Bug 1583383 - Remove Firefox specific information from engines.json. r=mkmelin
authorJorg K <jorgk@jorgk.com>
Wed, 02 Oct 2019 21:57:05 +0200
changeset 37055 40eba987b24dfb84baf0d1ee0000b1764c818174
parent 37054 a05c073aca210f99bbae432c57bcb907f0e1fe23
child 37056 73754cd20bd83544ef9eae5348e62784cede69b0
push id395
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:38:57 +0000
reviewersmkmelin
bugs1583383
Bug 1583383 - Remove Firefox specific information from engines.json. r=mkmelin
mail/components/search/extensions/engines.json
--- a/mail/components/search/extensions/engines.json
+++ b/mail/components/search/extensions/engines.json
@@ -1,85 +1,32 @@
 {
   "data": [
     {
       "engineName": "Google",
       "orderHint": 1000,
       "webExtensionId": "google@search.mozilla.org",
       "webExtensionVersion": "1.0",
       "searchUrlGetParams": {
-        "client": "firefox-b-d",
         "q": "{searchTerms}"
       },
-      "telemetryId": "google-b-d",
+      "telemetryId": "google",
       "appliesTo": [{
         "included": { "everywhere": true },
-        "default": "yes"
-      }, {
-        "included": {
-          "regions": ["ru", "tr", "by", "kz"],
-          "locales": {
-            "matches": ["ru", "tr", "be", "kk"],
-            "startsWith": ["en"]
-          },
-          "telemetryId": "google"
-        },
-        "default": "no"
-      }, {
-        "included": {
-          "regions": ["cn"],
-          "locales": {
-            "matches": ["zh-CN"]
-          }
-        },
-        "default": "no"
-      }, {
-        "included": { "regions": ["us"] },
-        "searchUrlGetParams": {
-          "client": "firefox-b-1-d",
-          "q": "{searchTerms}"
-        },
-        "telemetryId": "google-b-1-d"
+        "default": "yes-if-no-other"
       }],
       "aliases": ["@google"]
     },
     {
       "engineName": "Bing",
       "webExtensionId": "bing@search.mozilla.org",
       "webExtensionVersion": "1.0",
       "searchUrlGetParams": {
-        "q": "{searchTerms}",
-        "pc": "MOZI"
+        "q": "{searchTerms}"
       },
-      "extraParams": [{
-        "name": "form",
-        "condition": "purpose",
-        "purpose": "searchbar",
-        "value": "MOZSBR"
-      }, {
-        "name": "form",
-        "condition": "purpose",
-        "purpose": "keyword",
-        "value": "MOZLBR"
-      }, {
-        "name": "form",
-        "condition": "purpose",
-        "purpose": "contextmenu",
-        "value": "MOZCON"
-      }, {
-        "name": "form",
-        "condition": "purpose",
-        "purpose": "homepage",
-        "value": "MOZSPG"
-      }, {
-        "name": "form",
-        "condition": "purpose",
-        "purpose": "newtab",
-        "value": "MOZTSB"
-      }],
       "appliesTo": [{
         "included": {
           "locales": {
             "matches": [
               "ach", "af", "an", "ar", "ast", "az", "ca", "ca-valencia",
               "cak", "da", "de", "dsb", "el", "eo", "es-CL", "es-ES",
               "es-MX", "eu", "fa", "ff", "fi", "fr", "fy-NL", "gn",
               "gu-IN", "hi-IN", "hr", "hsb", "ia", "is", "it",
@@ -99,22 +46,20 @@
     },
     {
       "engineName": "\u767E\u5EA6",
       "webExtensionId": "baidu@search.mozilla.org",
       "webExtensionVersion": "1.0",
       "telemetryId": "baidu",
       "searchUrlGetParams": {
         "wd": "{searchTerms}",
-        "tn": "monline_7_dg",
         "ie": "utf-8"
       },
       "suggestUrlGetParams": {
         "wd": "{searchTerms}",
-        "tn": "monline_7_dg",
         "ie": "utf-8",
         "action": "opensearch"
       },
       "appliesTo": [{
         "included": { "locales": { "matches": ["zh-CN"] } }
       }, {
         "included": {
           "regions": ["cn"],
@@ -129,17 +74,16 @@
       "orderHint": 500,
       "webExtensionId": "amazondotcom@search.mozilla.org",
       "webExtensionVersion": "1.1",
       "telemetryId": "amazondotcom",
       "suggestUrlGetParams": {
         "field-keywords": "{searchTerms}",
         "ie": "{inputEncoding}",
         "mode": "blended",
-        "tag": "mozilla-20",
         "sourceid": "Mozilla-search"
       },
       "appliesTo": [{
         "included": { "regions": ["default"] }
       }, {
         "included": {
           "locales": {
             "matches": [
@@ -200,17 +144,16 @@
         "webExtensionVersion": "1.1",
         "webExtensionLocales": ["france"],
         "telemetryId": "amazon-france",
         "engineName": "Amazon.fr",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefox-fr-21",
           "sourceid":"Mozilla-search"
         }
       }, {
         "included": {
           "regions": ["gb"],
           "locales": {
             "matches": [
               "ach", "af", "ar", "az", "bg", "cak", "en-US", "eo",
@@ -223,17 +166,16 @@
         "webExtensionId": "amazon@search.mozilla.org",
         "webExtensionVersion": "1.1",
         "webExtensionLocales": ["en-GB"],
         "telemetryId": "amazon-en-GB",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefox-uk-21",
           "sourceid":"Mozilla-search"
         },
         "engineName": "Amazon.co.uk"
       }],
       "aliases": ["amazon"]
     },
     {
       "engineName": "Amazon",
@@ -261,17 +203,16 @@
         },
         "webExtensionLocales": ["france"],
         "telemetryId": "amazon-france",
         "engineName": "Amazon.fr",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefox-fr-21",
           "sourceid":"Mozilla-search"
         }
       }, {
         "included": {
           "regions": ["ca"],
           "locales": { "matches": ["br", "ff", "fr", "son", "wo"] }
         },
         "webExtensionLocales": ["ca"],
@@ -286,41 +227,38 @@
         "included": { "locales": { "matches": ["ja-JP-mac", "ja"] } },
         "webExtensionLocales": ["jp"],
         "telemetryId": "amazon-jp",
         "engineName": "Amazon.jp",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "mozillajapan-fx-22",
           "sourceid":"Mozilla-search"
         }
       }, {
         "included": { "locales": { "matches": ["it", "lij"] } },
         "webExtensionLocales": ["it"],
         "telemetryId": "amazon-it",
         "engineName": "Amazon.it",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefoxit-21",
           "sourceid":"Mozilla-search"
         }
       }, {
         "included": { "locales": { "matches": ["de", "dsb", "hsb"] } },
         "webExtensionLocales": ["de"],
         "telemetryId": "amazon-de",
         "engineName": "Amazon.de",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefox-de-21",
           "sourceid":"Mozilla-search"
         }
       }, {
         "included": {
           "locales": {
             "matches": [
               "cy", "da", "el", "en-GB", "eu", "ga-IE", "gd", "gl", "hr",
               "nb-NO", "nn-NO", "pt-PT", "sq", "sr"
@@ -328,17 +266,16 @@
           }
         },
         "webExtensionLocales": ["en-GB"],
         "telemetryId": "amazon-en-GB",
         "searchUrlGetParams": {
           "field-keywords": "{searchTerms}",
           "ie": "{inputEncoding}",
           "mode": "blended",
-          "tag": "firefox-uk-21",
           "sourceid":"Mozilla-search"
         },
         "engineName": "Amazon.co.uk"
       }, {
         "included": {
           "regions": ["au"],
           "locales": {
             "matches": [
@@ -374,77 +311,25 @@
       "aliases": ["amazon"]
     },
     {
       "engineName": "DuckDuckGo",
       "orderHint": 500,
       "webExtensionId": "ddg@search.mozilla.org",
       "webExtensionVersion": "1.0",
       "telemetryId": "ddg",
-      "extraParams": [{
-        "name": "t",
-        "condition": "purpose",
-        "purpose": "searchbar",
-        "value": "ffsb"
-      }, {
-        "name": "t",
-        "condition": "purpose",
-        "purpose": "keyword",
-        "value": "ffab"
-      }, {
-        "name": "t",
-        "condition": "purpose",
-        "purpose": "contextmenu",
-        "value": "ffcm"
-      }, {
-        "name": "t",
-        "condition": "purpose",
-        "purpose": "homepage",
-        "value": "ffhp"
-      }, {
-        "name": "t",
-        "condition": "purpose",
-        "purpose": "newtab",
-        "value": "ffnt"
-      }],
       "appliesTo": [{
         "included": { "everywhere": true }
       }],
       "aliases": ["@duckduckgo", "@ddg"]
     },
     {
       "engineName": "Yandex",
       "webExtensionId": "yandex@search.mozilla.org",
       "webExtensionVersion": "1.0",
-      "extraParams": [{
-        "name": "clid",
-        "condition": "purpose",
-        "purpose": "searchbar",
-        "value": "2186618"
-      }, {
-        "name": "clid",
-        "condition": "purpose",
-        "purpose": "keyword",
-        "value": "2186621"
-      }, {
-        "name": "clid",
-        "condition": "purpose",
-        "purpose": "contextmenu",
-        "value": "2186623"
-      }, {
-        "name": "clid",
-        "condition": "purpose",
-        "purpose": "homepage",
-        "value": "2186617"
-      }, {
-        "name": "clid",
-        "condition": "purpose",
-        "purpose": "newtab",
-        "value": "2186620"
-      }],
       "appliesTo": [{
         "default": "yes",
         "included": {
           "regions": ["ru", "tr", "by", "kz"],
           "locales": {
             "matches": ["ru", "tr", "be", "kk"],
             "startsWith": ["en"]
           }