Bug 1608272 - Remove 'this' as the second argument to 'ChromeUtils.import', use object destructuring instead (test-only changes). r=Gijs

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

.eslintrc.js

@@ -516,6 +516,7 @@ module.exports = {
         "browser/components/customizableui/test/browser_1042100_default_placements_update.js",
         "browser/components/customizableui/test/browser_1096763_seen_widgets_post_reset.js",
         "browser/components/customizableui/test/browser_1161838_inserted_new_default_buttons.js",
+        "browser/components/customizableui/test/browser_1686523_hide_home_button.js",
         "browser/components/customizableui/test/browser_989338_saved_placements_not_resaved.js",
         "browser/components/customizableui/test/browser_currentset_post_reset.js",
         "browser/components/customizableui/test/browser_panel_keyboard_navigation.js",

accessible/tests/browser/telemetry/browser_HCM_telemetry.js

@@ -11,7 +11,9 @@ Services.scriptloader.loadSubScript(
   this
 );
 
-ChromeUtils.import("resource://testing-common/TelemetryTestUtils.jsm", this);
+const { TelemetryTestUtils } = ChromeUtils.import(
+  "resource://testing-common/TelemetryTestUtils.jsm"
+);
 
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("browser.display.document_color_use");

browser/base/content/test/about/browser_aboutHome_search_searchbar.js

@@ -2,9 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

browser/base/content/test/contextMenu/browser_contextmenu.js

@@ -34,9 +34,6 @@ Services.scriptloader.loadSubScript(
   this
 );
 
-/* import-globals-from ../general/head.js */
-Services.scriptloader.loadSubScript(head_base + "head.js", this);
-
 function getThisFrameSubMenu(base_menu) {
   if (AppConstants.NIGHTLY_BUILD) {
     let osPidItem = ["context-frameOsPid", false];
@@ -1373,11 +1370,13 @@ add_task(async function test_dom_full_screen() {
       maybeScreenshotsPresent: true,
       shiftkey: true,
       async preCheckContextMenuFn() {
-        await pushPrefs(
-          ["full-screen-api.allow-trusted-requests-only", false],
-          ["full-screen-api.transition-duration.enter", "0 0"],
-          ["full-screen-api.transition-duration.leave", "0 0"]
-        );
+        await SpecialPowers.pushPrefEnv({
+          set: [
+            ["full-screen-api.allow-trusted-requests-only", false],
+            ["full-screen-api.transition-duration.enter", "0 0"],
+            ["full-screen-api.transition-duration.leave", "0 0"],
+          ],
+        });
         await SpecialPowers.spawn(
           gBrowser.selectedBrowser,
           [],

browser/base/content/test/general/head.js

@@ -1,4 +1,6 @@
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
 
 ChromeUtils.defineModuleGetter(
   this,

browser/base/content/test/performance/browser_appmenu.js

@@ -1,9 +1,8 @@
 "use strict";
 /* global PanelUI */
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

browser/base/content/test/permissions/head.js

@@ -1,4 +1,6 @@
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );

browser/base/content/test/protectionsUI/browser_protectionsUI.js

@@ -14,9 +14,8 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/ContentBlockingAllowList.jsm"
 );
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 
 add_task(async function setup() {

browser/base/content/test/protectionsUI/browser_protectionsUI_categories.js

@@ -7,9 +7,8 @@ const FP_PREF = "privacy.trackingprotection.fingerprinting.enabled";
 const ST_PREF = "privacy.trackingprotection.socialtracking.enabled";
 const STC_PREF = "privacy.socialtracking.block_cookies.enabled";
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 
 registerCleanupFunction(function() {

browser/base/content/test/siteIdentity/browser_geolocation_indicator.js

@@ -5,8 +5,12 @@
 
 requestLongerTimeout(2);
 
-ChromeUtils.import("resource:///modules/PermissionUI.jsm", this);
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { PermissionUI } = ChromeUtils.import(
+  "resource:///modules/PermissionUI.jsm"
+);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );

browser/base/content/test/siteIdentity/browser_no_mcb_for_loopback.js

@@ -11,7 +11,9 @@
 // The following rejections should not be left uncaught. This test has been
 // whitelisted until the issue is fixed.
 if (!gMultiProcessBrowser) {
-  ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+  const { PromiseTestUtils } = ChromeUtils.import(
+    "resource://testing-common/PromiseTestUtils.jsm"
+  );
   PromiseTestUtils.expectUncaughtRejection(/NetworkError/);
   PromiseTestUtils.expectUncaughtRejection(/NetworkError/);
 }

browser/base/content/test/sync/head.js

@@ -1,4 +1,4 @@
-ChromeUtils.import("resource://services-sync/UIState.jsm", this);
+const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm");
 const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm");
 
 function promiseSyncReady() {

browser/base/content/test/tabMediaIndicator/browser_mute_webAudio.js

@@ -1,7 +1,9 @@
 // The tab closing code leaves an uncaught rejection. This test has been
 // whitelisted until the issue is fixed.
 if (!gMultiProcessBrowser) {
-  ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+  const { PromiseTestUtils } = ChromeUtils.import(
+    "resource://testing-common/PromiseTestUtils.jsm"
+  );
   PromiseTestUtils.expectUncaughtRejection(/is no longer, usable/);
 }
 

browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js

@@ -8,9 +8,13 @@
 //
 // NOTE: Allowing a whole class of rejections should be avoided. Normally you
 //       should use "expectUncaughtRejection" to flag individual failures.
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.allowMatchingRejectionsGlobally(/aborted by the user agent/);
-ChromeUtils.import("resource:///modules/BrowserWindowTracker.jsm", this);
+const { BrowserWindowTracker } = ChromeUtils.import(
+  "resource:///modules/BrowserWindowTracker.jsm"
+);
 
 const permissionError =
   "error: NotAllowedError: The request is not allowed " +

browser/components/aboutlogins/tests/browser/browser_aaa_eventTelemetry_run_first.js

@@ -3,9 +3,9 @@
 
 requestLongerTimeout(2);
 
-ChromeUtils.import("resource://testing-common/TelemetryTestUtils.jsm", this);
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
+const { TelemetryTestUtils } = ChromeUtils.import(
+  "resource://testing-common/TelemetryTestUtils.jsm"
+);
 
 EXPECTED_BREACH = {
   AddedDate: "2018-12-20T23:56:26Z",

browser/components/aboutlogins/tests/browser/browser_alertDismissedAfterChangingPassword.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 EXPECTED_BREACH = {
   AddedDate: "2018-12-20T23:56:26Z",
   BreachDate: "2018-12-16",

browser/components/aboutlogins/tests/browser/browser_contextmenuFillLogins.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({

browser/components/aboutlogins/tests/browser/browser_copyToClipboardButton.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function test() {
   await SpecialPowers.pushPrefEnv({
     set: [["dom.events.testing.asyncClipboard", true]],

browser/components/aboutlogins/tests/browser/browser_createLogin.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   let aboutLoginsTab = await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_deleteLogin.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   TEST_LOGIN2 = await addLogin(TEST_LOGIN2);

browser/components/aboutlogins/tests/browser/browser_loginItemErrors.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   await BrowserTestUtils.openNewForegroundTab({
     gBrowser,

browser/components/aboutlogins/tests/browser/browser_loginSortOrderRestored.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
-
 EXPECTED_BREACH = {
   AddedDate: "2018-12-20T23:56:26Z",
   BreachDate: "2018-12-16",

browser/components/aboutlogins/tests/browser/browser_masterPassword.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
-
 function waitForLoginCountToReach(browser, loginCount) {
   return SpecialPowers.spawn(
     browser,

browser/components/aboutlogins/tests/browser/browser_openSite.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({

browser/components/aboutlogins/tests/browser/browser_osAuthDialog.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function test() {
   info(
     `updatechannel: ${UpdateUtils.getUpdateChannel(false)}; platform: ${

browser/components/aboutlogins/tests/browser/browser_removeAllDialog.js

@@ -2,7 +2,6 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint-disable mozilla/no-arbitrary-setTimeout */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
 const OS_REAUTH_PREF = "signon.management.page.os-auth.enabled";
 
 async function openRemoveAllDialog(browser) {

browser/components/aboutlogins/tests/browser/browser_updateLogin.js

@@ -1,8 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-
 add_task(async function setup() {
   TEST_LOGIN1 = await addLogin(TEST_LOGIN1);
   await BrowserTestUtils.openNewForegroundTab({

browser/components/aboutlogins/tests/unit/head.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
+const { LoginTestUtils } = ChromeUtils.import(
+  "resource://testing-common/LoginTestUtils.jsm"
+);
 const { LoginHelper } = ChromeUtils.import(
   "resource://gre/modules/LoginHelper.jsm"
 );

browser/components/customizableui/test/browser_1686523_hide_home_button.js

@@ -4,7 +4,6 @@
 
 "use strict";
 
-/* eslint-disable-next-line mozilla/reject-chromeutils-import-null */
 let CustomizableUIBSPass = ChromeUtils.import(
   "resource:///modules/CustomizableUI.jsm",
   null

browser/components/customizableui/test/browser_help_panel_cloning.js

@@ -5,11 +5,6 @@
 
 /* global PanelUI */
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
-);
-
 let gAppMenuStrings = new Localization(
   ["branding/brand.ftl", "browser/appmenu.ftl"],
   true

browser/components/enterprisepolicies/tests/browser/browser_policy_search_engine.js

@@ -2,9 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

browser/components/extensions/test/browser/browser_ext_tabs_hide_update.js

@@ -1,6 +1,8 @@
 "use strict";
 
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", this);
+const { AddonTestUtils } = ChromeUtils.import(
+  "resource://testing-common/AddonTestUtils.jsm"
+);
 
 AddonTestUtils.initMochitest(this);
 

browser/components/extensions/test/browser/browser_ext_webRequest.js

@@ -5,7 +5,9 @@
 /* import-globals-from ../../../../../toolkit/components/extensions/test/mochitest/head_webrequest.js */
 loadTestSubscript("head_webrequest.js");
 
-ChromeUtils.import("resource://gre/modules/HiddenFrame.jsm", this);
+const { HiddenFrame } = ChromeUtils.import(
+  "resource://gre/modules/HiddenFrame.jsm"
+);
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 SimpleTest.requestCompleteLog();

browser/components/places/tests/browser/browser_panelview_bookmarks_delete.js

@@ -3,9 +3,8 @@
 
 "use strict";
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

browser/components/places/tests/unit/head_bookmarks.js

@@ -25,7 +25,9 @@ ChromeUtils.defineModuleGetter(
 );
 
 // Needed by some test that relies on having an app registered.
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "PlacesTest",
   ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",

browser/components/preferences/tests/browser_applications_selection.js

@@ -1,7 +1,6 @@
 SimpleTest.requestCompleteLog();
-ChromeUtils.import(
-  "resource://testing-common/HandlerServiceTestUtils.jsm",
-  this
+const { HandlerServiceTestUtils } = ChromeUtils.import(
+  "resource://testing-common/HandlerServiceTestUtils.jsm"
 );
 
 let gHandlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(

browser/components/preferences/tests/browser_browser_languages_subdialog.js

@@ -1,7 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://testing-common/AddonTestUtils.jsm", this);
+const { AddonTestUtils } = ChromeUtils.import(
+  "resource://testing-common/AddonTestUtils.jsm"
+);
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 AddonTestUtils.initMochitest(this);

browser/components/preferences/tests/browser_filetype_dialog.js

@@ -2,9 +2,8 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 SimpleTest.requestCompleteLog();
-ChromeUtils.import(
-  "resource://testing-common/HandlerServiceTestUtils.jsm",
-  this
+const { HandlerServiceTestUtils } = ChromeUtils.import(
+  "resource://testing-common/HandlerServiceTestUtils.jsm"
 );
 
 let gHandlerService = Cc["@mozilla.org/uriloader/handler-service;1"].getService(

browser/components/preferences/tests/browser_masterpassword.js

@@ -1,5 +1,9 @@
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
-ChromeUtils.import("resource://gre/modules/OSKeyStore.jsm", this);
+const { OSKeyStoreTestUtils } = ChromeUtils.import(
+  "resource://testing-common/OSKeyStoreTestUtils.jsm"
+);
+const { OSKeyStore } = ChromeUtils.import(
+  "resource://gre/modules/OSKeyStore.jsm"
+);
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );

browser/components/preferences/tests/browser_password_management.js

@@ -1,7 +1,11 @@
 "use strict";
 
-ChromeUtils.import("resource://testing-common/LoginTestUtils.jsm", this);
-ChromeUtils.import("resource://testing-common/TelemetryTestUtils.jsm", this);
+const { LoginTestUtils } = ChromeUtils.import(
+  "resource://testing-common/LoginTestUtils.jsm"
+);
+const { TelemetryTestUtils } = ChromeUtils.import(
+  "resource://testing-common/TelemetryTestUtils.jsm"
+);
 
 var passwordsDialog;
 

browser/components/preferences/tests/head.js

@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://gre/modules/Promise.jsm", this);
+const { Promise } = ChromeUtils.import("resource://gre/modules/Promise.jsm");
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );

browser/components/sessionstore/test/browser_354894_perwindowpb.js

@@ -24,14 +24,18 @@
  * notifications. The latter won't.
  */
 
-ChromeUtils.import("resource:///modules/sessionstore/SessionStartup.jsm", this);
+const { SessionStartup } = ChromeUtils.import(
+  "resource:///modules/sessionstore/SessionStartup.jsm"
+);
 // The rejection "BrowserWindowTracker.getTopWindow(...) is null" is left
 // unhandled in some cases. This bug should be fixed, but for the moment this
 // file allows a class of rejections.
 //
 // NOTE: Allowing a whole class of rejections should be avoided. Normally you
 //       should use "expectUncaughtRejection" to flag individual failures.
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.allowMatchingRejectionsGlobally(/getTopWindow/);
 
 // Some urls that might be opened in tabs and/or popups

browser/components/sessionstore/test/browser_cleaner.js

@@ -8,9 +8,6 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
-
 const LONG_TIME_AGO = 1;
 
 const URL_TAB1 =

browser/components/sessionstore/test/browser_not_collect_when_idle.js

@@ -1,6 +1,8 @@
 /** Test for Bug 1305950 **/
 
-ChromeUtils.import("resource://testing-common/MockRegistrar.jsm", this);
+const { MockRegistrar } = ChromeUtils.import(
+  "resource://testing-common/MockRegistrar.jsm"
+);
 
 // The mock idle service.
 var idleService = {

browser/components/sessionstore/test/browser_upgrade_backup.js

@@ -1,9 +1,9 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
-ChromeUtils.import("resource://gre/modules/Preferences.jsm", this);
+const { Preferences } = ChromeUtils.import(
+  "resource://gre/modules/Preferences.jsm"
+);
 
 const Paths = SessionFile.Paths;
 const PREF_UPGRADE = "browser.sessionstore.upgradeBackup.latestBuildID";

browser/components/sessionstore/test/unit/test_backup_once.js

@@ -15,7 +15,9 @@ var Paths;
 var SessionFile;
 
 // We need a XULAppInfo to initialize SessionFile
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "SessionRestoreTest",
   ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",

browser/components/sessionstore/test/unit/test_histogram_corrupt_files.js

@@ -8,7 +8,6 @@
  */
 
 "use strict";
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
 
 const Telemetry = Services.telemetry;
 const Path = OS.Path;
@@ -16,7 +15,9 @@ const HistogramId = "FX_SESSION_RESTORE_ALL_FILES_CORRUPT";
 
 // Prepare the session file.
 var profd = do_get_profile();
-ChromeUtils.import("resource:///modules/sessionstore/SessionFile.jsm", this);
+const { SessionFile } = ChromeUtils.import(
+  "resource:///modules/sessionstore/SessionFile.jsm"
+);
 
 /**
  * A utility function for resetting the histogram and the contents

browser/components/sessionstore/test/unit/test_migration_lz4compression.js

@@ -11,7 +11,9 @@ var Paths;
 var SessionFile;
 
 // We need a XULAppInfo to initialize SessionFile
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "SessionRestoreTest",
   ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",

browser/components/sessionstore/test/unit/test_shutdown_cleanup.js

@@ -26,7 +26,9 @@ const MAX_ENTRIES = 9;
 const URL = "http://example.com/#";
 
 // We need a XULAppInfo to initialize SessionFile
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "SessionRestoreTest",
   ID: "{230de50e-4cd1-11dc-8314-0800200c9a66}",

browser/components/tests/browser/browser_contentpermissionprompt.js

@@ -9,7 +9,9 @@
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-ChromeUtils.import("resource://gre/modules/Integration.jsm", this);
+const { Integration } = ChromeUtils.import(
+  "resource://gre/modules/Integration.jsm"
+);
 
 XPCOMUtils.defineLazyServiceGetter(
   this,

browser/components/translation/test/browser_translation_yandex.js

@@ -11,7 +11,9 @@
 //
 // NOTE: Allowing a whole class of rejections should be avoided. Normally you
 //       should use "expectUncaughtRejection" to flag individual failures.
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.allowMatchingRejectionsGlobally(/NS_ERROR_ILLEGAL_VALUE/);
 
 const kEnginePref = "browser.translation.engine";

browser/components/uitour/test/browser_UITour.js

@@ -7,12 +7,15 @@ var gTestTab;
 var gContentAPI;
 var gContentWindow;
 
-ChromeUtils.import(
-  "resource://testing-common/TelemetryArchiveTesting.jsm",
-  this
+const { TelemetryArchiveTesting } = ChromeUtils.import(
+  "resource://testing-common/TelemetryArchiveTesting.jsm"
+);
+const { ProfileAge } = ChromeUtils.import(
+  "resource://gre/modules/ProfileAge.jsm"
+);
+const { UpdateUtils } = ChromeUtils.import(
+  "resource://gre/modules/UpdateUtils.jsm"
 );
-ChromeUtils.import("resource://gre/modules/ProfileAge.jsm", this);
-ChromeUtils.import("resource://gre/modules/UpdateUtils.jsm", this);
 
 function test() {
   UITourTest();

browser/components/uitour/test/browser_UITour3.js

@@ -1,8 +1,7 @@
 "use strict";
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

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

@@ -13,8 +13,12 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/OSKeyStore.jsm", this);
-ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
+const { OSKeyStore } = ChromeUtils.import(
+  "resource://gre/modules/OSKeyStore.jsm"
+);
+const { OSKeyStoreTestUtils } = ChromeUtils.import(
+  "resource://testing-common/OSKeyStoreTestUtils.jsm"
+);
 
 const MANAGE_ADDRESSES_DIALOG_URL =
   "chrome://formautofill/content/manageAddresses.xhtml";

browser/modules/test/browser/browser_PermissionUI.js

@@ -6,9 +6,15 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Integration.jsm", this);
-ChromeUtils.import("resource:///modules/PermissionUI.jsm", this);
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { Integration } = ChromeUtils.import(
+  "resource://gre/modules/Integration.jsm"
+);
+const { PermissionUI } = ChromeUtils.import(
+  "resource:///modules/PermissionUI.jsm"
+);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );

browser/modules/test/browser/browser_PermissionUI_prompts.js

@@ -6,9 +6,15 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Integration.jsm", this);
-ChromeUtils.import("resource:///modules/PermissionUI.jsm", this);
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { Integration } = ChromeUtils.import(
+  "resource://gre/modules/Integration.jsm"
+);
+const { PermissionUI } = ChromeUtils.import(
+  "resource:///modules/PermissionUI.jsm"
+);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 const { PermissionTestUtils } = ChromeUtils.import(
   "resource://testing-common/PermissionTestUtils.jsm"
 );

browser/modules/test/browser/browser_SitePermissions.js

@@ -4,7 +4,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 
 // This asserts that SitePermissions.set can not save ALLOW permissions
 // temporarily on a tab.

browser/modules/test/browser/browser_SitePermissions_combinations.js

@@ -4,7 +4,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 
 // This function applies combinations of different permissions and
 // checks how they override each other.

browser/modules/test/browser/browser_SitePermissions_expiry.js

@@ -5,7 +5,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 
 const EXPIRE_TIME_MS = 100;
 const TIMEOUT_MS = 500;

browser/modules/test/browser/browser_SitePermissions_tab_urls.js

@@ -4,7 +4,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource:///modules/SitePermissions.jsm", this);
+const { SitePermissions } = ChromeUtils.import(
+  "resource:///modules/SitePermissions.jsm"
+);
 
 function newPrincipal(origin) {
   return Services.scriptSecurityManager.createContentPrincipalFromOrigin(

browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js

@@ -6,7 +6,7 @@
 
 /* import-globals-from ../../head.js */
 
-ChromeUtils.import("resource://gre/modules/Geometry.jsm", this);
+const { Rect } = ChromeUtils.import("resource://gre/modules/Geometry.jsm");
 
 async function draw(window, src) {
   const { document, Image } = window;

chrome/test/unit/test_abi.js

@@ -1,5 +1,6 @@
-ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

chrome/test/unit/test_bug380398.js

@@ -7,7 +7,9 @@ var MANIFESTS = [do_get_file("data/test_bug380398.manifest")];
 
 registerManifests(MANIFESTS);
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   id: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

chrome/test/unit/test_bug397073.js

@@ -7,7 +7,9 @@ var MANIFESTS = [do_get_file("data/test_bug397073.manifest")];
 
 registerManifests(MANIFESTS);
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

chrome/test/unit/test_bug399707.js

@@ -7,7 +7,9 @@ var MANIFESTS = [do_get_file("data/test_bug399707.manifest")];
 
 registerManifests(MANIFESTS);
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

chrome/test/unit/test_bug401153.js

@@ -7,7 +7,9 @@ var MANIFESTS = [do_get_file("data/test_bug401153.manifest")];
 
 registerManifests(MANIFESTS);
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

chrome/test/unit/test_no_remote_registration.js

@@ -56,7 +56,9 @@ var testProtocols = [
   },
 ];
 function run_test() {
-  ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+  const { newAppInfo } = ChromeUtils.import(
+    "resource://testing-common/AppInfo.jsm"
+  );
   let XULAppInfo = newAppInfo({
     name: "XPCShell",
     ID: "{39885e5f-f6b4-4e2a-87e5-6259ecf79011}",

dom/base/test/browser_timeout_throttling_with_audio_playback.js

@@ -1,7 +1,9 @@
 // The tab closing code leaves an uncaught rejection. This test has been
 // whitelisted until the issue is fixed.
 if (!gMultiProcessBrowser) {
-  ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+  const { PromiseTestUtils } = ChromeUtils.import(
+    "resource://testing-common/PromiseTestUtils.jsm"
+  );
   PromiseTestUtils.expectUncaughtRejection(/is no longer, usable/);
 }
 

dom/promise/tests/unit/test_monitor_uncaught.js

@@ -4,8 +4,10 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Timer.jsm", this);
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 
 // Prevent test failures due to the unhandled rejections in this test file.
 PromiseTestUtils.disableUncaughtRejectionObserverForSelfTest();

dom/tests/browser/browser_hasbeforeunload.js

@@ -229,7 +229,9 @@ function controlFrameAt(browser, frameDepth, command) {
   return SpecialPowers.spawn(browser, [{ frameDepth, command }], async function(
     args
   ) {
-    ChromeUtils.import("resource://testing-common/TestUtils.jsm", this);
+    const { TestUtils } = ChromeUtils.import(
+      "resource://testing-common/TestUtils.jsm"
+    );
 
     let { command: contentCommand, frameDepth: contentFrameDepth } = args;
 

layout/xul/test/browser_bug1163304.js

@@ -1,6 +1,5 @@
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

security/manager/ssl/tests/unit/test_cert_storage.js

@@ -25,8 +25,10 @@ var id = "xpcshell@tests.mozilla.org";
 var appName = "XPCShell";
 var version = "1";
 var platformVersion = "1.9.2";
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this); // Imported via AppInfo.jsm.
-/* global updateAppInfo:false */ updateAppInfo({
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
+updateAppInfo({
   name: appName,
   ID: id,
   version,

services/common/tests/unit/head_global.js

@@ -9,7 +9,9 @@ var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "xpcshell@tests.mozilla.org",

services/crypto/tests/unit/head_helpers.js

@@ -19,7 +19,9 @@ try {
     OS = "Linux";
   }
 
-  ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+  const { updateAppInfo } = ChromeUtils.import(
+    "resource://testing-common/AppInfo.jsm"
+  );
   updateAppInfo({
     name: "XPCShell",
     ID: "{3e3ba16c-1675-4e88-b9c8-afef81b3d2ef}",

services/crypto/tests/unit/test_crypto_random.js

@@ -1,4 +1,6 @@
-ChromeUtils.import("resource://services-crypto/WeaveCrypto.js", this);
+const { WeaveCrypto } = ChromeUtils.import(
+  "resource://services-crypto/WeaveCrypto.js"
+);
 
 var cryptoSvc = new WeaveCrypto();
 

services/sync/tests/unit/head_appinfo.js

@@ -35,7 +35,9 @@ function getOS() {
   }
 }
 
-ChromeUtils.import("resource://testing-common/AppInfo.jsm", this);
+const { updateAppInfo } = ChromeUtils.import(
+  "resource://testing-common/AppInfo.jsm"
+);
 updateAppInfo({
   name: "XPCShell",
   ID: "xpcshell@tests.mozilla.org",

testing/mochitest/tests/browser/browser_fail_uncaught_rejection_expected.js

@@ -1,7 +1,9 @@
 setExpectedFailuresForSelfTest(1);
 
 // The test will fail because there is only one of two expected rejections.
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.expectUncaughtRejection(/Promise rejection./);
 PromiseTestUtils.expectUncaughtRejection(/Promise rejection./);
 

testing/mochitest/tests/browser/browser_fail_uncaught_rejection_expected_multi.js

@@ -1,7 +1,9 @@
 setExpectedFailuresForSelfTest(1);
 
 // The test will fail because an expected uncaught rejection is actually caught.
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.expectUncaughtRejection(/Promise rejection./);
 
 function test() {

testing/mochitest/tests/browser/browser_uncaught_rejection_expected.js

@@ -2,7 +2,9 @@
 let JSMPromise = ChromeUtils.import("resource://gre/modules/Promise.jsm", {})
   .Promise;
 
-ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+const { PromiseTestUtils } = ChromeUtils.import(
+  "resource://testing-common/PromiseTestUtils.jsm"
+);
 PromiseTestUtils.allowMatchingRejectionsGlobally(/Allowed rejection./);
 PromiseTestUtils.expectUncaughtRejection(/Promise.jsm rejection./);
 PromiseTestUtils.expectUncaughtRejection(/Promise.jsm rejection./);

testing/modules/FileTestUtils.jsm

@@ -10,12 +10,20 @@
 
 var EXPORTED_SYMBOLS = ["FileTestUtils"];
 
-ChromeUtils.import("resource://gre/modules/AsyncShutdown.jsm", this);
-ChromeUtils.import("resource://gre/modules/DownloadPaths.jsm", this);
-ChromeUtils.import("resource://gre/modules/FileUtils.jsm", this);
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", this);
-ChromeUtils.import("resource://testing-common/Assert.jsm", this);
+const { AsyncShutdown } = ChromeUtils.import(
+  "resource://gre/modules/AsyncShutdown.jsm"
+);
+const { DownloadPaths } = ChromeUtils.import(
+  "resource://gre/modules/DownloadPaths.jsm"
+);
+const { FileUtils } = ChromeUtils.import(
+  "resource://gre/modules/FileUtils.jsm"
+);
+const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+const { Assert } = ChromeUtils.import("resource://testing-common/Assert.jsm");
 
 let gFileCounter = 1;
 let gPathsToRemove = [];

toolkit/components/aboutconfig/test/browser/head.js

@@ -3,7 +3,9 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Preferences.jsm", this);
+const { Preferences } = ChromeUtils.import(
+  "resource://gre/modules/Preferences.jsm"
+);
 
 // List of default preferences that can be used for tests, chosen because they
 // have little or no side-effects when they are modified for a brief time. If

toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js

@@ -2,7 +2,9 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm", this);
+const { PromiseUtils } = ChromeUtils.import(
+  "resource://gre/modules/PromiseUtils.jsm"
+);
 
 add_task(async function test_no_condition() {
   for (let kind of [

toolkit/components/extensions/test/browser/browser_ext_themes_highlight.js

@@ -2,9 +2,8 @@
 
 // This test checks whether applied WebExtension themes that attempt to change
 // the color of the font and background in a selection are applied properly.
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 add_task(async function setup() {

toolkit/components/extensions/test/browser/browser_ext_themes_toolbar_fields.js

@@ -3,9 +3,8 @@
 // This test checks whether applied WebExtension themes that attempt to change
 // the background color and the color of the navbar text fields are applied properly.
 
-ChromeUtils.import(
-  "resource://testing-common/CustomizableUITestUtils.jsm",
-  this
+const { CustomizableUITestUtils } = ChromeUtils.import(
+  "resource://testing-common/CustomizableUITestUtils.jsm"
 );
 let gCUITestUtils = new CustomizableUITestUtils(window);
 

toolkit/components/extensions/test/xpcshell/head_sync.js

@@ -6,8 +6,9 @@
 
 /* exported withSyncContext */
 
-ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm", this);
+const { ExtensionCommon } = ChromeUtils.import(
+  "resource://gre/modules/ExtensionCommon.jsm"
+);
 
 class KintoExtContext extends ExtensionCommon.BaseContext {
   constructor(principal) {

toolkit/components/extensions/test/xpcshell/test_ext_contexts.js

@@ -2,10 +2,6 @@
 
 const global = this;
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
-
 var { BaseContext, EventManager } = ExtensionCommon;
 
 class StubContext extends BaseContext {

toolkit/components/extensions/test/xpcshell/test_ext_persistent_events.js

@@ -1,8 +1,5 @@
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { ExtensionAPI } = ExtensionCommon;
 
 const SCHEMA = [

toolkit/components/extensions/test/xpcshell/test_ext_schemas.js

@@ -1,9 +1,6 @@
 "use strict";
 
 const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 
 let { LocalAPIImplementation, SchemaAPIInterface } = ExtensionCommon;
 

toolkit/components/extensions/test/xpcshell/test_ext_schemas_async.js

@@ -1,8 +1,5 @@
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
 
 let { BaseContext, LocalAPIImplementation } = ExtensionCommon;

toolkit/components/extensions/test/xpcshell/test_ext_schemas_manifest_permissions.js

@@ -1,8 +1,5 @@
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { ExtensionAPI } = ExtensionCommon;
 
 add_task(async function() {

toolkit/components/extensions/test/xpcshell/test_ext_schemas_privileged.js

@@ -1,8 +1,5 @@
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { ExtensionAPI } = ExtensionCommon;
 
 AddonTestUtils.init(this);

toolkit/components/extensions/test/xpcshell/test_ext_schemas_revoke.js

@@ -2,9 +2,6 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
 
 let { SchemaAPIInterface } = ExtensionCommon;

toolkit/components/extensions/test/xpcshell/test_ext_schemas_roots.js

@@ -3,9 +3,6 @@
 "use strict";
 
 const { SchemaRoot } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 
 let { SchemaAPIInterface } = ExtensionCommon;
 

toolkit/components/extensions/test/xpcshell/test_load_all_api_modules.js

@@ -1,8 +1,5 @@
 "use strict";
 
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { Schemas } = ChromeUtils.import("resource://gre/modules/Schemas.jsm");
 
 const BASE_SCHEMA = "chrome://extensions/content/schemas/manifest.json";

toolkit/components/extensions/test/xpcshell/test_native_manifests.js

@@ -3,9 +3,6 @@
 const { AsyncShutdown } = ChromeUtils.import(
   "resource://gre/modules/AsyncShutdown.jsm"
 );
-const { ExtensionCommon } = ChromeUtils.import(
-  "resource://gre/modules/ExtensionCommon.jsm"
-);
 const { NativeManifests } = ChromeUtils.import(
   "resource://gre/modules/NativeManifests.jsm"
 );

toolkit/components/featuregates/test/unit/test_FeatureGateImplementation.js

@@ -3,13 +3,13 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/Services.jsm", this);
-ChromeUtils.import("resource://featuregates/FeatureGate.jsm", this);
-ChromeUtils.import(
-  "resource://featuregates/FeatureGateImplementation.jsm",
-  this
+const { FeatureGate } = ChromeUtils.import(
+  "resource://featuregates/FeatureGate.jsm"
 );
-ChromeUtils.import("resource://testing-common/httpd.js", this);
+const { FeatureGateImplementation } = ChromeUtils.import(
+  "resource://featuregates/FeatureGateImplementation.jsm"
+);
+const { HttpServer } = ChromeUtils.import("resource://testing-common/httpd.js");
 
 const kDefinitionDefaults = {
   id: "test-feature",

toolkit/components/filewatcher/tests/xpcshell/head.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/osfile.jsm", this);
-ChromeUtils.import("resource://gre/modules/Promise.jsm", this);
+const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
+const { Promise } = ChromeUtils.import("resource://gre/modules/Promise.jsm");
 
 function makeWatcher() {
   let watcher = Cc[

toolkit/components/normandy/test/NormandyTestUtils.jsm

@@ -3,9 +3,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-ChromeUtils.import("resource://normandy/lib/AddonStudies.jsm", this);
-ChromeUtils.import("resource://normandy/lib/NormandyUtils.jsm", this);
-ChromeUtils.import("resource://normandy/lib/RecipeRunner.jsm", this);
+const { AddonStudies } = ChromeUtils.import(
+  "resource://normandy/lib/AddonStudies.jsm"
+);
+const { NormandyUtils } = ChromeUtils.import(
+  "resource://normandy/lib/NormandyUtils.jsm"
+);
+const { RecipeRunner } = ChromeUtils.import(
+  "resource://normandy/lib/RecipeRunner.jsm"
+);
 
 const FIXTURE_ADDON_ID = "normandydriver-a@example.com";
 const UUID_REGEX = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;

toolkit/components/normandy/test/browser/browser_ActionsManager.js

@@ -1,9 +1,12 @@
 "use strict";
 
-ChromeUtils.import("resource://normandy/actions/BaseAction.jsm", this);
-ChromeUtils.import("resource://normandy/lib/ActionsManager.jsm", this);
-ChromeUtils.import("resource://normandy/lib/NormandyApi.jsm", this);
-ChromeUtils.import("resource://normandy/lib/Uptake.jsm", this);
+const { BaseAction } = ChromeUtils.import(
+  "resource://normandy/actions/BaseAction.jsm"
+);
+const { ActionsManager } = ChromeUtils.import(
+  "resource://normandy/lib/ActionsManager.jsm"
+);
+const { Uptake } = ChromeUtils.import("resource://normandy/lib/Uptake.jsm");
 const { ActionSchemas } = ChromeUtils.import(
   "resource://normandy/actions/schemas/index.js"
 );

toolkit/components/normandy/test/browser/browser_AddonRollouts.js

@@ -1,9 +1,14 @@
 "use strict";
 
-ChromeUtils.import("resource://gre/modules/IndexedDB.jsm", this);
-ChromeUtils.import("resource://gre/modules/TelemetryEnvironment.jsm", this);
-ChromeUtils.import("resource://normandy/lib/AddonRollouts.jsm", this);
-ChromeUtils.import("resource://normandy/lib/TelemetryEvents.jsm", this);
+const { IndexedDB } = ChromeUtils.import(
+  "resource://gre/modules/IndexedDB.jsm"
+);
+const { TelemetryEnvironment } = ChromeUtils.import(
+  "resource://gre/modules/TelemetryEnvironment.jsm"
+);
+const { AddonRollouts } = ChromeUtils.import(
+  "resource://normandy/lib/AddonRollouts.jsm"
+);
 
 decorate_task(AddonRollouts.withTestMock, async function testGetMissing() {
   ok(