Bug 1363925: Follow-up: Cleanup merge artifacts from bug 1433574. r=trivial
authorKris Maglione <maglione.k@gmail.com>
Tue, 24 Apr 2018 12:05:26 -0700
changeset 471482 6d8ebb6476c98519589404ab0793afc969c49216
parent 471481 13863e08584ae95ac1262b517bf8ef06dd29dbdf
child 471483 3ef195c68eed3a1875e9ee63ff556b7875c14f9b
push id1728
push userjlund@mozilla.com
push dateMon, 18 Jun 2018 21:12:27 +0000
treeherdermozilla-release@c296fde26f5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial
bugs1363925, 1433574
milestone61.0a1
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
Bug 1363925: Follow-up: Cleanup merge artifacts from bug 1433574. r=trivial MozReview-Commit-ID: EFrwjQkk7OO
toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -29,18 +29,16 @@ XPCOMUtils.defineLazyModuleGetters(this,
   Langpack: "resource://gre/modules/Extension.jsm",
   LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
   PermissionsUtils: "resource://gre/modules/PermissionsUtils.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   ConsoleAPI: "resource://gre/modules/Console.jsm",
   JSONFile: "resource://gre/modules/JSONFile.jsm",
   LegacyExtensionsUtils: "resource://gre/modules/LegacyExtensionsUtils.jsm",
-  setTimeout: "resource://gre/modules/Timer.jsm",
-  clearTimeout: "resource://gre/modules/Timer.jsm",
 
   XPIDatabase: "resource://gre/modules/addons/XPIDatabase.jsm",
   XPIDatabaseReconcile: "resource://gre/modules/addons/XPIDatabase.jsm",
   XPIInstall: "resource://gre/modules/addons/XPIInstall.jsm",
   verifyBundleSignedState: "resource://gre/modules/addons/XPIInstall.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
@@ -2752,18 +2750,19 @@ for (let meth of ["cancelUninstallAddon"
                   "isInstallAllowed", "isInstallEnabled", "uninstallAddon",
                   "updateSystemAddons"]) {
   XPIProvider[meth] = function() {
     return XPIInstall[meth](...arguments);
   };
 }
 
 function forwardInstallMethods(cls, methods) {
+  let {prototype} = cls;
   for (let meth of methods) {
-    cls.prototype[meth] = function() {
+    prototype[meth] = function() {
       return XPIInstall[cls.name].prototype[meth].apply(this, arguments);
     };
   }
 }
 
 /**
  * An object which identifies a directory install location for add-ons. The
  * location consists of a directory which contains the add-ons installed in the