Bug 1765167 - Part 1: Stop using Cu.import in browser/. r=mossop

Differential Revision: https://phabricator.services.mozilla.com/D144094
dothq · May 3, 2022 · 7dfdb15 · 7dfdb15
1 parent 567e0a3
commit 7dfdb15
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/browser/components/migration/tests/marionette/test_refresh_firefox.py b/browser/components/migration/tests/marionette/test_refresh_firefox.py
@@ -185,7 +185,9 @@ def createSession(self):
           let resolve = arguments[arguments.length - 1];
           const COMPLETE_STATE = Ci.nsIWebProgressListener.STATE_STOP +
                                  Ci.nsIWebProgressListener.STATE_IS_NETWORK;
-          let {TabStateFlusher} = Cu.import("resource:///modules/sessionstore/TabStateFlusher.jsm", {});
+          let { TabStateFlusher } = ChromeUtils.import(
+            "resource:///modules/sessionstore/TabStateFlusher.jsm"
+          );
           let expectedURLs = Array.from(arguments[0])
           gBrowser.addTabsProgressListener({
             onStateChange(browser, webprogress, request, flags, status) {
@@ -228,7 +230,9 @@ def createFxa(self):
         self.runAsyncCode(
             """
           let resolve = arguments[arguments.length - 1];
-          Cu.import("resource://gre/modules/FxAccountsStorage.jsm");
+          let { FxAccountsStorageManager } = ChromeUtils.import(
+            "resource://gre/modules/FxAccountsStorage.jsm"
+          );
           let storage = new FxAccountsStorageManager();
           let data = {email: "[email protected]", uid: "uid", keyFetchToken: "top-secret"};
           storage.initialize(data);
@@ -465,7 +469,9 @@ def checkSession(self):
     def checkFxA(self):
         result = self.runAsyncCode(
             """
-          Cu.import("resource://gre/modules/FxAccountsStorage.jsm");
+          let { FxAccountsStorageManager } = ChromeUtils.import(
+            "resource://gre/modules/FxAccountsStorage.jsm"
+          );
           let resolve = arguments[arguments.length - 1];
           let storage = new FxAccountsStorageManager();
           let result = {};
@@ -528,14 +534,20 @@ def setUpScriptData(self):
           window.global = {};
           global.LoginInfo = Components.Constructor("@mozilla.org/login-manager/loginInfo;1", "nsILoginInfo", "init");
           global.profSvc = Cc["@mozilla.org/toolkit/profile-service;1"].getService(Ci.nsIToolkitProfileService);
-          global.Preferences = Cu.import("resource://gre/modules/Preferences.jsm", {}).Preferences;
-          global.FormHistory = Cu.import("resource://gre/modules/FormHistory.jsm", {}).FormHistory;
+          global.Preferences = ChromeUtils.import(
+            "resource://gre/modules/Preferences.jsm"
+          ).Preferences;
+          global.FormHistory = ChromeUtils.import(
+            "resource://gre/modules/FormHistory.jsm"
+          ).FormHistory;
         """  # NOQA: E501
         )
         self._formAutofillAvailable = self.runCode(
             """
           try {
-            global.formAutofillStorage = Cu.import("resource://formautofill/FormAutofillStorage.jsm", {}).formAutofillStorage;
+            global.formAutofillStorage = ChromeUtils.import(
+              "resource://formautofill/FormAutofillStorage.jsm"
+            ).formAutofillStorage;
           } catch(e) {
             return false;
           }

diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm
@@ -20,8 +20,12 @@ var EXPORTED_SYMBOLS = ["PermissionUI"];
  * permission request is coming up from content by way of the
  * nsContentPermissionHelper. The system add-on could then do the following:
  *
- * Cu.import("resource://gre/modules/Integration.jsm");
- * Cu.import("resource:///modules/PermissionUI.jsm");
+ * const { Integration } = ChromeUtils.import(
+ *   "resource://gre/modules/Integration.jsm"
+ * );
+ * const { PermissionUI } = ChromeUtils.import(
+ *   "resource:///modules/PermissionUI.jsm"
+ * );
  *
  * const SoundCardIntegration = (base) => ({
  *   __proto__: base,