bromite/build/patches/Add-English-only-search-engine.patch

From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 11 Dec 2017 22:42:11 +0100
Subject: Add English-only search engine

Add a Google search engine that forces languages to English,
disable from all its searches RLZ and field experiments querystring parameters.
---
 .../search_engines/prepopulated_engines.json       |  21 ++
 components/search_engines/search_engine_type.h     |   1 +
 .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
 3 files changed, 131 insertions(+), 109 deletions(-)

diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -122,6 +122,27 @@
       "id": 1
     },
 
+    "googleen": {
+      "name": "Google in English",
+      "keyword": "googleen",
+      "favicon_url": "https://www.google.com/favicon.ico",
+      "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
+      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
+      "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
+      "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
+      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
+      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
+      "alternate_urls": [
+        "{google:baseURL}?hl=en#q={searchTerms}",
+        "{google:baseURL}search?hl=en#q={searchTerms}",
+        "{google:baseURL}webhp?hl=en#q={searchTerms}",
+        "{google:baseURL}s?hl=en#q={searchTerms}",
+        "{google:baseURL}s?hl=en&q={searchTerms}"
+      ],
+      "type": "SEARCH_ENGINE_GOOGLE_EN",
+      "id": 13
+    },
+
     "mail_ru": {
       "name": "@MAIL.RU",
       "keyword": "mail.ru",
diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
--- a/components/search_engines/search_engine_type.h
+++ b/components/search_engines/search_engine_type.h
@@ -68,6 +68,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_PARSIJOO,
   SEARCH_ENGINE_QWANT,
   SEARCH_ENGINE_STARTPAGE,
+  SEARCH_ENGINE_GOOGLE_EN,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };
diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
+++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -32,7 +32,7 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
 };
