Backed out 9 changesets (bug 1596918) for causing mochitest permafail…

…ures in toolkit/content/tests/chrome/test_findbar_events.xhtml CLOSED TREE Backed out changeset 45a1c42118f2 (bug 1596918) Backed out changeset db09910ffa56 (bug 1596918) Backed out changeset 5c9d9f141c10 (bug 1596918) Backed out changeset 6a135670d603 (bug 1596918) Backed out changeset 3a0184e0df72 (bug 1596918) Backed out changeset 2f0036486823 (bug 1596918) Backed out changeset a770c6d08d52 (bug 1596918) Backed out changeset ef062eb7a6ee (bug 1596918) Backed out changeset a6ea596e98db (bug 1596918)
iaxat · Dec 11, 2019 · a53e458 · a53e458
1 parent 8036845
commit a53e458
Show file tree

Hide file tree

Showing 966 changed files with 4,486 additions and 5,495 deletions.
diff --git a/browser/base/content/test/about/browser_aboutCertError_clockSkew.js b/browser/base/content/test/about/browser_aboutCertError_clockSkew.js
@@ -28,7 +28,7 @@ add_task(async function checkWrongSystemTimeWarning() {
     info("Loading and waiting for the cert error");
     await certErrorLoaded;
 
-    return SpecialPowers.spawn(browser, [], async function() {
+    return ContentTask.spawn(browser, null, async function() {
       let doc = content.document;
       let div = doc.getElementById("errorShortDescText");
       let systemDateDiv = doc.getElementById("wrongSystemTime_systemDate1");

diff --git a/browser/base/content/test/about/browser_aboutCertError_exception.js b/browser/base/content/test/about/browser_aboutCertError_exception.js
@@ -16,7 +16,7 @@ add_task(async function checkExceptionDialogButton() {
   let browser = tab.linkedBrowser;
   let loaded = BrowserTestUtils.browserLoaded(browser, false, BAD_CERT);
   info("Clicking the exceptionDialogButton in advanced panel");
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     let doc = content.document;
     let exceptionButton = doc.getElementById("exceptionDialogButton");
     exceptionButton.click();
@@ -25,7 +25,7 @@ add_task(async function checkExceptionDialogButton() {
   info("Loading the url after adding exception");
   await loaded;
 
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     let doc = content.document;
     ok(
       !doc.documentURI.startsWith("about:certerror"),
@@ -52,9 +52,9 @@ add_task(async function checkPermanentExceptionPref() {
     let browser = tab.linkedBrowser;
     let loaded = BrowserTestUtils.browserLoaded(browser, false, BAD_CERT);
     info("Clicking the exceptionDialogButton in advanced panel");
-    let securityInfoAsString = await SpecialPowers.spawn(
+    let securityInfoAsString = await ContentTask.spawn(
       browser,
-      [],
+      null,
       async function() {
         let doc = content.document;
         let exceptionButton = doc.getElementById("exceptionDialogButton");
@@ -72,7 +72,7 @@ add_task(async function checkPermanentExceptionPref() {
     info("Loading the url after adding exception");
     await loaded;
 
-    await SpecialPowers.spawn(browser, [], async function() {
+    await ContentTask.spawn(browser, null, async function() {
       let doc = content.document;
       ok(
         !doc.documentURI.startsWith("about:certerror"),
@@ -116,7 +116,7 @@ add_task(async function checkBadStsCert() {
     let tab = await openErrorPage(BAD_STS_CERT, useFrame);
     let browser = tab.linkedBrowser;
 
-    await SpecialPowers.spawn(browser, [{ frame: useFrame }], async function({
+    await ContentTask.spawn(browser, { frame: useFrame }, async function({
       frame,
     }) {
       let doc = frame
@@ -129,9 +129,9 @@ add_task(async function checkBadStsCert() {
       );
     });
 
-    let message = await SpecialPowers.spawn(
+    let message = await ContentTask.spawn(
       browser,
-      [{ frame: useFrame }],
+      { frame: useFrame },
       async function({ frame }) {
         let doc = frame
           ? content.document.querySelector("iframe").contentDocument
@@ -172,7 +172,7 @@ add_task(async function checkhideAddExceptionButtonViaPref() {
     let tab = await openErrorPage(BAD_CERT, useFrame);
     let browser = tab.linkedBrowser;
 
-    await SpecialPowers.spawn(browser, [{ frame: useFrame }], async function({
+    await ContentTask.spawn(browser, { frame: useFrame }, async function({
       frame,
     }) {
       let doc = frame
@@ -199,7 +199,7 @@ add_task(async function checkhideAddExceptionButtonInFrames() {
   let tab = await openErrorPage(BAD_CERT, true);
   let browser = tab.linkedBrowser;
 
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     let doc = content.document.querySelector("iframe").contentDocument;
     let exceptionButton = doc.getElementById("exceptionDialogButton");
     ok(

diff --git a/browser/base/content/test/about/browser_aboutCertError_mitm.js b/browser/base/content/test/about/browser_aboutCertError_mitm.js
@@ -38,7 +38,7 @@ add_task(async function checkMitmPriming() {
   // The page will reload after the initial canary request, so we'll just
   // wait until we're seeing the dedicated MitM page.
   await TestUtils.waitForCondition(function() {
-    return SpecialPowers.spawn(browser, [], () => {
+    return ContentTask.spawn(browser, {}, () => {
       return (
         content.document.body.getAttribute("code") ==
         "MOZILLA_PKIX_ERROR_MITM_DETECTED"
@@ -54,7 +54,7 @@ add_task(async function checkMitmPriming() {
     "Stored the correct issuer"
   );
 
-  await SpecialPowers.spawn(browser, [], () => {
+  await ContentTask.spawn(browser, {}, () => {
     let mitmName1 = content.document.querySelector(
       "#errorShortDescText .mitm-name"
     );
@@ -113,7 +113,7 @@ add_task(async function checkMitmAutoEnableEnterpriseRoots() {
   // The page will reload after the initial canary request, so we'll just
   // wait until we're seeing the dedicated MitM page.
   await TestUtils.waitForCondition(function() {
-    return SpecialPowers.spawn(browser, [], () => {
+    return ContentTask.spawn(browser, {}, () => {
       return (
         content.document.body.getAttribute("code") ==
         "MOZILLA_PKIX_ERROR_MITM_DETECTED"

diff --git a/browser/base/content/test/about/browser_aboutCertError_noSubjectAltName.js b/browser/base/content/test/about/browser_aboutCertError_noSubjectAltName.js
@@ -57,9 +57,9 @@ add_task(async function checkUntrustedCertError() {
   let tab = await openErrorPage(UNKNOWN_ISSUER);
   let browser = tab.linkedBrowser;
   info("Clicking the exceptionDialogButton in advanced panel");
-  let badCertTechnicalInfoText = await SpecialPowers.spawn(
+  let badCertTechnicalInfoText = await ContentTask.spawn(
     browser,
-    [],
+    null,
     checkAdvancedAndGetTechnicalInfoText
   );
   checkCorrectMessages(badCertTechnicalInfoText, browser);

diff --git a/browser/base/content/test/about/browser_aboutHome_search_POST.js b/browser/base/content/test/about/browser_aboutHome_search_POST.js
@@ -41,7 +41,7 @@ add_task(async function() {
           Services.search.setDefault(engine),
         ]);
         let promise = BrowserTestUtils.browserLoaded(browser);
-        await SpecialPowers.spawn(browser, [{ needle }], async function(args) {
+        await ContentTask.spawn(browser, { needle }, async function(args) {
           let doc = content.document;
           let el = doc.querySelector(["#searchText", "#newtab-search-text"]);
           el.value = args.needle;
@@ -51,7 +51,7 @@ add_task(async function() {
         await promise;
 
         // When the search results load, check them for correctness.
-        await SpecialPowers.spawn(browser, [{ needle }], async function(args) {
+        await ContentTask.spawn(browser, { needle }, async function(args) {
           let loadedText = content.document.body.textContent;
           ok(loadedText, "search page loaded");
           is(

diff --git a/browser/base/content/test/about/browser_aboutHome_search_composing.js b/browser/base/content/test/about/browser_aboutHome_search_composing.js
@@ -36,7 +36,7 @@ add_task(async function() {
         );
       });
 
-      await SpecialPowers.spawn(browser, [], async function() {
+      await ContentTask.spawn(browser, null, async function() {
         // Start composition and type "x"
         let input = content.document.querySelector([
           "#searchText",
@@ -46,7 +46,7 @@ add_task(async function() {
       });
 
       info("Setting up the mutation observer before synthesizing composition");
-      let mutationPromise = SpecialPowers.spawn(browser, [], async function() {
+      let mutationPromise = ContentTask.spawn(browser, null, async function() {
         let searchController = content.wrappedJSObject.gContentSearchController;
 
         // Wait for the search suggestions to become visible.

diff --git a/browser/base/content/test/about/browser_aboutHome_search_suggestion.js b/browser/base/content/test/about/browser_aboutHome_search_suggestion.js
@@ -19,7 +19,7 @@ add_task(async function() {
         Services.search.setDefault(engine),
       ]);
 
-      await SpecialPowers.spawn(browser, [], async function() {
+      await ContentTask.spawn(browser, null, async function() {
         // Type an X in the search input.
         let input = content.document.querySelector([
           "#searchText",
@@ -30,7 +30,7 @@ add_task(async function() {
 
       await BrowserTestUtils.synthesizeKey("x", {}, browser);
 
-      await SpecialPowers.spawn(browser, [], async function() {
+      await ContentTask.spawn(browser, null, async function() {
         // Wait for the search suggestions to become visible.
         let table = content.document.getElementById("searchSuggestionTable");
         let input = content.document.querySelector([
@@ -57,7 +57,7 @@ add_task(async function() {
       await BrowserTestUtils.synthesizeKey("a", { accelKey: true }, browser);
       await BrowserTestUtils.synthesizeKey("VK_DELETE", {}, browser);
 
-      await SpecialPowers.spawn(browser, [], async function() {
+      await ContentTask.spawn(browser, null, async function() {
         let table = content.document.getElementById("searchSuggestionTable");
         await ContentTaskUtils.waitForCondition(
           () => table.hidden,

diff --git a/browser/base/content/test/about/browser_aboutHome_search_telemetry.js b/browser/base/content/test/about/browser_aboutHome_search_telemetry.js
@@ -24,9 +24,9 @@ add_task(async function() {
         Services.search.setDefault(engine),
       ]);
 
-      await SpecialPowers.spawn(
+      await ContentTask.spawn(
         browser,
-        [{ expectedName: engine.name }],
+        { expectedName: engine.name },
         async function(args) {
           let engineName =
             content.wrappedJSObject.gContentSearchController.defaultEngine.name;
@@ -65,7 +65,7 @@ add_task(async function() {
       );
 
       // Perform a search to increase the SEARCH_COUNT histogram.
-      await SpecialPowers.spawn(browser, [{ searchStr }], async function(args) {
+      await ContentTask.spawn(browser, { searchStr }, async function(args) {
         let doc = content.document;
         info("Perform a search.");
         let el = doc.querySelector(["#searchText", "#newtab-search-text"]);

diff --git a/browser/base/content/test/about/browser_aboutNetError.js b/browser/base/content/test/about/browser_aboutNetError.js
@@ -70,7 +70,7 @@ add_task(async function resetToDefaultConfig() {
     TLS12_PAGE
   );
 
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     const doc = content.document;
     ok(
       doc.documentURI.startsWith("about:neterror"),
@@ -124,7 +124,7 @@ add_task(async function checkLearnMoreLink() {
 
   const baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
 
-  await SpecialPowers.spawn(browser, [baseURL], function(_baseURL) {
+  await ContentTask.spawn(browser, baseURL, function(_baseURL) {
     const doc = content.document;
     ok(
       doc.documentURI.startsWith("about:neterror"),
@@ -176,7 +176,7 @@ add_task(async function checkEnable10() {
     TLS10_PAGE
   );
 
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     const doc = content.document;
     ok(
       doc.documentURI.startsWith("about:neterror"),
@@ -227,7 +227,7 @@ add_task(async function dontOffer10WhenAlreadyEnabled() {
   info("Loading and waiting for the net error");
   await pageLoaded;
 
-  await SpecialPowers.spawn(browser, [], async function() {
+  await ContentTask.spawn(browser, null, async function() {
     const doc = content.document;
     ok(
       doc.documentURI.startsWith("about:neterror"),

diff --git a/browser/base/content/test/about/browser_aboutSupport.js b/browser/base/content/test/about/browser_aboutSupport.js
@@ -7,9 +7,9 @@ add_task(async function() {
   await BrowserTestUtils.withNewTab(
     { gBrowser, url: "about:support" },
     async function(browser) {
-      let keyLocationServiceGoogleStatus = await SpecialPowers.spawn(
+      let keyLocationServiceGoogleStatus = await ContentTask.spawn(
         browser,
-        [],
+        null,
         async function() {
           let textBox = content.document.getElementById(
             "key-location-service-google-box"
@@ -26,9 +26,9 @@ add_task(async function() {
         "Google location service API key status shown"
       );
 
-      let keySafebrowsingGoogleStatus = await SpecialPowers.spawn(
+      let keySafebrowsingGoogleStatus = await ContentTask.spawn(
         browser,
-        [],
+        null,
         async function() {
           let textBox = content.document.getElementById(
             "key-safebrowsing-google-box"
@@ -45,9 +45,9 @@ add_task(async function() {
         "Google Safebrowsing API key status shown"
       );
 
-      let keyMozillaStatus = await SpecialPowers.spawn(
+      let keyMozillaStatus = await ContentTask.spawn(
         browser,
-        [],
+        null,
         async function() {
           let textBox = content.document.getElementById("key-mozilla-box");
           await ContentTaskUtils.waitForCondition(

diff --git a/browser/base/content/test/about/browser_bug435325.js b/browser/base/content/test/about/browser_bug435325.js
@@ -34,7 +34,7 @@ add_task(async function checkSwitchPageToOnlineMode() {
     );
 
     // Click on the 'Try again' button.
-    await SpecialPowers.spawn(browser, [], async function() {
+    await ContentTask.spawn(browser, null, async function() {
       ok(
         content.document.documentURI.startsWith("about:neterror?e=netOffline"),
         "Should be showing error page"

diff --git a/browser/base/content/test/about/browser_bug633691.js b/browser/base/content/test/about/browser_bug633691.js
@@ -7,7 +7,7 @@ add_task(async function test() {
   await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(
     browser
   ) {
-    let context = await SpecialPowers.spawn(browser, [], function() {
+    let context = await ContentTask.spawn(browser, null, function() {
       let iframe = content.document.querySelector("iframe");
       iframe.src = "https://expired.example.com/";
       return BrowsingContext.getFromWindow(iframe.contentWindow);

diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js
@@ -161,9 +161,6 @@ function promiseTabLoadEvent(tab, url) {
  * Wait for the search engine to change.
  */
 function promiseContentSearchChange(browser, newEngineName) {
-  // Callers of this depend on very specific, very racy timing, and fail
-  // if we introduce the trip through SpecialPowersParent that
-  // SpecialPowers.spawn requires.
   return ContentTask.spawn(browser, { newEngineName }, async function(args) {
     return new Promise(resolve => {
       content.addEventListener("ContentSearchService", function listener(

diff --git a/browser/base/content/test/alerts/browser_notification_replace.js b/browser/base/content/test/alerts/browser_notification_replace.js
@@ -12,7 +12,7 @@ add_task(async function test_notificationReplace() {
       url: notificationURL,
     },
     async function dummyTabTask(aBrowser) {
-      await SpecialPowers.spawn(aBrowser, [], async function() {
+      await ContentTask.spawn(aBrowser, {}, async function() {
         let win = content.window.wrappedJSObject;
         let notification = win.showNotification1();
         let promiseCloseEvent = ContentTaskUtils.waitForEvent(

diff --git a/browser/base/content/test/alerts/browser_notification_tab_switching.js b/browser/base/content/test/alerts/browser_notification_tab_switching.js
@@ -34,7 +34,7 @@ add_task(async function test_notificationPreventDefaultAndSwitchTabs() {
 
       // First, show a notification that will be have the tab-switching prevented.
       function promiseNotificationEvent(evt) {
-        return SpecialPowers.spawn(aBrowser, [evt], async function(contentEvt) {
+        return ContentTask.spawn(aBrowser, evt, async function(contentEvt) {
           return new Promise(resolve => {
             let contentNotification = content.wrappedJSObject._notification;
             contentNotification.addEventListener(

diff --git a/browser/base/content/test/alerts/head.js b/browser/base/content/test/alerts/head.js
@@ -33,7 +33,7 @@ function promiseWindowClosed(window) {
  */
 function openNotification(aBrowser, fn, timeout) {
   info(`openNotification: ${fn}`);
-  return SpecialPowers.spawn(aBrowser, [[fn, timeout]], async function([
+  return ContentTask.spawn(aBrowser, [fn, timeout], async function([
     contentFn,
     contentTimeout,
   ]) {
@@ -60,7 +60,7 @@ function openNotification(aBrowser, fn, timeout) {
 }
 
 function closeNotification(aBrowser) {
-  return SpecialPowers.spawn(aBrowser, [], function() {
+  return ContentTask.spawn(aBrowser, null, function() {
     content.wrappedJSObject._notification.close();
   });
 }
diff --git a/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js b/browser/base/content/test/captivePortal/browser_captivePortal_certErrorUI.js
@@ -55,7 +55,7 @@ add_task(async function checkCaptivePortalCertErrorUI() {
     CANONICAL_URL
   );
 
-  await SpecialPowers.spawn(browser, [], () => {
+  await ContentTask.spawn(browser, null, () => {
     let doc = content.document;
     ok(
       doc.body.classList.contains("captiveportal"),
@@ -84,7 +84,7 @@ add_task(async function checkCaptivePortalCertErrorUI() {
   // Passing an empty function to BrowserTestUtils.switchTab lets us wait for an arbitrary
   // tab switch.
   portalTabPromise = BrowserTestUtils.switchTab(gBrowser, () => {});
-  await SpecialPowers.spawn(browser, [], () => {
+  await ContentTask.spawn(browser, null, () => {
     info("Clicking the Open Login Page button.");
     content.document.getElementById("openPortalLoginPageButton").click();
   });
@@ -102,7 +102,7 @@ add_task(async function checkCaptivePortalCertErrorUI() {
     "Waiting for error tab to be reloaded after the captive portal was freed."
   );
   await errorTabReloaded;
-  await SpecialPowers.spawn(browser, [], () => {
+  await ContentTask.spawn(browser, null, () => {
     let doc = content.document;
     ok(
       !doc.body.classList.contains("captiveportal"),