Merge backout; a=orange

browser/base/content/browser.js

@@ -1252,9 +1252,6 @@ function BrowserStartup() {
 
   BookmarksMenuButton.init();
 
-  // initialize the private browsing UI
-  gPrivateBrowsingUI.init();
-
   setTimeout(delayedStartup, 0, isLoadingBlank, mustLoadSidebar);
 }
 
@@ -1540,6 +1537,9 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
   placesContext.addEventListener("popuphiding", updateEditUIVisibility, false);
 #endif
 
+  // initialize the private browsing UI
+  gPrivateBrowsingUI.init();
+
   gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true);
   gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true);
   gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true);

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_newwindow_stopcmd.js

@@ -47,9 +47,11 @@ function test() {
   pb.privateBrowsingEnabled = true;
 
   let win = OpenBrowserWindow();
-  win.addEventListener("load", function() {
-    win.removeEventListener("load", arguments.callee, false);
-    executeSoon(function() {
+  Services.obs.addObserver(function(subject, topic, data) {
+    Services.obs.removeObserver(arguments.callee, "browser-delayed-startup-finished");
+    var notifiedWin = subject.QueryInterface(Ci.nsIDOMWindow);
+    is(win, notifiedWin, "sanity check");
+
     let cmd = win.document.getElementById("Tools:PrivateBrowsing");
     ok(!cmd.hasAttribute("disabled"),
        "The Private Browsing command in a new window should be enabled");
@@ -57,6 +59,5 @@ function test() {
     win.close();
     pb.privateBrowsingEnabled = false;
     finish();
-    });
-  }, false);
+  }, "browser-delayed-startup-finished", false);
 }

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_windowtitle.js

@@ -93,14 +93,19 @@ function test() {
         win.addEventListener("load", function() {
           win.removeEventListener("load", arguments.callee, false);
 
-          executeSoon(function() {
+          // ensure that the test is run after delayedStartup
+          let _delayedStartup = win.delayedStartup;
+          win.delayedStartup = function() {
+            _delayedStartup.apply(win, arguments);
+            win.delayedStartup = _delayedStartup;
+
             is(win.document.title, expected_title, "The window title for " + url +
                " detached tab is correct (" + (insidePB ? "inside" : "outside") +
                " private browsing mode)");
             win.close();
 
             setTimeout(funcNext, 0);
-          });
+          };
         }, false);
       });
     }, false);