Fix hyperlink for uBlock Origin

Thanks to reddit user DearPhysics for noticing this
Added public GnuPG key and instructions about downloaded files verification.
2018-07-11 01:46:35 +02:00 · 2018-07-08 16:49:17 +02:00 · 2018-07-07 14:31:59 +02:00 · 2018-07-02 19:06:48 +02:00 · 2018-06-30 18:15:40 +02:00 · 2018-06-29 22:13:19 +02:00
58 changed files with 3356 additions and 525 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,33 @@
+# 67.0.3396.107
+* updated AdBlock filters
+* removed patch to use Android Media Player for URLs (fixes https://github.com/bromite/bromite/issues/71)
+
+# 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`
+* updated AdBlock filters
+
 # 67.0.3396.92
-* improve randomisation for each retrieved Canvas data (fixes )https://github.com/bromite/bromite/issues/69
+* improve randomisation for each retrieved Canvas data (fixes https://github.com/bromite/bromite/issues/69)
 * updated AdBlock filters

 # 67.0.3396.88
@@ -21,13 +21,13 @@ Minimal UI changes are applied to help curbing the idea of "browser as an advert

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

-[Donate via LiberaPay](https://liberapay.com/csagan5/donate)
+Donate via LiberaPay: [![Donate via LiberaPay](https://www.bromite.org/donate.svg)](https://liberapay.com/csagan5/donate)

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

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

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

 ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

@@ -55,6 +55,15 @@ Bromite is about adblocking and privacy.
 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?
+Not (yet), for technical reasons. This is likely to change in future.
+
+## Does Bromite support WebRTC?
+No, it is not built-in.
+
 # Features

 * baked-in adblock engine with filters from EasyList, EasyPrivacy and others
@@ -62,7 +71,7 @@ We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywh
 * 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 [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/), [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) and [Iridium](https://github.com/iridium-browser) projects
+* 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
@@ -71,12 +80,37 @@ You can inspect all functionality/privacy changes by reading the patches: https:

 # Releases

-All built versions are available 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, Monochrome and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+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

@@ -87,12 +121,12 @@ Please refer to [official Chromium build documentation](https://www.chromium.org
 # 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](https://adblockplus.org/), [uBlock](https://www.ublock.org/), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included
+* [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,33 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:57:29 +0200
-Subject: Disable battery status service
-
---
- services/device/battery/battery_status_service.cc | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
--- 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);
- }
-- 
-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
+
@@ -1,7 +1,8 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 22:58:52 +0200
-Subject: Disable GCM status check
+From: Joachim Bauch <jojo@struktur.de>
+Date: Mon, 1 Jun 2015 17:14:34 +0200
+Subject: google-cloud-messaging: disable experiment status check

+This avoids trk:263 from triggering.
 ---
 components/gcm_driver/gcm_channel_status_request.cc | 6 ++++++
 1 file changed, 6 insertions(+)
@@ -1,70 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 01:35:53 +0200
-Subject: Disable updater pings
-
---
- components/component_updater/configurator_impl.cc | 21 +++------------------
- components/component_updater/configurator_impl.h  |  1 -
- 2 files changed, 3 insertions(+), 19 deletions(-)
-
-diff --git a/components/component_updater/configurator_impl.cc b/components/component_updater/configurator_impl.cc
--- 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);
- };
-- 
-2.7.4
-
@@ -0,0 +1,99 @@
+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)
+---
+ .../component_updater/component_updater_url_constants.cc      |  4 ++--
+ components/component_updater/configurator_impl.cc             | 11 +++++++----
+ components/component_updater/configurator_impl.h              |  1 -
+ 3 files changed, 9 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
+@@ -14,9 +14,9 @@ namespace component_updater {
+ //
+ // The value of |kDefaultUrlSource| can be overridden with
+ // --component-updater=url-source=someurl.
+-const char kUpdaterDefaultUrl[] = "https://clients2.google.com/service/update2";
+const char kUpdaterDefaultUrl[] = "about:blank";
+ 
+-const char kUpdaterFallbackUrl[] = "http://clients2.google.com/service/update2";
+const char kUpdaterFallbackUrl[] = "about:blank";
+ 
+ const char kUpdaterDefaultUrlAlt[] =
+     "https://update.googleapis.com/service/update2";
+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
+@@ -43,7 +43,9 @@ const char kSwitchRequestParam[] = "test-request";
+ 
+ // Disables pings. Pings are the requests sent to the update server that report
+ // the success or the failure of component install or update attempts.
+#if 0
+ const char kSwitchDisablePings[] = "disable-pings";
+#endif
+ 
+ // Sets the URL for updates.
+ const char kSwitchUrlSource[] = "url-source";
+@@ -56,8 +58,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,14 +90,12 @@ 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), ",",
+       base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+   fast_update_ = base::ContainsValue(switch_values, kSwitchFastUpdate);
+-  pings_enabled_ = !base::ContainsValue(switch_values, kSwitchDisablePings);
+   deltas_enabled_ =
+       !base::ContainsValue(switch_values, kSwitchDisableDeltaUpdates);
+ 
+@@ -140,6 +142,7 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
+     return urls;
+   }
+ 
+#if 0
+   if (base::FeatureList::IsEnabled(kAlternateComponentUrls)) {
+     urls.push_back(GURL(kUpdaterDefaultUrlAlt));
+     urls.push_back(GURL(kUpdaterFallbackUrlAlt));
+@@ -150,7 +153,7 @@ std::vector<GURL> ConfiguratorImpl::UpdateUrl() const {
+ 
+   if (require_encryption_)
+     update_client::RemoveUnsecureUrls(&urls);
+-
+#endif
+   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);
+ };
+-- 
+2.7.4
+
@@ -1,10 +1,8 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
+From: Jan Engelhardt <jengelh@inai.de>
 Date: Sat, 13 Sep 2014 17:25:47 +0200
 Subject: prefs: only keep cookies until exit

 Out with all those tracking cookies!
-
-author: Jan Engelhardt <jengelh@inai.de>
 ---
 components/content_settings/core/browser/content_settings_registry.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,4 +1,4 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
+From: Jan Engelhardt <jengelh@inai.de>
 Date: Thu, 2 Apr 2015 12:44:23 +0200
 Subject: Remove EV certificates

@@ -6,8 +6,6 @@ The team chose to let EV certificates appear just like normal
 certificates. The web of trust is considered a failure in itself, so
 do not give users a false sense of extra security with EV certs.
 Instead, let them appear just like regular ones.
-
-author: Jan Engelhardt <jengelh@inai.de>
 ---
 net/cert/ev_root_ca_metadata.cc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
@@ -10,7 +10,8 @@ Subject: Removed Sync and Translate menu
 .../res/drawable-xxxhdpi/settings_translate.png    | Bin 1038 -> 0 bytes
 .../java/res/xml/site_settings_preferences.xml     |   8 +++----
 .../website/SiteSettingsPreferences.java           |  26 ++++++++++-----------
- 7 files changed, 17 insertions(+), 17 deletions(-)
+ 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
@@ -19,107 +20,21 @@ Subject: Removed Sync and Translate menu

 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
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 399
-zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00042Nkl<ZcwWuc
-zJxjwt0LJme7er{c_yr2Oml}2V3s~G9aP6!}z(tU5et?4AT-<~%x+sFhO}e^tsU(Y=
-z0hgddd^pNsLc+Z{l>hP^9KR_C@$!FaVIla45F@WCMg$)o)DW3mQKSdON+{NY%D^rw
-zQ6|u}ti|NX7$R7iF@)z*9c+qa0?AUm<7d7%a4MD+^aKw>u^zc5))3o43mLu<Vh_0s
-z^onI1i*NbG31VmP*$I~u^o9@~3%Mjy{|2j}Ph4OPO<b`i*Ms^ERzc?^JnUm8&>5G;
-z8!SRo0o`C5w_HXQp+hq2?!?{u8c0%8C3Jue>()aulqxVESiz93aydblXyA)AxSXIZ
-z^u+3MIY49igeSZ=wug@XJ`tWQp%m)~(480Xl-fZ9?!ILEyg9Ig+E_v&p@gTlA*4tf
-tij`2N2SrL~qywpbE;5V|EcpMCd%u4DGPZTzo=E@z002ovPDHLkV1m$asKNjM
-
+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
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 284
-zcmV+%0ptFOP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002vNkl<ZcwV*C
-zy$-=p90hPI21^H{kVr7~0h$;*gq(zkcms==tbG8pC$M2)sTe$f#Kz1feE^(W(wipt
-z>YqeTIHw=KscAEhFY_CKhZ7#j@Qh~#`t~HT1AWt&iOFYBic(;rl@5Y9UG&&#fH`9r
-zbqhPT0Nhc-8hg~aB!JnVj0zT9La;<0Ijq#SJr@m*036I22Uj!E;6TtuAD4*o-y97Z
-ziWuYbs-FagXn-mvsLH_>O?Hzl1RVtIfGq+yWZ%bGZULC0h?xp|DgiD=uf=xl!2Uvo
-icHkLEh=B&e`~;qlBW{m=6s{@&0000<MNUMnLSTX)y>C|l
-
+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
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 547
-zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0005%Nkl<ZcwX(-
-zziU%b9ER~X&>vK2=pT?4!CJ8B5V|`lSO?MdsRak2|3E2<Ew~ov3nC6K4yBGdHyIT=
-z*iKQTa&gEaRP2_R<9E1(_FiJ{F<-%<Je=X3K5*}FI12x`^1wNOsFIKphLn;}MY&1<
-zRa%6SwW!7e2_d2+9!QG-C&)S}0;KUkhyudj0~b#<hpahU{YD2gq>+I}uBO%C0%8~2
-zqX2{ZjJTXFC*U;?c-ddi5s!R<4~S{LXX_djTCRX~3-JV7yh7Y2cms!wTkrY83}bwB
-z2dpi`B^D8n3HSqaSVYzpI`{+pWDRAl*>VMX>`+5Y@YI?>wsz=YK)L(kPe6xV>d0E+
-zF#Fw0h$>%W?u)^|9b`@O%&0zU>qXpsF&Oy9RW@l8a&@DCv<Q46cvb|~;{k3U>t;Ei
-z!kb9ohzhbQ9F+l#U_I(XZ6fPFVyg@=tm03vA!hhtr^YXT;4QKq66}a~{=i*iH3)XZ
-zJ#V1R7-E(l!Okq>w0(hXWNl<?1F`K3EFkM3TL*{*PoRnN1<~{aRuPk2Kh<Oqt6sn{
-zQ;3x_<Vp}z9QyzXvi8mZd)X7f1*jwDbN5@1`5@{JK-uDfGz#d(14$IH9}C1i5_>Gi
-l0_C5%UG`c2pI-Xsz;EN&!BMZ3jZy#r002ovPDHLkV1l>+@2da+
-
+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
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 793
-zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0008uNkl<ZcwX(=
-z%}Z2a6vy!qU&7QD6$CjgbzuaFrMYX-gy1F-TYN#>*(&T0P^f5;ixxw==!FDzQOmLj
-zW)TU|$~Iz9Aez>~5MeSGNzOdU;V@i=JI&0U$NLB~{9rb}%fp9z&%hk!M$92gIe;pl
-z3Wyj9l9(csBteWw5h(;j9dXi_fJqal&Mqj9DKT-2AY!CT2BnGF10^sPlCTEKJIX71
-z)JmT5wgxg*K&DJUmwnQupf11mfI$K*D&+>^c2@3W<t}H1aS^@Zph5Z5CZJigaScjR
-zMTBa$!Uuig{eHe=HE-q67$$tsm>kf|A8$jyfS$PkZE!?L6P{+3Y9btC#|6l6Q$SJA
-zJsJ|?2*wTQCyfHQr_G#j>iOXcWOyKi8a`n7&M5)i$G8LSaX}DgSmV5K&hghJ$naGk
-zn|yMVCHFr+W;};YV_bu_81R4w*m4VcMRV41&CGcb!S=Xdpk;b9jBZ}iok8`oEP#^s
-zxZ*(HxIwJ~nwTJkA;knuN_trO9#=T%BSV6b(8Ic?TcZbSdt70l>n4JR)6DpO>*nq3
-zafN}FIj#?Cl$~5NU<H)S4chdQct;y?eqjzexj|EYm%9W-*|Z3FLPYa42uQ+JQr19S
-z8PKI*ASGG4OG`vN`5X|W4{pi=YD6F%bO`8HV30TDOK#3CCj|0{M*=#@u3OM^=^OdI
-zpGG0Qa0|L3{jfB{0*bi=tx_fZf;0;Ps$$h0XjBJU8y)O1SD-zjI?&qaU`I*00lm%)
-zv^JT+e&Yso%`?y%9qc|Apbcs~1Fg})u4N;9(71N~84n-S`d?6M*r0iB`k2m2pEmR1
-zf(Er&%x+lJW-v@pl6q-6F+S;(uAXFgph;~W`+^>8I~g9RU77~AeL>qaNZ%d;C_u^s
-zlss&pgcZ=5Jy6WbGCgY#WaDr39a`*x^u>dcIQ=590n!A0HN&vZEG?C{V=ABuDD3<L
-X<=DewY$H`b00000NkvXXu0mjfrJ!K8
-
+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
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 1038
-zcmV+p1o8WcP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@000BkNkl<ZcwX(>
-zK}Zx)90u@NR77ZDqzI8+I%LtIBq1>CB9(`rB#V~#N{sTXQQ#UFR4mj+L_yL)FVdw5
-zWziyt2t7o(5K@$fpoFMU*4D8)xU9Pq43Ec~9k(6b`LAza_%8CfJov%x+j;ZfQFNEb
-z12`KG-~l{<2LKCHgb{}Zy~t>YBMcRaBe4w#ApzaNBoHbkpa(iZdP)TdK_^P66aW<o
-zGC%?<Js=F7FkyN?+%{m2FFR)&5T^%dqyUW`ppydhRRcUgbKdOZfPML2wf+F5xOe~$
-za5X2_a&lcrfC1Ws*OwkpL^d<PXBoFq``hX^=<WnOVSo$r0_HGoWCB?$0G$l*T3*0U
-zRIr6&7Qk=#4L}fCncqTZ7+{YDaF5Y0%Y7~MjxY7x)Mrs=v_5>56u{HU0Q*gCKWkg%
-zzZ!iHpXGBfgAJ^klo-HsmH{^5htXtkfHkMxaUPh*CPp}jjBvX|#jNB2o*};A4dL$x
-zZaR^jWPl1(GQd%H9Vr*E#k6n`zua~vj+y|s+;yl=;Uat{fDf0DatmMzyH{Mi0aNk=
-z7SV+=VZjqPArQ*Yg+(*KsriBvfHVeB1BIss!$v=x(+(m{a9cQ39AFtk*a}5R2a=qY
-zM2G2rH)-YzYX!{XHtL`Vsl}LuIEGp%Af7L*1<;Mkoc-n;k}EEs#5wq==L@R`yh6DE
-zXe@BOIf?tU^9B0=>sf0D9wH09K(eHO_}X@%^EiwcGSJsOT46u}y38pI7<D_Kr9^-i
-zP=vg64xr$P1wcPDKIJ5!8q?%}`J8W;O8jyTpdd(2xC138cbx<%s3v|R?c{)Z)Ej_Z
-zjsbXDFiNzkzJbCM<!8IM&H##xEx>u<B=-&9*y*m*Er37RzyZxh(`*3z`0Eb9fWRFv
-zHG}Q|Gzy#Ng3&CnO?9su03QYHao!$h%_sQ*-2z~Qw<D~%AUhz1jU1q2iT6uT*&Xkc
-z+<->{wR6Q0;bXZ0hXla52{6vu7MTGve7a+uW@Zs&Q??m-0eu3rC-3h{ugD5mMnC|3
-zumC<VKmZvz0Z(nO@k~y@G24JP83D5>w+*PktbBkdCkD`$Cjm}~$_Loa0g=4O2nTGJ
-z4KN`LLB8h&d>4i%6LJCCIpB!UT62U0+GPT0sN#Uwe*rNLsDdUBpr7+<3XGr9!nmqm
-z9zX*J^g=I?UJhtjCjd!2fc<E02gFGMDSAMd6fjK>P)UbW5mEs8p!*B_)Bwsy8PjNj
-zLJc5zn3UxUnxN1F9DJOYCxvN5;D?e6@Sf=Q03N^tcmNOZ5BbKcjE%x^TL1t607*qo
-IM6N<$g2Gw1A^-pY
-
+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 afb425b..a545372 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 @@
@@ -149,6 +64,7 @@ diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/
     <!-- 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 24b3a7d..dc1c609 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
@@ -38,7 +38,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
@@ -243,6 +159,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
             } 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

@@ -168,7 +168,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
-@@ -107947,6 +107947,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
+@@ -107956,6 +107956,7 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <suffix name="Overestimate"
       label="Tracks when the compositor's estimates were too high and by how
              much."/>
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 15:18:19 +0200
-Subject: Use Android MediaPlayer for URLs
-
---
- content/public/renderer/content_renderer_client.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
--- a/content/public/renderer/content_renderer_client.cc
-+++ b/content/public/renderer/content_renderer_client.cc
-@@ -121,7 +121,7 @@ bool ContentRendererClient::HandleNavigation(
- }
- 
- bool ContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) {
-  return false;
-+  return true;
- }
- #endif
- 
-- 
-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
+
@@ -1,77 +0,0 @@
-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
-
@@ -3,22 +3,22 @@ Date: Sat, 24 Mar 2018 05:18:03 +0100
 Subject: Canvas: fingerprinting mitigations for image data, font metrics and
 webGL

-Disable webGL renderering info, add shuffling to TextMetrics;
-additionally, the color data returned by ToBlob and ToDataURL will
-contain randomly manipulated pixels (maximum 10) that slightly
-change the color R,G,B components without visibly altering the rendering.
+Disable webGL renderer info, add shuffling to TextMetrics.
+Additionally, the color data returned by ToBlob, ToDataURL and getImageData
+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.
 ---
 .../renderer/core/html/canvas/text_metrics.cc      |  20 +++
 .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
- .../canvas/canvas2d/base_rendering_context_2d.cc   |   3 +
 .../canvas/canvas2d/canvas_rendering_context_2d.cc |   6 +-
 .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
- .../platform/graphics/image_data_buffer.cc         | 137 +++++++++++++++++++++
- .../renderer/platform/graphics/image_data_buffer.h |   2 +
- 7 files changed, 171 insertions(+), 3 deletions(-)
+ .../platform/graphics/image_data_buffer.cc         |   4 +
+ .../platform/graphics/static_bitmap_image.cc       | 151 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h        |   2 +
+ 7 files changed, 186 insertions(+), 3 deletions(-)

 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
@@ -62,19 +62,6 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_
  private:
   void Update(const Font&,
               const TextDirection&,
-diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-@@ -1620,6 +1620,9 @@ ImageData* BaseRenderingContext2D::getImageData(
-   const CanvasColorParams& color_params = ColorParams();
-   scoped_refptr<StaticBitmapImage> snapshot = GetImage(kPreferNoAcceleration);
- 
-+  //TODO: calculate some random value and use it to shuffle pixel data in 'snapshot'
-+  // it should be a StaticBitmapImage somehow
-+
-   if (!StaticBitmapImage::ConvertToArrayBufferContents(
-           snapshot, contents, image_data_rect, color_params, IsAccelerated())) {
-     exception_state.ThrowRangeError("Out of memory at ImageData creation");
 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
@@ -120,24 +107,67 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 #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"
-@@ -44,6 +45,7 @@
- #include "third_party/blink/renderer/platform/wtf/vector.h"
- #include "third_party/skia/include/core/SkSwizzle.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
+@@ -121,6 +122,9 @@ bool ImageDataBuffer::EncodeImage(const String& mime_type,
+                                   Vector<unsigned char>* encoded_image) 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 "skia/ext/texture_handle.h"
+ #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
+@@ -16,6 +17,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 {
- 
-@@ -116,11 +118,146 @@ const unsigned char* ImageDataBuffer::Pixels() const {
-   return static_cast<const unsigned char*>(pixmap_.addr());
+@@ -149,15 +151,164 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+       rect.Width(), rect.Height(), color_type, kUnpremul_SkAlphaType,
+       color_params.GetSkColorSpaceForSkSurfaces());
+   sk_sp<SkImage> sk_image = src_image->PaintImageForCurrentFrame().GetSkImage();
+
+   bool read_pixels_successful = sk_image->readPixels(
+       info, result.Data(), info.minRowBytes(), rect.X(), rect.Y());
+   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;
 }
 
-+#define shuffleComponent(color, max, delta) ((color) >= (max) ? -(delta) : (delta))
+// 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
+  if (w + h <= 16) {
+    return;
+  }
 +
-+void ImageDataBuffer::shuffleSubchannelColorData() const {
-+  auto w = pixmap_.width(), h = pixmap_.height();
 +  // generate the first random number here
-+  double shuffleX = 0.5 + base::RandDouble() * 0.5;
+  double shuffleX = base::RandDouble();
 +
 +  // cap maximum pixels to change
 +  auto pixels = (w + h) / 128;
@@ -147,10 +177,11 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +    pixels = 2;
 +  }
 +
-+  auto colorType = pixmap_.colorType();
+  auto colorType = info.colorType();
+  auto fRowBytes = info.minRowBytes(); // stride
 +
 +  // second random number (for y/height)
-+  double shuffleY = 0.5 + base::RandDouble() * 0.5;
+  double shuffleY = base::RandDouble();
 +
 +  // calculate random coordinates using bisection
 +  auto currentW = w, currentH = h;
@@ -164,12 +195,12 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +    switch (colorType) {
 +      case kAlpha_8_SkColorType:
 +      {
-+         uint8_t *pixel = pixmap_.writable_addr8(x, y);
+         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);
+         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);
@@ -177,20 +208,20 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +      break;
 +      case kGray_8_SkColorType:
 +      {
-+         uint8_t *pixel = pixmap_.writable_addr8(x, y);
-+         *pixel += shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
 +      }
 +      break;
 +      case kRGB_565_SkColorType:
 +      {
-+         uint16_t *pixel = pixmap_.writable_addr16(x, y);
+         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);
+         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;
@@ -201,12 +232,12 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +      break;
 +      case kARGB_4444_SkColorType:
 +      {
-+         uint16_t *pixel = pixmap_.writable_addr16(x, y);
+         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);
+         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;
@@ -219,12 +250,12 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +      break;
 +      case kRGBA_8888_SkColorType:
 +      {
-+         uint32_t *pixel = pixmap_.writable_addr32(x, y);
+         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);
+         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) |
@@ -233,12 +264,12 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +      break;
 +      case kBGRA_8888_SkColorType:
 +      {
-+         uint32_t *pixel = pixmap_.writable_addr32(x, y);
+         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);
+         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) |
@@ -264,29 +295,24 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +  }
 +}
 +
- bool ImageDataBuffer::EncodeImage(const String& mime_type,
-                                   const double& quality,
-                                   Vector<unsigned char>* encoded_image) const {
-   DCHECK(is_valid_);
- 
-+  // shuffle subchannel color data within the pixmap
-+  shuffleSubchannelColorData();
+#undef writable_addr
+#undef shuffleComponent
 +
-   if (mime_type == "image/jpeg") {
-     SkJpegEncoder::Options options;
-     options.fQuality = ImageEncoder::ComputeJpegQuality(quality);
-diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.h b/third_party/blink/renderer/platform/graphics/image_data_buffer.h
--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.h
-+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.h
-@@ -65,6 +65,8 @@ class PLATFORM_EXPORT ImageDataBuffer {
+ 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&);
 
-   bool IsValid() { return is_valid_; }  // Only used by Create()
- 
-+  void shuffleSubchannelColorData() const;
+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
 +
-   sk_sp<SkImage> retained_image_;
-   SkPixmap pixmap_;
-   bool is_valid_ = false;
+   bool IsStaticBitmapImage() const override { return true; }
+ 
+   // Methods overridden by all sub-classes
 -- 
 2.7.4

@@ -3,17 +3,22 @@ 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 +++--
- .../network_session_configurator/common/network_features.h |  5 +++--
- .../common/network_switch_list.h                           |  4 ++++
- 7 files changed, 37 insertions(+), 9 deletions(-)
+ 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
@@ -147,6 +152,131 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 // 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
+@@ -391,30 +391,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) {
+@@ -432,6 +410,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);
+   }
+ 
+@@ -851,7 +830,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

@@ -15,11 +15,18 @@ Subject: Add menu option to toggle global Javascript preference
 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,19 @@
+@@ -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">
@@ -32,20 +39,27 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 +          </menu>
 +        </item>
 +
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null"
-             android:orderInCategory="2">
+         <!-- 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,19 @@
+@@ -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"
-+            android:orderInCategory="2">
+            android:title="@null">
 +          <menu>
 +              <item android:id="@+id/enable_javascript_id"
 +                  android:title="@string/menu_enable_javascript" />
@@ -55,9 +69,9 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 +          </menu>
 +        </item>
 +
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null">
-           <menu>
+         <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
@@ -5,7 +5,7 @@ Subject: Add menu option to toggle global Adblock preference
 Allow toggling Chromium's "ads enabled" content settings option together with Bromite adblock engine.
 ---
 chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
- chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
+ 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 ++++++++++++++++++++++
@@ -15,7 +15,7 @@ Allow toggling Chromium's "ads enabled" content settings option together with Br
 net/url_request/adblock_intercept.cc               |  2 ++
 net/url_request/adblock_intercept.h                |  2 ++
 net/url_request/url_request.cc                     |  4 +++
- 11 files changed, 103 insertions(+)
+ 11 files changed, 101 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
@@ -42,14 +42,12 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 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,19 @@
-                 android:checkable="true" />
+@@ -82,6 +82,17 @@
           </menu>
         </item>
-+
+ 
 +        <item android:id="@+id/enable_adblock_row_menu_id"
-+            android:title="@null"
-+            android:orderInCategory="2">
+            android:title="@null">
 +          <menu>
 +              <item android:id="@+id/enable_adblock_id"
 +                  android:title="@string/menu_enable_adblock" />
@@ -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
+@@ -98,8 +98,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
+@@ -1975,15 +1975,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
+@@ -1016,7 +1016,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,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,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
+@@ -190,7 +190,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
+@@ -109,10 +109,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
+@@ -18,7 +18,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,54 @@
+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, 3 insertions(+), 8 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
+@@ -133,12 +133,6 @@ const net::BackoffEntry::Policy kAutofillBackoffPolicy = {
+     false,
+ };
+ 
+-#if defined(GOOGLE_CHROME_BUILD)
+-const char kClientName[] = "Google Chrome";
+-#else
+-const char kClientName[] = "Chromium";
+-#endif  // defined(GOOGLE_CHROME_BUILD)
+-
+ size_t CountActiveFieldsInForms(const std::vector<FormStructure*>& forms) {
+   size_t active_field_count = 0;
+   for (const auto* form : forms)
+@@ -158,8 +152,7 @@ std::string RequestTypeToString(AutofillDownloadManager::RequestType type) {
+ }
+ 
+ GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
+-  return GURL("https://clients1.google.com/tbproxy/af/" +
+-              RequestTypeToString(request_type) + "?client=" + kClientName);
+  return GURL("about:blank/");
+ }
+ 
+ std::ostream& operator<<(std::ostream& out,
+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
+@@ -1255,9 +1255,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
+@@ -58,8 +58,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
+@@ -353,8 +353,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
+@@ -62,11 +62,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
+ 
+@@ -283,6 +285,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());
+@@ -361,6 +367,7 @@ void ClientSideDetectionService::StartClientReportPhishingRequest(
+ 
+   // Record that we made a request
+   phishing_report_times_.push(base::Time::Now());
+#endif
+ }
+ 
+ void ClientSideDetectionService::StartClientReportMalwareRequest(
+@@ -375,6 +382,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);
+@@ -444,6 +455,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
+@@ -348,7 +348,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");
+@@ -430,7 +430,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
+@@ -1008,7 +1008,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
+@@ -242,7 +242,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
+@@ -380,9 +380,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
+@@ -96,10 +96,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.skia.mojom.ColorType;
+ 
+ import java.nio.ByteBuffer;
+@@ -41,14 +39,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
+@@ -261,7 +261,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
+@@ -72,22 +72,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" />
+@@ -886,43 +881,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"/>
+@@ -934,8 +892,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"
+@@ -962,24 +918,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.FieldTrialList;
+@@ -201,16 +199,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
+@@ -22,7 +22,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",
+@@ -1112,7 +1111,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
+
@@ -0,0 +1,318 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:13:38 +0200
+Subject: kill remaining Play Services checks
+
+---
+ .../chromium/chrome/browser/ChromeVersionInfo.java | 10 +-----
+ .../browser/externalauth/ExternalAuthUtils.java    | 41 ++--------------------
+ .../externalauth/UserRecoverableErrorHandler.java  | 10 ------
+ .../chrome/browser/omaha/UpdateMenuItemHelper.java | 10 +-----
+ chrome/android/java_sources.gni                    |  3 --
+ .../components/signin/AccountIdProvider.java       | 10 +-----
+ .../signin/GmsAvailabilityException.java           |  4 +--
+ .../signin/SystemAccountManagerDelegate.java       | 15 +-------
+ .../shape_detection/FaceDetectionProviderImpl.java |  8 +----
+ 9 files changed, 9 insertions(+), 102 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeVersionInfo.java
+@@ -7,8 +7,6 @@ package org.chromium.chrome.browser;
+ import android.content.Context;
+ import android.content.pm.PackageManager;
+ 
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+@@ -88,7 +86,7 @@ public class ChromeVersionInfo {
+     public static String getGmsInfo() {
+         Context context = ContextUtils.getApplicationContext();
+ 
+-        final long sdkVersion = GoogleApiAvailability.GOOGLE_PLAY_SERVICES_VERSION_CODE;
+        final long sdkVersion = 0L;
+         final long installedGmsVersion = getPlayServicesApkVersionNumber(context);
+ 
+         final String accessType;
+@@ -105,12 +103,6 @@ public class ChromeVersionInfo {
+     }
+ 
+     private static long getPlayServicesApkVersionNumber(Context context) {
+-        try {
+-            return context.getPackageManager()
+-                    .getPackageInfo(GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, 0)
+-                    .versionCode;
+-        } catch (PackageManager.NameNotFoundException e) {
+             return 0;
+-        }
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
+@@ -15,9 +15,6 @@ import android.os.SystemClock;
+ import android.support.annotation.WorkerThread;
+ import android.text.TextUtils;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.ThreadUtils;
+@@ -164,12 +161,7 @@ public class ExternalAuthUtils {
+      *         when it is updating.
+      */
+     public boolean isGooglePlayServicesMissing(final Context context) {
+-        final int resultCode = checkGooglePlayServicesAvailable(context);
+-        if (resultCode == ConnectionResult.SERVICE_MISSING
+-                || resultCode == ConnectionResult.SERVICE_INVALID) {
+             return true;
+-        }
+-        return false;
+     }
+ 
+     /**
+@@ -184,23 +176,6 @@ public class ExternalAuthUtils {
+      * @return true if and only if Google Play Services can be used
+      */
+     public boolean canUseGooglePlayServices(final UserRecoverableErrorHandler errorHandler) {
+-        Context context = ContextUtils.getApplicationContext();
+-        final int resultCode = checkGooglePlayServicesAvailable(context);
+-        recordConnectionResult(resultCode);
+-        if (resultCode == ConnectionResult.SUCCESS) {
+-            return true;
+-        }
+-        // resultCode is some kind of error.
+-        Log.v(TAG, "Unable to use Google Play Services: %s", describeError(resultCode));
+-        if (isUserRecoverableError(resultCode)) {
+-            Runnable errorHandlerTask = new Runnable() {
+-                @Override
+-                public void run() {
+-                    errorHandler.handleError(context, resultCode);
+-                }
+-            };
+-            ThreadUtils.runOnUiThread(errorHandlerTask);
+-        }
+         return false;
+     }
+ 
+@@ -262,17 +237,7 @@ public class ExternalAuthUtils {
+      * @return The code produced by calling the external code
+      */
+     protected int checkGooglePlayServicesAvailable(final Context context) {
+-        // Temporarily allowing disk access. TODO: Fix. See http://crbug.com/577190
+-        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+-        try {
+-            long time = SystemClock.elapsedRealtime();
+-            int isAvailable =
+-                    GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
+-            mRegistrationTimeHistogramSample.record(SystemClock.elapsedRealtime() - time);
+-            return isAvailable;
+-        } finally {
+-            StrictMode.setThreadPolicy(oldPolicy);
+-        }
+        return 1;
+     }
+ 
+     /**
+@@ -283,7 +248,7 @@ public class ExternalAuthUtils {
+      * @return true If the code represents a user-recoverable error
+      */
+     protected boolean isUserRecoverableError(final int errorCode) {
+-        return GoogleApiAvailability.getInstance().isUserResolvableError(errorCode);
+        return false;
+     }
+ 
+     /**
+@@ -293,6 +258,6 @@ public class ExternalAuthUtils {
+      * @return a textual description of the error code
+      */
+     protected String describeError(final int errorCode) {
+-        return GoogleApiAvailability.getInstance().getErrorString(errorCode);
+        return "";
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java
+@@ -9,8 +9,6 @@ import android.app.Dialog;
+ import android.content.Context;
+ import android.content.DialogInterface;
+ 
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.metrics.CachedMetrics.ActionEvent;
+ import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+@@ -113,7 +111,6 @@ public abstract class UserRecoverableErrorHandler {
+                         .record(ERROR_HANDLER_ACTION_IGNORED_AS_REDUNDANT);
+                 return;
+             }
+-            GoogleApiAvailability.getInstance().showErrorNotification(context, errorCode);
+             sErrorHandlerActionHistogramSample.record(ERROR_HANDLER_ACTION_SYSTEM_NOTIFICATION);
+         }
+     }
+@@ -206,13 +203,6 @@ public abstract class UserRecoverableErrorHandler {
+             if (mErrorCode != errorCode) {
+                 cancelDialog();
+             }
+-            if (mDialog == null) {
+-                mDialog = GoogleApiAvailability.getInstance().getErrorDialog(
+-                        mActivity, errorCode, NO_RESPONSE_REQUIRED);
+-                mErrorCode = errorCode;
+-
+-                DialogUserActionRecorder.createAndAttachToDialog(mDialog);
+-            }
+             // This can happen if |errorCode| is ConnectionResult.SERVICE_INVALID.
+             if (mDialog != null && !mDialog.isShowing()) {
+                 mDialog.setCancelable(mCancelable);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
+@@ -22,8 +22,6 @@ import android.text.TextUtils;
+ import android.view.View;
+ import android.view.animation.LinearInterpolator;
+ 
+-import com.google.android.gms.common.GooglePlayServicesUtil;
+-
+ import org.chromium.base.CommandLine;
+ import org.chromium.base.Log;
+ import org.chromium.base.ThreadUtils;
+@@ -161,13 +159,7 @@ public class UpdateMenuItemHelper {
+     }
+ 
+     private static boolean isGooglePlayStoreAvailable(Context context) {
+-        try {
+-            context.getPackageManager().getPackageInfo(
+-                    GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0);
+-        } catch (PackageManager.NameNotFoundException e) {
+-            return false;
+-        }
+-        return true;
+        return false;
+     }
+ 
+     /**
+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
+@@ -485,10 +485,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java",
+   "java/src/org/chromium/chrome/browser/fullscreen/FullscreenManager.java",
+   "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClient.java",
+-  "java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java",
+   "java/src/org/chromium/chrome/browser/gcore/ConnectedTask.java",
+-  "java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java",
+-  "java/src/org/chromium/chrome/browser/gcore/LifecycleHook.java",
+   "java/src/org/chromium/chrome/browser/gsa/ContextReporter.java",
+   "java/src/org/chromium/chrome/browser/gsa/GSAAccountChangeListener.java",
+   "java/src/org/chromium/chrome/browser/gsa/GSAContextDisplaySelection.java",
+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,9 +4,6 @@
+ 
+ package org.chromium.components.signin;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.StrictModeContext;
+@@ -47,12 +44,7 @@ public class AccountIdProvider {
+      * Google Play services is available.
+      */
+     public boolean canBeUsed() {
+-        // TODO(http://crbug.com/577190): Remove StrictMode override.
+-        try (StrictModeContext unused = StrictModeContext.allowDiskWrites()) {
+-            int resultCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                    ContextUtils.getApplicationContext());
+-            return resultCode == ConnectionResult.SUCCESS;
+-        }
+        return false;
+     }
+ 
+     /**
+diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
+--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
+@@ -4,8 +4,6 @@
+ 
+ package org.chromium.components.signin;
+ 
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ /**
+  * This class encapsulates return code if GMSCore package is not available.
+  */
+@@ -27,6 +25,6 @@ public class GmsAvailabilityException extends AccountManagerDelegateException {
+     }
+ 
+     public boolean isUserResolvableError() {
+-        return GoogleApiAvailability.getInstance().isUserResolvableError(mResultCode);
+        return false;
+     }
+ }
+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.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ApiCompatibilityUtils;
+ import org.chromium.base.Callback;
+ import org.chromium.base.ContextUtils;
+@@ -82,17 +79,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
+     }
+ 
+     protected void checkCanUseGooglePlayServices() throws AccountManagerDelegateException {
+-        Context context = ContextUtils.getApplicationContext();
+-        final int resultCode =
+-                GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
+-        if (resultCode == ConnectionResult.SUCCESS) {
+-            return;
+-        }
+-
+-        throw new GmsAvailabilityException(
+-                String.format("Can't use Google Play Services: %s",
+-                        GoogleApiAvailability.getInstance().getErrorString(resultCode)),
+-                resultCode);
+        throw new GmsAvailabilityException("Can't use Google Play Services: CFOSS",0);
+     }
+ 
+     @Override
+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
+@@ -4,9 +4,6 @@
+ 
+ package org.chromium.shape_detection;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.mojo.bindings.InterfaceRequest;
+ import org.chromium.mojo.system.MojoException;
+@@ -24,10 +21,7 @@ public class FaceDetectionProviderImpl implements FaceDetectionProvider {
+     @Override
+     public void createFaceDetection(
+             InterfaceRequest<FaceDetection> request, FaceDetectorOptions options) {
+-        final boolean isGmsCoreSupported =
+-                GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                        ContextUtils.getApplicationContext())
+-                == ConnectionResult.SUCCESS;
+        final boolean isGmsCoreSupported = false;
+ 
+         if (isGmsCoreSupported) {
+             //FaceDetection.MANAGER.bind(new FaceDetectionImplGmsCore(options), request);
+-- 
+2.7.4
+
@@ -0,0 +1,37 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:16:07 +0200
+Subject: kill TOS and metrics opt-out
+
+---
+ chrome/android/java/res/layout/fre_tosanduma.xml                       | 3 ++-
+ .../src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+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
+@@ -62,7 +62,8 @@
+                         android:layout_marginBottom="@dimen/fre_vertical_spacing"
+                         android:gravity="center"
+                         android:lineSpacingMultiplier="1.4"
+-                        android:textAppearance="@style/BlackBodyDefault" />
+                        android:textAppearance="@style/BlackBodyDefault"
+                        android:visibility="gone" />
+ 
+                     <CheckBox
+                         android:id="@+id/send_report_checkbox"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+@@ -36,7 +36,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
+     public static final String EXTRA_FIRST_RUN_ACTIVITY_RESULT = "Extra.FreActivityResult";
+     public static final String EXTRA_FIRST_RUN_COMPLETE = "Extra.FreComplete";
+ 
+-    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
+    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
+ 
+     private boolean mNativeInitialized;
+ 
+-- 
+2.7.4
+
@@ -0,0 +1,43 @@
+From: thermatk <thermatk@thermatk.com>
+Date: Fri, 22 Jun 2018 17:16:43 +0200
+Subject: kill Translate(doesn't work)
+
+---
+ chrome/android/java/res/xml/languages_preferences.xml                  | 3 ++-
+ .../src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java     | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
+--- a/chrome/android/java/res/xml/languages_preferences.xml
+++ b/chrome/android/java/res/xml/languages_preferences.xml
+@@ -14,6 +14,7 @@
+     <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
+         android:key="translate_switch"
+         android:summaryOn="@string/languages_offer_translate_switch"
+-        android:summaryOff="@string/languages_offer_translate_switch" />
+        android:summaryOff="@string/languages_offer_translate_switch"
+        android:enabled="false" />
+ 
+ </PreferenceScreen>
+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
+@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.metrics.UmaUtils;
+ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoUtils;
+ import org.chromium.chrome.browser.preferences.datareduction.DataReductionProxyUma;
+import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+ import org.chromium.chrome.browser.search_engines.TemplateUrlService;
+ import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
+ import org.chromium.ui.base.LocalizationUtils;
+@@ -142,6 +143,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
+         if (mFreProperties.getBoolean(SHOW_DATA_REDUCTION_PAGE)) {
+             mFreProgressStates.add(FRE_PROGRESS_DATA_SAVER_SHOWN);
+             notifyAdapter = true;
+            PrefServiceBridge.getInstance().setTranslateEnabled(false);
+         }
+ 
+         // An optional page to select a default search engine.
+-- 
+2.7.4
+
Author	SHA1	Message	Date
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