Bug 1765156 - Part 4: Use SpecialPowers.ChromeUtils.import in editor/. r=kmag

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

editor/libeditor/crashtests/1444630.html

@@ -7,8 +7,10 @@ function load()
   let textarea = document.getElementById("editor");
   textarea.focus();
 
-  SpecialPowers.Cu.import("resource://reftest/AsyncSpellCheckTestHelper.jsm")
-  .maybeOnSpellCheck(textarea, () => {
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://reftest/AsyncSpellCheckTestHelper.jsm"
+  );
+  maybeOnSpellCheck(textarea, () => {
     let isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
     let sc = isc.spellChecker;
 

editor/libeditor/tests/test_textarea_value_not_include_cr.html

@@ -72,10 +72,12 @@ SimpleTest.waitForFocus(async () => {
     let inlineSpellchecker = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(true);
     textarea.value = "abx ";
     await new Promise(resolve => {
-      SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-        .onSpellCheck(textarea, () => {
-            SimpleTest.executeSoon(resolve);
-        });
+      const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+        "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+      );
+      onSpellCheck(textarea, () => {
+        SimpleTest.executeSoon(resolve);
+      });
     });
     let anonymousDivElement = SpecialPowers.wrap(textarea).editor.rootElement;
     let misspelledWord = inlineSpellchecker.getMisspelledWord(anonymousDivElement.firstChild, 0);

editor/libeditor/tests/test_undo_after_spellchecker_replaces_word.html

@@ -93,9 +93,10 @@ SimpleTest.waitForFocus(async () => {
         return aElement === textarea ? aElement.value : aElement.innerHTML;
       }
 
-      SpecialPowers.Cu.import(
-        "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-      .maybeOnSpellCheck(aElement, () => {
+      const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+        "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+      );
+      maybeOnSpellCheck(aElement, () => {
         SimpleTest.executeSoon(() => {
           aElement.addEventListener("beforeinput", onBeforeInput);
           aElement.addEventListener("input", onInput);

editor/spellchecker/tests/test_async_UpdateCurrentDictionary.html

@@ -24,9 +24,10 @@ function start() {
   var textarea = document.getElementById("editor");
   textarea.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(textarea, function() {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  )
+  onSpellCheck(textarea, function() {
     var isc = SpecialPowers.wrap(textarea).editor.getInlineSpellChecker(false);
     ok(isc, "Inline spell checker should exist after focus and spell check");
     var sc = isc.spellChecker;

editor/spellchecker/tests/test_bug1100966.html

@@ -23,7 +23,9 @@ fivee sixx<br>
 
 <script class="testbody" type="application/javascript">
 
-let {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 /** Test for Bug 1100966 **/
 SimpleTest.waitForExplicitFinish();

editor/spellchecker/tests/test_bug1154791.html

@@ -22,7 +22,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1154791
 
 <script class="testbody" type="application/javascript">
 
-let {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 /** Test for Bug 1154791 **/
 SimpleTest.waitForExplicitFinish();

editor/spellchecker/tests/test_bug1200533.html

@@ -106,9 +106,10 @@ function continueTest(evt) {
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
   const is_en_US = SpecialPowers.Services.locale.appLocaleAsBCP47 == "en-US";
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(elem, async function() {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(elem, async function() {
     var spellchecker = inlineSpellChecker.spellChecker;
     let currentDictionaries;
     try {

editor/spellchecker/tests/test_bug1204147.html

@@ -69,9 +69,10 @@ var loadListener = async function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(elem, async function() {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(elem, async function() {
     let spellchecker = inlineSpellChecker.spellChecker;
     let currentDictionaries = spellchecker.getCurrentDictionaries();
     is(currentDictionaries.length, 1, "expected one dictionary");

editor/spellchecker/tests/test_bug1205983.html

@@ -28,9 +28,9 @@ var editor_de;
 var selcon_de;
 var script;
 
-var maybeOnSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm").maybeOnSpellCheck;
+var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 /** Test for Bug 1205983 **/
 SimpleTest.waitForExplicitFinish();

editor/spellchecker/tests/test_bug1209414.html

@@ -36,8 +36,9 @@ var script;
  * user behaviour.
  */
 
-let {maybeOnSpellCheck, onSpellCheck} = SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
+let { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(async function() {

editor/spellchecker/tests/test_bug1219928.html

@@ -29,9 +29,9 @@ var spellchecker;
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(function() {
-  var maybeOnSpellCheck =
-    SpecialPowers.Cu.import(
-      "resource://testing-common/AsyncSpellCheckTestHelper.jsm", {}).maybeOnSpellCheck;
+  var { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
 
   var elem = document.getElementById("en-US");
   elem.focus();

editor/spellchecker/tests/test_bug1365383.html

@@ -29,9 +29,10 @@ SimpleTest.waitForFocus(() => {
 
   textarea.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(textarea, () => {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(textarea, () => {
     // Callback parameter isn't set
     spellChecker.UpdateCurrentDictionary();
 

editor/spellchecker/tests/test_bug1368544.html

@@ -30,9 +30,10 @@ SimpleTest.waitForFocus(() => {
 
   textarea.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(textarea, () => {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(textarea, () => {
     spellChecker.UpdateCurrentDictionary(() => {
       textarea.value = "ABC";
       ok(editor.rootElement.hasChildNodes(),

editor/spellchecker/tests/test_bug1402822.html

@@ -21,7 +21,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1402822
 
 const Ci = SpecialPowers.Ci;
 
-let {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 function getMisspelledWords(editor) {
   return editor.selectionController.getSelection(Ci.nsISelectionController.SELECTION_SPELLCHECK).toString();

editor/spellchecker/tests/test_bug1418629.html

@@ -19,7 +19,9 @@
 <div id="edit1" contenteditable=true></div>
 
 <script>
-const {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 SimpleTest.waitForExplicitFinish();
 

editor/spellchecker/tests/test_bug1497480.html

@@ -23,8 +23,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1497480
 
 /** Test for Bug 1497480 **/
 let gMisspeltWords = [];
-let maybeOnSpellCheck = SpecialPowers.Cu.import(
-  "resource://testing-common/AsyncSpellCheckTestHelper.jsm", null).maybeOnSpellCheck;
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 const template = document.createElement("template");
 template.innerHTML = `<div id="target" contenteditable>Test</div>`;

editor/spellchecker/tests/test_bug1602526.html

@@ -17,7 +17,9 @@
 <div id="contenteditable" contenteditable=true>kkkk&#xf6;kkkk</div>
 
 <script>
-const {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 SimpleTest.waitForExplicitFinish();
 

editor/spellchecker/tests/test_bug1761273.html

@@ -21,7 +21,12 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1761273
 
 const Ci = SpecialPowers.Ci;
 
-let {getDictionaryContentPref, onSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let {
+  getDictionaryContentPref,
+  onSpellCheck,
+} = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 /** Test for Bug 1402822 **/
 SimpleTest.waitForExplicitFinish();

editor/spellchecker/tests/test_bug338427.html

@@ -20,10 +20,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=338427
 
 /** Test for Bug 338427 **/
 function init() {
-    var onSpellCheck =
-      SpecialPowers.Cu.import(
-        "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-                   .onSpellCheck;
+    var { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+      "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+    );
     var textarea = document.getElementById("editor");
     var editor = SpecialPowers.wrap(textarea).editor;
     var spellchecker = editor.getInlineSpellChecker(true);

editor/spellchecker/tests/test_bug366682.html

@@ -45,9 +45,10 @@ function runTest() {
   editDoc().designMode = "on";
   editDoc().defaultView.focus();
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-               .maybeOnSpellCheck(editDoc().documentElement, evalTest);
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  maybeOnSpellCheck(editDoc().documentElement, evalTest);
 }
 
 function evalTest() {

editor/spellchecker/tests/test_bug432225.html

@@ -21,7 +21,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=432225
 
 /** Test for Bug 432225 **/
 
-let {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(runTest);

editor/spellchecker/tests/test_bug484181.html

@@ -46,8 +46,9 @@ function runTest() {
   var edit = document.getElementById("edit");
   edit.focus();
 
-  const {maybeOnSpellCheck} = SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", null);
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
   maybeOnSpellCheck(edit, function() {
     ok(isSpellingCheckOk(getEditor(), gMisspeltWords),
        "All misspellings before editing are accounted for.");

editor/spellchecker/tests/test_bug596333.html

@@ -121,8 +121,9 @@ function runTest() {
   var edit = document.getElementById("edit");
   edit.focus();
 
-  onSpellCheck = SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", null).onSpellCheck;
+  onSpellCheck = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  ).onSpellCheck;
   onSpellCheck(edit, runOnFocus);
 }
 </script>

editor/spellchecker/tests/test_bug636465.html

@@ -11,8 +11,9 @@
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
-  const {onSpellCheck} = SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
   var x = document.getElementById("x");
   x.focus();
   onSpellCheck(x, function() {

editor/spellchecker/tests/test_bug678842.html

@@ -62,9 +62,10 @@ var loadListener = async function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(elem, async function() {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(elem, async function() {
     let spellchecker = inlineSpellChecker.spellChecker;
     let currentDictionaries = spellchecker.getCurrentDictionaries();
     is(currentDictionaries.length, 1, "expected one dictionary");

editor/spellchecker/tests/test_bug697981.html

@@ -27,15 +27,9 @@ var elem_de;
 var editor_de;
 var script;
 
-var maybeOnSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-               .maybeOnSpellCheck;
-
-var onSpellCheck =
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-               .onSpellCheck;
+var { maybeOnSpellCheck, onSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 /** Test for Bug 697981 **/
 SimpleTest.waitForExplicitFinish();

editor/spellchecker/tests/test_bug717433.html

@@ -63,9 +63,10 @@ var loadListener = async function(evt) {
   editor.setSpellcheckUserOverride(true);
   var inlineSpellChecker = editor.getInlineSpellChecker(true);
 
-  SpecialPowers.Cu.import(
-    "resource://testing-common/AsyncSpellCheckTestHelper.jsm")
-  .onSpellCheck(elem, async function() {
+  const { onSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
+  onSpellCheck(elem, async function() {
     let spellchecker = inlineSpellChecker.spellChecker;
     let currentDictionaries = spellchecker.getCurrentDictionaries();
 

editor/spellchecker/tests/test_nsIEditorSpellCheck_ReplaceWord.html

@@ -12,7 +12,9 @@
 
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(async () => {
-  const { maybeOnSpellCheck } = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm");
+  const { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
   const editor = document.querySelector("div[contenteditable]");
   async function replaceWord(aMisspelledWord, aCorrectWord, aReplaceAll) {
     const editorObj = SpecialPowers.wrap(window).docShell.editingSession.getEditorForWindow(window);

editor/spellchecker/tests/test_spellcheck_after_edit.html

@@ -8,8 +8,9 @@
 </head>
 <body>
 <script>
-let {maybeOnSpellCheck} =
-  SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 function waitForTick() {
   return new Promise(resolve =>

editor/spellchecker/tests/test_spellcheck_after_pressing_navigation_key.html

@@ -13,7 +13,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1729653
 <body>
 <textarea rows="20" cols="50">That undfgdfg seems OK.</textarea>
 <script>
-let {maybeOnSpellCheck} = SpecialPowers.Cu.import("resource://testing-common/AsyncSpellCheckTestHelper.jsm", {});
+let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+  "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+);
 
 function waitForTick() {
   return new Promise(resolve => SimpleTest.executeSoon(resolve));

editor/spellchecker/tests/test_suggest.html

@@ -15,9 +15,9 @@
 add_task(async function() {
   await new Promise(resolve => SimpleTest.waitForFocus(resolve));
 
-  let { maybeOnSpellCheck } =
-    SpecialPowers.Cu.import(
-      "resource://testing-common/AsyncSpellCheckTestHelper.jsm", null);
+  let { maybeOnSpellCheck } = SpecialPowers.ChromeUtils.import(
+    "resource://testing-common/AsyncSpellCheckTestHelper.jsm"
+  );
 
   let element = document.getElementById("en-US");
   element.focus();