Backed out changeset e7c2fe034f25 (bug 1356816) for mochitest bustage

Author: philor

toolkit/components/extensions/Extension.jsm

@@ -667,6 +667,8 @@ this.ExtensionData = class {
   }
 };
 
+let _browserUpdated = false;
+
 const PROXIED_EVENTS = new Set(["test-harness-message", "add-permissions", "remove-permissions"]);
 
 // We create one instance of this class per extension. |addonData|
@@ -743,6 +745,14 @@ this.Extension = class extends ExtensionData {
     /* eslint-enable mozilla/balanced-listeners */
   }
 
+  static set browserUpdated(updated) {
+    _browserUpdated = updated;
+  }
+
+  static get browserUpdated() {
+    return _browserUpdated;
+  }
+
   static generateXPI(data) {
     return ExtensionTestCommon.generateXPI(data);
   }

toolkit/components/extensions/ext-runtime.js

@@ -2,8 +2,6 @@
 
 XPCOMUtils.defineLazyModuleGetter(this, "AddonManager",
                                   "resource://gre/modules/AddonManager.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "AddonManagerPrivate",
-                                  "resource://gre/modules/AddonManager.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "Extension",
                                   "resource://gre/modules/Extension.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "ExtensionManagement",
@@ -36,7 +34,7 @@ this.runtime = class extends ExtensionAPI {
           let listener = () => {
             switch (extension.startupReason) {
               case "APP_STARTUP":
-                if (AddonManagerPrivate.browserUpdated) {
+                if (Extension.browserUpdated) {
                   fire.sync({reason: "browser_update"});
                 }
                 break;

toolkit/mozapps/extensions/AddonManager.jsm

@@ -643,7 +643,6 @@ var gShutdownBarrier = null;
 var gRepoShutdownState = "";
 var gShutdownInProgress = false;
 var gPluginPageListener = null;
-var gBrowserUpdated = null;
 
 /**
  * This is the real manager, kept here rather than in AddonManager to keep its
@@ -816,7 +815,7 @@ var AddonManagerInternal = {
         appChanged = Services.appinfo.version != oldAppVersion;
       } catch (e) { }
 
-      gBrowserUpdated = appChanged;
+      Extension.browserUpdated = appChanged;
 
       let oldPlatformVersion = Services.prefs.getCharPref(PREF_EM_LAST_PLATFORM_VERSION, "");
 
@@ -3099,10 +3098,6 @@ this.AddonManagerPrivate = {
     AddonManagerInternal.startup();
   },
 
-  get browserUpdated() {
-    return gBrowserUpdated;
-  },
-
   registerProvider(aProvider, aTypes) {
     AddonManagerInternal.registerProvider(aProvider, aTypes);
   },