Bug 1100687 - part 2: fix browser_blockHPKP.js, r=jaws

MozReview-Commit-ID: DxvN94O8fhi

--HG--
extra : rebase_source : 127d935b8153114624bd50400a40e84f5153278c

browser/base/content/test/general/browser.ini

@@ -527,7 +527,6 @@ tags = mcb
 [browser_e10s_javascript.js]
 [browser_blockHPKP.js]
 tags = psm
-skip-if = e10s # bug 1100687 - test directly manipulates content (content.document.getElementById)
 [browser_mcb_redirect.js]
 tags = mcb
 [browser_windowactivation.js]

browser/base/content/test/general/browser_blockHPKP.js

@@ -49,11 +49,12 @@ function test() {
 
 // Start by making a successful connection to a domain that will pin a site
 function loadPinningPage() {
-  gBrowser.selectedBrowser.addEventListener("load",
-                                             successfulPinningPageListener,
-                                             true);
 
-  gBrowser.selectedBrowser.loadURI("https://" + kPinningDomain + kURLPath + "valid");
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "https://" + kPinningDomain + kURLPath + "valid").then(function() {
+    gBrowser.selectedBrowser.addEventListener("load",
+                                               successfulPinningPageListener,
+                                               true);
+  });
 }
 
 // After the site is pinned try to load with a subdomain site that should
@@ -61,49 +62,40 @@ function loadPinningPage() {
 var successfulPinningPageListener = {
   handleEvent: function() {
     gBrowser.selectedBrowser.removeEventListener("load", this, true);
-    gBrowser.addProgressListener(certErrorProgressListener);
-    gBrowser.selectedBrowser.loadURI("https://" + kBadPinningDomain);
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "https://" + kBadPinningDomain).then(function() {
+      return promiseErrorPageLoaded(gBrowser.selectedBrowser);
+    }).then(errorPageLoaded);
   }
 };
 
 // The browser should load about:neterror, when this happens, proceed
 // to load the pinning domain again, this time removing the pinning information
-var certErrorProgressListener = {
-  onStateChange: function(aWebProgress, aRequest, aStateFlags, aStatus) {
-    if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) {
-      let textElement = content.document.getElementById("errorShortDescText");
-      let text = textElement.innerHTML;
-      ok(text.indexOf("MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE") > 0,
-         "Got a pinning error page");
-      gBrowser.removeProgressListener(this);
-      gBrowser.selectedBrowser.addEventListener("load",
-                                                successfulPinningRemovalPageListener,
-                                                true);
-      gBrowser.selectedBrowser.loadURI("https://" + kPinningDomain + kURLPath + "zeromaxagevalid");
-    }
-  }
+function errorPageLoaded() {
+  ContentTask.spawn(gBrowser.selectedBrowser, null, function*() {
+    let textElement = content.document.getElementById("errorShortDescText");
+    let text = textElement.innerHTML;
+    ok(text.indexOf("MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE") > 0,
+       "Got a pinning error page");
+  }).then(function() {
+    BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "https://" + kPinningDomain + kURLPath + "zeromaxagevalid").then(function() {
+      return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+    }).then(pinningRemovalLoaded);
+  });
 };
 
 // After the pinning information has been removed (successful load) proceed
 // to load again with the invalid pin domain.
-var successfulPinningRemovalPageListener = {
-  handleEvent: function() {
-    gBrowser.selectedBrowser.removeEventListener("load", this, true);
-    gBrowser.selectedBrowser.addEventListener("load",
-                                              successfulLoadListener,
-                                              true);
-
-    gBrowser.selectedBrowser.loadURI("https://" + kBadPinningDomain);
-  }
+function pinningRemovalLoaded() {
+  BrowserTestUtils.loadURI(gBrowser.selectedBrowser, "https://" + kBadPinningDomain).then(function() {
+    return BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
+  }).then(badPinningPageLoaded);
 };
 
 // Finally, we should successfully load
 // https://bad.include-subdomains.pinning-dynamic.example.com.
-var successfulLoadListener = {
-  handleEvent: function() {
-    gBrowser.selectedBrowser.removeEventListener("load", this, true);
-    gBrowser.removeTab(gBrowser.selectedTab);
+function badPinningPageLoaded() {
+  BrowserTestUtils.removeTab(gBrowser.selectedTab).then(function() {
     ok(true, "load complete");
     finish();
-  }
+  });
 };

browser/base/content/test/general/browser_ssl_error_reports.js

@@ -165,15 +165,6 @@ function createReportResponseStatusPromise(expectedURI) {
   });
 }
 
-function promiseErrorPageLoaded(browser) {
-  return new Promise(resolve => {
-    browser.addEventListener("DOMContentLoaded", function onLoad() {
-      browser.removeEventListener("DOMContentLoaded", onLoad, false, true);
-      resolve();
-    }, false, true);
-  });
-}
-
 function checkErrorPage(browser, suffix) {
   return ContentTask.spawn(browser, null, function* () {
     return content.document.documentURI;