Release 67.0.3396.88

Add links for all related projects/credits
Align with home page
2018-06-15 11:26:26 +02:00 · 2018-06-12 14:04:27 +02:00 · 2018-06-11 21:27:04 +02:00 · 2018-06-11 18:55:40 +02:00 · 2018-06-09 11:12:45 +02:00 · 2018-06-08 23:59:52 +02:00
31 changed files with 104008 additions and 44474 deletions
@@ -1,3 +1,114 @@
+# 67.0.3396.88
+* add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
+* disable signin, translate and data saver UI/internal components (fixes https://github.com/bromite/bromite/issues/67)
+* rename `GoogleEN` -> `Google In English` (fixes https://github.com/bromite/bromite/issues/66)
+* re-enabled text metrics and ToDataURL, ToBlob with randomisation of color data (fixes https://github.com/bromite/bromite/issues/52)
+* open YouTube links in Bromite
+* use Android Media Player for URLs
+* add exit menu item
+* hide "send reports to Google" menu item
+* updated AdBlock filters
+
+# 67.0.3396.82
+* updated AdBlock filters
+
+# 67.0.3396.76
+* updated AdBlock filters
+
+# 67.0.3396.72
+* add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
+* updated AdBlock filters
+
+# 67.0.3396.67
+* updated AdBlock filters
+
+# 66.0.3359.202
+* fix DevTools integration (https://github.com/bromite/bromite/issues/23)
+* allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
+* updated AdBlock filters
+
+# 66.0.3359.200
+* updated AdBlock filters
+
+# 66.0.3359.196
+* updated AdBlock filters
+
+# 66.0.3359.188
+* updated AdBlock filters
+* increase max (persistent) connections per server from 6 to 15
+* preliminary work for better canvas fingerprinting mitigations
+
+# 66.0.3359.161
+* updated AdBlock filters
+
+# 66.0.3359.148
+* disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17)
+* updated AdBlock filters
+* reduce randomisation for client rects from 5% to 3%
+
+# 65.0.3325.230
+* fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11)
+* updated AdBlock filters
+
+# 65.0.3325.218
+* always set WideVine version
+* updated AdBlock filters
+
+# 65.0.3325.204
+* add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37)
+* add fingeprinting mitigation for getClientRects, getBoundingClientRect
+* set audio latency to fixed number
+* updated AdBlock filters
+
+# 65.0.3325.198
+* re-landed support for third-party AdBlock filters
+* completed patches cleanup
+* updated AdBlock filters
+
+# 65.0.3325.190
+* block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15)
+* updated AdBlock filters
+
+# 65.0.3325.176
+* block plugins enumeration API
+* block battery API
+* remove device name and build id from User Agent
+* added Qwant search engine
+* updated AdBlock filters
+* disable non-working 3rd-party filters support
+
+# 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
@@ -1,6 +1,6 @@
 # Bromite - Take back your browser

-[![GitHub release][version-image]][version-url] [![license][license-image]][license-url]
+<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> [![license][license-image]][license-url]

 <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />

@@ -10,10 +10,19 @@ 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://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" /> <img src="https://www.bromite.org/bromite_bromite_xda_downloads.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />
+
+# Goals
+
+Bromite aims at providing a no-clutter browsing experience without privacy-invasive features and with the addition of a fast ad-blocking engine.
+Minimal UI changes are applied to help curbing the idea of "browser as an advertisement platform".
+
 # Donate

 Please donate to support development of Bromite and the costs for the build system.

+[Become a patron on Patreon](https://www.patreon.com/bePatron?c=1807244)
+
 Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)

 Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)
