Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

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

2 files changed, 44 insertions, 0 deletions

diff --git a/toolkit/components/search/tests/xpcshell/data/engine-fr.xml b/toolkit/components/search/tests/xpcshell/data/engine-fr.xml
new file mode 100644
index 0000000000..4bb4426a12
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/data/engine-fr.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">

+<ShortName>Test search engine (fr)</ShortName>

+<Description>A test search engine (based on Google search for a different locale)</Description>

+<InputEncoding>ISO-8859-1</InputEncoding>

+<Url type="text/html" method="GET" template="http://www.google.fr/search">

+  <Param name="q" value="{searchTerms}"/>

+  <Param name="ie" value="iso-8859-1"/>

+  <Param name="oe" value="iso-8859-1"/>

+</Url>

+<SearchForm>http://www.google.fr/</SearchForm>

+</SearchPlugin>

diff --git a/toolkit/components/search/tests/xpcshell/data/engine-fr/manifest.json b/toolkit/components/search/tests/xpcshell/data/engine-fr/manifest.json
new file mode 100644
index 0000000000..cc895d26d9
--- /dev/null
+++ b/toolkit/components/search/tests/xpcshell/data/engine-fr/manifest.json
@@ -0,0 +1,32 @@
+{
+  "name": "Test search engine (fr)",
+  "manifest_version": 2,
+  "version": "1.0",
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "engine-fr@search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "description": "A test search engine (based on Google search for a different locale)",
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Test search engine (fr)",
+      "search_url": "https://www.google.fr/search",
+      "params": [
+        {
+          "name": "q",
+          "value": "{searchTerms}"
+        },
+        {
+          "name": "ie",
+          "value": "iso-8859-1"
+        },
+        {
+          "name": "oe",
+          "value": "iso-8859-1"
+        }
+      ]
+    }
+  }
+}