Backed out 2 changesets (bug 1617983) for bc failures on browser_google_behavior.js

Backed out changeset 10c0ead96d08 (bug 1617983)
Backed out changeset 623af81c196a (bug 1617983)

browser/app/profile/firefox.js

@@ -507,7 +507,7 @@ pref("browser.tabs.delayHidingAudioPlayingIconMS", 3000);
   // for about: pages. This pref name did not age well: we will have multiple
   // types of privileged content processes, each with different privileges.
   // types of privleged content processes, each with different privleges.
-  pref("browser.tabs.remote.separatePrivilegedContentProcess", true);
+  pref("browser.tabs.remote.separatePrivilegedContentProcess", false);
   // This pref will cause assertions when a remoteType triggers a process switch
   // to a new remoteType it should not be able to trigger.
   pref("browser.tabs.remote.enforceRemoteTypeRestrictions", true);

toolkit/components/certviewer/tests/browser/browser_openTabAndSendCertInfo.js

@@ -69,27 +69,12 @@ add_task(async function openFromPopUp() {
 
   let [win] = await openCertDownloadDialog(cert);
   let viewCertButton = win.document.getElementById("viewC-button");
-  let newWinOpened = BrowserTestUtils.waitForNewWindow();
+  let newWinOpened = BrowserTestUtils.waitForNewWindow({
+    url: spec => spec.startsWith("about:certificate"),
+  });
   viewCertButton.click();
-
   let topWin = await newWinOpened;
-  let browser = topWin.gBrowser.selectedBrowser;
-
-  // We're racing against messages sent up from the content process that
-  // loads about:certificate. It may or may not have had the opportunity
-  // to tell the parent that it had loaded the page yet. If not, we wait
-  // for the page to load.
-  //
-  // Note that we can't use the URL parameter for
-  // BrowserTestUtils.waitForNewWindow, since we need to use a function
-  // to choose the right URL.
-  if (!browser.currentURI.spec.startsWith("about:certificate")) {
-    await BrowserTestUtils.browserLoaded(browser, false, spec =>
-      spec.startsWith("about:certificate")
-    );
-  }
-
-  let spec = browser.currentURI.spec;
+  let spec = topWin.gBrowser.selectedBrowser.currentURI.spec;
   checkSpec(spec);
 
   await BrowserTestUtils.closeWindow(topWin); // closes about:certificate