Backed out changeset 9c92da2ea3d7 (bug 844561) for mochitest b-c orange.

browser/base/content/browser.js

@@ -6398,20 +6398,20 @@ function warnAboutClosingWindow() {
   // Figure out if there's at least one other browser window around.
   let e = Services.wm.getEnumerator("navigator:browser");
   let otherPBWindowExists = false;
-  let nonPopupPresent = false;
+  let warnAboutClosingTabs = false;
   while (e.hasMoreElements()) {
     let win = e.getNext();
     if (win != window) {
       if (isPBWindow && PrivateBrowsingUtils.isWindowPrivate(win))
         otherPBWindowExists = true;
       if (win.toolbar.visible)
-        nonPopupPresent = true;
+        warnAboutClosingTabs = true;
       // If the current window is not in private browsing mode we don't need to 
       // look for other pb windows, we can leave the loop when finding the 
       // first non-popup window. If however the current window is in private 
       // browsing mode then we need at least one other pb and one non-popup 
       // window to break out early.
-      if ((!isPBWindow || otherPBWindowExists) && nonPopupPresent)
+      if ((!isPBWindow || otherPBWindowExists) && warnAboutClosingTabs)
         break;
     }
   }
@@ -6426,8 +6426,7 @@ function warnAboutClosingWindow() {
     if (exitingCanceled.data)
       return false;
   }
-
-  if (!isPBWindow && nonPopupPresent)
+  if (warnAboutClosingTabs)
     return gBrowser.warnAboutClosingTabs(true);
 
   let os = Services.obs;

browser/base/content/test/Makefile.in

@@ -313,7 +313,6 @@ _BROWSER_FILES = \
                  feed_tab.html \
                  browser_pluginCrashCommentAndURL.js \
                  pluginCrashCommentAndURL.html \
-                 browser_private_no_prompt.js \
                  $(NULL)
 
 # Disable test on Windows due to frequent failures (bug 841341)

browser/base/content/test/browser_private_no_prompt.js

@@ -1,13 +0,0 @@
-function test() {
-  waitForExplicitFinish();
-  var privateWin = OpenBrowserWindow({private: true});
-  privateWin.addEventListener("load", function onload() {
-    privateWin.removeEventListener("load", onload, false);
-    ok(true, "Load listener called");
-
-    privateWin.BrowserOpenTab();
-    privateWin.BrowserTryToCloseWindow();
-    ok(true, "didn't prompt");
-    finish();                        
-  }, false);
-}