Bug 1789254 - Migrate enterprisepolicies consumers to use ESM imports directly. r=mkaply,necko-reviewers,application-update-reviewers,nalexander

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

browser/base/content/browser.js

@@ -27,6 +27,7 @@ ChromeUtils.defineESModuleGetters(this, {
   UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs",
   UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs",
   UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs",
+  WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
@@ -96,7 +97,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Weave: "resource://services-sync/main.js",
   WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
   webrtcUI: "resource:///modules/webrtcUI.jsm",
-  WebsiteFilter: "resource:///modules/policies/WebsiteFilter.jsm",
   ZoomUI: "resource:///modules/ZoomUI.jsm",
 });
 

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

@@ -2,12 +2,12 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 ChromeUtils.defineESModuleGetters(this, {
+  EnterprisePolicyTesting:
+    "resource://testing-common/EnterprisePolicyTesting.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  EnterprisePolicyTesting:
-    "resource://testing-common/EnterprisePolicyTesting.jsm",
   ExtensionCommon: "resource://gre/modules/ExtensionCommon.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm",

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

@@ -9,8 +9,8 @@ const { ExperimentFakes } = ChromeUtils.import(
   "resource://testing-common/NimbusTestUtils.jsm"
 );
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 ChromeUtils.defineModuleGetter(

browser/components/doh/test/browser/browser_policyOverride.js

@@ -6,8 +6,8 @@
 
 add_task(setup);
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 add_task(async function testPolicyOverride() {

browser/components/downloads/test/browser/browser_download_opens_policy.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 ChromeUtils.defineModuleGetter(

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

@@ -3,8 +3,11 @@
 "use strict";
 
 async function runWithDisabledPrivateBrowsing(callback) {
-  const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
+  const {
-    "resource://testing-common/EnterprisePolicyTesting.jsm"
+    EnterprisePolicyTesting,
+    PoliciesPrefTracker,
+  } = ChromeUtils.importESModule(
+    "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
   );
 
   PoliciesPrefTracker.start();

browser/components/extensions/test/browser/browser_unified_extensions_context_menu.js

@@ -11,8 +11,8 @@ ChromeUtils.defineModuleGetter(
   "resource://gre/modules/AbuseReporter.jsm"
 );
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 const { TelemetryTestUtils } = ChromeUtils.import(
   "resource://testing-common/TelemetryTestUtils.jsm"

browser/components/newtab/test/xpcshell/test_ASRouterTargeting_attribution.js

@@ -13,8 +13,8 @@ const { ASRouterTargeting } = ChromeUtils.import(
 const { MacAttribution } = ChromeUtils.import(
   "resource:///modules/MacAttribution.jsm"
 );
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 add_task(async function check_attribution_data() {

browser/components/preferences/tests/browser_connection_dnsoverhttps.js

@@ -5,8 +5,11 @@
 
 requestLongerTimeout(4);
 
-const { EnterprisePolicyTesting, PoliciesPrefTracker } = ChromeUtils.import(
+const {
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  EnterprisePolicyTesting,
+  PoliciesPrefTracker,
+} = ChromeUtils.importESModule(
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 ChromeUtils.defineModuleGetter(

browser/components/preferences/tests/browser_moreFromMozilla.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 let { TelemetryTestUtils } = ChromeUtils.import(

browser/components/preferences/tests/browser_moreFromMozilla_locales.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 let { Region } = ChromeUtils.import("resource://gre/modules/Region.jsm");

browser/components/preferences/tests/browser_site_login_exceptions_policy.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 const PERMISSIONS_URL =

browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js

@@ -8,12 +8,12 @@
  */
 
 ChromeUtils.defineESModuleGetters(this, {
+  EnterprisePolicyTesting:
+    "resource://testing-common/EnterprisePolicyTesting.sys.mjs",
   UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  EnterprisePolicyTesting:
-    "resource://testing-common/EnterprisePolicyTesting.jsm",
   sinon: "resource://testing-common/Sinon.jsm",
 });
 

netwerk/test/unit/test_trr_enterprise_policy.js

@@ -24,8 +24,8 @@ updateAppInfo({
   platformVersion: "48",
 });
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 // This initializes the policy engine for xpcshell tests

toolkit/components/backgroundtasks/tests/BackgroundTask_policies.jsm

@@ -8,8 +8,8 @@ var EXPORTED_SYMBOLS = ["runBackgroundTask"];
 const { Checker } = ChromeUtils.import(
   "resource://gre/modules/UpdateService.jsm"
 );
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 async function runBackgroundTask(commandLine) {

toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_policies.js

@@ -18,8 +18,8 @@ updateAppInfo({
   platformVersion: "48",
 });
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 // This initializes the policy engine for xpcshell tests

toolkit/components/enterprisepolicies/EnterprisePoliciesParent.sys.mjs

@@ -11,13 +11,13 @@ const { AppConstants } = ChromeUtils.import(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  Policies: "resource:///modules/policies/Policies.sys.mjs",
   WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.sys.mjs",
   macOSPoliciesParser:
     "resource://gre/modules/policies/macOSPoliciesParser.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  Policies: "resource:///modules/policies/Policies.jsm",
   JsonSchemaValidator:
     "resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
 });

toolkit/components/enterprisepolicies/tests/EnterprisePolicyTesting.sys.mjs

@@ -102,8 +102,8 @@ export var PoliciesPrefTracker = {
   _originalValues: new Map(),
 
   start() {
-    let { PoliciesUtils } = ChromeUtils.import(
+    let { PoliciesUtils } = ChromeUtils.importESModule(
-      "resource:///modules/policies/Policies.jsm"
+      "resource:///modules/policies/Policies.sys.mjs"
     );
     this._originalFunc = PoliciesUtils.setDefaultPref;
     PoliciesUtils.setDefaultPref = this.hoistedSetDefaultPref.bind(this);
@@ -112,8 +112,8 @@ export var PoliciesPrefTracker = {
   stop() {
     this.restoreDefaultValues();
 
-    let { PoliciesUtils } = ChromeUtils.import(
+    let { PoliciesUtils } = ChromeUtils.importESModule(
-      "resource:///modules/policies/Policies.jsm"
+      "resource:///modules/policies/Policies.sys.mjs"
     );
     PoliciesUtils.setDefaultPref = this._originalFunc;
     this._originalFunc = null;

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

@@ -4,8 +4,8 @@
 "use strict";
 
 add_task(async function test_simple_policies() {
-  let { Policies } = ChromeUtils.import(
+  let { Policies } = ChromeUtils.importESModule(
-    "resource:///modules/policies/Policies.jsm"
+    "resource:///modules/policies/Policies.sys.mjs"
   );
 
   let policy0Ran = false,

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

@@ -6,8 +6,8 @@
 const PREF_DISALLOW_ENTERPRISE = "browser.policies.testing.disallowEnterprise";
 
 add_task(async function test_enterprise_only_policies() {
-  let { Policies } = ChromeUtils.import(
+  let { Policies } = ChromeUtils.importESModule(
-    "resource:///modules/policies/Policies.jsm"
+    "resource:///modules/policies/Policies.sys.mjs"
   );
 
   let normalPolicyRan = false,

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

@@ -12,8 +12,8 @@ add_task(async function setup_preferences() {
 });
 
 add_task(async function test_gpo_policies() {
-  let { Policies } = ChromeUtils.import(
+  let { Policies } = ChromeUtils.importESModule(
-    "resource:///modules/policies/Policies.jsm"
+    "resource:///modules/policies/Policies.sys.mjs"
   );
 
   let gpoPolicyRan = false;
@@ -68,8 +68,8 @@ add_task(async function test_gpo_policies() {
 });
 
 add_task(async function test_gpo_json_policies() {
-  let { Policies } = ChromeUtils.import(
+  let { Policies } = ChromeUtils.importESModule(
-    "resource:///modules/policies/Policies.jsm"
+    "resource:///modules/policies/Policies.sys.mjs"
   );
 
   let gpoPolicyRan = false;
@@ -154,8 +154,8 @@ add_task(async function test_gpo_json_policies() {
 });
 
 add_task(async function test_gpo_broken_json_policies() {
-  let { Policies } = ChromeUtils.import(
+  let { Policies } = ChromeUtils.importESModule(
-    "resource:///modules/policies/Policies.jsm"
+    "resource:///modules/policies/Policies.sys.mjs"
   );
 
   let gpoPolicyRan = false;

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

@@ -4,8 +4,8 @@ const PREF_DISABLE_SECURITY =
   "security.turn_off_all_security_so_that_" +
   "viruses_can_take_over_this_computer";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 // Setting PREF_DISABLE_SECURITY tells the policy engine that we are in testing

toolkit/modules/tests/xpcshell/test_BrowserUtils.js

@@ -9,8 +9,8 @@ const { BrowserUtils } = ChromeUtils.import(
   "resource://gre/modules/BrowserUtils.jsm"
 );
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 const { Region } = ChromeUtils.import("resource://gre/modules/Region.jsm");

toolkit/mozapps/downloads/tests/browser/browser_unknownContentType_policy.js

@@ -3,8 +3,8 @@
 
 "use strict";
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 const TEST_PATH = getRootDirectory(gTestPath).replace(

toolkit/mozapps/extensions/test/browser/browser_webapi_install.js

@@ -8,8 +8,8 @@ const { AddonTestUtils } = ChromeUtils.import(
   "resource://testing-common/AddonTestUtils.jsm"
 );
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 const TESTPATH = "webapi_checkavailable.html";

toolkit/mozapps/extensions/test/xpcshell/test_system_update_enterprisepolicy.js

@@ -5,8 +5,8 @@
 // This test verifies that system addon updates are correctly blocked by the
 // DisableSystemAddonUpdate enterprise policy.
 
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 
 // Setting PREF_DISABLE_SECURITY tells the policy engine that we are in testing

toolkit/mozapps/update/tests/unit_background_update/test_backgroundupdate_reason_update.js

@@ -11,8 +11,8 @@ const { BackgroundUpdate } = ChromeUtils.import(
 );
 let reasons = () => BackgroundUpdate._reasonsToNotUpdateInstallation();
 let REASON = BackgroundUpdate.REASON;
-const { EnterprisePolicyTesting } = ChromeUtils.import(
+const { EnterprisePolicyTesting } = ChromeUtils.importESModule(
-  "resource://testing-common/EnterprisePolicyTesting.jsm"
+  "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
 const { UpdateService } = ChromeUtils.import(
   "resource://gre/modules/UpdateService.jsm"