diff --git a/accessible/tests/browser/events/browser_test_focus_urlbar.js b/accessible/tests/browser/events/browser_test_focus_urlbar.js index 69e14d0591a4..77fde86fae70 100644 --- a/accessible/tests/browser/events/browser_test_focus_urlbar.js +++ b/accessible/tests/browser/events/browser_test_focus_urlbar.js @@ -13,14 +13,11 @@ loadScripts( ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvider: "resource:///modules/UrlbarUtils.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", + UrlbarProvider: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); function isEventForAutocompleteItem(event) { diff --git a/accessible/tests/browser/events/browser_test_selection_urlbar.js b/accessible/tests/browser/events/browser_test_selection_urlbar.js index 86ffc3e88660..0fb117bad13e 100644 --- a/accessible/tests/browser/events/browser_test_selection_urlbar.js +++ b/accessible/tests/browser/events/browser_test_selection_urlbar.js @@ -6,9 +6,12 @@ /* import-globals-from ../../mochitest/role.js */ loadScripts({ name: "role.js", dir: MOCHITESTS_DIR }); +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { BrowserTestUtils: "resource://testing-common/BrowserTestUtils.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", }); // Check that the URL bar manages accessibility diff --git a/accessible/tests/browser/general/browser_test_urlbar.js b/accessible/tests/browser/general/browser_test_urlbar.js index 8c0c7797b567..6b5dfa283d65 100644 --- a/accessible/tests/browser/general/browser_test_urlbar.js +++ b/accessible/tests/browser/general/browser_test_urlbar.js @@ -4,8 +4,8 @@ "use strict"; -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); // Checking that the awesomebar popup gets COMBOBOX_LIST role instead of diff --git a/browser/actors/AboutPrivateBrowsingParent.jsm b/browser/actors/AboutPrivateBrowsingParent.jsm index 54991c23275d..8218d6d12ba7 100644 --- a/browser/actors/AboutPrivateBrowsingParent.jsm +++ b/browser/actors/AboutPrivateBrowsingParent.jsm @@ -32,8 +32,11 @@ XPCOMUtils.defineLazyPreferenceGetter( false ); +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.jsm", }); diff --git a/browser/actors/ContentSearchParent.jsm b/browser/actors/ContentSearchParent.jsm index 4fda7ed012a5..35b5ba735660 100644 --- a/browser/actors/ContentSearchParent.jsm +++ b/browser/actors/ContentSearchParent.jsm @@ -16,12 +16,13 @@ ChromeUtils.defineESModuleGetters(lazy, { SearchSuggestionController: "resource://gre/modules/SearchSuggestionController.sys.mjs", + + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { FormHistory: "resource://gre/modules/FormHistory.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", }); const MAX_LOCAL_SUGGESTIONS = 3; diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index bd10bcc284f5..5fd4e3d9c59e 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -18,6 +18,13 @@ ChromeUtils.defineESModuleGetters(this, { PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs", PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarInput: "resource:///modules/UrlbarInput.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderSearchTips: + "resource:///modules/UrlbarProviderSearchTips.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -84,12 +91,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { Translation: "resource:///modules/translation/TranslationParent.jsm", UITour: "resource:///modules/UITour.jsm", UpdateUtils: "resource://gre/modules/UpdateUtils.jsm", - UrlbarInput: "resource:///modules/UrlbarInput.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderSearchTips: "resource:///modules/UrlbarProviderSearchTips.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", - UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.jsm", Weave: "resource://services-sync/main.js", WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm", webrtcUI: "resource:///modules/webrtcUI.jsm", diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index edf22adf8ee0..c97fed4fdc6c 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -24,11 +24,10 @@ "AsyncTabSwitcher", "resource:///modules/AsyncTabSwitcher.jsm" ); - ChromeUtils.defineModuleGetter( - this, - "UrlbarProviderOpenTabs", - "resource:///modules/UrlbarProviderOpenTabs.jsm" - ); + ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderOpenTabs: + "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", + }); if (AppConstants.MOZ_CRASHREPORTER) { ChromeUtils.defineModuleGetter( diff --git a/browser/base/content/test/fullscreen/browser_fullscreen_enterInUrlbar.js b/browser/base/content/test/fullscreen/browser_fullscreen_enterInUrlbar.js index 0f549e7ecf6f..914e2b262a7a 100644 --- a/browser/base/content/test/fullscreen/browser_fullscreen_enterInUrlbar.js +++ b/browser/base/content/test/fullscreen/browser_fullscreen_enterInUrlbar.js @@ -7,8 +7,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); add_task(async function test() { diff --git a/browser/base/content/test/performance/head.js b/browser/base/content/test/performance/head.js index 5d633089f500..bece0dc47df3 100644 --- a/browser/base/content/test/performance/head.js +++ b/browser/base/content/test/performance/head.js @@ -3,12 +3,12 @@ ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { AboutNewTab: "resource:///modules/AboutNewTab.jsm", PerfTestHelpers: "resource://testing-common/PerfTestHelpers.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", }); /** diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 09aa3c7d27c0..9c7c189d360b 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -30,6 +30,8 @@ ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", SnapshotMonitor: "resource:///modules/SnapshotMonitor.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -99,8 +101,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { TRRRacer: "resource:///modules/TRRPerformance.jsm", UIState: "resource://services-sync/UIState.jsm", UpdateListener: "resource://gre/modules/UpdateListener.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", WebChannel: "resource://gre/modules/WebChannel.jsm", WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm", }); diff --git a/browser/components/downloads/DownloadsViewUI.jsm b/browser/components/downloads/DownloadsViewUI.jsm index 43bcf08d920b..b4c95c842ae4 100644 --- a/browser/components/downloads/DownloadsViewUI.jsm +++ b/browser/components/downloads/DownloadsViewUI.jsm @@ -17,13 +17,16 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", Downloads: "resource://gre/modules/Downloads.jsm", DownloadUtils: "resource://gre/modules/DownloadUtils.jsm", DownloadsCommon: "resource:///modules/DownloadsCommon.jsm", FileUtils: "resource://gre/modules/FileUtils.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js b/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js index f429250b45c9..75e5f7f2463a 100644 --- a/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js +++ b/browser/components/enterprisepolicies/tests/browser/disable_app_update/browser_policy_disable_app_update.js @@ -3,8 +3,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); var updateService = Cc["@mozilla.org/updates/update-service;1"].getService( diff --git a/browser/components/extensions/parent/ext-urlbar.js b/browser/components/extensions/parent/ext-urlbar.js index 70b20716e99c..dc7919d2e28a 100644 --- a/browser/components/extensions/parent/ext-urlbar.js +++ b/browser/components/extensions/parent/ext-urlbar.js @@ -4,9 +4,10 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderExtension: "resource:///modules/UrlbarProviderExtension.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderExtension: + "resource:///modules/UrlbarProviderExtension.sys.mjs", }); var { ExtensionPreferencesManager } = ChromeUtils.import( diff --git a/browser/components/extensions/test/browser/browser_ext_omnibox.js b/browser/components/extensions/test/browser/browser_ext_omnibox.js index 14cbb9f3c4bb..6555cfc965d6 100644 --- a/browser/components/extensions/test/browser/browser_ext_omnibox.js +++ b/browser/components/extensions/test/browser/browser_ext_omnibox.js @@ -2,8 +2,8 @@ /* vim: set sts=2 sw=2 et tw=80: */ "use strict"; -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const keyword = "VeryUniqueKeywordThatDoesNeverMatchAnyTestUrl"; diff --git a/browser/components/extensions/test/browser/browser_ext_urlbar.js b/browser/components/extensions/test/browser/browser_ext_urlbar.js index edc0979e210a..da9f4c292876 100644 --- a/browser/components/extensions/test/browser/browser_ext_urlbar.js +++ b/browser/components/extensions/test/browser/browser_ext_urlbar.js @@ -3,11 +3,8 @@ ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); async function loadTipExtension(options = {}) { diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js index 77957234efa7..040ece294b12 100644 --- a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js +++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js @@ -5,12 +5,8 @@ ChromeUtils.defineESModuleGetters(this, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); -ChromeUtils.defineModuleGetter( - this, - "UrlbarTestUtils", - "resource://testing-common/UrlbarTestUtils.jsm" -); SearchTestUtils.init(this); diff --git a/browser/components/extensions/test/xpcshell/test_ext_urlbar.js b/browser/components/extensions/test/xpcshell/test_ext_urlbar.js index 82388a0dd8c0..7245c7c48ee4 100644 --- a/browser/components/extensions/test/xpcshell/test_ext_urlbar.js +++ b/browser/components/extensions/test/xpcshell/test_ext_urlbar.js @@ -6,15 +6,15 @@ const { AddonTestUtils } = ChromeUtils.import( ChromeUtils.defineESModuleGetters(this, { SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarQueryContext: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { ExtensionParent: "resource://gre/modules/ExtensionParent.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarQueryContext: "resource:///modules/UrlbarUtils.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); AddonTestUtils.init(this); diff --git a/browser/components/places/InteractionsBlocklist.sys.mjs b/browser/components/places/InteractionsBlocklist.sys.mjs index 4fb93ec30f63..055166cb22f5 100644 --- a/browser/components/places/InteractionsBlocklist.sys.mjs +++ b/browser/components/places/InteractionsBlocklist.sys.mjs @@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { FilterAdult: "resource://activity-stream/lib/FilterAdult.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "logConsole", function() { diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index d81893f4d02b..28961e9d4381 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -62,6 +62,10 @@ XPCOMUtils.defineLazyServiceGetters(this, { ChromeUtils.defineESModuleGetters(this, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderQuickSuggest: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -86,10 +90,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { TransientPrefs: "resource:///modules/TransientPrefs.jsm", UpdateUtils: "resource://gre/modules/UpdateUtils.jsm", UIState: "resource://services-sync/UIState.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(this, "gSubDialog", function() { diff --git a/browser/components/preferences/tests/browser_localSearchShortcuts.js b/browser/components/preferences/tests/browser_localSearchShortcuts.js index db4faf151c30..fdd0e6095156 100644 --- a/browser/components/preferences/tests/browser_localSearchShortcuts.js +++ b/browser/components/preferences/tests/browser_localSearchShortcuts.js @@ -7,9 +7,9 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); let gTree; diff --git a/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js b/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js index 4e84da6f90f1..06d64b855268 100644 --- a/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js +++ b/browser/components/preferences/tests/browser_privacy_firefoxSuggest.js @@ -5,15 +5,15 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", }); XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { - const { QuickSuggestTestUtils: module } = ChromeUtils.import( - "resource://testing-common/QuickSuggestTestUtils.jsm" + const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); module.init(this); registerCleanupFunction(() => module.uninit()); diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js index e2822bdd7157..e7445bf34129 100644 --- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js +++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js @@ -2,13 +2,13 @@ * 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/. */ -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { - const { UrlbarTestUtils: module } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" + const { UrlbarTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); module.init(this); return module; diff --git a/browser/components/search/BrowserSearchTelemetry.sys.mjs b/browser/components/search/BrowserSearchTelemetry.sys.mjs index db0ed0b60f86..9b642b802e18 100644 --- a/browser/components/search/BrowserSearchTelemetry.sys.mjs +++ b/browser/components/search/BrowserSearchTelemetry.sys.mjs @@ -12,12 +12,12 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", }); // A map of known search origins. diff --git a/browser/components/search/test/browser/browser_search_telemetry_searchbar.js b/browser/components/search/test/browser/browser_search_telemetry_searchbar.js index eecd0ed6f704..52cea4028805 100644 --- a/browser/components/search/test/browser/browser_search_telemetry_searchbar.js +++ b/browser/components/search/test/browser/browser_search_telemetry_searchbar.js @@ -2,11 +2,9 @@ const SCALAR_SEARCHBAR = "browser.engagement.navigation.searchbar"; -ChromeUtils.defineModuleGetter( - this, - "UrlbarTestUtils", - "resource://testing-common/UrlbarTestUtils.jsm" -); +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", +}); let suggestionEngine; diff --git a/browser/components/search/test/browser/browser_search_telemetry_sources.js b/browser/components/search/test/browser/browser_search_telemetry_sources.js index ad6531a1709c..771ef0fd91ff 100644 --- a/browser/components/search/test/browser/browser_search_telemetry_sources.js +++ b/browser/components/search/test/browser/browser_search_telemetry_sources.js @@ -13,8 +13,8 @@ const { BrowserSearchTelemetry } = ChromeUtils.importESModule( const { SearchSERPTelemetry } = ChromeUtils.importESModule( "resource:///modules/SearchSERPTelemetry.sys.mjs" ); -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const { SearchTestUtils } = ChromeUtils.importESModule( "resource://testing-common/SearchTestUtils.sys.mjs" diff --git a/browser/components/search/test/browser/browser_search_telemetry_sources_navigation.js b/browser/components/search/test/browser/browser_search_telemetry_sources_navigation.js index f99f4f214cc2..0b844f5728fa 100644 --- a/browser/components/search/test/browser/browser_search_telemetry_sources_navigation.js +++ b/browser/components/search/test/browser/browser_search_telemetry_sources_navigation.js @@ -13,8 +13,8 @@ const { BrowserSearchTelemetry } = ChromeUtils.importESModule( const { SearchSERPTelemetry } = ChromeUtils.importESModule( "resource:///modules/SearchSERPTelemetry.sys.mjs" ); -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const { SearchTestUtils } = ChromeUtils.importESModule( "resource://testing-common/SearchTestUtils.sys.mjs" diff --git a/browser/components/search/test/browser/head.js b/browser/components/search/test/browser/head.js index 230bdf100e35..dc83397a0661 100644 --- a/browser/components/search/test/browser/head.js +++ b/browser/components/search/test/browser/head.js @@ -4,6 +4,7 @@ ChromeUtils.defineESModuleGetters(this, { SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -14,7 +15,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { FormHistoryTestUtils: "resource://testing-common/FormHistoryTestUtils.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", }); let gCUITestUtils = new CustomizableUITestUtils(window); diff --git a/browser/components/sessionstore/test/browser_tabs_in_urlbar.js b/browser/components/sessionstore/test/browser_tabs_in_urlbar.js index 098959aba420..f64afda33c4f 100644 --- a/browser/components/sessionstore/test/browser_tabs_in_urlbar.js +++ b/browser/components/sessionstore/test/browser_tabs_in_urlbar.js @@ -17,12 +17,12 @@ const { PlacesUtils } = ChromeUtils.importESModule( "resource://gre/modules/PlacesUtils.sys.mjs" ); -const { UrlbarProviderOpenTabs } = ChromeUtils.import( - "resource:///modules/UrlbarProviderOpenTabs.jsm" +const { UrlbarProviderOpenTabs } = ChromeUtils.importESModule( + "resource:///modules/UrlbarProviderOpenTabs.sys.mjs" ); -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); var stateBackup = ss.getBrowserState(); diff --git a/browser/components/sessionstore/test/browser_urlbarSearchMode.js b/browser/components/sessionstore/test/browser_urlbarSearchMode.js index ee45abe9f811..af00767c2e4e 100644 --- a/browser/components/sessionstore/test/browser_urlbarSearchMode.js +++ b/browser/components/sessionstore/test/browser_urlbarSearchMode.js @@ -5,9 +5,9 @@ * This test makes sure that the urlbar's search mode is correctly preserved. */ -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); UrlbarTestUtils.init(this); diff --git a/browser/components/touchbar/MacTouchBar.jsm b/browser/components/touchbar/MacTouchBar.jsm index 428dbfb69d90..76f352ddd606 100644 --- a/browser/components/touchbar/MacTouchBar.jsm +++ b/browser/components/touchbar/MacTouchBar.jsm @@ -10,9 +10,12 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js b/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js index eaae320aa672..cdbe59a06dad 100644 --- a/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js +++ b/browser/components/touchbar/tests/browser/browser_touchbar_searchrestrictions.js @@ -6,10 +6,10 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs index a0f8e3580b07..a6800211ee7b 100644 --- a/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs +++ b/browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs @@ -9,11 +9,15 @@ const { XPCOMUtils } = ChromeUtils.importESModule( ); const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarProviderQuickActions: + "resource:///modules/UrlbarProviderQuickActions.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.jsm", - UrlbarProviderQuickActions: - "resource:///modules/UrlbarProviderQuickActions.jsm", }); const BASE_URL = Services.urlFormatter.formatURLPref("app.support.baseURL"); diff --git a/browser/components/urlbar/UrlbarController.sys.mjs b/browser/components/urlbar/UrlbarController.sys.mjs index 70c432418601..4ef8f4ebd83f 100644 --- a/browser/components/urlbar/UrlbarController.sys.mjs +++ b/browser/components/urlbar/UrlbarController.sys.mjs @@ -15,14 +15,14 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { FormHistory: "resource://gre/modules/FormHistory.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); const TELEMETRY_1ST_RESULT = "PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS"; diff --git a/browser/components/urlbar/UrlbarEventBufferer.sys.mjs b/browser/components/urlbar/UrlbarEventBufferer.sys.mjs index 171bf1e61686..e611ba62490e 100644 --- a/browser/components/urlbar/UrlbarEventBufferer.sys.mjs +++ b/browser/components/urlbar/UrlbarEventBufferer.sys.mjs @@ -11,10 +11,14 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { clearTimeout: "resource://gre/modules/Timer.jsm", setTimeout: "resource://gre/modules/Timer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "logger", () => diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs index f4b43da9be79..6695b18e5192 100644 --- a/browser/components/urlbar/UrlbarInput.sys.mjs +++ b/browser/components/urlbar/UrlbarInput.sys.mjs @@ -19,6 +19,16 @@ ChromeUtils.defineESModuleGetters(lazy, { "resource://gre/modules/ExtensionSearchHandler.sys.mjs", SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + UrlbarController: "resource:///modules/UrlbarController.sys.mjs", + UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarQueryContext: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -30,16 +40,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", ReaderMode: "resource://gre/modules/ReaderMode.jsm", PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm", - UrlbarController: "resource:///modules/UrlbarController.jsm", - UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarQueryContext: "resource:///modules/UrlbarUtils.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", - UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.sys.mjs b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.sys.mjs index b57d3bf8d56e..bf0ee41e4c4a 100644 --- a/browser/components/urlbar/UrlbarMuxerUnifiedComplete.sys.mjs +++ b/browser/components/urlbar/UrlbarMuxerUnifiedComplete.sys.mjs @@ -12,19 +12,20 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarMuxer, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarMuxer, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", UrlbarProviderTabToSearch: - "resource:///modules/UrlbarProviderTabToSearch.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", + "resource:///modules/UrlbarProviderTabToSearch.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", }); XPCOMUtils.defineLazyGetter(lazy, "logger", () => diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs index 526461d5852c..7ef1f47221b4 100644 --- a/browser/components/urlbar/UrlbarPrefs.sys.mjs +++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs @@ -16,10 +16,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm", Region: "resource://gre/modules/Region.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); const PREF_URLBAR_BRANCH = "browser.urlbar."; diff --git a/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs b/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs index 9bc87a419f47..5046c642b925 100644 --- a/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs @@ -12,15 +12,19 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", }); /** diff --git a/browser/components/urlbar/UrlbarProviderAliasEngines.sys.mjs b/browser/components/urlbar/UrlbarProviderAliasEngines.sys.mjs index 18a1a4c02665..c4a0f9ff75a6 100644 --- a/browser/components/urlbar/UrlbarProviderAliasEngines.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderAliasEngines.sys.mjs @@ -9,20 +9,17 @@ * results. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs b/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs index fa456d32a315..1a50bbad988d 100644 --- a/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs @@ -12,22 +12,23 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { AboutPagesUtils: "resource://gre/modules/AboutPagesUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); // AutoComplete query type constants. diff --git a/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs b/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs index ce1a28c9a6aa..d9ebc64adc75 100644 --- a/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs @@ -12,16 +12,20 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { KeywordUtils: "resource://gre/modules/KeywordUtils.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); /** diff --git a/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs b/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs index cceab2bff23f..8d664c15e3fe 100644 --- a/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderCalculator.sys.mjs @@ -8,16 +8,17 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/UrlbarProviderExtension.sys.mjs b/browser/components/urlbar/UrlbarProviderExtension.sys.mjs index ea036055a2dc..86c27ca83eb0 100644 --- a/browser/components/urlbar/UrlbarProviderExtension.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderExtension.sys.mjs @@ -9,21 +9,19 @@ * extensions. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + SkippableTimer, + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs index 4191807e6356..97af6285c6d1 100644 --- a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs @@ -10,21 +10,18 @@ * always the ultimate fallback for any query, so this provider is always active. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs b/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs index 73323aa7a101..7a7a23b8e727 100644 --- a/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs @@ -11,24 +11,18 @@ * string. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", }); // Sqlite result row index constants. diff --git a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs index 19a95ed07b48..d2ca320bbd19 100644 --- a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs @@ -8,12 +8,18 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AppUpdater: "resource:///modules/AppUpdater.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", @@ -21,8 +27,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", ResetProfile: "resource://gre/modules/ResetProfile.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "appUpdater", () => new lazy.AppUpdater()); diff --git a/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs b/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs index 318691697054..64b86bea51b2 100644 --- a/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs @@ -9,23 +9,19 @@ * extensions using the `omnibox` API. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + SkippableTimer, + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { ExtensionSearchHandler: "resource://gre/modules/ExtensionSearchHandler.sys.mjs", -}); -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarResult: "resource:///modules/UrlbarResult.jsm", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", }); // After this time, we'll give up waiting for the extension to return matches. diff --git a/browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs b/browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs index b2cdf37b2f50..7626d12cf4b8 100644 --- a/browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs @@ -9,23 +9,17 @@ * It is also used to register and unregister open tabs. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", }); const PRIVATE_USER_CONTEXT_ID = -1; diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs index 631fdb809c36..63869c3a98b8 100644 --- a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs @@ -100,14 +100,21 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -115,12 +122,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", Sqlite: "resource://gre/modules/Sqlite.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); function setTimeout(callback, ms) { diff --git a/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs b/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs index 0620664a6761..d4328ba765ec 100644 --- a/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderPreloadedSites.sys.mjs @@ -14,17 +14,21 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ProfileAge: "resource://gre/modules/ProfileAge.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); const MS_PER_DAY = 86400000; // 24 * 60 * 60 * 1000 diff --git a/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs b/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs index a446c50c5758..cb73aa56954f 100644 --- a/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs @@ -8,20 +8,18 @@ * This module exports a provider returning a private search entry. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + SkippableTimer, + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderQuickActions.sys.mjs b/browser/components/urlbar/UrlbarProviderQuickActions.sys.mjs index 242789d1bad9..fd001be5a575 100644 --- a/browser/components/urlbar/UrlbarProviderQuickActions.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderQuickActions.sys.mjs @@ -4,19 +4,17 @@ "use strict"; -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { +ChromeUtils.defineESModuleGetters(lazy, { QuickActionsLoaderDefault: - "resource:///modules/QuickActionsLoaderDefault.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", + "resource:///modules/QuickActionsLoaderDefault.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", }); // These prefs are relative to the `browser.urlbar` branch. diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs b/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs index 272accf468bf..c747b692bfee 100644 --- a/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs @@ -8,15 +8,21 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { +import { SkippableTimer, TaskQueue, UrlbarProvider, UrlbarUtils, -} = ChromeUtils.import("resource:///modules/UrlbarUtils.jsm"); +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", clearInterval: "resource://gre/modules/Timer.jsm", @@ -25,9 +31,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm", PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm", setInterval: "resource://gre/modules/Timer.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", }); const TIMESTAMP_TEMPLATE = "%YYYYMMDDHH%"; diff --git a/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs b/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs index 6f39ac46fddc..d0a93121a69c 100644 --- a/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs @@ -12,21 +12,22 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { SyncedTabs: "resource://services-sync/SyncedTabs.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); let _cache = null; diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs b/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs index 31b721cd6688..4a6b6af1bd27 100644 --- a/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs @@ -8,26 +8,22 @@ * This module exports a provider that offers search engine suggestions. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { SkippableTimer, UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + SkippableTimer, + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { SearchSuggestionController: "resource://gre/modules/SearchSuggestionController.sys.mjs", -}); -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs b/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs index ac4e24b61453..184e4f5c6fa5 100644 --- a/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs @@ -13,21 +13,25 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", DefaultBrowserCheck: "resource:///modules/BrowserGlue.jsm", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", ProfileAge: "resource://gre/modules/ProfileAge.jsm", setTimeout: "resource://gre/modules/Timer.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "updateManager", () => { diff --git a/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs b/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs index 603f14a64360..44cc95ed2f33 100644 --- a/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs @@ -9,23 +9,20 @@ * typing a search engine domain. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarView: "resource:///modules/UrlbarView.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); const DYNAMIC_RESULT_TYPE = "onboardTabToSearch"; diff --git a/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs b/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs index 1c0566f2bfea..47fd2d47656d 100644 --- a/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs @@ -8,21 +8,18 @@ * This module exports a provider that offers token alias engines. */ -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs b/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs index 9a5d29efda02..bd994e34a0ae 100644 --- a/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs @@ -12,14 +12,19 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -27,10 +32,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { CONTEXTUAL_SERVICES_PING_TYPES: "resource:///modules/PartnerLinkAttribution.jsm", PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", TOP_SITES_MAX_SITES_PER_ROW: "resource://activity-stream/common/Reducers.jsm", TOP_SITES_DEFAULT_ROWS: "resource://activity-stream/common/Reducers.jsm", }); diff --git a/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs b/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs index 8bc72c9752db..088cba50e575 100644 --- a/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs +++ b/browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs @@ -12,25 +12,20 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); -const { UnitConverterSimple } = ChromeUtils.import( - "resource:///modules/UnitConverterSimple.jsm" -); -const { UnitConverterTemperature } = ChromeUtils.import( - "resource:///modules/UnitConverterTemperature.jsm" -); -const { UnitConverterTimezone } = ChromeUtils.import( - "resource:///modules/UnitConverterTimezone.jsm" -); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { UnitConverterSimple } from "resource:///modules/UnitConverterSimple.sys.mjs"; +import { UnitConverterTemperature } from "resource:///modules/UnitConverterTemperature.sys.mjs"; +import { UnitConverterTimezone } from "resource:///modules/UnitConverterTimezone.sys.mjs"; +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs index 8b2b59cfa911..918c94bf589c 100644 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs @@ -16,17 +16,17 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + SkippableTimer: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarMuxer: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvider: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", - SkippableTimer: "resource:///modules/UrlbarUtils.jsm", - UrlbarMuxer: "resource:///modules/UrlbarUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvider: "resource:///modules/UrlbarUtils.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "logger", () => diff --git a/browser/components/urlbar/UrlbarQuickSuggest.sys.mjs b/browser/components/urlbar/UrlbarQuickSuggest.sys.mjs index 7c05840a0708..58f6b6d134bc 100644 --- a/browser/components/urlbar/UrlbarQuickSuggest.sys.mjs +++ b/browser/components/urlbar/UrlbarQuickSuggest.sys.mjs @@ -14,15 +14,19 @@ const { EventEmitter } = ChromeUtils.import( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + QUICK_SUGGEST_SOURCE: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + TaskQueue: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderQuickSuggest: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm", - QUICK_SUGGEST_SOURCE: "resource:///modules/UrlbarProviderQuickSuggest.jsm", RemoteSettings: "resource://services-settings/remote-settings.js", - TaskQueue: "resource:///modules/UrlbarUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", }); const log = console.createInstance({ diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs index 800343859746..974cfb20639e 100644 --- a/browser/components/urlbar/UrlbarResult.sys.mjs +++ b/browser/components/urlbar/UrlbarResult.sys.mjs @@ -16,12 +16,16 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm", JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); /** diff --git a/browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs b/browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs index 7d8937bfdc04..5e9a96f5c538 100644 --- a/browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs +++ b/browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs @@ -4,19 +4,15 @@ "use strict"; -const { XPCOMUtils } = ChromeUtils.importESModule( - "resource://gre/modules/XPCOMUtils.sys.mjs" -); - const { SearchOneOffs } = ChromeUtils.importESModule( "resource:///modules/SearchOneOffs.sys.mjs" ); const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); /** diff --git a/browser/components/urlbar/UrlbarSearchUtils.sys.mjs b/browser/components/urlbar/UrlbarSearchUtils.sys.mjs index 96f5b9d4b809..0244de643330 100644 --- a/browser/components/urlbar/UrlbarSearchUtils.sys.mjs +++ b/browser/components/urlbar/UrlbarSearchUtils.sys.mjs @@ -17,9 +17,9 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); const SEARCH_ENGINE_TOPIC = "browser-search-engine-modified"; diff --git a/browser/components/urlbar/UrlbarTokenizer.sys.mjs b/browser/components/urlbar/UrlbarTokenizer.sys.mjs index eb24d68f18b3..01aa5b77ac07 100644 --- a/browser/components/urlbar/UrlbarTokenizer.sys.mjs +++ b/browser/components/urlbar/UrlbarTokenizer.sys.mjs @@ -15,8 +15,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( ); const lazy = {}; -XPCOMUtils.defineLazyModuleGetters(lazy, { - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyGetter(lazy, "logger", () => diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs index 4b62a320d985..7b4748dba124 100644 --- a/browser/components/urlbar/UrlbarUtils.sys.mjs +++ b/browser/components/urlbar/UrlbarUtils.sys.mjs @@ -20,6 +20,10 @@ ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", SearchSuggestionController: "resource://gre/modules/SearchSuggestionController.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(lazy, { @@ -28,10 +32,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { KeywordUtils: "resource://gre/modules/KeywordUtils.jsm", Log: "resource://gre/modules/Log.jsm", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); export var UrlbarUtils = { diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs index 42f53e677f30..ae6fa2f03268 100644 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs @@ -10,10 +10,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule( const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); /** diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs index 7fdbe5d44218..4c4adbb28173 100644 --- a/browser/components/urlbar/UrlbarView.sys.mjs +++ b/browser/components/urlbar/UrlbarView.sys.mjs @@ -9,16 +9,20 @@ const { XPCOMUtils } = ChromeUtils.importESModule( ); const lazy = {}; + +ChromeUtils.defineESModuleGetters(lazy, { + L10nCache: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarSearchOneOffs: "resource:///modules/UrlbarSearchOneOffs.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", - L10nCache: "resource:///modules/UrlbarUtils.jsm", ObjectUtils: "resource://gre/modules/ObjectUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.jsm", - UrlbarSearchOneOffs: "resource:///modules/UrlbarSearchOneOffs.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/content/quicksuggestOnboarding.js b/browser/components/urlbar/content/quicksuggestOnboarding.js index 7aa9c6d25004..b13037d15435 100644 --- a/browser/components/urlbar/content/quicksuggestOnboarding.js +++ b/browser/components/urlbar/content/quicksuggestOnboarding.js @@ -4,8 +4,8 @@ "use strict"; -const { ONBOARDING_CHOICE } = ChromeUtils.import( - "resource:///modules/UrlbarQuickSuggest.jsm" +const { ONBOARDING_CHOICE } = ChromeUtils.importESModule( + "resource:///modules/UrlbarQuickSuggest.sys.mjs" ); const VARIATION_MAP = { diff --git a/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs b/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs index 4150be6af31a..77092e92d00e 100644 --- a/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs +++ b/browser/components/urlbar/tests/UrlbarTestUtils.sys.mjs @@ -10,12 +10,19 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { UrlbarProvider, UrlbarUtils } = ChromeUtils.import( - "resource:///modules/UrlbarUtils.jsm" -); +import { + UrlbarProvider, + UrlbarUtils, +} from "resource:///modules/UrlbarUtils.sys.mjs"; const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarController: "resource:///modules/UrlbarController.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { AddonTestUtils: "resource://testing-common/AddonTestUtils.jsm", BrowserTestUtils: "resource://testing-common/BrowserTestUtils.jsm", @@ -25,9 +32,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm", setTimeout: "resource://gre/modules/Timer.jsm", TestUtils: "resource://testing-common/TestUtils.jsm", - UrlbarController: "resource:///modules/UrlbarController.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", }); export var UrlbarTestUtils = { diff --git a/browser/components/urlbar/tests/browser-tips/browser_interventions.js b/browser/components/urlbar/tests/browser-tips/browser_interventions.js index 85328bbb0e43..8f4a08299736 100644 --- a/browser/components/urlbar/tests/browser-tips/browser_interventions.js +++ b/browser/components/urlbar/tests/browser-tips/browser_interventions.js @@ -3,9 +3,9 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderInterventions: - "resource:///modules/UrlbarProviderInterventions.jsm", + "resource:///modules/UrlbarProviderInterventions.sys.mjs", }); add_task(async function init() { diff --git a/browser/components/urlbar/tests/browser-tips/browser_searchTips.js b/browser/components/urlbar/tests/browser-tips/browser_searchTips.js index aeb2a6cd832e..e20b4ca7dbec 100644 --- a/browser/components/urlbar/tests/browser-tips/browser_searchTips.js +++ b/browser/components/urlbar/tests/browser-tips/browser_searchTips.js @@ -10,12 +10,16 @@ "use strict"; +ChromeUtils.defineESModuleGetters(this, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderSearchTips: + "resource:///modules/UrlbarProviderSearchTips.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", HttpServer: "resource://testing-common/httpd.js", ProfileAge: "resource://gre/modules/ProfileAge.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderSearchTips: "resource:///modules/UrlbarProviderSearchTips.jsm", }); // These should match the same consts in UrlbarProviderSearchTips.jsm. diff --git a/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js b/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js index 2d11a239c0f7..5aba22180848 100644 --- a/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js +++ b/browser/components/urlbar/tests/browser-tips/browser_searchTips_interaction.js @@ -9,12 +9,16 @@ "use strict"; +ChromeUtils.defineESModuleGetters(this, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderSearchTips: + "resource:///modules/UrlbarProviderSearchTips.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", HttpServer: "resource://testing-common/httpd.js", ProfileAge: "resource://gre/modules/ProfileAge.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderSearchTips: "resource:///modules/UrlbarProviderSearchTips.jsm", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/tests/browser-tips/head.js b/browser/components/urlbar/tests/browser-tips/head.js index 90f4006bc317..94fe19bc125a 100644 --- a/browser/components/urlbar/tests/browser-tips/head.js +++ b/browser/components/urlbar/tests/browser-tips/head.js @@ -14,19 +14,22 @@ Services.scriptloader.loadSubScript( this ); +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderInterventions: + "resource:///modules/UrlbarProviderInterventions.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { HttpServer: "resource://testing-common/httpd.js", ResetProfile: "resource://gre/modules/ResetProfile.jsm", - UrlbarProviderInterventions: - "resource:///modules/UrlbarProviderInterventions.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", }); XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { - const { UrlbarTestUtils: module } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" + const { UrlbarTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); module.init(this); return module; diff --git a/browser/components/urlbar/tests/browser-updateResults/head.js b/browser/components/urlbar/tests/browser-updateResults/head.js index 73e4955e1a7f..ea2cf2f40a4f 100644 --- a/browser/components/urlbar/tests/browser-updateResults/head.js +++ b/browser/components/urlbar/tests/browser-updateResults/head.js @@ -15,18 +15,15 @@ const { AppConstants } = ChromeUtils.import( ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { - const { UrlbarTestUtils: module } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" + const { UrlbarTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); module.init(this); return module; diff --git a/browser/components/urlbar/tests/browser/browser_quickactions.js b/browser/components/urlbar/tests/browser/browser_quickactions.js index 9a5baa28b276..c59eeb2cf5df 100644 --- a/browser/components/urlbar/tests/browser/browser_quickactions.js +++ b/browser/components/urlbar/tests/browser/browser_quickactions.js @@ -7,9 +7,9 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderQuickActions: - "resource:///modules/UrlbarProviderQuickActions.jsm", + "resource:///modules/UrlbarProviderQuickActions.sys.mjs", }); let testActionCalled = 0; diff --git a/browser/components/urlbar/tests/browser/browser_selectStaleResults.js b/browser/components/urlbar/tests/browser/browser_selectStaleResults.js index 8732a6d356c8..e0beaeba3280 100644 --- a/browser/components/urlbar/tests/browser/browser_selectStaleResults.js +++ b/browser/components/urlbar/tests/browser/browser_selectStaleResults.js @@ -7,8 +7,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarView: "resource:///modules/UrlbarView.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); add_task(async function init() { diff --git a/browser/components/urlbar/tests/browser/browser_tabToSearch.js b/browser/components/urlbar/tests/browser/browser_tabToSearch.js index 93f38b089e57..466ffb54cb24 100644 --- a/browser/components/urlbar/tests/browser/browser_tabToSearch.js +++ b/browser/components/urlbar/tests/browser/browser_tabToSearch.js @@ -13,9 +13,9 @@ const TEST_ENGINE_DOMAIN = "example.com"; const DYNAMIC_RESULT_TYPE = "onboardTabToSearch"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderTabToSearch: - "resource:///modules/UrlbarProviderTabToSearch.jsm", + "resource:///modules/UrlbarProviderTabToSearch.sys.mjs", }); add_setup(async function() { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_abandonment.js b/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_abandonment.js index 75fc801f00be..455f423b81dd 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_abandonment.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_abandonment.js @@ -3,8 +3,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); const TEST_ENGINE_NAME = "Test"; diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_engagement.js b/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_engagement.js index 118b9d4994ce..e1dbcbeb6a50 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_engagement.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry_engagement.js @@ -3,10 +3,10 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvider: "resource:///modules/UrlbarUtils.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarProvider: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); const TEST_ENGINE_NAME = "Test"; diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js index 4b01d4d8d6fc..dfcc656fecea 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry.js @@ -16,10 +16,7 @@ const SUGGEST_URLBAR_PREF = "browser.urlbar.suggest.searches"; ChromeUtils.defineESModuleGetters(this, { SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); function searchInAwesomebar(value, win = window) { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_autofill.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_autofill.js index 1b427c6ec1a5..e4931b031249 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_autofill.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_autofill.js @@ -7,9 +7,9 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderPreloadedSites: - "resource:///modules/UrlbarProviderPreloadedSites.jsm", + "resource:///modules/UrlbarProviderPreloadedSites.sys.mjs", }); const SCALAR_URLBAR = "browser.engagement.navigation.urlbar"; diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js index 4e54171126d6..d4f4e77d5707 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_dynamic.js @@ -8,11 +8,11 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); const DYNAMIC_TYPE_NAME = "test"; diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js index 186d64a50bf9..4653529e9515 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_extension.js @@ -10,8 +10,8 @@ const SCALAR_URLBAR = "browser.engagement.navigation.urlbar"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); function assertSearchTelemetryEmpty(search_hist) { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js index 1f60804ef6b0..bba1dca4ae33 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_places.js @@ -16,8 +16,8 @@ const TEST_URL = getRootDirectory(gTestPath).replace( "http://mochi.test:8888" ); -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); function searchInAwesomebar(value, win = window) { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js index 5dc359362c4b..344b781a18f9 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_remotetab.js @@ -10,9 +10,12 @@ const SCALAR_URLBAR = "browser.engagement.navigation.urlbar"; +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { SyncedTabs: "resource://services-sync/SyncedTabs.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", }); function assertSearchTelemetryEmpty(search_hist) { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js index 1da73192ebdc..343d547f4834 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_searchmode.js @@ -19,10 +19,10 @@ let engineDomain; // The preference to enable suggestions. const SUGGEST_PREF = "browser.search.suggest.enabled"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderTabToSearch: - "resource:///modules/UrlbarProviderTabToSearch.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", + "resource:///modules/UrlbarProviderTabToSearch.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); XPCOMUtils.defineLazyServiceGetter( diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js index b4c56ffc2a9c..63e4436f23e5 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tabtosearch.js @@ -13,10 +13,10 @@ const ENGINE_NAME = "MozSearch"; const ENGINE_DOMAIN = "example.com"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderTabToSearch: - "resource:///modules/UrlbarProviderTabToSearch.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", + "resource:///modules/UrlbarProviderTabToSearch.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); function snapshotHistograms() { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js index 36bf6237e29c..4efcc09ef618 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_tip.js @@ -8,11 +8,11 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProvider: "resource:///modules/UrlbarUtils.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarProvider: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); function snapshotHistograms() { diff --git a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js index f1936bcfbda0..2509869abd4f 100644 --- a/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js +++ b/browser/components/urlbar/tests/browser/browser_urlbar_telemetry_topsite.js @@ -8,9 +8,12 @@ "use strict"; +ChromeUtils.defineESModuleGetters(this, { + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { AboutNewTab: "resource:///modules/AboutNewTab.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", }); const EN_US_TOPSITES = diff --git a/browser/components/urlbar/tests/browser/head-common.js b/browser/components/urlbar/tests/browser/head-common.js index 5af49ae389e7..06528bb91414 100644 --- a/browser/components/urlbar/tests/browser/head-common.js +++ b/browser/components/urlbar/tests/browser/head-common.js @@ -7,16 +7,16 @@ var { XPCOMUtils } = ChromeUtils.importESModule( ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + UrlbarProvider: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { HttpServer: "resource://testing-common/httpd.js", Preferences: "resource://gre/modules/Preferences.jsm", - UrlbarProvider: "resource:///modules/UrlbarUtils.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(this, "TEST_BASE_URL", () => @@ -34,8 +34,8 @@ XPCOMUtils.defineLazyServiceGetter( ); XPCOMUtils.defineLazyGetter(this, "UrlbarTestUtils", () => { - const { UrlbarTestUtils: module } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" + const { UrlbarTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); module.init(this); registerCleanupFunction(() => module.uninit()); diff --git a/browser/components/urlbar/tests/browser/head.js b/browser/components/urlbar/tests/browser/head.js index ffa1acdd6d3b..b68893b8fedb 100644 --- a/browser/components/urlbar/tests/browser/head.js +++ b/browser/components/urlbar/tests/browser/head.js @@ -13,6 +13,12 @@ const { AppConstants } = ChromeUtils.import( ChromeUtils.defineESModuleGetters(this, { SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", + UrlbarController: "resource:///modules/UrlbarController.sys.mjs", + UrlbarQueryContext: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -24,12 +30,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", ResetProfile: "resource://gre/modules/ResetProfile.jsm", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", - UrlbarController: "resource:///modules/UrlbarController.jsm", - UrlbarQueryContext: "resource:///modules/UrlbarUtils.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", }); let sandbox; diff --git a/browser/components/urlbar/tests/ext/api.js b/browser/components/urlbar/tests/ext/api.js index c434446d0c1b..8318adcfc33e 100644 --- a/browser/components/urlbar/tests/ext/api.js +++ b/browser/components/urlbar/tests/ext/api.js @@ -10,12 +10,16 @@ const { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderExtension: + "resource:///modules/UrlbarProviderExtension.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarView: "resource:///modules/UrlbarView.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm", Preferences: "resource://gre/modules/Preferences.jsm", - UrlbarProviderExtension: "resource:///modules/UrlbarProviderExtension.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarView: "resource:///modules/UrlbarView.jsm", }); XPCOMUtils.defineLazyGetter( diff --git a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs index 06b0579c79bd..84098f877fac 100644 --- a/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs +++ b/browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs @@ -14,6 +14,14 @@ const { const lazy = {}; +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderQuickSuggest: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(lazy, { ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm", ExperimentFakes: "resource://testing-common/NimbusTestUtils.jsm", @@ -22,16 +30,11 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { sinon: "resource://testing-common/Sinon.jsm", TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", TestUtils: "resource://testing-common/TestUtils.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", - UrlbarUtils: "resource:///modules/UrlbarUtils.jsm", }); XPCOMUtils.defineLazyGetter(lazy, "UrlbarTestUtils", () => { - const { UrlbarTestUtils: module } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" + const { UrlbarTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); module.init(QuickSuggestTestUtils._testScope); return module; diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js index f67a1276103b..6d704779f8b1 100644 --- a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js +++ b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_configuration.js @@ -7,11 +7,14 @@ * Tests QuickSuggest configurations. */ +ChromeUtils.defineESModuleGetters(this, { + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { EnterprisePolicyTesting: "resource://testing-common/EnterprisePolicyTesting.jsm", sinon: "resource://testing-common/Sinon.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", }); // We use this pref in enterprise preference policy tests. We specifically use a diff --git a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_onboardingDialog.js b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_onboardingDialog.js index f5837389a8b8..10d578b44bb0 100644 --- a/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_onboardingDialog.js +++ b/browser/components/urlbar/tests/quicksuggest/browser/browser_quicksuggest_onboardingDialog.js @@ -7,9 +7,12 @@ * Tests the buttons in the onboarding dialog for quick suggest/Firefox Suggest. */ +ChromeUtils.defineESModuleGetters(this, { + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", }); const OTHER_DIALOG_URI = getRootDirectory(gTestPath) + "subdialog.xhtml"; diff --git a/browser/components/urlbar/tests/quicksuggest/browser/head.js b/browser/components/urlbar/tests/quicksuggest/browser/head.js index dab25842794d..a1d899ecabe5 100644 --- a/browser/components/urlbar/tests/quicksuggest/browser/head.js +++ b/browser/components/urlbar/tests/quicksuggest/browser/head.js @@ -11,16 +11,19 @@ Services.scriptloader.loadSubScript( this ); +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderQuickSuggest: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", - UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", }); XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { - const { QuickSuggestTestUtils: module } = ChromeUtils.import( - "resource://testing-common/QuickSuggestTestUtils.jsm" + const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); module.init(this); registerCleanupFunction(() => module.uninit()); diff --git a/browser/components/urlbar/tests/quicksuggest/unit/head.js b/browser/components/urlbar/tests/quicksuggest/unit/head.js index e47296074de9..222e732ca68d 100644 --- a/browser/components/urlbar/tests/quicksuggest/unit/head.js +++ b/browser/components/urlbar/tests/quicksuggest/unit/head.js @@ -3,11 +3,14 @@ /* import-globals-from ../../unit/head.js */ +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderQuickSuggest: + "resource:///modules/UrlbarProviderQuickSuggest.sys.mjs", + UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.sys.mjs", +}); + XPCOMUtils.defineLazyModuleGetters(this, { TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.jsm", - UrlbarProviderQuickSuggest: - "resource:///modules/UrlbarProviderQuickSuggest.jsm", - UrlbarQuickSuggest: "resource:///modules/UrlbarQuickSuggest.jsm", }); /** diff --git a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_positionInSuggestions.js b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_positionInSuggestions.js index 6d946fc40383..e46322149194 100644 --- a/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_positionInSuggestions.js +++ b/browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest_positionInSuggestions.js @@ -7,12 +7,12 @@ * Tests for quick suggest result position specified in suggestions. */ -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderHeuristicFallback: - "resource:///modules/UrlbarProviderHeuristicFallback.jsm", - UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.jsm", + "resource:///modules/UrlbarProviderHeuristicFallback.sys.mjs", + UrlbarProviderPlaces: "resource:///modules/UrlbarProviderPlaces.sys.mjs", UrlbarProviderTabToSearch: - "resource:///modules/UrlbarProviderTabToSearch.jsm", + "resource:///modules/UrlbarProviderTabToSearch.sys.mjs", }); const SPONSORED_SECOND_POSITION_SUGGEST = { diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js index 08c3e0391a54..70537515fd47 100644 --- a/browser/components/urlbar/tests/unit/head.js +++ b/browser/components/urlbar/tests/unit/head.js @@ -13,12 +13,20 @@ var { UrlbarProvider, UrlbarQueryContext, UrlbarUtils, -} = ChromeUtils.import("resource:///modules/UrlbarUtils.jsm"); +} = ChromeUtils.importESModule("resource:///modules/UrlbarUtils.sys.mjs"); ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", + UrlbarController: "resource:///modules/UrlbarController.sys.mjs", + UrlbarInput: "resource:///modules/UrlbarInput.sys.mjs", + UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", + UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", + UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.sys.mjs", + UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", + UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { @@ -26,20 +34,12 @@ XPCOMUtils.defineLazyModuleGetters(this, { HttpServer: "resource://testing-common/httpd.js", PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", TestUtils: "resource://testing-common/TestUtils.jsm", - UrlbarController: "resource:///modules/UrlbarController.jsm", - UrlbarInput: "resource:///modules/UrlbarInput.jsm", - UrlbarPrefs: "resource:///modules/UrlbarPrefs.jsm", - UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.jsm", - UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm", - UrlbarResult: "resource:///modules/UrlbarResult.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", - UrlbarTokenizer: "resource:///modules/UrlbarTokenizer.jsm", }); const { sinon } = ChromeUtils.import("resource://testing-common/Sinon.jsm"); XPCOMUtils.defineLazyGetter(this, "QuickSuggestTestUtils", () => { - const { QuickSuggestTestUtils: module } = ChromeUtils.import( - "resource://testing-common/QuickSuggestTestUtils.jsm" + const { QuickSuggestTestUtils: module } = ChromeUtils.importESModule( + "resource://testing-common/QuickSuggestTestUtils.sys.mjs" ); module.init(this); return module; diff --git a/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.js b/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.js index 2c9d3c689da0..1cf8546b17bb 100644 --- a/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.js +++ b/browser/components/urlbar/tests/unit/test_UrlbarSearchUtils.js @@ -2,8 +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/. */ -const { UrlbarSearchUtils } = ChromeUtils.import( - "resource:///modules/UrlbarSearchUtils.jsm" +const { UrlbarSearchUtils } = ChromeUtils.importESModule( + "resource:///modules/UrlbarSearchUtils.sys.mjs" ); let baconEngineExtension; diff --git a/browser/components/urlbar/tests/unit/test_calculator.js b/browser/components/urlbar/tests/unit/test_calculator.js index 30cafe2b1f29..7fa899f320e2 100644 --- a/browser/components/urlbar/tests/unit/test_calculator.js +++ b/browser/components/urlbar/tests/unit/test_calculator.js @@ -4,8 +4,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - Calculator: "resource:///modules/UrlbarProviderCalculator.jsm", +ChromeUtils.defineESModuleGetters(this, { + Calculator: "resource:///modules/UrlbarProviderCalculator.sys.mjs", }); const FORMULAS = [ diff --git a/browser/components/urlbar/tests/unit/test_heuristic_cancel.js b/browser/components/urlbar/tests/unit/test_heuristic_cancel.js index 80f374b70d78..87041b37b9f9 100644 --- a/browser/components/urlbar/tests/unit/test_heuristic_cancel.js +++ b/browser/components/urlbar/tests/unit/test_heuristic_cancel.js @@ -10,8 +10,8 @@ const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.sys.mjs", }); /** diff --git a/browser/components/urlbar/tests/unit/test_l10nCache.js b/browser/components/urlbar/tests/unit/test_l10nCache.js index 1159542b151a..66bb20974130 100644 --- a/browser/components/urlbar/tests/unit/test_l10nCache.js +++ b/browser/components/urlbar/tests/unit/test_l10nCache.js @@ -5,8 +5,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - L10nCache: "resource:///modules/UrlbarUtils.jsm", +ChromeUtils.defineESModuleGetters(this, { + L10nCache: "resource:///modules/UrlbarUtils.sys.mjs", }); add_task(async function comprehensive() { diff --git a/browser/components/urlbar/tests/unit/test_providerPreloaded.js b/browser/components/urlbar/tests/unit/test_providerPreloaded.js index e652d9bb96c6..289e3660c399 100644 --- a/browser/components/urlbar/tests/unit/test_providerPreloaded.js +++ b/browser/components/urlbar/tests/unit/test_providerPreloaded.js @@ -9,9 +9,9 @@ const PREF_FEATURE_ENABLED = "browser.urlbar.usepreloadedtopurls.enabled"; const PREF_FEATURE_EXPIRE_DAYS = "browser.urlbar.usepreloadedtopurls.expire_days"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderPreloadedSites: - "resource:///modules/UrlbarProviderPreloadedSites.jsm", + "resource:///modules/UrlbarProviderPreloadedSites.sys.mjs", }); Cu.importGlobalProperties(["fetch"]); diff --git a/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js b/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js index 70480d42fe96..1306d4217f3d 100644 --- a/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js +++ b/browser/components/urlbar/tests/unit/test_providerTabToSearch_partialHost.js @@ -9,8 +9,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.jsm", +ChromeUtils.defineESModuleGetters(this, { + UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.sys.mjs", }); add_task(async function setup() { diff --git a/browser/components/urlbar/tests/unit/test_queryScorer.js b/browser/components/urlbar/tests/unit/test_queryScorer.js index 4af1b2611288..1d6171eac499 100644 --- a/browser/components/urlbar/tests/unit/test_queryScorer.js +++ b/browser/components/urlbar/tests/unit/test_queryScorer.js @@ -3,8 +3,8 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { - QueryScorer: "resource:///modules/UrlbarProviderInterventions.jsm", +ChromeUtils.defineESModuleGetters(this, { + QueryScorer: "resource:///modules/UrlbarProviderInterventions.sys.mjs", }); const DISTANCE_THRESHOLD = 1; diff --git a/browser/components/urlbar/tests/unit/test_quickactions.js b/browser/components/urlbar/tests/unit/test_quickactions.js index 4f7981c95849..a7abcb846acf 100644 --- a/browser/components/urlbar/tests/unit/test_quickactions.js +++ b/browser/components/urlbar/tests/unit/test_quickactions.js @@ -4,9 +4,9 @@ "use strict"; -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderQuickActions: - "resource:///modules/UrlbarProviderQuickActions.jsm", + "resource:///modules/UrlbarProviderQuickActions.sys.mjs", }); const EXPECTED_MATCH = { diff --git a/browser/components/urlbar/tests/unit/test_unitConversion.js b/browser/components/urlbar/tests/unit/test_unitConversion.js index 07a9dbd56a27..016aaf0b3f54 100644 --- a/browser/components/urlbar/tests/unit/test_unitConversion.js +++ b/browser/components/urlbar/tests/unit/test_unitConversion.js @@ -8,9 +8,9 @@ * Unit test for unit conversion module. */ -XPCOMUtils.defineLazyModuleGetters(this, { +ChromeUtils.defineESModuleGetters(this, { UrlbarProviderUnitConversion: - "resource:///modules/UrlbarProviderUnitConversion.jsm", + "resource:///modules/UrlbarProviderUnitConversion.sys.mjs", }); const TEST_DATA = [ diff --git a/browser/modules/test/browser/browser_PartnerLinkAttribution.js b/browser/modules/test/browser/browser_PartnerLinkAttribution.js index e899e6b88c60..538b6b1c8c12 100644 --- a/browser/modules/test/browser/browser_PartnerLinkAttribution.js +++ b/browser/modules/test/browser/browser_PartnerLinkAttribution.js @@ -18,13 +18,13 @@ const SUGGESTION_ENGINE_NAME = ChromeUtils.defineESModuleGetters(this, { SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); XPCOMUtils.defineLazyModuleGetters(this, { CustomizableUITestUtils: "resource://testing-common/CustomizableUITestUtils.jsm", Region: "resource://gre/modules/Region.jsm", - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", HttpServer: "resource://testing-common/httpd.js", }); diff --git a/docshell/test/browser/browser_fall_back_to_https.js b/docshell/test/browser/browser_fall_back_to_https.js index 0d08a18e19e0..820dc5bfc5f3 100644 --- a/docshell/test/browser/browser_fall_back_to_https.js +++ b/docshell/test/browser/browser_fall_back_to_https.js @@ -17,8 +17,8 @@ * https://secureonly.example.com:443 instead. */ -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const bug1002724_tests = [ diff --git a/docshell/test/browser/browser_uriFixupAlternateRedirects.js b/docshell/test/browser/browser_uriFixupAlternateRedirects.js index ffe58bc75419..9e56084ec60e 100644 --- a/docshell/test/browser/browser_uriFixupAlternateRedirects.js +++ b/docshell/test/browser/browser_uriFixupAlternateRedirects.js @@ -1,7 +1,7 @@ "use strict"; -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const REDIRECTURL = diff --git a/docshell/test/browser/browser_uriFixupIntegration.js b/docshell/test/browser/browser_uriFixupIntegration.js index 483b6bdd16ce..e8f2a69cb50a 100644 --- a/docshell/test/browser/browser_uriFixupIntegration.js +++ b/docshell/test/browser/browser_uriFixupIntegration.js @@ -3,8 +3,8 @@ "use strict"; -const { UrlbarTestUtils } = ChromeUtils.import( - "resource://testing-common/UrlbarTestUtils.jsm" +const { UrlbarTestUtils } = ChromeUtils.importESModule( + "resource://testing-common/UrlbarTestUtils.sys.mjs" ); const { SearchTestUtils } = ChromeUtils.importESModule( "resource://testing-common/SearchTestUtils.sys.mjs" diff --git a/toolkit/components/extensions/WebNavigation.jsm b/toolkit/components/extensions/WebNavigation.jsm index 4ff28b7331fd..4eba344732bc 100644 --- a/toolkit/components/extensions/WebNavigation.jsm +++ b/toolkit/components/extensions/WebNavigation.jsm @@ -17,11 +17,9 @@ ChromeUtils.defineModuleGetter( "BrowserWindowTracker", "resource:///modules/BrowserWindowTracker.jsm" ); -ChromeUtils.defineModuleGetter( - lazy, - "UrlbarUtils", - "resource:///modules/UrlbarUtils.jsm" -); +ChromeUtils.defineESModuleGetters(lazy, { + UrlbarUtils: "resource:///modules/UrlbarUtils.sys.mjs", +}); ChromeUtils.defineModuleGetter( lazy, "WebNavigationFrames", diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js b/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js index 66c9a822849e..115a22cdd7b0 100644 --- a/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js +++ b/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js @@ -18,10 +18,7 @@ const SEARCH_TERM = "urlbar-reflows-" + Date.now(); ChromeUtils.defineESModuleGetters(this, { PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs", -}); - -XPCOMUtils.defineLazyModuleGetters(this, { - UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.jsm", + UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs", }); add_setup(async function() {