Bug 1814275 - Port bug 1795255: Stop importing useless modules in browser tests. r=freaktechnik

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

--HG--
extra : rebase_source : fcf39ce267d9d7be88bf261c98c1db28c587b63f

calendar/test/browser/browser_calendarUnifinder.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
+
 const { mailTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/MailTestUtils.jsm"
 );

calendar/test/browser/browser_dragEventItem.js

@@ -6,7 +6,6 @@
  * Test dragging of events in the various calendar views.
  */
 const { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",

calendar/test/browser/browser_eventDisplay.js

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
-
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",
 });

calendar/test/browser/browser_eventUndoRedo.js

@@ -8,7 +8,6 @@
  * Tests for ensuring the undo/redo options are enabled properly when
  * manipulating events.
  */
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",

calendar/test/browser/browser_taskDelete.js

@@ -9,7 +9,6 @@ const { mailTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 const { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",

calendar/test/browser/browser_taskDisplay.js

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
-
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalRecurrenceInfo: "resource:///modules/CalRecurrenceInfo.jsm",
   CalTodo: "resource:///modules/CalTodo.jsm",

calendar/test/browser/browser_taskUndoRedo.js

@@ -9,8 +9,6 @@
  * manipulating tasks.
  */
 
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
-
 var { mailTestUtils } = ChromeUtils.import("resource://testing-common/mailnews/MailTestUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {

calendar/test/browser/browser_todayPane.js

@@ -8,7 +8,6 @@ var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 var { formatDate, formatTime } = ChromeUtils.import(
   "resource://testing-common/calendar/ItemEditingHelpers.jsm"
 );
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalDateTime: "resource:///modules/CalDateTime.jsm",

calendar/test/browser/contextMenu/browser_edit.js

@@ -6,7 +6,6 @@ const { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 const { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",

calendar/test/browser/eventDialog/browser_eventDialog.js

@@ -11,7 +11,6 @@ var { cancelItemDialog, formatTime, saveAndCloseItemDialog, setData } = ChromeUt
   "resource://testing-common/calendar/ItemEditingHelpers.jsm"
 );
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",

calendar/test/browser/eventDialog/browser_eventDialogEditButton.js

@@ -7,7 +7,6 @@
  */
 
 const { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-const { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   CalEvent: "resource:///modules/CalEvent.jsm",

calendar/test/browser/invitations/browser_attachedPublishEvent.js

@@ -12,7 +12,6 @@ var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"
 );
 
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var gCalendar;

calendar/test/browser/invitations/browser_identityPrompt.js

@@ -8,7 +8,6 @@
 
 "use strict";
 
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 

calendar/test/browser/invitations/browser_imipBar.js

@@ -11,7 +11,6 @@ var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 var { CalItipDefaultEmailTransport } = ChromeUtils.import(
   "resource:///modules/CalItipEmailTransport.jsm"
 );
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarCancel.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarExceptionCancel.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarExceptionOnly.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarExceptions.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarRepeat.js

@@ -8,7 +8,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarRepeatCancel.js

@@ -8,7 +8,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarRepeatUpdates.js

@@ -10,7 +10,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_imipBarUpdates.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/browser_unsupportedFreq.js

@@ -9,7 +9,6 @@
 "use strict";
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { CalendarTestUtils } = ChromeUtils.import(

calendar/test/browser/invitations/head.js

@@ -15,7 +15,6 @@ var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
 var { CalItipDefaultEmailTransport } = ChromeUtils.import(
   "resource:///modules/CalItipEmailTransport.jsm"
 );
-var { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
 var { MailServices } = ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var { FileTestUtils } = ChromeUtils.importESModule(

calendar/test/browser/preferences/browser_alarmDefaultValue.js

@@ -7,7 +7,6 @@
  */
 
 var { cal } = ChromeUtils.import("resource:///modules/calendar/calUtils.jsm");
-var { PluralForm } = ChromeUtils.importESModule("resource://gre/modules/PluralForm.sys.mjs");
 
 var { CalendarTestUtils } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarTestUtils.jsm"

calendar/test/browser/providers/head.js

@@ -12,7 +12,6 @@ var { handleDeleteOccurrencePrompt } = ChromeUtils.import(
   "resource://testing-common/calendar/CalendarUtils.jsm"
 );
 
-var { PromiseUtils } = ChromeUtils.importESModule("resource://gre/modules/PromiseUtils.sys.mjs");
 var { saveAndCloseItemDialog, setData } = ChromeUtils.import(
   "resource://testing-common/calendar/ItemEditingHelpers.jsm"
 );

mail/base/test/browser/browser_linkHandler.js

@@ -7,9 +7,6 @@
 let { MockRegistrar } = ChromeUtils.importESModule(
   "resource://testing-common/MockRegistrar.sys.mjs"
 );
-let { PromiseUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/PromiseUtils.sys.mjs"
-);
 
 const TEST_DOMAIN = "http://example.org";
 const TEST_IP = "http://127.0.0.1:8888";

mail/base/test/browser/browser_selectionWidgetController.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 var tabInfo;
 var win;
 

mail/base/test/webextensions/head.js

@@ -15,9 +15,6 @@ const gBrowserBundle = Services.strings.createBundle(
   "chrome://messenger/locale/addons.properties"
 );
 
-var { ExtensionsUI } = ChromeUtils.import(
-  "resource:///modules/ExtensionsUI.jsm"
-);
 ChromeUtils.defineModuleGetter(
   this,
   "Management",

mail/components/cloudfile/test/browser/browser_repeat_upload.js

@@ -4,10 +4,6 @@
 
 /* import-globals-from ../../../../base/content/mailWindowOverlay.js */
 
-const { BrowserTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/BrowserTestUtils.sys.mjs"
-);
-
 let { cloudFileAccounts } = ChromeUtils.import(
   "resource:///modules/cloudFileAccounts.jsm"
 );

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

@@ -10,9 +10,6 @@ const {
 } = ChromeUtils.importESModule(
   "resource://testing-common/EnterprisePolicyTesting.sys.mjs"
 );
-const { TestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/TestUtils.sys.mjs"
-);
 
 PoliciesPrefTracker.start();
 

mail/components/extensions/test/browser/browser_ext_browserAction.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 

mail/components/extensions/test/browser/browser_ext_browserAction_popup_click.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 

mail/components/extensions/test/browser/browser_ext_browserAction_popup_click_mv3_event_pages.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 

mail/components/extensions/test/browser/browser_ext_commands_execute_compose_action.js

@@ -2,10 +2,6 @@
 /* vim: set sts=2 sw=2 et tw=80: */
 "use strict";
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 let gAccount;
 
 async function testExecuteComposeActionWithOptions(options = {}) {

mail/components/extensions/test/browser/browser_ext_composeAction.js

@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 let account;
 
 add_setup(async () => {

mail/components/extensions/test/browser/browser_ext_composeAction_popup_click.js

@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 let account;
 
 add_setup(async () => {

mail/components/extensions/test/browser/browser_ext_composeAction_popup_click_mv3_event_pages.js

@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 let account;
 
 add_setup(async () => {

mail/components/extensions/test/browser/browser_ext_messageDisplayAction.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 let tabmail = document.getElementById("tabmail");

mail/components/extensions/test/browser/browser_ext_messageDisplayAction_popup_click.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 let tabmail = document.getElementById("tabmail");

mail/components/extensions/test/browser/browser_ext_messageDisplayAction_popup_click_mv3_event_pages.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 let account;
 let messages;
 let tabmail = document.getElementById("tabmail");

mail/components/extensions/test/browser/browser_ext_spacesToolbar.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
-
 /**
  * Helper Function, creates a test extension to verify expected button states.
  *

mail/components/extensions/test/browser/browser_ext_windows.js

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-let { BrowserTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/BrowserTestUtils.sys.mjs"
-);
 let { MockRegistrar } = ChromeUtils.importESModule(
   "resource://testing-common/MockRegistrar.sys.mjs"
 );

mail/components/extensions/test/browser/browser_ext_windows_types.js

@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
 
-let { BrowserTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/BrowserTestUtils.sys.mjs"
-);
-
 add_task(async () => {
   let files = {
     "background.js": async () => {

mail/components/preferences/test/browser/browser_cloudfile.js

@@ -4,9 +4,6 @@
 
 /* eslint-env webextensions */
 
-let { AddonManager } = ChromeUtils.import(
-  "resource://gre/modules/AddonManager.jsm"
-);
 let { cloudFileAccounts } = ChromeUtils.import(
   "resource:///modules/cloudFileAccounts.jsm"
 );

mail/test/browser/account/browser_accountTelemetry.js

@@ -6,9 +6,7 @@
  */
 
 let { FeedUtils } = ChromeUtils.import("resource:///modules/FeedUtils.jsm");
-let { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 let { IMServices } = ChromeUtils.importESModule(
   "resource:///modules/IMServices.sys.mjs"
 );

mail/test/browser/composition/browser_addressWidgets.js

@@ -14,9 +14,7 @@ var { close_compose_window, open_compose_new_mail } = ChromeUtils.import(
 var { be_in_folder, FAKE_SERVER_HOSTNAME } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
+
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/composition/browser_attachment.js

@@ -30,10 +30,6 @@ var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
   "resource://testing-common/mozmill/WindowHelpers.jsm"
 );
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 var messenger;
 var folder;
 var epsilon;

mail/test/browser/composition/browser_attachmentDragDrop.js

@@ -9,9 +9,6 @@
 
 "use strict";
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 var { CloudFileTestProvider } = ChromeUtils.import(
   "resource://testing-common/mozmill/CloudfileHelpers.jsm"
 );

mail/test/browser/composition/browser_recipientPillsSelection.js

@@ -16,9 +16,6 @@ var {
 var { close_popup } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 
 var modifiers =
   AppConstants.platform == "macosx" ? { accelKey: true } : { ctrlKey: true };

mail/test/browser/composition/browser_replyCatchAll.js

@@ -30,10 +30,6 @@ var {
   "resource://testing-common/mozmill/NotificationBoxHelpers.jsm"
 );
 
-var { Assert } = ChromeUtils.importESModule(
-  "resource://testing-common/Assert.sys.mjs"
-);
-
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/composition/browser_sendButton.js

@@ -39,9 +39,6 @@ var {
   wait_for_modal_dialog,
 } = ChromeUtils.import("resource://testing-common/mozmill/WindowHelpers.jsm");
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/message-window/browser_emlSubject.js

@@ -15,10 +15,6 @@ var { close_window } = ChromeUtils.import(
   "resource://testing-common/mozmill/WindowHelpers.jsm"
 );
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
-
 async function check_eml_window_title(subject, eml) {
   let file = new FileUtils.File(getTestFilePath(`data/${eml}`));
   let msgc = await open_message_from_file(file);

mail/test/browser/notification/browser_notification.js

@@ -18,9 +18,6 @@ var {
   wait_for_window_close,
 } = ChromeUtils.import("resource://testing-common/mozmill/WindowHelpers.jsm");
 
-var { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
-);
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/browser_collectKeys.js

@@ -25,17 +25,13 @@ const {
 } = ChromeUtils.import(
   "resource://testing-common/mozmill/NotificationBoxHelpers.jsm"
 );
-
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-
 const { CollectedKeysDB } = ChromeUtils.import(
   "chrome://openpgp/content/modules/CollectedKeysDB.jsm"
 );

mail/test/browser/openpgp/browser_editDraftTemplate.js

@@ -26,9 +26,7 @@ var {
 var { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-var { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/browser_openPGPDrafts.js

@@ -23,9 +23,7 @@ const { close_window } = ChromeUtils.import(
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/browser_perm_decrypt.js

@@ -24,18 +24,13 @@ const { OpenPGPTestUtils } = ChromeUtils.import(
 const { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/PromiseTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { EnigmailPersistentCrypto } = ChromeUtils.import(
   "chrome://openpgp/content/modules/persistentCrypto.jsm"
 );
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 
 const MSG_TEXT = "Sundays are nothing without callaloo.";
 

mail/test/browser/openpgp/browser_viewMessage.js

@@ -42,9 +42,6 @@ const {
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/browser_viewMessageSecurity.js

@@ -40,15 +40,9 @@ const { SmimeUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/smimeUtils.jsm"
 );
 
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 
 const MSG_TEXT = "Sundays are nothing without callaloo.";
 

mail/test/browser/openpgp/browser_viewPartialMessage.js

@@ -23,13 +23,10 @@ const {
 } = ChromeUtils.import(
   "resource://testing-common/mozmill/NotificationBoxHelpers.jsm"
 );
-
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/composition/browser_composeEncrypted.js

@@ -26,9 +26,7 @@ const { close_window } = ChromeUtils.import(
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/composition/browser_composeSigned.js

@@ -23,9 +23,7 @@ const { open_compose_new_mail, setup_msg_contents } = ChromeUtils.import(
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/openpgp/composition/browser_composeSwitchIdentity.js

@@ -25,9 +25,7 @@ const { close_window } = ChromeUtils.import(
 const { OpenPGPTestUtils } = ChromeUtils.import(
   "resource://testing-common/mozmill/OpenPGPTestUtils.jsm"
 );
-const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
+
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/pref-window/browser_fontChooser.js

@@ -25,9 +25,6 @@ var { wait_for_frame_load } = ChromeUtils.import(
   "resource://testing-common/mozmill/WindowHelpers.jsm"
 );
 
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 var { Preferences } = ChromeUtils.importESModule(
   "resource://gre/modules/Preferences.sys.mjs"
 );

mail/test/browser/session-store/browser_sessionStore.js

@@ -45,9 +45,6 @@ var {
   wait_for_window_close,
 } = ChromeUtils.import("resource://testing-common/mozmill/WindowHelpers.jsm");
 
-var { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
 var { SessionStoreManager } = ChromeUtils.import(
   "resource:///modules/SessionStoreManager.jsm"
 );

mail/test/browser/smime/browser_multipartAlternative.js

@@ -31,9 +31,6 @@ var { close_window } = ChromeUtils.import(
   "resource://testing-common/mozmill/WindowHelpers.jsm"
 );
 
-var { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
-);
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );

mail/test/browser/tabmail/browser_closing.js

@@ -23,12 +23,6 @@ var {
 } = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
-var { BrowserTestUtils } = ChromeUtils.importESModule(
-  "resource://testing-common/BrowserTestUtils.sys.mjs"
-);
-var { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
-);
 
 var gFolder;