Bug 1966662 - Migrate most of toolkit/components/search to moz-src uris. r=search-reviewers,scunnane

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

browser/actors/ContentSearchParent.sys.mjs

@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SearchSuggestionController:
-    "resource://gre/modules/SearchSuggestionController.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
 });
 

browser/actors/SearchSERPTelemetryChild.sys.mjs

@@ -8,7 +8,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 

browser/components/backup/resources/PreferencesBackupResource.sys.mjs

@@ -7,7 +7,7 @@ import { BackupResource } from "resource:///modules/backup/BackupResource.sys.mj
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 /**

browser/components/backup/tests/xpcshell/test_PreferencesBackupResource.js

@@ -7,7 +7,7 @@ const { PreferencesBackupResource } = ChromeUtils.importESModule(
   "resource:///modules/backup/PreferencesBackupResource.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 /**

browser/components/backup/tests/xpcshell/test_PreferencesBackupResource_searchEngines.js

@@ -10,7 +10,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 const { updateAppInfo } = ChromeUtils.importESModule(
   "resource://testing-common/AppInfo.sys.mjs"

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

@@ -10,7 +10,7 @@ const { Preferences } = ChromeUtils.importESModule(
   "resource://gre/modules/Preferences.sys.mjs"
 );
 const { SearchSettings } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSettings.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSettings.sys.mjs"
 );
 const { updateAppInfo, getAppInfo } = ChromeUtils.importESModule(
   "resource://testing-common/AppInfo.sys.mjs"

browser/components/extensions/parent/ext-topSites.js

@@ -9,7 +9,8 @@
 ChromeUtils.defineESModuleGetters(this, {
   AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
   NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
-  getSearchProvider: "resource://gre/modules/SearchShortcuts.sys.mjs",
+  getSearchProvider:
+    "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs",
 });
 
 const SHORTCUTS_PREF =

browser/components/extensions/test/browser/browser_ext_search_favicon.js

@@ -15,7 +15,7 @@ const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"
 );
 const { AppProvidedSearchEngine } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppProvidedSearchEngine.sys.mjs"
+  "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs"
 );
 
 AddonTestUtils.initMochitest(this);

browser/components/extensions/test/xpcshell/test_ext_settings_overrides_defaults.js

@@ -12,7 +12,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
 );
 
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 const { RemoteSettings } = ChromeUtils.importESModule(

browser/components/preferences/search.js

@@ -8,11 +8,13 @@
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  AddonSearchEngine: "resource://gre/modules/AddonSearchEngine.sys.mjs",
+  AddonSearchEngine:
+    "moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs",
   CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
   SearchUIUtils: "moz-src:///browser/components/search/SearchUIUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
-  UserSearchEngine: "resource://gre/modules/UserSearchEngine.sys.mjs",
+  UserSearchEngine:
+    "moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs",
 });
 
 Preferences.addAll([

browser/components/preferences/tests/browser_searchChangedEngine.js

@@ -8,7 +8,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 AddonTestUtils.initMochitest(this);

browser/components/preferences/tests/browser_searchRestoreDefaults.js

@@ -5,7 +5,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 add_setup(async function () {

browser/components/preferences/tests/browser_searchScroll.js

@@ -13,7 +13,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 AddonTestUtils.initMochitest(this);

browser/components/preferences/tests/browser_search_engineList.js

@@ -12,7 +12,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 const { sinon } = ChromeUtils.importESModule(
   "resource://testing-common/Sinon.sys.mjs"

browser/components/preferences/tests/browser_search_userEngineDialog.js

@@ -7,7 +7,7 @@ const { SearchTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/SearchTestUtils.sys.mjs"
 );
 const { SearchUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchUtils.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs"
 );
 
 add_setup(async function () {

browser/components/search/SERPCategorization.sys.mjs

@@ -15,7 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   Sqlite: "resource://gre/modules/Sqlite.sys.mjs",
 });
 

browser/components/search/SearchSERPTelemetry.sys.mjs

@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   SERPCategorization:
     "moz-src:///browser/components/search/SERPCategorization.sys.mjs",
   SERPCategorizationRecorder:

browser/components/search/content/addEngine.js

@@ -20,7 +20,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 // Set the appropriate l10n id before the dialog's connectedCallback.

browser/components/search/content/searchbar.js

@@ -17,7 +17,7 @@
     BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
     FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
     SearchSuggestionController:
-      "resource://gre/modules/SearchSuggestionController.sys.mjs",
+      "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
   });
 
   /**

browser/components/search/test/browser/browser_contentSearchUI.js

@@ -21,7 +21,7 @@ ChromeUtils.defineESModuleGetters(this, {
   FormHistoryTestUtils:
     "resource://testing-common/FormHistoryTestUtils.sys.mjs",
   SearchSuggestionController:
-    "resource://gre/modules/SearchSuggestionController.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
 });
 
 requestLongerTimeout(2);

browser/components/search/test/browser/browser_searchbar_default.js

@@ -8,7 +8,7 @@
 "use strict";
 
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 
 const templateNormal = "https://example.com/?q=";

browser/components/search/test/browser/head.js

@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
   SearchUITestUtils: "resource://testing-common/SearchUITestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",
 });

browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js

@@ -11,7 +11,7 @@
  */
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 const TEST_PROVIDER_INFO = [

browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js

@@ -14,7 +14,7 @@ ChromeUtils.defineESModuleGetters(this, {
     "moz-src:///browser/components/search/SERPCategorization.sys.mjs",
   SERPDomainToCategoriesMap:
     "moz-src:///browser/components/search/SERPCategorization.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 const TEST_PROVIDER_INFO = [

browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js

@@ -8,7 +8,7 @@
  */
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 // The search provider's name is provided to ensure we can extract domains

browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_no_sponsored_values.js

@@ -8,7 +8,7 @@
  */
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 const TEST_PROVIDER_INFO = [

browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_region.js

@@ -11,7 +11,7 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   Region: "resource://gre/modules/Region.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 const TEST_PROVIDER_INFO = [

browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js

@@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(this, {
     "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs",
   SearchSERPDomainToCategoriesMap:
     "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TELEMETRY_SETTINGS_KEY:
     "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs",
 });

browser/components/search/test/browser/telemetry/head.js

@@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(this, {
     "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
   SearchUITestUtils: "resource://testing-common/SearchUITestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   SERPCategorizationRecorder:
     "moz-src:///browser/components/search/SERPCategorization.sys.mjs",
   SERPDomainToCategoriesMap:

browser/components/search/test/unit/test_search_telemetry_config_validation.js

@@ -9,7 +9,8 @@ ChromeUtils.defineESModuleGetters(this, {
   TELEMETRY_SETTINGS_KEY:
     "moz-src:///browser/components/search/SearchSERPTelemetry.sys.mjs",
   JsonSchema: "resource://gre/modules/JsonSchema.sys.mjs",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
 });
 
 /**

browser/components/topsites/TopSites.sys.mjs

@@ -12,7 +12,7 @@ import {
   CUSTOM_SEARCH_SHORTCUTS,
   checkHasSearchEngine,
   getSearchProvider,
-} from "resource://gre/modules/SearchShortcuts.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs";
 
 const lazy = {};
 

browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs

@@ -13,11 +13,12 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
-  OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.sys.mjs",
+  OpenSearchEngine:
+    "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs",
   OpenSearchManager:
     "moz-src:///browser/components/search/OpenSearchManager.sys.mjs",
   loadAndParseOpenSearchEngine:
-    "resource://gre/modules/OpenSearchLoader.sys.mjs",
+    "moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",

browser/components/urlbar/UrlbarInput.sys.mjs

@@ -23,7 +23,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs",
   SearchModeSwitcher: "resource:///modules/SearchModeSwitcher.sys.mjs",
   SearchUIUtils: "moz-src:///browser/components/search/SearchUIUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
   UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",

browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   ContentRelevancyManager:
     "resource://gre/modules/ContentRelevancyManager.sys.mjs",
   QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderSearchSuggestions:
     "resource:///modules/UrlbarProviderSearchSuggestions.sys.mjs",

browser/components/urlbar/UrlbarProviderRecentSearches.sys.mjs

@@ -14,7 +14,7 @@ import {
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",
   UrlbarSearchUtils: "resource:///modules/UrlbarSearchUtils.sys.mjs",

browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs

@@ -17,7 +17,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
   SearchSuggestionController:
-    "resource://gre/modules/SearchSuggestionController.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.sys.mjs",
   UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",

browser/components/urlbar/UrlbarProviderSearchTips.sys.mjs

@@ -21,7 +21,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
   DefaultBrowserCheck:
     "moz-src:///browser/components/DefaultBrowserCheck.sys.mjs",
   LaterRun: "resource:///modules/LaterRun.sys.mjs",
-  SearchStaticData: "resource://gre/modules/SearchStaticData.sys.mjs",
+  SearchStaticData:
+    "moz-src:///toolkit/components/search/SearchStaticData.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderTopSites: "resource:///modules/UrlbarProviderTopSites.sys.mjs",
   UrlbarResult: "resource:///modules/UrlbarResult.sys.mjs",

browser/components/urlbar/UrlbarUtils.sys.mjs

@@ -24,7 +24,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
   SearchSuggestionController:
-    "resource://gre/modules/SearchSuggestionController.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
   UrlbarProviderInterventions:
     "resource:///modules/UrlbarProviderInterventions.sys.mjs",

browser/components/urlbar/tests/browser/browser_searchHistoryLimit.js

@@ -10,7 +10,7 @@
 "use strict";
 
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 
 let gEngine;

browser/components/urlbar/tests/browser/head-common.js

@@ -1,6 +1,6 @@
 ChromeUtils.defineESModuleGetters(this, {
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
   HttpServer: "resource://testing-common/httpd.sys.mjs",
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
   PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",

browser/components/urlbar/tests/browser/head.js

@@ -12,7 +12,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PromptTestUtils: "resource://testing-common/PromptTestUtils.sys.mjs",
   ResetProfile: "resource://gre/modules/ResetProfile.sys.mjs",
   SearchUITestUtils: "resource://testing-common/SearchUITestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
   UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.sys.mjs",

browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_engagement_selected_result.js

@@ -13,7 +13,7 @@
 ChromeUtils.defineESModuleGetters(this, {
   UrlbarProviderClipboard:
     "resource:///modules/UrlbarProviderClipboard.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 // This test has many subtests and can time out in verify mode.

browser/components/urlbar/tests/engagementTelemetry/browser/head-interaction.js

@@ -6,9 +6,11 @@
 /* import-globals-from head.js */
 
 ChromeUtils.defineESModuleGetters(this, {
-  CUSTOM_SEARCH_SHORTCUTS: "resource://gre/modules/SearchShortcuts.sys.mjs",
+  CUSTOM_SEARCH_SHORTCUTS:
+    "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs",
   NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
-  SEARCH_SHORTCUTS: "resource://gre/modules/SearchShortcuts.sys.mjs",
+  SEARCH_SHORTCUTS:
+    "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs",
   SearchService: "resource://gre/modules/SearchService.sys.mjs",
 });
 

browser/components/urlbar/tests/quicksuggest/QuickSuggestTestUtils.sys.mjs

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettingsServer:
     "resource://testing-common/RemoteSettingsServer.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   Suggestion: "resource://gre/modules/RustSuggest.sys.mjs",
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
   UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",

browser/components/urlbar/tests/quicksuggest/unit/head.js

@@ -6,7 +6,7 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   QuickSuggest: "resource:///modules/QuickSuggest.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TelemetryTestUtils: "resource://testing-common/TelemetryTestUtils.sys.mjs",
   UrlbarProviderAutofill: "resource:///modules/UrlbarProviderAutofill.sys.mjs",
   UrlbarProviderQuickSuggest:

browser/extensions/newtab/karma.mc.config.js

@@ -354,7 +354,9 @@ module.exports = function (config) {
               path.join(__dirname, "../../components/topsites/"),
             ],
             [
-              new RegExp("^resource://gre/modules/SearchShortcuts.sys.mjs"),
+              new RegExp(
+                "^moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs"
+              ),
               path.join(
                 __dirname,
                 "../../../toolkit/components/search/SearchShortcuts.sys.mjs"

browser/extensions/newtab/lib/TopSitesFeed.sys.mjs

@@ -18,7 +18,7 @@ import {
   SEARCH_SHORTCUTS_HAVE_PINNED_PREF,
   checkHasSearchEngine,
   getSearchProvider,
-} from "resource://gre/modules/SearchShortcuts.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs";
 
 const lazy = {};
 

browser/extensions/search-detection/extension/api.js

@@ -18,9 +18,10 @@ var { ExtensionParent } = ChromeUtils.importESModule(
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  AddonSearchEngine: "resource://gre/modules/AddonSearchEngine.sys.mjs",
+  AddonSearchEngine:
+    "moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs",
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
 });
 
 // eslint-disable-next-line mozilla/reject-importGlobalProperties

docshell/test/unit/head_docshell.js

@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
   HttpServer: "resource://testing-common/httpd.sys.mjs",
   NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
 });
 

mobile/android/installer/package-manifest.in

@@ -98,6 +98,7 @@
 
 ; Modules
 @BINPATH@/modules/*
+@BINPATH@/moz-src/*
 @BINPATH@/actors/*
 
 ; [Browser Chrome Files]

toolkit/components/search/AddonSearchEngine.sys.mjs

@@ -4,14 +4,14 @@
 
 /* eslint no-shadow: error, mozilla/no-aArgs: error */
 
-import { SearchEngine } from "resource://gre/modules/SearchEngine.sys.mjs";
+import { SearchEngine } from "moz-src:///toolkit/components/search/SearchEngine.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   ExtensionParent: "resource://gre/modules/ExtensionParent.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/AppProvidedSearchEngine.sys.mjs

@@ -15,7 +15,7 @@ import {
   SearchEngine,
   EngineURL,
   QueryParameter,
-} from "resource://gre/modules/SearchEngine.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchEngine.sys.mjs";
 
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
@@ -26,7 +26,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
   SearchEngineClassification: "resource://gre/modules/RustSearch.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

toolkit/components/search/OpenSearchEngine.sys.mjs

@@ -11,14 +11,14 @@
 import {
   EngineURL,
   SearchEngine,
-} from "resource://gre/modules/SearchEngine.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchEngine.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   loadAndParseOpenSearchEngine:
-    "resource://gre/modules/OpenSearchLoader.sys.mjs",
+    "moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/OpenSearchLoader.sys.mjs

@@ -11,7 +11,7 @@
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/PolicySearchEngine.sys.mjs

@@ -4,7 +4,7 @@
 
 /* eslint no-shadow: error, mozilla/no-aArgs: error */
 
-import { SearchEngine } from "resource://gre/modules/SearchEngine.sys.mjs";
+import { SearchEngine } from "moz-src:///toolkit/components/search/SearchEngine.sys.mjs";
 
 /**
  * PolicySearchEngine represents a search engine defined by an enterprise

toolkit/components/search/SearchEngine.sys.mjs

@@ -12,9 +12,10 @@
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  SearchSettings: "resource://gre/modules/SearchSettings.sys.mjs",
+  SearchSettings: "moz-src:///toolkit/components/search/SearchSettings.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
-  OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.sys.mjs",
+  OpenSearchEngine:
+    "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/SearchEngineSelector.sys.mjs

@@ -18,7 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   SearchUserEnvironment: "resource://gre/modules/RustSearch.sys.mjs",
   SearchApplicationName: "resource://gre/modules/RustSearch.sys.mjs",
   SearchUpdateChannel: "resource://gre/modules/RustSearch.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/SearchService.sys.mjs

@@ -11,24 +11,30 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
-  AddonSearchEngine: "resource://gre/modules/AddonSearchEngine.sys.mjs",
+  AddonSearchEngine:
+    "moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs",
   BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
   IgnoreLists: "resource://gre/modules/IgnoreLists.sys.mjs",
   loadAndParseOpenSearchEngine:
-    "resource://gre/modules/OpenSearchLoader.sys.mjs",
+    "moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs",
-  OpenSearchEngine: "resource://gre/modules/OpenSearchEngine.sys.mjs",
+  OpenSearchEngine:
-  PolicySearchEngine: "resource://gre/modules/PolicySearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs",
+  PolicySearchEngine:
+    "moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
-  SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
+  SearchEngine: "moz-src:///toolkit/components/search/SearchEngine.sys.mjs",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
-  SearchSettings: "resource://gre/modules/SearchSettings.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
-  SearchStaticData: "resource://gre/modules/SearchStaticData.sys.mjs",
+  SearchSettings: "moz-src:///toolkit/components/search/SearchSettings.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchStaticData:
+    "moz-src:///toolkit/components/search/SearchStaticData.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   UserInstalledAppEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
-  UserSearchEngine: "resource://gre/modules/UserSearchEngine.sys.mjs",
+  UserSearchEngine:
+    "moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/SearchSettings.sys.mjs

@@ -7,10 +7,10 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
   DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs",
   ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/SearchSuggestionController.sys.mjs

@@ -8,7 +8,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 ChromeUtils.defineLazyGetter(lazy, "logConsole", () => {

toolkit/components/search/SearchSuggestions.sys.mjs

@@ -6,7 +6,7 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   FormHistory: "resource://gre/modules/FormHistory.sys.mjs",
   SearchSuggestionController:
-    "resource://gre/modules/SearchSuggestionController.sys.mjs",
+    "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs",
 });
 
 /**

toolkit/components/search/UserSearchEngine.sys.mjs

@@ -7,12 +7,12 @@
 import {
   SearchEngine,
   EngineURL,
-} from "resource://gre/modules/SearchEngine.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchEngine.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
 });
 
 /**

toolkit/components/search/moz.build

@@ -17,7 +17,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = "toolkit_search"
 
-EXTRA_JS_MODULES += [
+MOZ_SRC_FILES += [
     "AddonSearchEngine.sys.mjs",
     "AppProvidedSearchEngine.sys.mjs",
     "OpenSearchEngine.sys.mjs",
@@ -25,16 +25,19 @@ EXTRA_JS_MODULES += [
     "PolicySearchEngine.sys.mjs",
     "SearchEngine.sys.mjs",
     "SearchEngineSelector.sys.mjs",
-    "SearchService.sys.mjs",
     "SearchSettings.sys.mjs",
     "SearchShortcuts.sys.mjs",
     "SearchStaticData.sys.mjs",
     "SearchSuggestionController.sys.mjs",
-    "SearchSuggestions.sys.mjs",
     "SearchUtils.sys.mjs",
     "UserSearchEngine.sys.mjs",
 ]
 
+EXTRA_JS_MODULES += [
+    "SearchService.sys.mjs",
+    "SearchSuggestions.sys.mjs",
+]
+
 XPCOM_MANIFESTS += [
     "components.conf",
 ]

toolkit/components/search/tests/SearchTestUtils.sys.mjs

@@ -5,11 +5,11 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonTestUtils: "resource://testing-common/AddonTestUtils.sys.mjs",
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
   ExtensionTestUtils:
     "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   sinon: "resource://testing-common/Sinon.sys.mjs",
 });
 

toolkit/components/search/tests/xpcshell/head_search.js

@@ -15,11 +15,12 @@ ChromeUtils.defineESModuleGetters(this, {
   RemoteSettingsClient:
     "resource://services-settings/RemoteSettingsClient.sys.mjs",
   SearchEngineClassification: "resource://gre/modules/RustSearch.sys.mjs",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
   SearchService: "resource://gre/modules/SearchService.sys.mjs",
-  SearchSettings: "resource://gre/modules/SearchSettings.sys.mjs",
+  SearchSettings: "moz-src:///toolkit/components/search/SearchSettings.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   TestUtils: "resource://testing-common/TestUtils.sys.mjs",
   updateAppInfo: "resource://testing-common/AppInfo.sys.mjs",
   Utils: "resource://services-settings/Utils.sys.mjs",

toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js

@@ -12,10 +12,11 @@ ChromeUtils.defineESModuleGetters(this, {
   ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
-  SearchEngine: "resource://gre/modules/SearchEngine.sys.mjs",
+  SearchEngine: "moz-src:///toolkit/components/search/SearchEngine.sys.mjs",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
   SearchTestUtils: "resource://testing-common/SearchTestUtils.sys.mjs",
-  SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
+  SearchUtils: "moz-src:///toolkit/components/search/SearchUtils.sys.mjs",
   sinon: "resource://testing-common/Sinon.sys.mjs",
   updateAppInfo: "resource://testing-common/AppInfo.sys.mjs",
 });

toolkit/components/search/tests/xpcshell/test_SearchStaticData.js

@@ -8,7 +8,7 @@
 "use strict";
 
 const { SearchStaticData } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchStaticData.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchStaticData.sys.mjs"
 );
 
 function run_test() {

toolkit/components/search/tests/xpcshell/test_engine_selector_defaults.js

@@ -9,7 +9,8 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
 });
 
 const CONFIG = [

toolkit/components/search/tests/xpcshell/test_engine_selector_engine_orders.js

@@ -9,7 +9,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
 });
 
 const ENGINE_ORDERS_CONFIG = [

toolkit/components/search/tests/xpcshell/test_engine_selector_environment.js

@@ -9,7 +9,8 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
 });
 
 const CONFIG_EVERYWHERE = [

toolkit/components/search/tests/xpcshell/test_engine_selector_remote_override.js

@@ -4,7 +4,8 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.sys.mjs",
+  SearchEngineSelector:
+    "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs",
 });
 
 const TEST_CONFIG = [

toolkit/components/search/tests/xpcshell/test_searchSuggest.js

@@ -12,7 +12,7 @@ const { FormHistory } = ChromeUtils.importESModule(
   "resource://gre/modules/FormHistory.sys.mjs"
 );
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 const { TelemetryTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TelemetryTestUtils.sys.mjs"

toolkit/components/search/tests/xpcshell/test_searchSuggest_cookies.js

@@ -9,7 +9,7 @@
 "use strict";
 
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 
 // We must make sure the FormHistoryStartup component is

toolkit/components/search/tests/xpcshell/test_searchSuggest_private.js

@@ -9,7 +9,7 @@
 "use strict";
 
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 
 let engine;

toolkit/components/search/tests/xpcshell/test_searchSuggestionCountTelemetry.js

@@ -10,7 +10,7 @@ https://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
 const { SearchSuggestionController } = ChromeUtils.importESModule(
-  "resource://gre/modules/SearchSuggestionController.sys.mjs"
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"
 );
 
 let openSearchEngine, workingAppEngine, failingAppEngine;

toolkit/components/search/tests/xpcshell/test_telemetry_event_default.js

@@ -11,7 +11,7 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   AppProvidedSearchEngine:
-    "resource://gre/modules/AppProvidedSearchEngine.sys.mjs",
+    "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs",
 });
 
 const BASE_CONFIG = [

toolkit/modules/NewTabUtils.sys.mjs

@@ -6,7 +6,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 import {
   getSearchProvider,
   SEARCH_SHORTCUTS_EXPERIMENT,
-} from "resource://gre/modules/SearchShortcuts.sys.mjs";
+} from "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs";
 
 const lazy = {};
 

tools/@types/generated/lib.gecko.modules.d.ts

@@ -218,6 +218,19 @@ export interface LazyModules {
   "moz-src:///toolkit/components/reader/AboutReader.sys.mjs": typeof import("moz-src:///toolkit/components/reader/AboutReader.sys.mjs"),
   "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs": typeof import("moz-src:///toolkit/components/reader/ReaderMode.sys.mjs"),
   "moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs": typeof import("moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs"),
+  "moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/AddonSearchEngine.sys.mjs"),
+  "moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/AppProvidedSearchEngine.sys.mjs"),
+  "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs"),
+  "moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs": typeof import("moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs"),
+  "moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchEngine.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchSettings.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchSettings.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchShortcuts.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchStaticData.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchStaticData.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchSuggestionController.sys.mjs"),
+  "moz-src:///toolkit/components/search/SearchUtils.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchUtils.sys.mjs"),
+  "moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/UserSearchEngine.sys.mjs"),
   "resource:///actors/AboutNewTabParent.sys.mjs": typeof import("resource:///actors/AboutNewTabParent.sys.mjs"),
   "resource:///actors/AboutReaderParent.sys.mjs": typeof import("resource:///actors/AboutReaderParent.sys.mjs"),
   "resource:///actors/AboutWelcomeParent.sys.mjs": typeof import("resource:///actors/AboutWelcomeParent.sys.mjs"),
@@ -465,11 +478,9 @@ export interface LazyModules {
   "resource://gre/modules/AbuseReporter.sys.mjs": typeof import("resource://gre/modules/AbuseReporter.sys.mjs"),
   "resource://gre/modules/ActorManagerParent.sys.mjs": typeof import("resource://gre/modules/ActorManagerParent.sys.mjs"),
   "resource://gre/modules/AddonManager.sys.mjs": typeof import("resource://gre/modules/AddonManager.sys.mjs"),
-  "resource://gre/modules/AddonSearchEngine.sys.mjs": typeof import("resource://gre/modules/AddonSearchEngine.sys.mjs"),
   "resource://gre/modules/AndroidLog.sys.mjs": typeof import("resource://gre/modules/AndroidLog.sys.mjs"),
   "resource://gre/modules/AppConstants.sys.mjs": typeof import("resource://gre/modules/AppConstants.sys.mjs"),
   "resource://gre/modules/AppMenuNotifications.sys.mjs": typeof import("resource://gre/modules/AppMenuNotifications.sys.mjs"),
-  "resource://gre/modules/AppProvidedSearchEngine.sys.mjs": typeof import("resource://gre/modules/AppProvidedSearchEngine.sys.mjs"),
   "resource://gre/modules/AppUpdater.sys.mjs": typeof import("resource://gre/modules/AppUpdater.sys.mjs"),
   "resource://gre/modules/AsyncPrefs.sys.mjs": typeof import("resource://gre/modules/AsyncPrefs.sys.mjs"),
   "resource://gre/modules/AsyncShutdown.sys.mjs": typeof import("resource://gre/modules/AsyncShutdown.sys.mjs"),
@@ -648,8 +659,6 @@ export interface LazyModules {
   "resource://gre/modules/OSKeyStore.sys.mjs": typeof import("resource://gre/modules/OSKeyStore.sys.mjs"),
   "resource://gre/modules/ObjectUtils.sys.mjs": typeof import("resource://gre/modules/ObjectUtils.sys.mjs"),
   "resource://gre/modules/ObliviousHTTP.sys.mjs": typeof import("resource://gre/modules/ObliviousHTTP.sys.mjs"),
-  "resource://gre/modules/OpenSearchEngine.sys.mjs": typeof import("resource://gre/modules/OpenSearchEngine.sys.mjs"),
-  "resource://gre/modules/OpenSearchLoader.sys.mjs": typeof import("resource://gre/modules/OpenSearchLoader.sys.mjs"),
   "resource://gre/modules/OsEnvironment.sys.mjs": typeof import("resource://gre/modules/OsEnvironment.sys.mjs"),
   "resource://gre/modules/PageThumbUtils.sys.mjs": typeof import("resource://gre/modules/PageThumbUtils.sys.mjs"),
   "resource://gre/modules/PageThumbs.sys.mjs": typeof import("resource://gre/modules/PageThumbs.sys.mjs"),
@@ -665,7 +674,6 @@ export interface LazyModules {
   "resource://gre/modules/PlacesSyncUtils.sys.mjs": typeof import("resource://gre/modules/PlacesSyncUtils.sys.mjs"),
   "resource://gre/modules/PlacesTransactions.sys.mjs": typeof import("resource://gre/modules/PlacesTransactions.sys.mjs"),
   "resource://gre/modules/PlacesUtils.sys.mjs": typeof import("resource://gre/modules/PlacesUtils.sys.mjs"),
-  "resource://gre/modules/PolicySearchEngine.sys.mjs": typeof import("resource://gre/modules/PolicySearchEngine.sys.mjs"),
   "resource://gre/modules/Preferences.sys.mjs": typeof import("resource://gre/modules/Preferences.sys.mjs"),
   "resource://gre/modules/PrincipalsCollector.sys.mjs": typeof import("resource://gre/modules/PrincipalsCollector.sys.mjs"),
   "resource://gre/modules/PrivateBrowsingUtils.sys.mjs": typeof import("resource://gre/modules/PrivateBrowsingUtils.sys.mjs"),
@@ -694,14 +702,7 @@ export interface LazyModules {
   "resource://gre/modules/SafeBrowsing.sys.mjs": typeof import("resource://gre/modules/SafeBrowsing.sys.mjs"),
   "resource://gre/modules/SandboxUtils.sys.mjs": typeof import("resource://gre/modules/SandboxUtils.sys.mjs"),
   "resource://gre/modules/Schemas.sys.mjs": typeof import("resource://gre/modules/Schemas.sys.mjs"),
-  "resource://gre/modules/SearchEngine.sys.mjs": typeof import("resource://gre/modules/SearchEngine.sys.mjs"),
-  "resource://gre/modules/SearchEngineSelector.sys.mjs": typeof import("resource://gre/modules/SearchEngineSelector.sys.mjs"),
   "resource://gre/modules/SearchService.sys.mjs": typeof import("resource://gre/modules/SearchService.sys.mjs"),
-  "resource://gre/modules/SearchSettings.sys.mjs": typeof import("resource://gre/modules/SearchSettings.sys.mjs"),
-  "resource://gre/modules/SearchShortcuts.sys.mjs": typeof import("resource://gre/modules/SearchShortcuts.sys.mjs"),
-  "resource://gre/modules/SearchStaticData.sys.mjs": typeof import("resource://gre/modules/SearchStaticData.sys.mjs"),
-  "resource://gre/modules/SearchSuggestionController.sys.mjs": typeof import("resource://gre/modules/SearchSuggestionController.sys.mjs"),
-  "resource://gre/modules/SearchUtils.sys.mjs": typeof import("resource://gre/modules/SearchUtils.sys.mjs"),
   "resource://gre/modules/SecurityInfo.sys.mjs": typeof import("resource://gre/modules/SecurityInfo.sys.mjs"),
   "resource://gre/modules/SelectionUtils.sys.mjs": typeof import("resource://gre/modules/SelectionUtils.sys.mjs"),
   "resource://gre/modules/ServiceRequest.sys.mjs": typeof import("resource://gre/modules/ServiceRequest.sys.mjs"),
@@ -733,7 +734,6 @@ export interface LazyModules {
   "resource://gre/modules/UpdateService.sys.mjs": typeof import("resource://gre/modules/UpdateService.sys.mjs"),
   "resource://gre/modules/UpdateUtils.sys.mjs": typeof import("resource://gre/modules/UpdateUtils.sys.mjs"),
   "resource://gre/modules/UsageReporting.sys.mjs": typeof import("resource://gre/modules/UsageReporting.sys.mjs"),
-  "resource://gre/modules/UserSearchEngine.sys.mjs": typeof import("resource://gre/modules/UserSearchEngine.sys.mjs"),
   "resource://gre/modules/WebAuthnFeature.sys.mjs": typeof import("resource://gre/modules/WebAuthnFeature.sys.mjs"),
   "resource://gre/modules/WebChannel.sys.mjs": typeof import("resource://gre/modules/WebChannel.sys.mjs"),
   "resource://gre/modules/WebNavigation.sys.mjs": typeof import("resource://gre/modules/WebNavigation.sys.mjs"),

tools/@types/generated/tspaths.json

@@ -5525,9 +5525,6 @@
       "resource://gre/modules/AddonManager.sys.mjs": [
         "toolkit/mozapps/extensions/AddonManager.sys.mjs"
       ],
-      "resource://gre/modules/AddonSearchEngine.sys.mjs": [
-        "toolkit/components/search/AddonSearchEngine.sys.mjs"
-      ],
       "resource://gre/modules/AndroidLog.sys.mjs": [
         "mobile/android/modules/geckoview/AndroidLog.sys.mjs"
       ],
@@ -5537,9 +5534,6 @@
       "resource://gre/modules/AppMenuNotifications.sys.mjs": [
         "toolkit/modules/AppMenuNotifications.sys.mjs"
       ],
-      "resource://gre/modules/AppProvidedSearchEngine.sys.mjs": [
-        "toolkit/components/search/AppProvidedSearchEngine.sys.mjs"
-      ],
       "resource://gre/modules/AppUpdater.sys.mjs": [
         "toolkit/mozapps/update/AppUpdater.sys.mjs"
       ],
@@ -6182,12 +6176,6 @@
       "resource://gre/modules/ObliviousHTTP.sys.mjs": [
         "netwerk/protocol/http/ObliviousHTTP.sys.mjs"
       ],
-      "resource://gre/modules/OpenSearchEngine.sys.mjs": [
-        "toolkit/components/search/OpenSearchEngine.sys.mjs"
-      ],
-      "resource://gre/modules/OpenSearchLoader.sys.mjs": [
-        "toolkit/components/search/OpenSearchLoader.sys.mjs"
-      ],
       "resource://gre/modules/OsEnvironment.sys.mjs": [
         "toolkit/modules/OsEnvironment.sys.mjs"
       ],
@@ -6239,9 +6227,6 @@
       "resource://gre/modules/PlacesUtils.sys.mjs": [
         "toolkit/components/places/PlacesUtils.sys.mjs"
       ],
-      "resource://gre/modules/PolicySearchEngine.sys.mjs": [
-        "toolkit/components/search/PolicySearchEngine.sys.mjs"
-      ],
       "resource://gre/modules/PopupNotifications.sys.mjs": [
         "toolkit/modules/PopupNotifications.sys.mjs"
       ],
@@ -6380,30 +6365,9 @@
       "resource://gre/modules/Schemas.sys.mjs": [
         "toolkit/components/extensions/Schemas.sys.mjs"
       ],
-      "resource://gre/modules/SearchEngine.sys.mjs": [
-        "toolkit/components/search/SearchEngine.sys.mjs"
-      ],
-      "resource://gre/modules/SearchEngineSelector.sys.mjs": [
-        "toolkit/components/search/SearchEngineSelector.sys.mjs"
-      ],
       "resource://gre/modules/SearchService.sys.mjs": [
         "toolkit/components/search/SearchService.sys.mjs"
       ],
-      "resource://gre/modules/SearchSettings.sys.mjs": [
-        "toolkit/components/search/SearchSettings.sys.mjs"
-      ],
-      "resource://gre/modules/SearchShortcuts.sys.mjs": [
-        "toolkit/components/search/SearchShortcuts.sys.mjs"
-      ],
-      "resource://gre/modules/SearchStaticData.sys.mjs": [
-        "toolkit/components/search/SearchStaticData.sys.mjs"
-      ],
-      "resource://gre/modules/SearchSuggestionController.sys.mjs": [
-        "toolkit/components/search/SearchSuggestionController.sys.mjs"
-      ],
-      "resource://gre/modules/SearchUtils.sys.mjs": [
-        "toolkit/components/search/SearchUtils.sys.mjs"
-      ],
       "resource://gre/modules/SecurityInfo.sys.mjs": [
         "toolkit/components/extensions/webrequest/SecurityInfo.sys.mjs"
       ],
@@ -6527,9 +6491,6 @@
       "resource://gre/modules/UsageReporting.sys.mjs": [
         "toolkit/components/telemetry/app/UsageReporting.sys.mjs"
       ],
-      "resource://gre/modules/UserSearchEngine.sys.mjs": [
-        "toolkit/components/search/UserSearchEngine.sys.mjs"
-      ],
       "resource://gre/modules/ValueExtractor.sys.mjs": [
         "dom/manifest/ValueExtractor.sys.mjs"
       ],