Bug 822284 - Intermittent browser_privatebrowsing_cookieacceptdialog.js, browser_privatebrowsing_crh.js; r=ehsan

browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_cookieacceptdialog.js

@@ -8,8 +8,9 @@
 function test() {
   // initialization
   const TEST_URL = "http://mochi.test:8888/browser/browser/components/" +
-                   "privatebrowsing/test/browser/perwindow/" + 
+                   "privatebrowsing/test/browser/perwindow/" +
                    "browser_privatebrowsing_cookieacceptdialog.html";
+  const BLANK_URL = "http://mochi.test:8888/";
   let cp = Cc["@mozilla.org/embedcomp/cookieprompt-service;1"].
            getService(Ci.nsICookiePromptService);
 
@@ -37,8 +38,7 @@ function test() {
             ok(!remember.hasAttribute("disabled"),
                "The checkbox should not be disabled");
 
-          win.close();
-          executeSoon(callback);
+          waitForWindowClose(win, callback);
         });
       }, false);
     }
@@ -110,7 +110,16 @@ function test() {
   function testOnWindow(aIsPrivate, aCallback) {
     whenNewWindowLoaded({private: aIsPrivate}, function(aWin) {
       windowsToClose.push(aWin);
-      aCallback(aWin);
+      let selectedBrowser = aWin.gBrowser.selectedBrowser;
+      selectedBrowser.addEventListener("load", function onLoad() {
+        if (aWin.content.location.href != BLANK_URL) {
+          selectedBrowser.loadURI(BLANK_URL);
+          return;
+        }
+        selectedBrowser.removeEventListener("load", onLoad, true);
+        aCallback(aWin);
+      }, true);
+      selectedBrowser.loadURI(BLANK_URL);
     });
   }
 

browser/components/privatebrowsing/test/browser/perwindow/browser_privatebrowsing_crh.js

@@ -23,7 +23,7 @@ function test() {
   };
 
   let windowsToClose = [];
-  let testURI = "about:blank";
+  let testURI = "http://mochi.test:8888/";
 
   function testOnWindow(aIsPrivate, aCallback) {
     whenNewWindowLoaded({private: aIsPrivate}, function(aWin) {