Bug 1596918: Part 4g - Misc cleanup/fixes. r=mccr8

Differential Revision: https://phabricator.services.mozilla.com/D53748

--HG--
extra : moz-landing-system : lando

Author: kmaglione

browser/base/content/test/tabs/browser_tabSpinnerProbe.js

@@ -32,7 +32,7 @@ function sum(aArray) {
  *        Resolves once the hang is done.
  */
 function hangContentProcess(browser, aMs) {
-  return SpecialPowers.spawn(browser, [aMs], async function(ms) {
+  return ContentTask.spawn(browser, aMs, function(ms) {
     let then = Date.now();
     while (Date.now() - then < ms) {
       // Let's burn some CPU...

browser/components/extensions/test/browser/browser_ext_url_overrides_newtab.js

@@ -643,7 +643,7 @@ add_task(async function dontTemporarilyShowAboutExtensionPath() {
 
   gBrowser.removeProgressListener(wpl);
   is(gURLBar.value, "", "URL bar value should be empty.");
-  SpecialPowers.spawn(tab.linkedBrowser, [], function() {
+  await SpecialPowers.spawn(tab.linkedBrowser, [], function() {
     is(
       content.document.body.textContent,
       "New tab!",

browser/components/urlbar/tests/browser/browser_urlbar_blanking.js

@@ -34,12 +34,12 @@ add_task(async function() {
   );
   // When reloading, the javascript: uri we're using will throw an exception.
   // That's deliberate, so we need to tell mochitest to ignore it:
-  SimpleTest.expectUncaughtException(true);
   await SpecialPowers.spawn(tab.linkedBrowser, [], async function() {
     // This is sync, so by the time we return we should have changed the URL bar.
     content.location.reload();
+  }).catch(e => {
+    // Ignore expected exception.
   });
   ok(!!gURLBar.value, "URL bar should not be blank.");
   BrowserTestUtils.removeTab(tab);
-  SimpleTest.expectUncaughtException(false);
 });

browser/extensions/formautofill/test/browser/head.js

@@ -178,9 +178,9 @@ async function sleep(ms = 500) {
 async function focusAndWaitForFieldsIdentified(browser, selector) {
   info("expecting the target input being focused and identified");
   /* eslint no-shadow: ["error", { "allow": ["selector", "previouslyFocused", "previouslyIdentified"] }] */
-  const { previouslyFocused, previouslyIdentified } = await SpecialPowers.spawn(
+  const { previouslyFocused, previouslyIdentified } = await ContentTask.spawn(
     browser,
-    [{ selector }],
+    { selector },
     async function({ selector }) {
       const { FormLikeFactory } = ChromeUtils.import(
         "resource://gre/modules/FormLikeFactory.jsm"

browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm

@@ -154,24 +154,17 @@ async function clickOn(selector, beforeContentFn) {
     URL
   );
 
+  let { SpecialPowers } = lastTab.ownerGlobal;
   if (beforeContentFn) {
-    await lastTab.linkedBrowser.ownerGlobal.SpecialPowers.spawn(
-      lastTab.linkedBrowser,
-      [],
-      beforeContentFn
-    );
+    await SpecialPowers.spawn(lastTab.linkedBrowser, [], beforeContentFn);
   }
 
-  await lastTab.linkedBrowser.ownerGlobal.SpecialPowers.spawn(
-    lastTab.linkedBrowser,
-    [selector],
-    async function(arg) {
-      E10SUtils.wrapHandlingUserInput(content, true, function() {
-        let element = content.document.querySelector(arg);
-        element.click();
-      });
-    }
-  );
+  await SpecialPowers.spawn(lastTab.linkedBrowser, [selector], arg => {
+    E10SUtils.wrapHandlingUserInput(content, true, function() {
+      let element = content.document.querySelector(arg);
+      element.click();
+    });
+  });
 
   // Wait for the popup to actually be shown before making the screenshot
   await BrowserTestUtils.waitForEvent(

devtools/client/jsonview/test/head.js

@@ -80,7 +80,7 @@ async function addJsonViewTab(
   await Promise.race([
     error,
     // eslint-disable-next-line no-shadow
-    SpecialPowers.spawn(browser, [data], async function(data) {
+    ContentTask.spawn(browser, data, async function(data) {
       // Check if there is a JSONView object.
       const { JSONView } = content.wrappedJSObject;
       if (!JSONView) {

devtools/client/netmonitor/test/head.js

@@ -984,7 +984,7 @@ async function selectIndexAndWaitForSourceEditor(monitor, index) {
  */
 async function performRequests(monitor, tab, count) {
   const wait = waitForNetworkEvents(monitor, count);
-  await SpecialPowers.spawn(tab.linkedBrowser, [count], requestCount => {
+  await ContentTask.spawn(tab.linkedBrowser, count, requestCount => {
     content.wrappedJSObject.performRequests(requestCount);
   });
   await wait;

devtools/client/styleeditor/test/head.js

@@ -70,7 +70,7 @@ var reloadPageAndWaitForStyleSheets = async function(ui) {
 
   const onReset = ui.once("stylesheets-reset");
   const browser = gBrowser.selectedBrowser;
-  await SpecialPowers.spawn(browser, [], "() => content.location.reload()");
+  await SpecialPowers.spawn(browser, [], () => content.location.reload());
   await onReset;
 };
 

devtools/client/webconsole/test/browser/browser_webconsole_stubs_page_error.js

@@ -75,9 +75,9 @@ async function generatePageErrorStubs() {
       expectUncaughtException();
     }
 
-    await SpecialPowers.spawn(gBrowser.selectedBrowser, [code], function(
-      subCode
-    ) {
+    // Note: This needs to use ContentTask rather than SpecialPowers.spawn
+    // because the latter includes cross-process stack information.
+    await ContentTask.spawn(gBrowser.selectedBrowser, code, function(subCode) {
       const script = content.document.createElement("script");
       script.append(content.document.createTextNode(subCode));
       content.document.body.append(script);

dom/base/test/browser_inputStream_structuredClone.js

@@ -27,8 +27,10 @@ async function runTest(input, url) {
     "The length of the inputStream matches: " + input.length
   );
 
+  // FIXME: SpecialPowers.spawn currently crashes when trying to return
+  // values containing input streams.
   /* eslint-disable no-shadow */
-  let dataBack = await SpecialPowers.spawn(browser, [data], function(data) {
+  let dataBack = await ContentTask.spawn(browser, data, function(data) {
     let dataBack = {
       inputStream: data.inputStream,
       check: true,

dom/ipc/tests/browser_cancel_content_js.js

@@ -25,15 +25,13 @@ async function test_navigation(nextPage, cancelContentJSPref, shouldCancel) {
     opening: TEST_PAGE,
   });
 
-  const loopEnded = SpecialPowers.spawn(
-    tab.linkedBrowser,
-    [],
-    async function() {
-      return new Promise(resolve => {
-        content.window.addEventListener("LongLoopEnded", resolve);
+  const loopEnded = ContentTask.spawn(tab.linkedBrowser, [], async function() {
+    await new Promise(resolve => {
+      content.addEventListener("LongLoopEnded", resolve, {
+        once: true,
       });
-    }
-  );
+    });
+  });
 
   // Wait for the test page's long-running JS loop to start; it happens ~500ms
   // after load.

security/sandbox/test/browser_content_sandbox_fs.js

@@ -617,9 +617,9 @@ async function testFileAccess() {
       ok(test.file.exists(), `${test.file.path} exists`);
     }
 
-    let result = await SpecialPowers.spawn(
+    let result = await ContentTask.spawn(
       test.browser,
-      [test.file.path],
+      test.file.path,
       test.func
     );
 

toolkit/components/extensions/ExtensionXPCShellUtils.jsm

@@ -278,11 +278,7 @@ class ContentPage {
   }
 
   spawn(params, task) {
-    return this.browser.ownerGlobal.SpecialPowers.spawn(
-      this.browser,
-      [params],
-      task
-    );
+    return ContentTask.spawn(this.browser, params, task);
   }
 
   async close() {

toolkit/content/tests/browser/browser_datetime_datepicker.js

@@ -337,18 +337,17 @@ add_task(async function test_datepicker_clicked() {
     `data:text/html, <input type="date" value="${inputValue}">`
   );
   // Click the first item (top-left corner) of the calendar
+  let promise = BrowserTestUtils.waitForContentEvent(
+    helper.tab.linkedBrowser,
+    "input"
+  );
   helper.click(helper.getElement(DAYS_VIEW).children[0]);
-  await SpecialPowers.spawn(helper.tab.linkedBrowser, [], async function() {
-    let inputEl = content.document.querySelector("input");
-    await ContentTaskUtils.waitForEvent(inputEl, "input");
-  });
+  await promise;
 
   let value = await SpecialPowers.spawn(
-    gBrowser.selectedBrowser,
+    helper.tab.linkedBrowser,
     [],
-    async () => {
-      return content.document.querySelector("input").value;
-    }
+    () => content.document.querySelector("input").value
   );
   Assert.equal(value, firstDayOnCalendar);
 

toolkit/content/tests/chrome/bug263683_window.xhtml

@@ -19,8 +19,6 @@
   <script type="application/javascript"><![CDATA[
     const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
     const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    ;
-    ContentTask.setTestScope(window.arguments[0]);
 
     var gPrefsvc = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
     var gFindBar = null;

toolkit/content/tests/chrome/bug331215_window.xhtml

@@ -18,8 +18,6 @@
 
   <script type="application/javascript"><![CDATA[
     const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    ;
-    ContentTask.setTestScope(window.arguments[0]);
 
     var gFindBar = null;
     var gBrowser;

toolkit/content/tests/chrome/bug451540_window.xhtml

@@ -15,8 +15,6 @@
 
   <script type="application/javascript"><![CDATA[
     const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    ;
-    ContentTask.setTestScope(window.arguments[0]);
     const SEARCH_TEXT = "minefield";
 
     let gFindBar = null;

toolkit/content/tests/chrome/findbar_events_window.xhtml

@@ -18,8 +18,6 @@
 
   <script type="application/javascript"><![CDATA[
     const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    ;
-    ContentTask.setTestScope(window.arguments[0]);
 
     var gFindBar = null;
     var gBrowser;
@@ -47,8 +45,9 @@
       info("Starting test with browser '" + browserId + "'");
       gBrowser = document.getElementById(browserId);
       gFindBar.browser = gBrowser;
-      let promise = BrowserTestUtils.browserLoaded(gBrowser);
-      BrowserTestUtils.loadURI(gBrowser, "data:text/html,hello there");
+      const url = "data:text/html,hello there";
+      let promise = BrowserTestUtils.browserLoaded(gBrowser, false, url);
+      BrowserTestUtils.loadURI(gBrowser, url);
       await promise;
       await onDocumentLoaded();
     }

toolkit/content/tests/chrome/findbar_window.xhtml

@@ -21,8 +21,6 @@
   <script type="application/javascript"><![CDATA[
     const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
     const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-    ;
-    ContentTask.setTestScope(window.arguments[0]);
 
     var gPrefsvc = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
 

widget/tests/browser/browser_test_clipboardcache.js

@@ -78,13 +78,9 @@ async function testCopyPaste(isPrivate) {
   let browser = tab.linkedBrowser;
 
   // Sanitize environment
-  await SpecialPowers.spawn(
-    browser,
-    [SHORT_STRING_NO_CACHE],
-    async shortStr => {
-      await content.navigator.clipboard.writeText(shortStr);
-    }
-  );
+  await ContentTask.spawn(browser, SHORT_STRING_NO_CACHE, async shortStr => {
+    await content.navigator.clipboard.writeText(shortStr);
+  });
 
   let initialFdCount = getClipboardCacheFDCount();