Backed out 3 changesets (bug 1143922) for landing with the wrong bug number
authorWes Kocher <wkocher@mozilla.com>
Fri, 18 Sep 2015 14:13:33 -0700
changeset 295935 c2a2e73b931f46d7983b1433e7523e3c9a5c7f5d
parent 295934 7ba91c441e350089b3bf05bdabfe90ef729aa112
child 295936 4a5adeb6e823a5cef0b6a2bef00217a28abd43d5
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1143922
milestone43.0a1
backs out309b4d1ab81c67783d7db0968bcff7c88108ba4f
deda472458fd5314c11461302008ce984dbd00a7
977d5b7ecba32a0617d40c231e2f16963bf4a4ef
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 3 changesets (bug 1143922) for landing with the wrong bug number Backed out changeset 309b4d1ab81c (bug 1143922) Backed out changeset deda472458fd (bug 1143922) Backed out changeset 977d5b7ecba3 (bug 1143922)
b2g/components/ActivityChannel.jsm
dom/base/test/chrome/test_bug682305.html
dom/interfaces/security/moz.build
dom/interfaces/security/nsIContentSecurityManager.idl
dom/security/nsContentSecurityManager.cpp
dom/security/nsContentSecurityManager.h
layout/build/nsLayoutModule.cpp
netwerk/test/unit/test_bug894586.js
toolkit/components/addoncompat/RemoteAddonsChild.jsm
toolkit/components/addoncompat/tests/addon/bootstrap.js
--- a/b2g/components/ActivityChannel.jsm
+++ b/b2g/components/ActivityChannel.jsm
@@ -7,20 +7,16 @@
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 
 XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
                                    "@mozilla.org/childprocessmessagemanager;1",
                                    "nsIMessageSender");
 
-XPCOMUtils.defineLazyServiceGetter(this, "contentSecManager",
-                                   "@mozilla.org/contentsecuritymanager;1",
-                                   "nsIContentSecurityManager");
-
 this.EXPORTED_SYMBOLS = ["ActivityChannel"];
 
 this.ActivityChannel = function(aURI, aLoadInfo, aName, aDetails) {
   this._activityName = aName;
   this._activityDetails = aDetails;
   this.originalURI = aURI;
   this.URI = aURI;
   this.loadInfo = aLoadInfo;
@@ -50,15 +46,13 @@ this.ActivityChannel.prototype = {
 
   asyncOpen: function(aListener, aContext) {
     cpmm.sendAsyncMessage(this._activityName, this._activityDetails);
     // Let the listener cleanup.
     aListener.onStopRequest(this, aContext, Cr.NS_OK);
   },
 
   asyncOpen2: function(aListener) {
-    // throws an error if security checks fail
-    var outListener = contentSecManager.performSecurityCheck(this, aListener);
-    this.asyncOpen(outListener, null);
+    this.asyncOpen(aListener, null);
   },
 
   QueryInterface2: XPCOMUtils.generateQI([Ci.nsIChannel])
 }
--- a/dom/base/test/chrome/test_bug682305.html
+++ b/dom/base/test/chrome/test_bug682305.html
@@ -31,18 +31,16 @@ var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cr = Components.results;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 var SimpleURI = Cc["@mozilla.org/network/simple-uri;1"];
 var ios = Cc["@mozilla.org/network/io-service;1"]
             .getService(Ci.nsIIOService);
-var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
-                          .getService(Ci.nsIContentSecurityManager);
 
 var PROTOCOL_SCHEME = "jsproto";
 
 
 function CustomChannel(uri, loadInfo) {
 	this.URI = this.originalURI = uri;
   this.loadInfo = loadInfo;
 }
@@ -67,32 +65,22 @@ CustomChannel.prototype = {
     } catch(e) {}
     try {
       listener.onDataAvailable(this, context, stream, 0, stream.available());
     } catch(e) {}
     try {
       listener.onStopRequest(this, context, Cr.NS_OK);
     } catch(e) {}
   },
-  asyncOpen2: function(listener) {
-    // throws an error if security checks fail
-    var outListener = contentSecManager.performSecurityCheck(this, listener);
-    return this.asyncOpen(outListener, null);
-  },
   open: function() {
     let data = "bar";
     let stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
     stream.setData(data, data.length);
     return stream;
   },
