Bug 1190995 - backout 0450f02a2b3b for M1 failures

b2g/app/b2g.js

@@ -1174,3 +1174,4 @@ pref("dom.presentation.device.name", "Firefox OS");
 
 // Enable notification of performance timing
 pref("dom.performance.enable_notify_performance_timing", true);
+

b2g/components/ProcessGlobal.js

@@ -165,7 +165,9 @@ ProcessGlobal.prototype = {
                        .getService(Ci.nsIXULRuntime)
                        .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
       if (inParent) {
-        Services.ppmm.addMessageListener("getProfD", function(message) {
+        let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"]
+                     .getService(Ci.nsIMessageListenerManager);
+        ppmm.addMessageListener("getProfD", function(message) {
           return Services.dirsvc.get("ProfD", Ci.nsIFile).path;
         });
 

b2g/installer/package-manifest.in

@@ -1006,6 +1006,3 @@ bin/libfreebl_32int64_3.so
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
-
-@RESPATH@/components/simpleServices.js
-@RESPATH@/components/utils.manifest

dom/apps/UserCustomizations.jsm

@@ -12,18 +12,38 @@ this.EXPORTED_SYMBOLS = ["UserCustomizations"];
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/Extension.jsm");
+Cu.import("resource://gre/modules/AppsUtils.jsm");
 
+XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
+                                   "@mozilla.org/parentprocessmessagemanager;1",
+                                   "nsIMessageBroadcaster");
+
+XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
+                                   "@mozilla.org/childprocessmessagemanager;1",
+                                   "nsIMessageSender");
 
 XPCOMUtils.defineLazyServiceGetter(this, "console",
                                    "@mozilla.org/consoleservice;1",
                                    "nsIConsoleService");
+/**
+  * Customization scripts and CSS stylesheets can be specified in an
+  * application manifest with the following syntax:
+  * "customizations": [
+  *  {
+  *    "filter": "http://youtube.com",
+  *    "css": ["file1.css", "file2.css"],
+  *    "scripts": ["script1.js", "script2.js"]
+  *  }
+  * ]
+  */
 
 function debug(aMsg) {
   if (!UserCustomizations._debug) {
     return;
   }
-  dump("-*-*- UserCustomizations " + aMsg + "\n");
+  dump("-*-*- UserCustomizations (" +
+           (UserCustomizations._inParent ? "parent" : "child") +
+           "): " + aMsg + "\n");
 }
 
 function log(aStr) {
@@ -31,36 +51,267 @@ function log(aStr) {
 }
 
 this.UserCustomizations = {
-  extensions: new Map(), // id -> extension. Needed to disable extensions.
+  _debug: false,
+  _items: [],
+  _loaded : {},   // Keep track per manifestURL of css and scripts loaded.
+  _windows: null, // Set of currently opened windows.
+  _enabled: false,
+
+  _addItem: function(aItem) {
+    debug("_addItem: " + uneval(aItem));
+    this._items.push(aItem);
+    if (this._inParent) {
+      ppmm.broadcastAsyncMessage("UserCustomizations:Add", [aItem]);
+    }
+  },
+
+  _removeItem: function(aHash) {
+    debug("_removeItem: " + aHash);
+    let index = -1;
+    this._items.forEach((script, pos) => {
+      if (script.hash == aHash ) {
+        index = pos;
+      }
+    });
+
+    if (index != -1) {
+      this._items.splice(index, 1);
+    }
+
+    if (this._inParent) {
+      ppmm.broadcastAsyncMessage("UserCustomizations:Remove", aHash);
+    }
+  },
+
+  register: function(aManifest, aApp) {
+    debug("Starting customization registration for " + aApp.manifestURL);
 
-  register: function(aApp) {
     if (!this._enabled || !aApp.enabled || aApp.role != "addon") {
       debug("Rejecting registration (global enabled=" + this._enabled +
             ") (app role=" + aApp.role +
             ", enabled=" + aApp.enabled + ")");
+      debug(uneval(aApp));
       return;
     }
 
-    debug("Starting customization registration for " + aApp.manifestURL + "\n");
+    let customizations = aManifest.customizations;
+    if (customizations === undefined || !Array.isArray(customizations)) {
+      return;
+    }
 
-    let extension = new Extension({
-      id: aApp.manifestURL,
-      resourceURI: Services.io.newURI(aApp.origin + "/", null, null)
+    let base = Services.io.newURI(aApp.origin, null, null);
+
+    customizations.forEach(item => {
+      // The filter property is mandatory.
+      if (!item.filter || (typeof item.filter !== "string")) {
+        log("Mandatory filter property not found in this customization item: " +
+            uneval(item) + " in " + aApp.manifestURL);
+        return;
+      }
+
+      // Create a new object with resolved urls and a hash that we reuse to
+      // remove items.
+      let custom = {
+        filter: item.filter,
+        status: aApp.appStatus,
+        manifestURL: aApp.manifestURL,
+        css: [],
+        scripts: []
+      };
+      custom.hash = AppsUtils.computeObjectHash(item);
+
+      if (item.css && Array.isArray(item.css)) {
+        item.css.forEach((css) => {
+          custom.css.push(base.resolve(css));
+        });
+      }
+
+      if (item.scripts && Array.isArray(item.scripts)) {
+        item.scripts.forEach((script) => {
+          custom.scripts.push(base.resolve(script));
+        });
+      }
+
+      this._addItem(custom);
     });
-
-    this.extensions.set(aApp.manifestURL, extension);
-    extension.startup();
+    this._updateAllWindows();
   },
 
-  unregister: function(aApp) {
+  _updateAllWindows: function() {
+    debug("UpdateWindows");
+    if (this._inParent) {
+      ppmm.broadcastAsyncMessage("UserCustomizations:UpdateWindows", {});
+    }
+    // Inject in all currently opened windows.
+    this._windows.forEach(this._injectInWindow.bind(this));
+  },
+
+  unregister: function(aManifest, aApp) {
     if (!this._enabled) {
       return;
     }
 
     debug("Starting customization unregistration for " + aApp.manifestURL);
-    if (this.extensions.has(aApp.manifestURL)) {
-      this.extensions.get(aApp.manifestURL).shutdown();
-      this.extensions.delete(aApp.manifestURL);
+    let customizations = aManifest.customizations;
+    if (customizations === undefined || !Array.isArray(customizations)) {
+      return;
+    }
+
+    customizations.forEach(item => {
+      this._removeItem(AppsUtils.computeObjectHash(item));
+    });
+    this._unloadForManifestURL(aApp.manifestURL);
+  },
+
+  _unloadForManifestURL: function(aManifestURL) {
+    debug("_unloadForManifestURL " + aManifestURL);
+
+    if (this._inParent) {
+      ppmm.broadcastAsyncMessage("UserCustomizations:Unload", aManifestURL);
+    }
+
+    if (!this._loaded[aManifestURL]) {
+      return;
+    }
+
+    if (this._loaded[aManifestURL].scripts &&
+        this._loaded[aManifestURL].scripts.length > 0) {
+      // We can't rollback script changes, so don't even try to unload in this
+      // situation.
+      return;
+    }
+
+    this._loaded[aManifestURL].css.forEach(aItem => {
+      try {
+        debug("unloading " + aItem.uri.spec);
+        let utils = aItem.window.QueryInterface(Ci.nsIInterfaceRequestor)
+                                .getInterface(Ci.nsIDOMWindowUtils);
+        utils.removeSheet(aItem.uri, Ci.nsIDOMWindowUtils.AUTHOR_SHEET);
+      } catch(e) {
+        log("Error unloading stylesheet " + aItem.uri.spec + " : " + e);
+      }
+    });
+
+    this._loaded[aManifestURL] = null;
+  },
+
+  _injectItem: function(aWindow, aItem, aInjected) {
+    debug("Injecting item " + uneval(aItem) + " in " + aWindow.location.href);
+    let utils = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                       .getInterface(Ci.nsIDOMWindowUtils);
+
+    let manifestURL = aItem.manifestURL;
+
+    // Load the stylesheets only in this window.
+    aItem.css.forEach(aCss => {
+      if (aInjected.indexOf(aCss) !== -1) {
+        debug("Skipping duplicated css: " + aCss);
+        return;
+      }
+
+      let uri = Services.io.newURI(aCss, null, null);
+      try {
+        utils.loadSheet(uri, Ci.nsIDOMWindowUtils.AUTHOR_SHEET);
+        if (!this._loaded[manifestURL]) {
+          this._loaded[manifestURL] = { css: [], scripts: [] };
+        }
+        this._loaded[manifestURL].css.push({ window: aWindow, uri: uri });
+        aInjected.push(aCss);
+      } catch(e) {
+        log("Error loading stylesheet " + aCss + " : " + e);
+      }
+    });
+
+    let sandbox;
+    if (aItem.scripts.length > 0) {
+      sandbox = Cu.Sandbox([aWindow],
+                           { wantComponents: false,
+                             sandboxPrototype: aWindow });
+    }
+
+    // Load the scripts using a sandbox.
+    aItem.scripts.forEach(aScript => {
+      debug("Sandboxing " + aScript);
+      if (aInjected.indexOf(aScript) !== -1) {
+        debug("Skipping duplicated script: " + aScript);
+        return;
+      }
+
+      try {
+        let options = {
+          target: sandbox,
+          charset: "UTF-8",
+          async: true
+        }
+        Services.scriptloader.loadSubScriptWithOptions(aScript, options);
+        if (!this._loaded[manifestURL]) {
+          this._loaded[manifestURL] = { css: [], scripts: [] };
+        }
+        this._loaded[manifestURL].scripts.push({ sandbox: sandbox, uri: aScript });
+        aInjected.push(aScript);
+      } catch(e) {
+        log("Error sandboxing " + aScript + " : " + e);
+      }
+    });
+
+    // Makes sure we get rid of the sandbox.
+    if (sandbox) {
+      aWindow.addEventListener("unload", () => {
+        Cu.nukeSandbox(sandbox);
+        sandbox = null;
+      });
+    }
+  },
+
+  _injectInWindow: function(aWindow) {
+    debug("_injectInWindow");
+
+    if (!aWindow || !aWindow.document) {
+      return;
+    }
+
+    let principal = aWindow.document.nodePrincipal;
+    debug("principal status: " + principal.appStatus);
+
+    let href = aWindow.location.href;
+
+    // The list of resources loaded in this window, used to filter out
+    // duplicates.
+    let injected = [];
+
+    this._items.forEach((aItem) => {
+      // We only allow customizations to apply to apps with an equal or lower
+      // privilege level.
+      if (principal.appStatus > aItem.status) {
+        return;
+      }
+
+      let regexp = new RegExp(aItem.filter, "g");
+      if (regexp.test(href)) {
+        this._injectItem(aWindow, aItem, injected);
+        debug("Currently injected: " + injected.toString());
+      }
+    });
+  },
+
+  observe: function(aSubject, aTopic, aData) {
+    if (aTopic === "content-document-global-created") {
+      let window = aSubject.QueryInterface(Ci.nsIDOMWindow);
+      let href = window.location.href;
+      if (!href || href == "about:blank") {
+        return;
+      }
+
+      let id = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                     .getInterface(Ci.nsIDOMWindowUtils)
+                     .currentInnerWindowID;
+      this._windows.set(id, window);
+
+      debug("document created: " + href);
+      this._injectInWindow(window);
+    } else if (aTopic === "inner-window-destroyed") {
+      let winId = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
+      this._windows.delete(winId);
     }
   },
 
@@ -69,7 +320,56 @@ this.UserCustomizations = {
     try {
       this._enabled = Services.prefs.getBoolPref("dom.apps.customization.enabled");
     } catch(e) {}
+
+    if (!this._enabled) {
+      return;
+    }
+
+    this._windows = new Map(); // Can't be a WeakMap because we need to enumerate.
+    this._inParent = Cc["@mozilla.org/xre/runtime;1"]
+                       .getService(Ci.nsIXULRuntime)
+                       .processType == Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT;
+
+    debug("init");
+
+    Services.obs.addObserver(this, "content-document-global-created",
+                             /* ownsWeak */ false);
+    Services.obs.addObserver(this, "inner-window-destroyed",
+                             /* ownsWeak */ false);
+
+    if (this._inParent) {
+      ppmm.addMessageListener("UserCustomizations:List", this);
+    } else {
+      cpmm.addMessageListener("UserCustomizations:Add", this);
+      cpmm.addMessageListener("UserCustomizations:Remove", this);
+      cpmm.addMessageListener("UserCustomizations:Unload", this);
+      cpmm.addMessageListener("UserCustomizations:UpdateWindows", this);
+      cpmm.sendAsyncMessage("UserCustomizations:List", {});
+    }
   },
+
+  receiveMessage: function(aMessage) {
+    let name = aMessage.name;
+    let data = aMessage.data;
+
+    switch(name) {
+      case "UserCustomizations:List":
+        aMessage.target.sendAsyncMessage("UserCustomizations:Add", this._items);
+        break;
+      case "UserCustomizations:Add":
+        data.forEach(this._addItem, this);
+        break;
+      case "UserCustomizations:Remove":
+        this._removeItem(data);
+        break;
+      case "UserCustomizations:Unload":
+        this._unloadForManifestURL(data);
+        break;
+      case "UserCustomizations:UpdateWindows":
+        this._updateAllWindows();
+        break;
+    }
+  }
 }
 
 UserCustomizations.init();

dom/apps/Webapps.jsm

@@ -439,7 +439,7 @@ this.DOMApplicationRegistry = {
           app.redirects = this.sanitizeRedirects(aResult.redirects);
         }
         app.kind = this.appKind(app, aResult.manifest);
-        UserCustomizations.register(app);
+        UserCustomizations.register(aResult.manifest, app);
         Langpacks.register(app, aResult.manifest);
       });
 
@@ -1164,7 +1164,7 @@ this.DOMApplicationRegistry = {
         this._registerSystemMessages(manifest, app);
         this._registerInterAppConnections(manifest, app);
         appsToRegister.push({ manifest: manifest, app: app });
-        UserCustomizations.register(app);
+        UserCustomizations.register(manifest, app);
         Langpacks.register(app, manifest);
       });
       this._safeToClone.resolve();
@@ -2013,10 +2013,10 @@ this.DOMApplicationRegistry = {
 
     // Update user customizations and langpacks.
     if (aOldManifest) {
-      UserCustomizations.unregister(aApp);
+      UserCustomizations.unregister(aOldManifest, aApp);
       Langpacks.unregister(aApp, aOldManifest);
     }
-    UserCustomizations.register(aApp);
+    UserCustomizations.register(aNewManifest, aApp);
     Langpacks.register(aApp, aNewManifest);
   },
 
@@ -4125,7 +4125,7 @@ this.DOMApplicationRegistry = {
     if (supportSystemMessages()) {
       this._unregisterActivities(aApp.manifest, aApp);
     }
-    UserCustomizations.unregister(aApp);
+    UserCustomizations.unregister(aApp.manifest, aApp);
     Langpacks.unregister(aApp, aApp.manifest);
 
     let dir = this._getAppDir(id);
@@ -4545,11 +4545,10 @@ this.DOMApplicationRegistry = {
     });
 
     // Update customization.
-    if (app.enabled) {
-      UserCustomizations.register(app);
-    } else {
-      UserCustomizations.unregister(app);
-    }
+    this.getManifestFor(app.manifestURL).then((aManifest) => {
+      app.enabled ? UserCustomizations.register(aManifest, app)
+                  : UserCustomizations.unregister(aManifest, app);
+    });
   },
 
   getManifestFor: function(aManifestURL, aEntryPoint) {

dom/apps/tests/addons/index.html

@@ -10,12 +10,8 @@ function sendAlertsForNode(node) {
 }
 
 function run() {
-  // We need to wait for the next tick because add-ons are injected in the
-  // onload event too.
-  window.setTimeout(function() {
-    sendAlertsForNode(document.getElementById("header"));
-    sendAlertsForNode(document.getElementById("header2"));
-  }, 0);
+  sendAlertsForNode(document.getElementById("header"));
+  sendAlertsForNode(document.getElementById("header2"));
 }
     </script>
   </head>

dom/apps/tests/addons/manifest.json

@@ -1,12 +0,0 @@
-{
-  "name": "Addon app",
-  "version": "1.0",
-  "manifest_version": 2,
-  "permissions": ["tabs"],
-  "description": "Let me inject script and css!",
-  "content_scripts": [
-    {"matches": ["http://mochi.test/tests/dom/apps/tests/addons/index.html"],
-     "js": ["script.js", "script2.js", "invalid.js", "script.js"],
-     "css": ["style.css", "style2.css"]}
-  ]
-}

dom/apps/tests/addons/manifest.webapp

@@ -1,5 +1,12 @@
 {
   "name": "Addon app",
   "description": "Let me inject script and css!",
+  "customizations" : [
+    {
+      "filter": "http://mochi.test:8888/tests/dom/apps/tests/addons",
+      "css": ["style.css", "style2.css", "invalid.css", "style.css"],
+      "scripts": ["script.js", "script2.js", "invalid.js", "script.js"]
+    }
+  ],
   "role": "addon"
 }

dom/apps/tests/addons/script.js

@@ -1,5 +1,4 @@
-// Simple script that changes an element's content.
-
-var head = document.getElementById("header");
-head.innerHTML = "Hello World!";
-
+document.addEventListener("DOMContentLoaded", function() {
+  var head = document.getElementById("header");
+  head.innerHTML = "Hello World!";
+}, false);

dom/apps/tests/addons/script2.js

@@ -1,6 +1,4 @@
-// Simple script that changes an element's content.
-
-var head = document.getElementById("header2");
-head.innerHTML = "Customized content";
-
-
+document.addEventListener("DOMContentLoaded", function() {
+  var head = document.getElementById("header2");
+  head.innerHTML = "Customized content";
+}, false);

dom/browser-element/BrowserElementChildPreload.js

@@ -1732,3 +1732,4 @@ BrowserElementChild.prototype = {
 };
 
 var api = new BrowserElementChild();
+

dom/browser-element/BrowserElementParent.js

@@ -234,8 +234,6 @@ BrowserElementParent.prototype = {
                  .apply(self, arguments);
       }
     });
-
-    this._mm.loadFrameScript("chrome://global/content/extensions.js", true);
   },
 
   /**

dom/ipc/extensions.js

@@ -1,15 +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";
-
-dump("######################## extensions.js loaded\n");
-
-Components.utils.import("resource://gre/modules/ExtensionContent.jsm");
-
-ExtensionContent.init(this);
-
-addEventListener("unload", () => {
-  ExtensionContent.uninit(this);
-});

dom/ipc/jar.mn

@@ -10,6 +10,5 @@ toolkit.jar:
         content/global/BrowserElementCopyPaste.js (../browser-element/BrowserElementCopyPaste.js)
         content/global/BrowserElementPanning.js (../browser-element/BrowserElementPanning.js)
 *       content/global/BrowserElementPanningAPZDisabled.js (../browser-element/BrowserElementPanningAPZDisabled.js)
-        content/global/extensions.js (extensions.js)
         content/global/manifestMessages.js (manifestMessages.js)
         content/global/preload.js (preload.js)

dom/ipc/preload.js

@@ -27,6 +27,11 @@ const BrowserElementIsPreloaded = true;
   Cu.import("resource://gre/modules/Services.jsm");
   Cu.import("resource://gre/modules/SettingsDB.jsm");
   Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+  try {
+    if (Services.prefs.getBoolPref("dom.apps.customization.enabled")) {
+      Cu.import("resource://gre/modules/UserCustomizations.jsm");
+    }
+  } catch(e) {}
 
   Cc["@mozilla.org/appshell/appShellService;1"].getService(Ci["nsIAppShellService"]);
   Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci["nsIWindowMediator"]);

netwerk/protocol/res/SubstitutingProtocolHandler.cpp

@@ -308,8 +308,7 @@ SubstitutingProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *bas
   nsresult rv = baseURI->GetScheme(scheme);
   NS_ENSURE_SUCCESS(rv, rv);
   if (!scheme.Equals(mScheme)) {
-    if (mEnforceFileOrJar && !scheme.EqualsLiteral("file") && !scheme.EqualsLiteral("jar")
-        && !scheme.EqualsLiteral("app")) {
+    if (mEnforceFileOrJar && !scheme.EqualsLiteral("file") && !scheme.EqualsLiteral("jar")) {
       NS_WARNING("Refusing to create substituting URI to non-file:// target");
       return NS_ERROR_INVALID_ARG;
     }

toolkit/components/extensions/Extension.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["Extension"];
+const EXPORTED_SYMBOLS = ["Extension"];
 
 /*
  * This file is the main entry point for extensions. When an extension
@@ -306,7 +306,7 @@ let GlobalManager = {
 
 // We create one instance of this class per extension. |addonData|
 // comes directly from bootstrap.js when initializing.
-this.Extension = function(addonData)
+function Extension(addonData)
 {
   let uuidGenerator = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
   let uuid = uuidGenerator.generateUUID().number;

toolkit/components/extensions/ExtensionContent.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["ExtensionContent"];
+const EXPORTED_SYMBOLS = ["ExtensionContent"];
 
 /*
  * This file handles the content process side of extensions. It mainly
@@ -19,7 +19,6 @@ const Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/AppConstants.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionManagement",
                                   "resource://gre/modules/ExtensionManagement.jsm");
@@ -148,20 +147,8 @@ Script.prototype = {
     let scheduled = this.run_at || "document_idle";
     if (shouldRun(scheduled)) {
       for (let url of this.js) {
-        // On gonk we need to load the resources asynchronously because the
-        // app: channels only support asyncOpen. This is safe only in the
-        // `document_idle` state.
-        if (AppConstants.platform == "gonk" && scheduled != "document_idle") {
-          Cu.reportError(`Script injection: ignoring ${url} at ${scheduled}`);
-        }
         url = extension.baseURI.resolve(url);
-
-        let options = {
-          target: sandbox,
-          charset: "UTF-8",
-          async: AppConstants.platform == "gonk"
-        }
-        Services.scriptloader.loadSubScriptWithOptions(url, options);
+        Services.scriptloader.loadSubScript(url, sandbox);
       }
 
       if (this.options.jsCode) {
@@ -238,7 +225,6 @@ ExtensionContext.prototype = {
 
   callOnClose(obj) {
     this.onClose.add(obj);
-    Cu.nukeSandbox(this.sandbox);
   },
 
   forgetOnClose(obj) {
@@ -490,7 +476,7 @@ let ExtensionManager = {
   }
 };
 
-this.ExtensionContent = {
+let ExtensionContent = {
   globals: new Map(),
 
   init(global) {

toolkit/components/extensions/ExtensionManagement.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["ExtensionManagement"];
+const EXPORTED_SYMBOLS = ["ExtensionManagement"];
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -188,7 +188,7 @@ let Service = {
   },
 };
 
-this.ExtensionManagement = {
+let ExtensionManagement = {
   startupExtension: Service.startupExtension.bind(Service),
   shutdownExtension: Service.shutdownExtension.bind(Service),
 
@@ -198,3 +198,4 @@ this.ExtensionManagement = {
   getFrameId: Frames.getId.bind(Frames),
   getParentFrameId: Frames.getParentId.bind(Frames),
 };
+

toolkit/components/extensions/ExtensionStorage.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["ExtensionStorage"];
+const EXPORTED_SYMBOLS = ["ExtensionStorage"];
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -19,7 +19,7 @@ Cu.import("resource://gre/modules/AsyncShutdown.jsm");
 let Path = OS.Path;
 let profileDir = OS.Constants.Path.profileDir;
 
-this.ExtensionStorage = {
+let ExtensionStorage = {
   cache: new Map(),
   listeners: new Map(),
 

toolkit/components/extensions/ExtensionUtils.jsm

@@ -4,7 +4,7 @@
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["ExtensionUtils"];
+const EXPORTED_SYMBOLS = ["ExtensionUtils"];
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -527,8 +527,7 @@ Messenger.prototype = {
   },
 };
 
-this.ExtensionUtils = {
-  runSafeWithoutClone,
+let ExtensionUtils = {
   runSafe,
   DefaultWeakMap,
   EventManager,

toolkit/components/extensions/ext-alarms.js

@@ -1,5 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 let {
   EventManager,

toolkit/components/extensions/ext-notifications.js

@@ -1,5 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 let {
   EventManager,

toolkit/components/extensions/ext-runtime.js

@@ -1,5 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
 let {
   EventManager,

toolkit/components/extensions/ext-storage.js

@@ -1,5 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionStorage",
                                   "resource://gre/modules/ExtensionStorage.jsm");
 

toolkit/components/extensions/ext-webNavigation.js

@@ -1,7 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionManagement",
                                   "resource://gre/modules/ExtensionManagement.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "MatchPattern",

toolkit/components/extensions/ext-webRequest.js

@@ -1,7 +1,3 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-
 XPCOMUtils.defineLazyModuleGetter(this, "MatchPattern",
                                   "resource://gre/modules/MatchPattern.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "WebRequest",

toolkit/modules/addons/MatchPattern.jsm

@@ -6,9 +6,9 @@
 
 const Cu = Components.utils;
 
-this.EXPORTED_SYMBOLS = ["MatchPattern"];
+const EXPORTED_SYMBOLS = ["MatchPattern"];
 
-const PERMITTED_SCHEMES = ["http", "https", "file", "ftp", "app"];
+const PERMITTED_SCHEMES = ["http", "https", "file", "ftp"];
 
 // This function converts a glob pattern (containing * and possibly ?
 // as wildcards) to a regular expression.
@@ -37,7 +37,7 @@ function SingleMatchPattern(pat)
   } else if (!pat) {
     this.scheme = [];
   } else {
-    let re = new RegExp("^(http|https|file|ftp|app|\\*)://(\\*|\\*\\.[^*/]+|[^*/]+|)(/.*)$");
+    let re = new RegExp("^(http|https|file|ftp|\\*)://(\\*|\\*\\.[^*/]+|[^*/]+|)(/.*)$");
     let match = re.exec(pat);
     if (!match) {
       Cu.reportError(`Invalid match pattern: '${pat}'`);
@@ -91,7 +91,7 @@ SingleMatchPattern.prototype = {
   }
 };
 
-this.MatchPattern = function(pat)
+function MatchPattern(pat)
 {
   this.pat = pat;
   if (!pat) {