Bug 599105: Default wizard page of update extensions window shown when switching between builds. r=robstrong, a=blocks-final

toolkit/mozapps/extensions/content/update.js

@@ -77,15 +77,10 @@ var gUpdateWizard = {
     catch (e) {
     }
 
-    // Retrieve all add-ons in order to sync their app compatibility information
-    AddonManager.getAllAddons(function(aAddons) {
-      gUpdateWizard.addons = aAddons;
-
-      if (Services.io.offline)
-        document.documentElement.currentPage = document.getElementById("offline");
-      else
-        document.documentElement.currentPage = document.getElementById("versioninfo");
-    });
+    if (Services.io.offline)
+      document.documentElement.currentPage = document.getElementById("offline");
+    else
+      document.documentElement.currentPage = document.getElementById("versioninfo");
   },
 
   onWizardFinish: function ()
@@ -160,11 +155,17 @@ var gVersionInfoPage = {
     gUpdateWizard.setButtonLabels(null, true,
                                   "nextButtonText", true,
                                   "cancelButtonText", false);
-    this._totalCount = gUpdateWizard.addons.length;
 
-    gUpdateWizard.addons.forEach(function(aAddon) {
-      aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_INSTALLED);
-    }, this);
+    // Retrieve all add-ons in order to sync their app compatibility information
+    AddonManager.getAllAddons(function(aAddons) {
+      gUpdateWizard.addons = aAddons;
+
+      gVersionInfoPage._totalCount = aAddons.length;
+
+      aAddons.forEach(function(aAddon) {
+        aAddon.findUpdates(gVersionInfoPage, AddonManager.UPDATE_WHEN_NEW_APP_INSTALLED);
+      }, this);
+    });
   },
 
   onAllUpdatesFinished: function() {

toolkit/mozapps/extensions/test/browser/browser_bug557956.js

@@ -23,8 +23,7 @@ const URI_EXTENSION_UPDATE_DIALOG = "chrome://mozapps/content/extensions/update.
  */
 
 function test() {
-  ok(true, "Test disabled due to timeouts");
-  return;
+  requestLongerTimeout(2);
   waitForExplicitFinish();
 
   run_next_test();