Release 65.0.3325.198

Add patch for canvas fingerprinting disable

CHANGELOG.md

@@ -1,3 +1,52 @@
+# 65.0.3325.198
+* re-landed support of third-party filters
+* completed patches cleanup
+* updated AdBlock filters
+
+# 65.0.3325.190
+* block some Canvas and AudioBuffer APIs mostly used for fingerprinting
+* 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

README.md

@@ -10,6 +10,13 @@ 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.
@@ -22,31 +29,52 @@ 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
+* allow videos to play in background
+* [StartPage](https://startpage.com/) search engine
+* [DuckDuckGo](https://duckduckgo.com/) search engine
+* [Qwant](https://www.qwant.com/) search engine
+* Google search engine English-only with reduced tracking
+* privacy enhancement patches from Inox patchset, ungoogled-chromium and Iridium projects
+* anti-fingerprinting mitigations
+* all codecs included (proprietary, open H.264 etc.)
+* built with official optimizations
+
 # 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 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.
 
@@ -57,7 +85,7 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 * [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)
 * nochromo for the original adblock patch
-* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the compilation of original adblock patch
+* AdBlock Plus, uBlock, EasyList and EasyPrivacy for the filters included
 
 # License
 

patches/BRM000_Disable-the-ad-promo-system-by-default.patch

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Oct 2017 22:47:49 +0200
+Subject: Disable the ad promo system by default
+
+author: Michael Gilbert <mgilbert@debian.org>
+bug-debian: http://bugs.debian.org/634101
+---
+ chrome/browser/ui/app_list/app_list_service.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/chrome/browser/ui/app_list/app_list_service.cc b/chrome/browser/ui/app_list/app_list_service.cc
+--- a/chrome/browser/ui/app_list/app_list_service.cc
++++ b/chrome/browser/ui/app_list/app_list_service.cc
+@@ -142,6 +142,10 @@ void AppListService::RegisterPrefs(PrefRegistrySimple* registry) {
+   registry->RegisterIntegerPref(prefs::kAppListEnableMethod,
+                                 ENABLE_NOT_RECORDED);
+   registry->RegisterInt64Pref(prefs::kAppListEnableTime, 0);
++
++  // Identifies whether we should show the app launcher promo or not. This
++  // becomes false when the user dismisses the promo.
++  registry->RegisterBooleanPref(prefs::kShowAppLauncherPromo, false);
+ }
+ 
+ // static
+-- 
+2.7.4
+

patches/BRM001_Disable-third-party-cookies-by-default.patch

@@ -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(
+@@ -88,7 +88,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
+

patches/BRM002_Restore-classic-new-tab-page.patch

@@ -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
+

patches/BRM003_Disable-battery-status-service.patch

@@ -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
+

patches/BRM004_Disable-GCM-status-check.patch

@@ -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
+

patches/BRM005_Disable-updater-pings.patch

@@ -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";
@@ -53,7 +55,6 @@ index efc46c5..2bb49f36 100644
  }
  
 diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
-index afc3d2d..5258e47 100644
 --- a/components/component_updater/configurator_impl.h
 +++ b/components/component_updater/configurator_impl.h
 @@ -98,7 +98,6 @@ class ConfiguratorImpl {
@@ -64,3 +65,6 @@ index afc3d2d..5258e47 100644
  
    DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
  };
+-- 
+2.7.4
+

patches/BRM006_prefs-only-keep-cookies-until-exit.patch

@@ -1,15 +1,15 @@
-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() {
@@ -21,3 +21,6 @@ index fe84151..f303447 100644
             WebsiteSettingsInfo::SYNCABLE,
             WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
+-- 
+2.7.4
+

patches/BRM007_Remove-EV-certificates.patch

@@ -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 {
@@ -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
+

patches/BRM008_promo-disable-Google-promotion-fetching.patch

@@ -0,0 +1,37 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+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
+
+author: Jan Engelhardt <jengelh@inai.de>
+---
+ 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
+

patches/BRM009_Disables-omission-of-URL-elements-in-Omnibox.patch

@@ -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
+

patches/BRM010_Modify-default-preferences.patch

@@ -1,11 +1,27 @@
-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) {
@@ -18,10 +34,9 @@ index 6b66f9e..ac44881 100644
  
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index a96f159e..7f7e9cf 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -877,7 +877,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -858,7 +858,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -31,10 +46,9 @@ index a96f159e..7f7e9cf 100644
  }
  
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
-index e6ccce4..1e37c2b 100644
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -612,7 +612,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -620,7 +620,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                 std::string());
    registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
    data_reduction_proxy::RegisterPrefs(registry);
@@ -44,7 +58,6 @@ index e6ccce4..1e37c2b 100644
    registry->RegisterBooleanPref(prefs::kPacHttpsUrlStrippingEnabled, true);
  #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
-index 8ab8a07..967bf2f 100644
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
 @@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
@@ -57,7 +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 @@
@@ -96,10 +106,9 @@ index b46a992..9d353d9 100644
        </div>
      </dialog>
 diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
-index 0f4bdb3..77e4810 100644
 --- a/chrome/browser/signin/signin_promo.cc
 +++ b/chrome/browser/signin/signin_promo.cc
-@@ -371,8 +371,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
+@@ -391,8 +391,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
  void RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
@@ -111,7 +120,6 @@ index 0f4bdb3..77e4810 100644
  }
  
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index bcd4d0e..2302f0f 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
 @@ -59,11 +59,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -129,7 +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,10 +149,9 @@ 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(
+@@ -144,10 +144,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kLocalDiscoveryNotificationsEnabled,
@@ -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(
+@@ -216,7 +216,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) {
+@@ -334,9 +334,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(
@@ -218,7 +220,6 @@ index a05123f..4b8b05cb 100644
    registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,
                                  false);
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
-index b8da726..b9ca9b0 100644
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
 @@ -344,14 +344,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
@@ -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
+

patches/BRM011_Do-not-store-passwords-by-default.patch

@@ -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(
+@@ -236,10 +236,10 @@ PasswordFormManager* FindMatchedManager(
  void PasswordManager::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
@@ -21,3 +22,6 @@ index bbb0c20..cf171c0 100644
        user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
    registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
    registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+-- 
+2.7.4
+

patches/BRM012_Disable-NTP-remote-suggestions-by-default.patch

@@ -1,14 +1,15 @@
-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[] = {
+@@ -37,16 +37,16 @@ const base::Feature* const kAllFeatures[] = {
      nullptr};
  
  const base::Feature kArticleSuggestionsFeature{
@@ -28,3 +29,6 @@ index 31823bbc..82eefe3 100644
  
  const base::Feature kPhysicalWebPageSuggestionsFeature{
      "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.7.4
+

patches/BRM013_Disable-references-to-fonts.googleapis.com.patch

@@ -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
+

patches/BRM014_Disable-WebRTC-by-default.patch

@@ -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) {
+@@ -78,10 +78,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
+

patches/BRM015_Disable-data-saver.patch

@@ -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
+

patches/BRM016_Skip-the-first-run-and-metrics.patch

@@ -0,0 +1,96 @@
+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        | 11 +++++------
+ .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
+ .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
+ 3 files changed, 17 insertions(+), 28 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,12 +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.isInitialized()
+-                && CommandLine.getInstance().hasSwitch(
+-                           ChromeSwitches.FORCE_FIRST_RUN_FLOW_COMPLETE_FOR_TESTING);
++        return true;
+     }
+ 
+     /**
+@@ -77,4 +76,4 @@ public class FirstRunStatus {
+         return ContextUtils.getAppSharedPreferences().getBoolean(
+                 LIGHTWEIGHT_FIRST_RUN_FLOW_COMPLETE, false);
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+@@ -30,16 +30,12 @@ public class FirstRunUtils {
+         //   - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
+         boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
+         boolean nativePrefValue = prefsBridge.isFirstRunEulaAccepted();
+-        boolean userHasSeenTos =
+-                ToSAckedReceiver.checkAnyUserHasSeenToS();
+-        boolean isFirstRunComplete = FirstRunStatus.getFirstRunFlowComplete();
+-        if (javaPrefValue || nativePrefValue || userHasSeenTos || isFirstRunComplete) {
+-            if (!javaPrefValue) {
+-                javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
+-            }
+-            if (!nativePrefValue) {
+-                prefsBridge.setEulaAccepted();
+-            }
++
++        if (!javaPrefValue) {
++            javaPrefs.edit().putBoolean(CACHED_TOS_ACCEPTED_PREF, true).apply();
++        }
++        if (!nativePrefValue) {
++            prefsBridge.setEulaAccepted();
+         }
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+@@ -73,20 +73,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
+

patches/BRM017_Disable-Omaha-update-checks.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 23:11:56 +0100
+Subject: Disable Omaha update checks
+
+---
+ .../android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+@@ -122,7 +122,7 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
++        return true;
+     }
+ 
+     /**
+-- 
+2.7.4
+

patches/BRM018_Add-DuckDuckGo-search-engine.patch

@@ -1,20 +1,17 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 11:06:18 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 11:06:18 +0200
+Subject: Add DuckDuckGo search engine
 
-    Add DuckDuckGo search engine, not enabled by default
+---
+ .../search_engines/prepopulated_engines.json       |  19 ++
+ components/search_engines/search_engine_type.h     |   2 +
+ .../template_url_prepopulate_data.cc               | 218 ++++++++++-----------
+ 3 files changed, 130 insertions(+), 109 deletions(-)
 
 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
-   },
- 
+@@ -38,6 +38,25 @@
    // 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": {
@@ -23,685 +20,696 @@ index 002b6c0..7b4155b 100644
 +      "keyword": "duckduckgo.com",
 +      "favicon_url": "https://duckduckgo.com/favicon.ico",
 +      "search_url": "https://duckduckgo.com/?q={searchTerms}",
-+      "new_tab_url": "https://duckduckgo.com/",
++      "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list",
 +      "type": "SEARCH_ENGINE_DUCKDUCKGO",
 +      "id": 11
 +    },
++
++    "duckduckgo_light": {
++      "name": "DuckDuckGo Light",
++      "keyword": "duckduckgo.com/lite",
++      "favicon_url": "https://duckduckgo.com/favicon.ico",
++      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
++      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
++      "id": 12
++    },
 +
      "aol": {
        "name": "AOL",
        "keyword": "aol.com",
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index c19dd0e..02f6b16 100644
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -63,6 +63,7 @@ enum SearchEngineType {
+@@ -63,6 +63,8 @@ enum SearchEngineType {
    SEARCH_ENGINE_YANDEX,
    SEARCH_ENGINE_ZOZNAM,
    SEARCH_ENGINE_360,
 +  SEARCH_ENGINE_DUCKDUCKGO,
++  SEARCH_ENGINE_DUCKDUCKGOLIGHT,
    SEARCH_ENGINE_MAX          // Bounding value needed for UMA histogram macro.
  };
  
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
-index 6be17ee..ef50529 100644
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -50,548 +50,548 @@ namespace {
+@@ -51,548 +51,548 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // United Arab Emirates
  const PrepopulatedEngine* const engines_AE[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Albania
  const PrepopulatedEngine* const engines_AL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Argentina
  const PrepopulatedEngine* const engines_AR[] = {
 -    &google, &bing, &yahoo_ar,
-+    &google, &duckduckgo, &bing, &yahoo_ar,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ar,
  };
  
  // Austria
  const PrepopulatedEngine* const engines_AT[] = {
 -    &google, &bing, &yahoo_at,
-+    &google, &duckduckgo, &bing, &yahoo_at,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_at,
  };
  
  // Australia
  const PrepopulatedEngine* const engines_AU[] = {
 -    &google, &bing, &yahoo_au,
-+    &google, &duckduckgo, &bing, &yahoo_au,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_au,
  };
  
  // Bosnia and Herzegovina
  const PrepopulatedEngine* const engines_BA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Belgium
  const PrepopulatedEngine* const engines_BE[] = {
 -    &google, &bing, &yahoo, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo, &yahoo_fr,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &yahoo_fr,
  };
  
  // Bulgaria
  const PrepopulatedEngine* const engines_BG[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
  };
  
  // Bahrain
  const PrepopulatedEngine* const engines_BH[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Burundi
  const PrepopulatedEngine* const engines_BI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Brunei
  const PrepopulatedEngine* const engines_BN[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
  };
  
  // Bolivia
  const PrepopulatedEngine* const engines_BO[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Brazil
  const PrepopulatedEngine* const engines_BR[] = {
 -    &google, &ask_br, &bing, &yahoo_br,
-+    &google, &duckduckgo, &ask_br, &bing, &yahoo_br,
++    &google, &duckduckgo, &duckduckgo_light, &ask_br, &bing, &yahoo_br,
  };
  
  // Belarus
  const PrepopulatedEngine* const engines_BY[] = {
 -    &google, &yandex_by, &mail_ru,
-+    &google, &duckduckgo, &yandex_by, &mail_ru,
++    &google, &duckduckgo, &duckduckgo_light, &yandex_by, &mail_ru,
  };
  
  // Belize
  const PrepopulatedEngine* const engines_BZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Canada
  const PrepopulatedEngine* const engines_CA[] = {
 -    &google, &bing, &ask, &yahoo_ca, &yahoo_qc,
-+    &google, &duckduckgo, &bing, &ask, &yahoo_ca, &yahoo_qc,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &ask, &yahoo_ca, &yahoo_qc,
  };
  
  // Switzerland
  const PrepopulatedEngine* const engines_CH[] = {
 -    &google, &bing, &yahoo_ch,
-+    &google, &duckduckgo, &bing, &yahoo_ch,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ch,
  };
  
  // Chile
  const PrepopulatedEngine* const engines_CL[] = {
 -    &google, &bing, &yahoo_cl,
-+    &google, &duckduckgo, &bing, &yahoo_cl,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_cl,
  };
  
  // China
  const PrepopulatedEngine* const engines_CN[] = {
 -    &google, &baidu, &sogou, &so_360,
-+    &google, &duckduckgo, &baidu, &sogou, &so_360,
++    &google, &duckduckgo, &duckduckgo_light, &baidu, &sogou, &so_360,
  };
  
  // Colombia
  const PrepopulatedEngine* const engines_CO[] = {
 -    &google, &bing, &yahoo_co,
-+    &google, &duckduckgo, &bing, &yahoo_co,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_co,
  };
  
  // Costa Rica
  const PrepopulatedEngine* const engines_CR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Czech Republic
  const PrepopulatedEngine* const engines_CZ[] = {
 -    &google, &seznam, &bing,
-+    &google, &duckduckgo, &seznam, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &seznam, &bing,
  };
  
  // Germany
  const PrepopulatedEngine* const engines_DE[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
  };
  
  // Denmark
  const PrepopulatedEngine* const engines_DK[] = {
 -    &google, &bing, &yahoo_dk,
-+    &google, &duckduckgo, &bing, &yahoo_dk,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_dk,
  };
  
  // Dominican Republic
  const PrepopulatedEngine* const engines_DO[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // Ecuador
  const PrepopulatedEngine* const engines_EC[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Estonia
  const PrepopulatedEngine* const engines_EE[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Spain
  const PrepopulatedEngine* const engines_ES[] = {
 -    &google, &bing, &yahoo_es,
-+    &google, &duckduckgo, &bing, &yahoo_es,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_es,
  };
  
  // Faroe Islands
  const PrepopulatedEngine* const engines_FO[] = {
 -    &google, &bing, &ask,
-+    &google, &duckduckgo, &bing, &ask,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &ask,
  };
  
  // Finland
  const PrepopulatedEngine* const engines_FI[] = {
 -    &google, &bing, &yahoo_fi,
-+    &google, &duckduckgo, &bing, &yahoo_fi,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fi,
  };
  
  // France
  const PrepopulatedEngine* const engines_FR[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
  };
  
  // United Kingdom
  const PrepopulatedEngine* const engines_GB[] = {
 -    &google, &bing, &yahoo_uk, &ask_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk, &ask_uk,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk, &ask_uk,
  };
  
  // Greece
  const PrepopulatedEngine* const engines_GR[] = {
 -    &google, &bing, &yahoo_gr,
-+    &google, &duckduckgo, &bing, &yahoo_gr,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_gr,
  };
  
  // Guatemala
  const PrepopulatedEngine* const engines_GT[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Hong Kong
  const PrepopulatedEngine* const engines_HK[] = {
 -    &google, &yahoo_hk, &baidu, &bing,
-+    &google, &duckduckgo, &yahoo_hk, &baidu, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_hk, &baidu, &bing,
  };
  
  // Honduras
  const PrepopulatedEngine* const engines_HN[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Croatia
  const PrepopulatedEngine* const engines_HR[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Hungary
  const PrepopulatedEngine* const engines_HU[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Indonesia
  const PrepopulatedEngine* const engines_ID[] = {
 -    &google, &yahoo_id, &bing,
-+    &google, &duckduckgo, &yahoo_id, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_id, &bing,
  };
  
  // Ireland
  const PrepopulatedEngine* const engines_IE[] = {
 -    &google, &bing, &yahoo_uk,
-+    &google, &duckduckgo, &bing, &yahoo_uk,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_uk,
  };
  
  // Israel
  const PrepopulatedEngine* const engines_IL[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // India
  const PrepopulatedEngine* const engines_IN[] = {
 -    &google, &bing, &yahoo_in,
-+    &google, &duckduckgo, &bing, &yahoo_in,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_in,
  };
  
  // Iraq
  const PrepopulatedEngine* const engines_IQ[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
 -    &google, &virgilio, &bing,
-+    &google, &duckduckgo, &virgilio, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &virgilio, &bing,
  };
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
 -    &google, &yahoo_jp, &bing,
-+    &google, &duckduckgo, &yahoo_jp, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_jp, &bing,
  };
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
 -    &google, &naver, &daum,
-+    &google, &duckduckgo, &naver, &daum,
++    &google, &duckduckgo, &duckduckgo_light, &naver, &daum,
  };
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
 -    &google, &mail_ru, &yandex_kz,
-+    &google, &duckduckgo, &mail_ru, &yandex_kz,
++    &google, &duckduckgo, &duckduckgo_light, &mail_ru, &yandex_kz,
  };
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
 -    &google, &bing, &yahoo_de,
-+    &google, &duckduckgo, &bing, &yahoo_de,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_de,
  };
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
 -    &google, &bing, &yandex_ru,
-+    &google, &duckduckgo, &bing, &yandex_ru,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yandex_ru,
  };
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
 -    &google, &bing, &yahoo_fr,
-+    &google, &duckduckgo, &bing, &yahoo_fr,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_fr,
  };
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
 -    &google, &yandex_ru, &bing,
-+    &google, &duckduckgo, &yandex_ru, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &bing,
  };
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
 -    &google, &yahoo_fr, &bing,
-+    &google, &duckduckgo, &yahoo_fr, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_fr, &bing,
  };
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
 -    &google, &bing, &yahoo_mx,
-+    &google, &duckduckgo, &bing, &yahoo_mx,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_mx,
  };
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
 -    &google, &yahoo_my, &bing,
-+    &google, &duckduckgo, &yahoo_my, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_my, &bing,
  };
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
 -    &google, &yahoo_nl, &vinden,
-+    &google, &duckduckgo, &yahoo_nl, &vinden,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_nl, &vinden,
  };
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
 -    &google, &bing, &kvasir,
-+    &google, &duckduckgo, &bing, &kvasir,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &kvasir,
  };
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
 -    &google, &bing, &yahoo_nz,
-+    &google, &duckduckgo, &bing, &yahoo_nz,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_nz,
  };
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
 -    &google, &bing, &yahoo_pe,
-+    &google, &duckduckgo, &bing, &yahoo_pe,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_pe,
  };
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
 -    &google, &yahoo_ph, &bing,
-+    &google, &duckduckgo, &yahoo_ph, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_ph, &bing,
  };
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
 -    &google, &onet, &bing,
-+    &google, &duckduckgo, &onet, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &onet, &bing,
  };
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
 -    &google, &yahoo_ro, &bing,
-+    &google, &duckduckgo, &yahoo_ro, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_ro, &bing,
  };
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
 -    &google, &yandex_ru, &mail_ru,
-+    &google, &duckduckgo, &yandex_ru, &mail_ru,
++    &google, &duckduckgo, &duckduckgo_light, &yandex_ru, &mail_ru,
  };
  
  // Rwanda
  const PrepopulatedEngine* const engines_RW[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
 -    &google, &yahoo_maktoob, &bing,
-+    &google, &duckduckgo, &yahoo_maktoob, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_maktoob, &bing,
  };
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
 -    &google, &bing, &yahoo_se,
-+    &google, &duckduckgo, &bing, &yahoo_se,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_se,
  };
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
 -    &google, &yahoo_sg, &bing,
-+    &google, &duckduckgo, &yahoo_sg, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_sg, &bing,
  };
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
 -    &google, &najdi, &ask,
-+    &google, &duckduckgo, &najdi, &ask,
++    &google, &duckduckgo, &duckduckgo_light, &najdi, &ask,
  };
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
 -    &google, &yahoo_th, &bing,
-+    &google, &duckduckgo, &yahoo_th, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_th, &bing,
  };
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
 -    &google, &bing, &yahoo_tr, &yandex_tr,
-+    &google, &duckduckgo, &bing, &yahoo_tr, &yandex_tr,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_tr, &yandex_tr,
  };
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
 -    &google, &yahoo_tw, &bing,
-+    &google, &duckduckgo, &yahoo_tw, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_tw, &bing,
  };
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
 -    &google, &yahoo, &bing,
-+    &google, &duckduckgo, &yahoo, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo, &bing,
  };
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
 -    &google, &yandex_ua, &bing,
-+    &google, &duckduckgo, &yandex_ua, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yandex_ua, &bing,
  };
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
 -    &google, &bing, &yahoo, &aol, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &aol, &ask,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &aol, &ask,
  };
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
 -    &google, &bing, &yahoo_ve,
-+    &google, &duckduckgo, &bing, &yahoo_ve,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_ve,
  };
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
 -    &google, &yahoo_vn, &bing,
-+    &google, &duckduckgo, &yahoo_vn, &bing,
++    &google, &duckduckgo, &duckduckgo_light, &yahoo_vn, &bing,
  };
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
 -    &google, &bing, &yahoo_maktoob,
-+    &google, &duckduckgo, &bing, &yahoo_maktoob,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo_maktoob,
  };
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
 -    &google, &bing, &yahoo,
-+    &google, &duckduckgo, &bing, &yahoo,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo,
  };
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {
 -    &google, &bing, &yahoo, &ask,
-+    &google, &duckduckgo, &bing, &yahoo, &ask,
++    &google, &duckduckgo, &duckduckgo_light, &bing, &yahoo, &ask,
  };
  
  // A list of all the engines that we know about.
  const PrepopulatedEngine* const kAllEngines[] = {
      // Prepopulated engines:
 -    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &kvasir,
-+    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &kvasir,
++    &aol, &ask, &ask_br, &ask_uk, &baidu, &bing, &daum, &google, &duckduckgo, &duckduckgo_light, &kvasir,
      &mail_ru, &najdi, &naver, &onet, &seznam, &sogou, &vinden, &virgilio,
      &yahoo, &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
      &yahoo_cl, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, &yahoo_fi, &yahoo_fr,
+-- 
+2.7.4
+

patches/BRM019_Add-StartPage-search-engine.patch

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

patches/BRM020_Added-Google-English-only-engine.patch

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

patches/BRM021_Add-Qwant-search-engine.patch

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

patches/BRM022_Fix-crash-when-accessing-page-info-site-settings.patch

@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 20 Jan 2018 19:44:43 +0100
+Subject: Fix crash when accessing page info / site settings
+
+---
+ chrome/browser/permissions/permission_manager.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
+--- a/chrome/browser/permissions/permission_manager.cc
++++ b/chrome/browser/permissions/permission_manager.cc
+@@ -601,6 +601,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+     const GURL& embedding_origin) {
+   GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin);
+   PermissionContextBase* context = GetPermissionContext(permission);
++  if (context == nullptr) {
++      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
++  }
+   PermissionResult result = context->GetPermissionStatus(
+       render_frame_host, canonical_requesting_origin.GetOrigin(),
+       embedding_origin.GetOrigin());
+-- 
+2.7.4
+

patches/BRM023_openH264-enable-ARM-ARM64-optimizations.patch

@@ -0,0 +1,109 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 20 Jan 2018 21:17:27 +0100
+Subject: openH264: enable ARM/ARM64 optimizations
+
+Enable the optimizations not only for ChromeOS but for all compatbile ARM/ARM64 architectures
+Limit threads auto-detect only for iOS
+---
+ content/renderer/media_recorder/h264_encoder.cc |  6 ++--
+ third_party/openh264/BUILD.gn                   | 39 +++++++++++++++++++++++++
+ 2 files changed, 42 insertions(+), 3 deletions(-)
+
+diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
+--- a/content/renderer/media_recorder/h264_encoder.cc
++++ b/content/renderer/media_recorder/h264_encoder.cc
+@@ -146,11 +146,11 @@ void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
+     init_params.iRCMode = RC_OFF_MODE;
+   }
+ 
+-#if defined(OS_CHROMEOS)
+-  init_params.iMultipleThreadIdc = 0;
+-#else
++#if defined(OS_MACOSX)
+   // Threading model: Set to 1 due to https://crbug.com/583348.
+   init_params.iMultipleThreadIdc = 1;
++#else
++  init_params.iMultipleThreadIdc = 0;
+ #endif
+ 
+   // TODO(mcasas): consider reducing complexity if there are few CPUs available.
+diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
+--- a/third_party/openh264/BUILD.gn
++++ b/third_party/openh264/BUILD.gn
+@@ -10,6 +10,7 @@ import("//third_party/yasm/yasm_assemble.gni")
+ # Config shared by all openh264 targets.
+ config("config") {
+   cflags = []
++  defines = []
+ 
+   if (is_chromeos && target_cpu == "arm") {
+     # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
+@@ -20,6 +21,20 @@ config("config") {
+     ]
+   }
+ 
++  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
++  # devices.
++  if (is_chromeos && target_cpu == "arm") {
++    defines += [
++      "__chromeos__",
++    ]
++  }
++
++  if (target_cpu == "arm" || target_cpu == "arm64") {
++    defines += [
++      "HAVE_NEON",
++    ]
++  }
++
+   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
+   if (!is_win || is_clang) {
+     cflags += [
+@@ -128,6 +143,14 @@ source_set("common") {
+   }
+   include_dirs = openh264_common_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -154,6 +177,14 @@ source_set("processing") {
+   }
+   include_dirs = openh264_processing_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+@@ -173,6 +204,14 @@ source_set("encoder") {
+   }
+   include_dirs = openh264_encoder_include_dirs
+ 
++  # enable ARM optimizations
++  if (target_cpu == "arm") {
++    sources += openh264_common_sources_asm_arm
++  }
++  if (target_cpu == "arm64") {
++    sources += openh264_common_sources_asm_arm64
++  }
++
+   configs -= [ "//build/config/compiler:chromium_code" ]
+   configs += [ "//build/config/compiler:no_chromium_code" ]
+   configs += [ ":config" ]
+-- 
+2.7.4
+

patches/BRM024_Cure-AMP-and-tracking-from-search-results.patch

@@ -1,34 +1,37 @@
-commit b944811d1324b0d16d4f40ff7420a3fe3c69fd52
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Oct 28 10:09:41 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Oct 2017 10:09:41 +0200
+Subject: Cure AMP and tracking from search results
 
-    Do not track google search results clicks, remove AMP
+---
+ third_party/WebKit/Source/core/dom/BUILD.gn           |  1 +
+ third_party/WebKit/Source/core/dom/Document.cpp       | 19 ++++++++++++++++++-
+ .../WebKit/Source/core/dom/extensions/anti_amp_cure.h |  6 ++++++
+ 3 files changed, 25 insertions(+), 1 deletion(-)
+ create mode 100644 third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
 
 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") {
+@@ -296,6 +296,7 @@ blink_core_sources("dom") {
      "events/TreeScopeEventContext.h",
      "events/WindowEventContext.cpp",
      "events/WindowEventContext.h",
 +    "extensions/dont-track-me.h",
+     "ng/flat_tree_traversal_ng.cc",
+     "ng/flat_tree_traversal_ng.h",
      "trustedtypes/TrustedHTML.cpp",
-     "trustedtypes/TrustedHTML.h",
-     "trustedtypes/TrustedScriptURL.cpp",
 diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
-index b53451c..ecfa473 100644
 --- a/third_party/WebKit/Source/core/dom/Document.cpp
 +++ b/third_party/WebKit/Source/core/dom/Document.cpp
-@@ -218,6 +218,7 @@
+@@ -220,6 +220,7 @@
  #include "core/xml/parser/XMLDocumentParser.h"
  #include "core/xml_names.h"
  #include "core/xmlns_names.h"
-+#include "extensions/dont-track-me.h"
++#include "extensions/anti_amp_cure.h"
  #include "platform/CrossThreadFunctional.h"
  #include "platform/DateComponents.h"
  #include "platform/EventDispatchForbiddenScope.h"
-@@ -5826,8 +5827,24 @@ void Document::FinishedParsing() {
+@@ -5858,8 +5859,24 @@ void Document::FinishedParsing() {
      fetcher_->ClearResourcesFromPreviousFetcher();
    }
  
@@ -45,23 +48,26 @@ index b53451c..ecfa473 100644
 +    size_t pos = domain.Find(".google.");
 +    auto* bodyElement = body();
 +    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "Bromite: injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, false);
-+      e->setText(DONT_TRACK_ME_JS);
++      LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
++      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
++      e->setText(ANTI_AMP_CURE_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
+diff --git a/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
 new file mode 100644
 --- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
++++ b/third_party/WebKit/Source/core/dom/extensions/anti_amp_cure.h
 @@ -0,0 +1,6 @@
-+#ifndef dont_track_me_h
-+#define dont_track_me_h
++#ifndef anti_amp_cure_h
++#define anti_amp_cure_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"
++#define ANTI_AMP_CURE_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
++#endif  // anti_amp_cure_h
+-- 
+2.7.4
+

patches/BRM025_Play-videos-in-background.patch

@@ -0,0 +1,79 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 18 Feb 2018 22:15:25 +0100
+Subject: Play videos in background
+
+Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
+Original Javascript code by timdream
+---
+ third_party/WebKit/Source/core/dom/BUILD.gn             |  1 +
+ third_party/WebKit/Source/core/dom/Document.cpp         | 17 +++++++++++++----
+ .../WebKit/Source/core/dom/extensions/video_bg_play.h   |  6 ++++++
+ 3 files changed, 20 insertions(+), 4 deletions(-)
+ create mode 100644 third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+
+diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
+--- a/third_party/WebKit/Source/core/dom/BUILD.gn
++++ b/third_party/WebKit/Source/core/dom/BUILD.gn
+@@ -297,6 +297,7 @@ blink_core_sources("dom") {
+     "events/WindowEventContext.cpp",
+     "events/WindowEventContext.h",
+     "extensions/dont-track-me.h",
++    "extensions/video-bg-play.h",
+     "ng/flat_tree_traversal_ng.cc",
+     "ng/flat_tree_traversal_ng.h",
+     "trustedtypes/TrustedHTML.cpp",
+diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
+--- a/third_party/WebKit/Source/core/dom/Document.cpp
++++ b/third_party/WebKit/Source/core/dom/Document.cpp
+@@ -221,6 +221,7 @@
+ #include "core/xml_names.h"
+ #include "core/xmlns_names.h"
+ #include "extensions/anti_amp_cure.h"
++#include "extensions/video_bg_play.h"
+ #include "platform/CrossThreadFunctional.h"
+ #include "platform/DateComponents.h"
+ #include "platform/EventDispatchForbiddenScope.h"
+@@ -5866,17 +5867,25 @@ void Document::FinishedParsing() {
+ 
+   // determine whether this is a Google search results page
+   const SecurityOrigin *origin = GetSecurityOrigin();
+-  if (origin) {
++  auto* bodyElement = body();
++  if (origin && bodyElement) {
+     WTF::String domain = origin->Domain();
+     size_t pos = domain.Find(".google.");
+-    auto* bodyElement = body();
+-    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
++    if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+       LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
+       HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
+       e->setText(ANTI_AMP_CURE_JS);
+       bodyElement->AppendChild(e);
+     }
+-  }
++
++    // check for eligibility of the video bg fix
++    if ((WTF::kNotFound != domain.Find("youtube.com")) || (WTF::kNotFound != domain.Find("vimeo.com"))) {
++      LOG(INFO) << "injecting video-bg-play Javascript payload";
++      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
++      e->setText(VIDEO_BG_PLAY_JS);
++      bodyElement->AppendChild(e);
++    }
++  } // has origin and body element
+ }
+ 
+ void Document::ElementDataCacheClearTimerFired(TimerBase*) {
+diff --git a/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+new file mode 100644
+--- /dev/null
++++ b/third_party/WebKit/Source/core/dom/extensions/video_bg_play.h
+@@ -0,0 +1,6 @@
++#ifndef video_bg_play_h
++#define video_bg_play_h
++
++#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
++
++#endif  // video_bg_play_h
+-- 
+2.7.4
+

patches/BRM026_Never-send-any-crash-upload-data.patch

@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:43:35 +0100
+Subject: Never send any crash upload data
+
+---
+ chrome/browser/tracing/crash_service_uploader.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
+--- a/chrome/browser/tracing/crash_service_uploader.cc
++++ b/chrome/browser/tracing/crash_service_uploader.cc
+@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
+     std::unique_ptr<const base::DictionaryValue> metadata,
+     const UploadProgressCallback& progress_callback,
+     const UploadDoneCallback& done_callback) {
++
++  return;
++
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ 
+   progress_callback_ = progress_callback;
+-- 
+2.7.4
+

patches/BRM027_Never-fetch-popular-sites.patch

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 14 Feb 2018 12:56:01 +0100
+Subject: Never fetch popular sites
+
+---
+ components/ntp_tiles/popular_sites_impl.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
+--- a/components/ntp_tiles/popular_sites_impl.cc
++++ b/components/ntp_tiles/popular_sites_impl.cc
+@@ -289,6 +289,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+   DCHECK(!callback_);
+   callback_ = callback;
+ 
++  if (force_download) {
++    callback_.Run(true);
++    return true;
++  }
++  return false;
++
+   const base::Time last_download_time = base::Time::FromInternalValue(
+       prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
+   const base::TimeDelta time_since_last_download =
+-- 
+2.7.4
+

patches/BRM028_ungoogled-chromium-Disable-signin.patch

@@ -0,0 +1,56 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:14:39 +0100
+Subject: ungoogled-chromium: Disable signin
+
+---
+ chrome/browser/ui/chrome_pages.cc                     | 8 ++------
+ components/signin/core/browser/signin_manager_base.cc | 2 +-
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
+--- a/chrome/browser/ui/chrome_pages.cc
++++ b/chrome/browser/ui/chrome_pages.cc
+@@ -76,12 +76,6 @@ void OpenBookmarkManagerForNode(Browser* browser, int64_t node_id) {
+   ShowSingletonTabOverwritingNTP(browser, params);
+ }
+ 
+-void NavigateToSingletonTab(Browser* browser, const GURL& url) {
+-  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
+-  params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
+-  ShowSingletonTabOverwritingNTP(browser, params);
+-}
+-
+ // Shows either the help app or the appropriate help page for |source|. If
+ // |browser| is NULL and the help page is used (vs the app), the help page is
+ // shown in the last active browser. If there is no such browser, a new browser
+@@ -386,6 +380,7 @@ void ShowSearchEngineSettings(Browser* browser) {
+ #if !defined(OS_ANDROID)
+ void ShowBrowserSignin(Browser* browser,
+                        signin_metrics::AccessPoint access_point) {
++#if 0
+   Profile* original_profile = browser->profile()->GetOriginalProfile();
+   SigninManagerBase* manager =
+       SigninManagerFactory::GetForProfile(original_profile);
+@@ -426,6 +421,7 @@ void ShowBrowserSignin(Browser* browser,
+             false));
+     DCHECK_GT(browser->tab_strip_model()->count(), 0);
+   }
++#endif 
+ }
+ 
+ void ShowBrowserSigninOrSettings(Browser* browser,
+diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/signin/core/browser/signin_manager_base.cc
+--- a/components/signin/core/browser/signin_manager_base.cc
++++ b/components/signin/core/browser/signin_manager_base.cc
+@@ -158,7 +158,7 @@ void SigninManagerBase::Initialize(PrefService* local_state) {
+ bool SigninManagerBase::IsInitialized() const { return initialized_; }
+ 
+ bool SigninManagerBase::IsSigninAllowed() const {
+-  return client_->GetPrefs()->GetBoolean(prefs::kSigninAllowed);
++  return false;
+ }
+ 
+ AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
+-- 
+2.7.4
+

patches/BRM029_ungoogled-chromium-Disable-webRTC-log-uploader.patch

@@ -0,0 +1,100 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:21:36 +0100
+Subject: ungoogled-chromium: Disable webRTC log uploader
+
+---
+ chrome/browser/media/webrtc/webrtc_log_uploader.cc | 62 ++--------------------
+ 1 file changed, 4 insertions(+), 58 deletions(-)
+
+diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
++++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+@@ -115,30 +115,10 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
+   DCHECK(meta_data.get());
+   DCHECK(!upload_done_data.log_path.empty());
+ 
+-  std::string compressed_log;
+-  CompressLog(&compressed_log, log_buffer.get());
+-
+-  std::string local_log_id;
+-
+   if (base::PathExists(upload_done_data.log_path)) {
+     WebRtcLogUtil::DeleteOldWebRtcLogFiles(upload_done_data.log_path);
+-
+-    local_log_id = base::NumberToString(base::Time::Now().ToDoubleT());
+-    base::FilePath log_file_path =
+-        upload_done_data.log_path.AppendASCII(local_log_id)
+-            .AddExtension(FILE_PATH_LITERAL(".gz"));
+-    WriteCompressedLogToFile(compressed_log, log_file_path);
+-
+-    base::FilePath log_list_path =
+-        WebRtcLogList::GetWebRtcLogListFileForDirectory(
+-            upload_done_data.log_path);
+-    AddLocallyStoredLogInfoToUploadListFile(log_list_path, local_log_id);
+   }
+-
+-  WebRtcLogUploadDoneData upload_done_data_with_log_id = upload_done_data;
+-  upload_done_data_with_log_id.local_log_id = local_log_id;
+-  PrepareMultipartPostData(compressed_log, std::move(meta_data),
+-                           upload_done_data_with_log_id);
++  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
+ }
+ 
+ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -149,6 +129,9 @@ void WebRtcLogUploader::PrepareMultipartPostData(
+   DCHECK(!compressed_log.empty());
+   DCHECK(meta_data.get());
+ 
++  NotifyUploadDone(net::HTTP_OK, "", upload_done_data);
++  return;
++
+   std::unique_ptr<std::string> post_data(new std::string());
+   SetupMultipart(post_data.get(),
+                  compressed_log,
+@@ -237,43 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
+ 
+   WebRtcLogUtil::DeleteOldWebRtcLogFiles(log_paths.log_path);
+ 
+-  base::FilePath log_list_path =
+-      WebRtcLogList::GetWebRtcLogListFileForDirectory(log_paths.log_path);
+-
+-  // Store the native log with a ".gz" extension.
+-  std::string compressed_log;
+-  CompressLog(&compressed_log, log_buffer.get());
+-  base::FilePath native_log_path = log_paths.log_path.AppendASCII(log_id)
+-      .AddExtension(FILE_PATH_LITERAL(".gz"));
+-  WriteCompressedLogToFile(compressed_log, native_log_path);
+-  AddLocallyStoredLogInfoToUploadListFile(log_list_path, log_id);
+-
+-  // Move the rtp dump files to the log directory with a name of
+-  // <log id>.rtp_[in|out].
+-  if (!log_paths.incoming_rtp_dump.empty()) {
+-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".rtp_in"));
+-    base::Move(log_paths.incoming_rtp_dump, rtp_path);
+-  }
+-
+-  if (!log_paths.outgoing_rtp_dump.empty()) {
+-    base::FilePath rtp_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".rtp_out"));
+-    base::Move(log_paths.outgoing_rtp_dump, rtp_path);
+-  }
+-
+-  if (meta_data.get() && !meta_data->empty()) {
+-    base::Pickle pickle;
+-    for (const auto& it : *meta_data.get()) {
+-      pickle.WriteString(it.first);
+-      pickle.WriteString(it.second);
+-    }
+-    base::FilePath meta_path = log_paths.log_path.AppendASCII(log_id)
+-        .AddExtension(FILE_PATH_LITERAL(".meta"));
+-    base::WriteFile(meta_path, static_cast<const char*>(pickle.data()),
+-        pickle.size());
+-  }
+-
+   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                           base::BindOnce(done_callback, true, ""));
+ 
+-- 
+2.7.4
+

patches/BRM030_ungoogled-chromium-Disable-untraceable-URLs.patch

@@ -0,0 +1,126 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:28:11 +0100
+Subject: ungoogled-chromium: Disable untraceable URLs
+
+Disable additional URLs that are not caught by the "trk" scheme
+---
+ chrome/browser/android/rlz/rlz_ping_handler.cc           | 2 +-
+ chrome/browser/plugins/plugins_resource_service.cc       | 2 +-
+ chrome/browser/safe_browsing/client_side_model_loader.cc | 6 ++----
+ chrome/browser/safe_browsing/client_side_model_loader.h  | 1 -
+ rlz/lib/financial_ping.cc                                | 4 ++--
+ rlz/lib/lib_values.cc                                    | 1 -
+ rlz/lib/lib_values.h                                     | 1 -
+ 7 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
+--- a/chrome/browser/android/rlz/rlz_ping_handler.cc
++++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
+@@ -66,7 +66,7 @@ void RlzPingHandler::Ping(
+   DCHECK_EQ(id.length(), 50u);
+ 
+   GURL request_url(base::StringPrintf(
+-      "https://%s%s?", rlz_lib::kFinancialServer, rlz_lib::kFinancialPingPath));
++      "about:blank"));
+   request_url = net::AppendQueryParameter(
+       request_url, rlz_lib::kProductSignatureCgiVariable, "chrome");
+   request_url =
+diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
+--- a/chrome/browser/plugins/plugins_resource_service.cc
++++ b/chrome/browser/plugins/plugins_resource_service.cc
+@@ -68,7 +68,7 @@ GURL GetPluginsServerURL() {
+ #error Unknown platform
+ #endif
+ 
+-  return GURL(kPluginsServerUrl + filename);
++  return GURL("about:blank");
+ }
+ 
+ }  // namespace
+diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
+--- a/chrome/browser/safe_browsing/client_side_model_loader.cc
++++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
+@@ -34,8 +34,6 @@ namespace safe_browsing {
+ // Model Loader strings
+ const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
+ const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
+-const char ModelLoader::kClientModelUrlPrefix[] =
+-    "https://ssl.gstatic.com/safebrowsing/csd/";
+ const char ModelLoader::kClientModelNamePattern[] =
+     "client_model_v5%s_variation_%d.pb";
+ const char ModelLoader::kClientModelFinchExperiment[] =
+@@ -88,7 +86,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+                          net::URLRequestContextGetter* request_context_getter,
+                          bool is_extended_reporting)
+     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
+-      url_(kClientModelUrlPrefix + name_),
++      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       request_context_getter_(request_context_getter),
+       weak_factory_(this) {
+@@ -99,7 +97,7 @@ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+ ModelLoader::ModelLoader(base::Closure update_renderers_callback,
+                          const std::string& model_name)
+     : name_(model_name),
+-      url_(kClientModelUrlPrefix + name_),
++      url_("about:blank"),
+       update_renderers_callback_(update_renderers_callback),
+       request_context_getter_(NULL),
+       weak_factory_(this) {
+diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
+--- a/chrome/browser/safe_browsing/client_side_model_loader.h
++++ b/chrome/browser/safe_browsing/client_side_model_loader.h
+@@ -43,7 +43,6 @@ class ModelLoader : public net::URLFetcherDelegate {
+   static const int kClientModelFetchIntervalMs;
+   static const char kClientModelFinchExperiment[];
+   static const char kClientModelFinchParam[];
+-  static const char kClientModelUrlPrefix[];
+   static const char kClientModelNamePattern[];
+ 
+   // Constructs a model loader to fetch a model using |request_context_getter|.
+diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
+--- a/rlz/lib/financial_ping.cc
++++ b/rlz/lib/financial_ping.cc
+@@ -366,7 +366,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+ 
+   // Open network connection.
+   InternetHandle connection_handle = InternetConnectA(inet_handle,
+-      kFinancialServer, kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
++      "about:blank", kFinancialPort, "", "", INTERNET_SERVICE_HTTP,
+       INTERNET_FLAG_NO_CACHE_WRITE, 0);
+   if (!connection_handle)
+     return false;
+@@ -410,7 +410,7 @@ bool FinancialPing::PingServer(const char* request, std::string* response) {
+   return true;
+ #else
+   std::string url =
+-      base::StringPrintf("https://%s%s", kFinancialServer, request);
++      base::StringPrintf("about:blank");
+ 
+   // Use a waitable event to cause this function to block, to match the
+   // wininet implementation.
+diff --git a/rlz/lib/lib_values.cc b/rlz/lib/lib_values.cc
+--- a/rlz/lib/lib_values.cc
++++ b/rlz/lib/lib_values.cc
+@@ -41,7 +41,6 @@ const char kSetDccResponseVariable[] = "set_dcc";
+ //
+ 
+ const char kFinancialPingPath[] = "/tools/pso/ping";
+-const char kFinancialServer[]   = "clients1.google.com";
+ const int kFinancialPort = 443;
+ 
+ // Ping times in 100-nanosecond intervals.
+diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
+--- a/rlz/lib/lib_values.h
++++ b/rlz/lib/lib_values.h
+@@ -72,7 +72,6 @@ extern const char kSetDccResponseVariable[];
+ //
+ 
+ extern const char kFinancialPingPath[];
+-extern const char kFinancialServer[];
+ 
+ extern const int kFinancialPort;
+ 
+-- 
+2.7.4
+

patches/BRM031_ungoogled-chromium-Disable-translate-integration.patch

@@ -0,0 +1,53 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:28:53 +0100
+Subject: ungoogled-chromium: Disable translate integration
+
+---
+ components/translate/content/renderer/translate_helper.cc | 4 +++-
+ components/translate/core/browser/translate_manager.cc    | 2 +-
+ components/translate/core/browser/translate_script.cc     | 3 +--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc
+--- a/components/translate/content/renderer/translate_helper.cc
++++ b/components/translate/content/renderer/translate_helper.cc
+@@ -74,7 +74,9 @@ TranslateHelper::TranslateHelper(content::RenderFrame* render_frame,
+       world_id_(world_id),
+       extension_scheme_(extension_scheme),
+       binding_(this),
+-      weak_method_factory_(this) {}
++      weak_method_factory_(this) {
++  CancelPendingTranslation();
++}
+ 
+ TranslateHelper::~TranslateHelper() {
+ }
+diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
+--- a/components/translate/core/browser/translate_manager.cc
++++ b/components/translate/core/browser/translate_manager.cc
+@@ -102,7 +102,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) {
+   if (net::NetworkChangeNotifier::IsOffline())
+     return;
+ 
+-  if (!ignore_missing_key_for_testing_ && !::google_apis::HasKeysConfigured()) {
++  if (true) {
+     // Without an API key, translate won't work, so don't offer to translate in
+     // the first place. Leave prefs::kOfferTranslateEnabled on, though, because
+     // that settings syncs and we don't want to turn off translate everywhere
+diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc
+--- a/components/translate/core/browser/translate_script.cc
++++ b/components/translate/core/browser/translate_script.cc
+@@ -149,9 +149,8 @@ void TranslateScript::OnScriptFetchComplete(
+     base::StringAppendF(&data_, "var serverParams = '%s';\n",
+                         server_params.c_str());
+ 
+-    GURL security_origin = translate::GetTranslateSecurityOrigin();
+     base::StringAppendF(
+-        &data_, "var securityOrigin = '%s';", security_origin.spec().c_str());
++        &data_, "var securityOrigin = '';");
+ 
+     // Append embedded translate.js and a remote element library.
+     base::StringPiece str =
+-- 
+2.7.4
+

patches/BRM032_ungoogled-chromium-Disable-profile-avatar-downloading.patch

@@ -0,0 +1,35 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:29:30 +0100
+Subject: ungoogled-chromium: Disable profile avatar downloading
+
+---
+ chrome/browser/profiles/profile_avatar_downloader.cc | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc
+--- a/chrome/browser/profiles/profile_avatar_downloader.cc
++++ b/chrome/browser/profiles/profile_avatar_downloader.cc
+@@ -16,19 +16,13 @@
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+ #include "ui/gfx/image/image.h"
+ 
+-namespace {
+-const char kHighResAvatarDownloadUrlPrefix[] =
+-    "https://www.gstatic.com/chrome/profile_avatars/";
+-}
+-
+ ProfileAvatarDownloader::ProfileAvatarDownloader(
+     size_t icon_index,
+     const FetchCompleteCallback& callback)
+     : icon_index_(icon_index),
+       callback_(callback) {
+   DCHECK(!callback_.is_null());
+-  GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
+-           profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
++  GURL url(std::string("about:blank"));
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
+         semantics {
+-- 
+2.7.4
+

patches/BRM033_ungoogled-chromium-Disable-intranet-redirect-detector.patch

@@ -0,0 +1,28 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:30:30 +0100
+Subject: ungoogled-chromium: Disable intranet redirect detector
+
+Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled.
+
+See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
+---
+ chrome/browser/intranet_redirect_detector.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
+--- a/chrome/browser/intranet_redirect_detector.cc
++++ b/chrome/browser/intranet_redirect_detector.cc
+@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() {
+   fetchers_.clear();
+   resulting_origins_.clear();
+ 
+-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+-  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
+-    return;
++  return;
+ 
+   DCHECK(fetchers_.empty() && resulting_origins_.empty());
+ 
+-- 
+2.7.4
+

patches/BRM034_ungoogled-chromium-Disable-Google-host-detection.patch

@@ -0,0 +1,373 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:36:33 +0100
+Subject: ungoogled-chromium: Disable Google host detection
+
+Disables various detections of Google hosts and functionality specific to them
+---
+ .../page_load_metrics/page_load_metrics_util.cc    |   4 +-
+ .../page_load_metrics/page_load_metrics_util.cc    |  33 +---
+ components/google/core/browser/google_util.cc      | 193 ++-------------------
+ components/search_engines/template_url.cc          |   5 -
+ net/base/url_util.cc                               |  22 ---
+ 5 files changed, 13 insertions(+), 244 deletions(-)
+
+diff --git a/chrome/browser/page_load_metrics/page_load_metrics_util.cc b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+--- a/chrome/browser/page_load_metrics/page_load_metrics_util.cc
++++ b/chrome/browser/page_load_metrics/page_load_metrics_util.cc
+@@ -164,9 +164,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
+ }
+ 
+ bool IsGoogleSearchHostname(const GURL& url) {
+-  base::Optional<std::string> result =
+-      page_load_metrics::GetGoogleHostnamePrefix(url);
+-  return result && result.value() == "www";
++  return false;
+ }
+ 
+ bool IsGoogleSearchResultUrl(const GURL& url) {
+diff --git a/chrome/common/page_load_metrics/page_load_metrics_util.cc b/chrome/common/page_load_metrics/page_load_metrics_util.cc
+--- a/chrome/common/page_load_metrics/page_load_metrics_util.cc
++++ b/chrome/common/page_load_metrics/page_load_metrics_util.cc
+@@ -12,38 +12,7 @@
+ namespace page_load_metrics {
+ 
+ base::Optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
+-  const size_t registry_length =
+-      net::registry_controlled_domains::GetRegistryLength(
+-          url,
+-
+-          // Do not include unknown registries (registries that don't have any
+-          // matches in effective TLD names).
+-          net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-
+-          // Do not include private registries, such as appspot.com. We don't
+-          // want to match URLs like www.google.appspot.com.
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-
+-  const base::StringPiece hostname = url.host_piece();
+-  if (registry_length == 0 || registry_length == std::string::npos ||
+-      registry_length >= hostname.length()) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  // Removes the tld and the preceding dot.
+-  const base::StringPiece hostname_minus_registry =
+-      hostname.substr(0, hostname.length() - (registry_length + 1));
+-
+-  if (hostname_minus_registry == "google")
+-    return std::string("");
+-
+-  if (!base::EndsWith(hostname_minus_registry, ".google",
+-                      base::CompareCase::INSENSITIVE_ASCII)) {
+-    return base::Optional<std::string>();
+-  }
+-
+-  return std::string(hostname_minus_registry.substr(
+-      0, hostname_minus_registry.length() - strlen(".google")));
++  return base::Optional<std::string>();
+ }
+ 
+ bool IsGoogleHostname(const GURL& url) {
+diff --git a/components/google/core/browser/google_util.cc b/components/google/core/browser/google_util.cc
+--- a/components/google/core/browser/google_util.cc
++++ b/components/google/core/browser/google_util.cc
+@@ -41,118 +41,16 @@ namespace {
+ 
+ bool gUseMockLinkDoctorBaseURLForTesting = false;
+ 
+-bool IsPathHomePageBase(base::StringPiece path) {
+-  return (path == "/") || (path == "/webhp");
+-}
+-
+-// Removes a single trailing dot if present in |host|.
+-void StripTrailingDot(base::StringPiece* host) {
+-  if (host->ends_with("."))
+-    host->remove_suffix(1);
+-}
+-
+-// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
+-// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
+-// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
+-// string in |tld|, if specified and the |host| can be parsed.
+-bool IsValidHostName(base::StringPiece host,
+-                     base::StringPiece domain_in_lower_case,
+-                     SubdomainPermission subdomain_permission,
+-                     base::StringPiece* tld) {
+-  // Fast path to avoid searching the registry set.
+-  if (host.find(domain_in_lower_case) == base::StringPiece::npos)
+-    return false;
+-
+-  size_t tld_length =
+-      net::registry_controlled_domains::GetCanonicalHostRegistryLength(
+-          host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
+-          net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
+-  if ((tld_length == 0) || (tld_length == std::string::npos))
+-    return false;
+-
+-  // Removes the tld and the preceding dot.
+-  base::StringPiece host_minus_tld =
+-      host.substr(0, host.length() - tld_length - 1);
+-
+-  if (tld)
+-    *tld = host.substr(host.length() - tld_length);
+-
+-  if (base::LowerCaseEqualsASCII(host_minus_tld, domain_in_lower_case))
+-    return true;
+-
+-  if (subdomain_permission == ALLOW_SUBDOMAIN) {
+-    std::string dot_domain(".");
+-    domain_in_lower_case.AppendToString(&dot_domain);
+-    return base::EndsWith(host_minus_tld, dot_domain,
+-                          base::CompareCase::INSENSITIVE_ASCII);
+-  }
+-
+-  std::string www_domain("www.");
+-  domain_in_lower_case.AppendToString(&www_domain);
+-  return base::LowerCaseEqualsASCII(host_minus_tld, www_domain);
+-}
+-
+-// True if |url| is a valid URL with HTTP or HTTPS scheme. If |port_permission|
+-// is DISALLOW_NON_STANDARD_PORTS, this also requires |url| to use the standard
+-// port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsValidURL(const GURL& url, PortPermission port_permission) {
+-  return url.is_valid() && url.SchemeIsHTTPOrHTTPS() &&
+-         (url.port().empty() || (port_permission == ALLOW_NON_STANDARD_PORTS));
+-}
+-
+-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+-                                   SubdomainPermission subdomain_permission) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
+-    return true;
+-
+-  base::StringPiece tld;
+-  if (!IsValidHostName(canonical_host, "google", subdomain_permission, &tld))
+-    return false;
+-
+-  // Remove the trailing dot from tld if present, as for google domain it's the
+-  // same page.
+-  StripTrailingDot(&tld);
+-
+-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_tlds,
+-                         ({GOOGLE_TLD_LIST}));
+-  return base::ContainsKey(google_tlds, tld.as_string());
+-}
+-
+-// True if |url| is a valid URL with a host that is in the static list of
+-// Google subdomains for google search, and an HTTP or HTTPS scheme. Requires
+-// |url| to use the standard port for its scheme (80 for HTTP, 443 for HTTPS).
+-bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+-  if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
+-    return false;
+-
+-  base::StringPiece host(url.host_piece());
+-  StripTrailingDot(&host);
+-
+-  CR_DEFINE_STATIC_LOCAL(std::set<std::string>, google_subdomains,
+-                         ({"ipv4.google.com", "ipv6.google.com"}));
+-
+-  return base::ContainsKey(google_subdomains, host.as_string());
+-}
+-
+ }  // namespace
+ 
+ // Global functions -----------------------------------------------------------
+ 
+ bool HasGoogleSearchQueryParam(base::StringPiece str) {
+-  url::Component query(0, static_cast<int>(str.length())), key, value;
+-  while (url::ExtractQueryKeyValue(str.data(), &query, &key, &value)) {
+-    base::StringPiece key_str = str.substr(key.begin, key.len);
+-    if (key_str == "q" || key_str == "as_q")
+-      return true;
+-  }
+   return false;
+ }
+ 
+ GURL LinkDoctorBaseURL() {
+-  if (gUseMockLinkDoctorBaseURLForTesting)
+-    return GURL("http://mock.linkdoctor.url/for?testing");
+-  return GURL(LINKDOCTOR_SERVER_REQUEST_URL);
++  return GURL();
+ }
+ 
+ void SetMockLinkDoctorBaseURLForTesting() {
+@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
+ 
+ GURL AppendGoogleLocaleParam(const GURL& url,
+                              const std::string& application_locale) {
+-  return net::AppendQueryParameter(
+-      url, "hl", GetGoogleLocale(application_locale));
++  return url;
+ }
+ 
+ std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
+-  base::StringPiece google_hostname = google_homepage_url.host_piece();
+-  // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
+-  // like "google.com./". https://crbug.com/720295.
+-  const size_t last_dot = google_hostname.find_last_of('.');
+-  DCHECK_NE(std::string::npos, last_dot);
+-  base::StringPiece country_code = google_hostname.substr(last_dot + 1);
+-  // Assume the com TLD implies the US.
+-  if (country_code == "com")
+-    return "us";
+-  // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
+-  // code for the UK is "gb".
+-  if (country_code == "uk")
+-    return "gb";
+-  // Catalonia does not have a CLDR country code, since it's a region in Spain,
+-  // so use Spain instead.
+-  if (country_code == "cat")
+-    return "es";
+-  return country_code.as_string();
++  return "nolocale";
+ }
+ 
+ GURL GetGoogleSearchURL(const GURL& google_homepage_url) {
+-  // To transform the homepage URL into the corresponding search URL, add the
+-  // "search" and the "q=" query string.
+-  GURL::Replacements replacements;
+-  replacements.SetPathStr("search");
+-  replacements.SetQueryStr("q=");
+-  return google_homepage_url.ReplaceComponents(replacements);
++  return google_homepage_url;
+ }
+ 
+ const GURL& CommandLineGoogleBaseURL() {
+-  // Unit tests may add command-line flags after the first call to this
+-  // function, so we don't simply initialize a static |base_url| directly and
+-  // then unconditionally return it.
+-  CR_DEFINE_STATIC_LOCAL(std::string, switch_value, ());
+   CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
+-  std::string current_switch_value(
+-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+-          switches::kGoogleBaseURL));
+-  if (current_switch_value != switch_value) {
+-    switch_value = current_switch_value;
+-    base_url = url_formatter::FixupURL(switch_value, std::string());
+-    if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
+-      base_url = GURL();
+-  }
++  base_url = GURL();
+   return base_url;
+ }
+ 
+ bool StartsWithCommandLineGoogleBaseURL(const GURL& url) {
+-  const GURL& base_url(CommandLineGoogleBaseURL());
+-  return base_url.is_valid() &&
+-         base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
+-                          base::CompareCase::SENSITIVE);
++  return false;
+ }
+ 
+ bool IsGoogleHostname(base::StringPiece host,
+                       SubdomainPermission subdomain_permission) {
+-  url::CanonHostInfo host_info;
+-  return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info),
+-                                       subdomain_permission);
++  return false;
+ }
+ 
+ bool IsGoogleDomainUrl(const GURL& url,
+                        SubdomainPermission subdomain_permission,
+                        PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-         IsCanonicalHostGoogleHostname(url.host_piece(), subdomain_permission);
++  return false;
+ }
+ 
+ bool IsGoogleHomePageUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known home page path.
+-  base::StringPiece path(url.path_piece());
+-  return IsPathHomePageBase(path) ||
+-         base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
++  return false;
+ }
+ 
+ bool IsGoogleSearchUrl(const GURL& url) {
+-  // First check to see if this has a Google domain.
+-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+-                         DISALLOW_NON_STANDARD_PORTS) &&
+-      !IsGoogleSearchSubdomainUrl(url)) {
+-    return false;
+-  }
+-
+-  // Make sure the path is a known search path.
+-  base::StringPiece path(url.path_piece());
+-  bool is_home_page_base = IsPathHomePageBase(path);
+-  if (!is_home_page_base && (path != "/search"))
+-    return false;
+-
+-  // Check for query parameter in URL parameter and hash fragment, depending on
+-  // the path type.
+-  return HasGoogleSearchQueryParam(url.ref_piece()) ||
+-      (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
++  return false;
+ }
+ 
+ bool IsYoutubeDomainUrl(const GURL& url,
+                         SubdomainPermission subdomain_permission,
+                         PortPermission port_permission) {
+-  return IsValidURL(url, port_permission) &&
+-      IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+-                      nullptr);
++  return false;
+ }
+ 
+ const std::vector<std::string>& GetGoogleRegistrableDomains() {
+diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
+--- a/components/search_engines/template_url.cc
++++ b/components/search_engines/template_url.cc
+@@ -455,11 +455,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+ bool TemplateURLRef::HasGoogleBaseURLs(
+     const SearchTermsData& search_terms_data) const {
+   ParseIfNecessary(search_terms_data);
+-  for (size_t i = 0; i < replacements_.size(); ++i) {
+-    if ((replacements_[i].type == GOOGLE_BASE_URL) ||
+-        (replacements_[i].type == GOOGLE_BASE_SUGGEST_URL))
+-      return true;
+-  }
+   return false;
+ }
+ 
+diff --git a/net/base/url_util.cc b/net/base/url_util.cc
+--- a/net/base/url_util.cc
++++ b/net/base/url_util.cc
+@@ -397,28 +397,6 @@ void GetIdentityFromURL(const GURL& url,
+ }
+ 
+ bool HasGoogleHost(const GURL& url) {
+-  static const char* kGoogleHostSuffixes[] = {
+-      ".google.com",
+-      ".youtube.com",
+-      ".gmail.com",
+-      ".doubleclick.net",
+-      ".gstatic.com",
+-      ".googlevideo.com",
+-      ".googleusercontent.com",
+-      ".googlesyndication.com",
+-      ".google-analytics.com",
+-      ".googleadservices.com",
+-      ".googleapis.com",
+-      ".ytimg.com",
+-  };
+-  base::StringPiece host = url.host_piece();
+-  for (const char* suffix : kGoogleHostSuffixes) {
+-    // Here it's possible to get away with faster case-sensitive comparisons
+-    // because the list above is all lowercase, and a GURL's host name will
+-    // always be canonicalized to lowercase as well.
+-    if (base::EndsWith(host, suffix, base::CompareCase::SENSITIVE))
+-      return true;
+-  }
+   return false;
+ }
+ 
+-- 
+2.7.4
+

patches/BRM035_ungoogled-chromium-Disable-GCM.patch

@@ -0,0 +1,39 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:37:10 +0100
+Subject: ungoogled-chromium: Disable GCM
+
+Disable Google Cloud Messaging (GCM) client
+---
+ components/gcm_driver/gcm_client_impl.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
+--- a/components/gcm_driver/gcm_client_impl.cc
++++ b/components/gcm_driver/gcm_client_impl.cc
+@@ -481,6 +481,7 @@ void GCMClientImpl::StartGCM() {
+ }
+ 
+ void GCMClientImpl::InitializeMCSClient() {
++  return;
+   std::vector<GURL> endpoints;
+   endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
+   GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
+@@ -678,6 +679,7 @@ void GCMClientImpl::RemoveHeartbeatInterval(const std::string& scope) {
+ }
+ 
+ void GCMClientImpl::StartCheckin() {
++  return;
+   // Make sure no checkin is in progress.
+   if (checkin_request_.get())
+     return;
+@@ -756,6 +758,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
+ }
+ 
+ void GCMClientImpl::SchedulePeriodicCheckin() {
++  return;
+   // Make sure no checkin is in progress.
+   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
+     return;
+-- 
+2.7.4
+

patches/BRM036_ungoogled-chromium-Disable-Gaia.patch

@@ -0,0 +1,134 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:37:52 +0100
+Subject: ungoogled-chromium: Disable Gaia
+
+Disables Gaia code.
+Somehow it is still being activated even without being signed-in.
+
+See also: https://github.com/Eloston/ungoogled-chromium/issues/104
+---
+ chrome/browser/browser_resources.grd               |  2 --
+ .../component_extensions_whitelist/whitelist.cc    |  1 -
+ .../signin/gaia_auth_extension_loader.cc           |  7 ------
+ .../resources/component_extension_resources.grd    |  2 --
+ chrome/browser/ui/webui/signin/inline_login_ui.cc  |  1 -
+ google_apis/gaia/gaia_auth_fetcher.cc              | 29 ----------------------
+ 6 files changed, 42 deletions(-)
+
+diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
+--- a/chrome/browser/browser_resources.grd
++++ b/chrome/browser/browser_resources.grd
+@@ -307,7 +307,6 @@
+       <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+       <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_login.css" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_login.js" flattenhtml="true" type="BINDATA" />
+-      <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flattenhtml="true" type="BINDATA" />
+       <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+       <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flattenhtml="true" type="BINDATA" />
+@@ -445,7 +444,6 @@
+       </if>
+       <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifest.json" type="BINDATA" />
+       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="resources\cryptotoken\manifest.json" type="BINDATA" />
+-      <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" />
+       <if expr="chromeos">
+         <if expr="optimize_webui">
+           <then>
+diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
++++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc
+@@ -68,7 +68,6 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {
+ #endif
+     case IDR_CRYPTOTOKEN_MANIFEST:
+     case IDR_FEEDBACK_MANIFEST:
+-    case IDR_GAIA_AUTH_MANIFEST:
+ #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
+     case IDR_HANGOUT_SERVICES_MANIFEST:
+ #endif
+diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
++++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+@@ -42,18 +42,11 @@ extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
+ void LoadGaiaAuthExtension(BrowserContext* context) {
+   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ 
+-  extensions::ComponentLoader* component_loader = GetComponentLoader(context);
+   const base::CommandLine* command_line =
+       base::CommandLine::ForCurrentProcess();
+   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
+-    base::FilePath auth_extension_path =
+-        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
+-    component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
+     return;
+   }
+-
+-  component_loader->Add(IDR_GAIA_AUTH_MANIFEST,
+-                        base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
+ }
+ 
+ void UnloadGaiaAuthExtension(BrowserContext* context) {
+diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
+--- a/chrome/browser/resources/component_extension_resources.grd
++++ b/chrome/browser/resources/component_extension_resources.grd
+@@ -40,8 +40,6 @@
+       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
+       <!-- Material Design Bookmarks -->
+       <include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
+-      <!-- Gaia auth extension -->
+-      <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowexternalscript="true" type="BINDATA" />
+       <!-- Hangout Services extension, included in Google Chrome builds only. -->
+       <if expr="_google_chrome or enable_hangout_services_extension">
+         <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_services/background.html" type="BINDATA" />
+diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
+--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
++++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
+@@ -44,7 +44,6 @@ content::WebUIDataSource* CreateWebUIDataSource() {
+ 
+   source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
+   source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
+-  source->AddResourcePath("gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
+ 
+   source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE);
+   source->AddLocalizedString(
+diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
+--- a/google_apis/gaia/gaia_auth_fetcher.cc
++++ b/google_apis/gaia/gaia_auth_fetcher.cc
+@@ -219,35 +219,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
+     int load_flags,
+     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
+   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
+-  fetcher_ = net::URLFetcher::Create(
+-      0, gaia_gurl, body.empty() ? net::URLFetcher::GET : net::URLFetcher::POST,
+-      this, traffic_annotation);
+-  fetcher_->SetRequestContext(getter_);
+-  fetcher_->SetUploadData("application/x-www-form-urlencoded", body);
+-  gaia::MarkURLFetcherAsGaia(fetcher_.get());
+-
+-  VLOG(2) << "Gaia fetcher URL: " << gaia_gurl.spec();
+-  VLOG(2) << "Gaia fetcher headers: " << headers;
+-  VLOG(2) << "Gaia fetcher body: " << body;
+-
+-  // The Gaia token exchange requests do not require any cookie-based
+-  // identification as part of requests.  We suppress sending any cookies to
+-  // maintain a separation between the user's browsing and Chrome's internal
+-  // services.  Where such mixing is desired (MergeSession or OAuthLogin), it
+-  // will be done explicitly.
+-  fetcher_->SetLoadFlags(load_flags);
+-
+-  // Fetchers are sometimes cancelled because a network change was detected,
+-  // especially at startup and after sign-in on ChromeOS. Retrying once should
+-  // be enough in those cases; let the fetcher retry up to 3 times just in case.
+-  // http://crbug.com/163710
+-  fetcher_->SetAutomaticallyRetryOnNetworkChanges(3);
+-
+-  if (!headers.empty())
+-    fetcher_->SetExtraRequestHeaders(headers);
+-
+-  fetch_pending_ = true;
+-  fetcher_->Start();
+ }
+ 
+ // static
+-- 
+2.7.4
+

patches/BRM037_ungoogled-chromium-Clear-HTTP-cache-menu-item.patch

@@ -0,0 +1,181 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:45:21 +0100
+Subject: ungoogled-chromium: Clear HTTP cache menu item
+
+Adds a menu item under "More tools" to clear the HTTP authentication cache on demand
+---
+ chrome/app/chrome_command_ids.h                      | 1 +
+ chrome/app/generated_resources.grd                   | 6 ++++++
+ chrome/browser/ui/browser_command_controller.cc      | 7 +++++++
+ chrome/browser/ui/toolbar/app_menu_model.cc          | 8 ++++++++
+ chrome/browser/ui/toolbar/app_menu_model.h           | 1 +
+ chrome/browser/ui/views/frame/global_menu_bar_x11.cc | 1 +
+ net/http/http_auth_cache.cc                          | 4 ++++
+ net/http/http_auth_cache.h                           | 2 ++
+ tools/metrics/histograms/enums.xml                   | 1 +
+ tools/metrics/histograms/histograms.xml              | 1 +
+ 10 files changed, 32 insertions(+)
+
+diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
+--- a/chrome/app/chrome_command_ids.h
++++ b/chrome/app/chrome_command_ids.h
+@@ -148,6 +148,7 @@
+ #define IDC_DEV_TOOLS_INSPECT           40023
+ #define IDC_UPGRADE_DIALOG              40024
+ #define IDC_VIEW_INCOMPATIBILITIES      40025
++#define IDC_CLEAR_HTTP_AUTH_CACHE       40026
+ #define IDC_SHOW_KEYBOARD_OVERLAY       40027
+ #define IDC_PROFILING_ENABLED           40028
+ #define IDC_BOOKMARKS_MENU              40029
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
++++ b/chrome/app/generated_resources.grd
+@@ -1064,6 +1064,9 @@ are declared in build/common.gypi.
+         <message name="IDS_CLEAR_BROWSING_DATA" desc="The text label for the menu item for clearing of browsing data">
+           &amp;Clear browsing data...
+         </message>
++        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="The text label for the menu item for clearing the HTTP authentication cache">
++          Clear &amp;HTTP auth cache
++        </message>
+         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
+           &amp;Downloads
+         </message>
+@@ -1102,6 +1105,9 @@ are declared in build/common.gypi.
+         <message name="IDS_CLEAR_BROWSING_DATA" desc="In Title Case: The text label for the menu item for clearing of browsing data">
+           &amp;Clear Browsing Data...
+         </message>
++        <message name="IDS_CLEAR_HTTP_AUTH_CACHE" desc="In Title Case: The text label for the menu item for clearing the HTTP authentication cache">
++          Clear &amp;HTTP Auth Cache
++        </message>
+         <message name="IDS_SHOW_DOWNLOADS" desc="In Title Case: The show downloads menu in the app menu">
+           &amp;Downloads
+         </message>
+diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
+--- a/chrome/browser/ui/browser_command_controller.cc
++++ b/chrome/browser/ui/browser_command_controller.cc
+@@ -58,6 +58,9 @@
+ #include "extensions/browser/extension_system.h"
+ #include "printing/features/features.h"
+ #include "ui/events/keycodes/keyboard_codes.h"
++#include "net/url_request/url_request_context.h"
++#include "net/url_request/url_request_context_getter.h"
++#include "net/http/http_transaction_factory.h"
+ 
+ #if defined(OS_MACOSX)
+ #include "chrome/browser/ui/browser_commands_mac.h"
+@@ -625,6 +628,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+     case IDC_CLEAR_BROWSING_DATA:
+       ShowClearBrowsingDataDialog(browser_);
+       break;
++    case IDC_CLEAR_HTTP_AUTH_CACHE:
++      profile()->GetRequestContext()->GetURLRequestContext()->http_transaction_factory()->GetSession()->http_auth_cache()->Clear();
++      break;
+     case IDC_IMPORT_SETTINGS:
+       ShowImportDialog(browser_);
+       break;
+@@ -867,6 +873,7 @@ void BrowserCommandController::InitCommandState() {
+                                         !profile()->IsOffTheRecord());
+   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
+                                         !guest_session);
++  command_updater_.UpdateCommandEnabled(IDC_CLEAR_HTTP_AUTH_CACHE, true);
+ #if defined(OS_CHROMEOS)
+   command_updater_.UpdateCommandEnabled(IDC_TAKE_SCREENSHOT, true);
+ #else
+diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc
+--- a/chrome/browser/ui/toolbar/app_menu_model.cc
++++ b/chrome/browser/ui/toolbar/app_menu_model.cc
+@@ -215,6 +215,7 @@ void ToolsMenuModel::Build(Browser* browser) {
+ 
+   AddSeparator(ui::NORMAL_SEPARATOR);
+   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
++  AddItemWithStringId(IDC_CLEAR_HTTP_AUTH_CACHE, IDS_CLEAR_HTTP_AUTH_CACHE);
+   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
+   if (chrome::CanOpenTaskManager())
+     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+@@ -475,6 +476,13 @@ void AppMenuModel::LogMenuMetrics(int command_id) {
+       }
+       LogMenuAction(MENU_ACTION_CLEAR_BROWSING_DATA);
+       break;
++    case IDC_CLEAR_HTTP_AUTH_CACHE:
++      if (!uma_action_recorded_) {
++        UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ClearHttpAuthCache",
++                                   delta);
++      }
++      LogMenuAction(MENU_ACTION_CLEAR_HTTP_AUTH_CACHE);
++      break;
+     case IDC_VIEW_SOURCE:
+       if (!uma_action_recorded_)
+         UMA_HISTOGRAM_MEDIUM_TIMES("WrenchMenu.TimeToAction.ViewSource", delta);
+diff --git a/chrome/browser/ui/toolbar/app_menu_model.h b/chrome/browser/ui/toolbar/app_menu_model.h
+--- a/chrome/browser/ui/toolbar/app_menu_model.h
++++ b/chrome/browser/ui/toolbar/app_menu_model.h
+@@ -76,6 +76,7 @@ enum AppMenuAction {
+   MENU_ACTION_OPEN_IN_CHROME = 48,
+   MENU_ACTION_SITE_SETTINGS = 49,
+   MENU_ACTION_APP_INFO = 50,
++  MENU_ACTION_CLEAR_HTTP_AUTH_CACHE = 51,
+   LIMIT_MENU_ACTION
+ };
+ 
+diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
++++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+@@ -225,6 +225,7 @@ GlobalMenuBarCommand tools_menu[] = {
+ 
+     {IDS_TASK_MANAGER, IDC_TASK_MANAGER},
+     {IDS_CLEAR_BROWSING_DATA, IDC_CLEAR_BROWSING_DATA},
++    {IDS_CLEAR_HTTP_AUTH_CACHE, IDC_CLEAR_HTTP_AUTH_CACHE},
+ 
+     {MENU_SEPARATOR, MENU_SEPARATOR},
+ 
+diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
+--- a/net/http/http_auth_cache.cc
++++ b/net/http/http_auth_cache.cc
+@@ -250,6 +250,10 @@ bool HttpAuthCache::Remove(const GURL& origin,
+   return false;
+ }
+ 
++void HttpAuthCache::Clear() {
++  entries_.clear();
++}
++
+ void HttpAuthCache::ClearEntriesAddedWithin(base::TimeDelta duration) {
+   base::TimeTicks begin_time = base::TimeTicks::Now() - duration;
+   base::EraseIf(entries_, [begin_time](const Entry& entry) {
+diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
+--- a/net/http/http_auth_cache.h
++++ b/net/http/http_auth_cache.h
+@@ -166,6 +166,8 @@ class NET_EXPORT HttpAuthCache {
+               HttpAuth::Scheme scheme,
+               const AuthCredentials& credentials);
+ 
++  void Clear();
++
+   // Clears cache entries created within |duration| of base::TimeTicks::Now().
+   void ClearEntriesAddedWithin(base::TimeDelta duration);
+ 
+diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
+--- a/tools/metrics/histograms/enums.xml
++++ b/tools/metrics/histograms/enums.xml
+@@ -46154,6 +46154,7 @@ Called by update_traffic_annotation_histograms.py.-->
+   <int value="48" label="Open in Chrome"/>
+   <int value="49" label="Site Settings"/>
+   <int value="50" label="App Info"/>
++  <int value="51" label="Clear HTTP auth cache"/>
+ </enum>
+ 
+ <enum name="XFrameOptions">
+diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
+--- a/tools/metrics/histograms/histograms.xml
++++ b/tools/metrics/histograms/histograms.xml
+@@ -102544,6 +102544,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+   <suffix name="Overestimate"
+       label="Tracks when the compositor's estimates were too high and by how
+              much."/>
++  <suffix name="ClearHttpAuthCache" label="Clear HTTP authentication cache"/>
+   <suffix name="Underestimate"
+       label="Tracks when the compositor's estimates were too low and by how
+              much."/>
+-- 
+2.7.4
+

patches/BRM038_url_request-hooks-and-ad-url-data.patch

@@ -0,0 +1,189 @@
+From: NoChromo <nochromo@nochromo.com>
+Date: Sun, 3 Apr 2016 12:44:50 +0800
+Subject: url_request: hooks and ad url data
+
+---
+ net/BUILD.gn                          |   2 +
+ net/url_request/nochromo_intercept.cc | 116 ++++++++++++++++++++++++++++++++++
+ net/url_request/nochromo_intercept.h  |  13 ++++
+ net/url_request/url_request.cc        |   4 ++
+ 4 files changed, 135 insertions(+)
+ create mode 100644 net/url_request/nochromo_intercept.cc
+ create mode 100644 net/url_request/nochromo_intercept.h
+
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -1739,6 +1739,8 @@ component("net") {
+       "url_request/url_fetcher_response_writer.h",
+       "url_request/url_range_request_job.cc",
+       "url_request/url_range_request_job.h",
++      "url_request/nochromo_intercept.cc",
++      "url_request/nochromo_intercept.h",
+       "url_request/url_request.cc",
+       "url_request/url_request.h",
+       "url_request/url_request_context.cc",
+diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/nochromo_intercept.cc
+@@ -0,0 +1,116 @@
++#include "url/gurl.h"
++#include "net/url_request/nochromo_entries.h"
++
++#include <android/log.h>
++
++namespace net {
++  
++#define NOCHROMO_LOG 0
++#define NOCHROMO_LOG_MORE 0
++
++static char* strtolower(const char* str) {
++  int len = strlen(str);
++  char* ret = (char*)malloc(len + 1);
++  ret[len] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((65 <= str[i]) && (str[i] <= 90)) {
++      ret[i] = str[i] + 32;
++    } else {
++      ret[i] = str[i];
++    }
++  }
++  return ret;
++}
++
++static char* strtosep(const char* str) {
++  int len = strlen(str);
++  char* ret = (char*)malloc(len + 3);
++  ret[0] = '^';
++  ret[len + 1] = '^';
++  ret[len + 2] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
++      ret[i + 1] = '^';
++    } else {
++      ret[i + 1] = str[i];
++    }
++  }
++  return ret;
++}
++
++int nochromo_intercept(const GURL& url) {
++  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
++    const char* c_url = url.spec().c_str();
++    char* c_url_lower = strtolower(c_url);
++    char* c_url_sep = strtosep(c_url);
++    char* c_url_lower_sep = strtosep(c_url_lower);
++    
++    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
++    
++    bool intercept = false;
++    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
++      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
++      
++      // no use checking rules when we're intercepting, or exceptions when not
++      bool check =
++        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
++        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
++      
++      if (check) {
++        bool match = false;
++        
++        // select comparison string based on case and separator presence (separator takes some shortcuts)
++        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
++        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
++        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
++        
++        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
++        
++        // check for all match parts at >= position of last match
++        const char* last = match_url;
++        for (int m = 0; m < entry->matchcount; m++) {
++          const char* pos = strstr(last, entry->matches[m]);
++          match = (pos != NULL);
++          
++          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
++          
++          // check if the url starts with the first match part
++          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
++          
++          // check if the url ends with the last match part
++          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
++          
++          // check domain match
++          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
++          
++          // short circuit
++          if (!match) break;
++        }
++        
++        if (match) {
++          if (NOCHROMO_LOG) {
++            if (!intercept) {
++              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
++            } else {
++              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
++            }
++          }
++          intercept = !intercept;
++        }
++      }
++    }
++    
++    free(c_url_sep);
++    free(c_url_lower);
++    free(c_url_lower_sep);
++    
++    if (intercept) {
++      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
++      return 1;
++    }
++    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
++  }
++  return 0;
++}
++
++}  // namespace net
+\ No newline at end of file
+diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/nochromo_intercept.h
+@@ -0,0 +1,13 @@
++#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
++#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
++
++#include "url/gurl.h"
++
++namespace net {
++
++GURL nochromo_intercepted = GURL("http://127.0.0.1/");
++int nochromo_intercept(const GURL& url);
++
++}  // namespace net
++
++#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
+--- a/net/url_request/url_request.cc
++++ b/net/url_request/url_request.cc
+@@ -44,6 +44,8 @@
+ #include "url/gurl.h"
+ #include "url/origin.h"
+ 
++#include "net/url_request/nochromo_intercept.h"
++
+ #if BUILDFLAG(ENABLE_REPORTING)
+ #include "net/url_request/network_error_logging_delegate.h"
+ #endif  // BUILDFLAG(ENABLE_REPORTING)
+@@ -581,6 +583,8 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
++  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
++
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(
+       NetLogEventType::REQUEST_ALIVE,
+-- 
+2.7.4
+

patches/BRM039_Bromite-adblock-engine.patch

@@ -0,0 +1,566 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 28 Mar 2018 15:55:11 +0200
+Subject: Bromite adblock engine
+
+Ported from NoChromo patch
+Make interception testable
+Add domain support
+Re-land: third-party filters support
+---
+ net/BUILD.gn                          |   4 +-
+ net/url_request/adblock_intercept.cc  | 324 ++++++++++++++++++++++++++++++++++
+ net/url_request/adblock_intercept.h   |  16 ++
+ net/url_request/nochromo_intercept.cc | 116 ------------
+ net/url_request/nochromo_intercept.h  |  13 --
+ net/url_request/url_request.cc        |  14 +-
+ 6 files changed, 353 insertions(+), 134 deletions(-)
+ create mode 100644 net/url_request/adblock_intercept.cc
+ create mode 100644 net/url_request/adblock_intercept.h
+ delete mode 100644 net/url_request/nochromo_intercept.cc
+ delete mode 100644 net/url_request/nochromo_intercept.h
+
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -1739,8 +1739,8 @@ component("net") {
+       "url_request/url_fetcher_response_writer.h",
+       "url_request/url_range_request_job.cc",
+       "url_request/url_range_request_job.h",
+-      "url_request/nochromo_intercept.cc",
+-      "url_request/nochromo_intercept.h",
++      "url_request/adblock_intercept.cc",
++      "url_request/adblock_intercept.h",
+       "url_request/url_request.cc",
+       "url_request/url_request.h",
+       "url_request/url_request_context.cc",
+diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/adblock_intercept.cc
+@@ -0,0 +1,324 @@
++#include "url/gurl.h"
++
++#ifdef ADB_TESTER
++#include <cstddef>
++#include <cstdlib>
++#include <string.h>
++
++#include "log.h"
++#include <tld.h>
++
++#else
++
++#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
++#include <android/log.h>
++
++#endif
++
++#include "net/url_request/adblock_entries.h"
++
++namespace net {
++
++const char *LOG_TAG = "Bromite";
++
++#ifdef ADB_TESTER
++int adblock_rules_count() { return ADBLOCK_ENTRY_COUNT; }
++#endif
++
++// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
++// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
++// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
++// string in |tld|, if specified and the |host| can be parsed.
++static bool is_first_party(char *l_host, char *l_url_host) {
++  size_t tld_length;
++
++#ifdef ADB_TESTER
++  char *found_tld;
++
++  if (TLD_SUCCESS != tld_get_z(l_host, &found_tld))
++    return false;
++  tld_length = strlen(found_tld);
++  if (tld_length == 0)
++    return false;
++#else
++  tld_length = net::registry_controlled_domains::GetCanonicalHostRegistryLength(
++      l_host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
++      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
++  if ((tld_length == 0) || (tld_length == std::string::npos))
++    return false;
++#endif
++
++  int len = strlen(l_host);
++  char *tld = l_host + len - tld_length;
++
++  // Removes any subdomain from origin host.
++  int i = len - tld_length - 2, top_i = i;
++  if (i < 0) {
++    return false;
++  }
++  char *domain = l_host;
++  for (; i >= 0; i--) {
++    if (l_host[i] == '.') {
++      int p_len = top_i - i;
++      // skip "co" in "co.uk", "org" in "org.uk"
++      if (p_len <= 3) {
++        tld -= p_len + 1;
++        continue;
++      }
++
++      // segment is long enough, accept it at as a domain
++      domain = l_host + i;
++      len -= i;
++      break;
++    }
++  }
++
++#ifdef ADBLOCK_LOG
++  __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                      "%s: extracted domain suffix: \"%s\" (TLD=\"%s\")",
++                      l_host, domain, tld);
++#endif
++
++  // Check if supplied URL host matches, including the dot.
++  int b_len = strlen(l_url_host);
++  if (b_len < len) {
++    return false;
++  }
++  for (int i = 0; i < len; i++) {
++    if (l_url_host[b_len - 1 - i] != domain[len - 1 - i])
++      return false;
++  }
++
++  // pass with flying colors
++  return true;
++}
++
++static char *strtolower(const char *str) {
++  int len = strlen(str);
++  char *ret = (char *)malloc(len + 1);
++  ret[len] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((65 <= str[i]) && (str[i] <= 90)) {
++      ret[i] = str[i] + 32;
++    } else {
++      ret[i] = str[i];
++    }
++  }
++  return ret;
++}
++
++static char *strtosep(const char *str) {
++  int len = strlen(str);
++  char *ret = (char *)malloc(len + 3);
++  ret[0] = '^';
++  ret[len + 1] = '^';
++  ret[len + 2] = '\0';
++  for (int i = 0; i < len; i++) {
++    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') ||
++        (str[i] == '&') || (str[i] == '=')) {
++      ret[i + 1] = '^';
++    } else {
++      ret[i + 1] = str[i];
++    }
++  }
++  return ret;
++}
++
++static bool url_matches(const char *c_url, char *c_url_sep, char *c_url_lower,
++                        char *c_url_lower_sep, adblock_entry *entry) {
++  bool match = false;
++  // select comparison string based on case and separator presence (separator
++  // takes some shortcuts)
++  bool match_case = ((entry->flags & ADBLOCK_FLAG_MATCH_CASE) != 0);
++  bool match_separator = ((entry->flags & ADBLOCK_FLAG_HAS_SEPARATOR) != 0);
++  const char *match_url =
++      match_case ? (match_separator ? c_url_sep : c_url)
++                 : (match_separator ? c_url_lower_sep : c_url_lower);
++
++#ifdef ADBLOCK_LOG_MORE
++  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[case:%d][sep:%d][%s]",
++                      match_case, match_separator, match_url);
++#endif
++  // check for all match parts at >= position of last match
++  const char *last = match_url;
++  for (int m = 0; const char *url_match = entry->matches[m]; m++) {
++    bool is_last_match = entry->matches[m + 1] == NULL;
++    const char *pos = strstr(last, url_match);
++    match = (pos != NULL);
++
++#ifdef ADBLOCK_LOG_MORE
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s][found:%d][match:%d]",
++                        entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
++#endif
++    // check if the url starts with the first match part
++    if (match && (m == 0) && ((entry->flags & ADBLOCK_FLAG_MATCH_BEGIN) != 0) &&
++        (pos != match_url))
++      match = false;
++
++    // check if the url ends with the last match part
++    if (match && is_last_match &&
++        ((entry->flags & ADBLOCK_FLAG_MATCH_END) != 0) &&
++        (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])]))
++      match = false;
++
++    // check domain match
++    if (match && (m == 0) &&
++        ((entry->flags & ADBLOCK_FLAG_MATCH_DOMAIN) != 0) &&
++        (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') &&
++        (pos[-1] != '/'))
++      match = false;
++
++    // short circuit
++    if (!match)
++      break;
++  }
++  return match;
++}
++
++bool url_match_domain(adblock_entry *entry, const std::string &origin_host) {
++  bool match_domain = true;
++  // check for a negative domain match
++  if (entry->domains_neg) {
++    if (origin_host.empty()) {
++      // skip this rule, cannot match on domain
++      return false;
++    }
++    for (int d = 0; const char *domain = entry->domains_neg[d]; d++) {
++      if (domain == origin_host) {
++        match_domain = false;
++        break;
++      }
++    }
++  }
++
++  // check for a required positive domain match
++  if (entry->domains) {
++    if (origin_host.empty()) {
++      // skip this rule, cannot match on domain
++      return false;
++    }
++    for (int d = 0; const char *domain = entry->domains[d]; d++) {
++      if (domain != origin_host) {
++        match_domain = false;
++        break;
++      }
++    }
++  }
++  return match_domain;
++}
++
++static bool url_match_party(adblock_entry *entry, const GURL &url,
++                            const std::string &origin_host, bool &checked_fp,
++                            bool &fp) {
++  bool wanted_fp;
++  if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) {
++    wanted_fp = false;
++  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
++    wanted_fp = true;
++  } else {
++    // no-op
++    return true;
++  }
++
++  if (origin_host.empty()) {
++    // cannot match this rule, no origin host to determine first/third party
++    return false;
++  }
++
++#ifdef ADB_TESTER
++//__android_log_print(ANDROID_LOG_INFO, LOG_TAG, "matchFirst=%d matchThird=%d",
++// matchFirstParty, matchThirdParty);
++#endif
++  if (!checked_fp) {
++    // lower-case version
++    char *l_host = strtolower(origin_host.c_str()),
++         *l_url_host = strtolower(url.host().c_str());
++
++    // is the URL a first-party to the current page's host?
++    fp = is_first_party(l_host, l_url_host);
++
++    checked_fp = true;
++#ifdef ADB_TESTER
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                        "is_first_party(\"%s\", \"%s\") = %s", l_host,
++                        l_url_host, fp ? "true" : "false");
++#endif
++    free(l_host);
++    free(l_url_host);
++  }
++
++  return fp == wanted_fp;
++}
++
++int adblock_intercept(const GURL &url, const std::string &origin_host) {
++  //  if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) {
++  //     return 0;
++  //  }
++
++  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
++    const char *c_url = url.spec().c_str();
++    char *c_url_lower = strtolower(c_url);
++    char *c_url_sep = strtosep(c_url);
++    char *c_url_lower_sep = strtosep(c_url_lower);
++
++#ifdef ADBLOCK_LOG
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s with host '%s'] [%s]",
++                        c_url, url.host().c_str(), origin_host.c_str());
++#endif
++
++    bool checked_fp = false, fp = false;
++
++    bool intercept = false;
++    for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
++      adblock_entry *entry = &ADBLOCK_ENTRIES[i];
++
++      // no use checking rules when we're intercepting, or exceptions when not
++      bool check =
++          (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) ||
++          (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0));
++      if (!check)
++        continue;
++
++      // first check for domain matches, a quick branch out if matching
++      if (!url_match_domain(entry, origin_host))
++        continue;
++
++      // check on the URL matcher
++      if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry))
++        continue;
++
++      // finally check first/third-party
++      if (!url_match_party(entry, url, origin_host, checked_fp, fp))
++        continue;
++
++#ifdef ADBLOCK_LOG
++      if (!intercept) {
++        __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
++                            "--> intercept (#%d: \"%s\") (%x)", i,
++                            entry->matches[0], entry->flags);
++      } else {
++        __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "--> pass (%d) (#%d)", i,
++                            entry->flags);
++      }
++#endif
++      intercept = !intercept;
++    } // for each entry
++
++    free(c_url_sep);
++    free(c_url_lower);
++    free(c_url_lower_sep);
++
++    if (intercept) {
++#ifdef ADBLOCK_LOG
++      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
++#endif
++      return 1;
++    }
++#ifdef ADBLOCK_LOG
++    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
++#endif
++  }
++  return 0;
++}
++
++} // namespace net
+diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/adblock_intercept.h
+@@ -0,0 +1,16 @@
++#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
++#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
++
++#include "url/gurl.h"
++
++namespace net {
++
++#ifdef ADB_TESTER
++int adblock_rules_count();
++#endif
++
++int adblock_intercept(const GURL &url, const std::string &origin_host);
++
++} // namespace net
++
++#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
+diff --git a/net/url_request/nochromo_intercept.cc b/net/url_request/nochromo_intercept.cc
+deleted file mode 100644
+--- a/net/url_request/nochromo_intercept.cc
++++ /dev/null
+@@ -1,116 +0,0 @@
+-#include "url/gurl.h"
+-#include "net/url_request/nochromo_entries.h"
+-
+-#include <android/log.h>
+-
+-namespace net {
+-  
+-#define NOCHROMO_LOG 0
+-#define NOCHROMO_LOG_MORE 0
+-
+-static char* strtolower(const char* str) {
+-  int len = strlen(str);
+-  char* ret = (char*)malloc(len + 1);
+-  ret[len] = '\0';
+-  for (int i = 0; i < len; i++) {
+-    if ((65 <= str[i]) && (str[i] <= 90)) {
+-      ret[i] = str[i] + 32;
+-    } else {
+-      ret[i] = str[i];
+-    }
+-  }
+-  return ret;
+-}
+-
+-static char* strtosep(const char* str) {
+-  int len = strlen(str);
+-  char* ret = (char*)malloc(len + 3);
+-  ret[0] = '^';
+-  ret[len + 1] = '^';
+-  ret[len + 2] = '\0';
+-  for (int i = 0; i < len; i++) {
+-    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') || (str[i] == '&') || (str[i] == '=')) {
+-      ret[i + 1] = '^';
+-    } else {
+-      ret[i + 1] = str[i];
+-    }
+-  }
+-  return ret;
+-}
+-
+-int nochromo_intercept(const GURL& url) {
+-  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
+-    const char* c_url = url.spec().c_str();
+-    char* c_url_lower = strtolower(c_url);
+-    char* c_url_sep = strtosep(c_url);
+-    char* c_url_lower_sep = strtosep(c_url_lower);
+-    
+-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s]", c_url);
+-    
+-    bool intercept = false;
+-    for (int i = 0; i < NOCHROMO_ENTRY_COUNT; i++) {
+-      nochromo_entry* entry = &NOCHROMO_ENTRIES[i];
+-      
+-      // no use checking rules when we're intercepting, or exceptions when not
+-      bool check =
+-        (!intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) == 0)) ||
+-        (intercept && ((entry->flags & NOCHROMO_FLAG_EXCEPTION) != 0));
+-      
+-      if (check) {
+-        bool match = false;
+-        
+-        // select comparison string based on case and separator presence (separator takes some shortcuts)
+-        bool match_case = ((entry->flags & NOCHROMO_FLAG_MATCH_CASE) != 0);
+-        bool match_separator = ((entry->flags & NOCHROMO_FLAG_HAS_SEPARATOR) != 0);
+-        const char* match_url = match_case ? (match_separator ? c_url_sep : c_url) : (match_separator ? c_url_lower_sep : c_url_lower); 
+-        
+-        if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[case:%d][sep:%d][%s]", match_case, match_separator, match_url);
+-        
+-        // check for all match parts at >= position of last match
+-        const char* last = match_url;
+-        for (int m = 0; m < entry->matchcount; m++) {
+-          const char* pos = strstr(last, entry->matches[m]);
+-          match = (pos != NULL);
+-          
+-          if (NOCHROMO_LOG || NOCHROMO_LOG_MORE) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "[%s][found:%d][match:%d]", entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
+-          
+-          // check if the url starts with the first match part
+-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_BEGIN) != 0) && (pos != match_url)) match = false;
+-          
+-          // check if the url ends with the last match part
+-          if (match && (m == entry->matchcount - 1) && ((entry->flags & NOCHROMO_FLAG_MATCH_END) != 0) && (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])])) match = false;
+-          
+-          // check domain match
+-          if (match && (m == 0) && ((entry->flags & NOCHROMO_FLAG_MATCH_DOMAIN) != 0) && (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') && (pos[-1] != '/')) match = false;
+-          
+-          // short circuit
+-          if (!match) break;
+-        }
+-        
+-        if (match) {
+-          if (NOCHROMO_LOG) {
+-            if (!intercept) {
+-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> intercept (%d) (%d)", i, entry->flags);
+-            } else {
+-              __android_log_print(ANDROID_LOG_INFO, "NoChromo", "--> pass (%d) (%d)", i, entry->flags);
+-            }
+-          }
+-          intercept = !intercept;
+-        }
+-      }
+-    }
+-    
+-    free(c_url_sep);
+-    free(c_url_lower);
+-    free(c_url_lower_sep);
+-    
+-    if (intercept) {
+-      if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "intercepted!");
+-      return 1;
+-    }
+-    if (NOCHROMO_LOG) __android_log_print(ANDROID_LOG_INFO, "NoChromo", "pass!");
+-  }
+-  return 0;
+-}
+-
+-}  // namespace net
+\ No newline at end of file
+diff --git a/net/url_request/nochromo_intercept.h b/net/url_request/nochromo_intercept.h
+deleted file mode 100644
+--- a/net/url_request/nochromo_intercept.h
++++ /dev/null
+@@ -1,13 +0,0 @@
+-#ifndef NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+-#define NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+-
+-#include "url/gurl.h"
+-
+-namespace net {
+-
+-GURL nochromo_intercepted = GURL("http://127.0.0.1/");
+-int nochromo_intercept(const GURL& url);
+-
+-}  // namespace net
+-
+-#endif  // NET_URL_REQUEST_NOCHROMO_INTERCEPT_H_
+diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
+--- a/net/url_request/url_request.cc
++++ b/net/url_request/url_request.cc
+@@ -44,7 +44,7 @@
+ #include "url/gurl.h"
+ #include "url/origin.h"
+ 
+-#include "net/url_request/nochromo_intercept.h"
++#include "net/url_request/adblock_intercept.h"
+ 
+ #if BUILDFLAG(ENABLE_REPORTING)
+ #include "net/url_request/network_error_logging_delegate.h"
+@@ -558,7 +558,6 @@ URLRequest::URLRequest(const GURL& url,
+                                          : context->network_delegate()),
+       net_log_(NetLogWithSource::Make(context->net_log(),
+                                       NetLogSourceType::URL_REQUEST)),
+-      url_chain_(1, url),
+       method_("GET"),
+       referrer_policy_(CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE),
+       first_party_url_policy_(NEVER_CHANGE_FIRST_PARTY_URL),
+@@ -583,7 +582,16 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
+-  if (nochromo_intercept(url)) url_chain_.push_back(nochromo_intercepted);
++  std::string initiatorHost;
++  if (initiator_.has_value()) {
++    initiatorHost = initiator_.value().host();
++  }
++
++  if (adblock_intercept(url, initiatorHost)) {
++     url_chain_ = { url, GURL("http://127.0.0.1") };
++  } else {
++     url_chain_ = { url };
++  }
+ 
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(
+-- 
+2.7.4
+

patches/BRM040_User-Agent-anonymize.patch

@@ -0,0 +1,54 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 21 Mar 2018 14:15:28 +0100
+Subject: User Agent: anonymize
+
+Remove device name and build id
+---
+ content/common/user_agent.cc | 25 ++-----------------------
+ 1 file changed, 2 insertions(+), 23 deletions(-)
+
+diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
+--- a/content/common/user_agent.cc
++++ b/content/common/user_agent.cc
+@@ -79,26 +79,6 @@ std::string BuildOSCpuInfo() {
+ 
+ #if defined(OS_ANDROID)
+   std::string android_version_str = base::SysInfo::OperatingSystemVersion();
+-
+-  std::string android_info_str;
+-
+-  // Send information about the device.
+-  bool semicolon_inserted = false;
+-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+-  std::string android_device_name = base::SysInfo::HardwareModelName();
+-  if ("REL" == android_build_codename && android_device_name.size() > 0) {
+-    android_info_str += "; " + android_device_name;
+-    semicolon_inserted = true;
+-  }
+-
+-  // Append the build ID.
+-  std::string android_build_id = base::SysInfo::GetAndroidBuildID();
+-  if (android_build_id.size() > 0) {
+-    if (!semicolon_inserted) {
+-      android_info_str += ";";
+-    }
+-    android_info_str += " Build/" + android_build_id;
+-  }
+ #endif
+ 
+   base::StringAppendF(
+@@ -121,9 +101,8 @@ std::string BuildOSCpuInfo() {
+       os_minor_version,
+       os_bugfix_version
+ #elif defined(OS_ANDROID)
+-      "Android %s%s",
+-      android_version_str.c_str(),
+-      android_info_str.c_str()
++      "Android %s",
++      android_version_str.c_str()
+ #else
+       "%s %s",
+       unixinfo.sysname,  // e.g. Linux
+-- 
+2.7.4
+

patches/BRM041_Battery-API-return-nothing.patch

@@ -0,0 +1,64 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 22 Mar 2018 22:11:57 +0100
+Subject: Battery API: return nothing
+
+---
+ .../Source/modules/battery/BatteryManager.cpp      | 25 ++++------------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
+--- a/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
++++ b/third_party/WebKit/Source/modules/battery/BatteryManager.cpp
+@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+ }
+ 
+ bool BatteryManager::charging() {
+-  return battery_status_.Charging();
++  return false;
+ }
+ 
+ double BatteryManager::chargingTime() {
+-  return battery_status_.charging_time();
++  return 0;
+ }
+ 
+ double BatteryManager::dischargingTime() {
+-  return battery_status_.discharging_time();
++  return 0;
+ }
+ 
+ double BatteryManager::level() {
+-  return battery_status_.Level();
++  return 1;
+ }
+ 
+ void BatteryManager::DidUpdateData() {
+   DCHECK(battery_property_);
+ 
+-  BatteryStatus old_status = battery_status_;
+-  battery_status_ = *BatteryDispatcher::Instance().LatestData();
+-
+   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
+     battery_property_->Resolve(this);
+     return;
+   }
+-
+-  Document* document = ToDocument(GetExecutionContext());
+-  DCHECK(document);
+-  if (document->IsContextPaused() || document->IsContextDestroyed())
+-    return;
+-
+-  if (battery_status_.Charging() != old_status.Charging())
+-    DispatchEvent(Event::Create(EventTypeNames::chargingchange));
+-  if (battery_status_.charging_time() != old_status.charging_time())
+-    DispatchEvent(Event::Create(EventTypeNames::chargingtimechange));
+-  if (battery_status_.discharging_time() != old_status.discharging_time())
+-    DispatchEvent(Event::Create(EventTypeNames::dischargingtimechange));
+-  if (battery_status_.Level() != old_status.Level())
+-    DispatchEvent(Event::Create(EventTypeNames::levelchange));
+ }
+ 
+ void BatteryManager::RegisterWithDispatcher() {
+-- 
+2.7.4
+

patches/BRM042_Canvas-fingerprinting-mitigations-via-IDL.patch

@@ -0,0 +1,67 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 24 Mar 2018 05:18:03 +0100
+Subject: Canvas: fingerprinting mitigations via IDL
+
+Disable toDataURL, toBlob, getImageData and webGL renderering info
+---
+ third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl      | 4 ++--
+ .../Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl       | 4 ++--
+ third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp    | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
+--- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
++++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
+@@ -36,9 +36,9 @@ interface HTMLCanvasElement : HTMLElement
+     // Note: The arguments argument is variadic in the spec, but not here as
+     // only one extra argument is actually used.
+     // FIXME: type should not have a default value.
+-    [MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
++    //[MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
+ 
+-    [MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
++    //[MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
+ };
+ 
+ // https://html.spec.whatwg.org/multipage/canvas.html#blobcallback
+diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
+--- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
++++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
+@@ -110,7 +110,7 @@ interface CanvasRenderingContext2D {
+     // text (see also the CanvasDrawingStyles interface)
+     void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+     void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+-    TextMetrics measureText(DOMString text);
++    //TextMetrics measureText(DOMString text);
+ 
+     // drawing images
+     [CallWith=ScriptState, RaisesException] void drawImage(CanvasImageSource image, unrestricted double x, unrestricted double y);
+@@ -125,7 +125,7 @@ interface CanvasRenderingContext2D {
+     // pixel manipulation
+     [RaisesException] ImageData createImageData(ImageData imagedata);
+     [RaisesException] ImageData createImageData(long sw, long sh);
+-    [RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
++    //[RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
+     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy);
+     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
+     
+diff --git a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
+--- a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
++++ b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
+@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
+ 
+ WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
+     WebGLRenderingContextBase* context) {
+-  return new WebGLDebugRendererInfo(context);
++  return nullptr;
+ }
+ 
+ bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
+-  return true;
++  return false;
+ }
+ 
+ const char* WebGLDebugRendererInfo::ExtensionName() {
+-- 
+2.7.4
+

patches/BRM042_Disable-plugins-enumeration.patch

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 22 Mar 2018 22:38:00 +0100
+Subject: Disable plugins enumeration
+
+---
+ third_party/WebKit/Source/core/frame/LocalFrame.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
++++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+@@ -1086,10 +1086,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+ }
+ 
+ PluginData* LocalFrame::GetPluginData() const {
+-  if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
+-    return nullptr;
+-  return GetPage()->GetPluginData(
+-      Tree().Top().GetSecurityContext()->GetSecurityOrigin());
++  // what about no
++  return nullptr;
+ }
+ 
+ DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
+-- 
+2.7.4
+

patches/BRM043_Canvas-fingerprinting-mitigations-via-IDL.patch

@@ -0,0 +1,67 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 24 Mar 2018 05:18:03 +0100
+Subject: Canvas: fingerprinting mitigations via IDL
+
+Disable toDataURL, toBlob, getImageData and webGL renderering info
+---
+ third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl      | 4 ++--
+ .../Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl       | 4 ++--
+ third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp    | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
+--- a/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
++++ b/third_party/WebKit/Source/core/html/canvas/HTMLCanvasElement.idl
+@@ -36,9 +36,9 @@ interface HTMLCanvasElement : HTMLElement
+     // Note: The arguments argument is variadic in the spec, but not here as
+     // only one extra argument is actually used.
+     // FIXME: type should not have a default value.
+-    [MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
++    //[MeasureAs=CanvasToDataURL, RaisesException] DOMString toDataURL(optional DOMString type = null, optional any arguments);
+ 
+-    [MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
++    //[MeasureAs=CanvasToBlob, RaisesException] void toBlob(BlobCallback _callback, optional DOMString type = null, optional any arguments);
+ };
+ 
+ // https://html.spec.whatwg.org/multipage/canvas.html#blobcallback
+diff --git a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
+--- a/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
++++ b/third_party/WebKit/Source/modules/canvas/canvas2d/CanvasRenderingContext2D.idl
+@@ -110,7 +110,7 @@ interface CanvasRenderingContext2D {
+     // text (see also the CanvasDrawingStyles interface)
+     void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+     void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+-    TextMetrics measureText(DOMString text);
++    //TextMetrics measureText(DOMString text);
+ 
+     // drawing images
+     [CallWith=ScriptState, RaisesException] void drawImage(CanvasImageSource image, unrestricted double x, unrestricted double y);
+@@ -125,7 +125,7 @@ interface CanvasRenderingContext2D {
+     // pixel manipulation
+     [RaisesException] ImageData createImageData(ImageData imagedata);
+     [RaisesException] ImageData createImageData(long sw, long sh);
+-    [RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
++    //[RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh);
+     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy);
+     [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
+     
+diff --git a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
+--- a/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
++++ b/third_party/WebKit/Source/modules/webgl/WebGLDebugRendererInfo.cpp
+@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
+ 
+ WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
+     WebGLRenderingContextBase* context) {
+-  return new WebGLDebugRendererInfo(context);
++  return nullptr;
+ }
+ 
+ bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
+-  return true;
++  return false;
+ }
+ 
+ const char* WebGLDebugRendererInfo::ExtensionName() {
+-- 
+2.7.4
+

patches/BRM044_AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch

@@ -0,0 +1,43 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 25 Mar 2018 21:49:37 +0200
+Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL
+
+---
+ third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl | 8 ++++----
+ third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl  | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
+--- a/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
++++ b/third_party/WebKit/Source/modules/webaudio/AnalyserNode.idl
+@@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode {
+ 
+     // Copies the current frequency data into the passed array.
+     // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
+-    void getFloatFrequencyData(Float32Array array);
+-    void getByteFrequencyData(Uint8Array array);
++    //void getFloatFrequencyData(Float32Array array);
++    //void getByteFrequencyData(Uint8Array array);
+ 
+     // Real-time waveform data
+-    void getFloatTimeDomainData(Float32Array array);
+-    void getByteTimeDomainData(Uint8Array array);
++    //void getFloatTimeDomainData(Float32Array array);
++    //void getByteTimeDomainData(Uint8Array array);
+ };
+diff --git a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
+--- a/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
++++ b/third_party/WebKit/Source/modules/webaudio/AudioBuffer.idl
+@@ -38,7 +38,7 @@
+ 
+     // Channel access
+     readonly attribute unsigned long numberOfChannels;
+-    [RaisesException] Float32Array getChannelData(unsigned long channelIndex);
+-    [RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
++    //[RaisesException] Float32Array getChannelData(unsigned long channelIndex);
++    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
+     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
+ };
+-- 
+2.7.4
+

patches/performance/0012-use-64-bit-WebView-processes.patch

@@ -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
-

patches/privacy/add-google-en-search.patch

@@ -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,

patches/privacy/add-startpage.patch

@@ -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,

patches/privacy/disable-formatting-in-omnibox.patch

@@ -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;

patches/privacy/disable-google-fonts-3rd-party.patch

@@ -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;

patches/privacy/no-promo.patch

@@ -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

patches/privacy/promo-disable-Google-promotion-fetching.patch

@@ -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())

patches/privacy/restore-classic-ntp.patch

@@ -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);