From cfee7c5ce0518315965a201fca61bb8c666bf1ab Mon Sep 17 00:00:00 2001
From: Steven MacLeod <smacleod@mozilla.com>
Date: Thu, 5 Mar 2015 17:33:16 -0500
Subject: [PATCH] Bug 1132566 - Make test e10s compatible:
 browser_privatebrowsing_protocolhandler.js; r=mossop

The modifications should make the test e10s compatible but I have left
it disabled as it fails due to Bug 940206.

--HG--
extra : rebase_source : 740cd8c31a57010946d9835c5ab343c38f981023
---
 .../privatebrowsing/test/browser/browser.ini  |  2 +-
 ...browser_privatebrowsing_protocolhandler.js | 76 +++++++------------
 2 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/browser/components/privatebrowsing/test/browser/browser.ini b/browser/components/privatebrowsing/test/browser/browser.ini
index ffd74beaedb2..0fb20aa31053 100644
--- a/browser/components/privatebrowsing/test/browser/browser.ini
+++ b/browser/components/privatebrowsing/test/browser/browser.ini
@@ -41,7 +41,7 @@ skip-if = e10s # Bug 1139953 - Accept cookie dialog shown in private window when
 [browser_privatebrowsing_placestitle.js]
 [browser_privatebrowsing_popupblocker.js]
 [browser_privatebrowsing_protocolhandler.js]
-skip-if = e10s
+skip-if = e10s # Bug 940206 -  nsIWebContentHandlerRegistrar::registerProtocolHandler doesn't work in e10s
 [browser_privatebrowsing_sidebar.js]
 skip-if = e10s
 [browser_privatebrowsing_theming.js]
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler.js
index ac978898ac90..fe69a2234bac 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler.js
@@ -5,61 +5,43 @@
 // This test makes sure that the web pages can't register protocol handlers
 // inside the private browsing mode.
 
-function test() {
-  // initialization
-  waitForExplicitFinish();
-  let windowsToClose = [];
+add_task(function* test() {
   let notificationValue = "Protocol Registration: testprotocol";
   let testURI = "http://example.com/browser/" +
     "browser/components/privatebrowsing/test/browser/browser_privatebrowsing_protocolhandler_page.html";
 
-  function doTest(aIsPrivateMode, aWindow, aCallback) {
-    aWindow.gBrowser.selectedBrowser.addEventListener("load", function onLoad() {
-      aWindow.gBrowser.selectedBrowser.removeEventListener("load", onLoad, true);
+  let doTest = Task.async(function* (aIsPrivateMode, aWindow) {
+    let tab = aWindow.gBrowser.selectedTab = aWindow.gBrowser.addTab(testURI);
+    yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
-      setTimeout(function() {
-        let notificationBox = aWindow.gBrowser.getNotificationBox();
-        let notification = notificationBox.getNotificationWithValue(notificationValue);
+    let promiseFinished = PromiseUtils.defer();
+    setTimeout(function() {
+      let notificationBox = aWindow.gBrowser.getNotificationBox();
+      let notification = notificationBox.getNotificationWithValue(notificationValue);
 
-        if (aIsPrivateMode) {
-          // Make sure the notification is correctly displayed without a remember control
-          ok(!notification, "Notification box should not be displayed inside of private browsing mode");
-        } else {
-          // Make sure the notification is correctly displayed with a remember control
-          ok(notification, "Notification box should be displaying outside of private browsing mode");
-        }
+      if (aIsPrivateMode) {
+        // Make sure the notification is correctly displayed without a remember control
+        ok(!notification, "Notification box should not be displayed inside of private browsing mode");
+      } else {
+        // Make sure the notification is correctly displayed with a remember control
+        ok(notification, "Notification box should be displaying outside of private browsing mode");
+      }
 
-        aCallback();
-      }, 100); // remember control is added in a setTimeout(0) call
-    }, true);
+      promiseFinished.resolve();
+    }, 100); // remember control is added in a setTimeout(0) call
 
-    aWindow.gBrowser.selectedBrowser.loadURI(testURI);
-  }
-
-  function testOnWindow(aOptions, aCallback) {
-    whenNewWindowLoaded(aOptions, function(aWin) {
-      windowsToClose.push(aWin);
-      // execute should only be called when need, like when you are opening
-      // web pages on the test. If calling executeSoon() is not necesary, then
-      // call whenNewWindowLoaded() instead of testOnWindow() on your test.
-      executeSoon(function() aCallback(aWin));
-    });
-  };
-
-   // this function is called after calling finish() on the test.
-  registerCleanupFunction(function() {
-    windowsToClose.forEach(function(aWin) {
-      aWin.close();
-    });
+    yield promiseFinished.promise;
   });
 
   // test first when not on private mode
-  testOnWindow({}, function(aWin) {
-    doTest(false, aWin, function() {
-      // then test when on private mode
-      testOnWindow({private: true}, function(aWin) {
-        doTest(true, aWin, finish);
-      });
-    });
-  });
-}
+  let win = yield BrowserTestUtils.openNewBrowserWindow();
+  yield doTest(false, win);
+
+  // then test when on private mode
+  let privateWin = yield BrowserTestUtils.openNewBrowserWindow({private: true});
+  yield doTest(true, privateWin);
+
+  // Cleanup
+  yield BrowserTestUtils.closeWindow(win);
+  yield BrowserTestUtils.closeWindow(privateWin);
+});