Release 68.0.3440.72

Changed F.A.Q. about F-Droid
Remove LiberaPay link
2018-07-25 15:37:57 +02:00 · 2018-07-16 21:21:20 +02:00 · 2018-07-16 19:24:46 +02:00 · 2018-07-11 01:46:35 +02:00 · 2018-07-08 16:49:17 +02:00 · 2018-07-07 14:31:59 +02:00
105 changed files with 114043 additions and 96675 deletions
@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a Bromite bug report
+
+---
+
+**Version**
+
+Version: `v67...`
+Arch: `arm` or `arm64` or `x86`
+
+**Is the bug reproducible with latest version?**
+`Bug must be reproducible with latest version`
+
+**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
+`Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
+
+**Is the bug a crash?**
+If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest a privacy-related idea for this project
+
+---
+
+**Is your feature request related to privacy?**
+Only privacy-related feature requests are considered.
+
+**Is there a patch available for this feature somewhere?**
+...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
@@ -1,5 +1,136 @@
+# 68.0.3440.72
+* fix crash during some canvas rendering (fixes https://github.com/bromite/bromite/issues/95)
+* new approach to adblock filtering (fixes https://github.com/bromite/bromite/issues/90)
+* add a flag to enable higher maximum connections per host limit (fixes https://github.com/bromite/bromite/issues/61)
+* add a flag to disable custom tab intents (fixes https://github.com/bromite/bromite/issues/81)
+* add a flag to have an always-empty new tab page (fixes https://github.com/bromite/bromite/issues/82)
+* reduced randomization of TextMetrics and ClientRects results
+* disable ads metrics by default
+* disable all field trials (fixes https://github.com/bromite/bromite/issues/83)
+* re-introduced own battery API patch (fixes https://github.com/bromite/bromite/issues/80)
+* updated AdBlock filters
+
+# 67.0.3396.107
+* removed patch to use Android Media Player for URLs (fixes https://github.com/bromite/bromite/issues/71)
+* updated AdBlock filters
+
+# 67.0.3396.101
+* set home page to new tab page
+* adjust order of new menu entries, remove help menu item (fixes https://github.com/bromite/bromite/issues/76)
+* remove some Play Services integrations: Auth, Vision, GCM
+* remove TOS/metrics and translate
+* net/cert: increase default key length for newly-generated RSA keys
+* dns: send IPv6 connectivity probes to RIPE DNS rather than Google
+* profile-resetter: do not tick send-settings by default
+* autofill: disable autofill download manager
+* first_run: deactivate autoupdate globally
+* safe_browsing: disable incident reporting
+* safe_browsing: disable reporting of safebrowsing override
+* safe_browsing: disable cookie transmission
+* extensions: always show component extensions in the ext list
+* translate: disable fetching of translate languages from server
+* updated AdBlock filters
+
+# 67.0.3396.95
+* reduce headers sent in DoH requests (fixes https://github.com/bromite/bromite/issues/70)
+* serve DoH requests with maximum priority
+* `CloudFlare` -> `Cloudflare` (fixes https://github.com/bromite/bromite/issues/73)
+* fingerprint mitigations: cover also `ConvertToArrayBufferContents`
+* removed redundant own patch for battery API
+* updated AdBlock filters
+
+# 67.0.3396.92
+* improve randomization for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
+* updated AdBlock filters
+
+# 67.0.3396.88
+* add flag for DNS-over-HTTPS (Google experimental DNS) (fixes https://github.com/bromite/bromite/issues/68)
+* disable signin, translate and data saver UI/internal components (fixes https://github.com/bromite/bromite/issues/67)
+* rename `GoogleEN` -> `Google In English` (fixes https://github.com/bromite/bromite/issues/66)
+* re-enabled text metrics and ToDataURL, ToBlob with randomization of color data (fixes https://github.com/bromite/bromite/issues/52)
+* open YouTube links in Bromite
+* use Android Media Player for URLs
+* add exit menu item
+* hide "send reports to Google" menu item
+* updated AdBlock filters
+
+# 67.0.3396.82
+* updated AdBlock filters
+
+# 67.0.3396.76
+* updated AdBlock filters
+
+# 67.0.3396.72
+* add global toggle for adblock engine (https://github.com/bromite/bromite/issues/53)
+* updated AdBlock filters
+
+# 67.0.3396.67
+* updated AdBlock filters
+
+# 66.0.3359.202
+* fix DevTools integration (https://github.com/bromite/bromite/issues/23)
+* allow toggling of Javascript from New Tab Page (fixes https://github.com/bromite/bromite/issues/60)
+* updated AdBlock filters
+
+# 66.0.3359.200
+* updated AdBlock filters
+
+# 66.0.3359.196
+* updated AdBlock filters
+
+# 66.0.3359.188
+* updated AdBlock filters
+* increase max (persistent) connections per server from 6 to 15
+* preliminary work for better canvas fingerprinting mitigations
+
+# 66.0.3359.161
+* updated AdBlock filters
+
+# 66.0.3359.148
+* disable permanently all custom tab intents (https://github.com/bromite/bromite/issues/17)
+* updated AdBlock filters
+* reduce randomization for client rects from 5% to 3%
+
+# 65.0.3325.230
+* fixed permission to access Google account issue (https://github.com/bromite/bromite/issues/11)
+* updated AdBlock filters
+
+# 65.0.3325.218
+* always set WideVine version
+* updated AdBlock filters
+
+# 65.0.3325.204
+* add menu option to toggle global Javascript preferences setting (https://github.com/bromite/bromite/issues/37)
+* add fingeprinting mitigation for getClientRects, getBoundingClientRect
+* set audio latency to fixed number
+* updated AdBlock filters
+
+# 65.0.3325.198
+* re-landed support for third-party AdBlock filters
+* completed patches cleanup
+* updated AdBlock filters
+
+# 65.0.3325.190
+* block some Canvas and AudioBuffer APIs mostly used for fingerprinting (https://github.com/bromite/bromite/issues/15)
+* updated AdBlock filters
+
+# 65.0.3325.176
+* block plugins enumeration API
+* block battery API
+* remove device name and build id from User Agent
+* added Qwant search engine
+* updated AdBlock filters
+* disable non-working 3rd-party filters support
+
+# 64.0.3282.204
+* use H264 NEON optimizations also for arm64
+* fix build of Stable channel
+* updated AdBlock filters
+* started building vanilla Chromium releases as well
+
 # 64.0.3282.193
 * updated AdBlock filters
+* disable reporting

 # 64.0.3282.182
 * add support for domain-based adblock filters
@@ -1,6 +1,6 @@
 # Bromite - Take back your browser

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

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

@@ -10,8 +10,12 @@ Bromite is only available for Android v4.1 and above.

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

-<img src="https://bromite.org/downloads.svg" alt="downloads on Github" title="downloads on Github" />
-<img src="https://bromite.org/xda_labs.svg" alt="downloads on XDA Labs" title="downloads on XDA Labs" />
+<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

@@ -21,48 +25,106 @@ Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjec

 Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)

-BTC donations address: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`
+<a href="bitcoin:3MkC3idL61npQSCxL1gceksmRTkNkiCPcG">BTC donations address</a>: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`

 ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

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

 ## 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.

+## Does Bromite require root?
+No.
+
+## 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.
+
+## How to enable DNS-over-HTTPS?
+
+See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
+
+## 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.
+
+## Is Bromite on Play Store?
+No, and this is unlikely to change. The Play Store would not allow total freedom on the adblocking choice, amongst other limitations.
+
+## Is Bromite on F-Droid?
+No and there are no plans to support it; but feel free to submit it yourself.
+
+## Does Bromite support WebRTC?
+No, it is not built-in.
+
+# Features
+
+* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
+* remove click-tracking and AMP from search results
+* DNS-over-HTTPS support via Google/CloudFlare servers
+* allow playing videos in background
+* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
+* webRTC, canvas, audio and other anti-fingerprinting mitigations
+* all codecs included (proprietary, open H.264 etc.)
+* built with official speed optimizations
+
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
+
 # Releases

-A build server goes through the very lengthy build operation and then new versions are available in this project as [releases](https://github.com/bromite/bromite/releases).
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device.

-Each tag corresponds to a Chromium release tag.
+Each tag corresponds to a Chromium Stable release tag.
+
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
+Additionally, [SystemWebView](https://www.bromite.org/system_web_view), Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+
+## Integrity and authenticity
+
+You can verify the integrity of a downloaded APK file from this project with any `sha256sum`-compatible tool by downloading the corresponding `brm_X.Y.Z.sha256.txt` or `chr_X.Y.Z.sha256.txt` file, where X.Y.Z is the release version number. Example:
+```
+$ sha256sum --check brm_68.0.3440.54.sha256.txt
+arm64_SystemWebView.apk: OK
+arm64_ChromePublic.apk: OK
+arm64_ChromeModernPublic.apk: OK
+arm64_MonochromePublic.apk: OK
+```
+
+If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
+
+You can verify authenticity, e.g. that the author ([csagan5](https://github.com/csagan5)) released the file, by using gpg2:
+```
+$ gpg2 --quiet --verify brm_68.0.3440.54.sha256.txt.asc
+gpg: assuming signed data in 'brm_68.0.3440.54.sha256.txt'
+gpg: Signature made Sun 08 Jul 2018 04:22:52 PM CEST using RSA key ID D85DC0C5
+gpg: Good signature from "csagan5 <32685696+csagan5@users.noreply.github.com>"
+```
+
+You can download csagan5's public GnuPG key from here: [csagan5.asc](./csagan5.asc).
+
+**NOTE:** releases before v68 did not have published signed hashes files.

 # 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.

 # Credits

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

 # License

@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFphnJwBCAC1qSMaPR5Nq9sEHa9ZePwoGLFafjOBcApz7IYW7dIsQYXVUHlo
+lbBwwfFUjnnIf/wzZ42ck/QGRKJ18qA9VybWyT8as0Sz26Tmxah31vI7kzlBZCYY
+/ZER5N3onQFVVVoynYxmep5HdK7enAXOtLBOogbJ/x2Q9ITPuJ+Pv3b4R5E2ui/i
+hFAruUh+oifPBzh3fjBTTr0uvDqbsnsczQptFghKxYyJiPTblCD51Ou11a3uNt1y
+PuG1bR5jImgt33T6zjdFac6kQ2Zalxa/URU/FQPiYJ1X2J1jCgdEgRKlK70ha+oN
+mnVWhFzjecuCw180HCZh1OQho+LPWbtMFyvtABEBAAG0M2NzYWdhbjUgPDMyNjg1
+Njk2K2NzYWdhbjVAdXNlcnMubm9yZXBseS5naXRodWIuY29tPokBIgQTAQgAFgUC
+WmGcnAkQZBkKUdhdwMUCGwsCGQEAADpDB/4zlnDg1gToKqtz994jLzUM7PJOPTWa
+c8xGCj7l8BpGcCOK0fk7fOQ+bDYT0OSHZ1OCR7Gbm6ENu03wNLQ7W9Tr0uf/yDIP
+mItcFk6nYmMKPnK6bd7QWLMsT9mK6mYb02zt6Ql8D7EsWGxifQVQG85ETObhoSqw
+EH6zqZvflxJLmN+vh/Orm1ipzEvw7cjvpSloDwypjY6x9MGEE9utFcGySx726gKu
+Wmz417QZc/TpylCd1p72G9pCqv1Si+y+P9tSEdjWSM6EqEwMr5W+IJ1O6BZQ7A9p
+0l2FZqYC2WkRDJZqWiYoYltP6z1SEbbVI5rQaaVAesS1Ae8OOR9EmlK8
+=6Hsd
+-----END PGP PUBLIC KEY BLOCK-----
@@ -1,13 +1,16 @@
-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
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -88,7 +88,7 @@ void CookieSettings::GetCookieSettings(
+@@ -111,7 +111,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -16,3 +19,6 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
+-- 
+2.7.4
+
@@ -1,21 +0,0 @@
-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
--- 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
@@ -1,7 +1,10 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Nov 26 11:40:05 2017 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 11:40:05 +0100
+Subject: Restore classic new tab page

-    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
@@ -18,3 +21,6 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
 }
 
 bool ShouldDelayRemoteNTP(const GURL& search_provider_url, Profile* profile) {
+-- 
+2.7.4
+
@@ -0,0 +1,45 @@
+From: Joachim Bauch <jojo@struktur.de>
+Date: Tue, 4 Aug 2015 15:15:53 +0200
+Subject: battery_status_service: disable more privacy nightmares
+
+The W3C Battery Status API[1] has quite a laughable statement:
+
+"The information disclosed has minimal impact on privacy or
+fingerprinting, and therefore is exposed without permission grants".
+
+Along comes a paper "The leaking battery, A privacy analysis of the
+HTML5 Battery Status API."
+
+Clean up after the W3C and disable the battery status updater which
+could be used to identity users[2].
+
+[1] http://www.w3.org/TR/battery-status/
+[2] https://eprint.iacr.org/2015/616.pdf
+
+References: https://github.com/iridium-browser/iridium-browser/issues/40
+---
+ services/device/battery/battery_status_service.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
+--- 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) {
+   if (!battery_fetcher_)
+     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
+ 
+#if 0
+   if (callback_list_.empty()) {
+     bool success = battery_fetcher_->StartListeningBatteryChange();
+     // On failure pass the default values back.
+@@ -52,6 +53,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+     // Send recent status to the new callback if already available.
+     callback.Run(status_);
+   }
+#endif
+ 
+   return callback_list_.Add(callback);
+ }
+-- 
+2.7.4
+
@@ -0,0 +1,77 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 22 Mar 2018 22:11:57 +0100
+Subject: Battery API: return nothing
+
+---
+ services/device/battery/battery_status_service.cc  |  2 +-
+ .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
+ 2 files changed, 5 insertions(+), 22 deletions(-)
+
+diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
+--- a/services/device/battery/battery_status_service.cc
+++ b/services/device/battery/battery_status_service.cc
+@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+   if (!battery_fetcher_)
+     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
+ 
+-#if 0
+#if !defined(OS_ANDROID)
+   if (callback_list_.empty()) {
+     bool success = battery_fetcher_->StartListeningBatteryChange();
+     // On failure pass the default values back.
+diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
+--- a/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
+@@ -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
+
@@ -1,27 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:57:29 2017 +0200
-
-    Disable battery status service
-
-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
--- 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) {
-   if (!battery_fetcher_)
-     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
- 
-+#if 0
-   if (callback_list_.empty()) {
-     bool success = battery_fetcher_->StartListeningBatteryChange();
-     // On failure pass the default values back.
-@@ -52,6 +53,10 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-     // Send recent status to the new callback if already available.
-     callback.Run(status_);
-   }
-+#else
-+  // Always pass the default values.
-+  callback.Run(BatteryStatus());
-+#endif
- 
-   return callback_list_.Add(callback);
- }
@@ -1,7 +1,11 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 22:58:52 2017 +0200
+From: Joachim Bauch <jojo@struktur.de>
+Date: Mon, 1 Jun 2015 17:14:34 +0200
+Subject: google-cloud-messaging: disable experiment status check

-    Disable GCM status check
+This avoids trk:263 from triggering.
+---
+ 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
 --- a/components/gcm_driver/gcm_channel_status_request.cc
@@ -22,7 +26,7 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
 
 void GCMChannelStatusRequest::Start() {
 +#if 0
-   DCHECK(!url_fetcher_.get());
+   DCHECK(!url_fetcher_);
 
   GURL request_url(channel_status_request_url_);
@@ -112,6 +115,9 @@ void GCMChannelStatusRequest::Start() {
@@ -35,3 +39,6 @@ diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gc
 }
 
 void GCMChannelStatusRequest::OnURLFetchComplete(
+-- 
+2.7.4
+
@@ -1,63 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Thu Oct 12 01:35:53 2017 +0200
-
-    Disable updater pings
-
-diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
--- a/components/component_updater/configurator_impl.cc
-+++ b/components/component_updater/configurator_impl.cc
-@@ -56,8 +56,10 @@ const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates";
- const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads";
- #endif  // defined(OS_WIN)
- 
-+#if 0
- const base::Feature kAlternateComponentUrls{"AlternateComponentUrls",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+#endif
- 
- // If there is an element of |vec| of the form |test|=.*, returns the right-
- // hand side of that assignment. Otherwise, returns an empty string.
-@@ -86,8 +88,7 @@ ConfiguratorImpl::ConfiguratorImpl(const base::CommandLine* cmdline,
-     : fast_update_(false),
-       pings_enabled_(false),
-       deltas_enabled_(false),
-      background_downloads_enabled_(false),
-      require_encryption_(require_encryption) {
-+      background_downloads_enabled_(false) {
-   // Parse comma-delimited debug flags.
-   std::vector<std::string> switch_values = base::SplitString(
-       cmdline->GetSwitchValueASCII(switches::kComponentUpdater), ",",
-@@ -135,22 +136,6 @@ int ConfiguratorImpl::UpdateDelay() const {
- 
- std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
-   std::vector<GURL> urls;
-  if (url_source_override_.is_valid()) {
-    urls.push_back(GURL(url_source_override_));
-    return urls;
-  }
-
-  if (base::FeatureList::IsEnabled(kAlternateComponentUrls)) {
-    urls.push_back(GURL(kUpdaterDefaultUrlAlt));
-    urls.push_back(GURL(kUpdaterFallbackUrlAlt));
-  } else {
-    urls.push_back(GURL(kUpdaterDefaultUrl));
-    urls.push_back(GURL(kUpdaterFallbackUrl));
-  }
-
-  if (require_encryption_)
-    update_client::RemoveUnsecureUrls(&urls);
-
-   return urls;
- }
- 
-diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
--- a/components/component_updater/configurator_impl.h
-+++ b/components/component_updater/configurator_impl.h
-@@ -89,7 +89,6 @@ class ConfiguratorImpl {
-   bool pings_enabled_;
-   bool deltas_enabled_;
-   bool background_downloads_enabled_;
-  bool require_encryption_;
- 
-   DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
- };
@@ -0,0 +1,64 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 2 Jun 2015 11:01:50 +0200
+Subject: updater: disable updater pings
+
+Despite auto-updater being arguably disabled (see previous commit),
+Chromium would still send background requests. Kill it.
+(trk:170, trk:171)
+---
+ components/component_updater/component_updater_url_constants.cc | 4 ++--
+ components/component_updater/configurator_impl.cc               | 5 +----
+ components/component_updater/configurator_impl.h                | 1 -
+ 3 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/components/component_updater/component_updater_url_constants.cc b/components/component_updater/component_updater_url_constants.cc
+--- a/components/component_updater/component_updater_url_constants.cc
+++ b/components/component_updater/component_updater_url_constants.cc
+@@ -15,9 +15,9 @@ namespace component_updater {
+ // The value of |kDefaultUrlSource| can be overridden with
+ // --component-updater=url-source=someurl.
+ const char kUpdaterDefaultUrl[] =
+-    "https://update.googleapis.com/service/update2";
+    "about:blank";
+ 
+ const char kUpdaterFallbackUrl[] =
+-    "http://update.googleapis.com/service/update2";
+    "about:blank";
+ 
+ }  // namespace component_updater
+diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
+--- a/components/component_updater/configurator_impl.cc
+++ b/components/component_updater/configurator_impl.cc
+@@ -39,8 +39,7 @@ ConfiguratorImpl::ConfiguratorImpl(
+     : background_downloads_enabled_(config_policy.BackgroundDownloadsEnabled()),
+       deltas_enabled_(config_policy.DeltaUpdatesEnabled()),
+       fast_update_(config_policy.FastUpdate()),
+-      pings_enabled_(config_policy.PingsEnabled()),
+-      require_encryption_(require_encryption),
+      pings_enabled_(false),
+       url_source_override_(config_policy.UrlSourceOverride()) {
+   if (config_policy.TestRequest())
+     extra_info_ += "testrequest=\"1\"";
+@@ -70,8 +69,6 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
+   }
+ 
+   std::vector<GURL> urls{GURL(kUpdaterDefaultUrl), GURL(kUpdaterFallbackUrl)};
+-  if (require_encryption_)
+-    update_client::RemoveUnsecureUrls(&urls);
+ 
+   return urls;
+ }
+diff --git a/components/component_updater/configurator_impl.h b/components/component_updater/configurator_impl.h
+--- a/components/component_updater/configurator_impl.h
+++ b/components/component_updater/configurator_impl.h
+@@ -91,7 +91,6 @@ class ConfiguratorImpl {
+   bool deltas_enabled_;
+   bool fast_update_;
+   bool pings_enabled_;
+-  bool require_encryption_;
+   GURL url_source_override_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(ConfiguratorImpl);
+-- 
+2.7.4
+
@@ -1,11 +1,11 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:19:25 2017 +0200
+From: Jan Engelhardt <jengelh@inai.de>
+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!
+---
+ 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
 --- a/components/content_settings/core/browser/content_settings_registry.cc
@@ -19,3 +19,6 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
            WebsiteSettingsInfo::SYNCABLE,
            WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
            ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
+-- 
+2.7.4
+
@@ -1,22 +1,22 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:12:18 2017 +0200
+From: Jan Engelhardt <jengelh@inai.de>
+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.
+---
+ 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
 --- a/net/cert/ev_root_ca_metadata.cc
 +++ b/net/cert/ev_root_ca_metadata.cc
@@ -46,6 +46,16 @@ struct EVMetadata {
+   base::StringPiece policy_oids[kMaxOIDsPerCA];
+ };
 
- // These certificates may be found in net/data/ssl/ev_roots.
- static const EVMetadata ev_root_ca_metadata[] = {
 +  // need some dummy thing to make compiler happy, because
 +  // arraysize() is implemented as a convoluted template rather than
 +  // the traditional sizeof(x)/sizeof(*x)
@@ -27,10 +27,10 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 +    }
 +  },
 +#if 0
+ // These certificates may be found in net/data/ssl/ev_roots.
+ static const EVMetadata kEvRootCaMetadata[] = {
     // AC Camerfirma S.A. Chambers of Commerce Root - 2008
-     // https://www.camerfirma.com
-     {
-@@ -708,7 +718,9 @@ static const EVMetadata ev_root_ca_metadata[] = {
+@@ -750,7 +760,9 @@ static const EVMetadata kEvRootCaMetadata[] = {
           0xd2, 0x09, 0xb7, 0x37, 0xcb, 0xe2, 0xc1, 0x8c, 0xfb, 0x2c, 0x10,
           0xc0, 0xff, 0x0b, 0xcf, 0x0d, 0x32, 0x86, 0xfc, 0x1a, 0xa2}},
         {"2.16.840.1.114404.1.1.2.4.1", ""},
@@ -40,4 +40,7 @@ diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
 +};
 
 #endif  // defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
- 
+ }  // namespace
+-- 
+2.7.4
+
@@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 9 Nov 2014 01:54:27 +0100
+Subject: promo: disable Google promotion fetching
+
+Documentation is scarce, and sprinkled with misleading acronyms.
+NTP is not NTP, for example. FWIW:
+
+// A PromoResourceService fetches data from a web resource server to
+// be used to dynamically change the appearance of the New Tab Page.
+// For example, it has been used to fetch "tips" to be displayed on
+// the NTP, or to display promotional messages to certain groups of
+// Chrome users.
+
+Whatever it is that it downloads, deactivate the one that leads to
+Google.
+
+References: https://github.com/iridium-browser/iridium-browser/issues/33
+---
+ chrome/browser/signin/signin_promo.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
+--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
+@@ -130,6 +130,7 @@ namespace signin {
+ 
+ bool ShouldShowPromoAtStartup(Profile* profile, bool is_new_profile) {
+   DCHECK(profile);
+  return false;
+ 
+   // Don't show if the profile is an incognito.
+   if (profile->IsOffTheRecord())
+-- 
+2.7.4
+
@@ -1,32 +0,0 @@
-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
--- 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())
@@ -1,31 +1,34 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 11 23:24:58 2017 +0200
+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

-    Disables omission of URL elements in Omnibox
-    
-    Disable all omissions (already shadowed by first flag)
+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
-@@ -401,13 +401,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
- 
+@@ -407,12 +407,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
 }  // namespace
 
-const FormatUrlType kFormatUrlOmitNothing = 0;
+ const FormatUrlType kFormatUrlOmitNothing = 0;
 -const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
 -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
 -const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
 -const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-+const FormatUrlType kFormatUrlOmitNothing = 1;
 +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 kFormatUrlTrimAfterHost = 1 << 6;
 
 const FormatUrlType kFormatUrlOmitDefaults =
-     kFormatUrlOmitUsernamePassword | kFormatUrlOmitHTTP |
+-- 
+2.7.4
+
@@ -1,12 +1,30 @@
-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
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -363,7 +363,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -362,7 +362,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -18,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -882,7 +882,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1015,7 +1015,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -30,7 +48,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
 --- a/chrome/browser/io_thread.cc
 +++ b/chrome/browser/io_thread.cc
-@@ -644,7 +644,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -569,7 +569,7 @@ void IOThread::RegisterPrefs(PrefRegistrySimple* registry) {
                                std::string());
   registry->RegisterBooleanPref(prefs::kEnableReferrers, true);
   data_reduction_proxy::RegisterPrefs(registry);
@@ -38,7 +56,7 @@ diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
 +  registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, false);
   registry->RegisterListPref(prefs::kDnsOverHttpsServers);
   registry->RegisterListPref(prefs::kDnsOverHttpsServerMethods);
-   registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true);
+ #if defined(OS_POSIX)
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
@@ -66,7 +84,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -138,7 +138,7 @@ const char Profile::kNoHostedDomainFound[] = "NO_HOSTED_DOMAIN";
+@@ -137,7 +137,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ -82,11 +100,11 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
         </paper-button>
       </div>
       <div slot="footer">
-        <paper-checkbox id="sendSettings" checked>
-+        <paper-checkbox id="sendSettings">
-           $i18nRaw{resetPageFeedback}</paper-checkbox>
+-        <cr-checkbox id="sendSettings" checked>
+        <cr-checkbox id="sendSettings">
+           $i18nRaw{resetPageFeedback}</cr-checkbox>
       </div>
-     </dialog>
+     </cr-dialog>
 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
@@ -104,7 +122,7 @@ diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signi
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -65,11 +65,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -115,9 +133,9 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
   registry->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, true);
 -  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, false);
-   registry->RegisterBooleanPref(prefs::kDevToolsDisabled, false);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
   registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
+   registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
@@ -133,7 +151,7 @@ diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/br
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -144,10 +144,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kLocalDiscoveryNotificationsEnabled,
@@ -159,15 +177,15 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -216,7 +216,7 @@ void AutofillManager::RegisterProfilePrefs(
+@@ -210,7 +210,7 @@ void AutofillManager::RegisterProfilePrefs(
   registry->RegisterIntegerPref(
       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
   registry->RegisterBooleanPref(
 -      prefs::kAutofillEnabled, true,
 +      prefs::kAutofillEnabled, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kAutofillProfileUseDatesFixed, false,
+   registry->RegisterIntegerPref(
+       prefs::kAutofillLastVersionDeduped, 0,
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -189,7 +207,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -346,9 +346,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -370,9 +370,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -204,7 +222,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -330,14 +330,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -365,14 +365,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
   if (is_theme())
     return false;
 
@@ -219,3 +237,6 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
   // 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
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Jul 2018 11:17:53 +0200
+Subject: Disable ads metrics by default
+
+---
+ chrome/common/chrome_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
+@@ -15,7 +15,7 @@ namespace features {
+ // All features in alphabetical order.
+ 
+ // Enables Ads Metrics.
+-const base::Feature kAdsFeature{"AdsMetrics", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kAdsFeature{"AdsMetrics", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ #if defined(OS_ANDROID)
+ const base::Feature kAllowAutoplayUnmutedInWebappManifestScope{
+-- 
+2.7.4
+
@@ -1,12 +1,15 @@
-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
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -244,10 +244,10 @@ PasswordFormManager* FindMatchedManager(
+@@ -228,10 +228,10 @@ PasswordFormManager* FindMatchedManager(
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -17,5 +20,8 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
 -      prefs::kCredentialsEnableAutosignin, true,
 +      prefs::kCredentialsEnableAutosignin, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
-   registry->RegisterBooleanPref(prefs::kWasObsoleteHttpDataCleaned, false);
   registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
+                                PrefRegistry::NO_REGISTRATION_FLAGS);
+-- 
+2.7.4
+
@@ -1,12 +1,15 @@
-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
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -41,16 +41,16 @@ const base::Feature kArticleSuggestionsExpandableHeader{
+@@ -38,13 +38,13 @@ const base::Feature kArticleSuggestionsExpandableHeader{
     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kArticleSuggestionsFeature{
@@ -17,12 +20,12 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 -    "NTPBookmarkSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "NTPBookmarkSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kRecentOfflineTabSuggestionsFeature{
-     "NTPOfflinePageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
 const base::Feature kIncreasedVisibility{"NTPSnippetsIncreasedVisibility",
 -                                         base::FEATURE_ENABLED_BY_DEFAULT};
 +                                         base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kPhysicalWebPageSuggestionsFeature{
-     "NTPPhysicalWebPageSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kForeignSessionsSuggestionsFeature{
+     "NTPForeignSessionsSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.7.4
+
@@ -1,7 +1,13 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Oct 15 21:45:46 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
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -52,3 +58,6 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
 
 body,
 table,
+-- 
+2.7.4
+
@@ -1,14 +1,17 @@
-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
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -84,10 +84,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -87,10 +87,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 false);
 #endif
- #if BUILDFLAG(ENABLE_WEBRTC)
   // TODO(guoweis): Remove next 2 options at M50.
 -  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
 -  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
@@ -18,5 +21,8 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 -                               content::kWebRTCIPHandlingDefault);
 +                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
- #endif
 
+   // Dictionaries to keep track of default tasks in the file browser.
+-- 
+2.7.4
+
@@ -1,24 +1,28 @@
-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
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
-@@ -140,7 +140,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+@@ -141,7 +141,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(new DataReductionProxyFirstRunFragment.Page());
-+            //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
 --- 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
-@@ -149,6 +149,7 @@ public class DataReductionProxySettings {
+@@ -150,6 +150,7 @@ public class DataReductionProxySettings {
         // DataReductionProxySettings is a singleton that lives forever and there's no clean
         // shutdown of Chrome on Android
         mNativeDataReductionProxySettings = nativeInit();
@@ -26,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/D
     }
 
     /** Returns true if the SPDY proxy promo is allowed to be shown. */
-@@ -171,6 +172,7 @@ public class DataReductionProxySettings {
+@@ -172,6 +173,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) {
@@ -46,3 +50,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/dat
     }
 
     /**
+-- 
+2.7.4
+
@@ -1,7 +1,12 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Nov 26 22:51:43 2017 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 22:51:43 +0100
+Subject: Skip the first run and metrics

-    Skip the first run and metrics
+---
+ .../chrome/browser/firstrun/FirstRunStatus.java        |  8 ++++----
+ .../chrome/browser/firstrun/FirstRunUtils.java         | 16 ++++++----------
+ .../browser/firstrun/ToSAndUMAFirstRunFragment.java    | 18 ++++++------------
+ 3 files changed, 16 insertions(+), 26 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
@@ -51,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 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
+@@ -74,20 +74,14 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
             }
         });
 
@@ -77,4 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 +
         mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
 
-         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan() {
+         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> {
+-- 
+2.7.4
+
@@ -0,0 +1,220 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 14:23:07 +0200
+Subject: Disable signin and data saver preferences
+
+Never show the data saver promo snackbar
+---
+ chrome/android/java/res/xml/main_preferences.xml   |  8 +++---
+ .../chromium/chrome/browser/ChromeActivity.java    |  6 ++--
+ .../browser/preferences/MainPreferences.java       | 32 ++++++++++++----------
+ 3 files changed, 26 insertions(+), 20 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -6,10 +6,10 @@
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+     android:orderingFromXml="false">
+ 
+-    <org.chromium.chrome.browser.preferences.SignInPreference
+    <!-- org.chromium.chrome.browser.preferences.SignInPreference
+         android:key="sign_in"
+         android:order="0"
+-        android:title="@string/sign_in_to_chrome"/>
+        android:title="@string/sign_in_to_chrome"/-->
+ 
+     <PreferenceCategory
+         android:key="basics_section"
+@@ -70,11 +70,11 @@
+         android:key="languages"
+         android:order="12"
+         android:title="@string/prefs_languages"/>
+-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
+    <!-- org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences"
+         android:key="data_reduction"
+         android:order="13"
+-        android:title="@string/data_reduction_title"/>
+        android:title="@string/data_reduction_title"/-->
+     <org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
+         android:key="downloads"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -115,7 +115,7 @@ import org.chromium.chrome.browser.printing.TabPrinter;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.share.ShareMenuActionHandler;
+ import org.chromium.chrome.browser.snackbar.BottomContainer;
+-import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
+//import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController;
+ import org.chromium.chrome.browser.snackbar.DataUseSnackbarController;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
+@@ -258,7 +258,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+     private SnackbarManager mSnackbarManager;
+     private ModalDialogManager mModalDialogManager;
+     private DataUseSnackbarController mDataUseSnackbarController;
+-    private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
+    //private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController;
+     private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate;
+     private AppMenuHandler mAppMenuHandler;
+     private ToolbarManager mToolbarManager;
+@@ -577,6 +577,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+                     mDataUseSnackbarController.showDataUseTrackingEndedBar();
+                 }
+ 
+/*
+                 // Only alert about data savings once the first paint has happened. It doesn't make
+                 // sense to show a snackbar about savings when nothing has been displayed yet.
+                 if (DataReductionProxySettings.getInstance().isSnackbarPromoAllowed(tab.getUrl())) {
+@@ -589,6 +590,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+                             DataReductionProxySettings.getInstance()
+                                     .getTotalHttpContentLengthSaved());
+                 }
+*/
+             }
+ 
+             @Override
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+@@ -18,9 +18,9 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.autofill.PersonalDataManager;
+ import org.chromium.chrome.browser.contextual_suggestions.EnabledStateMonitor;
+-import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+//import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+-import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
+//import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
+ import org.chromium.chrome.browser.search_engines.TemplateUrl;
+ import org.chromium.chrome.browser.search_engines.TemplateUrlService;
+ import org.chromium.chrome.browser.signin.SigninManager;
+@@ -35,20 +35,20 @@ import java.util.Map;
+  */
+ public class MainPreferences extends PreferenceFragment
+         implements SigninManager.SignInStateObserver, TemplateUrlService.LoadListener {
+-    public static final String PREF_SIGN_IN = "sign_in";
+    //public static final String PREF_SIGN_IN = "sign_in";
+     public static final String PREF_AUTOFILL_SETTINGS = "autofill_settings";
+     public static final String PREF_SEARCH_ENGINE = "search_engine";
+     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
+     public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
+     public static final String PREF_HOMEPAGE = "homepage";
+-    public static final String PREF_DATA_REDUCTION = "data_reduction";
+    //public static final String PREF_DATA_REDUCTION = "data_reduction";
+     public static final String PREF_NOTIFICATIONS = "notifications";
+     public static final String PREF_LANGUAGES = "languages";
+     public static final String PREF_DOWNLOADS = "downloads";
+ 
+     private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
+     private final Map<String, Preference> mAllPreferences = new HashMap<>();
+-    private SignInPreference mSignInPreference;
+    //private SignInPreference mSignInPreference;
+ 
+     public MainPreferences() {
+         setHasOptionsMenu(true);
+@@ -64,25 +64,29 @@ public class MainPreferences extends PreferenceFragment
+     @Override
+     public void onDestroy() {
+         super.onDestroy();
+-        mSignInPreference.onPreferenceFragmentDestroyed();
+        //mSignInPreference.onPreferenceFragmentDestroyed();
+     }
+ 
+     @Override
+     public void onStart() {
+         super.onStart();
+/*
+         if (SigninManager.get().isSigninSupported()) {
+             SigninManager.get().addSignInStateObserver(this);
+             mSignInPreference.registerForUpdates();
+         }
+*/
+     }
+ 
+     @Override
+     public void onStop() {
+         super.onStop();
+/*
+         if (SigninManager.get().isSigninSupported()) {
+             SigninManager.get().removeSignInStateObserver(this);
+             mSignInPreference.unregisterForUpdates();
+         }
+*/
+     }
+ 
+     @Override
+@@ -98,7 +102,7 @@ public class MainPreferences extends PreferenceFragment
+         setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
+         setManagedPreferenceDelegateForPreference(PREF_AUTOFILL_SETTINGS);
+         setManagedPreferenceDelegateForPreference(PREF_SAVED_PASSWORDS);
+-        setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
+        //setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
+ 
+         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+             // If we are on Android O+ the Notifications preference should lead to the Android
+@@ -154,7 +158,7 @@ public class MainPreferences extends PreferenceFragment
+             Preference preference = getPreferenceScreen().getPreference(index);
+             mAllPreferences.put(preference.getKey(), preference);
+         }
+-        mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
+        //mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
+     }
+ 
+     private void setManagedPreferenceDelegateForPreference(String key) {
+@@ -163,12 +167,6 @@ public class MainPreferences extends PreferenceFragment
+     }
+ 
+     private void updatePreferences() {
+-        if (SigninManager.get().isSigninSupported()) {
+-            addPreferenceIfAbsent(PREF_SIGN_IN);
+-        } else {
+-            removePreferenceIfPresent(PREF_SIGN_IN);
+-        }
+-
+         updateSearchEnginePreference();
+ 
+         if (HomepageManager.shouldShowHomepageSetting()) {
+@@ -190,9 +188,11 @@ public class MainPreferences extends PreferenceFragment
+             removePreferenceIfPresent(PREF_CONTEXTUAL_SUGGESTIONS);
+         }
+ 
+/*
+         ChromeBasePreference dataReduction =
+                 (ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);
+         dataReduction.setSummary(DataReductionPreferences.generateSummary(getResources()));
+*/
+     }
+ 
+     private Preference addPreferenceIfAbsent(String key) {
+@@ -263,9 +263,11 @@ public class MainPreferences extends PreferenceFragment
+                 if (PREF_SAVED_PASSWORDS.equals(preference.getKey())) {
+                     return PrefServiceBridge.getInstance().isRememberPasswordsManaged();
+                 }
+/*
+                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
+                     return DataReductionProxySettings.getInstance().isDataReductionProxyManaged();
+                 }
+*/
+                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
+                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
+                 }
+@@ -283,11 +285,13 @@ public class MainPreferences extends PreferenceFragment
+                     return prefs.isRememberPasswordsManaged()
+                             && !prefs.isRememberPasswordsEnabled();
+                 }
+/*
+                 if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
+                     DataReductionProxySettings settings = DataReductionProxySettings.getInstance();
+                     return settings.isDataReductionProxyManaged()
+                             && !settings.isDataReductionProxyEnabled();
+                 }
+*/
+                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
+                     return TemplateUrlService.getInstance().isDefaultSearchManaged();
+                 }
+-- 
+2.7.4
+
@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:09:26 +0200
+Subject: Disable signin/data reduction promos
+
+---
+ .../java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java    | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -554,7 +554,7 @@ public class ChromeTabbedActivity
+             // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
+             //                might not have completed at this point and we could show multiple
+             //                promos.
+-            boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
+            /*boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
+             // Promo dialogs in multiwindow mode are broken on some devices: http://crbug.com/354696
+             boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
+             if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
+@@ -574,7 +574,7 @@ public class ChromeTabbedActivity
+                 preferenceManager.setPromosSkippedOnFirstStart(true);
+             }
+ 
+-            if (!isShowingPromo) {
+            if (!isShowingPromo) */ {
+                 ToolbarButtonInProductHelpController.maybeShowColdStartIPH(this);
+             }
+ 
+-- 
+2.7.4
+
@@ -0,0 +1,177 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Wed, 22 Mar 2017 19:10:30 -0400
+Subject: Removed Sync and Translate menu
+
+---
+ .../java/res/drawable-hdpi/settings_translate.png  | Bin 399 -> 0 bytes
+ .../java/res/drawable-mdpi/settings_translate.png  | Bin 284 -> 0 bytes
+ .../java/res/drawable-xhdpi/settings_translate.png | Bin 547 -> 0 bytes
+ .../res/drawable-xxhdpi/settings_translate.png     | Bin 793 -> 0 bytes
+ .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
+ .../java/res/xml/site_settings_preferences.xml     |   8 +++----
+ .../website/SiteSettingsPreferences.java           |  26 ++++++++++-----------
+ headless/lib/browser/protocol/browser_handler.cc   |   2 +-
+ 8 files changed, 18 insertions(+), 18 deletions(-)
+ delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxhdpi/settings_translate.png
+ delete mode 100644 chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
+
+diff --git a/chrome/android/java/res/drawable-hdpi/settings_translate.png b/chrome/android/java/res/drawable-hdpi/settings_translate.png
+deleted file mode 100644
+index 8067680e81c6ffa1a003c579411173827a3a9f96..0000000000000000000000000000000000000000
+diff --git a/chrome/android/java/res/drawable-mdpi/settings_translate.png b/chrome/android/java/res/drawable-mdpi/settings_translate.png
+deleted file mode 100644
+index 3b9b4cd482d36a60d4ff0a110b0bcefabe4c1060..0000000000000000000000000000000000000000
+diff --git a/chrome/android/java/res/drawable-xhdpi/settings_translate.png b/chrome/android/java/res/drawable-xhdpi/settings_translate.png
+deleted file mode 100644
+index 131a57394ca30dcff4bebcb2471bbbf0e1ac134e..0000000000000000000000000000000000000000
+diff --git a/chrome/android/java/res/drawable-xxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxhdpi/settings_translate.png
+deleted file mode 100644
+index 55878e697b1afed1b4f039a561dc6212e24fc024..0000000000000000000000000000000000000000
+diff --git a/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png b/chrome/android/java/res/drawable-xxxhdpi/settings_translate.png
+deleted file mode 100644
+index 058b50b84dd216d983e9dea2ea264b39773ac318..0000000000000000000000000000000000000000
+diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
+index 1159fd1..4a13a36 100644
+--- a/chrome/android/java/res/xml/site_settings_preferences.xml
+++ b/chrome/android/java/res/xml/site_settings_preferences.xml
+@@ -44,9 +44,9 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="ads" />
+     <!-- Background sync -->
+-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+    <!--<org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+-        android:key="background_sync" />
+        android:key="background_sync" />-->
+     <!-- Protected content -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+@@ -66,11 +66,11 @@
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="sound" />
+     <!-- Google Translate -->
+-    <Preference
+    <!-- <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.website.TranslatePreferences"
+         android:key="translate"
+         android:title="@string/google_translate"
+-        android:icon="@drawable/settings_translate" />
+        android:icon="@drawable/settings_translate" />-->
+     <!-- Storage -->
+     <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+index 2da84aa9..f3ee0d2 100644
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+@@ -39,7 +39,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     static final String ALL_SITES_KEY = "all_sites";
+     static final String ADS_KEY = "ads";
+     static final String AUTOPLAY_KEY = "autoplay";
+-    static final String BACKGROUND_SYNC_KEY = "background_sync";
+    //static final String BACKGROUND_SYNC_KEY = "background_sync";
+     static final String CAMERA_KEY = "camera";
+     static final String CLIPBOARD_KEY = "clipboard";
+     static final String COOKIES_KEY = "cookies";
+@@ -52,7 +52,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+     static final String PROTECTED_CONTENT_KEY = "protected_content";
+     static final String SOUND_KEY = "sound";
+     static final String STORAGE_KEY = "use_storage";
+-    static final String TRANSLATE_KEY = "translate";
+    //static final String TRANSLATE_KEY = "translate";
+     static final String USB_KEY = "usb";
+ 
+     // Whether the Protected Content menu is available for display.
+@@ -87,8 +87,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS;
+         } else if (AUTOPLAY_KEY.equals(key)) {
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_AUTOPLAY;
+-        } else if (BACKGROUND_SYNC_KEY.equals(key)) {
+-            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;
+        /*} else if (BACKGROUND_SYNC_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;*/
+         } else if (CAMERA_KEY.equals(key)) {
+             return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
+         } else if (CLIPBOARD_KEY.equals(key)) {
+@@ -127,7 +127,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             // menus.
+             getPreferenceScreen().removePreference(findPreference(ALL_SITES_KEY));
+             getPreferenceScreen().removePreference(findPreference(ADS_KEY));
+-            getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
+            //getPreferenceScreen().removePreference(findPreference(BACKGROUND_SYNC_KEY));
+             getPreferenceScreen().removePreference(findPreference(CAMERA_KEY));
+             getPreferenceScreen().removePreference(findPreference(CLIPBOARD_KEY));
+             getPreferenceScreen().removePreference(findPreference(COOKIES_KEY));
+@@ -139,7 +139,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             getPreferenceScreen().removePreference(findPreference(POPUPS_KEY));
+             getPreferenceScreen().removePreference(findPreference(SOUND_KEY));
+             getPreferenceScreen().removePreference(findPreference(STORAGE_KEY));
+-            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+            //getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+             getPreferenceScreen().removePreference(findPreference(USB_KEY));
+         } else {
+             // If both Autoplay and Protected Content menus are available, they'll be tucked under
+@@ -165,9 +165,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             }
+             // The new Languages Preference *feature* is an advanced version of this translate
+             // preference. Once Languages Preference is enabled, remove this setting.
+-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
+            /*if (ChromeFeatureList.isEnabled(ChromeFeatureList.LANGUAGES_PREFERENCE)) {
+                 getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+-            }
+            }*/
+         }
+     }
+ 
+@@ -175,10 +175,10 @@ public class SiteSettingsPreferences extends PreferenceFragment
+         PrefServiceBridge prefServiceBridge = PrefServiceBridge.getInstance();
+ 
+         // Translate preference.
+-        Preference translatePref = findPreference(TRANSLATE_KEY);
+        /*Preference translatePref = findPreference(TRANSLATE_KEY);
+         if (translatePref != null) {
+             setTranslateStateSummary(translatePref);
+-        }
+        }*/
+ 
+         // Preferences that navigate to Website Settings.
+         List<String> websitePrefs = new ArrayList<String>();
+@@ -192,7 +192,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+             // When showing the main menu, if Protected Content is not available, only Autoplay
+             // will be visible.
+             if (!mProtectedContentMenuAvailable) websitePrefs.add(AUTOPLAY_KEY);
+-            websitePrefs.add(BACKGROUND_SYNC_KEY);
+            //websitePrefs.add(BACKGROUND_SYNC_KEY);
+             websitePrefs.add(CAMERA_KEY);
+             if (ChromeFeatureList.isEnabled(ChromeFeatureList.CLIPBOARD_CONTENT_SETTING)) {
+                 websitePrefs.add(CLIPBOARD_KEY);
+@@ -218,8 +218,8 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 checked = PrefServiceBridge.getInstance().adsEnabled();
+             } else if (AUTOPLAY_KEY.equals(prefName)) {
+                 checked = PrefServiceBridge.getInstance().isAutoplayEnabled();
+-            } else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
+-                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();
+            /*} else if (BACKGROUND_SYNC_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().isBackgroundSyncAllowed();*/
+             } else if (CAMERA_KEY.equals(prefName)) {
+                 checked = PrefServiceBridge.getInstance().isCameraEnabled();
+             } else if (CLIPBOARD_KEY.equals(prefName)) {
+diff --git a/headless/lib/browser/protocol/browser_handler.cc b/headless/lib/browser/protocol/browser_handler.cc
+index 97ec5f5..955b233 100644
+--- a/headless/lib/browser/protocol/browser_handler.cc
+++ b/headless/lib/browser/protocol/browser_handler.cc
+@@ -71,7 +71,7 @@ Response BrowserHandler::Close() {
+ Response BrowserHandler::SetWindowBounds(
+     int window_id,
+     std::unique_ptr<Browser::Bounds> window_bounds) {
+-  HeadlessWebContentsImpl* web_contents = web_contents =
+  HeadlessWebContentsImpl* web_contents =
+       browser()->GetWebContentsForWindowId(window_id);
+   if (!web_contents)
+     return Response::Error("Browser window not found");
+-- 
+2.7.4
+
@@ -1,7 +1,10 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:43:35 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:43:35 +0100
+Subject: Never send any crash upload data

-    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
@@ -9,10 +12,13 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t
@@ -122,6 +122,9 @@ void TraceCrashServiceUploader::DoUpload(
     std::unique_ptr<const base::DictionaryValue> metadata,
     const UploadProgressCallback& progress_callback,
-     const UploadDoneCallback& done_callback) {
+     UploadDoneCallback done_callback) {
 +
 +  return;
 +
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   progress_callback_ = progress_callback;
+-- 
+2.7.4
+
@@ -1,114 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Dec 20 22:18:41 2017 +0100
-
-    Revert "Remove Runtime flags for /deep/ and ::shadow used in CSS dynamic profile"
-    
-    This reverts commit 860f43550bf6587ca21900dfdf901fce697cbbb7
-
-diff --git a/third_party/WebKit/Source/core/css/CSSSelector.cpp b/third_party/WebKit/Source/core/css/CSSSelector.cpp
--- a/third_party/WebKit/Source/core/css/CSSSelector.cpp
-+++ b/third_party/WebKit/Source/core/css/CSSSelector.cpp
-@@ -546,8 +546,14 @@ void CSSSelector::UpdatePseudoType(const AtomicString& value,
-         pseudo_type_ = kPseudoUnknown;
-       break;
-     case kPseudoShadow:
-      if (match_ != kPseudoElement || context.IsDynamicProfile())
-        pseudo_type_ = kPseudoUnknown;
-+      if (RuntimeEnabledFeatures::
-+              ShadowPseudoElementInCSSDynamicProfileEnabled()) {
-+        if (match_ != kPseudoElement)
-+          pseudo_type_ = kPseudoUnknown;
-+      } else {
-+        if (match_ != kPseudoElement || context.IsDynamicProfile())
-+          pseudo_type_ = kPseudoUnknown;
-+      }
-       break;
-     case kPseudoBlinkInternalElement:
-       if (match_ != kPseudoElement || mode != kUASheetMode)
-diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.cpp b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
--- a/third_party/WebKit/Source/core/css/SelectorChecker.cpp
-+++ b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
-@@ -336,6 +336,8 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
- 
-   switch (relation) {
-     case CSSSelector::kShadowDeepAsDescendant:
-+      DCHECK(
-+          !RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled());
-       Deprecation::CountDeprecation(context.element->GetDocument(),
-                                     WebFeature::kCSSDeepCombinator);
-       FALLTHROUGH;
-@@ -424,6 +426,11 @@ SelectorChecker::MatchStatus SelectorChecker::MatchForRelation(
-         UseCounter::Count(context.element->GetDocument(),
-                           WebFeature::kPseudoShadowInStaticProfile);
-       }
-+      if (RuntimeEnabledFeatures::
-+                       ShadowPseudoElementInCSSDynamicProfileEnabled()) {
-+          Deprecation::CountDeprecation(context.element->GetDocument(),
-+                                        WebFeature::kCSSSelectorPseudoShadow);
-+      }
-       // If we're in the same tree-scope as the scoping element, then following
-       // a shadow descendant combinator would escape that and thus the scope.
-       if (context.scope && context.scope->OwnerShadowHost() &&
-diff --git a/third_party/WebKit/Source/core/css/StyleEngineTest.cpp b/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
--- a/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
-+++ b/third_party/WebKit/Source/core/css/StyleEngineTest.cpp
-@@ -842,6 +842,14 @@ TEST_F(StyleEngineTest, RuleSetInvalidationV0BoundaryCrossing) {
-   EXPECT_EQ(ScheduleInvalidationsForRules(
-                 *shadow_root, ".a ::content span { background: green}"),
-             kRuleSetInvalidationFullRecalc);
-+  if (RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled()) {
-+    EXPECT_EQ(ScheduleInvalidationsForRules(
-+                  *shadow_root, ".a /deep/ span { background: green}"),
-+              kRuleSetInvalidationFullRecalc);
-+    EXPECT_EQ(ScheduleInvalidationsForRules(
-+                  *shadow_root, ".a::shadow span { background: green}"),
-+              kRuleSetInvalidationFullRecalc);
-+  }
- }
- 
- TEST_F(StyleEngineTest, HasViewportDependentMediaQueries) {
-diff --git a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
--- a/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
-+++ b/third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp
-@@ -1,4 +1,3 @@
-
- // Copyright 2014 The Chromium Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-@@ -667,6 +666,9 @@ CSSSelector::RelationType CSSSelectorParser::ConsumeCombinator(
-       const CSSParserToken& slash = range.ConsumeIncludingWhitespace();
-       if (slash.GetType() != kDelimiterToken || slash.Delimiter() != '/')
-         failed_parsing_ = true;
-+      if (RuntimeEnabledFeatures::DeepCombinatorInCSSDynamicProfileEnabled()) {
-+        return CSSSelector::kShadowDeep;
-+      }
-       return context_->IsDynamicProfile() ? CSSSelector::kShadowDeepAsDescendant
-                                           : CSSSelector::kShadowDeep;
-     }
-diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
--- a/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-+++ b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-@@ -325,6 +325,11 @@
-       name: "DecodeToYUV",
-       status: "experimental",
-     },
-+    // Remove this flag once we can remove /deep/ at M63.
-+    {
-+      name: "DeepCombinatorInCSSDynamicProfile",
-+      status: "test",
-+    },
-     {
-       name: "DeprecationReporting",
-       status: "experimental",
-@@ -980,6 +985,11 @@
-       name: "ShadowPiercingDescendantCombinator",
-       status: "experimental",
-     },
-+    // Remove this flag once we can remove ::shadow at M63.
-+    {
-+      name: "ShadowPseudoElementInCSSDynamicProfile",
-+      status: "test",
-+    },
-     {
-       name: "ShapeDetection",
-       status: "experimental",
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:03:29 +0200
+Subject: Hide "Send reports to Google"
+
+---
+ chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
+--- a/chrome/android/java/res/layout/fre_tosanduma.xml
+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
+@@ -70,7 +70,7 @@
+                         android:layout_height="wrap_content"
+                         android:lineSpacingMultiplier="1.4"
+                         android:text="@string/fre_send_report_check"
+-                        android:textAppearance="@style/BlackBodyDefault" />
+                        android:textAppearance="@style/BlackBodyDefault" android:visibility = "gone" />
+                     </LinearLayout>
+             </LinearLayout>
+         </LinearLayout>
+-- 
+2.7.4
+
@@ -1,71 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Dec 20 22:31:37 2017 +0100
-
-    Revert "Disable runtime flags for /deep/ and ::shadow used in CSS dynamic profile for M63."
-    
-    This reverts commit 0ebd56da93abf970128804390879624b3dc79ac2.
-
-diff --git a/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
--- a/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
-+++ b/third_party/WebKit/LayoutTests/fast/dom/shadow/apply-deep-in-document-scope-expected.txt
-@@ -1,4 +1,4 @@
-CONSOLE WARNING: line 1: /deep/ combinator is no longer supported in CSS dynamic profile.It is now effectively no-op, acting as if it were a descendant combinator. /deep/ combinator will be removed, and will be invalid at M65. You should remove it. See https://www.chromestatus.com/features/4964279606312960 for more details.
-+CONSOLE WARNING: line 1: /deep/ combinator in CSS is deprecated and will be removed in M63, around December 2017. See https://www.chromestatus.com/features/4964279606312960 for more details.
- /deep/ as a descendant selector in document without shadow trees.
- 
- On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-diff --git a/third_party/WebKit/Source/core/frame/Deprecation.cpp b/third_party/WebKit/Source/core/frame/Deprecation.cpp
--- a/third_party/WebKit/Source/core/frame/Deprecation.cpp
-+++ b/third_party/WebKit/Source/core/frame/Deprecation.cpp
-@@ -388,13 +388,13 @@ DeprecationInfo GetDeprecationInfo(WebFeature feature) {
-               "details.")};
- 
-     case WebFeature::kCSSDeepCombinator:
-      return {"CSSDeepCombinator", M65,
-              "/deep/ combinator is no longer supported in CSS dynamic profile."
-              "It is now effectively no-op, acting as if it were a descendant "
-              "combinator. /deep/ combinator will be removed, and will be "
-              "invalid at M65. You should remove it. See "
-              "https://www.chromestatus.com/features/4964279606312960 for more "
-              "details."};
-+      return {"CSSDeepCombinator", M63,
-+              willBeRemoved("/deep/ combinator in CSS", M63, "4964279606312960")};
-+
-+    case WebFeature::kCSSSelectorPseudoShadow:
-+      return {"CSSSelectorPseudoShadow", M63,
-+              willBeRemoved("::shadow pseudo-element in CSS", M63,
-+                           "6750456638341120")};
- 
-     case WebFeature::kVREyeParametersOffset:
-       return {"VREyeParametersOffset", Unknown,
-diff --git a/third_party/WebKit/Source/platform/runtime_enabled_features.json5 b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
--- a/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-+++ b/third_party/WebKit/Source/platform/runtime_enabled_features.json5
-@@ -325,10 +325,11 @@
-       name: "DecodeToYUV",
-       status: "experimental",
-     },
-    // Remove this flag once we can remove /deep/ at M63.
-+    // Introduced this flag as stable so we can re-enable this feature easily
-+    // after we disable this feature.
-     {
-       name: "DeepCombinatorInCSSDynamicProfile",
-      status: "test",
-+      status: "stable",
-     },
-     {
-       name: "DeprecationReporting",
-@@ -985,10 +986,11 @@
-       name: "ShadowPiercingDescendantCombinator",
-       status: "experimental",
-     },
-    // Remove this flag once we can remove ::shadow at M63.
-+    // Introduced this flag as stable so we can re-enable this feature easily
-+    // after we disable this feature.
-     {
-       name: "ShadowPseudoElementInCSSDynamicProfile",
-      status: "test",
-+      status: "stable",
-     },
-     {
-       name: "ShapeDetection",
@@ -1,12 +1,15 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Feb 14 12:56:01 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 14 Feb 2018 12:56:01 +0100
+Subject: Never fetch popular sites

-    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,
+@@ -291,6 +291,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
   DCHECK(!callback_);
   callback_ = callback;
 
@@ -19,3 +22,6 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
   const base::Time last_download_time = base::Time::FromInternalValue(
       prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
   const base::TimeDelta time_since_last_download =
+-- 
+2.7.4
+
@@ -1,81 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Jan 20 21:17:27 2018 +0100
-
-    Compile ARM optimizations for H264
-    Not only when running ChromeOS+ARM but for all ARM devices
-
-diff --git a/content/renderer/media_recorder/h264_encoder.cc b/content/renderer/media_recorder/h264_encoder.cc
--- a/content/renderer/media_recorder/h264_encoder.cc
-+++ b/content/renderer/media_recorder/h264_encoder.cc
-@@ -149,11 +149,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,16 +10,22 @@ import("//third_party/yasm/yasm_assemble.gni")
- # Config shared by all openh264 targets.
- config("config") {
-   cflags = []
-+  defines = []
- 
-+  # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
-+  # devices.
-   if (is_chromeos && target_cpu == "arm") {
-    # HAVE_NEON and __chromeos__ are needed for enabling NEON on ChromeOS
-    # devices.
-    defines = [
-      "HAVE_NEON",
-+    defines += [
-       "__chromeos__",
-     ]
-   }
- 
-+  if (target_cpu == "arm") {
-+    defines += [
-+      "HAVE_NEON",
-+    ]
-+  }
-+
-   # GCC and clang flags. MSVS (is_win && !is_clang) does not use cflags.
-   if (!is_win || is_clang) {
-     cflags += [
-@@ -123,7 +129,7 @@ if (use_assembler) {
- 
- source_set("common") {
-   sources = openh264_common_sources
-  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_common_sources_asm_arm
-   }
-   include_dirs = openh264_common_include_dirs
-@@ -149,7 +155,7 @@ source_set("common") {
- 
- source_set("processing") {
-   sources = openh264_processing_sources
-  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_processing_sources_asm_arm
-   }
-   include_dirs = openh264_processing_include_dirs
-@@ -168,7 +174,7 @@ source_set("processing") {
- 
- source_set("encoder") {
-   sources = openh264_encoder_sources
-  if (is_chromeos && target_cpu == "arm") {
-+  if (target_cpu == "arm") {
-     sources += openh264_encoder_sources_asm_arm
-   }
-   include_dirs = openh264_encoder_include_dirs
@@ -1,19 +1,23 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:14:39 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:14:39 +0100
+Subject: ungoogled-chromium: Disable signin

-    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);
+   ShowSingletonTabOverwritingNTP(browser, std::move(params));
 }
 
 -void NavigateToSingletonTab(Browser* browser, const GURL& url) {
 -  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
 -  params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
-  ShowSingletonTabOverwritingNTP(browser, params);
+-  ShowSingletonTabOverwritingNTP(browser, std::move(params));
 -}
 -
 // Shows either the help app or the appropriate help page for |source|. If
@@ -27,9 +31,9 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.
   Profile* original_profile = browser->profile()->GetOriginalProfile();
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(original_profile);
-@@ -436,6 +431,7 @@ void ShowBrowserSignin(Browser* browser,
-             false));
-     DCHECK_GT(browser->tab_strip_model()->count(), 0);
+@@ -444,6 +439,7 @@ void ShowBrowserSignin(Browser* browser,
+         profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN, browser, access_point);
+ #endif
   }
 +#endif 
 }
@@ -47,3 +51,6 @@ diff --git a/components/signin/core/browser/signin_manager_base.cc b/components/
 }
 
 AccountInfo SigninManagerBase::GetAuthenticatedAccountInfo() const {
+-- 
+2.7.4
+
@@ -1,66 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Oct 28 10:09:41 2017 +0200
-
-    Do not track google search results clicks
-    
-    Limit AMP cleanup to main search results
-
-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -301,6 +301,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",
-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/parser/XMLDocumentParser.h"
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
-+#include "extensions/dont-track-me.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5789,8 +5790,24 @@ void Document::FinishedParsing() {
-     fetcher_->ClearResourcesFromPreviousFetcher();
-   }
- 
-  if (IsPrefetchOnly())
-+  if (IsPrefetchOnly()) {
-     WebPrerenderingSupport::Current()->PrefetchFinished();
-+    return;
-+  }
-+
-+  // determine whether this is a Google search results page
-+  const SecurityOrigin *origin = GetSecurityOrigin();
-+  if (origin) {
-+    WTF::String domain = origin->Domain();
-+    size_t pos = domain.Find(".google.");
-+    auto* bodyElement = body();
-+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+      LOG(INFO) << "injecting dont-track-me Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(DONT_TRACK_ME_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  }
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-new file mode 100644
--- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/dont-track-me.h
-@@ -0,0 +1,6 @@
-+#ifndef dont_track_me_h
-+#define dont_track_me_h
-+
-+#define DONT_TRACK_ME_JS "/* Bromite click-tracking and AMP removal v0.3.5 */\n\nfunction recreateHyperlink(a) {\n    // skip already-sanitized hyperlinks\n    if (a.sane) return false;\n\n    // create new A element - old one has event listeners attached\n    var newA = document.createElement('a');\n    newA.referrerPolicy = 'origin';\n    // property set when hyperlink has been created by this script\n    newA.sane = 1;\n\n    // remove AMP class, get actual page URL\n    var ampCur = a.getAttribute('data-amp-cur');\n    if (ampCur) {\n        newA.href = ampCur;\n        a.classList.remove('amp_r');\n    } else {\n        var realLink = getRealLinkFromGoogleUrl(a);\n        if (realLink) {\n            newA.href = realLink;\n        } else {\n            // might not be an actual hyperlink, ignore it\n            if (!a.href) {\n                return false;\n            }\n            // leave original href unchanged\n            newA.href = a.href;\n        }\n    }\n    // copy CSS classes\n    newA.className = a.className;\n\n    // copy nodes inside the hyperlink\n    while (a.firstChild) {\n        newA.appendChild(a.lastChild);\n    }\n    // replace hyperlink\n    a.parentNode.replaceChild(newA, a);\n    return true;\n}\n\nfunction isResult(a) {\n    if (a.getAttribute('data-amp-cur'))\n        return true;\n    var inlineMousedown = a.getAttribute('onmousedown');\n    if (!inlineMousedown)\n\treturn false;\n    // return rwt(....); // E.g Google search results.\n    // return google.rwt(...); // E.g. sponsored search results\n    // return google.arwt(this); // E.g. sponsored search results (dec 2016).\n    return /\\ba?rwt\\(/.test(inlineMousedown) || /\\bctpacw\\b/.test(inlineMousedown);\n}\n\n/**\n * @returns {String} the real URL if the given link is a Google redirect URL.\n */\nfunction getRealLinkFromGoogleUrl(a) {\n    if ((a.hostname === location.hostname || a.hostname.indexOf('www.google.') == 0) &&\n        /^\\/(local_)?url$/.test(a.pathname)) {\n        // Google Maps / Dito (/local_url?q=<url>)\n        // Mobile (/url?q=<url>)\n        var url = /[?&](?:q|url)=((?:https?|ftp)[%:][^&]+)/.exec(a.search);\n        if (url) {\n            return decodeURIComponent(url[1]);\n        }\n        // Help pages, e.g. safe browsing (/url?...&q=%2Fsupport%2Fanswer...)\n        url = /[?&](?:q|url)=((?:%2[Ff]|\\/)[^&]+)/.exec(a.search);\n        if (url) {\n            return a.origin + decodeURIComponent(url[1]);\n        }\n    }\n}\n\nfunction sanitizeAds() {\n    // scan all divs\n    var div = document.getElementById('tads');\n    if (div) {\n        div.style.display = 'none';\n\treturn true;\n    }\n    return false;\n}\n\nfunction sanitizeAll() {\n      console.log(\"ads removed: \", sanitizeAds());\n      console.log(\"hyperlinks sanitized: \", sanitizeAllHyperlinks());\n}\n\nfunction setMlogoClick() {\n      var mlogo = document.getElementById('mlogo');\n      if (mlogo) {\n        mlogo.removeAttribute(\"href\");\n        mlogo.setAttribute(\"onclick\", \"sanitizeAll()\");\n        console.log(\"logo link replaced\");\n      } else {\n        console.log(\"could not replace logo link\");\n      }\n}\n\nfunction sanitizeAllHyperlinks() {\n    var saned = 0, total = 0;\n    document.querySelectorAll('div[data-hveid]:not([data-hveid=\"\"]) a').forEach(function(a) {\n\ttotal++;\n\tvar res = recreateHyperlink(a);\n\tif (res) saned++;\n    });\n    console.log(\"sanitized \", saned, \"/\", total, \" hyperlinks\");\n\n    return saned;\n}\n\n// avoid running cleanup on non-search pages\nif ((document.location.host.indexOf(\"images.google.\") == -1) && (document.location.host.indexOf(\"news.google.\") == -1)) {\n//    document.addEventListener('touchstart', handlePointerPress, true);\n    sanitizeAll();\n}\nsetMlogoClick();\n"
-+
-+#endif  // dont_track_me_h
@@ -0,0 +1,56 @@
+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 | 28 ++++------------------
+ 1 file changed, 4 insertions(+), 24 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
+@@ -114,30 +114,7 @@ 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)) {
+-    webrtc_logging::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 =
+-        webrtc_logging::LogList::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(
+@@ -148,6 +125,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,
+                  upload_done_data.incoming_rtp_dump,
+-- 
+2.7.4
+
@@ -1,13 +1,22 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:28:11 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:28:11 +0100
+Subject: ungoogled-chromium: Disable untraceable URLs

-    ungoogled-chromium: Disable untraceable URLs
-    Disable additional URLs that are not caught by the "trk" scheme
+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       | 5 +----
+ 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(+), 14 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(
+@@ -73,7 +73,7 @@ void RlzPingHandler::Ping(
   DCHECK_EQ(id.length(), 50u);
 
   GURL request_url(base::StringPrintf(
@@ -19,7 +28,17 @@ diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/and
 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
-@@ -69,7 +69,7 @@ GURL GetPluginsServerURL() {
+@@ -51,9 +51,6 @@ const int kStartResourceFetchDelayMs = 60 * 1000;
+ // Delay between calls to update the cache 1 day and 2 minutes in testing mode.
+ const int kCacheUpdateDelayMs = 24 * 60 * 60 * 1000;
+ 
+-const char kPluginsServerUrl[] =
+-    "https://www.gstatic.com/chrome/config/plugins_3/";
+-
+ GURL GetPluginsServerURL() {
+   std::string filename;
+ #if defined(OS_WIN)
+@@ -68,7 +65,7 @@ GURL GetPluginsServerURL() {
 #error Unknown platform
 #endif
 
@@ -31,7 +50,7 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
 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 {
+@@ -35,8 +35,6 @@ namespace safe_browsing {
 // Model Loader strings
 const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
 const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
@@ -40,39 +59,39 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/b
 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)
+@@ -90,7 +88,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     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),
+       url_loader_factory_(url_loader_factory),
       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)
+@@ -103,7 +101,7 @@ ModelLoader::ModelLoader(
+     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
+     const std::string& model_name)
     : name_(model_name),
 -      url_(kClientModelUrlPrefix + name_),
 +      url_("about:blank"),
       update_renderers_callback_(update_renderers_callback),
-       request_context_getter_(NULL),
+       url_loader_factory_(url_loader_factory),
       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 {
+@@ -42,7 +42,6 @@ class ModelLoader {
   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|.
+   // Constructs a model loader to fetch a model using |url_loader_factory|.
 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) {
+@@ -350,7 +350,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
 
   // Open network connection.
   InternetHandle connection_handle = InternetConnectA(inet_handle,
@@ -80,9 +99,9 @@ diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 +      "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;
+     return PING_FAILURE;
+@@ -394,7 +394,7 @@ FinancialPing::PingResponse FinancialPing::PingServer(const char* request,
+   return PING_SUCCESSFUL;
 #else
   std::string url =
 -      base::StringPrintf("https://%s%s", kFinancialServer, request);
@@ -112,3 +131,6 @@ diff --git a/rlz/lib/lib_values.h b/rlz/lib/lib_values.h
 
 extern const int kFinancialPort;
 
+-- 
+2.7.4
+
@@ -1,8 +1,12 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:28:53 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:28:53 +0100
+Subject: ungoogled-chromium: Disable translate integration

-    ungoogled-chromium: Disable translate
-    Disable Google 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
@@ -21,7 +25,7 @@ diff --git a/components/translate/content/renderer/translate_helper.cc b/compone
 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) {
+@@ -131,7 +131,7 @@ void TranslateManager::InitiateTranslation(const std::string& page_lang) {
   if (net::NetworkChangeNotifier::IsOffline())
     return;
 
@@ -44,3 +48,6 @@ diff --git a/components/translate/core/browser/translate_script.cc b/components/
 
     // Append embedded translate.js and a remote element library.
     base::StringPiece str =
+-- 
+2.7.4
+
@@ -1,8 +1,10 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:29:30 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:29:30 +0100
+Subject: ungoogled-chromium: Disable profile avatar downloading

-    ungoogled-chromium: Disable profile avatar downloading
-    Stop downloading profile avatar
+---
+ 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
@@ -28,3 +30,6 @@ diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/brows
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("profile_avatar", R"(
         semantics {
+-- 
+2.7.4
+
@@ -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
+@@ -75,9 +75,7 @@ void IntranetRedirectDetector::FinishSleep() {
+   simple_loaders_.clear();
+   resulting_origins_.clear();
+ 
+-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+-  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
+-    return;
+  return;
+ 
+   DCHECK(simple_loaders_.empty() && resulting_origins_.empty());
+ 
+-- 
+2.7.4
+
@@ -1,96 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:21:36 2018 +0100
-
-    ungoogled-chromium: Disable webRTC log uploader
-    Disables WebRTC log uploading to Google - ported patch
-
-diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -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)) {
-     webrtc_logging::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 =
-        webrtc_logging::LogList::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,44 +220,6 @@ void WebRtcLogUploader::LoggingStoppedDoStore(
- 
-   webrtc_logging::DeleteOldWebRtcLogFiles(log_paths.log_path);
- 
-  base::FilePath log_list_path =
-      webrtc_logging::LogList::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, ""));
- 
@@ -1,8 +1,15 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:36:33 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:36:33 +0100
+Subject: ungoogled-chromium: Disable Google host detection

-    ungoogled-chromium: Disable Google host detection
-    Disables various detections of Google hosts and functionality specific to them
+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      | 138 +++++----------------
+ components/search_engines/template_url.cc          |   6 +-
+ net/base/url_util.cc                               |  22 ----
+ 5 files changed, 31 insertions(+), 172 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
@@ -184,7 +191,7 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 }
 
 void SetMockLinkDoctorBaseURLForTesting() {
-@@ -166,119 +64,50 @@ std::string GetGoogleLocale(const std::string& application_locale) {
+@@ -166,11 +64,11 @@ std::string GetGoogleLocale(const std::string& application_locale) {
 
 GURL AppendGoogleLocaleParam(const GURL& url,
                              const std::string& application_locale) {
@@ -194,61 +201,52 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 }
 
 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();
+#if 0
+   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.
+@@ -190,18 +88,24 @@ std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
+   if (country_code == "cat")
+     return "es";
+   return country_code.as_string();
+#endif
 +  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);
+#if 0
+   // 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);
+#endif
 +  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();
-  }
+#if 0
+   // 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.
+@@ -216,31 +120,35 @@ const GURL& CommandLineGoogleBaseURL() {
+     if (!base_url.is_valid() || base_url.has_query() || base_url.has_ref())
+       base_url = GURL();
+   }
+#endif
+  CR_DEFINE_STATIC_LOCAL(GURL, base_url, ());
 +  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);
+#if 0
+   const GURL& base_url(CommandLineGoogleBaseURL());
+   return base_url.is_valid() &&
+          base::StartsWith(url.possibly_invalid_spec(), base_url.spec(),
+                           base::CompareCase::SENSITIVE);
+#endif
 +  return false;
 }
 
@@ -269,47 +267,41 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 }
 
 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);
+#if 0
+   // First check to see if this has a Google domain.
+   if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+                          DISALLOW_NON_STANDARD_PORTS) &&
+@@ -252,9 +160,13 @@ bool IsGoogleHomePageUrl(const GURL& url) {
+   base::StringPiece path(url.path_piece());
+   return IsPathHomePageBase(path) ||
+          base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
+#else
 +  return false;
+#endif
 }
 
 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()));
+#if 0
+   // First check to see if this has a Google domain.
+   if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN,
+                          DISALLOW_NON_STANDARD_PORTS) &&
+@@ -272,14 +184,20 @@ bool IsGoogleSearchUrl(const GURL& url) {
+   // the path type.
+   return HasGoogleSearchQueryParam(url.ref_piece()) ||
+       (!is_home_page_base && HasGoogleSearchQueryParam(url.query_piece()));
+#else
 +  return false;
+#endif
 }
 
 bool IsYoutubeDomainUrl(const GURL& url,
                         SubdomainPermission subdomain_permission,
                         PortPermission port_permission) {
-  return IsValidURL(url, port_permission) &&
-      IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
-                      nullptr);
+#if 0
+   return IsValidURL(url, port_permission) &&
+       IsValidHostName(url.host_piece(), "youtube", subdomain_permission,
+                       nullptr);
+#endif
 +  return false;
 }
 
@@ -317,22 +309,23 @@ diff --git a/components/google/core/browser/google_util.cc b/components/google/c
 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
-@@ -510,11 +510,6 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -498,11 +498,7 @@ 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;
+-  return std::any_of(replacements_.begin(), replacements_.end(),
+-                     [](const Replacement& replacement) {
+-                       return replacement.type == GOOGLE_BASE_URL ||
+-                              replacement.type == GOOGLE_BASE_SUGGEST_URL;
+-                     });
+  return false;
 }
 
+ bool TemplateURLRef::ExtractSearchTermsFromURL(
 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,
+@@ -383,28 +383,6 @@ void GetIdentityFromURL(const GURL& url,
 }
 
 bool HasGoogleHost(const GURL& url) {
@@ -361,3 +354,6 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
   return false;
 }
 
+-- 
+2.7.4
+
@@ -1,8 +1,11 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:37:10 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:37:10 +0100
+Subject: ungoogled-chromium: Disable GCM

-    ungoogled-chromium: Disable GCM
-    Disable Google Cloud Messaging (GCM) client
+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
@@ -21,7 +24,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
 void GCMClientImpl::StartCheckin() {
 +  return;
   // Make sure no checkin is in progress.
-   if (checkin_request_.get())
+   if (checkin_request_)
     return;
@@ -777,6 +779,7 @@ void GCMClientImpl::SetGServicesSettingsCallback(bool success) {
 }
@@ -31,3 +34,6 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
   // Make sure no checkin is in progress.
   if (checkin_request_.get() || !device_checkin_info_.accounts_set)
     return;
+-- 
+2.7.4
+
@@ -1,14 +1,24 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:37:52 2018 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Feb 2018 21:37:52 +0100
+Subject: ungoogled-chromium: Disable Gaia

-    ungoogled-chromium: Disable Gaia
-    Disables Gaia code
-    Somehow it is still activated even without being signed-in: https://github.com/Eloston/ungoogled-chromium/issues/104
+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
-@@ -301,7 +301,6 @@
+@@ -296,7 +296,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" />
@@ -16,8 +26,8 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
       <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" />
-@@ -437,7 +436,6 @@
-       </if>
+@@ -431,7 +430,6 @@
+       <include name="IDR_WEBRTC_LOGS_JS" file="resources\media\webrtc_logs.js" type="BINDATA" />
       <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" />
@@ -60,8 +70,8 @@ diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/ch
 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" />
+@@ -32,8 +32,6 @@
+ 
       <!-- Material Design Bookmarks -->
       <include name="IDR_COMPONENT_MD_BOOKMARKS_BOOKMARKS_HTML" file="md_bookmarks/bookmarks.html" type="BINDATA" />
 -      <!-- Gaia auth extension -->
@@ -83,7 +93,7 @@ diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/
 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(
+@@ -248,35 +248,6 @@ void GaiaAuthFetcher::CreateAndStartGaiaFetcher(
     int load_flags,
     const net::NetworkTrafficAnnotationTag& traffic_annotation) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
@@ -119,3 +129,6 @@ diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_
 }
 
 // static
+-- 
+2.7.4
+
@@ -1,13 +1,24 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:45:21 2018 +0100
+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

-    ungoogled-chromium: Clear HTTP cache menu item
-    Adds a menu item under "More tools" to clear the HTTP authentication cache on demand
+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                          | 1 +
+ tools/metrics/histograms/enums.xml                   | 1 +
+ tools/metrics/histograms/histograms.xml              | 1 +
+ 9 files changed, 27 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
-@@ -150,6 +150,7 @@
+@@ -152,6 +152,7 @@
 #define IDC_DEV_TOOLS_INSPECT           40023
 #define IDC_UPGRADE_DIALOG              40024
 #define IDC_VIEW_INCOMPATIBILITIES      40025
@@ -18,7 +29,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
 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
-@@ -1062,6 +1062,9 @@ are declared in build/common.gypi.
+@@ -1058,6 +1058,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>
@@ -28,7 +39,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
         <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu">
           &amp;Downloads
         </message>
-@@ -1100,6 +1103,9 @@ are declared in build/common.gypi.
+@@ -1096,6 +1099,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>
@@ -41,9 +52,9 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -59,6 +59,9 @@
+@@ -61,6 +61,9 @@
 #include "extensions/browser/extension_system.h"
- #include "printing/features/features.h"
+ #include "printing/buildflags/buildflags.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"
@@ -51,17 +62,17 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/browser_commands_mac.h"
-@@ -624,6 +627,9 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
+@@ -630,6 +633,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();
+      profile()->GetRequestContext()->GetURLRequestContext()->http_transaction_factory()->GetSession()->http_auth_cache()->ClearAllEntries();
 +      break;
     case IDC_IMPORT_SETTINGS:
       ShowImportDialog(browser_);
       break;
-@@ -865,6 +871,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -874,6 +880,7 @@ void BrowserCommandController::InitCommandState() {
                                         !profile()->IsOffTheRecord());
   command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA,
                                         !guest_session);
@@ -119,33 +130,18 @@ diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/brows
 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,
+@@ -250,6 +250,7 @@ bool HttpAuthCache::Remove(const GURL& origin,
+       return false;
+     }
+   }
+
   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
-@@ -46704,6 +46704,7 @@ Called by update_traffic_annotation_histograms.py.-->
+@@ -49525,6 +49525,7 @@ Full version information for the fingerprint enum values:
   <int value="48" label="Open in Chrome"/>
   <int value="49" label="Site Settings"/>
   <int value="50" label="App Info"/>
@@ -156,7 +152,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 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
-@@ -103940,6 +103940,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -111319,6 +111319,7 @@ uploading your change for review.
   <suffix name="Overestimate"
       label="Tracks when the compositor's estimates were too high and by how
              much."/>
@@ -164,3 +160,6 @@ diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/
   <suffix name="Underestimate"
       label="Tracks when the compositor's estimates were too low and by how
              much."/>
+-- 
+2.7.4
+
@@ -1,21 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Feb 12 21:30:30 2018 +0100
-
-    ungoogled-chromium: Disable intranet redirect detector
-    Disables the intranet redirect detector. It generates extra DNS requests and the functionality using this is disabled
-    See this page for more information: https://mikewest.org/2012/02/chrome-connects-to-three-random-domains-at-startup
-
-diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc
--- a/chrome/browser/intranet_redirect_detector.cc
-+++ b/chrome/browser/intranet_redirect_detector.cc
-@@ -72,9 +72,7 @@ void IntranetRedirectDetector::FinishSleep() {
-   fetchers_.clear();
-   resulting_origins_.clear();
- 
-  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking))
-    return;
-+  return;
- 
-   DCHECK(fetchers_.empty() && resulting_origins_.empty());
- 
@@ -1,12 +1,15 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Nov 26 23:11:56 2017 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 23:11:56 +0100
+Subject: Disable Omaha update checks

-    Always 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 {
+@@ -132,7 +132,7 @@ public class OmahaBase {
 
     /** See {@link #sIsDisabled}. */
     static boolean isDisabled() {
@@ -15,3 +18,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
     }
 
     /**
+-- 
+2.7.4
+
@@ -1,19 +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
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -32,12 +32,31 @@
- 
-     // Increment this if you change the data in ways that mean users with
-     // existing data should get a new version.
-    "kCurrentDataVersion": 100
-+    "kCurrentDataVersion": 101
-   },
- 
+@@ -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": {
@@ -712,3 +710,6 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &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
+
@@ -1,7 +1,12 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Wed Oct 18 21:24:05 2017 +0200
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 18 Oct 2017 21:24:05 +0200
+Subject: Add StartPage search engine

-    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
@@ -10,8 +15,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
-    "kCurrentDataVersion": 101
-+    "kCurrentDataVersion": 102
+-    "kCurrentDataVersion": 102
+    "kCurrentDataVersion": 103
   },
 
   // The following engines are included in country lists and are added to the
@@ -704,3 +709,6 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &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
+
@@ -1,7 +1,14 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Mon Dec 11 22:42:11 2017 +0100
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 11 Dec 2017 22:42:11 +0100
+Subject: Add Google English-only engine

-    Added Google English-only engine, no RLZ and field experiments
+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
@@ -10,8 +17,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
 
     // Increment this if you change the data in ways that mean users with
     // existing data should get a new version.
-    "kCurrentDataVersion": 102
-+    "kCurrentDataVersion": 103
+-    "kCurrentDataVersion": 103
+    "kCurrentDataVersion": 104
   },
 
   // The following engines are included in country lists and are added to the
@@ -20,8 +27,8 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
     },
 
 +    "googleen": {
-+      "name": "GoogleEN",
-+      "keyword": "google.co.uk",
+      "name": "Google in English",
+      "keyword": "googleen",
 +      "favicon_url": "https://www.google.com/favicon.ico",
 +      "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en",
 +      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en",
@@ -715,3 +722,6 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     &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
+
@@ -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": 104
+    "kCurrentDataVersion": 105
+   },
+ 
+   // 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
+
@@ -1,14 +1,17 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sat Jan 20 19:44:43 2018 +0100
+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

-    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
-@@ -573,6 +573,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-     const GURL& embedding_origin) {
-   GURL canonical_requesting_origin = GetCanonicalOrigin(requesting_origin);
+@@ -632,6 +632,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+   GURL canonical_requesting_origin =
+       GetCanonicalOrigin(requesting_origin, embedding_origin);
   PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
 +      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
@@ -16,3 +19,6 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/p
   PermissionResult result = context->GetPermissionStatus(
       render_frame_host, canonical_requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
+-- 
+2.7.4
+
@@ -1,70 +0,0 @@
-Author: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date:   Sun Feb 18 22:15:25 2018 +0100
-
-    Play videos in background
-    Break Page Visibility API and Fullscreen API for youtube.com and vimeo.com
-    Original Javascript code by timdream
-
-diff --git a/third_party/WebKit/Source/core/dom/BUILD.gn b/third_party/WebKit/Source/core/dom/BUILD.gn
--- a/third_party/WebKit/Source/core/dom/BUILD.gn
-+++ b/third_party/WebKit/Source/core/dom/BUILD.gn
-@@ -302,6 +302,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
-@@ -222,6 +222,7 @@
- #include "core/xml_names.h"
- #include "core/xmlns_names.h"
- #include "extensions/dont-track-me.h"
-+#include "extensions/video-bg-play.h"
- #include "platform/CrossThreadFunctional.h"
- #include "platform/DateComponents.h"
- #include "platform/EventDispatchForbiddenScope.h"
-@@ -5797,17 +5798,25 @@ void Document::FinishedParsing() {
- 
-   // determine whether this is a Google search results page
-   const SecurityOrigin *origin = GetSecurityOrigin();
-  if (origin) {
-+  auto* bodyElement = body();
-+  if (origin && bodyElement) {
-     WTF::String domain = origin->Domain();
-     size_t pos = domain.Find(".google.");
-    auto* bodyElement = body();
-    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-+    if ((pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
-       LOG(INFO) << "injecting dont-track-me Javascript payload";
-       HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-       e->setText(DONT_TRACK_ME_JS);
-       bodyElement->AppendChild(e);
-     }
-  }
-+
-+    // check for eligibility of the video bg fix
-+    if ((WTF::kNotFound != domain.Find("youtube.com")) || (WTF::kNotFound != domain.Find("vimeo.com"))) {
-+      LOG(INFO) << "injecting video-bg-play Javascript payload";
-+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
-+      e->setText(VIDEO_BG_PLAY_JS);
-+      bodyElement->AppendChild(e);
-+    }
-+  } // has origin and body element
- }
- 
- void Document::ElementDataCacheClearTimerFired(TimerBase*) {
-diff --git a/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h b/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h
-new file mode 100644
--- /dev/null
-+++ b/third_party/WebKit/Source/core/dom/extensions/video-bg-play.h
-@@ -0,0 +1,6 @@
-+#ifndef video_bg_play_h
-+#define video_bg_play_h
-+
-+#define VIDEO_BG_PLAY_JS "'use strict';\n\n/* video background play fix - original version by timdream */\ndocument.videoBGFix = {};\n\n// Page Visibility API\nObject.defineProperties(document.videoBGFix,\n  { 'hidden': {value: false}, 'visibilityState': {value: 'visible'} });\n\nwindow.addEventListener(\n  'visibilitychange', evt => evt.stopImmediatePropagation(), true);\nwindow.addEventListener(\n  'blur', evt => evt.stopImmediatePropagation(), true);\n\n// Fullscreen API\nwindow.addEventListener('fullscreenchange', evt => {\n  Object.defineProperties(document.videoBGFix,\n    { 'fullscreenEnabled': {value: true},\n      'fullscreen': {value: true},\n      'fullscreenElement': {value: document.fullscreenElement.videoBGFix}});\n  window.addEventListener(\n    'fullscreenchange', evt => evt.stopImmediatePropagation(), true);\n}, { capture: true, once: true });\n"
-+
-+#endif  // video_bg_play_h
@@ -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
+@@ -149,11 +149,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
+
@@ -0,0 +1,61 @@
+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
+
+---
+ third_party/blink/renderer/core/dom/BUILD.gn    |  1 +
+ third_party/blink/renderer/core/dom/document.cc | 20 +++++++++++++++++++-
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
+--- a/third_party/blink/renderer/core/dom/BUILD.gn
+++ b/third_party/blink/renderer/core/dom/BUILD.gn
+@@ -147,6 +147,7 @@ blink_core_sources("dom") {
+     "events/tree_scope_event_context.h",
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
+    "extensions/dont-track-me.h",
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -277,6 +277,8 @@
+ #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
+ #include "third_party/blink/renderer/platform/wtf/time.h"
+ 
+#include "extensions/anti_amp_cure.h"
+
+ #ifndef NDEBUG
+ using WeakDocumentSet =
+     blink::PersistentHeapHashSet<blink::WeakMember<blink::Document>>;
+@@ -5882,8 +5884,24 @@ void Document::FinishedParsing() {
+     fetcher_->ClearResourcesFromPreviousFetcher();
+   }
+ 
+-  if (IsPrefetchOnly())
+  if (IsPrefetchOnly()) {
+     WebPrerenderingSupport::Current()->PrefetchFinished();
+    return;
+  }
+
+  // determine whether this is a Google search results page
+  const SecurityOrigin *origin = GetSecurityOrigin();
+  if (origin) {
+    WTF::String domain = origin->Domain();
+    size_t pos = domain.Find(".google.");
+    auto* bodyElement = body();
+    if (bodyElement && (pos != WTF::kNotFound) && (domain.length() - pos - 8 < 4)) {
+      LOG(INFO) << "injecting anti-AMP-cure Javascript payload";
+      HTMLScriptElement* e = HTMLScriptElement::Create(*this, CreateElementFlags());
+      e->setText(ANTI_AMP_CURE_JS);
+      bodyElement->AppendChild(e);
+    }
+  }
+ 
+   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
+ }
+-- 
+2.7.4
+
@@ -0,0 +1,66 @@
+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/blink/renderer/core/dom/BUILD.gn    |  1 +
+ third_party/blink/renderer/core/dom/document.cc | 17 +++++++++++++----
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/dom/BUILD.gn b/third_party/blink/renderer/core/dom/BUILD.gn
+--- a/third_party/blink/renderer/core/dom/BUILD.gn
+++ b/third_party/blink/renderer/core/dom/BUILD.gn
+@@ -148,6 +148,7 @@ blink_core_sources("dom") {
+     "events/window_event_context.cc",
+     "events/window_event_context.h",
+     "extensions/dont-track-me.h",
+    "extensions/video-bg-play.h",
+     "exception_code.h",
+     "first_letter_pseudo_element.cc",
+     "first_letter_pseudo_element.h",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -222,6 +222,7 @@
+ #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
+ #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
+#include "extensions/video_bg_play.h"
+ #include "third_party/blink/renderer/core/paint/compositing/paint_layer_compositor.h"
+ #include "third_party/blink/renderer/core/paint/first_meaningful_paint_detector.h"
+ #include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
+@@ -5891,17 +5892,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
+ 
+   FirstMeaningfulPaintDetector::From(*this).CheckNetworkStable();
+ }
+-- 
+2.7.4
+
@@ -0,0 +1,52 @@
+From: AlexeyBarabash <alexey@brave.com>
+Date: Thu, 2 Nov 2017 18:21:16 +0200
+Subject: Allow playing audio in background
+
+---
+ media/blink/webmediaplayer_impl.cc | 11 ++++++++++-
+ media/blink/webmediaplayer_impl.h  |  2 ++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
+--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
+@@ -871,6 +871,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+   return pipeline_metadata_.has_audio;
+ }
+ 
+bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
+  DCHECK(main_task_runner_->BelongsToCurrentThread());
+
+  return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
+}
+
+ void WebMediaPlayerImpl::EnabledAudioTracksChanged(
+     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
+   DCHECK(main_task_runner_->BelongsToCurrentThread());
+@@ -2940,7 +2946,10 @@ bool WebMediaPlayerImpl::ShouldPauseVideoWhenHidden() const {
+   // If suspending background video, pause any video that's not remoted or
+   // not unlocked to play in the background.
+   if (IsBackgroundedSuspendEnabled()) {
+-    if (!HasVideo())
+    //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
+    //see media/base/pipeline_metadata.h. This is a workaround to allow audio
+    //streams be played in background.
+    if (!HasVideoNonEmptySize())
+       return false;
+ 
+ #if defined(OS_ANDROID)
+diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
+--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
+@@ -159,6 +159,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+   // True if the loaded media has a playable video/audio track.
+   bool HasVideo() const override;
+   bool HasAudio() const override;
+  // True is has video and it's frame size is not zero
+  bool HasVideoNonEmptySize() const;
+ 
+   void EnabledAudioTracksChanged(
+       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
+-- 
+2.7.4
+
@@ -0,0 +1,28 @@
+From: AlexeyBarabash <alexey@brave.com>
+Date: Thu, 11 Jan 2018 13:27:34 +0200
+Subject: Open YouTube links in Bromite
+
+---
+ .../chrome/browser/externalnav/ExternalNavigationHandler.java      | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+@@ -363,6 +363,13 @@ public class ExternalNavigationHandler {
+             return OverrideUrlLoadingResult.NO_OVERRIDE;
+         }
+ 
+        // Force to open YouTube urls in Bromite
+        String intentPackageName = intent.getPackage();
+        if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
+            if (DEBUG) Log.i(TAG, "NO_OVERRIDE: YouTube URL for YouTube app");
+            return OverrideUrlLoadingResult.NO_OVERRIDE;
+        }
+
+         // Sanitize the Intent, ensuring web pages can not bypass browser
+         // security (only access to BROWSABLE activities).
+         intent.addCategory(Intent.CATEGORY_BROWSABLE);
+-- 
+2.7.4
+
@@ -0,0 +1,50 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Tue, 31 Jan 2017 22:12:27 -0500
+Subject: Add exit menu item
+
+---
+ chrome/android/java/res/menu/main_menu.xml                             | 2 ++
+ .../android/java/src/org/chromium/chrome/browser/ChromeActivity.java   | 2 ++
+ chrome/android/java/strings/android_chrome_strings.grd                 | 3 +++
+ 3 files changed, 7 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -78,6 +78,8 @@
+             android:title="@string/menu_help" />
+         <item android:id="@+id/enter_vr_id"
+             android:title="@string/enter_vr" />
+        <item android:id="@+id/exit_id"
+            android:title="@string/menu_exit" />
+     </group>
+ 
+     <!-- Items shown only in the tab switcher -->
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -1986,6 +1986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             RecordUserAction.record("MobileMenuSettings");
+         } else if (id == R.id.show_menu) {
+             showAppMenuForKeyboardEvent();
+        } else if (id == R.id.exit_id) {
+            ApplicationLifetime.terminate(false);
+         } else if (id == R.id.find_in_page_id) {
+             if (mFindToolbarManager == null) return false;
+ 
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2678,6 +2678,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
+       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
+         Settings
+       </message>
+      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
+        Exit
+      </message>
+       <message name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
+         Close all tabs
+       </message>
+-- 
+2.7.4
+
@@ -0,0 +1,70 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 27 Jun 2018 01:32:28 +0200
+Subject: Remove help menu item
+
+---
+ chrome/android/java/res/menu/main_menu.xml                       | 2 --
+ .../java/src/org/chromium/chrome/browser/ChromeActivity.java     | 9 ---------
+ .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 3 ---
+ .../chromium/chrome/browser/customtabs/CustomTabActivity.java    | 2 +-
+ 4 files changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -74,8 +74,6 @@
+             android:icon="@drawable/reader_mode_prefs_icon" />
+         <item android:id="@+id/preferences_id"
+             android:title="@string/menu_preferences" />
+-        <item android:id="@+id/help_id"
+-            android:title="@string/menu_help" />
+         <item android:id="@+id/enter_vr_id"
+             android:title="@string/enter_vr" />
+         <item android:id="@+id/exit_id"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -2010,15 +2010,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+ 
+         final Tab currentTab = getActivityTab();
+ 
+-        if (id == R.id.help_id) {
+-            String url = currentTab != null ? currentTab.getUrl() : "";
+-            Profile profile = mTabModelSelector.isIncognitoSelected()
+-                    ? Profile.getLastUsedProfile().getOffTheRecordProfile()
+-                    : Profile.getLastUsedProfile().getOriginalProfile();
+-            startHelpAndFeedback(url, "MobileMenuFeedback", profile);
+-            return true;
+-        }
+-
+         // All the code below assumes currentTab is not null, so return early if it is null.
+         if (currentTab == null) {
+             return false;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+@@ -338,9 +338,6 @@ public class KeyboardShortcuts {
+                     tab = activity.getActivityTab();
+                     if (tab != null && tab.canGoForward()) tab.goForward();
+                     return true;
+-                case CTRL | SHIFT | KeyEvent.KEYCODE_SLASH:  // i.e. Ctrl+?
+-                    activity.onMenuOrKeyboardAction(R.id.help_id, false);
+-                    return true;
+             }
+         }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+@@ -1038,7 +1038,7 @@ public class CustomTabActivity extends ChromeActivity {
+     public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
+         // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
+         if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id
+-                || id == R.id.help_id || id == R.id.recent_tabs_menu_id
+                || id == R.id.recent_tabs_menu_id
+                 || id == R.id.new_incognito_tab_menu_id || id == R.id.new_tab_menu_id
+                 || id == R.id.open_history_menu_id) {
+             return true;
+-- 
+2.7.4
+
@@ -0,0 +1,197 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 18 Oct 2017 21:26:53 +0200
+Subject: Add menu option to toggle global Javascript preference
+
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 13 ++++++++
+ chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
+ .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
+ .../browser/appmenu/AppMenuPropertiesDelegate.java | 37 ++++++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
+ .../java/strings/android_chrome_strings.grd        | 11 +++++++
+ 7 files changed, 91 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -49,6 +49,7 @@
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk"
+             android:orderInCategory="2" />
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null"
+             android:orderInCategory="2">
+@@ -61,6 +62,18 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_javascript_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_javascript_id"
+                  android:title="@string/menu_enable_javascript" />
+              <item android:id="@+id/enable_javascript_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <!-- Title is intentionally left blank in xml and will be set in java. -->
+         <item android:id="@+id/open_in_browser_id"
+             android:title=""
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -59,6 +59,7 @@
+             android:title="@string/menu_add_to_homescreen" />
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk" />
+
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+             android:title="@null">
+           <menu>
+@@ -69,6 +70,18 @@
+                 android:checkable="true" />
+           </menu>
+         </item>
+
+        <item android:id="@+id/enable_javascript_row_menu_id"
+            android:title="@null">
+          <menu>
+              <item android:id="@+id/enable_javascript_id"
+                  android:title="@string/menu_enable_javascript" />
+              <item android:id="@+id/enable_javascript_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/reader_mode_prefs_id"
+             android:title="@string/menu_reader_mode_prefs"
+             android:icon="@drawable/reader_mode_prefs_icon" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -2079,6 +2079,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
+             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
+             RecordUserAction.record("MobileMenuRequestDesktopSite");
+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
+            if (reloadOnChange) {
+				currentTab.reload();
+			}
+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.reader_mode_prefs_id) {
+             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
+         } else {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1644,6 +1644,14 @@ public class ChromeTabbedActivity
+                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
+             }
+             RecordUserAction.record("MobileMenuDownloadManager");
+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+            PrefServiceBridge.getInstance().setJavaScriptEnabled(!jsEnabled);
+            if (reloadOnChange) {
+				currentTab.reload();
+			}
+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.open_recently_closed_tab) {
+             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
+             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+@@ -192,6 +192,8 @@ public class AppMenuPropertiesDelegate {
+ 
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+            updateEnableJavascriptMenuItem(menu, currentTab);
+
+             // Only display reader mode settings menu option if the current page is in reader mode.
+             menu.findItem(R.id.reader_mode_prefs_id)
+                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
+@@ -412,4 +414,39 @@ public class AppMenuPropertiesDelegate {
+                         ? mActivity.getString(R.string.menu_request_desktop_site_on)
+                         : mActivity.getString(R.string.menu_request_desktop_site_off));
+     }
+
+    /**
+     * Updates the enable JavaScript item's state.
+     *
+     * @param menu {@link Menu} for enable javascript
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateEnableJavascriptMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem enableMenuRow = menu.findItem(R.id.enable_javascript_row_menu_id);
+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
+
+        // Hide enable javascript on all chrome:// pages except for the NTP.
+        String url = currentTab.getUrl();
+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+        // Also hide enable javascsript on Reader Mode.
+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
+
+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
+        enableMenuRow.setVisible(itemVisible);
+        if (!itemVisible) return;
+
+        boolean jsEnabled = PrefServiceBridge.getInstance().javaScriptEnabled();
+
+        // Mark the checkbox if Javascript is activated on this tab.
+        enableMenuCheck.setChecked(jsEnabled);
+
+        // This title doesn't seem to be displayed by Android, but it is used to set up
+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
+        enableMenuLabel.setTitleCondensed(jsEnabled
+                        ? mActivity.getString(R.string.menu_enable_javascript_on)
+                        : mActivity.getString(R.string.menu_enable_javascript_off));
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -171,6 +171,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             }
+ 
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+            updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+         }
+     }
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2663,6 +2663,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
+         Find in page
+       </message>
+
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
+        Enable JavaScript
+      </message>
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
+        Turn off JavaScript
+      </message>
+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_OFF" desc="Accessibility description for when Enable JavaScript is unselected.">
+        Turn on JavaScript
+      </message>
+
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
+         Desktop site
+       </message>
+-- 
+2.7.4
+
@@ -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
+@@ -1734,6 +1734,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/network_error_logging/network_error_logging_service.h"
+ #include "net/reporting/reporting_service.h"
+@@ -583,6 +585,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
+
@@ -0,0 +1,806 @@
+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
+
+Add menu option to toggle global Adblock preference
+
+Allow toggling Chromium's "ads enabled" content settings option together with Bromite adblock engine.
+
+Perform adblock interception in StartJob to address lagging issues
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  |  12 +
+ chrome/android/java/res/menu/main_menu.xml         |  11 +
+ .../chromium/chrome/browser/ChromeActivity.java    |   8 +
+ .../chrome/browser/ChromeTabbedActivity.java       |   8 +
+ .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
+ .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
+ .../java/strings/android_chrome_strings.grd        |  11 +
+ .../subresource_filter_content_settings_manager.cc |   3 +
+ net/BUILD.gn                                       |   9 +-
+ net/url_request/adblock_intercept.cc               | 326 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  18 ++
+ net/url_request/nochromo_intercept.cc              | 116 --------
+ net/url_request/nochromo_intercept.h               |  13 -
+ net/url_request/url_request.cc                     |  36 ++-
+ 14 files changed, 477 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/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -74,6 +74,18 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_adblock_row_menu_id"
+            android:title="@null"
+            android:orderInCategory="2">
+          <menu>
+              <item android:id="@+id/enable_adblock_id"
+                  android:title="@string/menu_enable_adblock" />
+              <item android:id="@+id/enable_adblock_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <!-- Title is intentionally left blank in xml and will be set in java. -->
+         <item android:id="@+id/open_in_browser_id"
+             android:title=""
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -82,6 +82,17 @@
+           </menu>
+         </item>
+ 
+        <item android:id="@+id/enable_adblock_row_menu_id"
+            android:title="@null">
+          <menu>
+              <item android:id="@+id/enable_adblock_id"
+                  android:title="@string/menu_enable_adblock" />
+              <item android:id="@+id/enable_adblock_check_id"
+                  android:title="@null"
+                  android:checkable="true" />
+          </menu>
+        </item>
+
+         <item android:id="@+id/reader_mode_prefs_id"
+             android:title="@string/menu_reader_mode_prefs"
+             android:icon="@drawable/reader_mode_prefs_icon" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -2089,6 +2089,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             RecordUserAction.record("MobileMenuRequestEnableJavascript");
+         } else if (id == R.id.reader_mode_prefs_id) {
+             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
+            if (reloadOnChange) {
+                currentTab.reload();
+            }
+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return false;
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1658,6 +1658,14 @@ public class ChromeTabbedActivity
+             RecordUserAction.record("MobileTabClosedUndoShortCut");
+         } else if (id == R.id.enter_vr_id) {
+             VrShellDelegate.enterVrIfNecessary();
+        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
+            final boolean reloadOnChange = !currentTab.isNativePage();
+            final boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+            PrefServiceBridge.getInstance().setAllowAdsEnabled(adBlockEnabled);
+            if (reloadOnChange) {
+               currentTab.reload();
+            }
+            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return super.onMenuOrKeyboardAction(id, fromMenu);
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+@@ -190,6 +190,8 @@ public class AppMenuPropertiesDelegate {
+                     && !TextUtils.isEmpty(url);
+             prepareAddToHomescreenMenuItem(menu, currentTab, canShowHomeScreenMenuItem);
+ 
+            updateEnableAdBlockMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+ 
+             updateEnableJavascriptMenuItem(menu, currentTab);
+@@ -449,4 +451,40 @@ public class AppMenuPropertiesDelegate {
+                         ? mActivity.getString(R.string.menu_enable_javascript_on)
+                         : mActivity.getString(R.string.menu_enable_javascript_off));
+     }
+
+    /**
+     * Updates the enable AdBlock item's state.
+     *
+     * @param menu {@link Menu} for enable adblock
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateEnableAdBlockMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem enableMenuRow = menu.findItem(R.id.enable_adblock_row_menu_id);
+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_adblock_id);
+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
+
+
+        // Hide enable adblock on all chrome:// pages except for the NTP.
+        String url = currentTab.getUrl();
+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
+        // Also hide enable javascsript on Reader Mode.
+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
+
+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
+        enableMenuRow.setVisible(itemVisible);
+        if (!itemVisible) return;
+
+        boolean adBlockEnabled = !PrefServiceBridge.getInstance().adsEnabled();
+
+        // Mark the checkbox if adblock is globally activate.
+        enableMenuCheck.setChecked(adBlockEnabled);
+
+        // This title doesn't seem to be displayed by Android, but it is used to set up
+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
+        enableMenuLabel.setTitleCondensed(adBlockEnabled
+                        ? mActivity.getString(R.string.menu_enable_adblock_on)
+                        : mActivity.getString(R.string.menu_enable_adblock_off));
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -170,6 +170,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+                 }
+             }
+ 
+            updateEnableAdBlockMenuItem(menu, currentTab);
+
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+             updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2683,6 +2683,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
+         Turn on Request desktop site
+       </message>
+
+      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
+        Enable AdBlock
+      </message>
+      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
+        Turn off AdBlock
+      </message>
+      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
+        Turn on AdBlock
+      </message>
+
+       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
+         Appearance
+       </message>
+diff --git a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+--- a/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+++ b/chrome/browser/subresource_filter/subresource_filter_content_settings_manager.cc
+@@ -22,6 +22,7 @@
+ #include "components/keyed_service/core/service_access_type.h"
+ #include "components/subresource_filter/core/browser/subresource_filter_features.h"
+ #include "url/gurl.h"
+#include "net/url_request/adblock_intercept.h"
+ 
+ namespace {
+ 
+@@ -160,9 +161,11 @@ void SubresourceFilterContentSettingsManager::OnContentSettingChanged(
+     if (global_setting == CONTENT_SETTING_ALLOW) {
+       ChromeSubresourceFilterClient::LogAction(
+           kActionContentSettingsAllowedGlobal);
+      net::adblock_enabled = false;
+     } else if (global_setting == CONTENT_SETTING_BLOCK) {
+       ChromeSubresourceFilterClient::LogAction(
+           kActionContentSettingsBlockedGlobal);
+      net::adblock_enabled = true;
+     } else {
+       NOTREACHED();
+     }
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
+++ b/net/BUILD.gn
+@@ -1734,8 +1734,6 @@ 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",
+@@ -1793,6 +1791,13 @@ component("net") {
+       "//third_party/zlib",
+     ]
+ 
+    if (is_android) {
+      sources += [
+        "url_request/adblock_intercept.cc",
+        "url_request/adblock_intercept.h"
+      ]
+    }
+
+     if (enable_reporting) {
+       sources += [
+         "network_error_logging/network_error_logging_delegate.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,326 @@
+#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 {
+
+bool adblock_enabled = true;
+
+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,18 @@
+#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);
+
+extern bool adblock_enabled;
+
+} // 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,9 @@
+ #include "url/gurl.h"
+ #include "url/origin.h"
+ 
+-#include "net/url_request/nochromo_intercept.h"
+#if defined(OS_ANDROID)
+#include "net/url_request/adblock_intercept.h"
+#endif
+ 
+ #if BUILDFLAG(ENABLE_REPORTING)
+ #include "net/network_error_logging/network_error_logging_service.h"
+@@ -585,8 +587,6 @@ 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,
+@@ -665,6 +665,36 @@ void URLRequest::StartJob(URLRequestJob* job) {
+     }
+   }
+ 
+#if defined(OS_ANDROID)
+  if (net::adblock_enabled) {
+    std::string initiatorHost;
+    if (initiator_.has_value()) {
+      initiatorHost = initiator_.value().host();
+    }
+
+    if (adblock_intercept(url(), initiatorHost)) {
+      std::string source("delegate");
+      net_log_.AddEvent(NetLogEventType::CANCELLED,
+                        NetLog::StringCallback("source", &source));
+
+      job_.reset(new URLRequestErrorJob(
+          this, network_delegate_, ERR_BLOCKED_BY_CLIENT));
+
+      job_->SetExtraRequestHeaders(extra_request_headers_);
+      job_->SetPriority(priority_);
+      job_->SetRequestHeadersCallback(request_headers_callback_);
+      job_->SetResponseHeadersCallback(response_headers_callback_);
+
+      if (upload_data_stream_.get())
+        job_->SetUpload(upload_data_stream_.get());
+
+      // on fallthrough the initial status will be ERR_IO_PENDING,
+      // but the URLRequestErrorJob will then call NotifyResponseStarted
+      // with the correct ERR_BLOCKED_BYCLIENT status
+    }
+  }
+#endif
+
+   // Start() always completes asynchronously.
+   //
+   // Status is generally set by URLRequestJob itself, but Start() calls
+-- 
+2.7.4
+
@@ -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
+@@ -60,26 +60,6 @@ std::string BuildOSCpuInfo() {
+   }
+ #elif 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;
+-  }
+ #elif (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_FUCHSIA)
+   // Should work on any Posix system.
+   struct utsname unixinfo;
+@@ -115,9 +95,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()
+ #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+                       "%s %s",
+                       unixinfo.sysname,  // e.g. Linux
+-- 
+2.7.4
+
@@ -0,0 +1,57 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 25 Mar 2018 21:49:37 +0200
+Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL
+
+Return fixed base latency
+---
+ third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
+ third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
+ third_party/blink/renderer/modules/webaudio/audio_context.cc  | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.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/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.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);
+ };
+diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
+--- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
+++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
+@@ -271,7 +271,7 @@ void AudioContext::StopRendering() {
+ }
+ 
+ double AudioContext::baseLatency() const {
+-  return FramesPerBuffer() / static_cast<double>(sampleRate());
+  return 0.04;
+ }
+ 
+ }  // namespace blink
+-- 
+2.7.4
+
@@ -0,0 +1,253 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 24 Mar 2018 05:18:03 +0100
+Subject: Canvas: fingerprinting mitigations for image data and webGL
+
+Disable webGL renderer info and modify the color data returned by ToBlob,
+ToDataURL and getImageData so that it will contain randomly manipulated
+pixels (maximum 10) that slightly change the color of the R,G,B components
+without a visible effect.
+
+Credits to Slaviro (https://github.com/Slaviro) for coming up with a better
+approach to change color components.
+---
+ .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
+ .../platform/graphics/image_data_buffer.cc         |   5 +
+ .../platform/graphics/static_bitmap_image.cc       | 153 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h        |   2 +
+ 4 files changed, 162 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+@@ -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() {
+diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+@@ -35,6 +35,8 @@
+ #include <memory>
+ 
+ #include "base/memory/ptr_util.h"
+#include "base/rand_util.h"
+#include "base/logging.h"
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
+@@ -129,6 +131,9 @@ bool ImageDataBuffer::EncodeImageInternal(const String& mime_type,
+                                           const SkPixmap& pixmap) const {
+   DCHECK(is_valid_);
+ 
+  // shuffle subchannel color data within the pixmap
+  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
+
+   if (mime_type == "image/jpeg") {
+     SkJpegEncoder::Options options;
+     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
+diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ 
+#include "base/rand_util.h"
+ #include "gpu/command_buffer/client/gles2_interface.h"
+ #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
+ #include "third_party/blink/renderer/platform/graphics/graphics_context.h"
+@@ -15,6 +16,7 @@
+ #include "third_party/skia/include/core/SkCanvas.h"
+ #include "third_party/skia/include/core/SkImage.h"
+ #include "third_party/skia/include/core/SkPaint.h"
+#include "third_party/skia/src/core/SkColorData.h"
+ #include "third_party/skia/include/gpu/GrContext.h"
+ 
+ namespace blink {
+@@ -161,10 +163,161 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+   DCHECK(read_pixels_successful ||
+          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
+              rect.X(), rect.Y(), info.width(), info.height())));
+
+  ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
+
+   result.Transfer(dest_contents);
+   return true;
+ }
+ 
+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
+#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
+
+#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
+
+void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
+  auto w = info.width() - srcX, h = info.height() - srcY;
+
+  // skip tiny images; info.width()/height() can also be 0
+  if ((w < 8) || (h < 8)) {
+    return;
+  }
+
+  // generate the first random number here
+  double shuffleX = base::RandDouble();
+
+  // cap maximum pixels to change
+  auto pixels = (w + h) / 128;
+  if (pixels > 10) {
+    pixels = 10;
+  } else if (pixels < 2) {
+    pixels = 2;
+  }
+
+  auto colorType = info.colorType();
+  auto fRowBytes = info.minRowBytes(); // stride
+
+  LOG(DEBUG) << "BRM: ShuffleSubchannelColorData() w=" << w << " h=" << h << " colorType=" << colorType << " fRowBytes=" << fRowBytes;
+
+  // second random number (for y/height)
+  double shuffleY = base::RandDouble();
+
+  // calculate random coordinates using bisection
+  auto currentW = w, currentH = h;
+  for(;pixels >= 0; pixels--) {
+    int x = currentW * shuffleX, y = currentH * shuffleY;
+
+    // calculate randomisation amounts for each RGB component
+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
+
+    // manipulate pixel data to slightly change the R, G, B components
+    switch (colorType) {
+      case kAlpha_8_SkColorType:
+      {
+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
+         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = SkColorSetARGB(a, r, g, b);
+      }
+      break;
+      case kGray_8_SkColorType:
+      {
+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
+      }
+      break;
+      case kRGB_565_SkColorType:
+      {
+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
+         unsigned    r = SkPacked16ToR32(*pixel);
+         unsigned    g = SkPacked16ToG32(*pixel);
+         unsigned    b = SkPacked16ToB32(*pixel);
+
+         r = shuffleComponent(r, 31, shuffleR);
+         g = shuffleComponent(g, 63, shuffleG);
+         b = shuffleComponent(b, 31, shuffleB);
+
+         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
+         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
+         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
+
+         *pixel = r16 | g16 | b16;
+      }
+      break;
+      case kARGB_4444_SkColorType:
+      {
+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
+
+         r = shuffleComponent(r, 15, shuffleR);
+         g = shuffleComponent(g, 15, shuffleG);
+         b = shuffleComponent(b, 15, shuffleB);
+         // alpha is left unchanged
+
+         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
+         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
+         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
+         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
+
+         *pixel = r4 | b4 | g4 | a4;
+      }
+      break;
+      case kRGBA_8888_SkColorType:
+      {
+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
+                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
+      }
+      break;
+      case kBGRA_8888_SkColorType:
+      {
+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
+         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
+
+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
+         // alpha is left unchanged
+
+         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
+                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
+      }
+      break;
+      default:
+         // the remaining formats are not expected to be used in Chromium
+         LOG(INFO) << "BRM: ShuffleSubchannelColorData(): Ignoring pixel format";
+         return;
+    }
+
+    // keep bisecting or reset current width/height as needed
+    if (x == 0) {
+       currentW = w;
+    } else {
+       currentW = x;
+    }
+    if (y == 0) {
+       currentH = h;
+    } else {
+       currentH = y;
+    }
+  }
+}
+
+#undef writable_addr
+#undef shuffleComponent
+
+ const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
+   static const gpu::SyncToken sync_token;
+   return sync_token;
+diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
+                                                  const SkImageInfo&);
+ 
+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
+
+   bool IsStaticBitmapImage() const override { return true; }
+ 
+   // Methods overridden by all sub-classes
+-- 
+2.7.4
+
@@ -0,0 +1,175 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 30 Mar 2018 10:09:03 +0200
+Subject: getClientRects, getBoundingClientRect, measureText: add
+ fingerprinting mitigation
+
+Scale the result of Range::getClientRects, Element::getBoundingClientRect and
+Canvas::measureText by a random +/-3/10000th of the original value for each
+float in the returned Rect/Quad.
+
+Rationale is that the returned values are within the same order of magnitude
+of the floating point precision being used for fingerprinting and sufficient
+to poison the well.
+
+See also: http://www.gsd.inesc-id.pt/~mpc/pubs/fingerprinting-trustcom2016.pdf
+---
+ third_party/blink/renderer/core/dom/element.cc       | 17 +++++++++++++++++
+ third_party/blink/renderer/core/dom/range.cc         | 20 +++++++++++++++++++-
+ .../blink/renderer/core/html/canvas/text_metrics.cc  | 18 ++++++++++++++++++
+ .../blink/renderer/core/html/canvas/text_metrics.h   |  2 ++
+ .../canvas/canvas2d/canvas_rendering_context_2d.cc   | 10 +++++++++-
+ 5 files changed, 65 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
+--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
+@@ -27,6 +27,7 @@
+ #include "third_party/blink/renderer/core/dom/element.h"
+ 
+ #include <memory>
+#include "base/rand_util.h"
+ 
+ #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
+ #include "third_party/blink/renderer/bindings/core/v8/dictionary.h"
+@@ -1356,6 +1357,15 @@ DOMRectList* Element::getClientRects() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
+       quads, *element_layout_object);
+
+  // scale all quads by 3/10000th
+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
+
+  for (FloatQuad& quad : quads) {
+    quad.Scale(shuffleX, shuffleY);
+  }
+
+   return DOMRectList::Create(quads);
+ }
+ 
+@@ -1373,6 +1383,13 @@ DOMRect* Element::getBoundingClientRect() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
+                                                         *element_layout_object);
+
+  // scale rect by 3/10000th
+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
+
+  result.Scale(shuffleX, shuffleY);
+
+   return DOMRect::FromFloatRect(result);
+ }
+ 
+diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
+--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
+@@ -25,6 +25,8 @@
+ 
+ #include "third_party/blink/renderer/core/dom/range.h"
+ 
+#include "base/rand_util.h"
+
+ #include "third_party/blink/renderer/bindings/core/v8/exception_state.h"
+ #include "third_party/blink/renderer/core/dom/character_data.h"
+ #include "third_party/blink/renderer/core/dom/container_node.h"
+@@ -1575,11 +1577,27 @@ DOMRectList* Range::getClientRects() const {
+   Vector<FloatQuad> quads;
+   GetBorderAndTextQuads(quads);
+ 
+  // scale all quads by 3/10000th
+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
+
+  for (FloatQuad& quad : quads) {
+    quad.Scale(shuffleX, shuffleY);
+  }
+
+   return DOMRectList::Create(quads);
+ }
+ 
+ DOMRect* Range::getBoundingClientRect() const {
+-  return DOMRect::FromFloatRect(BoundingRect());
+  auto rect = BoundingRect();
+
+  // scale rect by 3/10000th
+  auto shuffleX = 1 + (base::RandDouble() - 0.5) * 0.0003;
+  auto shuffleY = 1 + (base::RandDouble() - 0.5) * 0.0003;
+
+  rect.Scale(shuffleX, shuffleY);
+
+  return DOMRect::FromFloatRect(rect);
+ }
+ 
+ // TODO(editing-dev): We should make
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+@@ -47,6 +47,24 @@ float TextMetrics::GetFontBaseline(const TextBaseline& text_baseline,
+   return 0;
+ }
+ 
+void TextMetrics::Shuffle(const double factor) {
+  // x-direction
+  width_ *= factor;
+  actual_bounding_box_left_ *= factor;
+  actual_bounding_box_right_ *= factor;
+
+  // y-direction
+  font_bounding_box_ascent_ *= factor;
+  font_bounding_box_descent_ *= factor;
+  actual_bounding_box_ascent_ *= factor;
+  actual_bounding_box_descent_ *= factor;
+  em_height_ascent_ *= factor;
+  em_height_descent_ *= factor;
+  hanging_baseline_ *= factor;
+  alphabetic_baseline_ *= factor;
+  ideographic_baseline_ *= factor;
+}
+
+ void TextMetrics::Update(const Font& font,
+                          const TextDirection& direction,
+                          const TextBaseline& baseline,
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+@@ -67,6 +67,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+ 
+   static float GetFontBaseline(const TextBaseline&, const FontMetrics&);
+ 
+  void Shuffle(const double factor);
+
+  private:
+   void Update(const Font&,
+               const TextDirection&,
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -33,6 +33,8 @@
+ 
+ #include "third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h"
+ 
+#include "base/rand_util.h"
+
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+ #include "third_party/blink/public/platform/web_scroll_into_view_params.h"
+@@ -776,8 +778,14 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+  TextMetrics* textMetrics = TextMetrics::Create(font, direction, GetState().GetTextBaseline(),
+                              GetState().GetTextAlign(), text);
+
+  // scale text metrics by 3/10000th
+  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.0003;
+  textMetrics->Shuffle(shuffleFactor);
+
+  return textMetrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
+-- 
+2.7.4
+
@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 2 Apr 2018 11:36:02 +0200
+Subject: Punt the Widevine version string
+
+Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
+---
+ chrome/common/chrome_content_client.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
+--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
+@@ -536,7 +536,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+     if (IsWidevineAvailable(&cdm_path, &video_codecs_supported,
+                             &supports_persistent_license,
+                             &encryption_modes_supported)) {
+-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
+      const base::Version version("1.0.123.456");
+       DCHECK(version.IsValid());
+ 
+       cdms->push_back(content::CdmInfo(
+-- 
+2.7.4
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 25 Apr 2018 10:23:51 +0200
+Subject: Disable metrics on all I/O threads
+
+---
+ chrome/browser/profiles/profile_io_data.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
+--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
+@@ -949,7 +949,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
+ 
+ bool ProfileIOData::GetMetricsEnabledStateOnIOThread() const {
+   DCHECK_CURRENTLY_ON(BrowserThread::IO);
+-  return enable_metrics_.GetValue();
+  return false;
+ }
+ 
+ chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
+-- 
+2.7.4
+
@@ -0,0 +1,282 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 08:30:26 +0200
+Subject: Add a flag for DNS-over-HTTPS
+
+Allow selection between Google and Cloudflare endpoints.
+Serve DoH requests with maximum priority, remove traffic annotation.
+Reduce HTTP headers in DoH requests to bare minimum.
+
+See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt
+---
+ chrome/browser/about_flags.cc                      | 12 +++++++++
+ chrome/browser/flag_descriptions.cc                |  3 +++
+ chrome/browser/flag_descriptions.h                 |  3 +++
+ chrome/browser/io_thread.cc                        | 14 +++++++----
+ .../common/network_features.cc                     |  5 ++--
+ .../common/network_features.h                      |  5 ++--
+ .../common/network_switch_list.h                   |  4 +++
+ net/base/load_flags_list.h                         |  6 +++++
+ net/dns/dns_transaction.cc                         | 29 +++-------------------
+ net/url_request/url_request_http_job.cc            | 28 +++++++++++++--------
+ 10 files changed, 64 insertions(+), 45 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -400,6 +400,12 @@ const FeatureEntry::Choice kChromeHomeSwipeLogicChoices[] = {
+      switches::kChromeHomeSwipeLogicType, "velocity"},
+ };
+ 
+const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
+    {features::kDnsOverHttpsChoiceDefault, "", ""},
+    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
+    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
+};
+
+ #endif  // OS_ANDROID
+ 
+ const FeatureEntry::Choice kNumRasterThreadsChoices[] = {
+@@ -3489,6 +3495,12 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kAsyncDns)},
+ #endif  // defined(OS_ANDROID)
+ 
+#if defined(OS_ANDROID)
+    {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
+     flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
+     MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
+#endif  // defined(OS_ANDROID)
+
+     {"enable-overflow-icons-for-media-controls",
+      flag_descriptions::kOverflowIconsForMediaControlsName,
+      flag_descriptions::kOverflowIconsForMediaControlsDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -1952,6 +1952,9 @@ const char kAndroidPaymentAppsDescription[] =
+ const char kAsyncDnsName[] = "Async DNS resolver";
+ const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
+ 
+const char kDnsOverHttpsName[] = "DNS over HTTPS";
+const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
+
+ const char kAutofillAccessoryViewName[] =
+     "Autofill suggestions as keyboard accessory view";
+ const char kAutofillAccessoryViewDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -1188,6 +1188,9 @@ extern const char kAndroidPaymentAppsDescription[];
+ extern const char kAsyncDnsName[];
+ extern const char kAsyncDnsDescription[];
+ 
+extern const char kDnsOverHttpsName[];
+extern const char kDnsOverHttpsDescription[];
+
+ extern const char kAutofillAccessoryViewName[];
+ extern const char kAutofillAccessoryViewDescription[];
+ 
+diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
+--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
+@@ -50,6 +50,7 @@
+ #include "components/metrics/metrics_service.h"
+ #include "components/net_log/chrome_net_log.h"
+ #include "components/network_session_configurator/common/network_features.h"
+#include "components/network_session_configurator/common/network_switches.h"
+ #include "components/policy/core/common/policy_service.h"
+ #include "components/policy/policy_constants.h"
+ #include "components/prefs/pref_registry_simple.h"
+@@ -373,13 +374,16 @@ IOThread::IOThread(
+                                       base::Unretained(this)));
+   dns_client_enabled_.MoveToThread(io_thread_proxy);
+ 
+-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
+  std::string dnsOverHttpsServer =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+      switches::kDnsOverHttpsServer);
+  if (!dnsOverHttpsServer.empty()) {
+     base::Value specs(base::Value::Type::LIST);
+     base::Value methods(base::Value::Type::LIST);
+-    base::Value spec(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "server"));
+-    base::Value method(variations::GetVariationParamValueByFeature(
+-        features::kDnsOverHttps, "method"));
+
+    base::Value spec(dnsOverHttpsServer);
+    base::Value method("POST");
+
+     if (spec.GetString().size() > 0) {
+       specs.GetList().push_back(std::move(spec));
+       methods.GetList().push_back(std::move(method));
+diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
+--- a/components/network_session_configurator/common/network_features.cc
+++ b/components/network_session_configurator/common/network_features.cc
+@@ -14,7 +14,8 @@ const base::Feature kTokenBinding{"token-binding",
+ // TODO(nharper): Disable kChannelID on all platforms in M69.
+ const base::Feature kChannelID{"channel-id", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+-const base::Feature kDnsOverHttps{"dns-over-https",
+-                                  base::FEATURE_DISABLED_BY_DEFAULT};
+const char kDnsOverHttpsChoiceDefault[] = "Disabled",
+                 kDnsOverHttpsChoiceGoogle[] = "Google",
+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare";
+ 
+ }  // namespace features
+diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
+--- a/components/network_session_configurator/common/network_features.h
+++ b/components/network_session_configurator/common/network_features.h
+@@ -17,9 +17,10 @@ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+ // Enables Channel ID.
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kChannelID;
+ 
+-// Enabled DNS over HTTPS
+// DNS over HTTPS server endpoint choices
+ // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
+-NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[];
+ 
+ }  // namespace features
+ 
+diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
+--- a/components/network_session_configurator/common/network_switch_list.h
+++ b/components/network_session_configurator/common/network_switch_list.h
+@@ -35,6 +35,10 @@ NETWORK_SWITCH(kOriginToForceQuicOn, "origin-to-force-quic-on")
+ // the server.
+ NETWORK_SWITCH(kQuicConnectionOptions, "quic-connection-options")
+ 
+// Specifies an IETF DNS-over-HTTPS server endpoint
+// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
+NETWORK_SWITCH(kDnsOverHttpsServer, "dns-over-https-server")
+
+ // Specifies the maximum length for a QUIC packet.
+ NETWORK_SWITCH(kQuicMaxPacketLength, "quic-max-packet-length")
+ 
+diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
+--- a/net/base/load_flags_list.h
+++ b/net/base/load_flags_list.h
+@@ -92,3 +92,9 @@ LOAD_FLAG(DISABLE_CONNECTION_MIGRATION, 1 << 16)
+ // Indicates that the cache should not check that the request matches the
+ // response's vary header.
+ LOAD_FLAG(SKIP_VARY_CHECK, 1 << 17)
+
+// This load will not send Accept-Language or User-Agent headers, and not
+// advertise brotli encoding.
+// Used to comply with IETF (draft) DNS-over-HTTPS:
+// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests."
+LOAD_FLAG(MINIMAL_HEADERS, 1 << 18)
+diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc
+--- a/net/dns/dns_transaction.cc
+++ b/net/dns/dns_transaction.cc
+@@ -390,30 +390,8 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+ 
+     HttpRequestHeaders extra_request_headers;
+     extra_request_headers.SetHeader("Accept", kDnsOverHttpResponseContentType);
+-
+-    request_ = url_request_context->CreateRequest(
+-        url, request_priority_, this,
+-        net::DefineNetworkTrafficAnnotation("dns_over_https", R"(
+-        semantics {
+-          sender: "DNS over HTTPS"
+-          description: "Domain name resolution over HTTPS"
+-          trigger: "User enters a navigates to a domain or Chrome otherwise "
+-                   "makes a connection to a domain whose IP address isn't cached"
+-          data: "The domain name that is being requested"
+-          destination: OTHER
+-          destination_other: "The user configured DNS over HTTPS server, which"
+-                             "may be dns.google.com"
+-        }
+-        policy {
+-          cookies_allowed: NO
+-          setting:
+-            "You can configure this feature via that 'dns_over_https_servers' and"
+-            "'dns_over_https.method' prefs. Empty lists imply this feature is"
+-            "disabled"
+-          policy_exception_justification: "Experimental feature that"
+-                                          "is disabled by default"
+-        }
+-      )"));
+    //extra_request_headers.SetHeader(HttpRequestHeaders::kUserAgent, "DoH client");
+    request_ = url_request_context->CreateRequest(url, request_priority_, this);
+     net_log_ = request_->net_log();
+ 
+     if (use_post) {
+@@ -431,6 +409,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
+                            LOAD_BYPASS_PROXY | LOAD_DO_NOT_SEND_COOKIES |
+                            LOAD_DO_NOT_SAVE_COOKIES |
+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
+                            LOAD_DO_NOT_SEND_AUTH_DATA);
+   }
+ 
+@@ -850,7 +829,7 @@ class DnsTransactionImpl : public DnsTransaction,
+         had_tcp_attempt_(false),
+         doh_attempt_(false),
+         first_server_index_(0),
+-        request_priority_(DEFAULT_PRIORITY) {
+        request_priority_(MAXIMUM_PRIORITY) {
+     DCHECK(session_.get());
+     DCHECK(!hostname_.empty());
+     DCHECK(!callback_.is_null());
+diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
+--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
+@@ -434,19 +434,23 @@ void URLRequestHttpJob::Start() {
+   // plugin could set a referrer although sending the referrer is inhibited.
+   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
+ 
+-  // Our consumer should have made sure that this is a safe referrer. See for
+-  // instance WebCore::FrameLoader::HideReferrer.
+-  if (referrer.is_valid()) {
+-    request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
+-                                          referrer.spec());
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+    // Our consumer should have made sure that this is a safe referrer. See for
+    // instance WebCore::FrameLoader::HideReferrer.
+    if (referrer.is_valid()) {
+      request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
+                                            referrer.spec());
+    }
+   }
+ 
+   request_info_.token_binding_referrer = request_->token_binding_referrer();
+ 
+-  request_info_.extra_headers.SetHeaderIfMissing(
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+    request_info_.extra_headers.SetHeaderIfMissing(
+       HttpRequestHeaders::kUserAgent,
+       http_user_agent_settings_ ?
+           http_user_agent_settings_->GetUserAgent() : std::string());
+  }
+ 
+   AddExtraHeaders();
+   AddCookieHeaderAndStart();
+@@ -663,10 +667,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
+           HttpRequestHeaders::kAcceptEncoding)) {
+     // Advertise "br" encoding only if transferred data is opaque to proxy.
+     bool advertise_brotli = false;
+-    if (request()->context()->enable_brotli()) {
+-      if (request()->url().SchemeIsCryptographic() ||
+-          IsLocalhost(request()->url())) {
+-        advertise_brotli = true;
+    if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS)) {
+      if (request()->context()->enable_brotli()) {
+        if (request()->url().SchemeIsCryptographic() ||
+            IsLocalhost(request()->url())) {
+          advertise_brotli = true;
+        }
+       }
+     }
+ 
+@@ -683,7 +689,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
+                                           advertised_encodings);
+   }
+ 
+-  if (http_user_agent_settings_) {
+  if (!(request_info_.load_flags & LOAD_MINIMAL_HEADERS) && http_user_agent_settings_) {
+     // Only add default Accept-Language if the request didn't have it
+     // specified.
+     std::string accept_language =
+-- 
+2.7.4
+
@@ -0,0 +1,46 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 5 Jun 2018 13:46:40 +0200
+Subject: Always respect async dns flag (regardless of SDK version)
+
+Do not read experiment value for cronet async DNS configuration
+---
+ chrome/browser/io_thread.cc                     | 10 +---------
+ components/cronet/url_request_context_config.cc |  3 ++-
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
+--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
+@@ -252,15 +252,7 @@ void UpdateMetricsUsagePrefsOnUIThread(const std::string& service_name,
+ // Check the AsyncDns field trial and return true if it should be enabled. On
+ // Android this includes checking the Android version in the field trial.
+ bool ShouldEnableAsyncDns() {
+-  bool feature_can_be_enabled = true;
+-#if defined(OS_ANDROID)
+-  int min_sdk =
+-      base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
+-  if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
+-    feature_can_be_enabled = false;
+-#endif
+-  return feature_can_be_enabled &&
+-         base::FeatureList::IsEnabled(features::kAsyncDns);
+  return base::FeatureList::IsEnabled(features::kAsyncDns);
+ }
+ 
+ }  // namespace
+diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
+--- a/components/cronet/url_request_context_config.cc
+++ b/components/cronet/url_request_context_config.cc
+@@ -366,7 +366,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+         effective_experimental_options->Remove(it.key(), nullptr);
+         continue;
+       }
+-      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
+      bool ignored;
+      async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
+     } else if (it.key() == kStaleDnsFieldTrialName) {
+       const base::DictionaryValue* stale_dns_args = nullptr;
+       if (!it.value().GetAsDictionary(&stale_dns_args)) {
+-- 
+2.7.4
+
@@ -0,0 +1,158 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 22:42:04 +0200
+Subject: Add flag to configure maximum connections per host
+
+With the introduction of this flag it is possible to increase the maximum
+allowed connections per host; this can however be detrimental to devices
+with limited CPU/memory resources and it is disabled by default.
+---
+ chrome/browser/about_flags.cc                           |  9 +++++++++
+ chrome/browser/flag_descriptions.cc                     |  4 ++++
+ chrome/browser/flag_descriptions.h                      |  3 +++
+ .../common/network_features.cc                          |  4 ++++
+ .../common/network_features.h                           |  4 ++++
+ .../common/network_switch_list.h                        |  4 ++++
+ net/socket/client_socket_pool_manager.cc                | 17 +++++++++++++++++
+ 7 files changed, 45 insertions(+)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -798,6 +798,12 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+      net::kEffectiveConnectionType4G},
+ };
+ 
+const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
+    {features::kMaxConnectionsPerHostChoiceDefault, "", "0"},
+    {features::kMaxConnectionsPerHostChoice6, switches::kMaxConnectionsPerHost, "6"},
+    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
+};
+
+ // Ensure that all effective connection types returned by Network Quality
+ // Estimator (NQE) are also exposed via flags.
+ static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
+@@ -2398,6 +2404,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kMaterialDesignIncognitoNTPName,
+      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
+    {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
+     flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
+     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
+     {"safe-search-url-reporting",
+      flag_descriptions::kSafeSearchUrlReportingName,
+      flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -975,6 +975,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
+     "If enabled, the Incognito New Tab page uses the new material design with "
+     "a better readable text.";
+ 
+const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
+const char kMaxConnectionsPerHostDescription[] =
+     "Customize maximum allowed connections per host (experimental).";
+
+ const char kMediaRouterCastAllowAllIPsName[] =
+     "Connect to Cast devices on all IP addresses";
+ const char kMediaRouterCastAllowAllIPsDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -613,6 +613,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
+ extern const char kMaterialDesignIncognitoNTPName[];
+ extern const char kMaterialDesignIncognitoNTPDescription[];
+ 
+extern const char kMaxConnectionsPerHostName[];
+extern const char kMaxConnectionsPerHostDescription[];
+
+ extern const char kMediaRouterCastAllowAllIPsName[];
+ extern const char kMediaRouterCastAllowAllIPsDescription[];
+ 
+diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
+--- a/components/network_session_configurator/common/network_features.cc
+++ b/components/network_session_configurator/common/network_features.cc
+@@ -8,6 +8,10 @@
+ 
+ namespace features {
+ 
+const char kMaxConnectionsPerHostChoiceDefault[] = "Default",
+                 kMaxConnectionsPerHostChoice6[] = "6",
+                 kMaxConnectionsPerHostChoice15[] = "15";
+
+ const base::Feature kTokenBinding{"token-binding",
+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
+--- a/components/network_session_configurator/common/network_features.h
+++ b/components/network_session_configurator/common/network_features.h
+@@ -10,6 +10,10 @@
+ 
+ namespace features {
+ 
+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[],
+                 kMaxConnectionsPerHostChoice6[],
+                 kMaxConnectionsPerHostChoice15[];
+
+ // Enables token binding
+ // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
+ NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
+--- a/components/network_session_configurator/common/network_switch_list.h
+++ b/components/network_session_configurator/common/network_switch_list.h
+@@ -21,6 +21,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
+ // Enables the QUIC protocol.  This is a temporary testing flag.
+ NETWORK_SWITCH(kEnableQuic, "enable-quic")
+ 
+// Allows specifying a higher number of maximum connections per host
+// (15 instead of 6, mirroring the value Mozilla uses).
+NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
+
+ // Enable use of experimental TCP sockets API for sending data in the
+ // SYN packet.
+ NETWORK_SWITCH(kEnableTcpFastOpen, "enable-tcp-fastopen")
+diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
+--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
+@@ -6,8 +6,10 @@
+ 
+ #include <memory>
+ 
+#include "base/command_line.h"
+ #include "base/logging.h"
+ #include "base/strings/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+ #include "net/base/load_flags.h"
+ #include "net/http/http_proxy_client_socket_pool.h"
+ #include "net/http/http_request_info.h"
+@@ -19,6 +21,7 @@
+ #include "net/socket/ssl_client_socket_pool.h"
+ #include "net/socket/transport_client_socket_pool.h"
+ #include "net/ssl/ssl_config.h"
+#include "components/network_session_configurator/common/network_switches.h"
+ 
+ namespace net {
+ 
+@@ -316,6 +319,20 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+ int ClientSocketPoolManager::max_sockets_per_group(
+     HttpNetworkSession::SocketPoolType pool_type) {
+   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
+
+  if (pool_type == HttpNetworkSession::NORMAL_SOCKET_POOL) {
+      int maxConnectionsPerHost;
+      if (!base::StringToInt(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kMaxConnectionsPerHost),
+                         &maxConnectionsPerHost)) {
+        LOG(DFATAL) << "--" << switches::kMaxConnectionsPerHost << " only accepts integers as arguments";
+        maxConnectionsPerHost = 0;
+      }
+      if (maxConnectionsPerHost != 0) {
+        return maxConnectionsPerHost;
+      }
+      // fallthrough for default value
+  }
+
+   return g_max_sockets_per_group[pool_type];
+ }
+ 
+-- 
+2.7.4
+
@@ -0,0 +1,116 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 9 Jul 2018 20:12:19 +0200
+Subject: Add flag to show/hide NTP tiles
+
+---
+ chrome/browser/about_flags.cc                           | 4 ++++
+ chrome/browser/android/ntp/most_visited_sites_bridge.cc | 8 ++++++++
+ chrome/browser/flag_descriptions.cc                     | 4 ++++
+ chrome/browser/flag_descriptions.h                      | 3 +++
+ chrome/common/chrome_switches.cc                        | 3 +++
+ chrome/common/chrome_switches.h                         | 1 +
+ 6 files changed, 23 insertions(+)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -1285,6 +1285,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebrtcNewEncodeCpuLoadEstimatorDescription, kOsAll,
+      FEATURE_VALUE_TYPE(media::kNewEncodeCpuLoadEstimator)},
+ #if defined(OS_ANDROID)
+    {"hide-ntp-tiles",
+     flag_descriptions::kHideNTPTilesName,
+     flag_descriptions::kHideNTPTilesDescription, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kHideNTPTiles)},
+     {"clear-old-browsing-data", flag_descriptions::kClearOldBrowsingDataName,
+      flag_descriptions::kClearOldBrowsingDataDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(features::kClearOldBrowsingData)},
+diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+@@ -13,9 +13,11 @@
+ #include "base/android/jni_array.h"
+ #include "base/android/jni_string.h"
+ #include "base/android/scoped_java_ref.h"
+#include "base/command_line.h"
+ #include "base/strings/string16.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "chrome/browser/browser_process.h"
+#include "chrome/common/chrome_switches.h"
+ #include "chrome/browser/history/history_service_factory.h"
+ #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h"
+ #include "chrome/browser/profiles/profile.h"
+@@ -167,6 +169,10 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable(
+   std::vector<int> sources;
+   std::vector<int> section_types;
+   std::vector<int64_t> data_generation_times;
+
+  // do not source any tile if NTP is disabled
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kHideNTPTiles)) {
+   for (const auto& section : sections) {
+     const NTPTilesVector& tiles = section.second;
+     section_types.resize(section_types.size() + tiles.size(),
+@@ -181,6 +187,8 @@ void MostVisitedSitesBridge::JavaObserver::OnURLsAvailable(
+           tile.data_generation_time.ToJavaTime());
+     }
+   }
+  }
+
+   Java_MostVisitedSitesBridge_onURLsAvailable(
+       env, observer_, ToJavaArrayOfStrings(env, titles),
+       ToJavaArrayOfStrings(env, urls), ToJavaIntArray(env, section_types),
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -106,6 +106,10 @@ const char kBackgroundVideoTrackOptimizationDescription[] =
+     "Disable video tracks when the video is played in the background to "
+     "optimize performance.";
+ 
+const char kHideNTPTilesName[] = "Hide NTP tiles";
+const char kHideNTPTilesDescription[] =
+    "Hide all tiles on the New Tab Page, making it effectively empty all the time.";
+
+ const char kBleAdvertisingInExtensionsName[] = "BLE Advertising in Chrome Apps";
+ const char kBleAdvertisingInExtensionsDescription[] =
+     "Enables BLE Advertising in Chrome Apps. BLE Advertising might interfere "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -92,6 +92,9 @@ extern const char kAv1DecoderDescription[];
+ extern const char kBackgroundVideoTrackOptimizationName[];
+ extern const char kBackgroundVideoTrackOptimizationDescription[];
+ 
+extern const char kHideNTPTilesName[];
+extern const char kHideNTPTilesDescription[];
+
+ extern const char kBleAdvertisingInExtensionsName[];
+ extern const char kBleAdvertisingInExtensionsDescription[];
+ 
+diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
+--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
+@@ -88,6 +88,9 @@ const char kAutoSelectDesktopCaptureSource[] =
+ const char kBypassAppBannerEngagementChecks[] =
+     "bypass-app-banner-engagement-checks";
+ 
+// Hide all New Tab Page tiles, making it effectively empty all the time.
+const char kHideNTPTiles[] = "hide-ntp-tiles";
+
+ // How often (in seconds) to check for updates. Should only be used for testing
+ // purposes.
+ const char kCheckForUpdateIntervalSec[]     = "check-for-update-interval";
+diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
+--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
+@@ -46,6 +46,7 @@ extern const char kAuthServerWhitelist[];
+ extern const char kAutoOpenDevToolsForTabs[];
+ extern const char kAutoSelectDesktopCaptureSource[];
+ extern const char kBypassAppBannerEngagementChecks[];
+extern const char kHideNTPTiles[];
+ extern const char kCheckForUpdateIntervalSec[];
+ extern const char kCipherSuiteBlacklist[];
+ extern const char kCloudPrintFile[];
+-- 
+2.7.4
+
@@ -0,0 +1,117 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 23:06:52 +0200
+Subject: Add flag to disable custom tab intents
+
+Custom tab intents allow apps to open URLs with a minimal browser UI;
+this flag allows disabling this functionality altogether and all custom tab
+intents will instead open as regular URLs.
+---
+ .../java/src/org/chromium/chrome/browser/ChromeSwitches.java      | 3 +++
+ .../src/org/chromium/chrome/browser/LaunchIntentDispatcher.java   | 8 ++++++--
+ chrome/browser/about_flags.cc                                     | 4 ++++
+ chrome/browser/flag_descriptions.cc                               | 4 ++++
+ chrome/browser/flag_descriptions.h                                | 3 +++
+ chrome/common/chrome_switches.cc                                  | 3 +++
+ chrome/common/chrome_switches.h                                   | 1 +
+ 7 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
+@@ -177,6 +177,9 @@ public abstract class ChromeSwitches {
+     /** Open all custom tabs in a new task. Used only for experimental purposes. */
+     public static final String OPEN_CUSTOM_TABS_IN_NEW_TASK = "open-custom-tabs-in-new-task";
+ 
+    /** Disallow custom tab intents. */
+    public static final String DISALLOW_CUSTOM_TAB_INTENT = "disallow-custom-tab-intent";
+
+     /**
+      * Don't crash on undispatched VIEW intents sent to .Main.
+      * See ChromeTabbedActivity.maybeDispatchExplicitMainViewIntent() for more info.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
+@@ -149,9 +149,13 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+         recordIntentMetrics();
+ 
+         mIsVrIntent = VrIntentUtils.isVrIntent(mIntent);
+-        boolean isCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
+
+        if (!CommandLine.getInstance().hasSwitch(ChromeSwitches.DISALLOW_CUSTOM_TAB_INTENT)) {
+            mIsCustomTabIntent = (!mIsVrIntent && isCustomTabIntent(mIntent))
+                 || (mIsVrIntent && VrIntentUtils.isCustomTabVrIntent(mIntent));
+-        mIsCustomTabIntent = isCustomTabIntent;
+        } else {
+            mIsCustomTabIntent = false;
+        }
+     }
+ 
+     /**
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -1302,6 +1302,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kMediaScreenCaptureName,
+      flag_descriptions::kMediaScreenCaptureDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kUserMediaScreenCapturing)},
+    {"disallow-custom-tab-intent",
+     flag_descriptions::kDisallowCustomTabIntentName,
+     flag_descriptions::kDisallowCustomTabIntentDescription, kOsAndroid,
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisallowCustomTabIntent)},
+ #endif  // OS_ANDROID
+ // Native client is compiled out if ENABLE_NACL is not set.
+ #if BUILDFLAG(ENABLE_NACL)
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -2043,6 +2043,10 @@ const char kContextualSearchSecondTapDescription[] =
+     "Enables triggering on a second tap gesture even when Ranker would "
+     "normally suppress that tap.";
+ 
+const char kDisallowCustomTabIntentName[] = "Disallow custom tab intent";
+const char kDisallowCustomTabIntentDescription[] =
+    "Do not allow apps to open custom tab intents and use a regular browsing interaction instead.";
+
+ const char kDontPrefetchLibrariesName[] = "Don't Prefetch Libraries";
+ const char kDontPrefetchLibrariesDescription[] =
+     "Don't prefetch libraries after loading.";
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -1244,6 +1244,9 @@ extern const char kContextualSearchRankerQueryDescription[];
+ extern const char kContextualSearchSecondTapName[];
+ extern const char kContextualSearchSecondTapDescription[];
+ 
+extern const char kDisallowCustomTabIntentName[];
+extern const char kDisallowCustomTabIntentDescription[];
+
+ extern const char kDontPrefetchLibrariesName[];
+ extern const char kDontPrefetchLibrariesDescription[];
+ 
+diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
+--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
+@@ -218,6 +218,9 @@ const char kDisableExtensions[]             = "disable-extensions";
+ // Disable extensions except those specified in a comma-separated list.
+ const char kDisableExtensionsExcept[] = "disable-extensions-except";
+ 
+// Disallow apps to use custom tab intents and use a regular URL open intent instead.
+const char kDisallowCustomTabIntent[] = "disallow-custom-tab-intent";
+
+ // Disable checking for user opt-in for extensions that want to inject script
+ // into file URLs (ie, always allow it). This is used during automated testing.
+ const char kDisableExtensionsFileAccessCheck[] =
+diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
+--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
+@@ -72,6 +72,7 @@ extern const char kDisableCastStreamingHWEncoding[];
+ extern const char kDisableClientSidePhishingDetection[];
+ extern const char kDisableComponentExtensionsWithBackgroundPages[];
+ extern const char kDisableComponentUpdate[];
+extern const char kDisallowCustomTabIntent[];
+ extern const char kDisableDefaultApps[];
+ extern const char kDisableDeviceDiscoveryNotifications[];
+ extern const char kDisableDomainReliability[];
+-- 
+2.7.4
+
@@ -0,0 +1,37 @@
+From: samartnik <artem@brave.com>
+Date: Thu, 14 Dec 2017 16:19:50 +0200
+Subject: Always allow partner customisation
+
+---
+ .../PartnerBrowserCustomizations.java                    | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
+             @Override
+             protected Void doInBackground(Void... params) {
+                 try {
+-                    boolean systemOrPreStable =
+-                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+-                            || !ChromeVersionInfo.isStableBuild();
+-                    if (!systemOrPreStable) {
+-                        // Only allow partner customization if this browser is a system package, or
+-                        // is in pre-stable channels.
+-                        return null;
+-                    }
+                    //boolean systemOrPreStable =
+                    //        (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+                    //        || !ChromeVersionInfo.isStableBuild();
+                    //if (!systemOrPreStable) {
+                    //    // Only allow partner customization if this browser is a system package, or
+                    //    // is in pre-stable channels.
+                    //    return null;
+                    //}
+ 
+                     if (isCancelled()) return null;
+                     refreshIncognitoModeDisabled();
+-- 
+2.7.4
+
@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 27 Jun 2018 11:02:38 +0200
+Subject: Change default homepage to new tab page
+
+Disable any partner-provided home page.
+---
+ .../chrome/browser/partnercustomizations/HomepageManager.java      | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+@@ -102,8 +102,7 @@ public class HomepageManager {
+      * @return Whether or not homepage setting should be shown.
+      */
+     public static boolean shouldShowHomepageSetting() {
+-        return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
+-                || FeatureUtilities.isHomePageButtonForceEnabled();
+        return FeatureUtilities.isHomePageButtonForceEnabled();
+     }
+ 
+     /**
+@@ -124,9 +123,7 @@ public class HomepageManager {
+      *         if the homepage button is force enabled via flag.
+      */
+     public static String getDefaultHomepageUri() {
+-        return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
+-                ? PartnerBrowserCustomizations.getHomePageUrl()
+-                : UrlConstants.NTP_NON_NATIVE_URL;
+        return UrlConstants.NTP_NON_NATIVE_URL;
+     }
+ 
+     /**
+-- 
+2.7.4
+
@@ -0,0 +1,69 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 8 Jul 2018 18:16:34 +0200
+Subject: Disable fetching of all field trials
+
+---
+ .../src/org/chromium/chrome/browser/ChromeFeatureList.java   | 12 +++---------
+ components/variations/service/variations_service.cc          |  4 ++++
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+@@ -103,9 +103,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static int getFieldTrialParamByFeatureAsInt(
+             String featureName, String paramName, int defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsInt(featureName, paramName, defaultValue);
+        return defaultValue;
+     }
+ 
+     /**
+@@ -122,9 +120,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static double getFieldTrialParamByFeatureAsDouble(
+             String featureName, String paramName, double defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsDouble(featureName, paramName, defaultValue);
+        return defaultValue;
+     }
+ 
+     /**
+@@ -141,9 +137,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static boolean getFieldTrialParamByFeatureAsBoolean(
+             String featureName, String paramName, boolean defaultValue) {
+-        if (sTestFeatures != null) return defaultValue;
+-        assert isInitialized();
+-        return nativeGetFieldTrialParamByFeatureAsBoolean(featureName, paramName, defaultValue);
+        return defaultValue;
+     }
+ 
+     // Alphabetical:
+diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
+--- a/components/variations/service/variations_service.cc
+++ b/components/variations/service/variations_service.cc
+@@ -224,6 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+ // Variations seed fetching is only enabled in official Chrome builds, if a URL
+ // is specified on the command line, and for testing.
+ bool IsFetchingEnabled() {
+#if 0
+ #if !defined(GOOGLE_CHROME_BUILD)
+   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kVariationsServerURL) &&
+@@ -235,6 +236,9 @@ bool IsFetchingEnabled() {
+   }
+ #endif
+   return true;
+#else
+  return false;
+#endif
+ }
+ 
+ std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
+-- 
+2.7.4
+
@@ -0,0 +1,31 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 24 Apr 2017 16:11:53 +0200
+Subject: Disable smooth scrolling on Linux
+
+Smooth scrolling (while using mousewheel or arrow keys) is a really
+dumb idea. Text naturally appears as a blur while it moves, and the
+animation takes that-many milliseconds to finish, so it's a time
+waster too.
+
+Only the fallback setting, which is used on Linux, is changed; on
+Windows/MacOS, smooth scrolling remains controlled by a system
+setting.
+---
+ ui/gfx/animation/animation.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc
+--- a/ui/gfx/animation/animation.cc
+++ b/ui/gfx/animation/animation.cc
+@@ -111,7 +111,7 @@ bool Animation::ShouldRenderRichAnimationImpl() {
+ // static
+ bool Animation::ScrollAnimationsEnabledBySystem() {
+   // Defined in platform specific files for Windows and OSX.
+-  return true;
+  return false;
+ }
+ #endif
+ 
+-- 
+2.7.4
+
@@ -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/blink/renderer/core/frame/local_frame.cc | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
+--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
+@@ -1239,10 +1239,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
+
@@ -0,0 +1,45 @@
+From: SergeyZhukovsky <serg.zhukovsky@gmail.com>
+Date: Tue, 15 Aug 2017 15:33:16 -0400
+Subject: Remove google account access permission on reboot
+
+---
+ chrome/android/BUILD.gn                 | 3 +--
+ chrome/android/java/AndroidManifest.xml | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -790,8 +790,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+   resources = [
+     "java/res_template/xml/file_paths.xml",
+     "java/res_template/xml/launchershortcuts.xml",
+-    "java/res_template/xml/searchable.xml",
+-    "java/res_template/xml/syncadapter.xml",
+    "java/res_template/xml/searchable.xml"
+   ]
+   res_dir = "java/res_template"
+   variables = chrome_public_jinja_variables
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
+@@ -831,14 +831,14 @@ by a child template that "extends" this file.
+         </provider>
+ 
+         <!-- Sync adapter for browser invalidation. -->
+-        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
+        <!--<service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
+             android:exported="false">
+             <intent-filter>
+                 <action android:name="android.content.SyncAdapter" />
+             </intent-filter>
+             <meta-data android:name="android.content.SyncAdapter"
+                        android:resource="@xml/syncadapter" />
+-        </service>
+        </service>-->
+ 
+         <!-- Broadcast receiver that will be notified of account changes -->
+         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
+-- 
+2.7.4
+
@@ -0,0 +1,25 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 15 Sep 2014 10:52:32 +0200
+Subject: net/cert: increase default key length for newly-generated RSA keys
+
+Should we add something for chrome://settings, or just leave
+it as hidden as it was before?
+---
+ net/cert/x509_util.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/cert/x509_util.cc b/net/cert/x509_util.cc
+--- a/net/cert/x509_util.cc
+++ b/net/cert/x509_util.cc
+@@ -191,7 +191,7 @@ bool GetTLSServerEndPointChannelBinding(const X509Certificate& certificate,
+ }
+ 
+ // RSA keys created by CreateKeyAndSelfSignedCert will be of this length.
+-static const uint16_t kRSAKeyLength = 1024;
+static const uint16_t kRSAKeyLength = 2048;
+ 
+ // Certificates made by CreateKeyAndSelfSignedCert will be signed using this
+ // digest algorithm.
+-- 
+2.7.4
+
@@ -0,0 +1,30 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Mon, 15 Sep 2014 10:58:42 +0200
+Subject: dns: send IPv6 connectivity probes to RIPE DNS rather than Google
+
+Short of disabling the code (we may do that in a subsequent patch
+anyway), avoid sending to Google.
+---
+ net/dns/host_resolver_impl.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
+--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
+@@ -107,10 +107,10 @@ const unsigned kMinimumTTLSeconds = kCacheEntryTTLSeconds;
+ // cached.
+ const int kIPv6ProbePeriodMs = 1000;
+ 
+-// Google DNS address used for IPv6 probes.
+/* RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted) */
+ const uint8_t kIPv6ProbeAddress[] =
+-    { 0x20, 0x01, 0x48, 0x60, 0x48, 0x60, 0x00, 0x00,
+-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 };
+    { 0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 };
+ 
+ // We use a separate histogram name for each platform to facilitate the
+ // display of error codes by their symbolic name (since each platform has
+-- 
+2.7.4
+
@@ -0,0 +1,30 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 28 Oct 2014 18:45:19 +0100
+Subject: profile-resetter: do not tick send-settings by default
+
+When the user wishes to reset his preferences, Chromium would suggest
+to send over the old settings to Google. I presume that this is for
+Google to investigate into the setting combinations that led the user
+to issue a rest.
+
+Of course, we cannot let that happen by default. Google is not to get
+any information.
+---
+ chrome/browser/profile_resetter/reset_report_uploader.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc
+--- a/chrome/browser/profile_resetter/reset_report_uploader.cc
+++ b/chrome/browser/profile_resetter/reset_report_uploader.cc
+@@ -19,7 +19,7 @@
+ 
+ namespace {
+ const char kResetReportUrl[] =
+-    "https://sb-ssl.google.com/safebrowsing/clientreport/chrome-reset";
+    "about:blank"; //https://sb-ssl.google.com/safebrowsing/clientreport/chrome-reset";
+ 
+ GURL GetClientReportUrl(const std::string& report_url) {
+   GURL url(report_url);
+-- 
+2.7.4
+
@@ -0,0 +1,23 @@
+From: Joachim Bauch <bauch@struktur.de>
+Date: Tue, 9 Dec 2014 17:19:41 +0100
+Subject: browser-ui: disable warning about missing API keys
+
+We do not want to use the services anyway ;)
+---
+ chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc
+@@ -14,6 +14,7 @@
+ 
+ // static
+ void GoogleApiKeysInfoBarDelegate::Create(InfoBarService* infobar_service) {
+  return;
+   infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
+       std::unique_ptr<ConfirmInfoBarDelegate>(
+           new GoogleApiKeysInfoBarDelegate())));
+-- 
+2.7.4
+
@@ -0,0 +1,73 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 11 Sep 2014 16:37:32 +0200
+Subject: autofill: disable autofill download manager
+
+Disables the autofill download manager (trk:158).
+---
+ components/autofill/core/browser/autofill_download_manager.cc | 9 +++++++--
+ components/autofill/core/browser/autofill_manager.cc          | 2 ++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
+--- a/components/autofill/core/browser/autofill_download_manager.cc
+++ b/components/autofill/core/browser/autofill_download_manager.cc
+@@ -39,7 +39,6 @@ namespace autofill {
+ 
+ namespace {
+ 
+-const size_t kMaxQueryGetSize = 1400;  // 1.25KB
+ const size_t kMaxFormCacheSize = 16;
+ const size_t kMaxFieldsPerQueryRequest = 100;
+ 
+@@ -69,11 +68,13 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = {
+     false,
+ };
+ 
+#if 0
+ #if defined(GOOGLE_CHROME_BUILD)
+ const char kClientName[] = "Google+Chrome";
+ #else
+ const char kClientName[] = "Chromium";
+ #endif  // defined(GOOGLE_CHROME_BUILD)
+#endif
+ 
+ const char kDefaultAutofillServerURL[] =
+     "https://clients1.google.com/tbproxy/af/";
+@@ -371,7 +372,7 @@ bool AutofillDownloadManager::StartUploadRequest(
+ std::tuple<GURL, net::URLFetcher::RequestType>
+ AutofillDownloadManager::GetRequestURLAndMethod(
+     const FormRequestData& request_data) const {
+-  net::URLFetcher::RequestType method = net::URLFetcher::POST;
+#if 0
+   std::string query_str(base::StrCat({"client=", kClientName}));
+ 
+   if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) {
+@@ -394,6 +395,10 @@ AutofillDownloadManager::GetRequestURLAndMethod(
+   GURL url = autofill_server_url_
+                  .Resolve(RequestTypeToString(request_data.request_type))
+                  .ReplaceComponents(replacements);
+#else
+  net::URLFetcher::RequestType method = net::URLFetcher::GET;
+  GURL url = GURL("about:blank");
+#endif
+ 
+   return std::make_tuple(std::move(url), method);
+ }
+diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
+--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
+@@ -1264,9 +1264,11 @@ AutofillManager::AutofillManager(
+       weak_ptr_factory_(this) {
+   DCHECK(driver);
+   DCHECK(client_);
+#if 0
+   if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {
+     download_manager_.reset(new AutofillDownloadManager(driver, this));
+   }
+#endif
+   CountryNames::SetLocaleString(app_locale_);
+   if (personal_data_ && client_)
+     personal_data_->OnSyncServiceInitialized(client_->GetSyncService());
+-- 
+2.7.4
+
@@ -0,0 +1,30 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sat, 13 Sep 2014 17:12:43 +0200
+Subject: first_run: deactivate autoupdate globally
+
+We currently do not have any update service infrastructure in place
+(i.e. on our webserver), and sending update requests to Google also
+sounds meh (wrong provider, after all).
+
+Also, there is no tunable in chrome://settings (or similar) yet to
+turn it back on.
+---
+ chrome/browser/extensions/extension_system_impl.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
+--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
+@@ -206,8 +206,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
+   // ExtensionService depends on RuntimeData.
+   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
+ 
+-  bool autoupdate_enabled = !profile_->IsGuestSession() &&
+-                            !profile_->IsSystemProfile();
+  bool autoupdate_enabled = false;
+ #if defined(OS_CHROMEOS)
+   if (!extensions_enabled ||
+       chromeos::ProfileHelper::IsLockScreenAppProfile(profile_)) {
+-- 
+2.7.4
+
@@ -0,0 +1,86 @@
+From: Joachim Bauch <jojo@struktur.de>
+Date: Tue, 7 Jul 2015 17:02:09 +0200
+Subject: safe_browsing: disable incident reporting
+
+Disables the safebrowsing incident reporting where you could upload
+information about a blocked URL to Google (also added a trk prefix to
+the URL so we get notified if this happens again in the future).
+---
+ .../safe_browsing/incident_reporting/incident_report_uploader_impl.cc  | 2 +-
+ .../safe_browsing/incident_reporting/incident_reporting_service.cc     | 3 +++
+ chrome/browser/safe_browsing/safe_browsing_blocking_page.cc            | 3 +--
+ chrome/browser/safe_browsing/safe_browsing_service.cc                  | 2 ++
+ components/security_interstitials/core/safe_browsing_loud_error_ui.cc  | 1 +
+ 5 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+--- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
+@@ -22,7 +22,7 @@ namespace safe_browsing {
+ namespace {
+ 
+ const char kSbIncidentReportUrl[] =
+-    "https://sb-ssl.google.com/safebrowsing/clientreport/incident";
+    "about:blank";
+ 
+ constexpr net::NetworkTrafficAnnotationTag
+     kSafeBrowsingIncidentTrafficAnnotation =
+diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+@@ -310,11 +310,14 @@ IncidentReportingService::UploadContext::~UploadContext() {
+ 
+ // static
+ bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
+  return false;
+#if 0
+   if (profile->IsOffTheRecord())
+     return false;
+   if (!profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled))
+     return false;
+   return IsExtendedReportingEnabled(*profile->GetPrefs());
+#endif
+ }
+ 
+ IncidentReportingService::IncidentReportingService(
+diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+@@ -59,8 +59,7 @@ class SafeBrowsingBlockingPageFactoryImpl
+     PrefService* prefs =
+         Profile::FromBrowserContext(web_contents->GetBrowserContext())
+             ->GetPrefs();
+-    bool is_extended_reporting_opt_in_allowed =
+-        IsExtendedReportingOptInAllowed(*prefs);
+    bool is_extended_reporting_opt_in_allowed = false;
+     bool is_proceed_anyway_disabled =
+         prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled);
+ 
+diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
+--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
+@@ -371,8 +371,10 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
+ 
+ void SafeBrowsingService::RegisterAllDelayedAnalysis() {
+ #if defined(FULL_SAFE_BROWSING)
+#if 0
+   RegisterBinaryIntegrityAnalysis();
+ #endif
+#endif
+ }
+ 
+ SafeBrowsingProtocolConfig SafeBrowsingService::GetProtocolConfig() const {
+diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+@@ -23,6 +23,7 @@ namespace {
+ // For malware interstitial pages, we link the problematic URL to Google's
+ // diagnostic page.
+ const char kSbDiagnosticUrl[] =
+/* trk:227 */
+     "https://transparencyreport.google.com/safe-browsing/search?url=%s";
+ 
+ // Constants for the V4 phishing string upgrades.
+-- 
+2.7.4
+
@@ -0,0 +1,69 @@
+From: Joachim Bauch <jojo@struktur.de>
+Date: Tue, 7 Jul 2015 18:28:46 +0200
+Subject: safe_browsing: disable reporting of safebrowsing override
+
+Disables reporting of the safebrowsing override, i.e. the report sent
+if a user decides to visit a page that was flagged as "insecure".
+This prevents trk:148 (phishing) and trk:149 (malware).
+---
+ .../browser/safe_browsing/client_side_detection_service.cc   | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
+--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
+@@ -64,11 +64,13 @@ enum MalwareReportTypes {
+   REPORT_RESULT_MAX
+ };
+ 
+#if 0
+ void UpdateEnumUMAHistogram(MalwareReportTypes report_type) {
+   DCHECK(report_type >= 0 && report_type < REPORT_RESULT_MAX);
+   UMA_HISTOGRAM_ENUMERATION("SBClientMalware.SentReports", report_type,
+                             REPORT_RESULT_MAX);
+ }
+#endif
+ 
+ }  // namespace
+ 
+@@ -285,6 +287,10 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+     return;
+   }
+ 
+#if 1
+  if (!callback.is_null())
+    callback.Run(GURL(request->url()), false);
+#else
+   // Fill in metadata about which model we used.
+   if (is_extended_reporting) {
+     request->set_model_filename(model_loader_extended_->name());
+@@ -367,6 +373,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+ 
+   // Record that we made a request
+   phishing_report_times_.push(base::Time::Now());
+#endif
+ }
+ 
+ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -381,6 +388,10 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+     return;
+   }
+ 
+#if 1
+  if (!callback.is_null())
+    callback.Run(GURL(request->url()), GURL(request->url()), false);
+#else
+   std::string request_data;
+   if (!request->SerializeToString(&request_data)) {
+     UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION);
+@@ -450,6 +461,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+ 
+   // Record that we made a malware request
+   malware_report_times_.push(base::Time::Now());
+#endif
+ }
+ 
+ void ClientSideDetectionService::HandlePhishingVerdict(
+-- 
+2.7.4
+
@@ -0,0 +1,114 @@
+From: Joachim Bauch <jojo@struktur.de>
+Date: Wed, 22 Jul 2015 12:24:15 +0200
+Subject: safe_browsing: disable cookie transmission
+
+Disables sending/setting cookies for Safebrowsing requests. This
+prevents the long-living tracking cookie from being set.
+
+References: https://github.com/iridium-browser/iridium-browser/issues/37
+---
+ chrome/browser/safe_browsing/client_side_detection_service.cc     | 4 ++--
+ .../download_protection/check_client_download_request.cc          | 2 +-
+ .../safe_browsing/download_protection/ppapi_download_request.cc   | 2 +-
+ chrome/browser/safe_browsing/protocol_manager.cc                  | 8 ++++----
+ components/safe_browsing/browser/threat_details_cache.cc          | 1 +
+ 5 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
+--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
+@@ -354,7 +354,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = GetClientReportUrl(kClientReportPhishingUrl);
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
+                                                  traffic_annotation);
+   loader->AttachStringForUpload(request_data, "application/octet-stream");
+@@ -436,7 +436,7 @@ void ClientSideDetectionService::StartClientReportMalwareRequest(
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = GetClientReportUrl(kClientReportMalwareUrl);
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   auto loader = network::SimpleURLLoader::Create(std::move(resource_request),
+                                                  traffic_annotation);
+   loader->AttachStringForUpload(request_data, "application/octet-stream");
+diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+--- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
+@@ -1022,7 +1022,7 @@ void CheckClientDownloadRequest::SendRequest() {
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = PPAPIDownloadRequest::GetDownloadRequestUrl();
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
+                                              traffic_annotation);
+   loader_->AttachStringForUpload(client_download_request_data_,
+diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
+--- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
+++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
+@@ -248,7 +248,7 @@ void PPAPIDownloadRequest::SendRequest() {
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = GetDownloadRequestUrl();
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   loader_ = network::SimpleURLLoader::Create(std::move(resource_request),
+                                              traffic_annotation);
+   loader_->AttachStringForUpload(client_download_request_data_,
+diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
+--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
+@@ -282,7 +282,7 @@ void SafeBrowsingProtocolManager::GetFullHash(
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = gethash_url;
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   auto loader_ptr = network::SimpleURLLoader::Create(
+       std::move(resource_request), traffic_annotation);
+   loader_ptr->AttachStringForUpload(FormatGetHash(prefixes), "text/plain");
+@@ -688,7 +688,7 @@ bool SafeBrowsingProtocolManager::IssueBackupUpdateRequest(
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = backup_update_url;
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   request_ = network::SimpleURLLoader::Create(std::move(resource_request),
+                                               traffic_annotation);
+   request_->AttachStringForUpload(update_list_data_, "text/plain");
+@@ -719,7 +719,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() {
+ 
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = chunk_url;
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
+   request_ = network::SimpleURLLoader::Create(
+       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
+   request_->DownloadToStringOfUnboundedSizeUntilCrashAndDie(
+@@ -777,7 +777,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete(
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = update_url;
+   resource_request->method = "POST";
+-  resource_request->load_flags = net::LOAD_DISABLE_CACHE;
+  resource_request->load_flags = net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DO_NOT_SEND_COOKIES;
+   request_ = network::SimpleURLLoader::Create(
+       std::move(resource_request), kChunkBackupRequestTrafficAnnotation);
+   request_->AttachStringForUpload(update_list_data_, "text/plain");
+diff --git a/components/safe_browsing/browser/threat_details_cache.cc b/components/safe_browsing/browser/threat_details_cache.cc
+--- a/components/safe_browsing/browser/threat_details_cache.cc
+++ b/components/safe_browsing/browser/threat_details_cache.cc
+@@ -113,6 +113,7 @@ void ThreatDetailsCacheCollector::OpenEntry() {
+   // Only from cache, and don't save cookies.
+   resource_request->load_flags = net::LOAD_ONLY_FROM_CACHE |
+                                  net::LOAD_SKIP_CACHE_VALIDATION |
+                                 net::LOAD_DO_NOT_SEND_COOKIES |
+                                  net::LOAD_DO_NOT_SAVE_COOKIES;
+   current_load_ = network::SimpleURLLoader::Create(std::move(resource_request),
+                                                    traffic_annotation);
+-- 
+2.7.4
+
@@ -0,0 +1,36 @@
+From: Joachim Bauch <jojo@struktur.de>
+Date: Thu, 25 Jun 2015 15:34:10 +0200
+Subject: extensions: always show component extensions in the ext list
+
+The attached patch makes sure that component extensions are always
+shown in "chrome://extensions".
+
+Currently these are
+- Bookmark Manager
+- Chromium PDF Viewer
+- CryptoTokenExtension
+
+References: https://github.com/iridium-browser/iridium-browser/issues/28
+---
+ extensions/common/extension.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
+--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
+@@ -377,9 +377,12 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+ }
+ 
+ bool Extension::ShouldExposeViaManagementAPI() const {
+#if 0
+   // Hide component extensions because they are only extensions as an
+   // implementation detail of Chrome.
+   return !extensions::Manifest::IsComponentLocation(location());
+#endif
+  return false;
+ }
+ 
+ Extension::ManifestData* Extension::GetManifestData(const std::string& key)
+-- 
+2.7.4
+
@@ -0,0 +1,31 @@
+From: Simon Eisenmann <simon@struktur.de>
+Date: Mon, 26 Oct 2015 14:18:05 +0100
+Subject: translate: disable fetching of translate languages from server
+
+GH issue #18.
+---
+ components/translate/core/browser/translate_language_list.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/components/translate/core/browser/translate_language_list.cc b/components/translate/core/browser/translate_language_list.cc
+--- a/components/translate/core/browser/translate_language_list.cc
+++ b/components/translate/core/browser/translate_language_list.cc
+@@ -207,6 +207,7 @@ GURL TranslateLanguageList::TranslateLanguageUrl() {
+ }
+ 
+ void TranslateLanguageList::RequestLanguageList() {
+#if 0
+   // If resource requests are not allowed, we'll get a callback when they are.
+   if (!resource_requests_allowed_) {
+     request_pending_ = true;
+@@ -233,6 +234,7 @@ void TranslateLanguageList::RequestLanguageList() {
+     if (!result)
+       NotifyEvent(__LINE__, "Request is omitted due to retry limit");
+   }
+#endif
+ }
+ 
+ void TranslateLanguageList::SetResourceRequestsAllowed(bool allowed) {
+-- 
+2.7.4
+
@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 24 Jun 2018 01:51:49 +0200
+Subject: lint: suppress hardcoded text warnings
+
+---
+ build/android/lint/suppressions.xml | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
+--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
+@@ -94,10 +94,8 @@ Still reading?
+     <ignore regexp="chromecast/internal" />
+     <ignore regexp="remoting/android/java/src/org/chromium/chromoting/TapGestureDetector.java" />
+   </issue>
+-  <issue id="HardcodedDebugMode" severity="Fatal">
+-    <ignore path="AndroidManifest.xml"/>
+-  </issue>
+-  <issue id="HardcodedText" severity="Error">
+  <issue id="HardcodedDebugMode" severity="Fatal" />
+  <issue id="HardcodedText" severity="ignore">
+     <ignore regexp="chromecast/internal"/>
+     <ignore regexp="remoting/android/host/res/layout/main.xml"/>
+   </issue>
+-- 
+2.7.4
+
@@ -0,0 +1,83 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:04:43 +0200
+Subject: kill Vision
+
+---
+ services/shape_detection/BUILD.gn                            |  3 ---
+ .../java/src/org/chromium/shape_detection/BitmapUtils.java   | 12 ------------
+ .../chromium/shape_detection/FaceDetectionProviderImpl.java  |  2 +-
+ .../src/org/chromium/shape_detection/InterfaceRegistrar.java |  2 --
+ 4 files changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.gn
+--- a/services/shape_detection/BUILD.gn
+++ b/services/shape_detection/BUILD.gn
+@@ -79,13 +79,10 @@ if (is_android) {
+ 
+   android_library("shape_detection_java") {
+     java_files = [
+-      "android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java",
+       "android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java",
+-      "android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java",
+       "android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java",
+       "android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java",
+       "android/java/src/org/chromium/shape_detection/BitmapUtils.java",
+-      "android/java/src/org/chromium/shape_detection/TextDetectionImpl.java",
+     ]
+ 
+     deps = [
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BitmapUtils.java
+@@ -6,8 +6,6 @@ package org.chromium.shape_detection;
+ 
+ import android.graphics.Bitmap;
+ 
+-import com.google.android.gms.vision.Frame;
+-
+ import org.chromium.mojo_base.BigBufferUtil;
+ import org.chromium.skia.mojom.ColorType;
+ 
+@@ -44,14 +42,4 @@ public class BitmapUtils {
+ 
+         return bitmap;
+     }
+-
+-    public static Frame convertToFrame(org.chromium.skia.mojom.Bitmap bitmapData) {
+-        Bitmap bitmap = convertToBitmap(bitmapData);
+-        if (bitmap == null) {
+-            return null;
+-        }
+-
+-        // This constructor implies a pixel format conversion to YUV.
+-        return new Frame.Builder().setBitmap(bitmap).build();
+-    }
+ }
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java
+@@ -30,7 +30,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider {
+                 == ConnectionResult.SUCCESS;
+ 
+         if (isGmsCoreSupported) {
+-            FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
+            //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
+         } else {
+             FaceDetection.MANAGER.bind(new FaceDetectionImpl(options), request);
+         }
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
+++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java
+@@ -20,9 +20,7 @@ class InterfaceRegistrar {
+         // is not necessary to hold on to a reference to it explicitly.
+         InterfaceRegistry registry = InterfaceRegistry.create(
+                 CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle());
+-        registry.addInterface(BarcodeDetection.MANAGER, new BarcodeDetectionImpl.Factory());
+         registry.addInterface(
+                 FaceDetectionProvider.MANAGER, new FaceDetectionProviderImpl.Factory());
+-        registry.addInterface(TextDetection.MANAGER, new TextDetectionImpl.Factory());
+     }
+ }
+-- 
+2.7.4
+
@@ -0,0 +1,800 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:11:38 +0200
+Subject: kill GCM
+
+---
+ build/secondary/third_party/android_tools/BUILD.gn |  2 -
+ .../third_party/android_tools/support/BUILD.gn     |  5 --
+ chrome/android/BUILD.gn                            |  1 -
+ chrome/android/java/AndroidManifest.xml            | 62 ----------------------
+ .../chrome/browser/BackgroundSyncLauncher.java     | 16 +++---
+ .../invalidation/InvalidationController.java       | 13 +----
+ .../browser/ntp/snippets/SnippetsLauncher.java     | 44 ---------------
+ .../browser/services/gcm/GCMBackgroundTask.java    |  2 -
+ .../gcm/InvalidationGcmUpstreamSender.java         |  3 +-
+ chrome/android/java_sources.gni                    |  2 -
+ components/background_task_scheduler/BUILD.gn      |  1 -
+ .../BackgroundTaskSchedulerGcmNetworkManager.java  | 30 ++++-------
+ components/gcm_driver/android/BUILD.gn             |  1 -
+ components/gcm_driver/instance_id/android/BUILD.gn |  1 -
+ .../gcm_driver/instance_id/InstanceIDBridge.java   | 29 ++--------
+ components/sync/android/BUILD.gn                   |  1 -
+ third_party/cacheinvalidation/BUILD.gn             |  6 ---
+ .../client/contrib/MultiplexingGcmListener.java    | 49 ++---------------
+ .../android2/channel/AndroidNetworkChannel.java    | 18 +++----
+ 19 files changed, 34 insertions(+), 252 deletions(-)
+
+diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
+--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
+@@ -43,8 +43,6 @@ if (enable_java_templates) {
+   support_lib_alias("android_support_chromium_java") {
+     testonly = true
+   }
+-  support_lib_alias("android_gcm_java") {
+-  }
+   support_lib_alias("emma_device_java") {
+   }
+   prebuilt_wrapper("android_arch_lifecycle_common_java") {
+diff --git a/build/secondary/third_party/android_tools/support/BUILD.gn b/build/secondary/third_party/android_tools/support/BUILD.gn
+--- a/build/secondary/third_party/android_tools/support/BUILD.gn
+++ b/build/secondary/third_party/android_tools/support/BUILD.gn
+@@ -21,11 +21,6 @@ android_library("android_support_chromium_java") {
+   visibility += [ "//third_party/android_tools:*" ]
+ }
+ 
+-android_java_prebuilt("android_gcm_java") {
+-  jar_path = "//third_party/android_tools/sdk/extras/google/gcm/gcm-client/dist/gcm.jar"
+-  visibility += [ "//third_party/android_tools:*" ]
+-}
+-
+ android_java_prebuilt("emma_device_java") {
+   jar_path = "//third_party/android_tools/sdk/tools/lib/emma_device.jar"
+   include_java_resources = true
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -260,7 +260,6 @@ android_library("chrome_java") {
+     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
+     "//third_party/android_tools:android_arch_lifecycle_common_java",
+     "//third_party/android_tools:android_arch_lifecycle_runtime_java",
+-    "//third_party/android_tools:android_gcm_java",
+     "//third_party/android_tools:android_support_annotations_java",
+     "//third_party/android_tools:android_support_compat_java",
+     "//third_party/android_tools:android_support_design_java",
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
+@@ -74,22 +74,17 @@ by a child template that "extends" this file.
+     <permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
+     <permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
+     <permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
+-    <!-- Only chrome can receive the messages and registration result -->
+-    <permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE"
+-        android:protectionLevel="signature" />
+     <permission android:name="{{ manifest_package }}.permission.DEBUG"
+                 android:label="Debug web pages"
+                 android:permissionGroup="android.permission-group.DEVELOPMENT_TOOLS"
+                 android:protectionLevel="signature" />
+ 
+-    <uses-permission android:name="{{ manifest_package }}.permission.C2D_MESSAGE" />
+     <uses-permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" />
+     <uses-permission android:name="{{ manifest_package }}.TOS_ACKED" />
+ 
+     <uses-permission android:name="com.chrome.permission.DEVICE_EXTRAS" />
+     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
+     <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
+-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+ 
+     <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
+@@ -913,43 +908,6 @@ by a child template that "extends" this file.
+             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
+             android:hardwareAccelerated="false" />
+ 
+-        <!-- Receiver for GCM messages. -->
+-        <receiver android:name="com.google.android.gms.gcm.GcmReceiver"
+-            android:exported="true"
+-            android:permission="com.google.android.c2dm.permission.SEND">
+-            <intent-filter>
+-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+-                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+-               <category android:name="{{ manifest_package }}"/>
+-            </intent-filter>
+-        </receiver>
+-        <!-- GcmTaskService for registration for Invalidations. -->
+-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
+-            android:exported="true"
+-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE" >
+-            <intent-filter>
+-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY"/>
+-            </intent-filter>
+-        </service>
+-        <!-- InstanceIDListenerService for token refresh events from GCM. -->
+-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidInstanceIDListenerService"
+-            android:exported="false">
+-            <intent-filter>
+-                <action android:name="com.google.android.gms.iid.InstanceID"/>
+-            </intent-filter>
+-        </service>
+-        <!-- GcmListenerService for messages from GCM. -->
+-        <service android:name="org.chromium.chrome.browser.services.gcm.ChromeGcmListenerService"
+-            android:exported="false" >
+-            <intent-filter>
+-              <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+-            </intent-filter>
+-        </service>
+-        <meta-data android:name="ipc.invalidation.ticl.gcm_upstream_service_class"
+-            android:value="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender" />
+-        <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
+-            android:exported="false"/>
+-
+         <!-- Notification service for sync. -->
+         <meta-data android:name="ipc.invalidation.ticl.listener_service_class"
+             android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
+@@ -961,8 +919,6 @@ by a child template that "extends" this file.
+         </service>
+         <service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
+             android:exported="false"/>
+-        <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
+-            android:exported="false"/>
+         <receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
+             android:exported="false"/>
+         <receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
+@@ -989,24 +945,6 @@ by a child template that "extends" this file.
+             android:exported="false"
+             android:permission="android.permission.BIND_JOB_SERVICE"/>
+ 
+-        <!-- Background Task Scheduler GCM task service -->
+-        <service android:name="org.chromium.components.background_task_scheduler.BackgroundTaskGcmTaskService"
+-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
+-            android:exported="true">
+-            <intent-filter>
+-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
+-            </intent-filter>
+-        </service>
+-
+-        <!-- GcmTaskService implementation to wake Chrome on scheduled events -->
+-        <service android:name="org.chromium.chrome.browser.ChromeBackgroundService"
+-            android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE"
+-            android:exported="true">
+-            <intent-filter>
+-                <action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
+-            </intent-filter>
+-        </service>
+-
+         <service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
+             android:exported="true"
+             tools:ignore="ExportedService" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BackgroundSyncLauncher.java
+@@ -9,10 +9,6 @@ import android.content.SharedPreferences;
+ import android.os.AsyncTask;
+ import android.os.StrictMode;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.OneoffTask;
+-import com.google.android.gms.gcm.Task;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.VisibleForTesting;
+@@ -37,8 +33,6 @@ public class BackgroundSyncLauncher {
+     // BackgroundSyncLauncherAndroid, if any. If it is non-null then the browser is running.
+     private static BackgroundSyncLauncher sInstance;
+ 
+-    private GcmNetworkManager mScheduler;
+-
+     /**
+      * Disables the automatic use of the GCMNetworkManager. When disabled, the methods which
+      * interact with GCM can still be used, but will not be called automatically on creation, or by
+@@ -123,6 +117,7 @@ public class BackgroundSyncLauncher {
+     @VisibleForTesting
+     @CalledByNative
+     protected void launchBrowserIfStopped(final boolean shouldLaunch, final long minDelayMs) {
+    /*
+         mLaunchBrowserIfStoppedTask = new AsyncTask<Void, Void, Void>() {
+             @Override
+             protected Void doInBackground(Void... params) {
+@@ -147,6 +142,7 @@ public class BackgroundSyncLauncher {
+                 }
+             }
+         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        */
+     }
+ 
+     /**
+@@ -158,7 +154,6 @@ public class BackgroundSyncLauncher {
+     }
+ 
+     protected BackgroundSyncLauncher() {
+-        mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
+         launchBrowserIfStopped(false, 0);
+     }
+ 
+@@ -186,7 +181,7 @@ public class BackgroundSyncLauncher {
+         }
+         return !sGCMEnabled;
+     }
+-
+	/*
+     private static boolean scheduleLaunchTask(GcmNetworkManager scheduler, long minDelayMs) {
+         // Google Play Services may not be up to date, if the application was not installed through
+         // the Play Store. In this case, scheduling the task will fail silently.
+@@ -229,7 +224,7 @@ public class BackgroundSyncLauncher {
+         }
+         return true;
+     }
+-
+	*/
+     /**
+      * Reschedule any required background sync tasks, if they have been removed due to an
+      * application upgrade.
+@@ -239,6 +234,7 @@ public class BackgroundSyncLauncher {
+      * This method is static so that it can be run without actually instantiating a
+      * BackgroundSyncLauncher.
+      */
+     /*
+     protected static void rescheduleTasksOnUpgrade(final Context context) {
+         final GcmNetworkManager scheduler = GcmNetworkManager.getInstance(context);
+         BackgroundSyncLauncher.ShouldLaunchCallback callback = shouldLaunch -> {
+@@ -252,7 +248,7 @@ public class BackgroundSyncLauncher {
+         };
+         BackgroundSyncLauncher.shouldLaunchBrowserIfStopped(callback);
+     }
+-
+	*/
+     @VisibleForTesting
+     static void setGCMEnabled(boolean enabled) {
+         sGCMEnabled = enabled;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+@@ -12,8 +12,6 @@ import android.os.Build;
+ import android.os.Handler;
+ import android.os.SystemClock;
+ 
+-import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
+-
+ import org.chromium.base.ApplicationState;
+ import org.chromium.base.ApplicationStatus;
+ import org.chromium.base.Log;
+@@ -200,16 +198,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
+      * Registers for Google Cloud Messaging (GCM) for Invalidations.
+      */
+     private void ensureGcmIsInitialized() {
+-        if (mGcmInitialized) return;
+-        mGcmInitialized = true;
+-        new AsyncTask<Void, Void, Void>() {
+-            @Override
+-            protected Void doInBackground(Void... arg0) {
+-                boolean useGcmUpstream = true;
+-                AndroidGcmController.get(mContext).initializeGcm(useGcmUpstream);
+-                return null;
+-            }
+-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        mGcmInitialized = false;
+     }
+ 
+     @VisibleForTesting
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsLauncher.java
+@@ -7,15 +7,10 @@ package org.chromium.chrome.browser.ntp.snippets;
+ import android.content.Context;
+ import android.net.ConnectivityManager;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.PeriodicTask;
+-import com.google.android.gms.gcm.Task;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.annotations.CalledByNative;
+-import org.chromium.chrome.browser.ChromeBackgroundService;
+ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+ 
+ /**
+@@ -40,8 +35,6 @@ public class SnippetsLauncher {
+     // If it is non-null then the browser is running.
+     private static SnippetsLauncher sInstance;
+ 
+-    private GcmNetworkManager mScheduler;
+-
+     private boolean mGCMEnabled = true;
+ 
+     /**
+@@ -78,7 +71,6 @@ public class SnippetsLauncher {
+ 
+     protected SnippetsLauncher() {
+         checkGCM();
+-        mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
+     }
+ 
+     private void checkGCM() {
+@@ -89,32 +81,7 @@ public class SnippetsLauncher {
+         }
+     }
+ 
+-    private static PeriodicTask buildFetchTask(
+-            String tag, long periodSeconds, int requiredNetwork) {
+-        // Add a bit of "flex" around the target period. This achieves the following:
+-        // - It makes sure the task doesn't run (significantly) before its initial period has
+-        //   elapsed. In practice, the scheduler seems to behave like that anyway, but it doesn't
+-        //   guarantee that, so we shouldn't rely on it.
+-        // - It gives the scheduler a bit of room to optimize for battery life.
+-        long effectivePeriodSeconds = (long) (periodSeconds * (1.0 + FLEX_FACTOR));
+-        long flexSeconds = (long) (periodSeconds * (2.0 * FLEX_FACTOR));
+-        return new PeriodicTask.Builder()
+-                .setService(ChromeBackgroundService.class)
+-                .setTag(tag)
+-                .setPeriod(effectivePeriodSeconds)
+-                .setFlex(flexSeconds)
+-                .setRequiredNetwork(requiredNetwork)
+-                .setPersisted(true)
+-                .setUpdateCurrent(true)
+-                .build();
+-    }
+-
+     private void scheduleOrCancelFetchTask(String taskTag, long period, int requiredNetwork) {
+-        if (period > 0) {
+-            mScheduler.schedule(buildFetchTask(taskTag, period, requiredNetwork));
+-        } else {
+-            mScheduler.cancelTask(taskTag, ChromeBackgroundService.class);
+-        }
+     }
+ 
+     @CalledByNative
+@@ -127,23 +94,12 @@ public class SnippetsLauncher {
+                 .edit()
+                 .putBoolean(PREF_IS_SCHEDULED, isScheduled)
+                 .apply();
+-
+-        // Google Play Services may not be up to date, if the application was not installed through
+-        // the Play Store. In this case, scheduling the task will fail silently.
+-        try {
+-            scheduleOrCancelFetchTask(
+-                    TASK_TAG_WIFI, periodWifiSeconds, Task.NETWORK_STATE_UNMETERED);
+-            scheduleOrCancelFetchTask(
+-                    TASK_TAG_FALLBACK, periodFallbackSeconds, Task.NETWORK_STATE_CONNECTED);
+-        } catch (IllegalArgumentException e) {
+             // Disable GCM for the remainder of this session.
+             mGCMEnabled = false;
+ 
+             ContextUtils.getAppSharedPreferences().edit().remove(PREF_IS_SCHEDULED).apply();
+             // Return false so that the failure will be logged.
+             return false;
+-        }
+-        return true;
+     }
+ 
+     @CalledByNative
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java
+@@ -39,8 +39,6 @@ public class GCMBackgroundTask implements BackgroundTask {
+             Log.e(TAG, "The received bundle containing message data could not be validated.");
+             return false;
+         }
+-
+-        ChromeGcmListenerService.dispatchMessageToDriver(context, new GCMMessage(extras));
+         return false;
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java
+@@ -13,7 +13,6 @@ import android.os.Parcel;
+ import android.support.annotation.MainThread;
+ import android.util.Log;
+ 
+-import com.google.android.gms.gcm.GoogleCloudMessaging;
+ import com.google.ipc.invalidation.ticl.android2.channel.GcmUpstreamSenderService;
+ 
+ import org.chromium.base.ThreadUtils;
+@@ -92,6 +91,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
+      * This function runs on a thread from the AsyncTask.THREAD_POOL_EXECUTOR.
+      */
+     private void sendUpstreamMessage(String to, Bundle data, String token, Context context) {
+    	/*
+         // Add the OAuth2 token to the bundle. The token should have the prefix Bearer added to it.
+         data.putString("Authorization", "Bearer " + token);
+         if (!isMessageWithinLimit(data)) {
+@@ -105,6 +105,7 @@ public class InvalidationGcmUpstreamSender extends GcmUpstreamSenderService {
+             Log.w(TAG, "Send message failed");
+             GcmUma.recordGcmUpstreamHistogram(context, GcmUma.UMA_UPSTREAM_SEND_FAILED);
+         }
+        */
+     }
+ 
+     private boolean isMessageWithinLimit(Bundle data) {
+diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
+--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
+@@ -24,7 +24,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/ChromeActivity.java",
+   "java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
+   "java/src/org/chromium/chrome/browser/ChromeApplication.java",
+-  "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
+   "java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
+   "java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
+   "java/src/org/chromium/chrome/browser/ChromeFeatureList.java",
+@@ -1159,7 +1158,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
+   "java/src/org/chromium/chrome/browser/services/AndroidEduOwnerCheckCallback.java",
+   "java/src/org/chromium/chrome/browser/services/GoogleServicesManager.java",
+-  "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
+   "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
+   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
+   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
+diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
+--- a/components/background_task_scheduler/BUILD.gn
+++ b/components/background_task_scheduler/BUILD.gn
+@@ -23,7 +23,6 @@ if (is_android) {
+   android_library("background_task_scheduler_java") {
+     java_files = [
+       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTask.java",
+-      "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java",
+       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskJobService.java",
+       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskReflection.java",
+       "android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskScheduler.java",
+diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
+--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerGcmNetworkManager.java
+@@ -8,14 +8,6 @@ import android.content.Context;
+ import android.os.Bundle;
+ import android.support.annotation.NonNull;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.OneoffTask;
+-import com.google.android.gms.gcm.PeriodicTask;
+-import com.google.android.gms.gcm.Task;
+-import com.google.android.gms.gcm.TaskParams;
+-
+ import org.chromium.base.Log;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.VisibleForTesting;
+@@ -33,7 +25,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+     static final String BACKGROUND_TASK_CLASS_KEY = "_background_task_class";
+     @VisibleForTesting
+     static final String BACKGROUND_TASK_EXTRAS_KEY = "_background_task_extras";
+-
+    /*
+     static BackgroundTask getBackgroundTaskFromTaskParams(@NonNull TaskParams taskParams) {
+         String backgroundTaskClassName = getBackgroundTaskClassFromTaskParams(taskParams);
+         return BackgroundTaskReflection.getBackgroundTaskFromClassName(backgroundTaskClassName);
+@@ -44,7 +36,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+         if (extras == null) return null;
+         return extras.getString(BACKGROUND_TASK_CLASS_KEY);
+     }
+-
+    */
+     /**
+      * Retrieves the {@link TaskParameters} from the {@link TaskParams}, which are passed as
+      * one of the keys. Only values valid for {@link android.os.BaseBundle} are supported, and other
+@@ -53,6 +45,8 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+      * @param taskParams the {@link TaskParams} to extract the {@link TaskParameters} from.
+      * @return the {@link TaskParameters} for the current job.
+      */
+     
+    /*
+     static TaskParameters getTaskParametersFromTaskParams(@NonNull TaskParams taskParams) {
+         int taskId;
+         try {
+@@ -132,6 +126,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+         return Task.NETWORK_STATE_ANY;
+     }
+ 
+    */
+     @Override
+     public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
+         ThreadUtils.assertOnUiThread();
+@@ -142,6 +137,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+                             + " has no parameterless public constructor.");
+             return false;
+         }
+        /*
+ 
+         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
+         if (gcmNetworkManager == null) {
+@@ -158,14 +154,15 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+                     "GcmNetworkManager failed to schedule task, gcm message: " + gcmErrorMessage);
+             return false;
+         }
+-
+-        return true;
+		*/
+        return false;
+     }
+ 
+     @Override
+     public void cancel(Context context, int taskId) {
+         ThreadUtils.assertOnUiThread();
+ 
+        /*
+         GcmNetworkManager gcmNetworkManager = getGcmNetworkManager(context);
+         if (gcmNetworkManager == null) {
+             Log.e(TAG, "GcmNetworkManager is not available.");
+@@ -178,14 +175,7 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+         } catch (IllegalArgumentException e) {
+             Log.e(TAG, "GcmNetworkManager failed to cancel task.");
+         }
+-    }
+-
+-    private GcmNetworkManager getGcmNetworkManager(Context context) {
+-        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context)
+-                == ConnectionResult.SUCCESS) {
+-            return GcmNetworkManager.getInstance(context);
+-        }
+-        return null;
+        */
+     }
+ 
+     private static String taskIdToTaskTag(int taskId) {
+diff --git a/components/gcm_driver/android/BUILD.gn b/components/gcm_driver/android/BUILD.gn
+--- a/components/gcm_driver/android/BUILD.gn
+++ b/components/gcm_driver/android/BUILD.gn
+@@ -15,7 +15,6 @@ android_library("gcm_driver_java") {
+   deps = [
+     "//base:base_java",
+     "//content/public/android:content_java",
+-    "//third_party/android_tools:android_gcm_java",
+     "//third_party/jsr-305:jsr_305_javalib",
+   ]
+ 
+diff --git a/components/gcm_driver/instance_id/android/BUILD.gn b/components/gcm_driver/instance_id/android/BUILD.gn
+--- a/components/gcm_driver/instance_id/android/BUILD.gn
+++ b/components/gcm_driver/instance_id/android/BUILD.gn
+@@ -26,7 +26,6 @@ android_library("instance_id_driver_java") {
+ 
+   java_files = [
+     "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java",
+-    "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java",
+   ]
+ }
+ 
+diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+@@ -26,7 +26,6 @@ public class InstanceIDBridge {
+      * Underlying InstanceIDWithSubtype. May be shared by multiple InstanceIDBridges. Must be
+      * initialized on a background thread.
+      */
+-    private InstanceIDWithSubtype mInstanceID;
+ 
+     private static boolean sBlockOnAsyncTasksForTesting;
+ 
+@@ -71,7 +70,7 @@ public class InstanceIDBridge {
+         new BridgeAsyncTask<String>() {
+             @Override
+             protected String doBackgroundWork() {
+-                return mInstanceID.getId();
+                return "";
+             }
+             @Override
+             protected void sendResultToNative(String id) {
+@@ -86,7 +85,7 @@ public class InstanceIDBridge {
+         new BridgeAsyncTask<Long>() {
+             @Override
+             protected Long doBackgroundWork() {
+-                return mInstanceID.getCreationTime();
+                return 0L;
+             }
+             @Override
+             protected void sendResultToNative(Long creationTime) {
+@@ -107,11 +106,7 @@ public class InstanceIDBridge {
+         new BridgeAsyncTask<String>() {
+             @Override
+             protected String doBackgroundWork() {
+-                try {
+-                    return mInstanceID.getToken(authorizedEntity, scope, extras);
+-                } catch (IOException ex) {
+-                    return "";
+-                }
+                return "";
+             }
+             @Override
+             protected void sendResultToNative(String token) {
+@@ -127,12 +122,7 @@ public class InstanceIDBridge {
+         new BridgeAsyncTask<Boolean>() {
+             @Override
+             protected Boolean doBackgroundWork() {
+-                try {
+-                    mInstanceID.deleteToken(authorizedEntity, scope);
+-                    return true;
+-                } catch (IOException ex) {
+-                    return false;
+-                }
+                return true;
+             }
+             @Override
+             protected void sendResultToNative(Boolean success) {
+@@ -147,12 +137,7 @@ public class InstanceIDBridge {
+         new BridgeAsyncTask<Boolean>() {
+             @Override
+             protected Boolean doBackgroundWork() {
+-                try {
+-                    mInstanceID.deleteInstanceID();
+-                    return true;
+-                } catch (IOException ex) {
+-                    return false;
+-                }
+                return true;
+             }
+             @Override
+             protected void sendResultToNative(Boolean success) {
+@@ -192,10 +177,6 @@ public class InstanceIDBridge {
+                 @SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
+                 protected Result doInBackground(Void... params) {
+                     synchronized (InstanceIDBridge.this) {
+-                        if (mInstanceID == null) {
+-                            mInstanceID = InstanceIDWithSubtype.getInstance(
+-                                    ContextUtils.getApplicationContext(), mSubtype);
+-                        }
+                     }
+                     return doBackgroundWork();
+                 }
+diff --git a/components/sync/android/BUILD.gn b/components/sync/android/BUILD.gn
+--- a/components/sync/android/BUILD.gn
+++ b/components/sync/android/BUILD.gn
+@@ -10,7 +10,6 @@ android_library("sync_java") {
+     "//base:base_java",
+     "//components/signin/core/browser/android:java",
+     "//net/android:net_java",
+-    "//third_party/android_tools:android_gcm_java",
+     "//third_party/android_tools:android_support_annotations_java",
+     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
+     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
+diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
+--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn
+@@ -141,7 +141,6 @@ if (is_android) {
+       "$google_play_services_package:google_play_services_iid_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//third_party/android_protobuf:protobuf_nano_javalib",
+-      "//third_party/android_tools:android_gcm_java",
+     ]
+ 
+     java_files = [
+@@ -207,13 +206,8 @@ if (is_android) {
+       "src/java/com/google/ipc/invalidation/ticl/android2/WakeLockManager.java",
+       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelConstants.java",
+       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java",
+-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java",
+-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java",
+-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java",
+-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java",
+       "src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java",
+       "src/java/com/google/ipc/invalidation/ticl/android2/channel/CommonUtils.java",
+-      "src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
+       "src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmUpstreamSenderService.java",
+       "src/java/com/google/ipc/invalidation/ticl/proto/AndroidChannel.java",
+       "src/java/com/google/ipc/invalidation/ticl/proto/AndroidListenerProtocol.java",
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/contrib/MultiplexingGcmListener.java
+@@ -16,9 +16,6 @@
+ 
+ package com.google.ipc.invalidation.external.client.contrib;
+ 
+-import com.google.android.gcm.GCMBaseIntentService;
+-import com.google.android.gcm.GCMBroadcastReceiver;
+-import com.google.android.gcm.GCMRegistrar;
+ import com.google.ipc.invalidation.external.client.SystemResources.Logger;
+ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
+ import com.google.ipc.invalidation.ticl.android2.WakeLockManager;
+@@ -69,7 +66,7 @@ import android.content.pm.ServiceInfo;
+  * there is nothing to do except log an error (which this class does).
+  *
+  */
+-public class MultiplexingGcmListener extends GCMBaseIntentService {
+public class MultiplexingGcmListener {
+   /* This class is public so that it can be instantiated by the Android runtime. */
+ 
+   /** Constants used in broadcast Intents. */
+@@ -106,18 +103,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+   }
+ 
+   /**
+-   * {@link GCMBroadcastReceiver} that forwards GCM intents to the {@code MultiplexingGcmListener}
+-   * class.
+-   */
+-  public static class GCMReceiver extends GCMBroadcastReceiver {
+-    /* This class is public so that it can be instantiated by the Android runtime. */
+-    @Override
+-    protected String getGCMIntentServiceClassName(Context context) {
+-      return MultiplexingGcmListener.class.getName();
+-    }
+-  }
+-
+-  /**
+    * Convenience base class for client implementations. It provides base classes for a broadcast
+    * receiver and an intent service that work together to handle events from the
+    * {@code MultiplexingGcmListener} while holding a wake lock.
+@@ -261,7 +246,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+   private static final Logger logger = AndroidLogger.forTag("MplexGcmListener");
+ 
+   // All onYYY methods work by constructing an appropriate Intent and broadcasting it.
+-
+	/*
+   @Override
+   protected void onMessage(Context context, Intent intent) {
+     Intent newIntent = new Intent();
+@@ -304,35 +289,7 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
+   protected String[] getSenderIds(Context context) {
+     return readSenderIdsFromManifestOrDie(this);
+   }
+-
+-  /**
+-   * Broadcasts {@code intent} with the action set to {@link Intents#ACTION} and the package name
+-   * set to the package name of this service.
+-   */
+-  private void rebroadcast(Intent intent) {
+-    intent.setAction(Intents.ACTION);
+-    intent.setPackage(getPackageName());
+-    sendBroadcast(intent);
+-  }
+-
+-  /**
+-   * Registers with GCM if not already registered. Also verifies that the device supports GCM
+-   * and that the manifest is correctly configured. Returns the existing registration id, if one
+-   * exists, or the empty string if one does not.
+-   *
+-   * @throws UnsupportedOperationException if the device does not have all GCM dependencies
+-   * @throws IllegalStateException if the manifest is not correctly configured
+-   */
+-  public static String initializeGcm(Context context) {
+-    AndroidChannelPreferences.setGcmChannelType(context, GcmChannelType.DEFAULT);
+-    GCMRegistrar.checkDevice(context);
+-    GCMRegistrar.checkManifest(context);
+-    final String regId = GCMRegistrar.getRegistrationId(context);
+-    if (regId.isEmpty()) {
+-      GCMRegistrar.register(context, readSenderIdsFromManifestOrDie(context));
+-    }
+-    return regId;
+-  }
+	*/
+ 
+   /**
+    * Returns the GCM sender ids from {@link #GCM_SENDER_IDS_METADATA_KEY} or throws a
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
+++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidNetworkChannel.java
+@@ -48,16 +48,12 @@ public class AndroidNetworkChannel implements TestableNetworkChannel {
+     Intent intent = ProtocolIntents.newOutboundMessageIntent(outgoingMessage);
+ 
+     // Select the sender service to use for upstream message.
+-    if (AndroidChannelPreferences.getGcmChannelType(context) == GcmChannelType.GCM_UPSTREAM){
+-      String upstreamServiceClass = new AndroidTiclManifest(context).getGcmUpstreamServiceClass();
+-      if (upstreamServiceClass == null || upstreamServiceClass.isEmpty()) {
+-        logger.warning("GcmUpstreamSenderService class not found.");
+-        return;
+-      }
+-      intent.setClassName(context, upstreamServiceClass);
+-    } else {
+-      intent.setClassName(context, AndroidMessageSenderService.class.getName());
+-    }
+	  String upstreamServiceClass = new AndroidTiclManifest(context).getGcmUpstreamServiceClass();
+	  if (upstreamServiceClass == null || upstreamServiceClass.isEmpty()) {
+		logger.warning("GcmUpstreamSenderService class not found.");
+		return;
+	  }
+	  intent.setClassName(context, upstreamServiceClass);
+     try {
+       context.startService(intent);
+     } catch (IllegalStateException exception) {
+@@ -77,6 +73,6 @@ public class AndroidNetworkChannel implements TestableNetworkChannel {
+ 
+   @Override
+   public NetworkEndpointId getNetworkIdForTest() {
+-    return AndroidMessageSenderService.getNetworkEndpointId(context, resources.getLogger());
+    return null;
+   }
+ }
+-- 
+2.7.4
+
@@ -0,0 +1,132 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:06:15 +0200
+Subject: kill Auth
+
+---
+ .../org/chromium/chrome/browser/signin/SigninHelper.java  |  6 ++----
+ .../org/chromium/components/signin/AccountIdProvider.java |  9 +--------
+ .../components/signin/SystemAccountManagerDelegate.java   | 15 +++++++++------
+ 3 files changed, 12 insertions(+), 18 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+@@ -9,10 +9,6 @@ import android.annotation.SuppressLint;
+ import android.content.Context;
+ import android.os.AsyncTask;
+ 
+-import com.google.android.gms.auth.AccountChangeEvent;
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.VisibleForTesting;
+@@ -71,6 +67,7 @@ public class SigninHelper {
+         @Override
+         public List<String> getAccountChangeEvents(
+                 Context context, int index, String accountName) {
+            /*
+             try {
+                 List<AccountChangeEvent> list = GoogleAuthUtil.getAccountChangeEvents(
+                         context, index, accountName);
+@@ -88,6 +85,7 @@ public class SigninHelper {
+             } catch (GoogleAuthException e) {
+                 Log.w(TAG, "Failed to get change events", e);
+             }
+            */
+             return new ArrayList<>(0);
+         }
+     }
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java
+@@ -4,8 +4,6 @@
+ 
+ package org.chromium.components.signin;
+ 
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+ import com.google.android.gms.common.ConnectionResult;
+ import com.google.android.gms.common.GoogleApiAvailability;
+ 
+@@ -40,12 +38,7 @@ public class AccountIdProvider {
+      * @param accountName The email address of a Google account.
+      */
+     public String getAccountId(String accountName) {
+-        try {
+-            return GoogleAuthUtil.getAccountId(ContextUtils.getApplicationContext(), accountName);
+-        } catch (IOException | GoogleAuthException ex) {
+-            Log.e("cr.AccountIdProvider", "AccountIdProvider.getAccountId", ex);
+-            return null;
+-        }
+        return null;
+     }
+ 
+     /**
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
+@@ -23,9 +23,6 @@ import android.os.PatternMatcher;
+ import android.os.Process;
+ import android.os.SystemClock;
+ 
+-import com.google.android.gms.auth.GoogleAuthException;
+-import com.google.android.gms.auth.GoogleAuthUtil;
+-import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
+ import com.google.android.gms.common.ConnectionResult;
+ import com.google.android.gms.common.GoogleApiAvailability;
+ 
+@@ -116,9 +113,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+         // so don't report any accounts if Google Play Services are out of date.
+         checkCanUseGooglePlayServices();
+ 
+-        if (!hasGetAccountsPermission()) {
+-            return new Account[] {};
+-        }
+        return new Account[] {};
+
+        /*
+         long now = SystemClock.elapsedRealtime();
+         Account[] accounts = mAccountManager.getAccountsByType(GoogleAuthUtil.GOOGLE_ACCOUNT_TYPE);
+         long elapsed = SystemClock.elapsedRealtime() - now;
+@@ -128,12 +125,15 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+                     "Signin.AndroidGetAccountsTimeUiThread_AccountManager", elapsed);
+         }
+         return accounts;
+        */
+     }
+ 
+     @Override
+     public String getAuthToken(Account account, String authTokenScope) throws AuthException {
+         assert !ThreadUtils.runningOnUiThread();
+         assert AccountManagerFacade.GOOGLE_ACCOUNT_TYPE.equals(account.type);
+        return null;
+        /*
+         try {
+             return GoogleAuthUtil.getTokenWithNotification(
+                     ContextUtils.getApplicationContext(), account, authTokenScope, null);
+@@ -145,10 +145,12 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+         } catch (IOException ex) {
+             throw new AuthException(AuthException.TRANSIENT, ex);
+         }
+        */
+     }
+ 
+     @Override
+     public void invalidateAuthToken(String authToken) throws AuthException {
+        /*
+         try {
+             GoogleAuthUtil.clearToken(ContextUtils.getApplicationContext(), authToken);
+         } catch (GooglePlayServicesAvailabilityException ex) {
+@@ -158,6 +160,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+         } catch (IOException ex) {
+             throw new AuthException(AuthException.TRANSIENT, ex);
+         }
+        */
+     }
+ 
+     @Override
+-- 
+2.7.4
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
csagan5	776d4f859e	Release 68.0.3440.72	2018-07-25 15:37:57 +02:00
csagan5	7b7a1a4c75	Changed F.A.Q. about F-Droid	2018-07-16 21:21:20 +02:00
csagan5	ac218f929b	Remove LiberaPay link	2018-07-16 19:24:46 +02:00
csagan5	efe90584df	Fix hyperlink for uBlock Origin Thanks to reddit user DearPhysics for noticing this	2018-07-11 01:46:35 +02:00
csagan5	1917072116	Added public GnuPG key and instructions about downloaded files verification.	2018-07-08 16:49:17 +02:00
csagan5	980053e78f	Adding more F.A.Q.s, some other improvements	2018-07-07 14:31:59 +02:00
csagan5	ffa2849e2f	Release 67.0.3396.107	2018-07-02 19:06:48 +02:00
csagan5	0e797ac643	Mention website of Iridium	2018-06-30 18:15:40 +02:00
csagan5	fc14caf48a	Release 67.0.3396.101	2018-06-29 22:13:19 +02:00
csagan5	494b396f9e	Change BTC donation address	2018-06-29 22:01:20 +02:00
csagan5	f007778846	Add donate button for LiberaPay	2018-06-29 14:10:29 +02:00
csagan5	b37f2f7b85	Typo fix	2018-06-22 08:47:32 +02:00
csagan5	10661f0b36	Release 67.0.3396.95	2018-06-22 08:46:05 +02:00
Carl	ff372ffe53	Add bug report and feature request issue templates	2018-06-21 21:44:22 +02:00
csagan5	c33f289a21	Typo fix	2018-06-20 21:22:30 +02:00
csagan5	d9a4d2dc88	Release 67.0.3396.92	2018-06-20 21:18:07 +02:00
csagan5	6e86d3db21	Replace Patreon with LiberaPay	2018-06-18 23:07:12 +02:00
csagan5	b11d180a37	Update patch as per suggestions in #69	2018-06-18 20:26:45 +02:00
csagan5	032d2ef9f2	Adding new patch for experiments on canvas RGB randomisation	2018-06-18 09:11:23 +02:00
csagan5	1951b38c64	Add F.A.Q. about DNS-over-HTTPS	2018-06-17 23:55:34 +02:00
csagan5	41c5c0f0cf	Move work-in-progress patches in subdirectory	2018-06-15 14:45:19 +02:00
csagan5	d0bab4a8da	Added two work-in-progress patches for Incognito-Only feature	2018-06-15 14:43:45 +02:00
csagan5	ef0cca39ce	Make features list more compact	2018-06-15 11:47:05 +02:00
csagan5	d94f36a0f7	Adding patches for release 67.0.3396.88	2018-06-15 11:27:35 +02:00
csagan5	3b1875efed	Release 67.0.3396.88	2018-06-15 11:26:26 +02:00
csagan5	acba336f2e	Add links for all related projects/credits	2018-06-12 14:04:27 +02:00
csagan5	61b6f9ee1d	Align with home page	2018-06-11 21:27:04 +02:00
csagan5	210a14d7ed	Release 67.0.3396.82	2018-06-11 18:55:40 +02:00
csagan5	91cc88eb37	Updated changelog	2018-06-09 11:12:45 +02:00
csagan5	4fc10e560b	Release 67.0.3396.76	2018-06-08 23:59:52 +02:00
CarlandGitHub	01ecc5d52f	Add link to Patreon	2018-06-04 20:53:49 +02:00
csagan5	7edcab0232	Add missing patch	2018-06-04 20:46:26 +02:00
csagan5	b4ada5bd99	Release 67.0.3396.72	2018-06-04 20:45:57 +02:00
csagan5	cfa7aca62a	Add missing patch	2018-06-01 15:59:14 +02:00
csagan5	9eca1ff0b3	Release 67.0.3396.67	2018-06-01 15:58:52 +02:00
csagan5	aac51e0a5a	Release 66.0.3359.202	2018-05-29 20:52:06 +02:00
csagan5	ea53ed1889	Release 66.0.3359.200	2018-05-26 11:13:29 +02:00
csagan5	780bb60137	Release 66.0.3359.196	2018-05-24 09:59:15 +02:00
csagan5	0fd859a0a6	Two new patches	2018-05-20 22:07:39 +02:00
csagan5	03645239a9	Release 66.0.3359.188	2018-05-20 22:07:14 +02:00
csagan5	ec5be6c048	Release 66.0.3359.161	2018-05-08 21:51:11 +02:00
csagan5	67651fbd75	Do not use special release svg	2018-05-05 20:12:38 +02:00
csagan5	6b758bfe0c	Added patches for previous release	2018-05-05 20:11:18 +02:00
csagan5	49ae827092	Release 66.0.3359.148	2018-05-05 00:51:00 +02:00
csagan5	01ad976b53	Release 65.0.3325.230	2018-04-21 22:39:52 +02:00
csagan5	38a672a1ca	Updated CHANGELOG	2018-04-12 09:47:34 +02:00
csagan5	a723e0e77d	Release 65.0.3325.218	2018-04-12 09:38:58 +02:00
CarlandGitHub	3abb1ad2a3	Mention anti-fingerprinting mitigations	2018-04-05 10:54:31 +02:00
csagan5	d7e8ac9d86	Add latest AdBlock filters	2018-04-01 12:05:30 +02:00
csagan5	284c419d01	Release 65.0.3325.204	2018-04-01 11:43:20 +02:00
csagan5	2dca759091	Publish patches for next release	2018-04-01 11:29:50 +02:00
csagan5	11cebfadc5	Release 65.0.3325.198	2018-03-29 09:20:10 +02:00
csagan5	e4e56ed69c	Updated README, added Goals	2018-03-28 18:12:04 +02:00
CarlandGitHub	7dcc27cb5e	Mention SystemWebView	2018-03-28 01:43:32 +02:00
csagan5	8b494263c3	Release 65.0.3325.190	2018-03-26 09:25:48 +02:00
csagan5	4029e8843d	Further improvements for fingerprinting mitigations	2018-03-26 00:07:08 +02:00
csagan5	85a9737c16	Adblock update	2018-03-24 16:04:45 +01:00
csagan5	247247a8ae	Properly format commit messages of the patches Add patch for canvas fingerprinting disable	2018-03-24 14:26:47 +01:00
csagan5	4bfb168982	Add F.A.Q. about root	2018-03-24 07:19:48 +01:00
csagan5	1652ef39b1	Updated README	2018-03-24 05:05:57 +01:00
csagan5	190ee08724	Mention Qwant	2018-03-24 05:04:34 +01:00
csagan5	367a2521a0	Patch to block battery API Patch to block plugins enumeration	2018-03-24 04:32:56 +01:00
csagan5	6b1cbc612a	Patches ready for 65.0.3325.176	2018-03-24 04:32:56 +01:00
CarlandGitHub	d0f89298b8	Add another F.A.Q.	2018-03-20 21:55:55 +01:00
csagan5	9adbcaf262	Add F.A.Q. about HTTPS everywhere	2018-03-19 00:45:49 +01:00
csagan5	ef067cd35d	Move F.A.Q. up	2018-03-18 23:44:13 +01:00
csagan5	e08ef39d4e	Put images on same line	2018-03-18 23:35:50 +01:00
csagan5	33f1df4d26	Fix download images URL	2018-03-18 23:35:26 +01:00
csagan5	29e6c35657	Release 64.0.3282.204	2018-03-10 09:34:55 +01:00
csagan5	148f920a06	Add webRTC disabled to features list	2018-03-05 08:12:59 +01:00