Adding upstream version 126.0.upstream/126.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 4 deletions

diff --git a/toolkit/components/search/tests/xpcshell/test_defaultEngine_fallback.js b/toolkit/components/search/tests/xpcshell/test_defaultEngine_fallback.js
index 12cb6568e7..2f269cc016 100644
--- a/toolkit/components/search/tests/xpcshell/test_defaultEngine_fallback.js
+++ b/toolkit/components/search/tests/xpcshell/test_defaultEngine_fallback.js
@@ -17,6 +17,15 @@
 let appDefault;
 let appPrivateDefault;
 
+async function getSearchConfig() {
+  let workDir = Services.dirsvc.get("CurWorkD", Ci.nsIFile);
+  let configFileName =
+    "file://" + PathUtils.join(workDir.path, "data", "search-config-v2.json");
+
+  let response = await fetch(configFileName);
+  return response.json();
+}
+
 add_setup(async function () {
   useHttpServer();
   await SearchTestUtils.useTestEngines();
@@ -292,10 +301,33 @@ add_task(async function test_default_fallback_remove_default_no_visible() {
 
 add_task(
   async function test_default_fallback_remove_default_no_visible_or_general() {
-    // Reset.
     Services.search.restoreDefaultEngines();
-    Services.search.defaultEngine = Services.search.defaultPrivateEngine =
-      appPrivateDefault;
+
+    // For this test, we need to change any general search engines to unknown,
+    // so that we can test what happens in the unlikely event that there are no
+    // general search engines.
+    if (SearchUtils.newSearchConfigEnabled) {
+      let searchConfig = await getSearchConfig();
+      for (let entry of searchConfig.data) {
+        if (
+          entry.recordType == "engine" &&
+          entry.base.classification == "general"
+        ) {
+          entry.base.classification = "unknown";
+        }
+      }
+      const settings = await RemoteSettings(SearchUtils.SETTINGS_KEY);
+      settings.get.returns(searchConfig.data);
+      Services.search.wrappedJSObject.reset();
+      await Services.search.init();
+
+      appPrivateDefault = await Services.search.getDefaultPrivate();
+
+      Services.search.defaultEngine = appPrivateDefault;
+    } else {
+      Services.search.defaultEngine = Services.search.defaultPrivateEngine =
+        appPrivateDefault;
+    }
 
     // Remove all but the default engine.
     let visibleEngines = await Services.search.getVisibleEngines();
@@ -310,7 +342,9 @@ add_task(
       "Should only have one visible engine"
     );
 
-    SearchUtils.GENERAL_SEARCH_ENGINE_IDS.clear();
+    if (!SearchUtils.newSearchConfigEnabled) {
+      SearchUtils.GENERAL_SEARCH_ENGINE_IDS.clear();
+    }
 
     const observer = new SearchObserver(
       [