-  open2: function() {
-    // throws an error if security checks fail
-    contentSecManager.performSecurityCheck(this, null);
-    return this.open();
-  },
   isPending: function() {
     return false;
   },
   cancel: function() {
     throw Cr.NS_ERROR_NOT_IMPLEMENTED;
   },
   suspend: function() {
     throw Cr.NS_ERROR_NOT_IMPLEMENTED;
--- a/dom/interfaces/security/moz.build
+++ b/dom/interfaces/security/moz.build
@@ -1,13 +1,12 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_SOURCES += [
-    'nsIContentSecurityManager.idl',
     'nsIContentSecurityPolicy.idl'
 ]
 
 XPIDL_MODULE = 'dom_security'
 
deleted file mode 100644
--- a/dom/interfaces/security/nsIContentSecurityManager.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIChannel;
-interface nsIStreamListener;
-
-/**
- * nsIContentSecurityManager
- * Describes an XPCOM component used to perform security checks
- * right before opnening a channel.
- */
-
-[scriptable, uuid(70eaa956-1077-41f6-bef8-d722cea31245)]
-interface nsIContentSecurityManager : nsISupports
-{
-  /**
-   * Checks whether a channel is allowed to access the given URI and
-   * whether the channel should be openend or should be blocked consulting
-   * internal security checks like Same Origin Policy, Content Security
-   * Policy, Mixed Content Blocker, etc.
-   *
-   * If security checks within performSecurityCheck fail, the function
-   * throws an exception.
-   *
-   * @param aChannel
-   *     The channel about to be openend
-   * @param aStreamListener
-   *     The Streamlistener of the channel potentially wrapped
-   *     into CORSListenerProxy.
-   * @return
-   *     The StreamListener of the channel wrapped into CORSListenerProxy.
-   *
-   * @throws NS_ERROR_DOM_BAD_URI
-   *     If accessing the URI is not allowed (e.g. prohibted by SOP)
-   * @throws NS_ERROR_CONTENT_BLOCKED
-   *     If any of the security policies (CSP, Mixed content) is violated
-   */
-   nsIStreamListener performSecurityCheck(in nsIChannel aChannel,
-                                          in nsIStreamListener aStreamListener);
-};
--- a/dom/security/nsContentSecurityManager.cpp
+++ b/dom/security/nsContentSecurityManager.cpp
@@ -3,18 +3,16 @@
 #include "nsIStreamListener.h"
 #include "nsILoadInfo.h"
 #include "nsContentUtils.h"
 #include "nsCORSListenerProxy.h"
 #include "nsIStreamListener.h"
 
 #include "mozilla/dom/Element.h"
 
-NS_IMPL_ISUPPORTS(nsContentSecurityManager, nsIContentSecurityManager)
-
 nsresult
 ValidateSecurityFlags(nsILoadInfo* aLoadInfo)
 {
   nsSecurityFlags securityMode = aLoadInfo->GetSecurityMode();
 
   if (securityMode != nsILoadInfo::SEC_REQUIRE_SAME_ORIGIN_DATA_INHERITS &&
       securityMode != nsILoadInfo::SEC_REQUIRE_SAME_ORIGIN_DATA_IS_BLOCKED &&
       securityMode != nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS &&
@@ -342,24 +340,8 @@ nsContentSecurityManager::doContentSecur
 
   // Perform all ContentPolicy checks (MixedContent, CSP, ...)
   rv = DoContentSecurityChecks(finalChannelURI, loadInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // all security checks passed - lets allow the load
   return NS_OK;
 }
-
-
-// ==== nsIContentSecurityManager implementation =====
-
-NS_IMETHODIMP
-nsContentSecurityManager::PerformSecurityCheck(nsIChannel* aChannel,
-                                               nsIStreamListener* aStreamListener,
-                                               nsIStreamListener** outStreamListener)
-{
-  nsCOMPtr<nsIStreamListener> inAndOutListener = aStreamListener;
-  nsresult rv = doContentSecurityCheck(aChannel, inAndOutListener);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  inAndOutListener.forget(outStreamListener);
-  return NS_OK;
-}
--- a/dom/security/nsContentSecurityManager.h
+++ b/dom/security/nsContentSecurityManager.h
@@ -2,36 +2,23 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsContentSecurityManager_h___
 #define nsContentSecurityManager_h___
 
-#include "nsIContentSecurityManager.h"
 #include "nsIChannel.h"
-
 class nsIStreamListener;
 
-#define NS_CONTENTSECURITYMANAGER_CONTRACTID "@mozilla.org/contentsecuritymanager;1"
-// cdcc1ab8-3cea-4e6c-a294-a651fa35227f
-#define NS_CONTENTSECURITYMANAGER_CID \
-{ 0xcdcc1ab8, 0x3cea, 0x4e6c, \
-  { 0xa2, 0x94, 0xa6, 0x51, 0xfa, 0x35, 0x22, 0x7f } }
+class nsContentSecurityManager
+{
+private:
+  nsContentSecurityManager() {}
+  virtual ~nsContentSecurityManager() {}
 
-class nsContentSecurityManager : public nsIContentSecurityManager
-{
 public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSICONTENTSECURITYMANAGER
-
-  nsContentSecurityManager() {}
-
   static nsresult doContentSecurityCheck(nsIChannel* aChannel,
                                          nsCOMPtr<nsIStreamListener>& aInAndOutListener);
-
-private:
-  virtual ~nsContentSecurityManager() {}
-
 };
 
 #endif /* nsContentSecurityManager_h___ */
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -212,17 +212,16 @@ NS_NewXULTreeBuilder(nsISupports* aOuter
 
 static void Shutdown();
 
 #include "nsGeolocation.h"
 #include "nsDeviceSensors.h"
 #ifdef MOZ_GAMEPAD
 #include "mozilla/dom/GamepadServiceTest.h"
 #endif
-#include "mozilla/dom/nsContentSecurityManager.h"
 #include "mozilla/dom/nsCSPService.h"
 #include "mozilla/dom/nsCSPContext.h"
 #include "nsICellBroadcastService.h"
 #include "nsIIccService.h"
 #include "nsISmsService.h"
 #include "nsIMmsService.h"
 #include "nsIMobileConnectionService.h"
 #include "nsIMobileMessageService.h"
@@ -648,17 +647,16 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR
 
 #ifdef MOZ_WEBSPEECH_TEST_BACKEND
 NS_GENERIC_FACTORY_CONSTRUCTOR(FakeSpeechRecognitionService)
 #endif
 #ifdef MOZ_WEBSPEECH_POCKETSPHINX
 NS_GENERIC_FACTORY_CONSTRUCTOR(PocketSphinxSpeechRecognitionService)
 #endif
 
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsContentSecurityManager)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCSPContext)
 NS_GENERIC_FACTORY_CONSTRUCTOR(CSPService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMixedContentBlocker)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrincipal)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSystemPrincipal,
     nsScriptSecurityManager::SystemPrincipalSingletonConstructor)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNullPrincipal, Init)
