Bug 1565315 - Fix Yandex missing from en builds when in Russian regions. r=mconnor,daleharvey

Depends on D37869

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

--HG--
extra : moz-landing-system : lando

browser/components/search/extensions/list.json

@@ -56,6 +56,35 @@
         "visibleDefaultEngines": [
           "google-b-d", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia"
         ]
+      },
+      "KZ": {
+        "visibleDefaultEngines": [
+          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "BY": {
+        "visibleDefaultEngines": [
+          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "RU": {
+        "visibleDefaultEngines": [
+          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "TR": {
+        "visibleDefaultEngines": [
+          "amazondotcom", "bing", "google", "twitter", "wikipedia", "ddg", "yandex-en"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-ca", "amazon-au", "yandex-en", "google", "google-b-1-e", "google-b-e"
+        ]
       }
     },
     "ach": {
@@ -237,6 +266,35 @@
         "visibleDefaultEngines": [
           "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
         ]
+      },
+      "KZ": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "BY": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "RU": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "TR": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-ca", "amazon-au", "yandex-en", "google", "google-b-1-e", "google-b-e"
+        ]
       }
     },
     "en-GB": {
@@ -244,6 +302,35 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
         ]
+      },
+      "KZ": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "BY": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "RU": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "TR": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "yandex-en"
+        ]
       }
     },
     "en-ZA": {
@@ -251,6 +338,30 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
         ]
+      },
+      "KZ": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "BY": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "RU": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
+      },
+      "TR": {
+        "visibleDefaultEngines": [
+          "yandex-en", "google-b-d", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+        ],
+        "searchDefault": "Yandex"
       }
     },
     "eo": {
@@ -286,6 +397,11 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "ddg", "mercadolibre-mx", "wikipedia-es"
         ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-mx"
+        ]
       }
     },
     "et": {
@@ -335,6 +451,11 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL"
         ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-nl"
+        ]
       }
     },
     "ga-IE": {
@@ -608,6 +729,11 @@
         "visibleDefaultEngines": [
           "google-b-d", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl"
         ]
+      },
+      "experimental-hidden": {
+        "visibleDefaultEngines": [
+          "amazon-nl"
+        ]
       }
     },
     "nn-NO": {

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

@@ -3,6 +3,8 @@
 
 "use strict";
 
+let availableRegions = Services.intl.getAvailableLocaleDisplayNames("region");
+
 const test = new SearchConfigTest({
   identifier: "ebay",
   aliases: ["@ebay"],
@@ -19,7 +21,6 @@ const test = new SearchConfigTest({
         locales: {
           matches: [
             "an",
-            "en-US",
             "ast",
             "br",
             "ca",
@@ -44,6 +45,15 @@ const test = new SearchConfigTest({
           ],
         },
       },
+      {
+        // For en-US ebay is currently included everywhere apart from these regions.
+        regions: availableRegions.filter(
+          region => !["by", "kz", "ru", "tr"].includes(region)
+        ),
+        locales: {
+          matches: ["en-US"],
+        },
+      },
     ],
   },
   searchUrlBase: "https://rover.ebay.com/rover/1/",

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

@@ -18,8 +18,7 @@ const test = new SearchConfigTest({
         regions: ["ru", "tr", "by", "kz"],
         locales: {
           matches: ["ru", "tr", "be", "kk"],
-          // We don't currently enforce this.
-          // startsWith: ["en"],
+          startsWith: ["en"],
         },
       },
       {

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

@@ -12,8 +12,7 @@ const test = new SearchConfigTest({
         regions: ["ru", "tr", "by", "kz"],
         locales: {
           matches: ["ru", "tr", "be", "kk"],
-          // We don't currently enforce this.
-          // startsWith: ["en"],
+          startsWith: ["en"],
         },
       },
     ],
@@ -25,6 +24,12 @@ const test = new SearchConfigTest({
           matches: ["az", "ru", "be", "kk", "tr"],
         },
       },
+      {
+        regions: ["ru", "tr", "by", "kz"],
+        locales: {
+          startsWith: ["en"],
+        },
+      },
     ],
   },
   details: [