Bug 1596918: Part 4e - Fix callers which rely on frame message manager globals. r=mccr8

Differential Revision: https://phabricator.services.mozilla.com/D53746 --HG-- extra : moz-landing-system : lando
2019-12-07 18:44:35 +00:00 · 2019-12-07 18:44:35 +00:00 · 63b8ddb1c0
--- a/browser/base/content/test/permissions/head.js
+++ b/browser/base/content/test/permissions/head.js
@ -2,3 +2,8 @@ ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
 const { PermissionTestUtils } = ChromeUtils.import(
  "resource://testing-common/PermissionTestUtils.jsm"
 );
+
+SpecialPowers.addTaskImport(
+  "E10SUtils",
+  "resource://gre/modules/E10SUtils.jsm"
+);
--- a/browser/components/sessionstore/test/browser_500328.js
+++ b/browser/components/sessionstore/test/browser_500328.js
@ -18,7 +18,7 @@ async function checkState(browser) {

  // Now go back.  This should trigger the popstate event handler.
  let popstatePromise = SpecialPowers.spawn(browser, [], async () => {
-    let event = await ContentTaskUtils.waitForEvent(this, "popstate", true);
+    let event = await ContentTaskUtils.waitForEvent(content, "popstate", true);
    ok(event.state, "Event should have a state property.");

    is(content.testState, "foo", "testState after going back");
@ -47,7 +47,7 @@ async function checkState(browser) {
  await popstatePromise;

  popstatePromise = SpecialPowers.spawn(browser, [], async () => {
-    let event = await ContentTaskUtils.waitForEvent(this, "popstate", true);
+    let event = await ContentTaskUtils.waitForEvent(content, "popstate", true);

    // When content fires a PopStateEvent and we observe it from a chrome event
    // listener (as we do here, and, thankfully, nowhere else in the tree), the
--- a/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js
+++ b/browser/extensions/pdfjs/test/browser_pdfjs_navigation.js
@ -237,7 +237,7 @@ async function contentSetUp() {

      var select = document.querySelector("select#scaleSelect");
      select.selectedIndex = 2;
-      select.dispatchEvent(new Event("change"));
+      select.dispatchEvent(new content.Event("change"));
    });
  }

@ -305,7 +305,7 @@ async function runTests(browser) {
        );
        el.dispatchEvent(ev);
      } else {
-        ev = new Event(test.action.event);
+        ev = new content.Event(test.action.event);
      }
      el.dispatchEvent(ev);

--- a/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js
+++ b/browser/extensions/pdfjs/test/browser_pdfjs_zoom.js
@ -139,7 +139,7 @@ add_task(async function test() {
            }

            // Dispatch the event for changing the zoom
-            ev = new Event(subTest.action.event);
+            ev = new content.Event(subTest.action.event);
          } else {
            // We zoom using keyboard
            // Simulate key press
--- a/devtools/server/tests/browser/browser_inspector-remove.js
+++ b/devtools/server/tests/browser/browser_inspector-remove.js
@ -17,7 +17,10 @@ add_task(async function testRemoveSubtree() {
  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], function() {
    function ignoreNode(node) {
      // Duplicate the walker logic to skip blank nodes...
-      return node.nodeType === Node.TEXT_NODE && !/[^\s]/.test(node.nodeValue);
+      return (
+        node.nodeType === content.Node.TEXT_NODE &&
+        !/[^\s]/.test(node.nodeValue)
+      );
    }

    let nextSibling = content.document.querySelector("#longlist").nextSibling;
--- a/devtools/shared/webconsole/test/browser/browser_commands_registration.js
+++ b/devtools/shared/webconsole/test/browser/browser_commands_registration.js
@ -12,7 +12,7 @@ add_task(async function() {
  const webConsoleFront = target.activeConsole;

  // Fetch WebConsoleCommands so that it is available for next Content Tasks
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    const { require } = ChromeUtils.import(
      "resource://devtools/shared/Loader.jsm"
    );
@ -37,7 +37,7 @@ async function evaluateJSAndCheckResult(webConsoleFront, input, expected) {
 }

 async function registerNewCommand(webConsoleFront) {
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.register("setFoo", (owner, value) => {
      owner.window.foo = value;
      return "ok";
@ -55,13 +55,13 @@ async function registerNewCommand(webConsoleFront) {
    result: "ok",
  });

-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    is(content.top.foo, "bar", "top.foo should equal to 'bar'");
  });
 }

 async function wrapCommand(webConsoleFront) {
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    const origKeys = this.WebConsoleCommands.getCommand("keys");

    const newKeys = (...args) => {
@ -97,7 +97,7 @@ async function wrapCommand(webConsoleFront) {
    },
  });

-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.register("keys", this.origKeys);
    is(
      this.WebConsoleCommands.getCommand("keys"),
@ -109,7 +109,7 @@ async function wrapCommand(webConsoleFront) {
 }

 async function unregisterCommand(webConsoleFront) {
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.unregister("setFoo");
  });

@ -123,7 +123,7 @@ async function unregisterCommand(webConsoleFront) {
 }

 async function registerAccessor(webConsoleFront) {
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.register("$foo", {
      get(owner) {
        const foo = owner.window.document.getElementById("quack");
@ -138,7 +138,7 @@ async function registerAccessor(webConsoleFront) {
    result: ">o_/",
  });

-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    is(
      content.document.getElementById("quack").textContent,
      ">o_/",
@ -153,7 +153,7 @@ async function registerAccessor(webConsoleFront) {
 }

 async function unregisterAfterOverridingTwice(webConsoleFront) {
-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.register("keys", (owner, obj) => "command 1");
  });

@ -162,7 +162,7 @@ async function unregisterAfterOverridingTwice(webConsoleFront) {
    result: "command 1",
  });

-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    const orig = this.WebConsoleCommands.getCommand("keys");
    this.WebConsoleCommands.register("keys", (owner, obj) => {
      if (obj === "quack") {
@ -180,7 +180,7 @@ async function unregisterAfterOverridingTwice(webConsoleFront) {
    result: "bang!",
  });

-  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async function() {
+  await ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
    this.WebConsoleCommands.unregister("keys");
  });

--- a/dom/base/test/chrome/test_chromeOuterWindowID.xhtml
+++ b/dom/base/test/chrome/test_chromeOuterWindowID.xhtml
@ -21,7 +21,7 @@ windows.
  <script type="application/javascript"><![CDATA[
  SimpleTest.waitForExplicitFinish();
  const {BrowserTestUtils} = ChromeUtils.import("resource://testing-common/BrowserTestUtils.jsm");
-  ;
+  const {ContentTask} = ChromeUtils.import("resource://testing-common/ContentTask.jsm");

  const BROWSER_DOC = "window_chromeOuterWindowID.xhtml";
  const TEST_PAGE = "http://example.com";
--- a/dom/indexedDB/test/browser_private_idb.js
+++ b/dom/indexedDB/test/browser_private_idb.js
@ -1,11 +1,13 @@
 async function idbCheckFunc() {
-  let factory;
+  let factory, console;
  try {
    // in a worker, this resolves directly.
    factory = indexedDB;
+    console = self.console;
  } catch (ex) {
    // in a frame-script, we need to pierce "content"
    factory = content.indexedDB;
+    console = content.console;
  }
  try {
    console.log("opening db");
@ -75,6 +77,7 @@ const workerScriptBlob = new Blob([workerScript]);
 * idbCheckFunc and return the result to us.
 */
 async function workerCheckDeployer({ srcBlob, workerType }) {
+  const { console } = content;
  let worker, port;
  const url = content.URL.createObjectURL(srcBlob);
  if (workerType === "dedicated") {
--- a/layout/base/tests/browser_bug839103.js
+++ b/layout/base/tests/browser_bug839103.js
@ -40,7 +40,7 @@ async function testBody(testRoot) {
  link.setAttribute("href", testRoot + gStyleSheet);

  let stateChanged = ContentTaskUtils.waitForEvent(
-    this,
+    docShell.chromeEventHandler,
    "StyleSheetApplicableStateChanged",
    true
  );
@ -59,7 +59,7 @@ async function testBody(testRoot) {
  is(evt.applicable, true, "evt.applicable has the right value");

  stateChanged = ContentTaskUtils.waitForEvent(
-    this,
+    docShell.chromeEventHandler,
    "StyleSheetApplicableStateChanged",
    true
  );
--- a/toolkit/components/narrate/test/head.js
+++ b/toolkit/components/narrate/test/head.js
@ -64,19 +64,17 @@ function spawnInNewReaderTab(url, func) {
  return BrowserTestUtils.withNewTab(
    { gBrowser, url: `about:reader?url=${encodeURIComponent(url)}` },
    async function(browser) {
+      // This imports the test utils for all tests, so we'll declare it as
+      // a global here which will make it ESLint happy.
+      /* global NarrateTestUtils */
+      SpecialPowers.addTaskImport(
+        "NarrateTestUtils",
+        "chrome://mochitests/content/browser/" +
+          "toolkit/components/narrate/test/NarrateTestUtils.jsm"
+      );
      await SpecialPowers.spawn(browser, [], async function() {
-        // This imports the test utils for all tests, so we'll declare it as
-        // a global here which will make it ESLint happy.
-        /* global NarrateTestUtils */
-        ChromeUtils.import(
-          "chrome://mochitests/content/browser/" +
-            "toolkit/components/narrate/test/NarrateTestUtils.jsm",
-          Cu.getGlobalForObject({})
-        );
-
        await NarrateTestUtils.getReaderReadyPromise(content);
      });
-
      await SpecialPowers.spawn(browser, [], func);
    }
  );
--- a/toolkit/components/pictureinpicture/tests/browser_removeVideoElement.js
+++ b/toolkit/components/pictureinpicture/tests/browser_removeVideoElement.js
@ -60,7 +60,7 @@ add_task(async () => {
          let video = doc.querySelector(`#${videoID}`);

          let promise = ContentTaskUtils.waitForEvent(
-            this,
+            docShell.chromeEventHandler,
            "MozStopPictureInPicture",
            { capture: true }
          );
--- a/toolkit/content/tests/browser/browser_autoplay_policy_touchScroll.js
+++ b/toolkit/content/tests/browser/browser_autoplay_policy_touchScroll.js
@ -29,7 +29,7 @@ async function callMediaPlay(shouldStartPlaying) {
      audio.isPlayStarted = true;
      resolve();
    });
-    setTimeout(() => {
+    content.setTimeout(() => {
      if (audio.isPlayStarted) {
        return;
      }
--- a/toolkit/content/tests/browser/browser_autoplay_policy_user_gestures.js
+++ b/toolkit/content/tests/browser/browser_autoplay_policy_user_gestures.js
@ -210,7 +210,7 @@ function resumeWithoutExpectedSuccess() {
  let promise = ac.resume();
  ac.resumePromises.push(promise);
  return new Promise((resolve, reject) => {
-    setTimeout(() => {
+    content.setTimeout(() => {
      if (ac.state == "suspended") {
        ok(true, "audio context is still suspended");
        resolve();
--- a/toolkit/content/tests/browser/browser_autoplay_policy_web_audio_with_gum.js
+++ b/toolkit/content/tests/browser/browser_autoplay_policy_web_audio_with_gum.js
@ -91,7 +91,7 @@ function resumeWithoutExpectedSuccess() {
  let promise = ac.resume();
  ac.resumePromises.push(promise);
  return new Promise((resolve, reject) => {
-    setTimeout(() => {
+    content.setTimeout(() => {
      if (ac.state == "suspended") {
        ok(true, "audio context is still suspended");
        resolve();
--- a/toolkit/content/tests/browser/browser_crash_previous_frameloader.js
+++ b/toolkit/content/tests/browser/browser_crash_previous_frameloader.js
@ -87,10 +87,9 @@ add_task(async function test_crash_in_previous_frameloader() {
        const { ctypes } = ChromeUtils.import(
          "resource://gre/modules/ctypes.jsm"
        );
-        ChromeUtils.import("resource://gre/modules/Timer.jsm");

        let dies = function() {
-          privateNoteIntentionalCrash();
+          ChromeUtils.privateNoteIntentionalCrash();
          let zero = new ctypes.intptr_t(8);
          let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
          badptr.contents;
--- a/toolkit/content/tests/browser/browser_delay_autoplay_multipleMedia.js
+++ b/toolkit/content/tests/browser/browser_delay_autoplay_multipleMedia.js
@ -18,7 +18,7 @@ function check_autoplay_audio_onplay() {
    autoPlay.pause();
    autoPlay.play();

-    setTimeout(() => {
+    content.setTimeout(() => {
      ok(true, "Doesn't receive play event when media was blocked.");
      autoPlay.onplay = null;
      resolve();
--- a/toolkit/content/tests/browser/browser_delay_autoplay_notInTreeAudio.js
+++ b/toolkit/content/tests/browser/browser_delay_autoplay_notInTreeAudio.js
@ -20,7 +20,7 @@ function play_not_in_tree_audio() {
  content.document.body.removeChild(audio);

  // Add timeout to ensure the audio is removed from DOM tree.
-  setTimeout(function() {
+  content.setTimeout(function() {
    info("Prepare to start playing audio.");
    audio.play();
  }, 1000);
--- a/toolkit/modules/tests/browser/browser_BrowserUtils.js
+++ b/toolkit/modules/tests/browser/browser_BrowserUtils.js
@ -12,6 +12,9 @@ add_task(async function test_getSelectionDetails_input() {
  await BrowserTestUtils.withNewTab({ gBrowser, url }, async browser => {
    await SpecialPowers.spawn(browser, [], () => {
      function checkSelection({ id, text, linkURL }) {
+        const { BrowserUtils } = ChromeUtils.import(
+          "resource://gre/modules/BrowserUtils.jsm"
+        );
        content.document.getElementById(id).select();
        // It seems that when running as a test, the previous line will set
        // the both the window's selection and the input's selection to contain