@@ -22,31 +31,53 @@ BTC donations address: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`

 ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

-# Features
-
-* adblocking (currently baked-in, no configuration options available)
-* remove click-tracking and AMP from Google search results
-* [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)
-* privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
-* all codecs included (proprietary, open H.264 etc.)
-* built with official Chrome 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.

+## What is the SystemWebView?
+It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
+
+## Does Bromite require root?
+No.
+
+## Can you add dark mode/some cool themes?
+No.
+Bromite is about adblocking and privacy.
+
+## Can you add HTTPS everywhere?
+No.
+We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywhere in particular is too invasive to be easily maintained across new releases.
+
+# Features
+
+* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
+* remove click-tracking and AMP from Google search results
+* DNS-over-HTTPS support via Google/CloudFlare servers
+* allow playing videos in background
+* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* Google search engine English-only with reduced tracking
+* privacy enhancement patches from [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/), [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) and [Iridium](https://github.com/iridium-browser) projects
+* webRTC, canvas, audio and other anti-fingerprinting mitigations
+* all codecs included (proprietary, open H.264 etc.)
+* built with official speed optimizations
+
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
+
 # Releases

-A build server goes through the very lengthy build operation and then new versions are available in this project as [releases](https://github.com/bromite/bromite/releases).
+All built versions are available as [releases](https://github.com/bromite/bromite/releases).

 Each tag corresponds to a Chromium release tag.

+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
+Additionally, SystemWebView, Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+
 # How to build

-The [bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).
+The [Bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).

 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.

@@ -56,8 +87,9 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
 * [Iridium project](https://github.com/iridium-browser) for some patches (taken from above ungoogled-chromium)
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (taken from above ungoogled-chromium)
+* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * nochromo for the original adblock patch
-* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the compilation of original adblock patch
+* [AdBlock Plus](https://adblockplus.org/), [uBlock](https://www.ublock.org/), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included

 # License

@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 18 May 2018 10:10:00 +0200
+Subject: Increase maximum connections per host from 6 to 15
+
+---
+ net/socket/client_socket_pool_manager.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
+--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
+@@ -34,7 +34,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+                   HttpNetworkSession::NUM_SOCKET_POOL_TYPES,
+               "max sockets per pool length mismatch");
+ 
+-// Default to allow up to 6 connections per host. Experiment and tuning may
+// Default to allow up to 15 connections per host. Experiment and tuning may
+ // try other values (greater than 0).  Too large may cause many problems, such
+ // as home routers blocking the connections!?!?  See http://crbug.com/12066.
+ //
+@@ -43,7 +43,7 @@ static_assert(arraysize(g_max_sockets_per_pool) ==
+ // be the same as the limit for ws. Also note that Firefox uses a limit of 200.
+ // See http://crbug.com/486800
+ int g_max_sockets_per_group[] = {
+-    6,   // NORMAL_SOCKET_POOL
+    15,  // NORMAL_SOCKET_POOL
+     255  // WEBSOCKET_SOCKET_POOL
+ };
+ 
+-- 
+2.7.4
+
@@ -1,15 +1,16 @@
-commit 0a3880671af60180c72cdaf18e24f699db87ae23
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:50:10 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 22:50:10 +0200
+Subject: Disable third-party cookies by default

-    Disable third-party cookies by default
-    author: Chad Miller <chad.miller@canonical.com>
+author: Chad Miller <chad.miller@canonical.com>
+---
+ components/content_settings/core/browser/cookie_settings.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 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(
+@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -18,3 +19,6 @@ index 6dbac81..26a9c23 100644
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
+-- 
+2.7.4
+
@@ -0,0 +1,26 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 11:40:05 +0100
+Subject: Restore classic new tab page
+
+---
+ chrome/browser/search/search.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+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
+@@ -155,10 +155,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) {
+-- 
+2.7.4
+
@@ -1,11 +1,12 @@
-commit 8ca595ca27ab3d99674275c96b06b160a83d92e3
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:57:29 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 22:57:29 +0200
+Subject: Disable battery status service

-    Disable battery status service
+---
+ services/device/battery/battery_status_service.cc | 5 +++++
+ 1 file changed, 5 insertions(+)

 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) {
@@ -27,3 +28,6 @@ index 988f20d..adbaf69 100644
 
   return callback_list_.Add(callback);
 }
+-- 
+2.7.4
+
@@ -1,11 +1,12 @@
-commit fd5c89a560c1fcbab8cd9b7335aca75a2d22d1e5
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:58:52 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 22:58:52 +0200
+Subject: Disable GCM status check

-    Disable GCM status check
+---
+ components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)

 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 {
@@ -37,3 +38,6 @@ index 8972447..415b1ab 100644
 }
 
 void GCMChannelStatusRequest::OnURLFetchComplete(
+-- 
+2.7.4
+
@@ -1,11 +1,13 @@
-commit 835aa728bc2eaa7f01dc875d87aa64b61bb11ccd
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 01:35:53 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 01:35:53 +0200
+Subject: Disable updater pings

-    Disable updater pings
+---
+ components/component_updater/configurator_impl.cc | 21 +++------------------
+ components/component_updater/configurator_impl.h  |  1 -
+ 2 files changed, 3 insertions(+), 19 deletions(-)

 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";
@@ -19,8 +21,8 @@ index efc46c5..2bb49f36 100644
 
 // If there is an element of |vec| of the form |test|=.*, returns the right-
 // hand side of that assignment. Otherwise, returns an empty string.
-@@ -89,8 +91,7 @@ ConfiguratorImpl::ConfiguratorImpl(
-       fast_update_(false),
+@@ -86,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(const base::CommandLine* cmdline,
+     : fast_update_(false),
       pings_enabled_(false),
       deltas_enabled_(false),
 -      background_downloads_enabled_(false),
@@ -29,7 +31,7 @@ index efc46c5..2bb49f36 100644
   // Parse comma-delimited debug flags.
   std::vector<std::string> switch_values = base::SplitString(
       cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
-@@ -138,22 +139,6 @@ int ConfiguratorImpl::UpdateDelay() const {
+@@ -135,22 +136,6 @@ int ConfiguratorImpl::UpdateDelay() const {
 
 std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
   std::vector<GURL> urls;
@@ -53,10 +55,9 @@ 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 {
+@@ -89,7 +89,6 @@ class ConfiguratorImpl {
   bool pings_enabled_;
   bool deltas_enabled_;
   bool background_downloads_enabled_;
@@ -64,3 +65,6 @@ index afc3d2d..5258e47 100644
 
   DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
 };
+-- 
+2.7.4
+
@@ -1,18 +1,18 @@
-commit 099b041051cd3ea166c38269aa584bee7962d816
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:19:25 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 13 Sep 2014 17:25:47 +0200
+Subject: prefs: only keep cookies until exit

-    Subject: [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!
+Out with all those tracking cookies!
+
+author: Jan Engelhardt <jengelh@inai.de>
+---
+ components/content_settings/core/browser/content_settings_registry.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 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() {
+@@ -117,7 +117,7 @@ void ContentSettingsRegistry::Init() {
   // WARNING: The string names of the permissions passed in below are used to
   // generate preference names and should never be changed!
 
@@ -21,3 +21,6 @@ index fe84151..f303447 100644
            WebsiteSettingsInfo::SYNCABLE,
            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
+-- 
+2.7.4
+
@@ -1,18 +1,18 @@
-commit 6eaea225c3e5ceaba5a2753248c770b218bdc4f4
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:12:18 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 2 Apr 2015 12:44:23 +0200
+Subject: Remove EV certificates

-    [PATCH 35/60] Remove EV certificates
-    From: Jan Engelhardt <jengelh@inai.de>
-    Date: Thu, 2 Apr 2015 12:44:23 +0200
-    
-    The team chose to let EV certificates appear just like normal
-    certificates. The web of trust is considered a failure in itself, so
-    do not give users a false sense of extra security with EV certs.
-    Instead, let them appear just like regular ones.
+The team chose to let EV certificates appear just like normal
+certificates. The web of trust is considered a failure in itself, so
+do not give users a false sense of extra security with EV certs.
+Instead, let them appear just like regular ones.
+
+author: Jan Engelhardt <jengelh@inai.de>
+---
+ net/cert/ev_root_ca_metadata.cc | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)

 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 {
@@ -32,7 +32,7 @@ index 3e89bb3..9bb411b 100644
     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
     // https://www.camerfirma.com
     {
-@@ -708,7 +718,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
+@@ -748,7 +758,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
         {"2.16.840.1.114404.1.1.2.4.1", ""},
@@ -41,5 +41,8 @@ index 3e89bb3..9bb411b 100644
 +#endif
 +};
 
- #endif  // defined(USE_NSS_CERTS) || defined(OS_IOS) || defined(OS_WIN)
+ #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
 
+-- 
+2.7.4
+
@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 9 Nov 2014 01:54:27 +0100
+Subject: promo: disable Google promotion fetching
+
+Documentation is scarce, and sprinkled with misleading acronyms.
+NTP is not NTP, for example. FWIW:
+
+// A PromoResourceService fetches data from a web resource server to
+// be used to dynamically change the appearance of the New Tab Page.
+// For example, it has been used to fetch "tips" to be displayed on
+// the NTP, or to display promotional messages to certain groups of
+// Chrome users.
+
+Whatever it is that it downloads, deactivate the one that leads to
+Google.
+
+References: https://github.com/iridium-browser/iridium-browser/issues/33
+---
+ chrome/browser/signin/signin_promo.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
+--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
+@@ -130,6 +130,7 @@ namespace signin {
+ 
+ bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
+   DCHECK(profile);
+  return false;
+ 
+   // Don't show if the profile is an incognito.
+   if (profile->IsOffTheRecord())
+-- 
+2.7.4
+
@@ -0,0 +1,34 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 23:24:58 +0200
+Subject: Disables omission of URL elements in Omnibox
+
+Disable all omissions (already shadowed by first flag)
+---
+ components/url_formatter/url_formatter.cc | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
+--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
+@@ -402,12 +402,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+ }  // namespace
+ 
+ const FormatUrlType kFormatUrlOmitNothing = 0;
+-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
+-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
+-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
+-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
+-const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
+-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
+ 
+ const FormatUrlType kFormatUrlOmitDefaults =
+     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
+-- 
+2.7.4
+
@@ -1,14 +1,30 @@
-commit 3075d5cc23f69b42c80690162426ae2501cd2b5b
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 08:09:24 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 08:09:24 +0200
+Subject: Modify default preferences

-    Modify default preferences
+---
+ chrome/browser/background/background_mode_manager.cc              | 2 +-
+ chrome/browser/chrome_content_browser_client.cc                   | 2 +-
+ chrome/browser/io_thread.cc                                       | 2 +-
+ chrome/browser/net/prediction_options.cc                          | 2 +-
+ chrome/browser/net/prediction_options.h                           | 2 +-
+ chrome/browser/profiles/profile.cc                                | 2 +-
+ .../resources/settings/reset_page/reset_profile_dialog.html       | 2 +-
+ chrome/browser/signin/signin_promo.cc                             | 4 ++--
+ chrome/browser/ui/browser_ui_prefs.cc                             | 4 ++--
+ chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
+ chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
+ chrome/service/cloud_print/connector_settings.cc                  | 2 +-
+ components/autofill/core/browser/autofill_manager.cc              | 2 +-
+ components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
+ components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
+ extensions/common/extension.cc                                    | 8 --------
+ 16 files changed, 18 insertions(+), 30 deletions(-)

 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) {
+@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -18,33 +34,30 @@ 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(
+@@ -990,7 +990,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
 -  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, true);
 +  registry->RegisterBooleanPref(prefs::kEnableHyperlinkAuditing, false);
   registry->RegisterListPref(prefs::kEnableDeprecatedWebPlatformFeatures);
- }
- 
+   // Register user prefs for mapping SitePerProcess and IsolateOrigins in
+   // user policy in addition to the same named ones in Local State (which are
 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) {
+@@ -615,7 +615,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
 -  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
+   registry->RegisterListPref(prefs::kDnsOverHttpsServers);
+   registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods);
   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
-   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 +70,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,10 +82,9 @@ 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";
+@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ -83,7 +94,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 @@
@@ -94,12 +104,11 @@ index b46a992..9d353d9 100644
 +        <paper-checkbox id="sendSettings">
           $i18nRaw{resetPageFeedback}</paper-checkbox>
       </div>
-     </dialog>
+     </cr-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) {
+@@ -384,8 +384,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
 void RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -108,13 +117,12 @@ index 0f4bdb3..77e4810 100644
 +  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
 +  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
+   registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0);
 }
- 
 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) {
+@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -129,7 +137,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 +149,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 +163,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 +175,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(
+@@ -227,7 +227,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
@@ -183,7 +187,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 +205,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) {
+@@ -374,9 +374,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -218,10 +220,9 @@ 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 {
+@@ -368,14 +368,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
   if (is_theme())
     return false;
 
@@ -236,3 +237,6 @@ index b8da726..b9ca9b0 100644
   // Unless they are unpacked, never show hosted apps. Note: We intentionally
   // show packaged apps and platform apps because there are some pieces of
   // functionality that are only available in chrome://extensions/ but which
+-- 
+2.7.4
+
@@ -1,14 +1,15 @@
-commit 5927635bd17374da897e3d49264c536c68a09868
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:17:17 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 23:17:17 +0200
+Subject: Do not store passwords by default

-    Do not store passwords by default
+---
+ components/password_manager/core/browser/password_manager.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

 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(
+@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -19,5 +20,8 @@ index bbb0c20..cf171c0 100644
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+                                PrefRegistry::NO_REGISTRATION_FLAGS);
+-- 
+2.7.4
+
@@ -1,15 +1,16 @@
-commit e1675be76a5ab56335b878dcef50043159efae7a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 08:15:17 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 08:15:17 +0200
+Subject: Disable NTP remote suggestions by default

-    Disable NTP remote suggestions by default
+---
+ components/ntp_snippets/features.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 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[] = {
-     nullptr};
+@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
+     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kArticleSuggestionsFeature{
 -    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -28,3 +29,6 @@ index 31823bbc..82eefe3 100644
 
 const base::Feature kPhysicalWebPageSuggestionsFeature{
     "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.7.4
+
@@ -1,14 +1,18 @@
-commit a06e62ec32a189b8cd16266e47b386ebe00cc04c
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 07:41:20 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 15 Oct 2017 21:45:46 +0200
+Subject: Disable references to fonts.googleapis.com

-    Disables references to fonts.googleapis.com
+---
+ .../dom_distiller/content/browser/dom_distiller_viewer_source.cc       | 2 +-
+ components/dom_distiller/core/html/preview.html                        | 2 +-
+ components/dom_distiller/core/javascript/dom_distiller_viewer.js       | 2 +-
+ third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css         | 3 +--
+ 4 files changed, 4 insertions(+), 5 deletions(-)

 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 +22,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 +34,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 +46,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 @@
@@ -57,3 +58,6 @@ index f21cfe9..b7a5d7a 100644
 
 body,
 table,
+-- 
+2.7.4
+
@@ -1,14 +1,15 @@
-commit aff93733a4c414f9182103b7384c23e6fa450a6a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 26 16:59:03 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 26 Oct 2017 16:59:03 +0200
+Subject: Disable WebRTC by default

-    Disable WebRTC by default
+---
+ chrome/browser/ui/browser_ui_prefs.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 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) {
+@@ -89,10 +89,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
@@ -22,3 +23,6 @@ index 946f7cd..96b79b1 100644
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
 #endif
 
+-- 
+2.7.4
+
@@ -1,27 +1,28 @@
-commit 6a6024067d27a53fb58af282580da68f6cea8809
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Fri Oct 27 15:53:37 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 27 Oct 2017 15:53:37 +0200
+Subject: Disable data saver

-    Ported data reduction disable patch
+---
+ .../java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java | 1 -
+ .../chrome/browser/net/spdyproxy/DataReductionProxySettings.java        | 2 ++
+ .../browser/preferences/datareduction/DataReductionPromoUtils.java      | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)

 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
+@@ -140,7 +140,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));
+-            mPages.add(new DataReductionProxyFirstRunFragment.Page());
             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 +30,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 +39,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 {
@@ -50,3 +50,6 @@ index bd42c89..b147765 100644
     }
 
     /**
+-- 
+2.7.4
+
@@ -0,0 +1,88 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 22:51:43 +0100
+Subject: Skip the first run and metrics
+
+---
+ .../chrome/browser/firstrun/FirstRunStatus.java        |  8 ++++----
+ .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
+ .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
+ 3 files changed, 16 insertions(+), 26 deletions(-)
+
+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
+@@ -36,11 +36,11 @@ public class FirstRunStatus {
+      * includes ToS and Sign In pages if necessary.
+      */
+     public static boolean getFirstRunFlowComplete() {
+-        if (ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false)) {
+-            return true;
+        boolean complete = ContextUtils.getAppSharedPreferences().getBoolean(FIRST_RUN_FLOW_COMPLETE, false);
+        if (!complete) {
+             setFirstRunFlowComplete(true);
+         }
+-        return CommandLine.getInstance().hasSwitch(
+-                ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
+        return true;
+     }
+ 
+     /**
+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
+@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+             }
+         });
+ 
+-        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() {
+-- 
+2.7.4
+
@@ -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,707 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-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 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
-    "kCurrentDataVersion": 99
-+    "kCurrentDataVersion": 100
-   },
- 
-   // The following engines are included in country lists and are added to the
-   // list of search engines on the first run depending on user's country.
-   "elements": {
-+    "duckduckgo": {
-+      "name": "DuckDuckGo",
-+      "keyword": "duckduckgo.com",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "new_tab_url": "https://duckduckgo.com/",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGO",
-+      "id": 11
-+    },
-+
-     "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 {
-   SEARCH_ENGINE_YANDEX,
-   SEARCH_ENGINE_ZOZNAM,
-   SEARCH_ENGINE_360,
-+  SEARCH_ENGINE_DUCKDUCKGO,
-   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 {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &google, &bing, &yahoo_ar,
-+    &google, &duckduckgo, &bing, &yahoo_ar,
- };
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &google, &bing, &yahoo_at,
-+    &google, &duckduckgo, &bing, &yahoo_at,
- };
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &google, &bing, &yahoo_au,
-+    &google, &duckduckgo, &bing, &yahoo_au,
- };
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &google, &bing, &yahoo, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
- };
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
- };
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &google, &ask_br, &bing, &yahoo_br,
-+    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
- };
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &google, &yandex_by, &mail_ru,
-+    &google, &duckduckgo, &yandex_by, &mail_ru,
- };
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &google, &bing, &yahoo_ch,
-+    &google, &duckduckgo, &bing, &yahoo_ch,
- };
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &google, &bing, &yahoo_cl,
-+    &google, &duckduckgo, &bing, &yahoo_cl,
- };
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &google, &baidu, &sogou, &so_360,
-+    &google, &duckduckgo, &baidu, &sogou, &so_360,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &google, &bing, &yahoo_co,
-+    &google, &duckduckgo, &bing, &yahoo_co,
- };
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &google, &seznam, &bing,
-+    &google, &duckduckgo, &seznam, &bing,
- };
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &google, &bing, &yahoo_dk,
-+    &google, &duckduckgo, &bing, &yahoo_dk,
- };
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &google, &bing, &yahoo_es,
-+    &google, &duckduckgo, &bing, &yahoo_es,
- };
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
- };
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &google, &bing, &yahoo_fi,
-+    &google, &duckduckgo, &bing, &yahoo_fi,
- };
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &google, &bing, &yahoo_uk, &ask_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
- };
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &google, &bing, &yahoo_gr,
-+    &google, &duckduckgo, &bing, &yahoo_gr,
- };
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &google, &yahoo_hk, &baidu, &bing,
-+    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
- };
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &google, &yahoo_id, &bing,
-+    &google, &duckduckgo, &yahoo_id, &bing,
- };
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &google, &bing, &yahoo_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk,
- };
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &google, &bing, &yahoo_in,
-+    &google, &duckduckgo, &bing, &yahoo_in,
- };
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &google, &virgilio, &bing,
-+    &google, &duckduckgo, &virgilio, &bing,
- };
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &google, &yahoo_jp, &bing,
-+    &google, &duckduckgo, &yahoo_jp, &bing,
- };
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &google, &naver, &daum,
-+    &google, &duckduckgo, &naver, &daum,
- };
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &google, &mail_ru, &yandex_kz,
-+    &google, &duckduckgo, &mail_ru, &yandex_kz,
- };
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
- };
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &google, &bing, &yandex_ru,
-+    &google, &duckduckgo, &bing, &yandex_ru,
- };
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
- };
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &google, &yandex_ru, &bing,
-+    &google, &duckduckgo, &yandex_ru, &bing,
- };
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &google, &yahoo_fr, &bing,
-+    &google, &duckduckgo, &yahoo_fr, &bing,
- };
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &google, &bing, &yahoo_mx,
-+    &google, &duckduckgo, &bing, &yahoo_mx,
- };
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
- };
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &google, &yahoo_nl, &vinden,
-+    &google, &duckduckgo, &yahoo_nl, &vinden,
- };
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &google, &bing, &kvasir,
-+    &google, &duckduckgo, &bing, &kvasir,
- };
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &google, &bing, &yahoo_nz,
-+    &google, &duckduckgo, &bing, &yahoo_nz,
- };
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &google, &bing, &yahoo_pe,
-+    &google, &duckduckgo, &bing, &yahoo_pe,
- };
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &google, &yahoo_ph, &bing,
-+    &google, &duckduckgo, &yahoo_ph, &bing,
- };
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &google, &onet, &bing,
-+    &google, &duckduckgo, &onet, &bing,
- };
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &google, &yahoo_ro, &bing,
-+    &google, &duckduckgo, &yahoo_ro, &bing,
- };
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &google, &yandex_ru, &mail_ru,
-+    &google, &duckduckgo, &yandex_ru, &mail_ru,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
- };
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &google, &bing, &yahoo_se,
-+    &google, &duckduckgo, &bing, &yahoo_se,
- };
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &google, &yahoo_sg, &bing,
-+    &google, &duckduckgo, &yahoo_sg, &bing,
- };
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &google, &najdi, &ask,
-+    &google, &duckduckgo, &najdi, &ask,
- };
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &google, &yahoo_th, &bing,
-+    &google, &duckduckgo, &yahoo_th, &bing,
- };
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &google, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
- };
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &google, &yahoo_tw, &bing,
-+    &google, &duckduckgo, &yahoo_tw, &bing,
- };
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
- };
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &google, &yandex_ua, &bing,
-+    &google, &duckduckgo, &yandex_ua, &bing,
- };
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &google, &bing, &yahoo, &aol, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
- };
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &google, &bing, &yahoo_ve,
-+    &google, &duckduckgo, &bing, &yahoo_ve,
- };
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &google, &yahoo_vn, &bing,
-+    &google, &duckduckgo, &yahoo_vn, &bing,
- };
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
- };
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
- };
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &google, &bing, &yahoo, &ask,
-+    &google, &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, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &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,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,67 +0,0 @@
-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
-
-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") {
-     "events/TreeScopeEventContext.h",
-     "events/WindowEventContext.cpp",
-     "events/WindowEventContext.h",
-+    "extensions/dont-track-me.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 @@
- #include "core/xml/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
-+#include "extensions/dont-track-me.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
-  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  const SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "Bromite: injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
-+      e->setText(DONT_TRACK_ME_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-new file mode 100644
--- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-@@ -0,0 +1,6 @@
-+#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/**\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
@@ -1,25 +0,0 @@
-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
-
-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,
- 
- }  // namespace
- 
-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 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;
@@ -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,21 +0,0 @@
-commit 0e91bb1894cc0b7a9f2ddb8d3a8dd0cdc609910a
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:47:49 2017 +0200
-
-    Disable the ad promo system by default
-    author: Michael Gilbert <mgilbert@debian.org>
-    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);
-+  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
- }
- 
- // static
@@ -1,34 +0,0 @@
-commit 232645939b9739109cfadd92755375dd775b4768
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:22:05 2017 +0200
-
-    [PATCH 45/60] promo: disable Google promotion fetching
-    From: Jan Engelhardt <jengelh@inai.de>
-    Date: Sun, 9 Nov 2014 01:54:27 +0100
-    
-    Documentation is scarce, and sprinkled with misleading acronyms.
-    NTP is not NTP, for example. FWIW:
-    
-    // A PromoResourceService fetches data from a web resource server to
-    // be used to dynamically change the appearance of the New Tab Page.
-    // For example, it has been used to fetch "tips" to be displayed on
-    // the NTP, or to display promotional messages to certain groups of
-    // Chrome users.
-    
-    Whatever it is that it downloads, deactivate the one that leads to
-    Google.
-    
-    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 {
- 
- bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
-   DCHECK(profile);
-+  return false;
- 
-   // Don't show if the profile is an incognito.
-   if (profile->IsOffTheRecord())
@@ -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	3b1875efed	Release 67.0.3396.88	2018-06-15 11:26:26 +02:00
csagan5	acba336f2e	Add links for all related projects/credits	2018-06-12 14:04:27 +02:00
csagan5	61b6f9ee1d	Align with home page	2018-06-11 21:27:04 +02:00
csagan5	210a14d7ed	Release 67.0.3396.82	2018-06-11 18:55:40 +02:00
csagan5	91cc88eb37	Updated changelog	2018-06-09 11:12:45 +02:00
csagan5	4fc10e560b	Release 67.0.3396.76	2018-06-08 23:59:52 +02:00
CarlandGitHub	01ecc5d52f	Add link to Patreon	2018-06-04 20:53:49 +02:00
csagan5	7edcab0232	Add missing patch	2018-06-04 20:46:26 +02:00
csagan5	b4ada5bd99	Release 67.0.3396.72	2018-06-04 20:45:57 +02:00
csagan5	cfa7aca62a	Add missing patch	2018-06-01 15:59:14 +02:00
csagan5	9eca1ff0b3	Release 67.0.3396.67	2018-06-01 15:58:52 +02:00
csagan5	aac51e0a5a	Release 66.0.3359.202	2018-05-29 20:52:06 +02:00
csagan5	ea53ed1889	Release 66.0.3359.200	2018-05-26 11:13:29 +02:00
csagan5	780bb60137	Release 66.0.3359.196	2018-05-24 09:59:15 +02:00
csagan5	0fd859a0a6	Two new patches	2018-05-20 22:07:39 +02:00
csagan5	03645239a9	Release 66.0.3359.188	2018-05-20 22:07:14 +02:00
csagan5	ec5be6c048	Release 66.0.3359.161	2018-05-08 21:51:11 +02:00
csagan5	67651fbd75	Do not use special release svg	2018-05-05 20:12:38 +02:00
csagan5	6b758bfe0c	Added patches for previous release	2018-05-05 20:11:18 +02:00
csagan5	49ae827092	Release 66.0.3359.148	2018-05-05 00:51:00 +02:00
csagan5	01ad976b53	Release 65.0.3325.230	2018-04-21 22:39:52 +02:00
csagan5	38a672a1ca	Updated CHANGELOG	2018-04-12 09:47:34 +02:00
csagan5	a723e0e77d	Release 65.0.3325.218	2018-04-12 09:38:58 +02:00
CarlandGitHub	3abb1ad2a3	Mention anti-fingerprinting mitigations	2018-04-05 10:54:31 +02:00
csagan5	d7e8ac9d86	Add latest AdBlock filters	2018-04-01 12:05:30 +02:00
csagan5	284c419d01	Release 65.0.3325.204	2018-04-01 11:43:20 +02:00
csagan5	2dca759091	Publish patches for next release	2018-04-01 11:29:50 +02:00
csagan5	11cebfadc5	Release 65.0.3325.198	2018-03-29 09:20:10 +02:00
csagan5	e4e56ed69c	Updated README, added Goals	2018-03-28 18:12:04 +02:00
CarlandGitHub	7dcc27cb5e	Mention SystemWebView	2018-03-28 01:43:32 +02:00
csagan5	8b494263c3	Release 65.0.3325.190	2018-03-26 09:25:48 +02:00
csagan5	4029e8843d	Further improvements for fingerprinting mitigations	2018-03-26 00:07:08 +02:00
csagan5	85a9737c16	Adblock update	2018-03-24 16:04:45 +01:00
csagan5	247247a8ae	Properly format commit messages of the patches Add patch for canvas fingerprinting disable	2018-03-24 14:26:47 +01:00
csagan5	4bfb168982	Add F.A.Q. about root	2018-03-24 07:19:48 +01:00
csagan5	1652ef39b1	Updated README	2018-03-24 05:05:57 +01:00
csagan5	190ee08724	Mention Qwant	2018-03-24 05:04:34 +01:00
csagan5	367a2521a0	Patch to block battery API Patch to block plugins enumeration	2018-03-24 04:32:56 +01:00
csagan5	6b1cbc612a	Patches ready for 65.0.3325.176	2018-03-24 04:32:56 +01:00
CarlandGitHub	d0f89298b8	Add another F.A.Q.	2018-03-20 21:55:55 +01:00
csagan5	9adbcaf262	Add F.A.Q. about HTTPS everywhere	2018-03-19 00:45:49 +01:00
csagan5	ef067cd35d	Move F.A.Q. up	2018-03-18 23:44:13 +01:00
csagan5	e08ef39d4e	Put images on same line	2018-03-18 23:35:50 +01:00
csagan5	33f1df4d26	Fix download images URL	2018-03-18 23:35:26 +01:00
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