@@ -41,7 +41,7 @@ const PrepopulatedEngine* const engines_default[] = {
 // Engine selection by country ------------------------------------------------
 // United Arab Emirates
 const PrepopulatedEngine* const engines_AE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -49,7 +49,7 @@ const PrepopulatedEngine* const engines_AE[] = {
 
 // Albania
 const PrepopulatedEngine* const engines_AL[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &ask,
@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = {
 
 // Argentina
 const PrepopulatedEngine* const engines_AR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_ar,
     &duckduckgo,
@@ -65,7 +65,7 @@ const PrepopulatedEngine* const engines_AR[] = {
 
 // Austria
 const PrepopulatedEngine* const engines_AT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_at,
     &duckduckgo,
@@ -73,7 +73,7 @@ const PrepopulatedEngine* const engines_AT[] = {
 
 // Australia
 const PrepopulatedEngine* const engines_AU[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_au,
     &duckduckgo,
@@ -81,7 +81,7 @@ const PrepopulatedEngine* const engines_AU[] = {
 
 // Bosnia and Herzegovina
 const PrepopulatedEngine* const engines_BA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &ask,
@@ -89,7 +89,7 @@ const PrepopulatedEngine* const engines_BA[] = {
 
 // Belgium
 const PrepopulatedEngine* const engines_BE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = {
 
 // Bulgaria
 const PrepopulatedEngine* const engines_BG[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = {
 
 // Bahrain
 const PrepopulatedEngine* const engines_BH[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &ask,
@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BH[] = {
 
 // Burundi
 const PrepopulatedEngine* const engines_BI[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -121,7 +121,7 @@ const PrepopulatedEngine* const engines_BI[] = {
 
 // Brunei
 const PrepopulatedEngine* const engines_BN[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BN[] = {
 
 // Bolivia
 const PrepopulatedEngine* const engines_BO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -137,7 +137,7 @@ const PrepopulatedEngine* const engines_BO[] = {
 
 // Brazil
 const PrepopulatedEngine* const engines_BR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_br,
     &duckduckgo,
@@ -145,7 +145,7 @@ const PrepopulatedEngine* const engines_BR[] = {
 
 // Belarus
 const PrepopulatedEngine* const engines_BY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yandex_by,
     &mail_ru,
     &bing,
@@ -153,7 +153,7 @@ const PrepopulatedEngine* const engines_BY[] = {
 
 // Belize
 const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -161,12 +161,12 @@ const PrepopulatedEngine* const engines_BZ[] = {
 
 // Canada
 const PrepopulatedEngine* const engines_CA[] = {
-    &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,
+    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,
 };
 
 // Switzerland
 const PrepopulatedEngine* const engines_CH[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &duckduckgo,
     &yahoo_ch,
@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_CH[] = {
 
 // Chile
 const PrepopulatedEngine* const engines_CL[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_cl,
     &duckduckgo,
@@ -182,12 +182,12 @@ const PrepopulatedEngine* const engines_CL[] = {
 
 // China
 const PrepopulatedEngine* const engines_CN[] = {
-    &baidu, &so_360, &google, &startpage, &sogou, &bing,
+    &baidu, &so_360, &googleen, &google, &startpage, &sogou, &bing,
 };
 
 // Colombia
 const PrepopulatedEngine* const engines_CO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_co,
     &bing,
     &duckduckgo,
@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CO[] = {
 
 // Costa Rica
 const PrepopulatedEngine* const engines_CR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -203,7 +203,7 @@ const PrepopulatedEngine* const engines_CR[] = {
 
 // Czech Republic
 const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &seznam,
     &bing,
     &yahoo,
@@ -211,7 +211,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
 
 // Germany
 const PrepopulatedEngine* const engines_DE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_de,
     &duckduckgo,
@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_DE[] = {
 
 // Denmark
 const PrepopulatedEngine* const engines_DK[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_dk,
     &duckduckgo,
@@ -227,7 +227,7 @@ const PrepopulatedEngine* const engines_DK[] = {
 
 // Dominican Republic
 const PrepopulatedEngine* const engines_DO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -235,7 +235,7 @@ const PrepopulatedEngine* const engines_DO[] = {
 
 // Algeria
 const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -243,7 +243,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
 
 // Ecuador
 const PrepopulatedEngine* const engines_EC[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -251,7 +251,7 @@ const PrepopulatedEngine* const engines_EC[] = {
 
 // Estonia
 const PrepopulatedEngine* const engines_EE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yandex_ru,
     &neti,
@@ -259,7 +259,7 @@ const PrepopulatedEngine* const engines_EE[] = {
 
 // Egypt
 const PrepopulatedEngine* const engines_EG[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_EG[] = {
 
 // Spain
 const PrepopulatedEngine* const engines_ES[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_es,
     &duckduckgo,
@@ -275,7 +275,7 @@ const PrepopulatedEngine* const engines_ES[] = {
 
 // Finland
 const PrepopulatedEngine* const engines_FI[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_fi,
     &duckduckgo,
@@ -283,7 +283,7 @@ const PrepopulatedEngine* const engines_FI[] = {
 
 // Faroe Islands
 const PrepopulatedEngine* const engines_FO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_FO[] = {
 
 // France
 const PrepopulatedEngine* const engines_FR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_fr,
     &qwant,
@@ -299,7 +299,7 @@ const PrepopulatedEngine* const engines_FR[] = {
 
 // United Kingdom
 const PrepopulatedEngine* const engines_GB[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_uk,
     &duckduckgo,
@@ -307,7 +307,7 @@ const PrepopulatedEngine* const engines_GB[] = {
 
 // Greece
 const PrepopulatedEngine* const engines_GR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -315,7 +315,7 @@ const PrepopulatedEngine* const engines_GR[] = {
 
 // Guatemala
 const PrepopulatedEngine* const engines_GT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -323,7 +323,7 @@ const PrepopulatedEngine* const engines_GT[] = {
 
 // Hong Kong
 const PrepopulatedEngine* const engines_HK[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_hk,
     &bing,
     &baidu,
@@ -331,7 +331,7 @@ const PrepopulatedEngine* const engines_HK[] = {
 
 // Honduras
 const PrepopulatedEngine* const engines_HN[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_HN[] = {
 
 // Croatia
 const PrepopulatedEngine* const engines_HR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_HR[] = {
 
 // Hungary
 const PrepopulatedEngine* const engines_HU[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &duckduckgo,
@@ -355,7 +355,7 @@ const PrepopulatedEngine* const engines_HU[] = {
 
 // Indonesia
 const PrepopulatedEngine* const engines_ID[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_id,
     &bing,
     &duckduckgo,
@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_ID[] = {
 
 // Ireland
 const PrepopulatedEngine* const engines_IE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -371,7 +371,7 @@ const PrepopulatedEngine* const engines_IE[] = {
 
 // Israel
 const PrepopulatedEngine* const engines_IL[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -379,7 +379,7 @@ const PrepopulatedEngine* const engines_IL[] = {
 
 // India
 const PrepopulatedEngine* const engines_IN[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_in,
     &bing,
     &duckduckgo,
@@ -387,7 +387,7 @@ const PrepopulatedEngine* const engines_IN[] = {
 
 // Iraq
 const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
 
 // Iran
 const PrepopulatedEngine* const engines_IR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
 };
 
 // Iceland
 const PrepopulatedEngine* const engines_IS[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = {
 
 // Italy
 const PrepopulatedEngine* const engines_IT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = {
 
 // Jamaica
 const PrepopulatedEngine* const engines_JM[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = {
 
 // Jordan
 const PrepopulatedEngine* const engines_JO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = {
 
 // Japan
 const PrepopulatedEngine* const engines_JP[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_jp,
     &bing,
     &baidu,
@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = {
 
 // Kenya
 const PrepopulatedEngine* const engines_KE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &duckduckgo,
@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = {
 
 // South Korea
 const PrepopulatedEngine* const engines_KR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &naver,
     &daum,
     &bing,
@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = {
 
 // Kuwait
 const PrepopulatedEngine* const engines_KW[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &ask,
@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = {
 
 // Kazakhstan
 const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yandex_kz,
     &mail_ru,
     &bing,
@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
 
 // Lebanon
 const PrepopulatedEngine* const engines_LB[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = {
 
 // Liechtenstein
 const PrepopulatedEngine* const engines_LI[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &duckduckgo,
     &yahoo,
@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = {
 
 // Lithuania
 const PrepopulatedEngine* const engines_LT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = {
 
 // Luxembourg
 const PrepopulatedEngine* const engines_LU[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &duckduckgo,
     &yahoo,
@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = {
 
 // Latvia
 const PrepopulatedEngine* const engines_LV[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yandex_ru,
     &yahoo,
@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = {
 
 // Libya
 const PrepopulatedEngine* const engines_LY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_com,
@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = {
 
 // Morocco
 const PrepopulatedEngine* const engines_MA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = {
 
 // Monaco
 const PrepopulatedEngine* const engines_MC[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = {
 
 // Moldova
 const PrepopulatedEngine* const engines_MD[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yandex_ru,
     &mail_ru,
     &duckduckgo,
@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = {
 
 // Montenegro
 const PrepopulatedEngine* const engines_ME[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = {
 
 // Macedonia
 const PrepopulatedEngine* const engines_MK[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &duckduckgo,
@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = {
 
 // Mexico
 const PrepopulatedEngine* const engines_MX[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_mx,
     &duckduckgo,
@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = {
 
 // Malaysia
 const PrepopulatedEngine* const engines_MY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_my,
     &bing,
     &baidu,
@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = {
 
 // Nicaragua
 const PrepopulatedEngine* const engines_NI[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = {
 
 // Netherlands
 const PrepopulatedEngine* const engines_NL[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_nl,
     &duckduckgo,
@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = {
 
 // Norway
 const PrepopulatedEngine* const engines_NO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = {
 
 // New Zealand
 const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &duckduckgo,
     &yahoo_nz,
@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
 
 // Oman
 const PrepopulatedEngine* const engines_OM[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &ask,
@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = {
 
 // Panama
 const PrepopulatedEngine* const engines_PA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = {
 
 // Peru
 const PrepopulatedEngine* const engines_PE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_pe,
     &bing,
     &duckduckgo,
@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = {
 
 // Philippines
 const PrepopulatedEngine* const engines_PH[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_ph,
     &bing,
     &duckduckgo,
@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = {
 
 // Pakistan
 const PrepopulatedEngine* const engines_PK[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &baidu,
@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = {
 
 // Poland
 const PrepopulatedEngine* const engines_PL[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = {
 
 // Puerto Rico
 const PrepopulatedEngine* const engines_PR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = {
 
 // Portugal
 const PrepopulatedEngine* const engines_PT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = {
 
 // Paraguay
 const PrepopulatedEngine* const engines_PY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = {
 
 // Qatar
 const PrepopulatedEngine* const engines_QA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &ask,
@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = {
 
 // Romania
 const PrepopulatedEngine* const engines_RO[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = {
 
 // Serbia
 const PrepopulatedEngine* const engines_RS[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &duckduckgo,
@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = {
 // Russia
 const PrepopulatedEngine* const engines_RU[] = {
     &yandex_ru,
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &mail_ru,
     &bing,
 };
 
 // Rwanda
 const PrepopulatedEngine* const engines_RW[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = {
 
 // Saudi Arabia
 const PrepopulatedEngine* const engines_SA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_com,
@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = {
 
 // Sweden
 const PrepopulatedEngine* const engines_SE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_se,
     &duckduckgo,
@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = {
 
 // Singapore
 const PrepopulatedEngine* const engines_SG[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo_sg,
     &yandex_com,
@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = {
 
 // Slovenia
 const PrepopulatedEngine* const engines_SI[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = {
 
 // Slovakia
 const PrepopulatedEngine* const engines_SK[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = {
 
 // El Salvador
 const PrepopulatedEngine* const engines_SV[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = {
 
 // Syria
 const PrepopulatedEngine* const engines_SY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = {
 
 // Thailand
 const PrepopulatedEngine* const engines_TH[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_th,
     &bing,
     &ask,
@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = {
 
 // Tunisia
 const PrepopulatedEngine* const engines_TN[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo,
     &bing,
     &yandex_ru,
@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = {
 
 // Turkey
 const PrepopulatedEngine* const engines_TR[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yandex_tr,
     &yahoo_tr,
     &bing,
@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = {
 
 // Trinidad and Tobago
 const PrepopulatedEngine* const engines_TT[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = {
 
 // Taiwan
 const PrepopulatedEngine* const engines_TW[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_tw,
     &bing,
     &baidu,
@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = {
 
 // Tanzania
 const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &yandex_ru,
@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
 
 // Ukraine
 const PrepopulatedEngine* const engines_UA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yandex_ua,
     &mail_ru,
     &bing,
@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = {
 
 // United States
 const PrepopulatedEngine* const engines_US[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = {
 
 // Uruguay
 const PrepopulatedEngine* const engines_UY[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = {
 
 // Venezuela
 const PrepopulatedEngine* const engines_VE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &yahoo_ve,
     &bing,
     &duckduckgo,
@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = {
 
 // Vietnam
 const PrepopulatedEngine* const engines_VN[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &coccoc,
     &bing,
     &yahoo_vn,
@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = {
 
 // Yemen
 const PrepopulatedEngine* const engines_YE[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &baidu,
@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = {
 
 // South Africa
 const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &duckduckgo,
@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
 
 // Zimbabwe
 const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &bing,
     &yahoo,
     &baidu,
@@ -898,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
     &coccoc,
     &daum,
     &duckduckgo,
-    &google, &startpage,
+    &googleen, &google, &startpage,
     &mail_ru,
     &naver,
     &qwant,
-- 
2.11.0