Release 64.0.3282.204

Add webRTC disabled to features list
Release 64.0.3282.193
2018-03-10 09:34:55 +01:00 · 2018-03-05 08:12:59 +01:00 · 2018-03-05 01:16:47 +01:00 · 2018-03-04 20:54:36 +01:00 · 2018-03-04 17:33:18 +01:00 · 2018-02-25 19:17:21 +01:00
46 changed files with 99324 additions and 43687 deletions
@@ -1,9 +1,52 @@
+# 64.0.3282.204
+* use H264 NEON optimizations also for arm64
+* fix build of Stable channel
+* updated AdBlock filters
+* started building vanilla Chromium releases as well
+
+# 64.0.3282.193
+* updated AdBlock filters
+* disable reporting
+
+# 64.0.3282.182
+* add support for domain-based adblock filters
+* optimized memory allocation for filters
+* updated AdBlock filters
+
+# 64.0.3282.168
+* extension: allow playing youtube/vimeo videos in background (https://github.com/bromite/bromite/issues/16)
+* never fetch most popular sites for new tab initialization, disable logo on new tab page
+* some improvements to adblock filters
+* disabled signin (ungoogled-chromium) (https://github.com/bromite/bromite/issues/31 and https://github.com/bromite/bromite/issues/11)
+* disabled webRTC and crash uploaders (ungoogled-chromium)
+* disabled translate (ungoogled-chromium)
+* disabled Gaia & GCM (ungoogled-chromium)
+* added clear HTTP cache menu item (ungoogled-chromium)
+* disabled Google host detection (ungoogled-chromium)
+* disabled profile avatar downloading (ungoogled-chromium)
+* disabled intranet redirect detector (ungoogled-chromium)
+* disabled plugin untraceable URLs (ungoogled-chromium)
+
+# 64.0.3282.149
+* updated AdBlock filters
+
+# 63.0.3239.150
+* fixed crash when clicking on address bar lock (page info) or opening site settings (https://github.com/bromite/bromite/issues/28)
+* build H264 with NEON optimizations for ARMv7
+* updated AdBlock filters
+* more builds for arm64 architecture
+
+# 63.0.3239.144
+* fixed invalid AdBlock filter rule blocking all connections (https://github.com/bromite/bromite/issues/26)
+* updated AdBlock filters
+
 # 63.0.3239.129
 * updated AdBlock filters

 # 63.0.3239.122
 * disable webRTC completely (https://github.com/bromite/bromite/issues/9)
 * hyperlinks sanitization fixed and now accessible from Google logo click
+* now building and publishing SystemWebView apks

 # 63.0.3239.118
 * limit impact of AMP-removal to not break tabs (https://github.com/bromite/bromite/issues/20)
@@ -6,10 +6,13 @@

 Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.

-Bromite is only available for Android v4 and above.
+Bromite is only available for Android v4.1 and above.

 See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.

+<img src="https://bromite.org/downloads.svg" alt="downloads on Github" title="downloads on Github" />
+<img src="https://bromite.org/xda_labs.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />
+
 # Donate

 Please donate to support development of Bromite and the costs for the build system.
@@ -26,15 +29,18 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

 * adblocking (currently baked-in, no configuration options available)
 * remove click-tracking and AMP from Google search results
+* allow youtube/vimeo videos to play in background
 * [StartPage](https://startpage.com/) search engine (select it from search engines under settings)
 * [DuckDuckGo](https://duckduckgo.com/) search engine (select it from search engines under settings)
+* Google search engines English-only with reduced tracking (select it from search engines under settings)
 * privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
+* completely removed webRTC
 * all codecs included (proprietary, open H.264 etc.)
-* built with official Chrome optimizations
+* built with official optimizations

 # F.A.Q.

-## Does Google Sync work?
+## Does Google Sync/Translate/Data saver work?
 No.
 This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.

@@ -1,4 +1,3 @@
-commit 0e91bb1894cc0b7a9f2ddb8d3a8dd0cdc609910a
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 22:47:49 2017 +0200

@@ -7,14 +6,15 @@ Date:   Wed Oct 11 22:47:49 2017 +0200
    bug-debian: http://bugs.debian.org/634101

 diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
-index ce4b76e..23bedeb 100644
 --- a/chrome/browser/ui/app_list/app_list_service.cc
 +++ b/chrome/browser/ui/app_list/app_list_service.cc
-@@ -145,7 +145,7 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
- 
-   // Identifies whether we should show the app launcher promo or not. This
-   // becomes false when the user dismisses the promo.
-  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, true);
+@@ -142,6 +142,10 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
+   registry->RegisterIntegerPref(prefs::kAppListEnableMethod,
+                                 ENABLE_NOT_RECORDED);
+   registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0);
+
+  // Identifies whether we should show the app launcher promo or not. This
+  // becomes false when the user dismisses the promo.
 +  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
 }
 
@@ -1,4 +1,3 @@
-commit 0a3880671af60180c72cdaf18e24f699db87ae23
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 22:50:10 2017 +0200

@@ -6,10 +5,9 @@ Date:   Wed Oct 11 22:50:10 2017 +0200
    author: Chad Miller <chad.miller@canonical.com>

 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 6dbac81..26a9c23 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -80,7 +80,7 @@ void CookieSettings::GetCookieSettings(
+@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -0,0 +1,20 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sun Nov 26 11:40:05 2017 +0100
+
+    Restore classic new tab page
+
+diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
+--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
+@@ -115,10 +115,7 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
+ }
+ 
+ bool ShouldShowLocalNewTab(Profile* profile) {
+-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+-  return command_line->HasSwitch(switches::kForceLocalNtp) ||
+-         (base::FeatureList::IsEnabled(features::kUseGoogleLocalNtp) &&
+-          profile && DefaultSearchProviderIsGoogle(profile));
+  return true;
+ }
+ 
+ bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
@@ -1,11 +1,9 @@
-commit 8ca595ca27ab3d99674275c96b06b160a83d92e3
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 22:57:29 2017 +0200

    Disable battery status service

 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
-index 988f20d..adbaf69 100644
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
@@ -41,6 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
@@ -1,11 +1,9 @@
-commit fd5c89a560c1fcbab8cd9b7335aca75a2d22d1e5
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 22:58:52 2017 +0200

    Disable GCM status check

 diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
-index 8972447..415b1ab 100644
 --- a/components/gcm_driver/gcm_channel_status_request.cc
 +++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -23,8 +23,10 @@ namespace gcm {
@@ -1,11 +1,9 @@
-commit 835aa728bc2eaa7f01dc875d87aa64b61bb11ccd
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 01:35:53 2017 +0200

    Disable updater pings

 diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
-index efc46c5..2bb49f36 100644
 --- a/components/component_updater/configurator_impl.cc
 +++ b/components/component_updater/configurator_impl.cc
@@ -56,8 +56,10 @@ const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
@@ -53,7 +51,6 @@ index efc46c5..2bb49f36 100644
 }
 
 diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
-index afc3d2d..5258e47 100644
 --- a/components/component_updater/configurator_impl.h
 +++ b/components/component_updater/configurator_impl.h
@@ -98,7 +98,6 @@ class ConfiguratorImpl {
@@ -1,15 +1,13 @@
-commit 099b041051cd3ea166c38269aa584bee7962d816
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:19:25 2017 +0200

-    Subject: [PATCH 21/60] prefs: only keep cookies until exit
+    [PATCH 21/60] prefs: only keep cookies until exit
    From: Jan Engelhardt <jengelh@inai.de>
    Date: Sat, 13 Sep 2014 17:25:47 +0200
    
    Out with all those tracking cookies!

 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index fe84151..f303447 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -118,7 +118,7 @@ void ContentSettingsRegistry::Init() {
@@ -1,4 +1,3 @@
-commit 6eaea225c3e5ceaba5a2753248c770b218bdc4f4
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:12:18 2017 +0200

@@ -12,7 +11,6 @@ Date:   Wed Oct 11 23:12:18 2017 +0200
    Instead, let them appear just like regular ones.

 diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
-index 3e89bb3..9bb411b 100644
 --- a/net/cert/ev_root_ca_metadata.cc
 +++ b/net/cert/ev_root_ca_metadata.cc
@@ -46,6 +46,16 @@ struct EVMetadata {
@@ -41,5 +39,5 @@ index 3e89bb3..9bb411b 100644
 +#endif
 +};
 
- #endif  // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
+ #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
 
@@ -1,4 +1,3 @@
-commit 232645939b9739109cfadd92755375dd775b4768
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:22:05 2017 +0200

@@ -21,10 +20,9 @@ Date:   Wed Oct 11 23:22:05 2017 +0200
    References: https://github.com/iridium-browser/iridium-browser/issues/33

 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 4dd2f65..01f0f66 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -84,6 +84,7 @@ namespace signin {
+@@ -130,6 +130,7 @@ namespace signin {
 
 bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
   DCHECK(profile);
@@ -1,25 +1,29 @@
-commit 31f49917379c516f5c71f4ca5aa140e2184c9f3b
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:24:58 2017 +0200

    Disables omission of URL elements in Omnibox
+    
+    Disable all omissions (already shadowed by first flag)

 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
-index bad3a45a..066407e 100644
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -401,10 +401,10 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
- 
+@@ -402,12 +402,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
 }  // namespace
 
-const FormatUrlType kFormatUrlOmitNothing = 0;
+ const FormatUrlType kFormatUrlOmitNothing = 0;
 -const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
 -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-+const FormatUrlType kFormatUrlOmitNothing = 1;
+-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
+-const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
+-const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;
 +const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
 +const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
 +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
- const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
- const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
- const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 1 << 5;
+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
+const FormatUrlType kFormatUrlExperimentalOmitTrivialSubdomains = 0 << 5;
+ 
+ const FormatUrlType kFormatUrlOmitDefaults =
+     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
@@ -1,11 +1,9 @@
-commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 08:09:24 2017 +0200

    Modify default preferences

 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
-index 6b66f9e..ac44881 100644
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -18,10 +16,9 @@ index 6b66f9e..ac44881 100644
 
 void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index a96f159e..7f7e9cf 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -878,7 +878,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -31,7 +28,6 @@ index a96f159e..7f7e9cf 100644
 }
 
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
-index e6ccce4..1e37c2b 100644
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -44,7 +40,6 @@ index e6ccce4..1e37c2b 100644
   registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
 #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
-index 8ab8a07..967bf2f 100644
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
@@ -57,7 +52,6 @@ index 8ab8a07..967bf2f 100644
   }
 }
 diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
-index 6512483..4c55a19 100644
 --- a/chrome/browser/net/prediction_options.h
 +++ b/chrome/browser/net/prediction_options.h
@@ -23,7 +23,7 @@ enum NetworkPredictionOptions {
@@ -70,7 +64,6 @@ index 6512483..4c55a19 100644
 
 enum class NetworkPredictionStatus {
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index 52042ee..b1acb4a 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
@@ -136,7 +136,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
@@ -83,7 +76,6 @@ index 52042ee..b1acb4a 100644
 #if defined(OS_ANDROID)
   registry->RegisterStringPref(
 diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-index b46a992..9d353d9 100644
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
@@ -45,7 +45,7 @@
@@ -96,10 +88,9 @@ index b46a992..9d353d9 100644
       </div>
     </dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 0f4bdb3..77e4810 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -391,8 +391,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -111,7 +102,6 @@ index 0f4bdb3..77e4810 100644
 }
 
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index bcd4d0e..2302f0f 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -129,7 +119,6 @@ index bcd4d0e..2302f0f 100644
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
-index 887d681..60eea93 100644
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
@@ -142,7 +131,6 @@ index 887d681..60eea93 100644
 }
 
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-index 8d043bd..69aa9f4 100644
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
@@ -157,7 +145,6 @@ index 8d043bd..69aa9f4 100644
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
-index 83a4617..4b8511c 100644
 --- a/chrome/service/cloud_print/connector_settings.cc
 +++ b/chrome/service/cloud_print/connector_settings.cc
@@ -60,7 +60,7 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
@@ -170,10 +157,9 @@ index 83a4617..4b8511c 100644
   xmpp_ping_enabled_ = prefs->GetBoolean(
       prefs::kCloudPrintXmppPingEnabled, false);
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
-index 9468cf2..86366ca 100644
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -211,7 +211,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -217,7 +217,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -183,7 +169,6 @@ index 9468cf2..86366ca 100644
   registry->RegisterBooleanPref(
       prefs::kAutofillProfileUseDatesFixed, false,
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
-index 8455e49..c7e70c0 100644
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -442,12 +442,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
@@ -202,10 +187,9 @@ index 8455e49..c7e70c0 100644
   registry->RegisterBooleanPref(
       prefs::kShowManagedBookmarksInBookmarkBar,
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
-index a05123f..4b8b05cb 100644
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -343,9 +343,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -334,9 +334,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -218,7 +202,6 @@ index a05123f..4b8b05cb 100644
   registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,
                                 false);
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
-index b8da726..b9ca9b0 100644
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
@@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
@@ -1,14 +1,12 @@
-commit 5927635bd17374da897e3d49264c536c68a09868
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Wed Oct 11 23:17:17 2017 +0200

    Do not store passwords by default

 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
-index bbb0c20..cf171c0 100644
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -207,10 +207,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -235,10 +235,10 @@ PasswordFormManager* FindMatchedManager(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -1,11 +1,9 @@
-commit e1675be76a5ab56335b878dcef50043159efae7a
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 12 08:15:17 2017 +0200

    Disable NTP remote suggestions by default

 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
-index 31823bbc..82eefe3 100644
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
@@ -38,16 +38,16 @@ const base::Feature* const kAllFeatures[] = {
@@ -1,14 +1,12 @@
-commit a06e62ec32a189b8cd16266e47b386ebe00cc04c
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 07:41:20 2017 +0200
+Date:   Sun Oct 15 21:45:46 2017 +0200

    Disables references to fonts.googleapis.com

 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-index bed7d31..cb8971f 100644
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -309,7 +309,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
     const {
@@ -18,7 +16,6 @@ index bed7d31..cb8971f 100644
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
 diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
-index a4c07c5..894eb7f 100644
 --- a/components/dom_distiller/core/html/preview.html
 +++ b/components/dom_distiller/core/html/preview.html
@@ -11,7 +11,7 @@ found in the LICENSE file.
@@ -31,7 +28,6 @@ index a4c07c5..894eb7f 100644
     .english :lang(th) {display: none}
     .english :lang(zh) {display: none}
 diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-index 61ef521..2640e3a 100644
 --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
 +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
@@ -120,7 +120,7 @@ function maybeSetWebFont() {
@@ -44,7 +40,6 @@ index 61ef521..2640e3a 100644
   e.type = 'text/css';
   document.head.appendChild(e);
 diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
-index f21cfe9..b7a5d7a 100644
 --- a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
 +++ b/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css
@@ -12,8 +12,7 @@
@@ -1,14 +1,12 @@
-commit aff93733a4c414f9182103b7384c23e6fa450a6a
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Thu Oct 26 16:59:03 2017 +0200

    Disable WebRTC by default

 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 946f7cd..96b79b1 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -81,10 +81,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -78,10 +78,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
@@ -1,27 +1,23 @@
-commit 6a6024067d27a53fb58af282580da68f6cea8809
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Fri Oct 27 15:53:37 2017 +0200

    Ported data reduction disable patch

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-index ccc8517..5c69672 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -144,7 +144,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -146,7 +146,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
         boolean notifyAdapter = false;
         // An optional Data Saver page.
         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
 -            mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
-+            //mPages.add(pageOf(DataReductionProxyFirstRunFragment.class));
             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
             notifyAdapter = true;
         }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-index 822f642..06e91a5 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java
-@@ -156,6 +156,7 @@ public class DataReductionProxySettings {
+@@ -149,6 +149,7 @@ public class DataReductionProxySettings {
         // DataReductionProxySettings is a singleton that lives forever and there's no clean
         // shutdown of Chrome on Android
         mNativeDataReductionProxySettings = nativeInit();
@@ -29,7 +25,7 @@ index 822f642..06e91a5 100644
     }
 
     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -178,6 +179,7 @@ public class DataReductionProxySettings {
+@@ -171,6 +172,7 @@ public class DataReductionProxySettings {
      * data reduction statistics if this is the first time the SPDY proxy has been enabled.
      */
     public void setDataReductionProxyEnabled(Context context, boolean enabled) {
@@ -38,7 +34,6 @@ index 822f642..06e91a5 100644
                 && ContextUtils.getAppSharedPreferences().getLong(
                            DATA_REDUCTION_FIRST_ENABLED_TIME, 0)
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
-index bd42c89..b147765 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoUtils.java
@@ -68,7 +68,7 @@ public class DataReductionPromoUtils {
@@ -0,0 +1,85 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sun Nov 26 22:51:43 2017 +0100
+
+    Skip the first run and metrics
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
+@@ -34,8 +34,12 @@ public class FirstRunStatus {
+      * includes ToS and Sign In pages if necessary.
+      */
+     public static boolean getFirstRunFlowComplete() {
+-        return ContextUtils.getAppSharedPreferences()
+        boolean complete = ContextUtils.getAppSharedPreferences()
+                 .getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
+        if (!complete) {
+             setFirstRunFlowComplete(true);
+        }
+        return true;
+     }
+ 
+     /**
+@@ -71,4 +75,4 @@ public class FirstRunStatus {
+         return ContextUtils.getAppSharedPreferences().getBoolean(
+                 LIGHTWEIGHT_FIRST_RUN_FLOW_COMPLETE, false);
+     }
+-}
+\ No newline at end of file
+}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+@@ -30,16 +30,12 @@ public class FirstRunUtils {
+         //   - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
+         boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
+         boolean nativePrefValue = prefsBridge.isFirstRunEulaAccepted();
+-        boolean userHasSeenTos =
+-                ToSAckedReceiver.checkAnyUserHasSeenToS();
+-        boolean isFirstRunComplete = FirstRunStatus.getFirstRunFlowComplete();
+-        if (javaPrefValue || nativePrefValue || userHasSeenTos || isFirstRunComplete) {
+-            if (!javaPrefValue) {
+-                javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
+-            }
+-            if (!nativePrefValue) {
+-                prefsBridge.setEulaAccepted();
+-            }
+
+        if (!javaPrefValue) {
+            javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
+        }
+        if (!nativePrefValue) {
+            prefsBridge.setEulaAccepted();
+         }
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+@@ -60,20 +60,14 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
+             }
+         });
+ 
+-        if (ChromeVersionInfo.isOfficialBuild()) {
+-            int paddingStart = getResources().getDimensionPixelSize(
+-                    R.dimen.fre_tos_checkbox_padding);
+-            ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox,
+-                    ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart,
+-                    mSendReportCheckBox.getPaddingTop(),
+-                    ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox),
+-                    mSendReportCheckBox.getPaddingBottom());
+-
+-            mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
+-        } else {
+-            mSendReportCheckBox.setVisibility(View.GONE);
+        int paddingStart = getResources().getDimensionPixelSize(R.dimen.fre_tos_checkbox_padding);
+        if (paddingStart != 0) {
+            mSendReportCheckBox.setChecked(false);
+         }
+ 
+        mSendReportCheckBox.setChecked(false);
+        mSendReportCheckBox.setVisibility(View.GONE);
+
+         mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
+ 
+         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan() {
@@ -0,0 +1,17 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sun Nov 26 23:11:56 2017 +0100
+
+    Always disable Omaha update checks
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+@@ -121,7 +121,7 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
+        return true;
+     }
+ 
+     /**
@@ -4,10 +4,9 @@ Date:   Thu Oct 12 11:06:18 2017 +0200
    Add DuckDuckGo search engine, not enabled by default

 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 002b6c0..7b4155b 100644
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -32,12 +32,22 @@
+@@ -32,12 +32,31 @@
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
@@ -23,28 +22,36 @@ index 002b6c0..7b4155b 100644
 +      "keyword": "duckduckgo.com",
 +      "favicon_url": "https://duckduckgo.com/favicon.ico",
 +      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "new_tab_url": "https://duckduckgo.com/",
+      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list",
 +      "type": "SEARCH_ENGINE_DUCKDUCKGO",
 +      "id": 11
 +    },
+
+    "duckduckgo_light": {
+      "name": "DuckDuckGo Light",
+      "keyword": "duckduckgo.com/lite",
+      "favicon_url": "https://duckduckgo.com/favicon.ico",
+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
+      "id": 12
+    },
 +
     "aol": {
       "name": "AOL",
       "keyword": "aol.com",
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index c19dd0e..02f6b16 100644
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -63,6 +63,7 @@ enum SearchEngineType {
+@@ -63,6 +63,8 @@ enum SearchEngineType {
   SEARCH_ENGINE_YANDEX,
   SEARCH_ENGINE_ZOZNAM,
   SEARCH_ENGINE_360,
 +  SEARCH_ENGINE_DUCKDUCKGO,
+  SEARCH_ENGINE_DUCKDUCKGOLIGHT,
   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
-index 6be17ee..ef50529 100644
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
@@ -50,548 +50,548 @@ namespace {
@@ -52,656 +59,656 @@ index 6be17ee..ef50529 100644
 // Default (for countries with no better engine set)
 const PrepopulatedEngine* const engines_default[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // United Arab Emirates
 const PrepopulatedEngine* const engines_AE[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Albania
 const PrepopulatedEngine* const engines_AL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Argentina
 const PrepopulatedEngine* const engines_AR[] = {
 -    &google, &bing, &yahoo_ar,
-+    &google, &duckduckgo, &bing, &yahoo_ar,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
 };
 
 // Austria
 const PrepopulatedEngine* const engines_AT[] = {
 -    &google, &bing, &yahoo_at,
-+    &google, &duckduckgo, &bing, &yahoo_at,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
 };
 
 // Australia
 const PrepopulatedEngine* const engines_AU[] = {
 -    &google, &bing, &yahoo_au,
-+    &google, &duckduckgo, &bing, &yahoo_au,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
 };
 
 // Bosnia and Herzegovina
 const PrepopulatedEngine* const engines_BA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Belgium
 const PrepopulatedEngine* const engines_BE[] = {
 -    &google, &bing, &yahoo, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
 };
 
 // Bulgaria
 const PrepopulatedEngine* const engines_BG[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
 };
 
 // Bahrain
 const PrepopulatedEngine* const engines_BH[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Burundi
 const PrepopulatedEngine* const engines_BI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Brunei
 const PrepopulatedEngine* const engines_BN[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
 };
 
 // Bolivia
 const PrepopulatedEngine* const engines_BO[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Brazil
 const PrepopulatedEngine* const engines_BR[] = {
 -    &google, &ask_br, &bing, &yahoo_br,
-+    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
+    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
 };
 
 // Belarus
 const PrepopulatedEngine* const engines_BY[] = {
 -    &google, &yandex_by, &mail_ru,
-+    &google, &duckduckgo, &yandex_by, &mail_ru,
+    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
 };
 
 // Belize
 const PrepopulatedEngine* const engines_BZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Canada
 const PrepopulatedEngine* const engines_CA[] = {
 -    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
 };
 
 // Switzerland
 const PrepopulatedEngine* const engines_CH[] = {
 -    &google, &bing, &yahoo_ch,
-+    &google, &duckduckgo, &bing, &yahoo_ch,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
 };
 
 // Chile
 const PrepopulatedEngine* const engines_CL[] = {
 -    &google, &bing, &yahoo_cl,
-+    &google, &duckduckgo, &bing, &yahoo_cl,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
 };
 
 // China
 const PrepopulatedEngine* const engines_CN[] = {
 -    &google, &baidu, &sogou, &so_360,
-+    &google, &duckduckgo, &baidu, &sogou, &so_360,
+    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
 };
 
 // Colombia
 const PrepopulatedEngine* const engines_CO[] = {
 -    &google, &bing, &yahoo_co,
-+    &google, &duckduckgo, &bing, &yahoo_co,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
 };
 
 // Costa Rica
 const PrepopulatedEngine* const engines_CR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Czech Republic
 const PrepopulatedEngine* const engines_CZ[] = {
 -    &google, &seznam, &bing,
-+    &google, &duckduckgo, &seznam, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,
 };
 
 // Germany
 const PrepopulatedEngine* const engines_DE[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
 };
 
 // Denmark
 const PrepopulatedEngine* const engines_DK[] = {
 -    &google, &bing, &yahoo_dk,
-+    &google, &duckduckgo, &bing, &yahoo_dk,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
 };
 
 // Dominican Republic
 const PrepopulatedEngine* const engines_DO[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Algeria
 const PrepopulatedEngine* const engines_DZ[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Ecuador
 const PrepopulatedEngine* const engines_EC[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Estonia
 const PrepopulatedEngine* const engines_EE[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Egypt
 const PrepopulatedEngine* const engines_EG[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Spain
 const PrepopulatedEngine* const engines_ES[] = {
 -    &google, &bing, &yahoo_es,
-+    &google, &duckduckgo, &bing, &yahoo_es,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
 };
 
 // Faroe Islands
 const PrepopulatedEngine* const engines_FO[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
 };
 
 // Finland
 const PrepopulatedEngine* const engines_FI[] = {
 -    &google, &bing, &yahoo_fi,
-+    &google, &duckduckgo, &bing, &yahoo_fi,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
 };
 
 // France
 const PrepopulatedEngine* const engines_FR[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
 };
 
 // United Kingdom
 const PrepopulatedEngine* const engines_GB[] = {
 -    &google, &bing, &yahoo_uk, &ask_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
 };
 
 // Greece
 const PrepopulatedEngine* const engines_GR[] = {
 -    &google, &bing, &yahoo_gr,
-+    &google, &duckduckgo, &bing, &yahoo_gr,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
 };
 
 // Guatemala
 const PrepopulatedEngine* const engines_GT[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Hong Kong
 const PrepopulatedEngine* const engines_HK[] = {
 -    &google, &yahoo_hk, &baidu, &bing,
-+    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
 };
 
 // Honduras
 const PrepopulatedEngine* const engines_HN[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Croatia
 const PrepopulatedEngine* const engines_HR[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Hungary
 const PrepopulatedEngine* const engines_HU[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Indonesia
 const PrepopulatedEngine* const engines_ID[] = {
 -    &google, &yahoo_id, &bing,
-+    &google, &duckduckgo, &yahoo_id, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
 };
 
 // Ireland
 const PrepopulatedEngine* const engines_IE[] = {
 -    &google, &bing, &yahoo_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
 };
 
 // Israel
 const PrepopulatedEngine* const engines_IL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // India
 const PrepopulatedEngine* const engines_IN[] = {
 -    &google, &bing, &yahoo_in,
-+    &google, &duckduckgo, &bing, &yahoo_in,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
 };
 
 // Iraq
 const PrepopulatedEngine* const engines_IQ[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Iran
 const PrepopulatedEngine* const engines_IR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Iceland
 const PrepopulatedEngine* const engines_IS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Italy
 const PrepopulatedEngine* const engines_IT[] = {
 -    &google, &virgilio, &bing,
-+    &google, &duckduckgo, &virgilio, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
 };
 
 // Jamaica
 const PrepopulatedEngine* const engines_JM[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Jordan
 const PrepopulatedEngine* const engines_JO[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Japan
 const PrepopulatedEngine* const engines_JP[] = {
 -    &google, &yahoo_jp, &bing,
-+    &google, &duckduckgo, &yahoo_jp, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
 };
 
 // Kenya
 const PrepopulatedEngine* const engines_KE[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Kuwait
 const PrepopulatedEngine* const engines_KW[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // South Korea
 const PrepopulatedEngine* const engines_KR[] = {
 -    &google, &naver, &daum,
-+    &google, &duckduckgo, &naver, &daum,
+    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,
 };
 
 // Kazakhstan
 const PrepopulatedEngine* const engines_KZ[] = {
 -    &google, &mail_ru, &yandex_kz,
-+    &google, &duckduckgo, &mail_ru, &yandex_kz,
+    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
 };
 
 // Lebanon
 const PrepopulatedEngine* const engines_LB[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Liechtenstein
 const PrepopulatedEngine* const engines_LI[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
 };
 
 // Lithuania
 const PrepopulatedEngine* const engines_LT[] = {
 -    &google, &bing, &yandex_ru,
-+    &google, &duckduckgo, &bing, &yandex_ru,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
 };
 
 // Luxembourg
 const PrepopulatedEngine* const engines_LU[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
 };
 
 // Latvia
 const PrepopulatedEngine* const engines_LV[] = {
 -    &google, &yandex_ru, &bing,
-+    &google, &duckduckgo, &yandex_ru, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
 };
 
 // Libya
 const PrepopulatedEngine* const engines_LY[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Morocco
 const PrepopulatedEngine* const engines_MA[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Monaco
 const PrepopulatedEngine* const engines_MC[] = {
 -    &google, &yahoo_fr, &bing,
-+    &google, &duckduckgo, &yahoo_fr, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
 };
 
 // Moldova
 const PrepopulatedEngine* const engines_MD[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Montenegro
 const PrepopulatedEngine* const engines_ME[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Macedonia
 const PrepopulatedEngine* const engines_MK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Mexico
 const PrepopulatedEngine* const engines_MX[] = {
 -    &google, &bing, &yahoo_mx,
-+    &google, &duckduckgo, &bing, &yahoo_mx,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
 };
 
 // Malaysia
 const PrepopulatedEngine* const engines_MY[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
 };
 
 // Nicaragua
 const PrepopulatedEngine* const engines_NI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Netherlands
 const PrepopulatedEngine* const engines_NL[] = {
 -    &google, &yahoo_nl, &vinden,
-+    &google, &duckduckgo, &yahoo_nl, &vinden,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
 };
 
 // Norway
 const PrepopulatedEngine* const engines_NO[] = {
 -    &google, &bing, &kvasir,
-+    &google, &duckduckgo, &bing, &kvasir,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
 };
 
 // New Zealand
 const PrepopulatedEngine* const engines_NZ[] = {
 -    &google, &bing, &yahoo_nz,
-+    &google, &duckduckgo, &bing, &yahoo_nz,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
 };
 
 // Oman
 const PrepopulatedEngine* const engines_OM[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Panama
 const PrepopulatedEngine* const engines_PA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Peru
 const PrepopulatedEngine* const engines_PE[] = {
 -    &google, &bing, &yahoo_pe,
-+    &google, &duckduckgo, &bing, &yahoo_pe,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
 };
 
 // Philippines
 const PrepopulatedEngine* const engines_PH[] = {
 -    &google, &yahoo_ph, &bing,
-+    &google, &duckduckgo, &yahoo_ph, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
 };
 
 // Pakistan
 const PrepopulatedEngine* const engines_PK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Puerto Rico
 const PrepopulatedEngine* const engines_PR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Poland
 const PrepopulatedEngine* const engines_PL[] = {
 -    &google, &onet, &bing,
-+    &google, &duckduckgo, &onet, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,
 };
 
 // Portugal
 const PrepopulatedEngine* const engines_PT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Paraguay
 const PrepopulatedEngine* const engines_PY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Qatar
 const PrepopulatedEngine* const engines_QA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Romania
 const PrepopulatedEngine* const engines_RO[] = {
 -    &google, &yahoo_ro, &bing,
-+    &google, &duckduckgo, &yahoo_ro, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
 };
 
 // Serbia
 const PrepopulatedEngine* const engines_RS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Russia
 const PrepopulatedEngine* const engines_RU[] = {
 -    &google, &yandex_ru, &mail_ru,
-+    &google, &duckduckgo, &yandex_ru, &mail_ru,
+    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
 };
 
 // Rwanda
 const PrepopulatedEngine* const engines_RW[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Saudi Arabia
 const PrepopulatedEngine* const engines_SA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
 };
 
 // Sweden
 const PrepopulatedEngine* const engines_SE[] = {
 -    &google, &bing, &yahoo_se,
-+    &google, &duckduckgo, &bing, &yahoo_se,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
 };
 
 // Singapore
 const PrepopulatedEngine* const engines_SG[] = {
 -    &google, &yahoo_sg, &bing,
-+    &google, &duckduckgo, &yahoo_sg, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
 };
 
 // Slovenia
 const PrepopulatedEngine* const engines_SI[] = {
 -    &google, &najdi, &ask,
-+    &google, &duckduckgo, &najdi, &ask,
+    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,
 };
 
 // Slovakia
 const PrepopulatedEngine* const engines_SK[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // El Salvador
 const PrepopulatedEngine* const engines_SV[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Syria
 const PrepopulatedEngine* const engines_SY[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Thailand
 const PrepopulatedEngine* const engines_TH[] = {
 -    &google, &yahoo_th, &bing,
-+    &google, &duckduckgo, &yahoo_th, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
 };
 
 // Tunisia
 const PrepopulatedEngine* const engines_TN[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // Turkey
 const PrepopulatedEngine* const engines_TR[] = {
 -    &google, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
 };
 
 // Trinidad and Tobago
 const PrepopulatedEngine* const engines_TT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Taiwan
 const PrepopulatedEngine* const engines_TW[] = {
 -    &google, &yahoo_tw, &bing,
-+    &google, &duckduckgo, &yahoo_tw, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
 };
 
 // Tanzania
 const PrepopulatedEngine* const engines_TZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
 };
 
 // Ukraine
 const PrepopulatedEngine* const engines_UA[] = {
 -    &google, &yandex_ua, &bing,
-+    &google, &duckduckgo, &yandex_ua, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
 };
 
 // United States
 const PrepopulatedEngine* const engines_US[] = {
 -    &google, &bing, &yahoo, &aol, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
 };
 
 // Uruguay
 const PrepopulatedEngine* const engines_UY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Venezuela
 const PrepopulatedEngine* const engines_VE[] = {
 -    &google, &bing, &yahoo_ve,
-+    &google, &duckduckgo, &bing, &yahoo_ve,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
 };
 
 // Vietnam
 const PrepopulatedEngine* const engines_VN[] = {
 -    &google, &yahoo_vn, &bing,
-+    &google, &duckduckgo, &yahoo_vn, &bing,
+    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
 };
 
 // Yemen
 const PrepopulatedEngine* const engines_YE[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
 };
 
 // South Africa
 const PrepopulatedEngine* const engines_ZA[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
+    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
 };
 
 // Zimbabwe
 const PrepopulatedEngine* const engines_ZW[] = {
 -    &google, &bing, &yahoo, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &ask,
+    &google, &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, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &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,
@@ -0,0 +1,706 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Oct 18 21:24:05 2017 +0200
+
+    Add StartPage search engine
+
+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": 100
+    "kCurrentDataVersion": 101
+   },
+ 
+   // The following engines are included in country lists and are added to the
+@@ -228,6 +228,16 @@
+       "id": 56
+     },
+ 
+    "startpage": {
+      "name": "StartPage",
+      "keyword": "startpage.com",
+      "favicon_url": "https://www.startpage.com/graphics/favicon/sp-favicon-16x16.png",
+      "search_url": "https://www.startpage.com/do/dsearch?query={searchTerms}&cat=web&pl=opensearch",
+      "suggest_url": "https://www.startpage.com/cgi-bin/csuggest?query={searchTerms}&limit=10&format=json",
+      "type": "SEARCH_ENGINE_STARTPAGE",
+      "id": 33
+    },
+
+     "vinden": {
+       "name": "Vinden.nl",
+       "keyword": "vinden.nl",
+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
+@@ -65,6 +65,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_360,
+   SEARCH_ENGINE_DUCKDUCKGO,
+   SEARCH_ENGINE_DUCKDUCKGOLIGHT,
+  SEARCH_ENGINE_STARTPAGE,
+   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
+@@ -50,548 +50,548 @@ namespace {
+ 
+ // Default (for countries with no better engine set)
+ const PrepopulatedEngine* const engines_default[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // United Arab Emirates
+ const PrepopulatedEngine* const engines_AE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Albania
+ const PrepopulatedEngine* const engines_AL[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Argentina
+ const PrepopulatedEngine* const engines_AR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
+ };
+ 
+ // Austria
+ const PrepopulatedEngine* const engines_AT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
+ };
+ 
+ // Australia
+ const PrepopulatedEngine* const engines_AU[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
+ };
+ 
+ // Bosnia and Herzegovina
+ const PrepopulatedEngine* const engines_BA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Belgium
+ const PrepopulatedEngine* const engines_BE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
+ };
+ 
+ // Bulgaria
+ const PrepopulatedEngine* const engines_BG[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
+ };
+ 
+ // Bahrain
+ const PrepopulatedEngine* const engines_BH[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Burundi
+ const PrepopulatedEngine* const engines_BI[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Brunei
+ const PrepopulatedEngine* const engines_BN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+ };
+ 
+ // Bolivia
+ const PrepopulatedEngine* const engines_BO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Brazil
+ const PrepopulatedEngine* const engines_BR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
+ };
+ 
+ // Belarus
+ const PrepopulatedEngine* const engines_BY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
+ };
+ 
+ // Belize
+ const PrepopulatedEngine* const engines_BZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Canada
+ const PrepopulatedEngine* const engines_CA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
+ };
+ 
+ // Switzerland
+ const PrepopulatedEngine* const engines_CH[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
+ };
+ 
+ // Chile
+ const PrepopulatedEngine* const engines_CL[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
+ };
+ 
+ // China
+ const PrepopulatedEngine* const engines_CN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
+ };
+ 
+ // Colombia
+ const PrepopulatedEngine* const engines_CO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
+ };
+ 
+ // Costa Rica
+ const PrepopulatedEngine* const engines_CR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Czech Republic
+ const PrepopulatedEngine* const engines_CZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &seznam, &bing,
+ };
+ 
+ // Germany
+ const PrepopulatedEngine* const engines_DE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+ };
+ 
+ // Denmark
+ const PrepopulatedEngine* const engines_DK[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
+ };
+ 
+ // Dominican Republic
+ const PrepopulatedEngine* const engines_DO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Algeria
+ const PrepopulatedEngine* const engines_DZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Ecuador
+ const PrepopulatedEngine* const engines_EC[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Estonia
+ const PrepopulatedEngine* const engines_EE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Egypt
+ const PrepopulatedEngine* const engines_EG[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Spain
+ const PrepopulatedEngine* const engines_ES[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
+ };
+ 
+ // Faroe Islands
+ const PrepopulatedEngine* const engines_FO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &ask,
+ };
+ 
+ // Finland
+ const PrepopulatedEngine* const engines_FI[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
+ };
+ 
+ // France
+ const PrepopulatedEngine* const engines_FR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+ };
+ 
+ // United Kingdom
+ const PrepopulatedEngine* const engines_GB[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
+ };
+ 
+ // Greece
+ const PrepopulatedEngine* const engines_GR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
+ };
+ 
+ // Guatemala
+ const PrepopulatedEngine* const engines_GT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Hong Kong
+ const PrepopulatedEngine* const engines_HK[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
+ };
+ 
+ // Honduras
+ const PrepopulatedEngine* const engines_HN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Croatia
+ const PrepopulatedEngine* const engines_HR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Hungary
+ const PrepopulatedEngine* const engines_HU[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Indonesia
+ const PrepopulatedEngine* const engines_ID[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
+ };
+ 
+ // Ireland
+ const PrepopulatedEngine* const engines_IE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
+ };
+ 
+ // Israel
+ const PrepopulatedEngine* const engines_IL[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // India
+ const PrepopulatedEngine* const engines_IN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
+ };
+ 
+ // Iraq
+ const PrepopulatedEngine* const engines_IQ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Iran
+ const PrepopulatedEngine* const engines_IR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Iceland
+ const PrepopulatedEngine* const engines_IS[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Italy
+ const PrepopulatedEngine* const engines_IT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
+ };
+ 
+ // Jamaica
+ const PrepopulatedEngine* const engines_JM[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Jordan
+ const PrepopulatedEngine* const engines_JO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Japan
+ const PrepopulatedEngine* const engines_JP[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
+ };
+ 
+ // Kenya
+ const PrepopulatedEngine* const engines_KE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Kuwait
+ const PrepopulatedEngine* const engines_KW[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // South Korea
+ const PrepopulatedEngine* const engines_KR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &naver, &daum,
+ };
+ 
+ // Kazakhstan
+ const PrepopulatedEngine* const engines_KZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
+ };
+ 
+ // Lebanon
+ const PrepopulatedEngine* const engines_LB[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Liechtenstein
+ const PrepopulatedEngine* const engines_LI[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
+ };
+ 
+ // Lithuania
+ const PrepopulatedEngine* const engines_LT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
+ };
+ 
+ // Luxembourg
+ const PrepopulatedEngine* const engines_LU[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
+ };
+ 
+ // Latvia
+ const PrepopulatedEngine* const engines_LV[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
+ };
+ 
+ // Libya
+ const PrepopulatedEngine* const engines_LY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Morocco
+ const PrepopulatedEngine* const engines_MA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Monaco
+ const PrepopulatedEngine* const engines_MC[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
+ };
+ 
+ // Moldova
+ const PrepopulatedEngine* const engines_MD[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Montenegro
+ const PrepopulatedEngine* const engines_ME[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Macedonia
+ const PrepopulatedEngine* const engines_MK[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Mexico
+ const PrepopulatedEngine* const engines_MX[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
+ };
+ 
+ // Malaysia
+ const PrepopulatedEngine* const engines_MY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
+ };
+ 
+ // Nicaragua
+ const PrepopulatedEngine* const engines_NI[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Netherlands
+ const PrepopulatedEngine* const engines_NL[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
+ };
+ 
+ // Norway
+ const PrepopulatedEngine* const engines_NO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
+ };
+ 
+ // New Zealand
+ const PrepopulatedEngine* const engines_NZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
+ };
+ 
+ // Oman
+ const PrepopulatedEngine* const engines_OM[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Panama
+ const PrepopulatedEngine* const engines_PA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Peru
+ const PrepopulatedEngine* const engines_PE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
+ };
+ 
+ // Philippines
+ const PrepopulatedEngine* const engines_PH[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
+ };
+ 
+ // Pakistan
+ const PrepopulatedEngine* const engines_PK[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Puerto Rico
+ const PrepopulatedEngine* const engines_PR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Poland
+ const PrepopulatedEngine* const engines_PL[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &onet, &bing,
+ };
+ 
+ // Portugal
+ const PrepopulatedEngine* const engines_PT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Paraguay
+ const PrepopulatedEngine* const engines_PY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Qatar
+ const PrepopulatedEngine* const engines_QA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Romania
+ const PrepopulatedEngine* const engines_RO[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
+ };
+ 
+ // Serbia
+ const PrepopulatedEngine* const engines_RS[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Russia
+ const PrepopulatedEngine* const engines_RU[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
+ };
+ 
+ // Rwanda
+ const PrepopulatedEngine* const engines_RW[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Saudi Arabia
+ const PrepopulatedEngine* const engines_SA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
+ };
+ 
+ // Sweden
+ const PrepopulatedEngine* const engines_SE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
+ };
+ 
+ // Singapore
+ const PrepopulatedEngine* const engines_SG[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
+ };
+ 
+ // Slovenia
+ const PrepopulatedEngine* const engines_SI[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &najdi, &ask,
+ };
+ 
+ // Slovakia
+ const PrepopulatedEngine* const engines_SK[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // El Salvador
+ const PrepopulatedEngine* const engines_SV[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Syria
+ const PrepopulatedEngine* const engines_SY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Thailand
+ const PrepopulatedEngine* const engines_TH[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
+ };
+ 
+ // Tunisia
+ const PrepopulatedEngine* const engines_TN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // Turkey
+ const PrepopulatedEngine* const engines_TR[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
+ };
+ 
+ // Trinidad and Tobago
+ const PrepopulatedEngine* const engines_TT[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Taiwan
+ const PrepopulatedEngine* const engines_TW[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
+ };
+ 
+ // Tanzania
+ const PrepopulatedEngine* const engines_TZ[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
+ };
+ 
+ // Ukraine
+ const PrepopulatedEngine* const engines_UA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
+ };
+ 
+ // United States
+ const PrepopulatedEngine* const engines_US[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
+ };
+ 
+ // Uruguay
+ const PrepopulatedEngine* const engines_UY[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Venezuela
+ const PrepopulatedEngine* const engines_VE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
+ };
+ 
+ // Vietnam
+ const PrepopulatedEngine* const engines_VN[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
+ };
+ 
+ // Yemen
+ const PrepopulatedEngine* const engines_YE[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
+ };
+ 
+ // South Africa
+ const PrepopulatedEngine* const engines_ZA[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+    &google, &startpage, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
+ };
+ 
+ // Zimbabwe
+ const PrepopulatedEngine* const engines_ZW[] = {
+-    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
+    &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, &duckduckgo, &duckduckgo_light, &kvasir,
+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &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,
@@ -0,0 +1,717 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Dec 11 22:42:11 2017 +0100
+
+    Added Google English-only engine, no RLZ and field experiments
+
+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": 101
+    "kCurrentDataVersion": 102
+   },
+ 
+   // The following engines are included in country lists and are added to the
+@@ -150,6 +150,27 @@
+       "id": 1
+     },
+ 
+    "googleen": {
+      "name": "GoogleEN",
+      "keyword": "google.co.uk",
+      "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
+@@ -50,548 +50,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,
@@ -0,0 +1,18 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Jan 20 19:44:43 2018 +0100
+
+    Fix crash when accessing page info / site settings
+
+diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
+--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
+@@ -601,6 +601,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+     const GURL& embedding_origin) {
+   GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin);
+   PermissionContextBase* context = GetPermissionContext(permission);
+  if (context == nullptr) {
+      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
+  }
+   PermissionResult result = context->GetPermissionStatus(
+       render_frame_host, canonical_requesting_origin.GetOrigin(),
+       embedding_origin.GetOrigin());
@@ -0,0 +1,91 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sat Jan 20 21:17:27 2018 +0100
+
+    Compile with ARM/ARM64 optimizations for H264
+    Not only when running ChromeOS but for all compatbile devices
+
+diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
+--- a/content/renderer/media_recorder/h264_encoder.cc
+++ b/content/renderer/media_recorder/h264_encoder.cc
+@@ -145,8 +145,12 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+     init_params.iRCMode = RC_OFF_MODE;
+   }
+ 
+#if defined(OS_MACOSX)
+   // Threading model: Set to 1 due to https://crbug.com/583348.
+   init_params.iMultipleThreadIdc = 1;
+#else
+  init_params.iMultipleThreadIdc = 0;
+#endif
+ 
+   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
+   init_params.iComplexityMode = MEDIUM_COMPLEXITY;
+diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
+--- a/third_party/openh264/BUILD.gn
+++ b/third_party/openh264/BUILD.gn
+@@ -12,6 +12,20 @@ config("config") {
+   cflags = []
+   defines = []
+ 
+  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
+  # devices.
+  if (is_chromeos && target_cpu == "arm") {
+    defines += [
+      "__chromeos__",
+    ]
+  }
+
+  if (target_cpu == "arm" || target_cpu == "arm64") {
+    defines += [
+      "HAVE_NEON",
+    ]
+  }
+
+   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
+   if (!is_win || is_clang) {
+     cflags += [
+@@ -105,6 +119,14 @@ source_set("common") {
+   sources = openh264_common_sources
+   include_dirs = openh264_common_include_dirs
+ 
+  # enable ARM optimizations
+  if (target_cpu == "arm") {
+    sources += openh264_common_sources_asm_arm
+  }
+  if (target_cpu == "arm64") {
+    sources += openh264_common_sources_asm_arm64
+  }
+
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -128,6 +150,14 @@ source_set("processing") {
+   sources = openh264_processing_sources
+   include_dirs = openh264_processing_include_dirs
+ 
+  # enable ARM optimizations
+  if (target_cpu == "arm") {
+    sources += openh264_common_sources_asm_arm
+  }
+  if (target_cpu == "arm64") {
+    sources += openh264_common_sources_asm_arm64
+  }
+
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -144,6 +174,14 @@ source_set("encoder") {
+   sources = openh264_encoder_sources
+   include_dirs = openh264_encoder_include_dirs
+ 
+  # enable ARM optimizations
+  if (target_cpu == "arm") {
+    sources += openh264_common_sources_asm_arm
+  }
+  if (target_cpu == "arm64") {
+    sources += openh264_common_sources_asm_arm64
+  }
+
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
@@ -1,26 +1,25 @@
-commit b944811d1324b0d16d4f40ff7420a3fe3c69fd52
 Author: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date:   Sat Oct 28 10:09:41 2017 +0200

-    Do not track google search results clicks, remove AMP
+    Do not track google search results clicks
+    
+    Limit AMP cleanup to main search results

 diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
-index 93f080f..2df8d30 100644
 --- a/third_party/WebKit/Source/core/dom/BUILD.gn
 +++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -344,6 +344,7 @@ blink_core_sources("dom") {
+@@ -346,6 +346,7 @@ blink_core_sources("dom") {
     "events/TreeScopeEventContext.h",
     "events/WindowEventContext.cpp",
     "events/WindowEventContext.h",
 +    "extensions/dont-track-me.h",
+     "ng/flat_tree_traversal_ng.cc",
+     "ng/flat_tree_traversal_ng.h",
     "trustedtypes/TrustedHTML.cpp",
-     "trustedtypes/TrustedHTML.h",
-     "trustedtypes/TrustedScriptURL.cpp",
 diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
-index b53451c..ecfa473 100644
 --- a/third_party/WebKit/Source/core/dom/Document.cpp
 +++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -218,6 +218,7 @@
+@@ -219,6 +219,7 @@
 #include "core/xml/parser/XMLDocumentParser.h"
 #include "core/xml_names.h"
 #include "core/xmlns_names.h"
@@ -28,7 +27,7 @@ index b53451c..ecfa473 100644
 #include "platform/CrossThreadFunctional.h"
 #include "platform/DateComponents.h"
 #include "platform/EventDispatchForbiddenScope.h"
-@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
+@@ -5809,8 +5810,24 @@ void Document::FinishedParsing() {
     fetcher_->ClearResourcesFromPreviousFetcher();
   }
 
@@ -45,8 +44,8 @@ index b53451c..ecfa473 100644
 +    size_t pos = domain.Find(".google.");
 +    auto* bodyElement = body();
 +    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "BRM: injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
+      LOG(INFO) << "injecting dont-track-me Javascript payload";
+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
 +      e->setText(DONT_TRACK_ME_JS);
 +      bodyElement->AppendChild(e);
 +    }
@@ -62,6 +61,6 @@ new file mode 100644
 +#ifndef dont_track_me_h
 +#define dont_track_me_h
 +
-+#define DONT_TRACK_ME_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n// sanitize hyperlinks as they are long-touched - currently unused\n/*function handlePointerPress(e) {\n    var a = e.target;\n    while (a && !a.href) {\n        a = a.parentElement;\n    }\n    if (!a) {\n        return;\n    }\n    if (isResult(a)) {\n        // In Chrome, removing onmousedown during event dispatch does not\n        // prevent the inline listener from running... So we have to cancel\n        // event propagation just in case.\n        e.stopImmediatePropagation();\n\n        a.removeAttribute('onmousedown');\n        // remove also ping and oncontextmenu, just in case\n        a.removeAttribute('ping');\n        a.removeAttribute('oncontextmenu');\n        // (event attributes are removed here, but hyperlinks is going to be re-created anyway)\n\n        recreateHyperlink(a);\n    }\n}*/\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
+#define DONT_TRACK_ME_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
 +
 +#endif  // dont_track_me_h
@@ -0,0 +1,18 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:43:35 2018 +0100
+
+    Never send any crash upload data
+
+diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
+--- a/chrome/browser/tracing/crash_service_uploader.cc
+++ b/chrome/browser/tracing/crash_service_uploader.cc
+@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
+     std::unique_ptr<const base::DictionaryValue> metadata,
+     const UploadProgressCallback& progress_callback,
+     const UploadDoneCallback& done_callback) {
+
+  return;
+
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ 
+   progress_callback_ = progress_callback;
@@ -0,0 +1,21 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Wed Feb 14 12:56:01 2018 +0100
+
+    Never fetch popular sites
+
+diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
+--- a/components/ntp_tiles/popular_sites_impl.cc
+++ b/components/ntp_tiles/popular_sites_impl.cc
+@@ -289,6 +289,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+   DCHECK(!callback_);
+   callback_ = callback;
+ 
+  if (force_download) {
+    callback_.Run(true);
+    return true;
+  }
+  return false;
+
+   const base::Time last_download_time = base::Time::FromInternalValue(
+       prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
+   const base::TimeDelta time_since_last_download =
@@ -0,0 +1,49 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:14:39 2018 +0100
+
+    ungoogled-chromium: Disable signin
+
+diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
+--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
+@@ -74,12 +74,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+   ShowSingletonTabOverwritingNTP(browser, params);
+ }
+ 
+-void NavigateToSingletonTab(Browser* browser, const GURL& url) {
+-  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
+-  params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
+-  ShowSingletonTabOverwritingNTP(browser, params);
+-}
+-
+ // Shows either the help app or the appropriate help page for |source|. If
+ // |browser| is NULL and the help page is used (vs the app), the help page is
+ // shown in the last active browser. If there is no such browser, a new browser
+@@ -384,6 +378,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+ #if !defined(OS_ANDROID)
+ void ShowBrowserSignin(Browser* browser,
+                        signin_metrics::AccessPoint access_point) {
+#if 0
+   Profile* original_profile = browser->profile()->GetOriginalProfile();
+   SigninManagerBase* manager =
+       SigninManagerFactory::GetForProfile(original_profile);
+@@ -424,6 +419,7 @@ void ShowBrowserSignin(Browser* browser,
+             false));
+     DCHECK_GT(browser->tab_strip_model()->count(), 0);
+   }
+#endif 
+ }
+ 
+ void ShowBrowserSigninOrSettings(Browser* browser,
+diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
+--- a/components/signin/core/browser/signin_manager_base.cc
+++ b/components/signin/core/browser/signin_manager_base.cc
+@@ -162,7 +162,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
+ bool SigninManagerBase::IsInitialized() const { return initialized_; }
+ 
+ bool SigninManagerBase::IsSigninAllowed() const {
+-  return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
+  return false;
+ }
+ 
+ AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
@@ -0,0 +1,95 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:21:36 2018 +0100
+
+    ungoogled-chromium: Disable webRTC log uploader
+    Disables WebRTC log uploading to Google - ported patch
+
+diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+@@ -117,30 +117,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
+   DCHECK(meta_data.get());
+   DCHECK(!upload_done_data.log_path.empty());
+ 
+-  std::string compressed_log;
+-  CompressLog(&compressed_log, log_buffer.get());
+-
+-  std::string local_log_id;
+-
+   if (base::PathExists(upload_done_data.log_path)) {
+     WebRtcLogUtil::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
+-
+-    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
+-    base::FilePath log_file_path =
+-        upload_done_data.log_path.AppendASCII(local_log_id)
+-            .AddExtension(FILE_PATH_LITERAL(".gz"));
+-    WriteCompressedLogToFile(compressed_log, log_file_path);
+-
+-    base::FilePath log_list_path =
+-        WebRtcLogList::GetWebRtcLogListFileForDirectory(
+-            upload_done_data.log_path);
+-    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
+   }
+-
+-  WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
+-  upload_done_data_with_log_id.local_log_id = local_log_id;
+-  PrepareMultipartPostData(compressed_log, std::move(meta_data),
+-                           upload_done_data_with_log_id);
+  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
+ }
+ 
+ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -151,6 +131,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
+   DCHECK(!compressed_log.empty());
+   DCHECK(meta_data.get());
+ 
+  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
+  return;
+
+   std::unique_ptr<std::string> post_data(new std::string());
+   SetupMultipart(post_data.get(),
+                  compressed_log,
+@@ -239,43 +222,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
+ 
+   WebRtcLogUtil::DeleteOldWebRtcLogFiles(log_paths.log_path);
+ 
+-  base::FilePath log_list_path =
+-      WebRtcLogList::GetWebRtcLogListFileForDirectory(log_paths.log_path);
+-
+-  // Store the native log with a ".gz" extension.
+-  std::string compressed_log;
+-  CompressLog(&compressed_log, log_buffer.get());
+-  base::FilePath native_log_path = log_paths.log_path.AppendASCII(log_id)
+-      .AddExtension(FILE_PATH_LITERAL(".gz"));
+-  WriteCompressedLogToFile(compressed_log, native_log_path);
+-  AddLocallyStoredLogInfoToUploadListFile(log_list_path, log_id);
+-
+-  // Move the rtp dump files to the log directory with a name of
+-  // <log id>.rtp_[in|out].
+-  if (!log_paths.incoming_rtp_dump.empty()) {
+-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".rtp_in"));
+-    base::Move(log_paths.incoming_rtp_dump, rtp_path);
+-  }
+-
+-  if (!log_paths.outgoing_rtp_dump.empty()) {
+-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".rtp_out"));
+-    base::Move(log_paths.outgoing_rtp_dump, rtp_path);
+-  }
+-
+-  if (meta_data.get() && !meta_data->empty()) {
+-    base::Pickle pickle;
+-    for (const auto& it : *meta_data.get()) {
+-      pickle.WriteString(it.first);
+-      pickle.WriteString(it.second);
+-    }
+-    base::FilePath meta_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".meta"));
+-    base::WriteFile(meta_path, static_cast<const char*>(pickle.data()),
+-        pickle.size());
+-  }
+-
+   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                           base::BindOnce(done_callback, true, ""));
+ 
@@ -0,0 +1,119 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:28:11 2018 +0100
+
+    ungoogled-chromium: Disable untraceable URLs
+    Disable additional URLs that are not caught by the "trk" scheme
+
+diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
+--- a/chrome/browser/android/rlz/rlz_ping_handler.cc
+++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
+@@ -65,7 +65,7 @@ void RlzPingHandler::Ping(
+   DCHECK_EQ(id.length(), 50u);
+ 
+   GURL request_url(base::StringPrintf(
+-      "https://%s%s?", rlz_lib::kFinancialServer, rlz_lib::kFinancialPingPath));
+      "about:blank"));
+   request_url = net::AppendQueryParameter(
+       request_url, rlz_lib::kProductSignatureCgiVariable, "chrome");
+   request_url =
+diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
+--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
+@@ -68,7 +68,7 @@ GURL GetPluginsServerURL() {
+ #error Unknown platform
+ #endif
+ 
+-  return GURL(kPluginsServerUrl + filename);
+  return GURL("about:blank");
+ }
+ 
+ }  // namespace
+diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
+--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
+@@ -34,8 +34,6 @@ namespace safe_browsing {
+ // Model Loader strings
+ const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
+ const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
+-const char ModelLoader::kClientModelUrlPrefix[] =
+-    "https://ssl.gstatic.com/safebrowsing/csd/";
+ const char ModelLoader::kClientModelNamePattern[] =
+     "client_model_v5%s_variation_%d.pb";
+ const char ModelLoader::kClientModelFinchExperiment[] =
+@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+                          net::URLRequestContextGetter* request_context_getter,
+                          bool is_extended_reporting)
+     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
+-      url_(kClientModelUrlPrefix + name_),
+      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       request_context_getter_(request_context_getter),
+       weak_factory_(this) {
+@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+                          const std::string& model_name)
+     : name_(model_name),
+-      url_(kClientModelUrlPrefix + name_),
+      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       request_context_getter_(NULL),
+       weak_factory_(this) {
+diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
+--- a/chrome/browser/safe_browsing/client_side_model_loader.h
+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
+@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetcherDelegate {
+   static const int kClientModelFetchIntervalMs;
+   static const char kClientModelFinchExperiment[];
+   static const char kClientModelFinchParam[];
+-  static const char kClientModelUrlPrefix[];
+   static const char kClientModelNamePattern[];
+ 
+   // Constructs a model loader to fetch a model using |request_context_getter|.
+diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
+--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
+@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+ 
+   // Open network connection.
+   InternetHandle connection_handle = InternetConnectA(inet_handle,
+-      kFinancialServer, kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
+      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
+       INTERNET_FLAG_NO_CACHE_WRITE, 0);
+   if (!connection_handle)
+     return false;
+@@ -407,9 +407,8 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+ 
+   return true;
+ #else
+-  std::string url = base::StringPrintf("http://%s:%d%s",
+-                                       kFinancialServer, kFinancialPort,
+-                                       request);
+  std::string url =
+      base::StringPrintf("about:blank");
+ 
+   // Use a waitable event to cause this function to block, to match the
+   // wininet implementation.
+diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc
+--- a/rlz/lib/lib_values.cc
+++ b/rlz/lib/lib_values.cc
+@@ -41,8 +41,7 @@ const char kSetDccResponseVariable[] = "set_dcc";
+ //
+ 
+ const char kFinancialPingPath[] = "/tools/pso/ping";
+-const char kFinancialServer[]   = "clients1.google.com";
+-const int kFinancialPort = 80;
+const int kFinancialPort = 443;
+ 
+ // Ping times in 100-nanosecond intervals.
+ const int64_t kEventsPingInterval = 24LL * 3600LL * 10000000LL;   // 1 day
+diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
+--- a/rlz/lib/lib_values.h
+++ b/rlz/lib/lib_values.h
+@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariable[];
+ //
+ 
+ extern const char kFinancialPingPath[];
+-extern const char kFinancialServer[];
+ 
+ extern const int kFinancialPort;
+ 
@@ -0,0 +1,46 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:28:53 2018 +0100
+
+    ungoogled-chromium: Disable translate
+    Disable Google Translate integration
+
+diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc
+--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
+@@ -74,7 +74,9 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
+       world_id_(world_id),
+       extension_scheme_(extension_scheme),
+       binding_(this),
+-      weak_method_factory_(this) {}
+      weak_method_factory_(this) {
+  CancelPendingTranslation();
+}
+ 
+ TranslateHelper::~TranslateHelper() {
+ }
+diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
+--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
+@@ -102,7 +102,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) {
+   if (net::NetworkChangeNotifier::IsOffline())
+     return;
+ 
+-  if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) {
+  if (true) {
+     // Without an API key, translate won't work, so don't offer to translate in
+     // the first place. Leave prefs::kOfferTranslateEnabled on, though, because
+     // that settings syncs and we don't want to turn off translate everywhere
+diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
+--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
+@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchComplete(
+     base::StringAppendF(&data_, "var serverParams = '%s';\n",
+                         server_params.c_str());
+ 
+-    GURL security_origin = translate::GetTranslateSecurityOrigin();
+     base::StringAppendF(
+-        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
+        &data_, "var securityOrigin = '';");
+ 
+     // Append embedded translate.js and a remote element library.
+     base::StringPiece str =
@@ -0,0 +1,30 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:29:30 2018 +0100
+
+    ungoogled-chromium: Disable profile avatar downloading
+    Stop downloading profile avatar
+
+diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
+--- a/chrome/browser/profiles/profile_avatar_downloader.cc
+++ b/chrome/browser/profiles/profile_avatar_downloader.cc
+@@ -15,19 +15,13 @@
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+ #include "ui/gfx/image/image.h"
+ 
+-namespace {
+-const char kHighResAvatarDownloadUrlPrefix[] =
+-    "https://www.gstatic.com/chrome/profile_avatars/";
+-}
+-
+ ProfileAvatarDownloader::ProfileAvatarDownloader(
+     size_t icon_index,
+     const FetchCompleteCallback& callback)
+     : icon_index_(icon_index),
+       callback_(callback) {
+   DCHECK(!callback_.is_null());
+-  GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
+-           profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
+  GURL url(std::string("about:blank"));
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
+         semantics {
@@ -0,0 +1,21 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:30:30 2018 +0100
+
+    ungoogled-chromium: Disable intranet redirect detector
+    Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled
+    See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
+
+diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
+--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
+@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() {
+   fetchers_.clear();
+   resulting_origins_.clear();
+ 
+-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+-  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
+-    return;
+  return;
+ 
+   DCHECK(fetchers_.empty() && resulting_origins_.empty());
+ 
@@ -0,0 +1,363 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:36:33 2018 +0100
+
+    ungoogled-chromium: Disable Google host detection
+    Disables various detections of Google hosts and functionality specific to them
+
+diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+--- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+@@ -164,9 +164,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+ }
+ 
+ bool IsGoogleSearchHostname(const GURL& url) {
+-  base::Optional<std::string> result =
+-      page_load_metrics::GetGoogleHostnamePrefix(url);
+-  return result && result.value() == "www";
+  return false;
+ }
+ 
+ bool IsGoogleSearchResultUrl(const GURL& url) {
+diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/common/page_load_metrics/page_load_metrics_util.cc
+--- a/chrome/common/page_load_metrics/page_load_metrics_util.cc
+++ b/chrome/common/page_load_metrics/page_load_metrics_util.cc
+@@ -12,38 +12,7 @@
+ namespace page_load_metrics {
+ 
+ base::Optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
+-  const size_t registry_length =
+-      net::registry_controlled_domains::GetRegistryLength(
+-          url,
+-
+-          // Do not include unknown registries (registries that don't have any
+-          // matches in effective TLD names).
+-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-
+-          // Do not include private registries, such as appspot.com. We don't
+-          // want to match URLs like www.google.appspot.com.
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-
+-  const base::StringPiece hostname = url.host_piece();
+-  if (registry_length == 0 || registry_length == std::string::npos ||
+-      registry_length >= hostname.length()) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  // Removes the tld and the preceding dot.
+-  const base::StringPiece hostname_minus_registry =
+-      hostname.substr(0, hostname.length() - (registry_length + 1));
+-
+-  if (hostname_minus_registry == "google")
+-    return std::string("");
+-
+-  if (!base::EndsWith(hostname_minus_registry, ".google",
+-                      base::CompareCase::INSENSITIVE_ASCII)) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  return std::string(hostname_minus_registry.substr(
+-      0, hostname_minus_registry.length() - strlen(".google")));
+  return base::Optional<std::string>();
+ }
+ 
+ bool IsGoogleHostname(const GURL& url) {
+diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
+--- a/components/google/core/browser/google_util.cc
+++ b/components/google/core/browser/google_util.cc
+@@ -41,118 +41,16 @@ namespace {
+ 
+ bool gUseMockLinkDoctorBaseURLForTesting = false;
+ 
+-bool IsPathHomePageBase(base::StringPiece path) {
+-  return (path == "/") || (path == "/webhp");
+-}
+-
+-// Removes a single trailing dot if present in |host|.
+-void StripTrailingDot(base::StringPiece* host) {
+-  if (host->ends_with("."))
+-    host->remove_suffix(1);
+-}
+-
+-// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
+-// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
+-// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
+-// string in |tld|, if specified and the |host| can be parsed.
+-bool IsValidHostName(base::StringPiece host,
+-                     base::StringPiece domain_in_lower_case,
+-                     SubdomainPermission subdomain_permission,
+-                     base::StringPiece* tld) {
+-  // Fast path to avoid searching the registry set.
+-  if (host.find(domain_in_lower_case) == base::StringPiece::npos)
+-    return false;
+-
+-  size_t tld_length =
+-      net::registry_controlled_domains::GetCanonicalHostRegistryLength(
+-          host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-  if ((tld_length == 0) || (tld_length == std::string::npos))
+-    return false;
+-
+-  // Removes the tld and the preceding dot.
+-  base::StringPiece host_minus_tld =
+-      host.substr(0, host.length() - tld_length - 1);
+-
+-  if (tld)
+-    *tld = host.substr(host.length() - tld_length);
+-
+-  if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case))
+-    return true;
+-
+-  if (subdomain_permission == ALLOW_SUBDOMAIN) {
+-    std::string dot_domain(".");
+-    domain_in_lower_case.AppendToString(&dot_domain);
+-    return base::EndsWith(host_minus_tld, dot_domain,
+-                          base::CompareCase::INSENSITIVE_ASCII);
+-  }
+-
+-  std::string www_domain("www.");
+-  domain_in_lower_case.AppendToString(&www_domain);
+-  return base::LowerCaseEqualsASCII(host_minus_tld, www_domain);
+-}
+-
+-// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
+-// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
+-// port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsValidURL(const GURL& url, PortPermission port_permission) {
+-  return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
+-         (url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS));
+-}
+-
+-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+-                                   SubdomainPermission subdomain_permission) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
+-    return true;
+-
+-  base::StringPiece tld;
+-  if (!IsValidHostName(canonical_host, "google", subdomain_permission, &tld))
+-    return false;
+-
+-  // Remove the trailing dot from tld if present, as for google domain it's the
+-  // same page.
+-  StripTrailingDot(&tld);
+-
+-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_tlds,
+-                         ({GOOGLE_TLD_LIST}));
+-  return base::ContainsKey(google_tlds, tld.as_string());
+-}
+-
+-// True if |url| is a valid URL with a host that is in the static list of
+-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
+-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+-  if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
+-    return false;
+-
+-  base::StringPiece host(url.host_piece());
+-  StripTrailingDot(&host);
+-
+-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_subdomains,
+-                         ({"ipv4.google.com", "ipv6.google.com"}));
+-
+-  return base::ContainsKey(google_subdomains, host.as_string());
+-}
+-
+ }  // namespace
+ 
+ // Global functions -----------------------------------------------------------
+ 
+ bool HasGoogleSearchQueryParam(base::StringPiece str) {
+-  url::Component query(0, static_cast<int>(str.length())), key, value;
+-  while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) {
+-    base::StringPiece key_str = str.substr(key.begin, key.len);
+-    if (key_str == "q" || key_str == "as_q")
+-      return true;
+-  }
+   return false;
+ }
+ 
+ GURL LinkDoctorBaseURL() {
+-  if (gUseMockLinkDoctorBaseURLForTesting)
+-    return GURL("http://mock.linkdoctor.url/for?testing");
+-  return GURL(LINKDOCTOR_SERVER_REQUEST_URL);
+  return GURL();
+ }
+ 
+ void SetMockLinkDoctorBaseURLForTesting() {
+@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
+ 
+ GURL AppendGoogleLocaleParam(const GURL& url,
+                              const std::string& application_locale) {
+-  return net::AppendQueryParameter(
+-      url, "hl", GetGoogleLocale(application_locale));
+  return url;
+ }
+ 
+ std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
+-  base::StringPiece google_hostname = google_homepage_url.host_piece();
+-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
+-  // like "google.com./". https://crbug.com/720295.
+-  const size_t last_dot = google_hostname.find_last_of('.');
+-  DCHECK_NE(std::string::npos, last_dot);
+-  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
+-  // Assume the com TLD implies the US.
+-  if (country_code == "com")
+-    return "us";
+-  // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
+-  // code for the UK is "gb".
+-  if (country_code == "uk")
+-    return "gb";
+-  // Catalonia does not have a CLDR country code, since it's a region in Spain,
+-  // so use Spain instead.
+-  if (country_code == "cat")
+-    return "es";
+-  return country_code.as_string();
+  return "nolocale";
+ }
+ 
+ GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
+-  // To transform the homepage URL into the corresponding search URL, add the
+-  // "search" and the "q=" query string.
+-  GURL::Replacements replacements;
+-  replacements.SetPathStr("search");
+-  replacements.SetQueryStr("q=");
+-  return google_homepage_url.ReplaceComponents(replacements);
+  return google_homepage_url;
+ }
+ 
+ const GURL& CommandLineGoogleBaseURL() {
+-  // Unit tests may add command-line flags after the first call to this
+-  // function, so we don't simply initialize a static |base_url| directly and
+-  // then unconditionally return it.
+-  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
+   CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  std::string current_switch_value(
+-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+-          switches::kGoogleBaseURL));
+-  if (current_switch_value != switch_value) {
+-    switch_value = current_switch_value;
+-    base_url = url_formatter::FixupURL(switch_value, std::string());
+-    if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
+-      base_url = GURL();
+-  }
+  base_url = GURL();
+   return base_url;
+ }
+ 
+ bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  return base_url.is_valid() &&
+-         base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
+-                          base::CompareCase::SENSITIVE);
+  return false;
+ }
+ 
+ bool IsGoogleHostname(base::StringPiece host,
+                       SubdomainPermission subdomain_permission) {
+-  url::CanonHostInfo host_info;
+-  return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info),
+-                                       subdomain_permission);
+  return false;
+ }
+ 
+ bool IsGoogleDomainUrl(const GURL& url,
+                        SubdomainPermission subdomain_permission,
+                        PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-         IsCanonicalHostGoogleHostname(url.host_piece(), subdomain_permission);
+  return false;
+ }
+ 
+ bool IsGoogleHomePageUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known home page path.
+-  base::StringPiece path(url.path_piece());
+-  return IsPathHomePageBase(path) ||
+-         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
+  return false;
+ }
+ 
+ bool IsGoogleSearchUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known search path.
+-  base::StringPiece path(url.path_piece());
+-  bool is_home_page_base = IsPathHomePageBase(path);
+-  if (!is_home_page_base && (path != "/search"))
+-    return false;
+-
+-  // Check for query parameter in URL parameter and hash fragment, depending on
+-  // the path type.
+-  return HasGoogleSearchQueryParam(url.ref_piece()) ||
+-      (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
+  return false;
+ }
+ 
+ bool IsYoutubeDomainUrl(const GURL& url,
+                         SubdomainPermission subdomain_permission,
+                         PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-      IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+-                      nullptr);
+  return false;
+ }
+ 
+ const std::vector<std::string>& GetGoogleRegistrableDomains() {
+diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
+--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
+@@ -455,11 +455,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+ bool TemplateURLRef::HasGoogleBaseURLs(
+     const SearchTermsData& search_terms_data) const {
+   ParseIfNecessary(search_terms_data);
+-  for (size_t i = 0; i < replacements_.size(); ++i) {
+-    if ((replacements_[i].type == GOOGLE_BASE_URL) ||
+-        (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
+-      return true;
+-  }
+   return false;
+ }
+ 
+diff --git a/net/base/url_util.cc b/net/base/url_util.cc
+--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
+@@ -393,28 +393,6 @@ void GetIdentityFromURL(const GURL& url,
+ }
+ 
+ bool HasGoogleHost(const GURL& url) {
+-  static const char* kGoogleHostSuffixes[] = {
+-      ".google.com",
+-      ".youtube.com",
+-      ".gmail.com",
+-      ".doubleclick.net",
+-      ".gstatic.com",
+-      ".googlevideo.com",
+-      ".googleusercontent.com",
+-      ".googlesyndication.com",
+-      ".google-analytics.com",
+-      ".googleadservices.com",
+-      ".googleapis.com",
+-      ".ytimg.com",
+-  };
+-  base::StringPiece host = url.host_piece();
+-  for (const char* suffix : kGoogleHostSuffixes) {
+-    // Here it's possible to get away with faster case-sensitive comparisons
+-    // because the list above is all lowercase, and a GURL's host name will
+-    // always be canonicalized to lowercase as well.
+-    if (base::EndsWith(host, suffix, base::CompareCase::SENSITIVE))
+-      return true;
+-  }
+   return false;
+ }
+ 
@@ -0,0 +1,33 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:37:10 2018 +0100
+
+    ungoogled-chromium: Disable GCM
+    Disable Google Cloud Messaging (GCM) client
+
+diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
+--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
+@@ -481,6 +481,7 @@ void GCMClientImpl::StartGCM() {
+ }
+ 
+ void GCMClientImpl::InitializeMCSClient() {
+  return;
+   std::vector<GURL> endpoints;
+   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
+   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
+@@ -678,6 +679,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+ }
+ 
+ void GCMClientImpl::StartCheckin() {
+  return;
+   // Make sure no checkin is in progress.
+   if (checkin_request_.get())
+     return;
+@@ -756,6 +758,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+ }
+ 
+ void GCMClientImpl::SchedulePeriodicCheckin() {
+  return;
+   // Make sure no checkin is in progress.
+   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
+     return;
@@ -0,0 +1,121 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:37:52 2018 +0100
+
+    ungoogled-chromium: Disable Gaia
+    Disables Gaia code
+    Somehow it is still activated even without being signed-in: https://github.com/Eloston/ungoogled-chromium/issues/104
+
+diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
+--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
+@@ -306,7 +306,6 @@
+       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
+-      <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+       <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
+@@ -441,7 +440,6 @@
+       </if>
+       <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
+       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
+-      <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
+       <if expr="chromeos">
+         <include name="IDR_BLUETOOTH_PAIRING_DIALOG_HTML" file="resources\chromeos\bluetooth_pairing_dialog.html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
+         <include name="IDR_BLUETOOTH_PAIRING_DIALOG_JS" file="resources\chromeos\bluetooth_pairing_dialog.js" type="chrome_html" />
+diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
+ #endif
+     case IDR_CRYPTOTOKEN_MANIFEST:
+     case IDR_FEEDBACK_MANIFEST:
+-    case IDR_GAIA_AUTH_MANIFEST:
+ #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+     case IDR_HANGOUT_SERVICES_MANIFEST:
+ #endif
+diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+@@ -42,18 +42,11 @@ extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
+ void LoadGaiaAuthExtension(BrowserContext* context) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ 
+-  extensions::ComponentLoader* component_loader = GetComponentLoader(context);
+   const base::CommandLine* command_line =
+       base::CommandLine::ForCurrentProcess();
+   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
+-    base::FilePath auth_extension_path =
+-        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
+-    component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
+     return;
+   }
+-
+-  component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
+-                        base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
+ }
+ 
+ void UnloadGaiaAuthExtension(BrowserContext* context) {
+diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
+--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
+@@ -40,8 +40,6 @@
+       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
+       <!-- Material Design Bookmarks -->
+       <include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
+-      <!-- Gaia auth extension -->
+-      <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowexternalscript="true" type="BINDATA" />
+       <!-- Hangout Services extension, included in Google Chrome builds only. -->
+       <if expr="_google_chrome or enable_hangout_services_extension">
+         <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_services/background.html" type="BINDATA" />
+diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
+--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
+@@ -43,7 +43,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
+ 
+   source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
+   source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
+-  source->AddResourcePath("gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
+ 
+   source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE);
+   source->AddLocalizedString(
+diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
+--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
+@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+     int load_flags,
+     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
+   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
+-  fetcher_ = net::URLFetcher::Create(
+-      0, gaia_gurl, body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
+-      this, traffic_annotation);
+-  fetcher_->SetRequestContext(getter_);
+-  fetcher_->SetUploadData("application/x-www-form-urlencoded", body);
+-  gaia::MarkURLFetcherAsGaia(fetcher_.get());
+-
+-  VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
+-  VLOG(2) << "Gaia fetcher headers: " << headers;
+-  VLOG(2) << "Gaia fetcher body: " << body;
+-
+-  // The Gaia token exchange requests do not require any cookie-based
+-  // identification as part of requests.  We suppress sending any cookies to
+-  // maintain a separation between the user's browsing and Chrome's internal
+-  // services.  Where such mixing is desired (MergeSession or OAuthLogin), it
+-  // will be done explicitly.
+-  fetcher_->SetLoadFlags(load_flags);
+-
+-  // Fetchers are sometimes cancelled because a network change was detected,
+-  // especially at startup and after sign-in on ChromeOS. Retrying once should
+-  // be enough in those cases; let the fetcher retry up to 3 times just in case.
+-  // http://crbug.com/163710
+-  fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
+-
+-  if (!headers.empty())
+-    fetcher_->SetExtraRequestHeaders(headers);
+-
+-  fetch_pending_ = true;
+-  fetcher_->Start();
+ }
+ 
+ // static
@@ -0,0 +1,166 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Mon Feb 12 21:45:21 2018 +0100
+
+    ungoogled-chromium: Clear HTTP cache menu item
+    Adds a menu item under "More tools" to clear the HTTP authentication cache on demand
+
+diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
+--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
+@@ -149,6 +149,7 @@
+ #define IDC_DEV_TOOLS_INSPECT           40023
+ #define IDC_UPGRADE_DIALOG              40024
+ #define IDC_VIEW_INCOMPATIBILITIES      40025
+#define IDC_CLEAR_HTTP_AUTH_CACHE       40026
+ #define IDC_SHOW_KEYBOARD_OVERLAY       40027
+ #define IDC_PROFILING_ENABLED           40028
+ #define IDC_BOOKMARKS_MENU              40029
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
+@@ -1064,6 +1064,9 @@ are declared in build/common.gypi.
+         <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
+           &amp;Clear browsing data...
+         </message>
+        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="The text label for the menu item for clearing the HTTP authentication cache">
+          Clear &amp;HTTP auth cache
+        </message>
+         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
+           &amp;Downloads
+         </message>
+@@ -1102,6 +1105,9 @@ are declared in build/common.gypi.
+         <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
+           &amp;Clear Browsing Data...
+         </message>
+        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="In Title Case: The text label for the menu item for clearing the HTTP authentication cache">
+          Clear &amp;HTTP Auth Cache
+        </message>
+         <message name="IDS_SHOW_DOWNLOADS" desc="In Title Case: The show downloads menu in the app menu">
+           &amp;Downloads
+         </message>
+diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
+--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
+@@ -59,6 +59,9 @@
+ #include "printing/features/features.h"
+ #include "services/service_manager/public/cpp/connector.h"
+ #include "ui/events/keycodes/keyboard_codes.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "net/http/http_transaction_factory.h"
+ 
+ #if defined(OS_MACOSX)
+ #include "chrome/browser/ui/browser_commands_mac.h"
+@@ -640,6 +643,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+     case IDC_CLEAR_BROWSING_DATA:
+       ShowClearBrowsingDataDialog(browser_);
+       break;
+    case IDC_CLEAR_HTTP_AUTH_CACHE:
+      profile()->GetRequestContext()->GetURLRequestContext()->http_transaction_factory()->GetSession()->http_auth_cache()->Clear();
+      break;
+     case IDC_IMPORT_SETTINGS:
+       ShowImportDialog(browser_);
+       break;
+@@ -891,6 +897,7 @@ void BrowserCommandController::InitCommandState() {
+                                         !profile()->IsOffTheRecord());
+   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
+                                         !guest_session);
+  command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
+ #if defined(OS_CHROMEOS)
+   command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
+   command_updater_.UpdateCommandEnabled(IDC_TOUCH_HUD_PROJECTION_TOGGLE, true);
+diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
+--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
+@@ -195,6 +195,7 @@ void ToolsMenuModel::Build(Browser* browser) {
+ 
+   AddSeparator(ui::NORMAL_SEPARATOR);
+   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
+  AddItemWithStringId(IDC_CLEAR_HTTP_AUTH_CACHE, IDS_CLEAR_HTTP_AUTH_CACHE);
+   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
+   if (chrome::CanOpenTaskManager())
+     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+@@ -452,6 +453,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
+       }
+       LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
+       break;
+    case IDC_CLEAR_HTTP_AUTH_CACHE:
+      if (!uma_action_recorded_) {
+        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ClearHttpAuthCache",
+                                   delta);
+      }
+      LogMenuAction(MENU_ACTION_CLEAR_HTTP_AUTH_CACHE);
+      break;
+     case IDC_VIEW_SOURCE:
+       if (!uma_action_recorded_)
+         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta);
+diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h
+--- a/chrome/browser/ui/toolbar/app_menu_model.h
+++ b/chrome/browser/ui/toolbar/app_menu_model.h
+@@ -72,6 +72,7 @@ enum AppMenuAction {
+   MENU_ACTION_UPGRADE_DIALOG = 44,
+   MENU_ACTION_CAST = 45,
+   MENU_ACTION_BETA_FORUM = 46,
+  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 51,
+   LIMIT_MENU_ACTION
+ };
+ 
+diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = {
+ 
+     {IDS_TASK_MANAGER, IDC_TASK_MANAGER},
+     {IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA},
+    {IDS_CLEAR_HTTP_AUTH_CACHE, IDC_CLEAR_HTTP_AUTH_CACHE},
+ 
+     {MENU_SEPARATOR, MENU_SEPARATOR},
+ 
+diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
+--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc
+@@ -250,6 +250,10 @@ bool HttpAuthCache::Remove(const GURL& origin,
+   return false;
+ }
+ 
+void HttpAuthCache::Clear() {
+  entries_.clear();
+}
+
+ void HttpAuthCache::ClearEntriesAddedWithin(base::TimeDelta duration) {
+   base::TimeTicks begin_time = base::TimeTicks::Now() - duration;
+   base::EraseIf(entries_, [begin_time](const Entry& entry) {
+diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
+--- a/net/http/http_auth_cache.h
+++ b/net/http/http_auth_cache.h
+@@ -166,6 +166,8 @@ class NET_EXPORT HttpAuthCache {
+               HttpAuth::Scheme scheme,
+               const AuthCredentials& credentials);
+ 
+  void Clear();
+
+   // Clears cache entries created within |duration| of base::TimeTicks::Now().
+   void ClearEntriesAddedWithin(base::TimeDelta duration);
+ 
+diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
+--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
+@@ -44908,6 +44908,7 @@ Called by update_traffic_annotation_histograms.py.-->
+   <int value="43" label="Exit"/>
+   <int value="44" label="Upgrade browser"/>
+   <int value="45" label="Cast"/>
+  <int value="51" label="Clear HTTP auth cache"/>
+ </enum>
+ 
+ <enum name="XFrameOptions">
+diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
+--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
+@@ -100011,6 +100011,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+   <suffix name="Overestimate"
+       label="Tracks when the compositor's estimates were too high and by how
+              much."/>
+  <suffix name="ClearHttpAuthCache" label="Clear HTTP authentication cache"/>
+   <suffix name="Underestimate"
+       label="Tracks when the compositor's estimates were too low and by how
+              much."/>
@@ -0,0 +1,70 @@
+Author: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date:   Sun Feb 18 22:15:25 2018 +0100
+
+    Play videos in background
+    Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
+    Original Javascript code by timdream
+
+diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
+--- a/third_party/WebKit/Source/core/dom/BUILD.gn
+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
+@@ -347,6 +347,7 @@ blink_core_sources("dom") {
+     "events/WindowEventContext.cpp",
+     "events/WindowEventContext.h",
+     "extensions/dont-track-me.h",
+    "extensions/video-bg-play.h",
+     "ng/flat_tree_traversal_ng.cc",
+     "ng/flat_tree_traversal_ng.h",
+     "trustedtypes/TrustedHTML.cpp",
+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
+--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
+@@ -220,6 +220,7 @@
+ #include "core/xml_names.h"
+ #include "core/xmlns_names.h"
+ #include "extensions/dont-track-me.h"
+#include "extensions/video-bg-play.h"
+ #include "platform/CrossThreadFunctional.h"
+ #include "platform/DateComponents.h"
+ #include "platform/EventDispatchForbiddenScope.h"
+@@ -5817,17 +5818,25 @@ void Document::FinishedParsing() {
+ 
+   // determine whether this is a Google search results page
+   const SecurityOrigin *origin = GetSecurityOrigin();
+-  if (origin) {
+  auto* bodyElement = body();
+  if (origin && bodyElement) {
+     WTF::String domain = origin->Domain();
+     size_t pos = domain.Find(".google.");
+-    auto* bodyElement = body();
+-    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+    if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+       LOG(INFO) << "injecting dont-track-me Javascript payload";
+       HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
+       e->setText(DONT_TRACK_ME_JS);
+       bodyElement->AppendChild(e);
+     }
+-  }
+
+    // check for eligibility of the video bg fix
+    if ((WTF::kNotFound != domain.Find("youtube.com")) || (WTF::kNotFound != domain.Find("vimeo.com"))) {
+      LOG(INFO) << "injecting video-bg-play Javascript payload";
+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
+      e->setText(VIDEO_BG_PLAY_JS);
+      bodyElement->AppendChild(e);
+    }
+  } // has origin and body element
+ }
+ 
+ void Document::ElementDataCacheClearTimerFired(TimerBase*) {
+diff --git a/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h b/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h
+new file mode 100644
+--- /dev/null
+++ b/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h
+@@ -0,0 +1,6 @@
+#ifndef video_bg_play_h
+#define video_bg_play_h
+
+#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
+
+#endif  // video_bg_play_h
@@ -1,26 +0,0 @@
-From ee80624a6cad6e19a281a59cfea32f406e7ee03d Mon Sep 17 00:00:00 2001
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Thu, 26 Jan 2017 01:30:12 -0500
-Subject: [PATCH 12/21] use 64-bit WebView processes
-
---
- android_webview/apk/java/AndroidManifest.xml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
-index 23b55ecb437a..3f7212fe2807 100644
--- a/android_webview/apk/java/AndroidManifest.xml
-+++ b/android_webview/apk/java/AndroidManifest.xml
-@@ -20,8 +20,7 @@
- 
-     <application android:label="Android System WebView"
-                  android:icon="@drawable/icon_webview"
-                 android:multiArch="true"
-                 android:use32bitAbi="true">
-+                 android:multiArch="true">
-         {# This part is shared between stand-alone WebView and Monochrome #}
-         {% macro common(manifest_package, webview_lib) %}
-             <meta-data android:name="com.android.webview.WebViewLibrary"
-- 
-2.14.2
-
@@ -1,717 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Dec 11 22:42:11 2017 +0100
-
-    Added Google English-only engine, no RLZ and field experiments
-
-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": 101
-+    "kCurrentDataVersion": 102
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -141,6 +141,27 @@
-       "id": 1
-     },
- 
-+    "googleen": {
-+      "name": "GoogleEN",
-+      "keyword": "google.co.uk",
-+      "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
-@@ -65,6 +65,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_360,
-   SEARCH_ENGINE_DUCKDUCKGO,
-   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
-@@ -50,548 +50,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_at,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_au,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &google, &startpage, &duckduckgo, &bing, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
-+    &googleen, &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
-+    &googleen, &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_co,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &startpage, &duckduckgo, &seznam, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_es,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &google, &startpage, &duckduckgo, &bing, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &google, &startpage, &duckduckgo, &yahoo_id, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_in,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &google, &startpage, &duckduckgo, &virgilio, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &google, &startpage, &duckduckgo, &naver, &daum,
-+    &googleen, &google, &startpage, &duckduckgo, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
-+    &googleen, &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &google, &startpage, &duckduckgo, &bing, &yandex_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &google, &startpage, &duckduckgo, &yandex_ru, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &google, &startpage, &duckduckgo, &bing, &kvasir,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &google, &startpage, &duckduckgo, &onet, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
-+    &googleen, &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_se,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &google, &startpage, &duckduckgo, &najdi, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &google, &startpage, &duckduckgo, &yahoo_th, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &startpage, &duckduckgo, &yahoo, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &google, &startpage, &duckduckgo, &yandex_ua, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
-+    &googleen, &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo,
-+    &googleen, &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &startpage, &duckduckgo, &bing, &yahoo, &ask,
-+    &googleen, &google, &startpage, &duckduckgo, &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, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &googleen, &google, &startpage, &duckduckgo, &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,
@@ -1,710 +0,0 @@
-commit 8885c3f6f759c0d97183fe44913e2c4ca1839220
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 18 21:24:05 2017 +0200
-
-    Add StartPage search engine
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 25e85ab..dcccdb8 100644
--- 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": 100
-+    "kCurrentDataVersion": 101
-   },
- 
-   // The following engines are included in country lists and are added to the
-@@ -220,6 +220,16 @@
-       "id": 56
-     },
- 
-+    "startpage": {
-+      "name": "StartPage",
-+      "keyword": "startpage.com",
-+      "favicon_url": "https://startpage.com/favicon.ico",
-+      "search_url": "https://startpage.com/do/dsearch?query={searchTerms}",
-+      "new_tab_url": "https://startpage.com/",
-+      "type": "SEARCH_ENGINE_STARTPAGE",
-+      "id": 12
-+    },
-+
-     "vinden": {
-       "name": "Vinden.nl",
-       "keyword": "vinden.nl",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index 02f6b16..8df48741 100644
--- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -64,6 +64,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_ZOZNAM,
-   SEARCH_ENGINE_360,
-   SEARCH_ENGINE_DUCKDUCKGO,
-+  SEARCH_ENGINE_STARTPAGE,
-   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
-index 7adede7..52743e7 100644
--- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -50,548 +50,548 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &google, &duckduckgo, &bing, &yahoo_ar,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &google, &duckduckgo, &bing, &yahoo_at,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &google, &duckduckgo, &bing, &yahoo_au,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &google, &duckduckgo, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &google, &duckduckgo, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
-+    &google, &startpage, &duckduckgo, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &google, &duckduckgo, &yandex_by, &mail_ru,
-+    &google, &startpage, &duckduckgo, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &startpage, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &google, &duckduckgo, &bing, &yahoo_ch,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &google, &duckduckgo, &bing, &yahoo_cl,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &google, &duckduckgo, &baidu, &sogou, &so_360,
-+    &google, &startpage, &duckduckgo, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &google, &duckduckgo, &bing, &yahoo_co,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &duckduckgo, &seznam, &bing,
-+    &google, &startpage, &duckduckgo, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &google, &duckduckgo, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &google, &duckduckgo, &bing, &yahoo_dk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &google, &duckduckgo, &bing, &yahoo_es,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &google, &duckduckgo, &bing, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &google, &duckduckgo, &bing, &yahoo_fi,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &google, &duckduckgo, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &google, &duckduckgo, &bing, &yahoo_gr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &google, &duckduckgo, &yahoo_id, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &google, &duckduckgo, &bing, &yahoo_uk,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &google, &duckduckgo, &bing, &yahoo_in,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &google, &duckduckgo, &virgilio, &bing,
-+    &google, &startpage, &duckduckgo, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &google, &duckduckgo, &yahoo_jp, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &google, &duckduckgo, &naver, &daum,
-+    &google, &startpage, &duckduckgo, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &duckduckgo, &mail_ru, &yandex_kz,
-+    &google, &startpage, &duckduckgo, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &google, &duckduckgo, &bing, &yahoo_de,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &google, &duckduckgo, &bing, &yandex_ru,
-+    &google, &startpage, &duckduckgo, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &google, &duckduckgo, &bing, &yahoo_fr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &google, &duckduckgo, &yandex_ru, &bing,
-+    &google, &startpage, &duckduckgo, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &google, &duckduckgo, &yahoo_fr, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &google, &duckduckgo, &bing, &yahoo_mx,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &google, &duckduckgo, &yahoo_my, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &google, &duckduckgo, &yahoo_nl, &vinden,
-+    &google, &startpage, &duckduckgo, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &google, &duckduckgo, &bing, &kvasir,
-+    &google, &startpage, &duckduckgo, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &duckduckgo, &bing, &yahoo_nz,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &google, &duckduckgo, &bing, &yahoo_pe,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &google, &duckduckgo, &yahoo_ph, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &google, &duckduckgo, &onet, &bing,
-+    &google, &startpage, &duckduckgo, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &google, &duckduckgo, &yahoo_ro, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &google, &duckduckgo, &yandex_ru, &mail_ru,
-+    &google, &startpage, &duckduckgo, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &google, &duckduckgo, &yahoo_maktoob, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &google, &duckduckgo, &bing, &yahoo_se,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &google, &duckduckgo, &yahoo_sg, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &google, &duckduckgo, &najdi, &ask,
-+    &google, &startpage, &duckduckgo, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &google, &duckduckgo, &yahoo_th, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &google, &duckduckgo, &yahoo_tw, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &duckduckgo, &yahoo, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &google, &duckduckgo, &yandex_ua, &bing,
-+    &google, &startpage, &duckduckgo, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &google, &duckduckgo, &bing, &yahoo_ve,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &google, &duckduckgo, &yahoo_vn, &bing,
-+    &google, &startpage, &duckduckgo, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &google, &duckduckgo, &bing, &yahoo_maktoob,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &duckduckgo, &bing, &yahoo,
-+    &google, &startpage, &duckduckgo, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &duckduckgo, &bing, &yahoo, &ask,
-+    &google, &startpage, &duckduckgo, &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, &duckduckgo, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &startpage, &duckduckgo, &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,
@@ -1,13 +0,0 @@
-diff --git a/tracing/third_party/gl-matrix/jsdoc-template/static/default.css b/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-index efcf782..99a6767 100644
--- a/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-+++ b/third_party/catapult/tracing/third_party/gl-matrix/jsdoc-template/static/default.css
-@@ -168,7 +168,7 @@ ul.inheritsList
- 
- /* Copied from styles.css generated by Github Pages */
- 
-@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
-+@import url(chrome://resources/css/roboto.css);
- 
- body {
-   padding:50px;
@@ -1,20 +0,0 @@
-commit a53d9cf12fb835938c2d2ad641633126a07bf636
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Nov 26 11:40:05 2017 +0100
-
-    Restore classic new tab page
-
-diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
-index b756cb0..5785c581 100644
--- a/chrome/browser/search/search.cc
-+++ b/chrome/browser/search/search.cc
-@@ -171,9 +171,6 @@ struct NewTabURLDetails {
- 
-     NewTabURLState state = IsValidNewTabURL(profile, search_provider_url);
-     switch (state) {
-      case NEW_TAB_URL_VALID:
-        // We can use the search provider's page.
-        return NewTabURLDetails(search_provider_url, state);
-       case NEW_TAB_URL_INCOGNITO:
-         // Incognito has its own New Tab.
-         return NewTabURLDetails(GURL(), state);
Author	SHA1	Message	Date
csagan5	29e6c35657	Release 64.0.3282.204	2018-03-10 09:34:55 +01:00
csagan5	148f920a06	Add webRTC disabled to features list	2018-03-05 08:12:59 +01:00
csagan5	c5e38e8077	Release 64.0.3282.193	2018-03-05 01:16:47 +01:00
csagan5	94a0637fb1	Add XDA Labs downloads badge	2018-03-04 20:54:36 +01:00
csagan5	db00f3e4f4	Add downloads badge	2018-03-04 17:33:18 +01:00
csagan5	e664528479	All patches updated for 64.0.3282.182	2018-02-25 19:17:21 +01:00
csagan5	83a16596e6	Update F.A.Q.	2018-02-19 20:34:18 +01:00
csagan5	7c6a4374f5	Update features list	2018-02-18 22:47:15 +01:00
csagan5	5b2034ff45	Add patch to play videos in background	2018-02-18 22:43:29 +01:00
csagan5	6807e7b388	Fix some adblock filters	2018-02-18 22:13:51 +01:00
csagan5	71b5dc1b0b	Changelog update	2018-02-15 13:39:22 +01:00
csagan5	2bda9e45f6	Updated Bromite patches for next release Disable fetching of popular sites	2018-02-15 13:39:20 +01:00
csagan5	530626fd21	Add more ungoogled-chromium patches	2018-02-15 13:39:19 +01:00
csagan5	4e8b70cb64	Add Bromite-specific patches First run, disable Omaha updates, H264 ARM optimizations, revert deep/shadow CSS changes Rename patches with ordering prefix Move all patches in single directory for easier tracking	2018-02-13 01:08:44 +01:00
csagan5	f4b6592dbc	Latest release 64.0.3282.149	2018-02-07 20:05:21 +01:00
csagan5	0d6534d9eb	Release 63.0.3239.150	2018-01-27 13:06:54 +01:00
csagan5	b869bb5b7b	Specify minimum Android version as v4.1	2018-01-17 20:41:25 +01:00
csagan5	a6603ca827	Release 63.0.3239.144	2018-01-16 23:34:02 +01:00