Bug 1316718 - Remove ExtensionContent from mozbrowser startup. r=fabrice

MozReview-Commit-ID: 4I5Ox1cQdIg

--HG--
extra : rebase_source : ca8dc8328fe268d91e7e98b1130c16527684a427

dom/browser-element/BrowserElementChildPreload.js

@@ -17,7 +17,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/BrowserElementPromptService.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/ExtensionContent.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "acs",
                                    "@mozilla.org/audiochannel/service;1",

dom/browser-element/BrowserElementParent.js

@@ -319,7 +319,6 @@ BrowserElementParent.prototype = {
   _setupMessageListener: function() {
     this._mm = this._frameLoader.messageManager;
     this._mm.addMessageListener('browser-element-api:call', this);
-    this._mm.loadFrameScript("chrome://global/content/extensions.js", true);
   },
 
   receiveMessage: function(aMsg) {

dom/ipc/extensions.js

@@ -1,17 +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/. */
-
-"use strict";
-
-function debug(msg) {
-  // dump("extensions - " + msg + "\n");
-}
-
-debug("loaded");
-
-ExtensionContent.init(this);
-
-addEventListener("unload", () => {
-  ExtensionContent.uninit(this);
-});

dom/ipc/jar.mn

@@ -8,6 +8,5 @@ toolkit.jar:
         content/global/BrowserElementChild.js (../browser-element/BrowserElementChild.js)
         content/global/BrowserElementChildPreload.js (../browser-element/BrowserElementChildPreload.js)
         content/global/BrowserElementCopyPaste.js (../browser-element/BrowserElementCopyPaste.js)
-        content/global/extensions.js (extensions.js)
         content/global/manifestMessages.js (manifestMessages.js)
         content/global/preload.js (preload.js)