@@ -794,17 +792,16 @@ NS_DEFINE_NAMED_CID(NS_EDITINGCONTROLLER
 NS_DEFINE_NAMED_CID(NS_EDITORCOMMANDTABLE_CID);
 NS_DEFINE_NAMED_CID(NS_EDITINGCOMMANDTABLE_CID);
 NS_DEFINE_NAMED_CID(NS_TEXTSERVICESDOCUMENT_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GEOLOCATION_CID);
 NS_DEFINE_NAMED_CID(NS_AUDIOCHANNEL_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_DATASTORE_SERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_FOCUSMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_CONTENTSECURITYMANAGER_CID);
 NS_DEFINE_NAMED_CID(CSPSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_CSPCONTEXT_CID);
 NS_DEFINE_NAMED_CID(NS_MIXEDCONTENTBLOCKER_CID);
 NS_DEFINE_NAMED_CID(NS_EVENTLISTENERSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_GLOBALMESSAGEMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_PARENTPROCESSMESSAGEMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_CHILDPROCESSMESSAGEMANAGER_CID);
 NS_DEFINE_NAMED_CID(NS_SCRIPTSECURITYMANAGER_CID);
@@ -1113,17 +1110,16 @@ static const mozilla::Module::CIDEntry k
   { &kNS_FAKE_SPEECH_RECOGNITION_SERVICE_CID, false, nullptr, FakeSpeechRecognitionServiceConstructor },
 #endif
 #ifdef MOZ_WEBSPEECH_POCKETSPHINX
   { &kNS_POCKETSPHINX_SPEECH_RECOGNITION_SERVICE_CID, false, nullptr, PocketSphinxSpeechRecognitionServiceConstructor },
 #endif
 #ifdef MOZ_WEBSPEECH
   { &kNS_SYNTHVOICEREGISTRY_CID, true, nullptr, nsSynthVoiceRegistryConstructor },
 #endif
-  { &kNS_CONTENTSECURITYMANAGER_CID, false, nullptr, nsContentSecurityManagerConstructor },
   { &kCSPSERVICE_CID, false, nullptr, CSPServiceConstructor },
   { &kNS_CSPCONTEXT_CID, false, nullptr, nsCSPContextConstructor },
   { &kNS_MIXEDCONTENTBLOCKER_CID, false, nullptr, nsMixedContentBlockerConstructor },
   { &kNS_EVENTLISTENERSERVICE_CID, false, nullptr, CreateEventListenerService },
   { &kNS_GLOBALMESSAGEMANAGER_CID, false, nullptr, CreateGlobalMessageManager },
   { &kNS_PARENTPROCESSMESSAGEMANAGER_CID, false, nullptr, CreateParentMessageManager },
   { &kNS_CHILDPROCESSMESSAGEMANAGER_CID, false, nullptr, CreateChildMessageManager },
   { &kNS_SCRIPTSECURITYMANAGER_CID, false, nullptr, Construct_nsIScriptSecurityManager },
@@ -1283,17 +1279,16 @@ static const mozilla::Module::ContractID
   { NS_SPEECH_RECOGNITION_SERVICE_CONTRACTID_PREFIX "fake", &kNS_FAKE_SPEECH_RECOGNITION_SERVICE_CID },
 #endif
 #ifdef MOZ_WEBSPEECH_POCKETSPHINX
   { NS_SPEECH_RECOGNITION_SERVICE_CONTRACTID_PREFIX "pocketsphinx-en-US", &kNS_POCKETSPHINX_SPEECH_RECOGNITION_SERVICE_CID },
 #endif
 #ifdef MOZ_WEBSPEECH
   { NS_SYNTHVOICEREGISTRY_CONTRACTID, &kNS_SYNTHVOICEREGISTRY_CID },
 #endif
-  { NS_CONTENTSECURITYMANAGER_CONTRACTID, &kNS_CONTENTSECURITYMANAGER_CID },
   { CSPSERVICE_CONTRACTID, &kCSPSERVICE_CID },
   { NS_CSPCONTEXT_CONTRACTID, &kNS_CSPCONTEXT_CID },
   { NS_MIXEDCONTENTBLOCKER_CONTRACTID, &kNS_MIXEDCONTENTBLOCKER_CID },
   { NS_EVENTLISTENERSERVICE_CONTRACTID, &kNS_EVENTLISTENERSERVICE_CID },
   { NS_GLOBALMESSAGEMANAGER_CONTRACTID, &kNS_GLOBALMESSAGEMANAGER_CID },
   { NS_PARENTPROCESSMESSAGEMANAGER_CONTRACTID, &kNS_PARENTPROCESSMESSAGEMANAGER_CID },
   { NS_CHILDPROCESSMESSAGEMANAGER_CONTRACTID, &kNS_CHILDPROCESSMESSAGEMANAGER_CID },
   { NS_SCRIPTSECURITYMANAGER_CONTRACTID, &kNS_SCRIPTSECURITYMANAGER_CID },
--- a/netwerk/test/unit/test_bug894586.js
+++ b/netwerk/test/unit/test_bug894586.js
@@ -1,19 +1,16 @@
 /*
  * Tests for bug 894586: nsSyncLoadService::PushSyncStreamToListener
  * should not fail for channels of unknown size
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
-                          .getService(Ci.nsIContentSecurityManager);
-
 function ProtocolHandler() {
   this.uri = Cc["@mozilla.org/network/simple-uri;1"].
                createInstance(Ci.nsIURI);
   this.uri.spec = this.scheme + ":dummy";
   this.uri.QueryInterface(Ci.nsIMutable).mutable = false;
 }
 
 ProtocolHandler.prototype = {
@@ -53,29 +50,20 @@ ProtocolHandler.prototype = {
     var url = Services.io.newFileURI(file);
     return Services.io.newChannelFromURI2(url,
                                           null,      // aLoadingNode
                                           Services.scriptSecurityManager.getSystemPrincipal(),
                                           null,      // aTriggeringPrincipal
                                           Ci.nsILoadInfo.SEC_NORMAL,
                                           Ci.nsIContentPolicy.TYPE_OTHER).open();
   },
-  open2: function() {
-    // throws an error if security checks fail
-    contentSecManager.performSecurityCheck(this, null);
-    return this.open();
-  },
   asyncOpen: function(aListener, aContext) {
     throw Components.Exception("Not implemented",
                                Cr.NS_ERROR_NOT_IMPLEMENTED);
   },
-  asyncOpen2: function(aListener, aContext) {
-    throw Components.Exception("Not implemented",
-                               Cr.NS_ERROR_NOT_IMPLEMENTED);
-  },
   contentDisposition: Ci.nsIChannel.DISPOSITION_INLINE,
   get contentDispositionFilename() {
     throw Components.Exception("No file name",
                                Cr.NS_ERROR_NOT_AVAILABLE);
   },
   get contentDispositionHeader() {
     throw Components.Exception("No header",
                                Cr.NS_ERROR_NOT_AVAILABLE);
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
@@ -15,20 +15,16 @@ Cu.import("resource://gre/modules/Servic
 XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils",
                                   "resource://gre/modules/BrowserUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Prefetcher",
                                   "resource://gre/modules/Prefetcher.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "SystemPrincipal",
                                    "@mozilla.org/systemprincipal;1", "nsIPrincipal");
 
-XPCOMUtils.defineLazyServiceGetter(this, "contentSecManager",
-                                   "@mozilla.org/contentsecuritymanager;1",
-                                   "nsIContentSecurityManager");
-
 // Similar to Python. Returns dict[key] if it exists. Otherwise,
 // sets dict[key] to default_ and returns default_.
 function setDefault(dict, key, default_)
 {
   if (key in dict) {
     return dict[key];
   }
   dict[key] = default_;
@@ -273,30 +269,20 @@ AboutProtocolChannel.prototype = {
         try {
           listener.onStopRequest(this, context, Cr.NS_OK);
         } catch(e) {}
       }
     };
     Services.tm.currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
   },
 
-  asyncOpen2: function(listener) {
-    // throws an error if security checks fail
-    var outListener = contentSecManager.performSecurityCheck(this, listener);
-    this.asyncOpen(outListener, null);
-  },
-
   open: function() {
     throw Cr.NS_ERROR_NOT_IMPLEMENTED;
   },
 
-  open2: function() {
-    throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-  },
-
   isPending: function() {
     return false;
   },
 
   cancel: function() {
     throw Cr.NS_ERROR_NOT_IMPLEMENTED;
   },
 
--- a/toolkit/components/addoncompat/tests/addon/bootstrap.js
+++ b/toolkit/components/addoncompat/tests/addon/bootstrap.js
@@ -5,19 +5,16 @@ var Cr = Components.results;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/BrowserUtils.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 const baseURL = "http://mochi.test:8888/browser/" +
   "toolkit/components/addoncompat/tests/browser/";
 
-var contentSecManager = Cc["@mozilla.org/contentsecuritymanager;1"]
-                          .getService(Ci.nsIContentSecurityManager);
-
 function forEachWindow(f)
 {
   let wins = Services.ww.getWindowEnumerator("navigator:browser");
   while (wins.hasMoreElements()) {
     let win = wins.getNext();
     if (win.gBrowser) {
       f(win);
     }
@@ -293,22 +290,16 @@ function testAboutModuleRegistration()
           try {
             listener.onStopRequest(this, context, Cr.NS_OK);
           } catch(e) {}
         }
       };
       Services.tm.currentThread.dispatch(runnable, Ci.nsIEventTarget.DISPATCH_NORMAL);
     },
 
-    asyncOpen2: function(listener) {
-      // throws an error if security checks fail
-      var outListener = contentSecManager.performSecurityCheck(this, listener);
-      return this.asyncOpen(outListener, null);
-    },
-
     open: function() {
       function getWindow(channel) {
         try
         {
           if (channel.notificationCallbacks)
             return channel.notificationCallbacks.getInterface(Ci.nsILoadContext).associatedWindow;
         } catch(e) {}
 
@@ -326,22 +317,16 @@ function testAboutModuleRegistration()
       if (!wnd)
         throw Cr.NS_ERROR_UNEXPECTED;
 
       let stream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance(Ci.nsIStringInputStream);
       stream.setData(data, data.length);
       return stream;
     },
 
-    open2: function() {
-      // throws an error if security checks fail
-      contentSecManager.performSecurityCheck(this, null);
-      return this.open();
-    },
-
     isPending: function() {
       return false;
     },
     cancel: function() {
       throw Cr.NS_ERROR_NOT_IMPLEMENTED;
     },
     suspend: function() {
       throw Cr.NS_ERROR_NOT_IMPLEMENTED;