From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:27 +0200
Subject: Adding upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../tests/xpcshell/test_maybereloadengine_order.js | 54 +++-------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

(limited to 'toolkit/components/search/tests/xpcshell/test_maybereloadengine_order.js')

diff --git a/toolkit/components/search/tests/xpcshell/test_maybereloadengine_order.js b/toolkit/components/search/tests/xpcshell/test_maybereloadengine_order.js
index 663b7205a7..bdb8510812 100644
--- a/toolkit/components/search/tests/xpcshell/test_maybereloadengine_order.js
+++ b/toolkit/components/search/tests/xpcshell/test_maybereloadengine_order.js
@@ -1,56 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-"use strict";
+/*
+ * Test engine order is not set after engine reload.
+ */
 
-const TEST_CONFIG = [
-  {
-    webExtension: {
-      id: "plainengine@search.mozilla.org",
-      name: "Plain",
-      search_url: "https://duckduckgo.com/",
-      params: [
-        {
-          name: "q",
-          value: "{searchTerms}",
-        },
-      ],
-      suggest_url: "https://ac.duckduckgo.com/ac/q={searchTerms}&type=list",
-    },
-    appliesTo: [{ included: { everywhere: true } }],
-  },
-  {
-    webExtension: {
-      id: "special-engine@search.mozilla.org",
-      name: "Special",
-      search_url: "https://www.google.com/search",
-      params: [
-        {
-          name: "q",
-          value: "{searchTerms}",
-        },
-        {
-          name: "client",
-          condition: "purpose",
-          purpose: "keyword",
-          value: "firefox-b-1-ab",
-        },
-        {
-          name: "client",
-          condition: "purpose",
-          purpose: "searchbar",
-          value: "firefox-b-1",
-        },
-      ],
-      suggest_url:
-        "https://www.google.com/complete/search?client=firefox&q={searchTerms}",
-    },
-    appliesTo: [{ default: "yes", included: { regions: ["FR"] } }],
-  },
-];
+"use strict";
 
 add_setup(async function () {
-  await SearchTestUtils.useTestEngines("test-extensions", null, TEST_CONFIG);
+  await SearchTestUtils.useTestEngines("test-extensions");
   await AddonTestUtils.promiseStartupManager();
 
   registerCleanupFunction(AddonTestUtils.promiseShutdownManager);
@@ -59,7 +17,7 @@ add_setup(async function () {
 add_task(async function basic_multilocale_test() {
   let resolver;
   let initPromise = new Promise(resolve => (resolver = resolve));
-  useCustomGeoServer("FR", initPromise);
+  useCustomGeoServer("TR", initPromise);
 
   await Services.search.init();
   await Services.search.getAppProvidedEngines();
-- 
cgit v1.2.3