Bug 1483033 - EmbeddedExtension should pass string startup and shutdo…

…wn reasons to the embedded webextension, not numeric reasons. r=kmag Differential Revision: https://phabricator.services.mozilla.com/D5820 --HG-- extra : moz-landing-system : lando
trman · Sep 13, 2018 · 956bb2d · 956bb2d
1 parent e9c38d0
commit 956bb2d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/toolkit/components/extensions/Extension.jsm b/toolkit/components/extensions/Extension.jsm
@@ -1211,44 +1211,29 @@ class BootstrapScope {
 
   startup(data, reason) {
     // eslint-disable-next-line no-use-before-define
-    this.extension = new Extension(data, this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
+    this.extension = new Extension(data, AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
     return this.extension.startup();
   }
 
   shutdown(data, reason) {
-    let result = this.extension.shutdown(this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
+    let result = this.extension.shutdown(AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
     this.extension = null;
     return result;
   }
 }
 
-XPCOMUtils.defineLazyGetter(BootstrapScope.prototype, "BOOTSTRAP_REASON_TO_STRING_MAP", () => {
-  const {BOOTSTRAP_REASONS} = AddonManagerPrivate;
-
-  return Object.freeze({
-    [BOOTSTRAP_REASONS.APP_STARTUP]: "APP_STARTUP",
-    [BOOTSTRAP_REASONS.APP_SHUTDOWN]: "APP_SHUTDOWN",
-    [BOOTSTRAP_REASONS.ADDON_ENABLE]: "ADDON_ENABLE",
-    [BOOTSTRAP_REASONS.ADDON_DISABLE]: "ADDON_DISABLE",
-    [BOOTSTRAP_REASONS.ADDON_INSTALL]: "ADDON_INSTALL",
-    [BOOTSTRAP_REASONS.ADDON_UNINSTALL]: "ADDON_UNINSTALL",
-    [BOOTSTRAP_REASONS.ADDON_UPGRADE]: "ADDON_UPGRADE",
-    [BOOTSTRAP_REASONS.ADDON_DOWNGRADE]: "ADDON_DOWNGRADE",
-  });
-});
-
 class DictionaryBootstrapScope extends BootstrapScope {
   install(data, reason) {}
   uninstall(data, reason) {}
 
   startup(data, reason) {
     // eslint-disable-next-line no-use-before-define
     this.dictionary = new Dictionary(data);
-    return this.dictionary.startup(this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
+    return this.dictionary.startup(AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
   }
 
   shutdown(data, reason) {
-    this.dictionary.shutdown(this.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
+    this.dictionary.shutdown(AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
     this.dictionary = null;
   }
 }

diff --git a/toolkit/components/extensions/LegacyExtensionsUtils.jsm b/toolkit/components/extensions/LegacyExtensionsUtils.jsm
@@ -14,6 +14,8 @@ var EXPORTED_SYMBOLS = ["LegacyExtensionsUtils"];
  * and exchange messages with the embedded WebExtension.
  */
 
+ChromeUtils.defineModuleGetter(this, "AddonManagerPrivate",
+                               "resource://gre/modules/AddonManager.jsm");
 ChromeUtils.defineModuleGetter(this, "Extension",
                                "resource://gre/modules/Extension.jsm");
 ChromeUtils.defineModuleGetter(this, "ExtensionChild",
@@ -188,9 +190,9 @@ class EmbeddedExtension {
 
       this.extension.on("startup", onBeforeStarted);
 
-      // Run ambedded extension startup and catch any error during embedded extension
+      // Run embedded extension startup and catch any error during embedded extension
       // startup.
-      this.extension.startup(reason).catch((err) => {
+      this.extension.startup(AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]).catch((err) => {
         this.started = false;
         this.startupPromise = null;
         this.extension.off("startup", onBeforeStarted);
@@ -217,7 +219,7 @@ class EmbeddedExtension {
       let {extension} = this;
       this.extension = null;
 
-      await extension.shutdown(reason);
+      await extension.shutdown(AddonManagerPrivate.BOOTSTRAP_REASON_TO_STRING_MAP[reason]);
     }
     return undefined;
   }

diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -2803,6 +2803,20 @@ var AddonManagerInternal = {
   },
 };
 
+XPCOMUtils.defineLazyGetter(AddonManagerInternal, "BOOTSTRAP_REASON_TO_STRING_MAP", () => {
+  const {BOOTSTRAP_REASONS} = AddonManagerPrivate;
+  return Object.freeze({
+    [BOOTSTRAP_REASONS.APP_STARTUP]: "APP_STARTUP",
+    [BOOTSTRAP_REASONS.APP_SHUTDOWN]: "APP_SHUTDOWN",
+    [BOOTSTRAP_REASONS.ADDON_ENABLE]: "ADDON_ENABLE",
+    [BOOTSTRAP_REASONS.ADDON_DISABLE]: "ADDON_DISABLE",
+    [BOOTSTRAP_REASONS.ADDON_INSTALL]: "ADDON_INSTALL",
+    [BOOTSTRAP_REASONS.ADDON_UNINSTALL]: "ADDON_UNINSTALL",
+    [BOOTSTRAP_REASONS.ADDON_UPGRADE]: "ADDON_UPGRADE",
+    [BOOTSTRAP_REASONS.ADDON_DOWNGRADE]: "ADDON_DOWNGRADE",
+  });
+});
+
 /**
  * Should not be used outside of core Mozilla code. This is a private API for
  * the startup and platform integration code to use. Refer to the methods on
@@ -2897,6 +2911,10 @@ var AddonManagerPrivate = {
             .BOOTSTRAP_REASONS;
   },
 
+  get BOOTSTRAP_REASON_TO_STRING_MAP() {
+    return AddonManagerInternal.BOOTSTRAP_REASON_TO_STRING_MAP;
+  },
+
   recordTimestamp(name, value) {
     AddonManagerInternal.recordTimestamp(name, value);
   },
@@ -3503,6 +3521,5 @@ this.AddonManager.init();
 
 // load the timestamps module into AddonManagerInternal
 ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", AddonManagerInternal);
-Object.freeze(AddonManagerInternal);
 Object.freeze(AddonManagerPrivate);
 Object.freeze(AddonManager);