Bug 1710273 - Stop using ChromeUtils.import(..., null) for importing EnterprisePolicies.jsm. r=nhnt11,extension-reviewers,preferences-reviewers,zombie

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

.eslintrc.js

@@ -499,7 +499,6 @@ module.exports = {
         "browser/components/customizableui/test/browser_panel_keyboard_navigation.js",
         "browser/components/customizableui/test/browser_proton_toolbar_hide_toolbarbuttons.js",
         "browser/components/enterprisepolicies/tests/browser/browser_policies_setAndLockPref_API.js",
-        "browser/components/enterprisepolicies/tests/browser/head.js",
         "browser/components/enterprisepolicies/tests/xpcshell/head.js",
         "browser/components/enterprisepolicies/tests/xpcshell/test_proxy.js",
         "browser/components/enterprisepolicies/tests/xpcshell/test_runOnce_helper.js",
@@ -517,7 +516,6 @@ module.exports = {
         "browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js",
         "browser/components/extensions/test/browser/browser_ext_sessions_restore.js",
         "browser/components/extensions/test/browser/browser_ext_tabs_audio.js",
-        "browser/components/extensions/test/browser/browser_ext_tabs_create_url.js",
         "browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js",
         "browser/components/extensions/test/browser/browser_ext_tabs_newtab_private.js",
         "browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js",
@@ -527,7 +525,6 @@ module.exports = {
         "browser/components/extensions/test/browser/head.js",
         "browser/components/extensions/test/xpcshell/test_ext_url_overrides_newtab.js",
         "browser/components/migration/tests/unit/test_Edge_db_migration.js",
-        "browser/components/preferences/tests/browser_contentblocking.js",
         "browser/components/translation/test/unit/test_cld2.js",
         "browser/extensions/formautofill/test/unit/test_sync.js",
         "browser/extensions/report-site-issue/test/browser/head.js",
@@ -551,7 +548,6 @@ module.exports = {
         "toolkit/components/crashes/tests/xpcshell/test_crash_manager.js",
         "toolkit/components/crashes/tests/xpcshell/test_crash_service.js",
         "toolkit/components/crashes/tests/xpcshell/test_crash_store.js",
-        "toolkit/components/enterprisepolicies/tests/browser/head.js",
         "toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.jsm",
         "toolkit/components/extensions/ExtensionPreferencesManager.jsm",
         "toolkit/components/extensions/ExtensionXPCShellUtils.jsm",

browser/components/enterprisepolicies/tests/browser/head.js

@@ -5,12 +5,10 @@
 "use strict";
 
 const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
-  "resource://testing-common/EnterprisePolicyTesting.jsm",
-  null
+  "resource://testing-common/EnterprisePolicyTesting.jsm"
 );
 const { TestUtils } = ChromeUtils.import(
-  "resource://testing-common/TestUtils.jsm",
-  null
+  "resource://testing-common/TestUtils.jsm"
 );
 
 ChromeUtils.defineModuleGetter(

browser/components/extensions/test/browser/browser_ext_tabs_create_url.js

@@ -4,8 +4,7 @@
 
 async function runWithDisabledPrivateBrowsing(callback) {
   const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
-    "resource://testing-common/EnterprisePolicyTesting.jsm",
-    null
+    "resource://testing-common/EnterprisePolicyTesting.jsm"
   );
 
   PoliciesPrefTracker.start();

browser/components/preferences/tests/browser_contentblocking.js

@@ -24,8 +24,7 @@ const ISOLATE_UI_PREF =
 const FPI_PREF = "privacy.firstparty.isolate";
 
 const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
-  "resource://testing-common/EnterprisePolicyTesting.jsm",
-  null
+  "resource://testing-common/EnterprisePolicyTesting.jsm"
 );
 
 requestLongerTimeout(2);

toolkit/components/enterprisepolicies/tests/browser/head.js

@@ -5,12 +5,10 @@
 "use strict";
 
 const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
-  "resource://testing-common/EnterprisePolicyTesting.jsm",
-  null
+  "resource://testing-common/EnterprisePolicyTesting.jsm"
 );
 const { TestUtils } = ChromeUtils.import(
-  "resource://testing-common/TestUtils.jsm",
-  null
+  "resource://testing-common/TestUtils.jsm"
 );
 
 PoliciesPrefTracker.start();