From d0d41ac35f4f7b7d5f3b0fd65cef901dea0adf9c Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Fri, 17 Mar 2023 06:34:35 +0000 Subject: [PATCH] Bug 1822792 - Convert ModuleManager's resouces to ESM. r=geckoview-reviewers,extension-reviewers,owlish Differential Revision: https://phabricator.services.mozilla.com/D172781 --- mobile/android/chrome/geckoview/geckoview.js | 22 +++++++++---------- .../components/extensions/ext-android.js | 7 +----- .../android/components/extensions/ext-tabs.js | 7 +----- ...ewContent.jsm => GeckoViewContent.sys.mjs} | 10 ++------- ...g.jsm => GeckoViewContentBlocking.sys.mjs} | 10 ++------- ...trol.jsm => GeckoViewMediaControl.sys.mjs} | 10 ++------- ...gation.jsm => GeckoViewNavigation.sys.mjs} | 15 ++++--------- ...sm => GeckoViewProcessHangMonitor.sys.mjs} | 10 ++------- ...Progress.jsm => GeckoViewProgress.sys.mjs} | 14 +++--------- ...n.jsm => GeckoViewSelectionAction.sys.mjs} | 10 ++------- ...Settings.jsm => GeckoViewSettings.sys.mjs} | 16 ++++---------- ...{GeckoViewTab.jsm => GeckoViewTab.sys.mjs} | 15 ++++--------- .../geckoview/GeckoViewWebExtension.jsm | 2 +- mobile/android/modules/geckoview/moz.build | 18 +++++++-------- .../modules/test/AppUiTestDelegate.jsm | 2 +- 15 files changed, 49 insertions(+), 119 deletions(-) rename mobile/android/modules/geckoview/{GeckoViewContent.jsm => GeckoViewContent.sys.mjs} (98%) rename mobile/android/modules/geckoview/{GeckoViewContentBlocking.jsm => GeckoViewContentBlocking.sys.mjs} (92%) rename mobile/android/modules/geckoview/{GeckoViewMediaControl.jsm => GeckoViewMediaControl.sys.mjs} (96%) rename mobile/android/modules/geckoview/{GeckoViewNavigation.jsm => GeckoViewNavigation.sys.mjs} (98%) rename mobile/android/modules/geckoview/{GeckoViewProcessHangMonitor.jsm => GeckoViewProcessHangMonitor.sys.mjs} (95%) rename mobile/android/modules/geckoview/{GeckoViewProgress.jsm => GeckoViewProgress.sys.mjs} (98%) rename mobile/android/modules/geckoview/{GeckoViewSelectionAction.jsm => GeckoViewSelectionAction.sys.mjs} (77%) rename mobile/android/modules/geckoview/{GeckoViewSettings.jsm => GeckoViewSettings.sys.mjs} (93%) rename mobile/android/modules/geckoview/{GeckoViewTab.jsm => GeckoViewTab.sys.mjs} (94%) diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js index db9de5121a6c..2280ad9d6957 100644 --- a/mobile/android/chrome/geckoview/geckoview.js +++ b/mobile/android/chrome/geckoview/geckoview.js @@ -15,6 +15,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", EventDispatcher: "resource://gre/modules/Messaging.sys.mjs", GeckoViewActorManager: "resource://gre/modules/GeckoViewActorManager.sys.mjs", + GeckoViewSettings: "resource://gre/modules/GeckoViewSettings.sys.mjs", GeckoViewUtils: "resource://gre/modules/GeckoViewUtils.sys.mjs", RemoteSecuritySettings: "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs", @@ -22,7 +23,6 @@ ChromeUtils.defineESModuleGetters(this, { XPCOMUtils.defineLazyModuleGetters(this, { Blocklist: "resource://gre/modules/Blocklist.jsm", - GeckoViewSettings: "resource://gre/modules/GeckoViewSettings.jsm", HistogramStopwatch: "resource://gre/modules/GeckoViewTelemetry.jsm", InitializationTracker: "resource://gre/modules/GeckoViewTelemetry.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", @@ -425,7 +425,7 @@ class ModuleInfo { return; } - const exports = ChromeUtils.import(aPhase.resource); + const exports = ChromeUtils.importESModule(aPhase.resource); this._impl = new exports[this._name](this); } @@ -565,7 +565,7 @@ function startup() { { name: "GeckoViewContent", onInit: { - resource: "resource://gre/modules/GeckoViewContent.jsm", + resource: "resource://gre/modules/GeckoViewContent.sys.mjs", actors: { GeckoViewContent: { parent: { @@ -612,19 +612,19 @@ function startup() { { name: "GeckoViewNavigation", onInit: { - resource: "resource://gre/modules/GeckoViewNavigation.jsm", + resource: "resource://gre/modules/GeckoViewNavigation.sys.mjs", }, }, { name: "GeckoViewProcessHangMonitor", onInit: { - resource: "resource://gre/modules/GeckoViewProcessHangMonitor.jsm", + resource: "resource://gre/modules/GeckoViewProcessHangMonitor.sys.mjs", }, }, { name: "GeckoViewProgress", onEnable: { - resource: "resource://gre/modules/GeckoViewProgress.jsm", + resource: "resource://gre/modules/GeckoViewProgress.sys.mjs", actors: { ProgressDelegate: { parent: { @@ -665,7 +665,7 @@ function startup() { { name: "GeckoViewSelectionAction", onEnable: { - resource: "resource://gre/modules/GeckoViewSelectionAction.jsm", + resource: "resource://gre/modules/GeckoViewSelectionAction.sys.mjs", actors: { SelectionActionDelegate: { parent: { @@ -688,7 +688,7 @@ function startup() { { name: "GeckoViewSettings", onInit: { - resource: "resource://gre/modules/GeckoViewSettings.jsm", + resource: "resource://gre/modules/GeckoViewSettings.sys.mjs", actors: { GeckoViewSettings: { child: { @@ -701,13 +701,13 @@ function startup() { { name: "GeckoViewTab", onInit: { - resource: "resource://gre/modules/GeckoViewTab.jsm", + resource: "resource://gre/modules/GeckoViewTab.sys.mjs", }, }, { name: "GeckoViewContentBlocking", onInit: { - resource: "resource://gre/modules/GeckoViewContentBlocking.jsm", + resource: "resource://gre/modules/GeckoViewContentBlocking.sys.mjs", }, }, { @@ -763,7 +763,7 @@ function startup() { { name: "GeckoViewMediaControl", onEnable: { - resource: "resource://gre/modules/GeckoViewMediaControl.jsm", + resource: "resource://gre/modules/GeckoViewMediaControl.sys.mjs", actors: { MediaControlDelegate: { parent: { diff --git a/mobile/android/components/extensions/ext-android.js b/mobile/android/components/extensions/ext-android.js index 1f2d4028d596..b4040e808f58 100644 --- a/mobile/android/components/extensions/ext-android.js +++ b/mobile/android/components/extensions/ext-android.js @@ -4,15 +4,10 @@ "use strict"; ChromeUtils.defineESModuleGetters(this, { + GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", }); -ChromeUtils.defineModuleGetter( - this, - "GeckoViewTabBridge", - "resource://gre/modules/GeckoViewTab.jsm" -); - ChromeUtils.defineModuleGetter( this, "mobileWindowTracker", diff --git a/mobile/android/components/extensions/ext-tabs.js b/mobile/android/components/extensions/ext-tabs.js index d2bc7ec8b65e..e9b29479d987 100644 --- a/mobile/android/components/extensions/ext-tabs.js +++ b/mobile/android/components/extensions/ext-tabs.js @@ -7,15 +7,10 @@ "use strict"; ChromeUtils.defineESModuleGetters(this, { + GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.sys.mjs", PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs", }); -ChromeUtils.defineModuleGetter( - this, - "GeckoViewTabBridge", - "resource://gre/modules/GeckoViewTab.jsm" -); - ChromeUtils.defineModuleGetter( this, "mobileWindowTracker", diff --git a/mobile/android/modules/geckoview/GeckoViewContent.jsm b/mobile/android/modules/geckoview/GeckoViewContent.sys.mjs similarity index 98% rename from mobile/android/modules/geckoview/GeckoViewContent.jsm rename to mobile/android/modules/geckoview/GeckoViewContent.sys.mjs index c3948911cc4e..c7c18a7c226c 100644 --- a/mobile/android/modules/geckoview/GeckoViewContent.jsm +++ b/mobile/android/modules/geckoview/GeckoViewContent.sys.mjs @@ -2,15 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewContent"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -class GeckoViewContent extends GeckoViewModule { +export class GeckoViewContent extends GeckoViewModule { onInit() { this.registerListener([ "GeckoViewContent:ExitFullScreen", diff --git a/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm b/mobile/android/modules/geckoview/GeckoViewContentBlocking.sys.mjs similarity index 92% rename from mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm rename to mobile/android/modules/geckoview/GeckoViewContentBlocking.sys.mjs index 018a83293703..d5d125444f9a 100644 --- a/mobile/android/modules/geckoview/GeckoViewContentBlocking.jsm +++ b/mobile/android/modules/geckoview/GeckoViewContentBlocking.sys.mjs @@ -2,15 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewContentBlocking"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -class GeckoViewContentBlocking extends GeckoViewModule { +export class GeckoViewContentBlocking extends GeckoViewModule { onEnable() { const flags = Ci.nsIWebProgress.NOTIFY_CONTENT_BLOCKING; this.progressFilter = Cc[ diff --git a/mobile/android/modules/geckoview/GeckoViewMediaControl.jsm b/mobile/android/modules/geckoview/GeckoViewMediaControl.sys.mjs similarity index 96% rename from mobile/android/modules/geckoview/GeckoViewMediaControl.jsm rename to mobile/android/modules/geckoview/GeckoViewMediaControl.sys.mjs index 9bcfe1acce29..ee7d95fc9b94 100644 --- a/mobile/android/modules/geckoview/GeckoViewMediaControl.jsm +++ b/mobile/android/modules/geckoview/GeckoViewMediaControl.sys.mjs @@ -2,15 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewMediaControl"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -class GeckoViewMediaControl extends GeckoViewModule { +export class GeckoViewMediaControl extends GeckoViewModule { onInit() { debug`onInit`; } diff --git a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm b/mobile/android/modules/geckoview/GeckoViewNavigation.sys.mjs similarity index 98% rename from mobile/android/modules/geckoview/GeckoViewNavigation.jsm rename to mobile/android/modules/geckoview/GeckoViewNavigation.sys.mjs index 8aec08322075..5545b0aecd4f 100644 --- a/mobile/android/modules/geckoview/GeckoViewNavigation.jsm +++ b/mobile/android/modules/geckoview/GeckoViewNavigation.sys.mjs @@ -2,16 +2,8 @@ * 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/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["GeckoViewNavigation"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -44,6 +36,7 @@ const FORBIDDEN_HEADER_CHARACTERS = ["\n", "\r"]; // Keep in sync with GeckoSession.java const HEADER_FILTER_CORS_SAFELISTED = 1; +// eslint-disable-next-line no-unused-vars const HEADER_FILTER_UNRESTRICTED_UNSAFE = 2; // Create default ReferrerInfo instance for the given referrer URI string. @@ -95,7 +88,7 @@ function convertFlags(aFlags) { // Dispatches GeckoView:LocationChange to the GeckoView on location change when // active. // Implements nsIBrowserDOMWindow. -class GeckoViewNavigation extends GeckoViewModule { +export class GeckoViewNavigation extends GeckoViewModule { onInitBrowser() { this.window.browserDOMWindow = this; diff --git a/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm b/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs similarity index 95% rename from mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm rename to mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs index 41e3c71ff182..7f6f14a29e32 100644 --- a/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.jsm +++ b/mobile/android/modules/geckoview/GeckoViewProcessHangMonitor.sys.mjs @@ -2,15 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewProcessHangMonitor"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -class GeckoViewProcessHangMonitor extends GeckoViewModule { +export class GeckoViewProcessHangMonitor extends GeckoViewModule { constructor(aModuleInfo) { super(aModuleInfo); diff --git a/mobile/android/modules/geckoview/GeckoViewProgress.jsm b/mobile/android/modules/geckoview/GeckoViewProgress.sys.mjs similarity index 98% rename from mobile/android/modules/geckoview/GeckoViewProgress.jsm rename to mobile/android/modules/geckoview/GeckoViewProgress.sys.mjs index 1f5a2df8a47a..4606a52b99e2 100644 --- a/mobile/android/modules/geckoview/GeckoViewProgress.jsm +++ b/mobile/android/modules/geckoview/GeckoViewProgress.sys.mjs @@ -2,16 +2,8 @@ * 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/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["GeckoViewProgress"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -506,7 +498,7 @@ class SecurityTracker extends Tracker { } } -class GeckoViewProgress extends GeckoViewModule { +export class GeckoViewProgress extends GeckoViewModule { onEnable() { debug`onEnable`; diff --git a/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm b/mobile/android/modules/geckoview/GeckoViewSelectionAction.sys.mjs similarity index 77% rename from mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm rename to mobile/android/modules/geckoview/GeckoViewSelectionAction.sys.mjs index 06744af05d60..07498e4b00dc 100644 --- a/mobile/android/modules/geckoview/GeckoViewSelectionAction.jsm +++ b/mobile/android/modules/geckoview/GeckoViewSelectionAction.sys.mjs @@ -2,15 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewSelectionAction"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -class GeckoViewSelectionAction extends GeckoViewModule { +export class GeckoViewSelectionAction extends GeckoViewModule { onEnable() { debug`onEnable`; this.registerListener(["GeckoView:ExecuteSelectionAction"]); diff --git a/mobile/android/modules/geckoview/GeckoViewSettings.jsm b/mobile/android/modules/geckoview/GeckoViewSettings.sys.mjs similarity index 93% rename from mobile/android/modules/geckoview/GeckoViewSettings.jsm rename to mobile/android/modules/geckoview/GeckoViewSettings.sys.mjs index 549f53107be9..a88c51b24a38 100644 --- a/mobile/android/modules/geckoview/GeckoViewSettings.jsm +++ b/mobile/android/modules/geckoview/GeckoViewSettings.sys.mjs @@ -2,17 +2,8 @@ * 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/. */ -"use strict"; - -var EXPORTED_SYMBOLS = ["GeckoViewSettings"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); - -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; @@ -45,11 +36,12 @@ const DISPLAY_MODE_STANDALONE = 2; const DISPLAY_MODE_FULLSCREEN = 3; // This needs to match GeckoSessionSettings.java +// eslint-disable-next-line no-unused-vars const VIEWPORT_MODE_MOBILE = 0; const VIEWPORT_MODE_DESKTOP = 1; // Handles GeckoSession settings. -class GeckoViewSettings extends GeckoViewModule { +export class GeckoViewSettings extends GeckoViewModule { onInit() { debug`onInit`; this._userAgentMode = USER_AGENT_MODE_MOBILE; diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.sys.mjs similarity index 94% rename from mobile/android/modules/geckoview/GeckoViewTab.jsm rename to mobile/android/modules/geckoview/GeckoViewTab.sys.mjs index 52d3a5c9356c..aa049ff32e71 100644 --- a/mobile/android/modules/geckoview/GeckoViewTab.jsm +++ b/mobile/android/modules/geckoview/GeckoViewTab.sys.mjs @@ -2,16 +2,9 @@ * 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/. */ -"use strict"; +import { GeckoViewModule } from "resource://gre/modules/GeckoViewModule.sys.mjs"; +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; -var EXPORTED_SYMBOLS = ["GeckoViewTab", "GeckoViewTabBridge"]; - -const { GeckoViewModule } = ChromeUtils.importESModule( - "resource://gre/modules/GeckoViewModule.sys.mjs" -); -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); const { ExtensionUtils } = ChromeUtils.import( "resource://gre/modules/ExtensionUtils.jsm" ); @@ -53,7 +46,7 @@ class Tab { // we choose a value that is unlikely to overlap with Fennec's tab IDs. const TAB_ID_BASE = 10000; -const GeckoViewTabBridge = { +export const GeckoViewTabBridge = { /** * Converts windowId to tabId as in GeckoView every browser window has exactly one tab. * @@ -206,7 +199,7 @@ const GeckoViewTabBridge = { }, }; -class GeckoViewTab extends GeckoViewModule { +export class GeckoViewTab extends GeckoViewModule { onInit() { const { window } = this; if (!window.tab) { diff --git a/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm b/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm index 5814dbec5f23..dbd5bdb4bd96 100644 --- a/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm +++ b/mobile/android/modules/geckoview/GeckoViewWebExtension.jsm @@ -31,6 +31,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { EventDispatcher: "resource://gre/modules/Messaging.sys.mjs", + GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", }); @@ -39,7 +40,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { Extension: "resource://gre/modules/Extension.jsm", ExtensionData: "resource://gre/modules/Extension.jsm", ExtensionPermissions: "resource://gre/modules/ExtensionPermissions.jsm", - GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.jsm", Management: "resource://gre/modules/Extension.jsm", }); diff --git a/mobile/android/modules/geckoview/moz.build b/mobile/android/modules/geckoview/moz.build index 13116ead7e12..ad1cb3008507 100644 --- a/mobile/android/modules/geckoview/moz.build +++ b/mobile/android/modules/geckoview/moz.build @@ -16,20 +16,20 @@ EXTRA_JS_MODULES += [ "GeckoViewAutofill.jsm", "GeckoViewChildModule.jsm", "GeckoViewConsole.jsm", - "GeckoViewContent.jsm", - "GeckoViewContentBlocking.jsm", - "GeckoViewMediaControl.jsm", + "GeckoViewContent.sys.mjs", + "GeckoViewContentBlocking.sys.mjs", + "GeckoViewMediaControl.sys.mjs", "GeckoViewModule.sys.mjs", - "GeckoViewNavigation.jsm", - "GeckoViewProcessHangMonitor.jsm", - "GeckoViewProgress.jsm", + "GeckoViewNavigation.sys.mjs", + "GeckoViewProcessHangMonitor.sys.mjs", + "GeckoViewProgress.sys.mjs", "GeckoViewPushController.jsm", "GeckoViewRemoteDebugger.jsm", - "GeckoViewSelectionAction.jsm", + "GeckoViewSelectionAction.sys.mjs", "GeckoViewSessionStore.jsm", - "GeckoViewSettings.jsm", + "GeckoViewSettings.sys.mjs", "GeckoViewStorageController.jsm", - "GeckoViewTab.jsm", + "GeckoViewTab.sys.mjs", "GeckoViewTelemetry.jsm", "GeckoViewTestUtils.jsm", "GeckoViewUtils.sys.mjs", diff --git a/mobile/android/modules/test/AppUiTestDelegate.jsm b/mobile/android/modules/test/AppUiTestDelegate.jsm index b5c49736fbbe..5b86fe94f910 100644 --- a/mobile/android/modules/test/AppUiTestDelegate.jsm +++ b/mobile/android/modules/test/AppUiTestDelegate.jsm @@ -14,11 +14,11 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { EventDispatcher: "resource://gre/modules/Messaging.sys.mjs", + GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { mobileWindowTracker: "resource://gre/modules/GeckoViewWebExtension.jsm", - GeckoViewTabBridge: "resource://gre/modules/GeckoViewTab.jsm", }); const TEST_SUPPORT_EXTENSION_ID = "test-runner-support@tests.mozilla.org";