Refresh 2019 Default Search Engines list

This CL updates the list of default search engines with rankings
determined by data collected in 2019.

Bug: 1025000
Change-Id: Ifb4412ae046639681a3f5c242e188615b5ab3d7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918334
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731799}

components/search_engines/prepopulated_engines.json

@@ -23,12 +23,12 @@
     // When adding new engines, increment this number and use it as the new
     // max ID. This is used by UMA stats and must be updated to include the full
     // range or else not all engines will be counted in stats.
-    "kMaxPrepopulatedEngineID": 100,
+    "kMaxPrepopulatedEngineID": 101,
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version. Otherwise, existing data may
     // continue to be used and updates made here will not always appear.
-    "kCurrentDataVersion": 117
+    "kCurrentDataVersion": 121
   },
 
   // The following engines are included in country lists and are added to the
@@ -102,6 +102,16 @@
       "id": 92
     },
 
+    "ecosia": {
+      "name": "Ecosia",
+      "keyword": "ecosia.org",
+      "favicon_url": "https://cdn.ecosia.org/assets/images/ico/favicon.ico",
+      "search_url": "https://www.ecosia.org/search?q={searchTerms}&addon=opensearch",
+      "suggest_url": "https://ac.ecosia.org/autocomplete?q={searchTerms}&type=list",
+      "type": "SEARCH_ENGINE_ECOSIA",
+      "id": 101
+    },
+
     "google": {
       "name": "Google",
       "keyword": "google.com",
@@ -341,9 +351,7 @@
       "search_url": "https://fr.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
       "suggest_url": "https://fr.search.yahoo.com/sugg/chrome?output=fxjson&appid=crmas&command={searchTerms}",
       "type": "SEARCH_ENGINE_YAHOO",
-
-      // Can't be 2 as this has to appear in the Belgium list alongside yahoo.
-      "id": 5
+      "id": 2
     },
 
     "yahoo_hk": {
@@ -446,18 +454,6 @@
       "id": 2
     },
 
-    "yahoo_qc": {
-      "name": "Yahoo! Qu\u00e9bec",
-      "keyword": "qc.yahoo.com",
-      "favicon_url": "https://qc.search.yahoo.com/favicon.ico",
-      "search_url": "https://qc.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
-      "suggest_url": "https://qc.search.yahoo.com/sugg/chrome?output=fxjson&appid=crmas&command={searchTerms}",
-      "type": "SEARCH_ENGINE_YAHOO",
-
-      // Can't be 2 as this has to appear in the Canada list alongside yahoo_ca.
-      "id": 5
-    },
-
     "yahoo_se": {
       "name": "Yahoo! Sverige",
       "keyword": "se.yahoo.com",
@@ -1125,6 +1121,16 @@
       "id": 76
     },
 
+    "yahoo_qc": {
+      "name": "Yahoo! Qu\u00e9bec",
+      "keyword": "qc.yahoo.com",
+      "favicon_url": "https://qc.search.yahoo.com/favicon.ico",
+      "search_url": "https://qc.search.yahoo.com/search{google:pathWildcard}?ei={inputEncoding}&fr=crmas&p={searchTerms}",
+      "suggest_url": "https://qc.search.yahoo.com/sugg/chrome?output=fxjson&appid=crmas&command={searchTerms}",
+      "type": "SEARCH_ENGINE_YAHOO",
+      "id": 2
+    },
+
     "zoznam": {
       "name": "Zoznam",
       "keyword": "zoznam.sk",

components/search_engines/search_engine_type.h

@@ -73,6 +73,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_METAGER,
   SEARCH_ENGINE_OCEANHERO,
   SEARCH_ENGINE_PRIVACYWALL,
+  SEARCH_ENGINE_ECOSIA,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };