From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Mon, 11 Dec 2017 22:42:11 +0100
Subject: Add Google English-only 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       |  23 ++-
 components/search_engines/search_engine_type.h     |   1 +
 .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
 3 files changed, 132 insertions(+), 110 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
@@ -32,7 +32,7 @@
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
-    "kCurrentDataVersion": 104
+    "kCurrentDataVersion": 105
   },
 
   // The following engines are included in country lists and are added to the
@@ -159,6 +159,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
+    },
+
     "kvasir": {
       "name": "Kvasir",
       "keyword": "kvasir.no",
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
@@ -66,6 +66,7 @@ enum SearchEngineType {
   SEARCH_ENGINE_DUCKDUCKGO,
   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
   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
@@ -51,548 +51,548 @@ namespace {
 
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // United Arab Emirates
 const PrepopulatedEngine* const engines_AE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Albania
 const PrepopulatedEngine* const engines_AL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Argentina
 const PrepopulatedEngine* const engines_AR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
 };
 
 // Austria
 const PrepopulatedEngine* const engines_AT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
 };
 
 // Australia
 const PrepopulatedEngine* const engines_AU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
 };
 
 // Bosnia and Herzegovina
 const PrepopulatedEngine* const engines_BA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Belgium
 const PrepopulatedEngine* const engines_BE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
 };
 
 // Bulgaria
 const PrepopulatedEngine* const engines_BG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
 };
 
 // Bahrain
 const PrepopulatedEngine* const engines_BH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Burundi
 const PrepopulatedEngine* const engines_BI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Brunei
 const PrepopulatedEngine* const engines_BN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
 };
 
 // Bolivia
 const PrepopulatedEngine* const engines_BO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Brazil
 const PrepopulatedEngine* const engines_BR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
 };
 
 // Belarus
 const PrepopulatedEngine* const engines_BY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
 };
 
 // Belize
 const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Canada
 const PrepopulatedEngine* const engines_CA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
 };
 
 // Switzerland
 const PrepopulatedEngine* const engines_CH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
 };
 
 // Chile
 const PrepopulatedEngine* const engines_CL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
 };
 
 // China
 const PrepopulatedEngine* const engines_CN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
 };
 
 // Colombia
 const PrepopulatedEngine* const engines_CO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
 };
 
 // Costa Rica
 const PrepopulatedEngine* const engines_CR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Czech Republic
 const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
 };
 
 // Germany
 const PrepopulatedEngine* const engines_DE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
 };
 
 // Denmark
 const PrepopulatedEngine* const engines_DK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
 };
 
 // Dominican Republic
 const PrepopulatedEngine* const engines_DO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Algeria
 const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Ecuador
 const PrepopulatedEngine* const engines_EC[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Estonia
 const PrepopulatedEngine* const engines_EE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Egypt
 const PrepopulatedEngine* const engines_EG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Spain
 const PrepopulatedEngine* const engines_ES[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
 };
 
 // Faroe Islands
 const PrepopulatedEngine* const engines_FO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
 };
 
 // Finland
 const PrepopulatedEngine* const engines_FI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
 };
 
 // France
 const PrepopulatedEngine* const engines_FR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
 };
 
 // United Kingdom
 const PrepopulatedEngine* const engines_GB[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
 };
 
 // Greece
 const PrepopulatedEngine* const engines_GR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
 };
 
 // Guatemala
 const PrepopulatedEngine* const engines_GT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Hong Kong
 const PrepopulatedEngine* const engines_HK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
 };
 
 // Honduras
 const PrepopulatedEngine* const engines_HN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Croatia
 const PrepopulatedEngine* const engines_HR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Hungary
 const PrepopulatedEngine* const engines_HU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Indonesia
 const PrepopulatedEngine* const engines_ID[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
 };
 
 // Ireland
 const PrepopulatedEngine* const engines_IE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
 };
 
 // Israel
 const PrepopulatedEngine* const engines_IL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // India
 const PrepopulatedEngine* const engines_IN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
 };
 
 // Iraq
 const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Iran
 const PrepopulatedEngine* const engines_IR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Iceland
 const PrepopulatedEngine* const engines_IS[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Italy
 const PrepopulatedEngine* const engines_IT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
 };
 
 // Jamaica
 const PrepopulatedEngine* const engines_JM[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Jordan
 const PrepopulatedEngine* const engines_JO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Japan
 const PrepopulatedEngine* const engines_JP[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
 };
 
 // Kenya
 const PrepopulatedEngine* const engines_KE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Kuwait
 const PrepopulatedEngine* const engines_KW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // South Korea
 const PrepopulatedEngine* const engines_KR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
 };
 
 // Kazakhstan
 const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
 };
 
 // Lebanon
 const PrepopulatedEngine* const engines_LB[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Liechtenstein
 const PrepopulatedEngine* const engines_LI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
 };
 
 // Lithuania
 const PrepopulatedEngine* const engines_LT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
 };
 
 // Luxembourg
 const PrepopulatedEngine* const engines_LU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
 };
 
 // Latvia
 const PrepopulatedEngine* const engines_LV[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
 };
 
 // Libya
 const PrepopulatedEngine* const engines_LY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Morocco
 const PrepopulatedEngine* const engines_MA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Monaco
 const PrepopulatedEngine* const engines_MC[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
 };
 
 // Moldova
 const PrepopulatedEngine* const engines_MD[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Montenegro
 const PrepopulatedEngine* const engines_ME[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Macedonia
 const PrepopulatedEngine* const engines_MK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Mexico
 const PrepopulatedEngine* const engines_MX[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
 };
 
 // Malaysia
 const PrepopulatedEngine* const engines_MY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
 };
 
 // Nicaragua
 const PrepopulatedEngine* const engines_NI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Netherlands
 const PrepopulatedEngine* const engines_NL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
 };
 
 // Norway
 const PrepopulatedEngine* const engines_NO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
 };
 
 // New Zealand
 const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
 };
 
 // Oman
 const PrepopulatedEngine* const engines_OM[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Panama
 const PrepopulatedEngine* const engines_PA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Peru
 const PrepopulatedEngine* const engines_PE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
 };
 
 // Philippines
 const PrepopulatedEngine* const engines_PH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
 };
 
 // Pakistan
 const PrepopulatedEngine* const engines_PK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Puerto Rico
 const PrepopulatedEngine* const engines_PR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Poland
 const PrepopulatedEngine* const engines_PL[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
 };
 
 // Portugal
 const PrepopulatedEngine* const engines_PT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Paraguay
 const PrepopulatedEngine* const engines_PY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Qatar
 const PrepopulatedEngine* const engines_QA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Romania
 const PrepopulatedEngine* const engines_RO[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
 };
 
 // Serbia
 const PrepopulatedEngine* const engines_RS[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Russia
 const PrepopulatedEngine* const engines_RU[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
 };
 
 // Rwanda
 const PrepopulatedEngine* const engines_RW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Saudi Arabia
 const PrepopulatedEngine* const engines_SA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Sweden
 const PrepopulatedEngine* const engines_SE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
 };
 
 // Singapore
 const PrepopulatedEngine* const engines_SG[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
 };
 
 // Slovenia
 const PrepopulatedEngine* const engines_SI[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
 };
 
 // Slovakia
 const PrepopulatedEngine* const engines_SK[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // El Salvador
 const PrepopulatedEngine* const engines_SV[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Syria
 const PrepopulatedEngine* const engines_SY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Thailand
 const PrepopulatedEngine* const engines_TH[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
 };
 
 // Tunisia
 const PrepopulatedEngine* const engines_TN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Turkey
 const PrepopulatedEngine* const engines_TR[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
 };
 
 // Trinidad and Tobago
 const PrepopulatedEngine* const engines_TT[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Taiwan
 const PrepopulatedEngine* const engines_TW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
 };
 
 // Tanzania
 const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Ukraine
 const PrepopulatedEngine* const engines_UA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
 };
 
 // United States
 const PrepopulatedEngine* const engines_US[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
 };
 
 // Uruguay
 const PrepopulatedEngine* const engines_UY[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Venezuela
 const PrepopulatedEngine* const engines_VE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
 };
 
 // Vietnam
 const PrepopulatedEngine* const engines_VN[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
 };
 
 // Yemen
 const PrepopulatedEngine* const engines_YE[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // South Africa
 const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Zimbabwe
 const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
+    &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
 };
 
 // A list of all the engines that we know about.
 const PrepopulatedEngine* const kAllEngines[] = {
     // Prepopulated engines:
-    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &duckduckgo_light, &kvasir,
     &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
     &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
     &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
-- 
2.7.4