Release 78.0.3904.130

Remove "enable" from menu items
Renamed more references for consistency

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,30 +4,36 @@ about: Create a Bromite bug report
 
 ---
 
-**Bromite version**
+### Bromite version
 
 Version: `76.0...`
 Arch: `arm` or `arm64` or `x86`
 Android version: (example: `9.0`)
 Device model: (example: `SM-G960UZKABST`)
 
-**Is the bug reproducible with latest version?**
+### Is this bug about the SystemWebView?
+Yes/No
+
+No support for SystemWebView installations is provided.
+
+### Is the bug reproducible with latest version?
 
 Do not report bugs which are not reproducible with latest version
 
-**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
+### Can the bug be reproduced with corresponding Chromium version?
 
-If yes then report it upstream on [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.
+Please pick the same version of Chromium as Bromite from here: https://github.com/bromite/chromium/releases
+If the bug is reproducible then it might be a configuration issue or an upstream bug. Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.
 
-**Is the bug a crash?**
+### 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**
+### Describe the bug
 
 Write here a clear and concise description of the bug.
 
-**To Reproduce**
+### Steps to reproduce the bug
 
 Steps to reproduce the behavior:
 1. Go to '...'
@@ -35,10 +41,10 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+### Expected behavior
 
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+### Screenshots
 
-If applicable, add screenshots to help explain your problem.
+If applicable, add screenshots to help explain your problem. Otherwise remove this section.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,16 +4,20 @@ about: Suggest a privacy-related idea for this project
 
 ---
 
-**Is your feature request related to privacy?**
+### Is your feature request related to privacy?
+
 Features that are not related to privacy are unlikely to be considered.
 
-**Is there a patch available for this feature somewhere?**
+### Is there a patch available for this feature somewhere?
+
 If yes then provide URL and license information.
 
-**Describe the solution you would like**
+### Describe the solution you would like
+
 A clear and concise description of what you want to happen.
 
 Do not ask "I would like feature X which is available in browser Y"; such issues are closed immediately.
 
-**Describe alternatives you have considered**
+### Describe alternatives you have considered
+
 A clear and concise description of any alternative solutions or features you have considered.

CHANGELOG.md

@@ -1,3 +1,52 @@
+# 78.0.3904.130
+* support user-specified subresources filter URL (fixes https://github.com/bromite/bromite/issues/2)
+* revert removal of flag for disabling pull-to-refresh effect
+* fix crash when entering no DoH URL (fixes https://github.com/bromite/bromite/issues/430)
+* added Peter Lowe's Ad and tracking server list (fixes https://github.com/bromite/bromite/issues/423)
+* removed Startpage
+* enabled dav1d_decoder
+
+# 78.0.3904.119
+* replace fixed DNS-over-HTTPS feature flag with user-customizable option
+* fix background playback issue (fixes https://github.com/bromite/bromite/issues/424)
+
+# 78.0.3904.105
+* add flag to disable WebGL (fixes https://github.com/bromite/bromite/issues/411)
+* more selective AMP sanitization (fixes https://github.com/bromite/bromite/issues/410)
+* build optimizations to disable debug information
+
+# 78.0.3904.93
+* introduce flags to disable browser fingerprinting capabilities (fixes https://github.com/bromite/bromite/issues/402)
+* major enhancements to AMP sanitization for news/images
+* remove duplicate network predictions privacy setting
+* disable some signed exchanges features
+* ungoogled-chromium-android: patches to block all GCM/GMS/PlayServices integrations
+* ungoogled-chromium: block all connection requests to substituted domains
+* disable GVR services build flag
+* disable HEAD requests for single words typed and clicked in Omnibar
+* increase number of autocomplete matches from 5 to 10
+* replace DoH probe domain with RIPE domain
+* merged fixes for adblock/javascript menu text (https://github.com/bromite/bromite/pull/398)
+* updated User-agent phone model and version
+
+# 78.0.3904.72
+* updated User-agent phone model and version
+* fix network predictions bug (fixes https://github.com/bromite/bromite/issues/387)
+* fix crash in settings (fixes https://github.com/bromite/bromite/issues/388)
+
+# 78.0.3904.63
+* replace Beta DoH service URL for Google (https://developers.google.com/speed/public-dns/docs/doh/migration)
+* disable AImageReaderMediaPlayer until upstream bug is fixed (https://bugs.chromium.org/p/chromium/issues/detail?id=977583)
+* disabled face detection provider
+* removed non-working SystemWebView adblock patch (not working since v77)
+* bring back some privacy options which upstream moved to Sync settings (fixes https://github.com/bromite/bromite/issues/383)
+
+# 77.0.3865.104
+* revert upstream commit for search privacy options and related translations removal (fixes https://github.com/bromite/bromite/issues/375)
+* remove unused patch for enabling subresource filter on all sites
+
+# 77.0.3865.95
+
 # 77.0.3865.81
 * use native subresource filtering instead of Bromite engine
 * introduce Bromite AdBlockUpdate service

README.md

@@ -19,9 +19,7 @@ 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.
 
-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)
+[→ Support development with a donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2): [![paypal](https://www.bromite.org/assets/img/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)
 
 <a href="bitcoin:3MkC3idL61npQSCxL1gceksmRTkNkiCPcG">BTC donations address</a>: `3MkC3idL61npQSCxL1gceksmRTkNkiCPcG`
 
@@ -52,10 +50,6 @@ See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-Syst
 
 See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
 
-## Can you add dark mode/some cool themes?
-No.
-Bromite is about privacy and adblocking.
-
 ## Can you add HTTPS everywhere?
 No.
 We cannot add add-ons to Bromite (merely some features).
@@ -75,7 +69,7 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 
 # Features
 
-* baked-in adblock engine
+* native adblock engine
 * remove click-tracking and AMP from search results
 * DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
 * [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
@@ -143,24 +137,31 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags
 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.
 
 The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).
-The patches are to be applied second the order specified in the `patches_list.txt` file (you can use `git am`); the big file `adblock_entries.h` (containing all the AdBlock filters) needs to be copied under `src/net/url_request/`.
+The patches are to be applied second the order specified in the `bromite_patches_list.txt` file (you can use `git am`).
+
+## How to build the filters
+
+See upstream documentation: https://github.com/chromium/chromium/blob/master/components/subresource_filter/FILTER_LIST_GENERATION.md
+
+Bromite uses an unindexed filter file, which is periodically published at https://github.com/bromite/filters
 
 # 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
+* [ungoogled-chromium-android](https://github.com/ungoogled-software/ungoogled-chromium-android) for some patches
 * [GrapheneOS](https://github.com/GrapheneOS) for some security patches
 * [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
+* nochromo for the original adblock patch, currently used only in the SystemWebView
 * [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo
 
 # Filters credits
 * [EasyList](https://easylist.to/#easylist)
 * [EasyPrivacy](https://easylist.to/#easyprivacy)
 * [uBlock Origin](https://github.com/uBlockOrigin)
-
+* [Peter Lowe's Ad and tracking server list](https://pgl.yoyo.org/adservers/)
 # License
 
 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).

build/GN_ARGS

@@ -2,8 +2,11 @@ android_channel="stable"
 blink_symbol_level=1
 dcheck_always_on=false
 debuggable_apks=false
+disable_android_lint=true
 enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
 enable_av1_decoder=true
+enable_dav1d_decoder=true
+enable_gvr_services=false
 enable_hangout_services_extension=false
 enable_mdns=false
 enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
@@ -13,15 +16,18 @@ enable_remoting=false
 enable_reporting=false
 enable_resource_whitelist_generation=false
 enable_vr=false
+exclude_unwind_tables = true
 fieldtrial_testing_like_official_build=true
 is_cfi=true
 is_component_build=false
 is_debug=false
 is_official_build=true
-jumbo_file_merge_limit=60
+remove_webcore_debug_symbols=true
+rtc_build_examples=false
 safe_browsing_mode=0
 strip_absolute_paths_from_debug_symbols=true
-strip_debug_info=false
+strip_debug_info=true
+symbol_level=0
 symbol_level=1
 target_os="android"
 use_debug_fission=true

build/bromite_patches_list.txt

@@ -0,0 +1,145 @@
+Disable-third-party-cookies-by-default.patch
+Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
+Restore-classic-new-tab-page.patch
+Always-use-new-tab-page-for-default-home-page.patch
+Always-allow-partner-customisation.patch
+Always-show-home-page-settings.patch
+battery_status_service-disable-more-privacy-nightmares.patch
+Battery-API-return-nothing.patch
+google-cloud-messaging-disable-experiment-status-check.patch
+updater-disable-updater-pings.patch
+prefs-only-keep-cookies-until-exit.patch
+Remove-EV-certificates.patch
+promo-disable-Google-promotion-fetching.patch
+Disable-omission-of-URL-elements-in-Omnibox.patch
+Modify-default-preferences.patch
+Disable-contextual-search-by-default.patch
+Do-not-store-passwords-by-default.patch
+Disable-NTP-remote-suggestions-by-default.patch
+Disable-references-to-fonts.googleapis.com.patch
+Disable-WebRTC-by-default.patch
+Never-send-any-crash-upload-data.patch
+Hide-send-reports-checkbox.patch
+Never-fetch-popular-sites.patch
+ungoogled-chromium-Disable-webRTC-log-uploader.patch
+ungoogled-chromium-Disable-untraceable-URLs.patch
+ungoogled-chromium-Disable-translate-integration.patch
+ungoogled-chromium-Disable-profile-avatar-downloading.patch
+ungoogled-chromium-Disable-intranet-redirect-detector.patch
+ungoogled-chromium-Disable-Google-host-detection.patch
+ungoogled-chromium-Disable-GCM.patch
+ungoogled-chromium-Disable-Gaia.patch
+ungoogled-chromium-Disable-domain-reliability.patch
+ungoogled-chromium-Disable-Network-Time-Tracker.patch
+ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
+safe_browsing-disable-incident-reporting.patch
+safe_browsing-disable-reporting-of-safebrowsing-override.patch
+safe_browsing-disable-cookie-transmission.patch
+Disable-safe-browsing.patch
+Skip-the-first-run-and-metrics.patch
+Disable-all-promo-dialogs.patch
+Disable-sync-services-menu-entry.patch
+Remove-signin-and-data-saver-integrations.patch
+Remove-background-sync-and-translate-menu-options.patch
+Hide-passwords-manager-link.patch
+Disable-Omaha-update-checks.patch
+Disable-update-scheduler.patch
+Add-StartPage-search-engine.patch
+Add-English-only-search-engine.patch
+Add-DuckDuckGo-Lite-search-engine.patch
+Add-Qwant-search-engine.patch
+Fix-crash-when-accessing-page-info-site-settings.patch
+openH264-enable-ARM-ARM64-optimizations.patch
+Switch-to-fstack-protector-strong.patch
+Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
+build-remove-calling-untrusted-hooks.patch
+AV1-codec-support.patch
+Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
+Allow-playing-audio-in-background.patch
+Add-flag-to-control-video-playback-resume-feature.patch
+Open-YouTube-links-in-Bromite.patch
+Add-exit-menu-item.patch
+Remove-help-menu-item.patch
+Add-menu-option-to-toggle-global-Javascript-preference.patch
+Add-menu-option-to-toggle-ad-blocker.patch
+User-Agent-anonymize.patch
+AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
+Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
+Add-flags-to-disable-device-motion-and-orientation-APIs.patch
+Punt-the-Widevine-version-string.patch
+Disable-metrics-on-all-I-O-threads.patch
+Always-respect-async-dns-flag-regardless-of-SDK-version.patch
+Add-flag-to-configure-maximum-connections-per-host.patch
+Add-site-settings-option-for-session-only-cookies.patch
+Add-bookmark-import-export-actions.patch
+Disable-promos-displayed-in-bookmarks-manager.patch
+Add-an-always-incognito-mode.patch
+Add-custom-tab-intents-privacy-option.patch
+Add-option-to-not-persist-tabs-across-sessions.patch
+Disable-fetching-of-all-field-trials.patch
+Disable-seed-based-field-trials.patch
+Disable-plugins-enumeration.patch
+net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
+dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
+profile-resetter-do-not-tick-send-settings-by-default.patch
+browser-ui-disable-warning-about-missing-API-keys.patch
+autofill-disable-autofill-download-manager.patch
+first_run-deactivate-autoupdate-globally.patch
+translate-disable-fetching-of-translate-languages-from-server.patch
+kill-TOS-and-metrics-opt-out.patch
+kill-Translate.patch
+kill-Vision.patch
+kill-Location-fall-back-to-system.patch
+kill-Auth.patch
+Remove-dependency-on-com.google.android.gms.auth.patch
+kill-GCM.patch
+Remove-dependency-on-com.google.android.gcm.patch
+Remove-dependency-on-com.google.android.gms.gcm.patch
+Remove-dependency-on-com.google.android.play.patch
+Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
+Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
+Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
+Remove-dependency-on-com.google.android.gms.cast.patch
+Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
+Remove-play-dependency-for-module-installer.patch
+Remove-SMS-integration.patch
+Allow-website-sign-in-without-account-sign-in.patch
+Offer-builtin-autocomplete-for-chrome-flags.patch
+Do-not-grant-notifications-to-default-search-engine.patch
+Add-flag-to-disable-IPv6-probes.patch
+Add-a-proxy-configuration-page.patch
+Do-not-ignore-download-location-prompt-setting.patch
+Disable-previews-by-default.patch
+Use-4-tile-rows-never-show-logo.patch
+Disable-metrics-collection-for-NTP-tiles.patch
+Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
+Use-64-bit-WebView-processes.patch
+Add-option-to-use-home-page-as-NTP.patch
+Enable-night-mode-menu-entry-by-default.patch
+Disable-dynamic-module-loading.patch
+prefs-disable-signinallowed-by-default.patch
+prefs-always-prompt-for-download-directory-by-default.patch
+Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
+Enable-changing-default-downloads-storage-location-by-default.patch
+Enable-download-rename-option-by-default.patch
+disable-payment-support-by-default.patch
+disable-background-sync-by-default.patch
+disable-sensors-access-site-setting-by-default.patch
+Disable-media-router-and-remoting-by-default.patch
+Do-not-record-UMA-for-network-errors.patch
+Disable-unified-consent-on-Android.patch
+Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
+Disable-search-ready-omnibox-by-default.patch
+disable-AdsBlockedInfoBar.patch
+Bromite-AdBlockUpdaterService.patch
+Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
+Replace-DoH-probe-domain-with-RIPE-domain.patch
+Increase-number-of-autocomplete-matches-from-5-to-10.patch
+Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
+Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
+Disable-some-signed-exchange-features.patch
+Add-flag-to-disable-WebGL.patch
+Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
+Revert-flags-remove-disable-pull-to-refresh-effect.patch
+Add-option-to-configure-the-ad-blocker-filters-URL.patch

build/chromium_patches_list.txt

@@ -0,0 +1,7 @@
+Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
+AV1-codec-support.patch
+Switch-to-fstack-protector-strong.patch
+Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
+Disable-safe-browsing.patch
+Disable-sync-services-menu-entry.patch

build/patches/AV1-codec-support.patch

@@ -69,7 +69,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 +      sources += aom_ports_arm_sources
      }
      if (is_android) {
-       deps += [ "//third_party/android_sdk:cpu_features" ]
+       deps += [ "//third_party/android_ndk:cpu_features" ]
 diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
 --- a/third_party/libaom/libaom_srcs.gni
 +++ b/third_party/libaom/libaom_srcs.gni

build/patches/Add-DuckDuckGo-Lite-search-engine.patch

@@ -11,7 +11,7 @@ Subject: Add DuckDuckGo Lite search engine
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -95,6 +95,16 @@
+@@ -91,6 +91,16 @@
        "id": 68
      },
  

build/patches/Add-English-only-search-engine.patch

@@ -13,7 +13,7 @@ disable from all its searches RLZ and field experiments querystring parameters.
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -126,6 +126,27 @@
+@@ -122,6 +122,27 @@
        "id": 1
      },
  

build/patches/Add-Qwant-search-engine.patch

@@ -12,7 +12,7 @@ Make search engine selectable in default list
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -187,6 +187,7 @@
+@@ -183,6 +183,7 @@
        "favicon_url": "https://www.qwant.com/favicon.ico",
        "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch",
        "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch",

build/patches/Add-StartPage-search-engine.patch

@@ -11,7 +11,7 @@ Subject: Add StartPage search engine
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -197,6 +197,16 @@
+@@ -193,6 +193,16 @@
        "id": 56
      },
  

build/patches/Add-a-flag-for-DNS-over-HTTPS.patch

@@ -1,254 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 28 Apr 2018 08:30:26 +0200
-Subject: Add a flag for DNS-over-HTTPS
-
-Allow selection between Google and Cloudflare endpoints.
-Serve DoH requests with maximum priority, remove traffic annotation.
-Reduce HTTP headers in DoH requests to bare minimum.
-Add AdGuard (default) endpoint
-Do not fallback to UDP when using DoH
-
-See also: https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-14.txt
----
- chrome/browser/about_flags.cc                           | 11 +++++++++++
- chrome/browser/flag_descriptions.cc                     |  3 +++
- chrome/browser/flag_descriptions.h                      |  3 +++
- chrome/browser/net/system_network_context_manager.cc    | 17 ++++++++---------
- .../common/network_features.cc                          |  7 +++++--
- .../common/network_features.h                           |  5 ++++-
- .../common/network_switch_list.h                        |  4 ++++
- net/base/load_flags_list.h                              |  6 ++++++
- net/dns/dns_transaction.cc                              |  3 ++-
- net/url_request/url_request_http_job.cc                 | 16 +++++++++++-----
- 10 files changed, 57 insertions(+), 18 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -403,6 +403,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
-      base::size(kCCTModuleCache_ThirtyMinutes), nullptr},
- };
- 
-+const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
-+    {features::kDnsOverHttpsChoiceDefault, "", ""},
-+    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google.com/experimental"},
-+    {features::kDnsOverHttpsChoiceCloudflare, switches::kDnsOverHttpsServer, "https://1.1.1.1/dns-query"},
-+    {features::kDnsOverHttpsChoiceQuad9, switches::kDnsOverHttpsServer, "https://9.9.9.9/dns-query"},
-+    {features::kDnsOverHttpsChoiceAdGuard, switches::kDnsOverHttpsServer, "https://dns.adguard.com/dns-query"}
-+};
-+
- #endif  // OS_ANDROID
- 
- const FeatureEntry::Choice kEnableGpuRasterizationChoices[] = {
-@@ -3438,6 +3446,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kEnableSyncUSSBookmarksName,
-      flag_descriptions::kEnableSyncUSSBookmarksDescription, kOsAll,
-      FEATURE_VALUE_TYPE(switches::kSyncUSSBookmarks)},
-+    {"enable-dns-over-https", flag_descriptions::kDnsOverHttpsName,
-+     flag_descriptions::kDnsOverHttpsDescription, kOsAndroid,
-+     MULTI_VALUE_TYPE(kDnsOverHttpsChoices)},
- 
-     {"enable-lookalike-url-navigation-suggestions",
-      flag_descriptions::kLookalikeUrlNavigationSuggestionsName,
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -2182,6 +2182,9 @@ const char kAutoFetchOnNetErrorPageDescription[] =
-     "When enabled, and navigation fails with an offline error, schedule a "
-     "fetch of the page when online again.";
- 
-+const char kDnsOverHttpsName[] = "DNS over HTTPS";
-+const char kDnsOverHttpsDescription[] = "Enables DNS-over-HTTPS (experimental).";
-+
- const char kAutofillAccessoryViewName[] =
-     "Autofill suggestions as keyboard accessory view";
- const char kAutofillAccessoryViewDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1294,6 +1294,9 @@ extern const char kAsyncDnsDescription[];
- extern const char kAutoFetchOnNetErrorPageName[];
- extern const char kAutoFetchOnNetErrorPageDescription[];
- 
-+extern const char kDnsOverHttpsName[];
-+extern const char kDnsOverHttpsDescription[];
-+
- extern const char kAutofillAccessoryViewName[];
- extern const char kAutofillAccessoryViewDescription[];
- 
-diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
---- a/chrome/browser/net/system_network_context_manager.cc
-+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -23,6 +23,7 @@
- #include "chrome/browser/chrome_content_browser_client.h"
- #include "chrome/browser/component_updater/crl_set_component_installer.h"
- #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
-+#include "components/network_session_configurator/common/network_switches.h"
- #include "chrome/browser/safe_browsing/safe_browsing_service.h"
- #include "chrome/browser/ssl/ssl_config_service_manager.h"
- #include "chrome/common/channel_info.h"
-@@ -111,6 +112,7 @@ void GetStubResolverConfig(
-       if (!net::dns_util::IsValidDoHTemplate(
-               doh_server_list[i].GetString(),
-               doh_server_method_list[i].GetString())) {
-+        LOG(ERROR) << "Invalid DoH template: " << doh_server_list[i].GetString() << " with method " << doh_server_method_list[i].GetString();
-         continue;
-       }
- 
-@@ -378,15 +380,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-                                     base::Value(ShouldEnableAsyncDns()));
-   base::ListValue default_doh_servers;
-   base::ListValue default_doh_server_methods;
--  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
--    std::string server(variations::GetVariationParamValueByFeature(
--        features::kDnsOverHttps, "server"));
--    std::string method(variations::GetVariationParamValueByFeature(
--        features::kDnsOverHttps, "method"));
--    if (!server.empty()) {
--      default_doh_servers.AppendString(server);
--      default_doh_server_methods.AppendString(method);
--    }
-+  std::string server =
-+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-+      switches::kDnsOverHttpsServer);
-+  if (!server.empty()) {
-+    default_doh_servers.AppendString(server);
-+    default_doh_server_methods.AppendString("POST");
-   }
-   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsServers,
-                                     std::move(default_doh_servers));
-diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
---- a/components/network_session_configurator/common/network_features.cc
-+++ b/components/network_session_configurator/common/network_features.cc
-@@ -8,7 +8,10 @@
- 
- namespace features {
- 
--const base::Feature kDnsOverHttps{"dns-over-https",
--                                  base::FEATURE_DISABLED_BY_DEFAULT};
-+const char kDnsOverHttpsChoiceDefault[] = "Disabled",
-+                 kDnsOverHttpsChoiceGoogle[] = "Google",
-+                 kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
-+                 kDnsOverHttpsChoiceQuad9[] = "Quad9",
-+                 kDnsOverHttpsChoiceAdGuard[] = "AdGuard";
- 
- }  // namespace features
-diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
---- a/components/network_session_configurator/common/network_features.h
-+++ b/components/network_session_configurator/common/network_features.h
-@@ -10,9 +10,12 @@
- 
- namespace features {
- 
--// Enabled DNS over HTTPS
-+// DNS over HTTPS server endpoint choices
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
-+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kDnsOverHttpsChoiceDefault[],
-+   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[],
-+   kDnsOverHttpsChoiceAdGuard[];
- 
- }  // namespace features
- 
-diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
---- a/components/network_session_configurator/common/network_switch_list.h
-+++ b/components/network_session_configurator/common/network_switch_list.h
-@@ -32,6 +32,10 @@ NETWORK_SWITCH(kOriginToForceQuicOn, "origin-to-force-quic-on")
- // the server.
- NETWORK_SWITCH(kQuicConnectionOptions, "quic-connection-options")
- 
-+// Specifies an IETF DNS-over-HTTPS server endpoint
-+// (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-02.txt).
-+NETWORK_SWITCH(kDnsOverHttpsServer, "dns-over-https-server")
-+
- // Specifies the maximum length for a QUIC packet.
- NETWORK_SWITCH(kQuicMaxPacketLength, "quic-max-packet-length")
- 
-diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h
---- a/net/base/load_flags_list.h
-+++ b/net/base/load_flags_list.h
-@@ -105,3 +105,9 @@ LOAD_FLAG(SKIP_VARY_CHECK, 1 << 16)
- // does not complete in 60 seconds, the cache treat the stale resource as
- // invalid, as it did not specify stale-while-revalidate.
- LOAD_FLAG(SUPPORT_ASYNC_REVALIDATION, 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
-@@ -392,6 +392,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
- 
-     request_->SetExtraRequestHeaders(extra_request_headers);
-     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
-+                           LOAD_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
-                            LOAD_BYPASS_PROXY);
-     request_->set_allow_credentials(false);
-   }
-@@ -806,7 +807,7 @@ class DnsTransactionImpl : public DnsTransaction,
-         doh_attempt_(false),
-         first_server_index_(0),
-         url_request_context_(url_request_context),
--        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
-@@ -340,6 +340,7 @@ void URLRequestHttpJob::Start() {
-   // plugin could set a referrer although sending the referrer is inhibited.
-   request_info_.extra_headers.RemoveHeader(HttpRequestHeaders::kReferer);
- 
-+  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()) {
-@@ -355,11 +356,14 @@ void URLRequestHttpJob::Start() {
-     request_info_.extra_headers.SetHeader(HttpRequestHeaders::kReferer,
-                                           referer_value);
-   }
-+  }
- 
-+  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();
-@@ -582,10 +586,12 @@ void URLRequestHttpJob::AddExtraHeaders() {
-     } else {
-       // 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;
-+          }
-         }
-       }
- 
-@@ -603,7 +609,7 @@ void URLRequestHttpJob::AddExtraHeaders() {
-     }
-   }
- 
--  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.11.0
-

build/patches/Add-a-proxy-configuration-page.patch

@@ -10,7 +10,7 @@ Offer auto-complete for the proxy page URL.
  chrome/android/java/res/values/values.xml          |   3 +
  .../android/java/res/xml/privacy_preferences.xml   |   4 +
  .../chrome_autocomplete_provider_client.cc         |   2 +
- chrome/browser/browser_resources.grd               |   2 +
+ chrome/browser/browser_resources.grd               |   6 +
  .../prefs/chrome_command_line_pref_store.cc        |   2 +-
  chrome/browser/resources/proxy_config.css          |  61 ++++
  chrome/browser/resources/proxy_config.html         |  78 ++++
@@ -26,7 +26,7 @@ Offer auto-complete for the proxy page URL.
  components/proxy_config/proxy_config_dictionary.h  |   6 +-
  net/proxy_resolution/proxy_config.cc               |  45 +++
  net/proxy_resolution/proxy_config.h                |   3 +
- 19 files changed, 911 insertions(+), 12 deletions(-)
+ 19 files changed, 915 insertions(+), 12 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -36,7 +36,7 @@ Offer auto-complete for the proxy page URL.
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -80,6 +80,9 @@
+@@ -76,6 +76,9 @@
      <integer name="list_item_level_selected">1</integer>
      <integer name="list_item_level_incognito">2</integer>
  
@@ -50,16 +50,16 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
 @@ -6,6 +6,10 @@
- <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
  
 +    <org.chromium.chrome.browser.preferences.HyperlinkPreference
 +        android:key="proxy"
 +        android:title="@string/proxy_title"
 +        app:url="@string/proxy_url" />
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
-         android:key="can_make_payment"
-         android:title="@string/can_make_payment_title"
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="search_suggestions"
+         android:title="@string/search_suggestions_title"
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -75,15 +75,19 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -211,6 +211,8 @@
-         <include name="IDR_SNIPPETS_INTERNALS_MOJOM_LITE_JS" file="${root_gen_dir}\chrome\browser\ui\webui\snippets_internals\snippets_internals.mojom-lite.js" use_base_dir="false" type="BINDATA" compress="gzip" />
+@@ -202,6 +202,12 @@
+         <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
        </if>
-       <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervised_user_internals\supervised_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
+ 
++      <!-- Bromite Proxy Configuration UI. -->
++      <if expr="is_android">
 +        <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
 +        <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
-       <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervised_user_internals\supervised_user_internals.css" compress="gzip" type="BINDATA" />
-       <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervised_user_internals\supervised_user_internals.js" compress="gzip" type="BINDATA" />
-       <if expr="enable_hangout_services_extension">
++      </if>
++
+       <!-- App Management. -->
+       <if expr="not is_android">
+         <include name="IDR_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js" use_base_dir="false" type="BINDATA" />
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
@@ -505,7 +509,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -271,6 +271,8 @@ jumbo_split_static_library("ui") {
+@@ -275,6 +275,8 @@ jumbo_split_static_library("ui") {
      "webui/metrics_handler.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -517,15 +521,15 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -54,6 +54,7 @@
- #include "chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.h"
+@@ -55,6 +55,7 @@
+ #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
  #include "chrome/browser/ui/webui/policy_ui.h"
  #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
  #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
  #include "chrome/browser/ui/webui/settings/settings_ui.h"
  #include "chrome/browser/ui/webui/settings_utils.h"
-@@ -386,6 +387,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -413,6 +414,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<MemoryInternalsUI>;
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
@@ -602,7 +606,7 @@ new file mode 100644
 +  content::WebUIDataSource* source =
 +      content::WebUIDataSource::Create(chrome::kChromeUIProxyConfigHost);
 +
-+  source->SetJsonPath("strings.js");
++  source->UseStringsJs();
 +  source->AddResourcePath("proxy_config.js", IDR_PROXY_CONFIG_JS);
 +  source->SetDefaultResource(IDR_PROXY_CONFIG_HTML);
 +  return source;
@@ -977,7 +981,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -180,6 +180,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
+@@ -189,6 +189,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
  const char kChromeUINativeScheme[] = "chrome-native";
  const char kChromeUIOfflineInternalsHost[] = "offline-internals";
  const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics";
@@ -986,15 +990,15 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
  const char kChromeUISnippetsInternalsHost[] = "snippets-internals";
  const char kChromeUIWebApksHost[] = "webapks";
  #endif
-@@ -439,6 +441,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
+@@ -456,6 +458,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
        kResetSubPage,
        kSmartLockSettingsSubPage,
        kSmbSharesSubPage,
 +      kChromeUIProxyConfigHost,
        kStorageSubPage,
        kStylusSubPage,
-       // sync is both an OS and browser sub page, but prefer the OS version
-@@ -538,6 +541,7 @@ const char* const kChromeHostURLs[] = {
+       kSwitchAccessSubPage,
+@@ -556,6 +559,7 @@ const char* const kChromeHostURLs[] = {
  #if !defined(OS_ANDROID)
  #if !defined(OS_CHROMEOS)
      kChromeUIAppLauncherPageHost,
@@ -1005,7 +1009,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -108,6 +108,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -110,6 +110,8 @@ extern const char kChromeUIMemoryInternalsHost[];
  extern const char kChromeUINTPTilesInternalsHost[];
  extern const char kChromeUINaClHost[];
  extern const char kChromeUINetExportHost[];

build/patches/Add-an-always-incognito-mode.patch

@@ -30,16 +30,18 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -28,4 +28,9 @@
-         android:title="@string/clear_browsing_data_title"
-         android:summary="@string/clear_browsing_data_summary"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+@@ -20,6 +20,11 @@
+         android:title="@string/preload_pages_title"
+         android:summary="@string/preload_pages_summary"
+         android:persistent="false" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="always_incognito"
 +        android:title="@string/always_incognito_title"
 +        android:summary="@string/always_incognito_summary"
 +        android:defaultValue="false" />
- </android.support.v7.preference.PreferenceScreen>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:key="do_not_track"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 new file mode 100644
 --- /dev/null
@@ -130,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
      /**
       * Timeout in ms for reading PartnerBrowserCustomizations provider.
       */
-@@ -1659,6 +1661,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1650,6 +1652,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -151,16 +153,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
  import org.chromium.base.ObservableSupplier;
  import org.chromium.base.VisibleForTesting;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -56,6 +57,8 @@ class AppMenuHandlerImpl implements AppMenuHandler, StartStopWithNativeObserver,
-     private @Nullable Callback<OverviewModeBehavior> mOverviewModeSupplierCallback;
+@@ -57,6 +58,8 @@ class AppMenuHandlerImpl
      private @Nullable OverviewModeBehavior mOverviewModeBehavior;
+     private OverviewModeBehavior.OverviewModeObserver mOverviewModeObserver;
  
 +    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
 +
      /**
       * The resource id of the menu item to highlight when the menu next opens. A value of
       * {@code null} means no item will be highlighted.  This value will be cleared after the menu is
-@@ -237,6 +240,14 @@ class AppMenuHandlerImpl implements AppMenuHandler, StartStopWithNativeObserver,
+@@ -267,6 +270,14 @@ class AppMenuHandlerImpl
          if (mDelegate.shouldShowHeader(appRect.height())) {
              headerResourceId = mDelegate.getHeaderResourceId();
          }
@@ -184,9 +186,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  import org.chromium.base.metrics.RecordHistogram;
 +import org.chromium.base.ContextUtils;
  import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ChromeFeatureList;
  import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel;
- import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
-@@ -44,6 +45,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -46,6 +47,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
      private static final String TAG = "CCMenuPopulator";
      private final ContextMenuItemDelegate mDelegate;
      private final @ContextMenuMode int mMode;
@@ -194,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  
      /**
       * Defines the Groups of each Context Menu Item
-@@ -270,7 +272,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -298,7 +300,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
              if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL
                      && !isEmptyUrl(params.getUrl())
                      && UrlUtilities.isAcceptedScheme(params.getUrl())) {
@@ -211,8 +213,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -7,8 +7,10 @@ package org.chromium.chrome.browser.tabmodel;
- import android.content.Intent;
+@@ -8,8 +8,10 @@ import android.content.Intent;
+ import android.support.annotation.Nullable;
  import android.text.TextUtils;
  
 +import org.chromium.base.ContextUtils;
@@ -222,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.ChromeActivity;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.ServiceTabLauncher;
-@@ -16,6 +18,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+@@ -17,6 +19,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabAssociatedApp;
  import org.chromium.chrome.browser.tab.TabBuilder;
@@ -230,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.tab.TabDelegateFactory;
  import org.chromium.chrome.browser.tab.TabParentIntent;
  import org.chromium.chrome.browser.tab.TabRedirectHandler;
-@@ -36,6 +39,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -37,6 +40,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
  
      private final ChromeActivity mActivity;
      private final boolean mIncognito;
@@ -238,7 +240,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  
      private WindowAndroid mNativeWindow;
      private TabModel mTabModel;
-@@ -46,6 +50,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -47,6 +51,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
          mActivity = activity;
          mNativeWindow = nativeWindow;
          mIncognito = incognito;
@@ -250,7 +252,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
      }
  
      @Override
-@@ -170,6 +179,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -171,6 +180,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                          tab.getWebContents());
              }
  
@@ -261,7 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
              mTabModel.addTab(tab, position, type);
              return tab;
          } finally {
-@@ -198,6 +211,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -199,6 +212,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                            .setWindow(mNativeWindow)
                            .setLaunchType(type)
                            .build();
@@ -273,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
          tab.initialize(webContents, delegateFactory, !openInForeground, null, false);
          mTabModel.addTab(tab, position, type);
          return true;
-@@ -241,7 +259,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -242,7 +260,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
       */
      public Tab launchUrlFromExternalApp(String url, String referer, String headers,
              String appId, boolean forceNewTab, Intent intent, long intentTimestamp) {
@@ -281,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
          boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName());
  
          // If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is
-@@ -306,6 +323,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -307,6 +324,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                  state.isIncognito());
          tab.initialize(null, createDefaultTabDelegateFactory(), !selectTab, state, false);
          assert state.isIncognito() == mIncognito;
@@ -296,7 +298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -692,6 +692,14 @@ CHAR-LIMIT guidelines:
+@@ -689,6 +689,14 @@ CHAR-LIMIT guidelines:
          Search and site suggestions disabled
        </message>
  

build/patches/Add-bookmark-import-export-actions.patch

@@ -16,7 +16,7 @@ Completely remove contacts picker permission from the file dialog
  .../chrome/browser/bookmarks/BookmarkPage.java     |   1 +
  .../java/strings/android_chrome_strings.grd        |   6 +
  chrome/browser/BUILD.gn                            |   8 +-
- .../browser/android/bookmarks/bookmark_bridge.cc   | 216 +++++++++++++++++++++
+ .../browser/android/bookmarks/bookmark_bridge.cc   | 215 +++++++++++++++++++++
  chrome/browser/android/bookmarks/bookmark_bridge.h |  20 +-
  chrome/browser/importer/profile_writer.cc          |  12 ++
  chrome/browser/importer/profile_writer.h           |   6 +
@@ -28,7 +28,7 @@ Completely remove contacts picker permission from the file dialog
  ui/shell_dialogs/select_file_dialog.h              |   2 +
  ui/shell_dialogs/select_file_dialog_android.cc     |   6 +
  ui/shell_dialogs/select_file_dialog_android.h      |   2 +
- 22 files changed, 447 insertions(+), 14 deletions(-)
+ 22 files changed, 446 insertions(+), 14 deletions(-)
 
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
-@@ -86,6 +86,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -90,6 +90,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          } else if (menuItem.getItemId() == R.id.search_menu_id) {
              mDelegate.openSearchUI();
              return true;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          }
  
          SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
-@@ -129,6 +135,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -141,6 +147,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      void showLoadingUi() {
          setTitle(null);
          setNavigationButton(NAVIGATION_BUTTON_NONE);
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          getMenu().findItem(R.id.search_menu_id).setVisible(false);
          getMenu().findItem(R.id.edit_menu_id).setVisible(false);
      }
-@@ -138,6 +146,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -150,6 +158,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          super.showNormalView();
  
          if (mDelegate == null) {
@@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
              getMenu().findItem(R.id.search_menu_id).setVisible(false);
              getMenu().findItem(R.id.edit_menu_id).setVisible(false);
          }
-@@ -170,6 +180,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -182,6 +192,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      public void onFolderStateSet(BookmarkId folder) {
          mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
  
@@ -169,9 +169,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import android.text.TextUtils;
  import android.util.Pair;
  
-@@ -13,11 +17,15 @@ import org.chromium.base.ObserverList;
- import org.chromium.base.VisibleForTesting;
+@@ -14,11 +18,15 @@ import org.chromium.base.VisibleForTesting;
  import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.annotations.NativeMethods;
  import org.chromium.base.metrics.RecordHistogram;
 +import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 +import org.chromium.chrome.browser.IntentHandler;
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  
  import java.util.ArrayList;
  import java.util.List;
-@@ -506,6 +514,24 @@ public class BookmarkBridge {
+@@ -525,6 +533,24 @@ public class BookmarkBridge {
      }
  
      /**
@@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +     */
 +    public void importBookmarks(WindowAndroid window) {
 +        assert mIsNativeBookmarkModelLoaded;
-+        nativeImportBookmarks(mNativeBookmarkBridge, window);
++        BookmarkBridgeJni.get().importBookmarks(mNativeBookmarkBridge, BookmarkBridge.this, window);
 +    }
 +
 +    /**
@@ -203,14 +203,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +     */
 +    public void exportBookmarks() {
 +        assert mIsNativeBookmarkModelLoaded;
-+        nativeExportBookmarks(mNativeBookmarkBridge);
++        BookmarkBridgeJni.get().exportBookmarks(mNativeBookmarkBridge, BookmarkBridge.this);
 +    }
 +
 +    /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       * @param query Keyword used for searching bookmarks.
       * @param maxNumberOfResult Maximum number of result to fetch.
-@@ -848,6 +874,24 @@ public class BookmarkBridge {
+@@ -877,6 +903,24 @@ public class BookmarkBridge {
          depthList.add(depth);
      }
  
@@ -235,15 +235,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
          List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
          for (int i = 0; i < left.length; i++) {
-@@ -914,6 +958,8 @@ public class BookmarkBridge {
-             boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
-     private native BookmarkId nativeGetChildAt(long nativeBookmarkBridge, long id, int type,
-             int index);
-+    private native void nativeImportBookmarks(long nativeBookmarkBridge, WindowAndroid window);
-+    private native void nativeExportBookmarks(long nativeBookmarkBridge);
-     private native int nativeGetTotalBookmarkCount(long nativeBookmarkBridge, long id, int type);
-     private native void nativeSetBookmarkTitle(long nativeBookmarkBridge, long id, int type,
-             String title);
+@@ -943,6 +987,8 @@ public class BookmarkBridge {
+         int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
+         void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
+                 boolean getFolders, boolean getBookmarks, List<BookmarkId> bookmarksList);
++        void importBookmarks(long nativeBookmarkBridge, BookmarkBridge caller, WindowAndroid window);
++        void exportBookmarks(long nativeBookmarkBridge, BookmarkBridge caller);
+         BookmarkId getChildAt(
+                 long nativeBookmarkBridge, BookmarkBridge caller, long id, int type, int index);
+         int getTotalBookmarkCount(
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
@@ -291,7 +291,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private BookmarkUndoController mUndoController;
      private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
      private BasicNativePage mNativePage;
-@@ -358,6 +361,13 @@ public class BookmarkManager
+@@ -362,6 +365,13 @@ public class BookmarkManager
      }
  
      /**
@@ -336,7 +336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -233,6 +233,12 @@ CHAR-LIMIT guidelines:
+@@ -236,6 +236,12 @@ CHAR-LIMIT guidelines:
        <message name="IDS_SEARCH" desc="The label for a search button.">
          Search
        </message>
@@ -352,7 +352,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -170,6 +170,10 @@ jumbo_split_static_library("browser") {
+@@ -174,6 +174,10 @@ jumbo_split_static_library("browser") {
      "bitmap_fetcher/bitmap_fetcher_service.h",
      "bitmap_fetcher/bitmap_fetcher_service_factory.cc",
      "bitmap_fetcher/bitmap_fetcher_service_factory.h",
@@ -363,7 +363,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
      "bookmarks/chrome_bookmark_client.cc",
-@@ -2921,8 +2925,6 @@ jumbo_split_static_library("browser") {
+@@ -3007,8 +3011,6 @@ jumbo_split_static_library("browser") {
        "badging/badge_manager_factory.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -372,7 +372,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "certificate_viewer.h",
        "chrome_browser_field_trials_desktop.cc",
        "chrome_browser_field_trials_desktop.h",
-@@ -3034,8 +3036,6 @@ jumbo_split_static_library("browser") {
+@@ -3115,8 +3117,6 @@ jumbo_split_static_library("browser") {
        "importer/importer_uma.h",
        "importer/in_process_importer_bridge.cc",
        "importer/in_process_importer_bridge.h",
@@ -384,7 +384,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
 --- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
 +++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
-@@ -38,6 +38,21 @@
+@@ -41,6 +41,21 @@
  #include "components/undo/undo_manager.h"
  #include "content/public/browser/browser_thread.h"
  
@@ -406,7 +406,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
  using base::android::AttachCurrentThread;
  using base::android::ConvertUTF8ToJavaString;
  using base::android::ConvertUTF16ToJavaString;
-@@ -55,6 +70,57 @@ using bookmarks::BookmarkPermanentNode;
+@@ -58,6 +73,56 @@ using bookmarks::BookmarkPermanentNode;
  using bookmarks::BookmarkType;
  using content::BrowserThread;
  
@@ -434,8 +434,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  // that we support.
 +  if (url.SchemeIs(content::kChromeUIScheme) ||
 +      url.SchemeIs(url::kAboutScheme)) {
-+    if (url.host_piece() == chrome::kChromeUIUberHost ||
-+        url.host_piece() == chrome::kChromeUIAboutHost)
++    if (url.host_piece() == chrome::kChromeUIAboutHost)
 +      return true;
 +
 +    GURL fixed_url(url_formatter::FixupURL(url.spec(), std::string()));
@@ -464,7 +463,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
  namespace {
  
  class BookmarkTitleComparer {
-@@ -131,6 +197,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -134,6 +199,10 @@ BookmarkBridge::~BookmarkBridge() {
    bookmark_model_->RemoveObserver(this);
    if (partner_bookmarks_shim_)
      partner_bookmarks_shim_->RemoveObserver(this);
@@ -475,7 +474,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -444,6 +514,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -475,6 +544,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -631,7 +630,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h
 --- a/chrome/browser/android/bookmarks/bookmark_bridge.h
 +++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
-@@ -13,6 +13,8 @@
+@@ -16,6 +16,8 @@
  #include "components/bookmarks/browser/base_bookmark_model_observer.h"
  #include "components/bookmarks/common/android/bookmark_id.h"
  #include "components/prefs/pref_change_registrar.h"
@@ -640,7 +639,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
  
  namespace bookmarks {
  class BookmarkModel;
-@@ -26,7 +28,8 @@ class Profile;
+@@ -29,7 +31,8 @@ class Profile;
  // bookmark page. This fetches the bookmarks, title, urls, folder
  // hierarchy.
  class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
@@ -650,7 +649,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
   public:
    BookmarkBridge(JNIEnv* env,
                   const base::android::JavaRef<jobject>& obj,
-@@ -36,6 +39,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -39,6 +42,12 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    bool IsDoingExtensiveChanges(JNIEnv* env,
                                 const base::android::JavaParamRef<jobject>& obj);
  
@@ -660,10 +659,10 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
 +                    void* params) override;
 +  void FileSelectionCanceled(void* params) override;
 +
-   jboolean IsEditBookmarksEnabled(
-       JNIEnv* env,
-       const base::android::JavaParamRef<jobject>& obj);
-@@ -122,6 +131,13 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   jboolean IsEditBookmarksEnabled(JNIEnv* env);
+ 
+   void LoadEmptyPartnerBookmarkShimForTesting(
+@@ -129,6 +138,13 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
                               jlong id,
                               jint type);
  
@@ -677,7 +676,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
    void SetBookmarkTitle(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          jlong id,
-@@ -267,12 +283,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -274,12 +290,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
  
    Profile* profile_;
@@ -753,7 +752,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -445,6 +445,9 @@ static_library("common") {
+@@ -440,6 +440,9 @@ static_library("common") {
      sources += [
        "media/chrome_media_drm_bridge_client.cc",
        "media/chrome_media_drm_bridge_client.h",
@@ -766,7 +765,7 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -64,8 +64,6 @@ static_library("utility") {
+@@ -66,8 +66,6 @@ static_library("utility") {
  
    if (!is_android) {
      sources += [
@@ -775,7 +774,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
        "importer/bookmarks_file_importer.cc",
        "importer/bookmarks_file_importer.h",
        "importer/edge_database_reader_win.cc",
-@@ -163,6 +161,11 @@ static_library("utility") {
+@@ -160,6 +158,11 @@ static_library("utility") {
      }
    }
  
@@ -896,7 +895,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
-@@ -32,6 +32,7 @@ import org.chromium.base.task.PostTask;
+@@ -33,6 +33,7 @@ import org.chromium.base.task.PostTask;
  import org.chromium.base.task.TaskTraits;
  import org.chromium.ui.PhotoPickerListener;
  import org.chromium.ui.R;
@@ -904,7 +903,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
  import org.chromium.ui.UiUtils;
  
  import java.io.File;
-@@ -51,6 +52,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -52,6 +53,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
      private static final String IMAGE_TYPE = "image/";
      private static final String VIDEO_TYPE = "video/";
      private static final String AUDIO_TYPE = "audio/";
@@ -912,7 +911,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*";
      private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*";
      private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*";
-@@ -129,6 +131,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -130,6 +132,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          mFileTypes = fileTypes;
      }
  
@@ -924,7 +923,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      /**
       * Creates and starts an intent based on the passed fileTypes and capture value.
       * @param fileTypes MIME types requested (i.e. "image/*")
-@@ -156,7 +163,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -157,7 +164,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          List<String> missingPermissions = new ArrayList<>();
          String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
          boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -933,7 +932,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
              if (!window.hasPermission(storagePermission)) missingPermissions.add(storagePermission);
          } else {
              if (((mSupportsImageCapture && shouldShowImageTypes())
-@@ -184,7 +191,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -185,7 +192,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                          }
  
                          // TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
@@ -942,7 +941,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                              if (permissions.length != requestPermissions.length) {
                                  throw new RuntimeException(
                                          String.format("Permissions arrays misaligned: %d != %d",
-@@ -198,7 +205,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -199,7 +206,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                              }
                          }
  
@@ -951,7 +950,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                              onFileNotSelected();
                              return;
                          }
-@@ -347,6 +354,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -348,6 +355,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
              }
              if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
          }
@@ -959,7 +958,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
          return mimeTypes;
      }
  
-@@ -619,6 +627,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -625,6 +633,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          return countAcceptTypesFor(specificType) > 0;
      }
  

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -13,7 +13,7 @@ Subject: Add custom tab intents privacy option
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -18,6 +18,9 @@
+@@ -14,6 +14,9 @@
      <item name="top_controls_show_threshold" format="float" type="dimen">0.5</item>
      <item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item>
  
@@ -26,22 +26,22 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -15,6 +15,11 @@
-         android:title="@string/preload_pages_title"
-         android:summary="@string/preload_pages_summary"
-         android:persistent="false" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+@@ -29,6 +29,11 @@
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:key="do_not_track"
+         android:title="@string/do_not_track_title" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="allow_custom_tab_intents"
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
-     <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
-         android:key="usage_stats_reporting"
-         android:title="@string/usage_stats_setting_title"
+     <android.support.v7.preference.Preference
+         android:key="contextual_search"
+         android:title="@string/contextual_search_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
  import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.profiles.Profile;
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.util.FeatureUtilities;
-@@ -271,6 +272,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -273,6 +274,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -60,32 +60,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -39,6 +39,8 @@ public class PrivacyPreferences
+@@ -43,6 +43,8 @@ public class PrivacyPreferences
  
-     private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
  
 +    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
 +
      @Override
      public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
          PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
-@@ -69,6 +71,10 @@ public class PrivacyPreferences
-         if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-             PrefServiceBridge.getInstance().setBoolean(
-                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+@@ -101,6 +103,10 @@ public class PrivacyPreferences
+             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 +        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
-         }
-@@ -98,6 +104,11 @@ public class PrivacyPreferences
+         } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
+             PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
+         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+@@ -141,6 +147,11 @@ public class PrivacyPreferences
                      prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
-+        ChromeBaseCheckBoxPreferenceCompat allowCustomTabIntentsPref =
-+                (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
++        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
 +        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
 +        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
@@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3965,6 +3965,13 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -4020,6 +4020,13 @@ The site does NOT gain access to the camera. The camera images are only visible
        <message name="IDS_INCOGNITO_DISCLOSURE_CHECKBOX_TEXT" desc="Text for checkbox inviting to close incognito tabs in incognito disclosure dialog." translateable="false">
           Close other incognito tabs
        </message>

build/patches/Add-exit-menu-item.patch

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 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
-@@ -2148,6 +2148,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2137,6 +2137,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      new AddToHomescreenManager(this, currentTab);
              addToHomescreenManager.start();
              RecordUserAction.record("MobileMenuAddToHomescreen");
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2959,6 +2959,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2947,6 +2947,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
          Settings
        </message>

build/patches/Add-flag-to-configure-maximum-connections-per-host.patch

@@ -12,14 +12,14 @@ with limited CPU/memory resources and it is disabled by default.
  .../common/network_features.cc                          |  3 +++
  .../common/network_features.h                           |  4 ++++
  .../common/network_switch_list.h                        |  4 ++++
- components/url_formatter/top_domains/BUILD.gn           |  1 +
+ .../url_formatter/spoof_checks/top_domains/BUILD.gn     |  1 +
  net/socket/client_socket_pool_manager.cc                | 17 +++++++++++++++++
  8 files changed, 44 insertions(+)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -593,6 +593,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -669,6 +669,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
       net::kEffectiveConnectionType4G},
  };
  
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  // Ensure that all effective connection types returned by Network Quality
  // Estimator (NQE) are also exposed via flags.
  static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2363,6 +2368,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2538,6 +2543,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kPassiveDocumentEventListenersName,
       flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1219,6 +1219,10 @@ const char kLookalikeUrlNavigationSuggestionsDescription[] =
+@@ -1240,6 +1240,10 @@ const char kLookalikeUrlNavigationSuggestionsDescription[] =
  const char kMarkHttpAsName[] = "Mark non-secure origins as non-secure";
  const char kMarkHttpAsDescription[] = "Change the UI treatment for HTTP pages";
  
@@ -58,7 +58,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -742,6 +742,9 @@ extern const char kMarkHttpAsWarning[];
+@@ -761,6 +761,9 @@ extern const char kMarkHttpAsWarning[];
  extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
  extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
  
@@ -71,16 +71,14 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
 --- a/components/network_session_configurator/common/network_features.cc
 +++ b/components/network_session_configurator/common/network_features.cc
-@@ -8,6 +8,9 @@
+@@ -8,4 +8,7 @@
  
  namespace features {
  
 +const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
- const char kDnsOverHttpsChoiceDefault[] = "Disabled",
-                  kDnsOverHttpsChoiceGoogle[] = "Google",
-                  kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
+ }  // namespace features
 diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
 --- a/components/network_session_configurator/common/network_features.h
 +++ b/components/network_session_configurator/common/network_features.h
@@ -92,9 +90,9 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 +                 kMaxConnectionsPerHostChoice6[],
 +                 kMaxConnectionsPerHostChoice15[];
 +
- // DNS over HTTPS server endpoint choices
- // (https://tools.ietf.org/id/draft-ietf-doh-dns-over-https-12.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kDnsOverHttps;
+ }  // namespace features
+ 
+ #endif  // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
@@ -109,10 +107,10 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
  // Ignores certificate-related errors.
  NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors")
  
-diff --git a/components/url_formatter/top_domains/BUILD.gn b/components/url_formatter/top_domains/BUILD.gn
---- a/components/url_formatter/top_domains/BUILD.gn
-+++ b/components/url_formatter/top_domains/BUILD.gn
-@@ -76,6 +76,7 @@ executable("make_top_domain_list_for_edit_distance") {
+diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
+--- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
++++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
+@@ -78,6 +78,7 @@ executable("make_top_domain_list_for_edit_distance") {
      "//base",
      "//base:i18n",
      "//third_party/icu",
@@ -123,7 +121,7 @@ diff --git a/components/url_formatter/top_domains/BUILD.gn b/components/url_form
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -19,6 +19,10 @@
+@@ -20,6 +20,10 @@
  #include "net/socket/client_socket_pool.h"
  #include "net/socket/connect_job.h"
  #include "net/ssl/ssl_config.h"
@@ -134,7 +132,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  
  namespace net {
  
-@@ -184,6 +188,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -185,6 +189,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
  int ClientSocketPoolManager::max_sockets_per_group(
      HttpNetworkSession::SocketPoolType pool_type) {
    DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);

build/patches/Add-flag-to-control-video-playback-resume-feature.patch

@@ -4,15 +4,30 @@ Subject: Add flag to control video playback resume feature
 
 Disable it by default on Android as it is everywhere else
 ---
+ chrome/browser/about_flags.cc       | 4 ++++
  chrome/browser/flag_descriptions.cc | 5 +++++
  chrome/browser/flag_descriptions.h  | 3 +++
  media/base/media_switches.cc        | 6 +-----
- 3 files changed, 9 insertions(+), 5 deletions(-)
+ 4 files changed, 13 insertions(+), 5 deletions(-)
 
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1580,6 +1580,10 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-webassembly-threads", flag_descriptions::kEnableWasmThreadsName,
+      flag_descriptions::kEnableWasmThreadsDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebAssemblyThreads)},
++    {"resume-background-video",
++     flag_descriptions::kResumeBackgroundVideoName,
++     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
++     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
+     {"shared-array-buffer", flag_descriptions::kEnableSharedArrayBufferName,
+      flag_descriptions::kEnableSharedArrayBufferDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kSharedArrayBuffer)},
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -848,6 +848,11 @@ const char kMemlogStackModeNative[] = "Native";
+@@ -876,6 +876,11 @@ const char kMemlogStackModeNative[] = "Native";
  const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
  const char kMemlogStackModePseudo[] = "Trace events";
  
@@ -27,7 +42,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -501,6 +501,9 @@ extern const char kEnablePortalsDescription[];
+@@ -520,6 +520,9 @@ extern const char kEnablePortalsDescription[];
  extern const char kEnablePictureInPictureName[];
  extern const char kEnablePictureInPictureDescription[];
  

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -3,20 +3,20 @@ Date: Sun, 18 Nov 2018 13:06:49 +0100
 Subject: Add flag to disable IPv6 probes
 
 ---
- chrome/browser/about_flags.cc                 |  5 +++++
- chrome/browser/flag_descriptions.cc           |  4 ++++
- chrome/browser/flag_descriptions.h            |  3 +++
- components/subresource_filter/tools/BUILD.gn  |  6 ++++++
- components/url_formatter/top_domains/BUILD.gn |  3 ++-
- net/dns/host_resolver_manager.cc              | 10 ++++++++--
- services/network/public/cpp/features.cc       |  4 ++++
- services/network/public/cpp/features.h        |  2 ++
+ chrome/browser/about_flags.cc                              |  5 +++++
+ chrome/browser/flag_descriptions.cc                        |  4 ++++
+ chrome/browser/flag_descriptions.h                         |  3 +++
+ components/subresource_filter/tools/BUILD.gn               |  6 ++++++
+ components/url_formatter/spoof_checks/top_domains/BUILD.gn |  3 ++-
+ net/dns/host_resolver_manager.cc                           | 10 ++++++++--
+ services/network/public/cpp/features.cc                    |  4 ++++
+ services/network/public/cpp/features.h                     |  2 ++
  8 files changed, 34 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3037,6 +3037,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3198,6 +3198,11 @@ const FeatureEntry kFeatureEntries[] = {
           kMarkHttpAsFeatureVariations,
           "HTTPReallyBadFinal")},
  
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2394,6 +2394,10 @@ const char kForegroundNotificationManagerDescription[] =
+@@ -2512,6 +2512,10 @@ const char kForegroundNotificationManagerDescription[] =
  const char kHomePageButtonName[] = "Force Enable Home Page Button";
  const char kHomePageButtonDescription[] = "Displays a home button if enabled.";
  
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -504,6 +504,9 @@ extern const char kEnableNewDownloadBackendDescription[];
+@@ -523,6 +523,9 @@ extern const char kEnableNewDownloadBackendDescription[];
  extern const char kEnablePortalsName[];
  extern const char kEnablePortalsDescription[];
  
@@ -85,10 +85,10 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour
      ]
    }
  
-diff --git a/components/url_formatter/top_domains/BUILD.gn b/components/url_formatter/top_domains/BUILD.gn
---- a/components/url_formatter/top_domains/BUILD.gn
-+++ b/components/url_formatter/top_domains/BUILD.gn
-@@ -76,7 +76,8 @@ executable("make_top_domain_list_for_edit_distance") {
+diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
+--- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
++++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
+@@ -78,7 +78,8 @@ executable("make_top_domain_list_for_edit_distance") {
      "//base",
      "//base:i18n",
      "//third_party/icu",
@@ -101,7 +101,7 @@ diff --git a/components/url_formatter/top_domains/BUILD.gn b/components/url_form
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -86,6 +86,7 @@
+@@ -87,6 +87,7 @@
  #include "net/socket/client_socket_factory.h"
  #include "net/socket/datagram_client_socket.h"
  #include "net/url_request/url_request_context.h"
@@ -109,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
  #include "url/url_canon_ip.h"
  
  #if BUILDFLAG(ENABLE_MDNS)
-@@ -3178,8 +3179,13 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -3209,8 +3210,13 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
    bool cached = true;
    if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
        kIPv6ProbePeriodMs) {
@@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -50,6 +50,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -46,6 +46,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
  const base::Feature kThrottleDelayable{"ThrottleDelayable",
                                         base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -142,7 +142,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -18,6 +18,8 @@ extern const base::Feature kNetworkErrorLogging;
+@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging;
  COMPONENT_EXPORT(NETWORK_CPP)
  extern const base::Feature kNetworkService;
  COMPONENT_EXPORT(NETWORK_CPP)

build/patches/Add-flag-to-disable-WebGL.patch

@@ -0,0 +1,53 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 16 Nov 2019 11:18:09 +0100
+Subject: Add flag to disable WebGL
+
+---
+ chrome/browser/about_flags.cc       | 3 +++
+ chrome/browser/flag_descriptions.cc | 4 ++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1364,6 +1364,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kAccelerated2dCanvasName,
+      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
++    {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName,
++     flag_descriptions::kDisableWebGLDescription, kOsAll,
++     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)},
+     {"composited-layer-borders", flag_descriptions::kCompositedLayerBordersName,
+      flag_descriptions::kCompositedLayerBordersDescription, kOsAll,
+      SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -385,6 +385,10 @@ const char kDisableAudioForDesktopShareDescription[] =
+     "With this flag on, desktop share picker window will not let the user "
+     "choose whether to share audio.";
+ 
++const char kDisableWebGLName[] = "Disable all versions of WebGL";
++
++const char kDisableWebGLDescription[] = "Disable all versions of WebGL";
++
+ const char kDisableBestEffortTasksName[] = "Skip best effort tasks";
+ const char kDisableBestEffortTasksDescription[] =
+     "With this flag on, tasks of the lowest priority will not be executed "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -256,6 +256,9 @@ extern const char kDevtoolsExperimentsDescription[];
+ extern const char kDisableAudioForDesktopShareName[];
+ extern const char kDisableAudioForDesktopShareDescription[];
+ 
++extern const char kDisableWebGLName[];
++extern const char kDisableWebGLDescription[];
++
+ extern const char kDisableBestEffortTasksName[];
+ extern const char kDisableBestEffortTasksDescription[];
+ 
+-- 
+2.11.0
+

build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch

@@ -20,25 +20,25 @@ legacy acceleration events.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -2437,6 +2437,12 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-generic-sensor", flag_descriptions::kEnableGenericSensorName,
-      flag_descriptions::kEnableGenericSensorDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kGenericSensor)},
+@@ -1606,6 +1606,12 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
+      flag_descriptions::kGpuRasterizationDescription, kOsAll,
+      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
 +    {"enable-device-motion", flag_descriptions::kEnableDeviceMotionName,
 +     flag_descriptions::kEnableDeviceMotionDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(features::kDeviceMotion)},
 +    {"enable-device-orientation", flag_descriptions::kEnableDeviceOrientationName,
 +     flag_descriptions::kEnableDeviceOrientationDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(features::kDeviceOrientation)},
-     {"enable-generic-sensor-extra-classes",
-      flag_descriptions::kEnableGenericSensorExtraClassesName,
-      flag_descriptions::kEnableGenericSensorExtraClassesDescription, kOsAll,
+     {"enable-oop-rasterization", flag_descriptions::kOopRasterizationName,
+      flag_descriptions::kOopRasterizationDescription, kOsAll,
+      MULTI_VALUE_TYPE(kEnableOopRasterizationChoices)},
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -620,6 +620,14 @@ const char kEnableGenericSensorDescription[] =
-     "Accelerometer, LinearAccelerationSensor, Gyroscope, "
-     "AbsoluteOrientationSensor and RelativeOrientationSensor interfaces.";
+@@ -644,6 +644,14 @@ const char kWinrtSensorsImplementationDescription[] =
+     "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for "
+     "sensors";
  
 +const char kEnableDeviceMotionName[] = "Enable device motion";
 +const char kEnableDeviceMotionDescription[] =
@@ -54,9 +54,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -379,6 +379,12 @@ extern const char kWinrtSensorsImplementationDescription[];
- extern const char kEnableGenericSensorName[];
- extern const char kEnableGenericSensorDescription[];
+@@ -398,6 +398,12 @@ extern const char kEnableTLS13EarlyDataDescription[];
+ extern const char kWinrtSensorsImplementationName[];
+ extern const char kWinrtSensorsImplementationDescription[];
  
 +extern const char kEnableDeviceMotionName[];
 +extern const char kEnableDeviceMotionDescription[];
@@ -83,7 +83,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -667,6 +667,16 @@ const base::Feature kExperimentalProductivityFeatures{
+@@ -689,6 +689,16 @@ const base::Feature kExperimentalProductivityFeatures{
  // TODO(rouslan): Remove this.
  const base::Feature kWebPayments{"WebPayments",
                                   base::FEATURE_ENABLED_BY_DEFAULT};
@@ -103,7 +103,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -156,6 +156,8 @@ CONTENT_EXPORT extern const base::Feature kScriptStreamingOnPreload;
+@@ -157,6 +157,8 @@ CONTENT_EXPORT extern const base::Feature kScriptStreamingOnPreload;
  CONTENT_EXPORT extern const base::Feature kTrustedDOMTypes;
  CONTENT_EXPORT extern const base::Feature kBrowserUseDisplayThreadPriority;
  
@@ -116,18 +116,18 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
 @@ -91,6 +91,8 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableCanvas2dImageChromium(bool);
    BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
+   BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
    BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
    BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool);
    BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
-   BLINK_PLATFORM_EXPORT static void EnableDecodeLossyWebPImagesToYUV(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDecodeJpeg420ImagesToYUV(bool);
 diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
 --- a/third_party/blink/renderer/modules/modules_initializer.cc
 +++ b/third_party/blink/renderer/modules/modules_initializer.cc
-@@ -252,9 +252,12 @@ void ModulesInitializer::InitInspectorAgentSession(
+@@ -244,9 +244,12 @@ void ModulesInitializer::InitInspectorAgentSession(
  void ModulesInitializer::OnClearWindowObjectInMainWorld(
      Document& document,
      const Settings& settings) const {
@@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -144,6 +144,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
+@@ -160,6 +160,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
    RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
  }
  
@@ -164,7 +164,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1064,6 +1064,14 @@
+@@ -1128,6 +1128,14 @@
        status: "experimental",
      },
      {

build/patches/Add-menu-option-to-toggle-ad-blocker.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sat, 14 Sep 2019 10:19:07 +0200
-Subject: Add global menu entry to toggle AdBlocker
+Subject: Add menu option to toggle ad blocker
 
 ---
  chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
@@ -58,7 +58,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 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
-@@ -2170,6 +2170,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2159,6 +2159,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              RecordUserAction.record("MobileMenuRequestEnableJavascript");
          } else if (id == R.id.reader_mode_prefs_id) {
              DomDistillerUIUtils.openSettings(currentTab.getWebContents());
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1709,6 +1709,14 @@ public class ChromeTabbedActivity
+@@ -1757,6 +1757,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
                  reportNewTabShortcutUsed(true);
                  getTabCreator(true).launchNTP();
              }
@@ -94,15 +94,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -27,6 +27,7 @@ import org.chromium.chrome.R;
+@@ -26,6 +26,7 @@ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
- import org.chromium.chrome.browser.ChromeFeatureList;
  import org.chromium.chrome.browser.ChromeSwitches;
 +import org.chromium.chrome.browser.ContentSettingsType;
  import org.chromium.chrome.browser.ShortcutHelper;
  import org.chromium.chrome.browser.banners.AppBannerManager;
  import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-@@ -225,6 +226,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -224,6 +225,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
              // Prepare translate menu button.
              prepareTranslateMenuItem(menu, currentTab);
  
@@ -111,14 +111,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
              // Hide 'Add to homescreen' for the following:
              // * chrome:// pages - Android doesn't know how to direct those URLs.
              // * incognito pages - To avoid problems where users create shortcuts in incognito
-@@ -300,6 +303,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -299,6 +302,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                  PrefServiceBridge.getInstance().isIncognitoModeManaged());
      }
  
 +     /**
-+     * Updates the enable AdBlock item's state.
++     * Updates the ad blocker item's state.
 +     *
-+     * @param menu {@link Menu} for enable adblock
++     * @param menu {@link Menu} to enable ad blocker
 +     * @param currentTab      Current tab being displayed.
 +     */
 +    protected void updateEnableAdBlockMenuItem(
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
 +
 +
-+        // Hide enable adblock on all chrome:// pages except for the NTP.
++        // Hide Block ads on all chrome:// pages except for the NTP.
 +        String url = currentTab.getUrl();
 +        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
 +                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +
 +        boolean adBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
 +
-+        // Mark the checkbox if adblock is globally activate.
++        // Mark the checkbox if ad blocker is globally activated.
 +        enableMenuCheck.setChecked(adBlockEnabled);
 +
 +        // This title doesn't seem to be displayed by Android, but it is used to set up
@@ -170,19 +170,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2964,6 +2964,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2952,6 +2952,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
          Turn on Request desktop site
        </message>
 +
-+      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable AdBlock engine for the page. [CHAR-LIMIT=27]">
-+        Enable AdBlock
++      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable ad blocker engine for the page. [CHAR-LIMIT=27]">
++        Block ads
 +      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
-+        Turn off AdBlock
++      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Block ads is selected.">
++        Turn off ad blocking
 +      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
-+        Turn on AdBlock
++      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Block ads is unselected.">
++        Turn on ad blocking
 +      </message>
 +
        <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">

build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch

@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 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
-@@ -2160,6 +2160,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2149,6 +2149,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent(
                      !usingDesktopUserAgent, reloadOnChange);
              RecordUserAction.record("MobileMenuRequestDesktopSite");
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1751,6 +1751,14 @@ public class ChromeTabbedActivity
+@@ -1802,6 +1802,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -110,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -242,6 +242,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -241,6 +241,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
  
              updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
  
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
              // Only display reader mode settings menu option if the current page is in reader mode.
              menu.findItem(R.id.reader_mode_prefs_id)
                      .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -437,6 +439,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -432,6 +434,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          }
      }
  
@@ -177,13 +177,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2944,6 +2944,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2932,6 +2932,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
          Find in page
        </message>
 +
 +      <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
-+        Enable JavaScript
++        JavaScript
 +      </message>
 +      <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
 +        Turn off JavaScript

build/patches/Add-option-to-configure-the-ad-blocker-filters-URL.patch

@@ -0,0 +1,516 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 5 Dec 2019 22:41:25 +0100
+Subject: Add option to configure the ad blocker filters URL
+
+---
+ chrome/android/chrome_java_sources.gni             |  2 +
+ chrome/android/java/res/layout/adblock_editor.xml  | 65 ++++++++++++++++
+ chrome/android/java/res/values/values.xml          |  2 +
+ .../android/java/res/xml/adblock_preferences.xml   | 25 ++++++
+ chrome/android/java/res/xml/main_preferences.xml   | 11 ++-
+ .../chrome/browser/preferences/AdBlockEditor.java  | 91 ++++++++++++++++++++++
+ .../browser/preferences/AdBlockPreferences.java    | 53 +++++++++++++
+ .../chrome/browser/util/FeatureUtilities.java      | 10 +++
+ .../java/strings/android_chrome_strings.grd        | 14 ++++
+ chrome/app/generated_resources.grd                 | 10 +++
+ chrome/browser/android/feature_utilities.cc        |  8 ++
+ chrome/browser/browser_process_impl.cc             |  3 +-
+ .../browser/net/system_network_context_manager.cc  |  3 +
+ chrome/common/pref_names.cc                        |  3 +
+ chrome/common/pref_names.h                         |  1 +
+ .../component_updater/adblock_updater_service.cc   |  6 +-
+ .../component_updater/adblock_updater_service.h    |  3 +-
+ 17 files changed, 302 insertions(+), 8 deletions(-)
+ create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
+ create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
+
+diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
+--- a/chrome/android/chrome_java_sources.gni
++++ b/chrome/android/chrome_java_sources.gni
+@@ -1266,6 +1266,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java",
+   "java/src/org/chromium/chrome/browser/preferences/Preferences.java",
+   "java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java",
++  "java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java",
++  "java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java",
+   "java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java",
+   "java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java",
+   "java/src/org/chromium/chrome/browser/preferences/SearchUtils.java",
+diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/java/res/layout/adblock_editor.xml
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/res/layout/adblock_editor.xml
+@@ -0,0 +1,65 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright 2015 The Chromium Authors. All rights reserved.
++     Use of this source code is governed by a BSD-style license that can be
++     found in the LICENSE file. -->
++
++<FrameLayout
++    xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:app="http://schemas.android.com/apk/res-auto"
++    xmlns:tools="http://schemas.android.com/tools"
++    android:layout_width="match_parent"
++    android:layout_height="match_parent" >
++
++    <ScrollView
++        android:layout_width="match_parent"
++        android:layout_height="match_parent"
++        android:id="@+id/scroll_view"
++        android:fillViewport="true" >
++
++        <LinearLayout
++            android:layout_width="match_parent"
++            android:layout_height="wrap_content"
++            android:orientation="vertical"
++            android:focusableInTouchMode="true" >
++
++            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
++                android:id="@+id/adblock_url"
++                style="@style/PreferenceScreenLayout"
++                android:layout_width="match_parent"
++                android:layout_height="wrap_content" >
++                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
++                <EditText
++                    tools:ignore="Autofill"
++                    android:id="@+id/adblock_url_edit"
++                    android:layout_width="match_parent"
++                    android:layout_height="wrap_content"
++                    android:inputType="textUri"
++                    android:singleLine="true"
++                    android:hint="@string/options_adblock_edit_label" />
++            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
++
++            <Space style="@style/ButtonBarTopSpacer" />
++            <View style="@style/ButtonBarTopDivider" />
++
++            <LinearLayout style="@style/ButtonBar" >
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/adblock_reset"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/reset" />
++
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/adblock_cancel"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/cancel" />
++
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/adblock_save"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/save" />
++            </LinearLayout>
++        </LinearLayout>
++    </ScrollView>
++
++    <include layout="@layout/preferences_action_bar_shadow"/>
++
++</FrameLayout>
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
++++ b/chrome/android/java/res/values/values.xml
+@@ -68,6 +68,8 @@
+     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
+     <string name="manage_space_activity"></string>
+ 
++    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>
++
+     <!-- Value for scaleX to mirror drawables correctly for LTR / RTL layouts. -->
+     <integer name="automirror_scale_x_reverse">-1</integer>
+ 
+diff --git a/chrome/android/java/res/xml/adblock_preferences.xml b/chrome/android/java/res/xml/adblock_preferences.xml
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/res/xml/adblock_preferences.xml
+@@ -0,0 +1,25 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright 2015 The Chromium Authors. All rights reserved.
++     Use of this source code is governed by a BSD-style license that can be
++     found in the LICENSE file. -->
++
++<PreferenceScreen
++    xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:app="http://schemas.android.com/apk/res-auto">
++
++    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
++        android:key="adblock_switch"
++        android:summaryOn="@string/text_on"
++        android:summaryOff="@string/text_off" />
++
++    <org.chromium.chrome.browser.preferences.HyperlinkPreference
++        android:key="adblock_help"
++        android:title="@string/adblock_help"
++        app:url="@string/adblock_help_url" />
++
++    <Preference
++        android:key="adblock_edit"
++        android:title="@string/options_adblock_edit_label"
++        android:fragment="org.chromium.chrome.browser.preferences.AdBlockEditor" />
++
++</PreferenceScreen>
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
++++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -61,19 +61,24 @@
+         android:order="13"
+         android:title="@string/prefs_privacy"/>
+     <Preference
++        android:fragment="org.chromium.chrome.browser.preferences.AdBlockPreferences"
++        android:key="adblock"
++        android:order="14"
++        android:title="@string/prefs_adblock"/>
++    <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.AccessibilityPreferences"
+         android:key="accessibility"
+-        android:order="14"
++        android:order="15"
+         android:title="@string/prefs_accessibility"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SiteSettingsPreferences"
+         android:key="content_settings"
+-        android:order="15"
++        android:order="16"
+         android:title="@string/prefs_site_settings"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.preferences.languages.LanguagesPreferences"
+         android:key="languages"
+-        android:order="16"
++        android:order="17"
+         android:title="@string/prefs_languages"/>
+     <org.chromium.chrome.browser.preferences.ChromeBasePreference
+         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
+@@ -0,0 +1,91 @@
++// Copyright 2015 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++package org.chromium.chrome.browser.preferences;
++
++import android.os.Bundle;
++import android.support.v4.app.Fragment;
++import android.text.Editable;
++import android.text.TextWatcher;
++import android.view.LayoutInflater;
++import android.view.View;
++import android.view.ViewGroup;
++import android.widget.Button;
++import android.widget.EditText;
++
++import org.chromium.chrome.browser.util.FeatureUtilities;
++import org.chromium.chrome.R;
++import org.chromium.components.url_formatter.UrlFormatter;
++
++/**
++ * Provides the Java-UI for editing the DNS-over-HTTPS (AdBlock) preference.
++ */
++public class AdBlockEditor extends Fragment implements TextWatcher {
++    private EditText mAdBlockFiltersUrlEdit;
++    private Button mSaveButton;
++    private Button mResetButton;
++
++    @Override
++    public View onCreateView(LayoutInflater inflater, ViewGroup container,
++            Bundle savedInstanceState) {
++        super.onCreate(savedInstanceState);
++        getActivity().setTitle(R.string.options_adblock_edit_title);
++
++        View v = inflater.inflate(R.layout.adblock_editor, container, false);
++        View scrollView = v.findViewById(R.id.scroll_view);
++        scrollView.getViewTreeObserver().addOnScrollChangedListener(
++                PreferenceUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
++        mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);
++        mAdBlockFiltersUrlEdit.setText(FeatureUtilities.getAdBlockFiltersURL());
++        mAdBlockFiltersUrlEdit.addTextChangedListener(this);
++        mAdBlockFiltersUrlEdit.requestFocus();
++
++        initializeSaveCancelResetButtons(v);
++        return v;
++    }
++
++    @Override
++    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
++    }
++
++    @Override
++    public void onTextChanged(CharSequence s, int start, int before, int count) {
++        mSaveButton.setEnabled(s.length() != 0);
++        mResetButton.setEnabled(true);
++    }
++
++    @Override
++    public void afterTextChanged(Editable s) {
++    }
++
++    private void initializeSaveCancelResetButtons(View v) {
++        mResetButton = (Button) v.findViewById(R.id.adblock_reset);
++        mResetButton.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                mAdBlockFiltersUrlEdit.setText(FeatureUtilities.getAdBlockFiltersURL());
++                getActivity().finish();
++            }
++        });
++
++        mSaveButton = (Button) v.findViewById(R.id.adblock_save);
++        mSaveButton.setEnabled(false);
++        mSaveButton.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                FeatureUtilities.setAdBlockFiltersURL(
++                        UrlFormatter.fixupUrl(mAdBlockFiltersUrlEdit.getText().toString()));
++                getActivity().finish();
++            }
++        });
++
++        Button button = (Button) v.findViewById(R.id.adblock_cancel);
++        button.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                getActivity().finish();
++            }
++        });
++    }
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
+@@ -0,0 +1,53 @@
++// Copyright 2015 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++package org.chromium.chrome.browser.preferences;
++
++import android.os.Bundle;
++import android.support.v7.preference.Preference;
++import android.support.v7.preference.PreferenceFragmentCompat;
++
++import org.chromium.chrome.browser.ContentSettingsType;
++import org.chromium.chrome.browser.util.FeatureUtilities;
++import org.chromium.base.VisibleForTesting;
++import org.chromium.chrome.R;
++
++/**
++ * Fragment that allows the user to configure AdBlock related preferences.
++ */
++public class AdBlockPreferences extends PreferenceFragmentCompat {
++    @VisibleForTesting
++    public static final String PREF_ADBLOCK_SWITCH = "adblock_switch";
++    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
++
++    private Preference mAdBlockEdit;
++
++    @Override
++    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
++        getActivity().setTitle(R.string.options_adblock_title);
++        PreferenceUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
++
++        ChromeSwitchPreference mAdBlockSwitch =
++                (ChromeSwitchPreference) findPreference(PREF_ADBLOCK_SWITCH);
++        boolean isAdBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++        mAdBlockSwitch.setChecked(isAdBlockEnabled);
++        mAdBlockSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, !(boolean) newValue);
++            return true;
++        });
++
++        mAdBlockEdit = findPreference(PREF_ADBLOCK_EDIT);
++        updateCurrentAdBlockUrl();
++    }
++
++    private void updateCurrentAdBlockUrl() {
++        mAdBlockEdit.setSummary(FeatureUtilities.getAdBlockFiltersURL());
++    }
++
++    @Override
++    public void onResume() {
++        super.onResume();
++        updateCurrentAdBlockUrl();
++    }
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+@@ -237,6 +237,14 @@ public class FeatureUtilities {
+         cacheServiceManagerForBackgroundPrefetch();
+     }
+ 
++     public static void setAdBlockFiltersURL(String url) {
++         nativeSetAdBlockFiltersURL(url);
++     }
++
++     public static String getAdBlockFiltersURL() {
++         return nativeGetAdBlockFiltersURL();
++     }
++
+     /**
+      * @return True if tab model merging for Android N+ is enabled.
+      */
+@@ -924,4 +932,6 @@ public class FeatureUtilities {
+     private static native String nativeGetDoHTemplates();
+     private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
+     private static native boolean nativeIsNetworkServiceWarmUpEnabled();
++    private static native void nativeSetAdBlockFiltersURL(String url);
++    private static native String nativeGetAdBlockFiltersURL();
+ }
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -898,6 +898,20 @@ Your Google account may have other forms of browsing history like searches and a
+         Captions
+       </message>
+ 
++      <!-- AdBlock settings -->
++      <message name="IDS_PREFS_ADBLOCK" desc="Title of the AdBlock Settings screen. [CHAR-LIMIT=32]">
++        AdBlock settings
++      </message>
++      <message name="IDS_OPTIONS_ADBLOCK_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used to fetch the ad blocker filters.">
++        Edit filters URL
++      </message>
++      <message name="IDS_OPTIONS_ADBLOCK_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used to fetch the ad blocker filters.">
++        Filters URL
++      </message>
++      <message name="IDS_ADBLOCK_HELP" desc="The title of the hyperlink that allows users to visit the web page with instructions for custom ad blocker filters.">
++        Visit help page
++      </message>
++
+       <!-- Site settings -->
+       <message name="IDS_PREFS_SITE_SETTINGS" desc="Title of the Website Settings screen. [CHAR-LIMIT=32]">
+         Site settings
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
++++ b/chrome/app/generated_resources.grd
+@@ -9505,6 +9505,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+       Never show this again.
+     </message>
+ 
++    <!-- Ad Blocking preferences -->
++    <if expr="is_android">
++      <message name="IDS_OPTIONS_ADBLOCK_TITLE" desc="The title of the Ad Blocking option on Android" formatter_data="android_java">
++        Ad Blocking
++      </message>
++      <message name="IDS_OPTIONS_ADBLOCK_SUMMARY" desc="The title of the Ad Blocking summary on Android" formatter_data="android_java">
++        Configure Ad Blocking and filters URL
++      </message>
++    </if>
++
+     <!-- Ad Blocking UI strings. -->
+     <message name="IDS_ALWAYS_ALLOW_ADS" desc="Explanation associated with a toggle to allow ads after ads have been blocked on the page. To be used on pages where the ad blocking UI is governed by a persistent permissions-based whitelist.">
+       Always allow ads on this site
+diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
+--- a/chrome/browser/android/feature_utilities.cc
++++ b/chrome/browser/android/feature_utilities.cc
+@@ -58,6 +58,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
+ } // namespace android
+ } // namespace chrome
+ 
++static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetAdBlockFiltersURL(JNIEnv* env) {
++  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
++}
++
++static void JNI_FeatureUtilities_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
++  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
++}
++
+ static void JNI_FeatureUtilities_SetCustomTabVisible(
+     JNIEnv* env,
+     jboolean visible) {
+diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
+--- a/chrome/browser/browser_process_impl.cc
++++ b/chrome/browser/browser_process_impl.cc
+@@ -1032,7 +1032,8 @@ BrowserProcessImpl::adblock_updater() {
+   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
+           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
+           std::move(scheduler),
+-          g_browser_process->subresource_filter_ruleset_service());
++          g_browser_process->subresource_filter_ruleset_service(),
++          local_state()->GetString(prefs::kAdBlockFiltersURL));
+ 
+   return adblock_updater_.get();
+ }
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
++++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -391,6 +391,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+       ssl_config_service_manager_(
+           SSLConfigServiceManager::CreateDefaultManager(local_state_)),
+       proxy_config_monitor_(local_state_) {
++  local_state_->SetDefaultPrefValue(prefs::kAdBlockFiltersURL,
++                                    base::Value("https://www.bromite.org/filters/filters.dat"));
+ #if !defined(OS_ANDROID)
+   // QuicAllowed was not part of Android policy.
+   const base::Value* value =
+@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+ }
+ 
+ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
++  registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string());
+   // Register the DnsClient and DoH preferences. The feature list has not been
+   // initialized yet, so setting the preference defaults here to reflect the
+   // corresponding features will only cause the preference defaults to reflect
+diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
+--- a/chrome/common/pref_names.cc
++++ b/chrome/common/pref_names.cc
+@@ -1871,6 +1871,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+ // capture devices without prompt.
+ const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
+ 
++// Holds the URL to an indexed subresource filters file.
++const char kAdBlockFiltersURL[] = "adblock.filters_url";
++
+ // A pref holding the value of the policy used to explicitly allow or deny
+ // access to video capture devices.  When enabled or not set, the user is
+ // prompted for device access.  When disabled, access to video capture devices
+diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
+--- a/chrome/common/pref_names.h
++++ b/chrome/common/pref_names.h
+@@ -30,6 +30,7 @@ extern const char kDownloadRestrictions[];
+ extern const char kForceEphemeralProfiles[];
+ extern const char kHomePageIsNewTabPage[];
+ extern const char kHomePage[];
++extern const char kAdBlockFiltersURL[];
+ extern const char kImportantSitesDialogHistory[];
+ #if defined(OS_WIN)
+ extern const char kLastProfileResetTimestamp[];
+diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
+--- a/components/component_updater/adblock_updater_service.cc
++++ b/components/component_updater/adblock_updater_service.cc
+@@ -46,12 +46,12 @@ const int initial_check_delay = 5,
+       next_check_delay = 60*60*24*7, // 1 week
+       on_demand_check_delay = 60; // minimum 1 minute between each on-demand check
+ 
+-AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service)
++AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
++   subresource_filter::RulesetService* ruleset_service, std::string filters_url)
+  : ruleset_service_(ruleset_service), shared_url_network_factory_(shared_url_network_factory), scheduler_(std::move(scheduler)) {
+   DCHECK(ruleset_service);
+ 
+-  //TODO: retrieve filters URL from config/prefs
+-  filters_url_ = "https://www.bromite.org/filters/filters.dat";
++  filters_url_ = filters_url;
+ }
+ 
+ AdBlockUpdaterService::~AdBlockUpdaterService() {
+diff --git a/components/component_updater/adblock_updater_service.h b/components/component_updater/adblock_updater_service.h
+--- a/components/component_updater/adblock_updater_service.h
++++ b/components/component_updater/adblock_updater_service.h
+@@ -54,7 +54,8 @@ class Observer {
+ // All methods are safe to call ONLY from the browser's main thread.
+ class AdBlockUpdaterService {
+  public:
+-  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service);
++  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
++                        subresource_filter::RulesetService* ruleset_service, std::string filters_url);
+   ~AdBlockUpdaterService();
+ 
+   // Adds an observer for this class. An observer should not be added more
+-- 
+2.11.0
+

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

@@ -13,7 +13,7 @@ Subject: Add option to not persist tabs across sessions
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -66,6 +66,9 @@
+@@ -62,6 +62,9 @@
      <!-- TODO(peconn): Add help section. -->
      <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
  
@@ -26,22 +26,22 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -28,6 +28,11 @@
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
-         android:key="do_not_track"
-         android:title="@string/do_not_track_title" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+@@ -38,6 +38,11 @@
+         android:key="contextual_search"
+         android:title="@string/contextual_search_title"
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
 +        android:summary="@string/close_tabs_on_exit_summary"
 +        android:defaultValue="false" />
-     <android.support.v7.preference.Preference
+     <Preference
          android:key="clear_browsing_data"
          android:title="@string/clear_browsing_data_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1132,8 +1132,10 @@ public class ChromeTabbedActivity
+@@ -1166,8 +1166,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -64,26 +64,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
  import android.os.Bundle;
  import android.support.graphics.drawable.VectorDrawableCompat;
  import android.support.v7.preference.CheckBoxPreference;
-@@ -13,6 +14,7 @@ import android.view.Menu;
+@@ -14,6 +15,7 @@ import android.view.Menu;
  import android.view.MenuInflater;
  import android.view.MenuItem;
  
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.BuildInfo;
  import org.chromium.chrome.R;
- import org.chromium.chrome.browser.help.HelpAndFeedback;
-@@ -32,6 +34,7 @@ import org.chromium.ui.text.SpanApplier;
-  */
- public class PrivacyPreferences
-         extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
-+    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+ import org.chromium.chrome.browser.ChromeFeatureList;
+@@ -38,6 +40,7 @@ public class PrivacyPreferences
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
      private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
-     private static final String PREF_USAGE_STATS = "usage_stats_reporting";
-@@ -77,6 +80,10 @@ public class PrivacyPreferences
-             sharedPreferencesEditor.apply();
-         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
++    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+ 
+@@ -112,6 +115,10 @@ public class PrivacyPreferences
+         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
 +        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
@@ -91,22 +91,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
          }
  
          return true;
-@@ -114,6 +121,11 @@ public class PrivacyPreferences
-             doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
+@@ -162,6 +169,11 @@ public class PrivacyPreferences
+             boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
+             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
          }
- 
-+        ChromeBaseCheckBoxPreferenceCompat closeTabsOnExitPref =
-+                (ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_CLOSE_TABS_ON_EXIT);
++
++        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
 +        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
 +        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-+
-         Preference usageStatsPref = findPreference(PREF_USAGE_STATS);
-         if (usageStatsPref != null) {
-             if (BuildInfo.isAtLeastQ() && prefServiceBridge.getBoolean(Pref.USAGE_STATS_ENABLED)) {
+     }
+ 
+     private ManagedPreferenceDelegate createManagedPreferenceDelegate() {
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3768,6 +3768,12 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -3764,6 +3764,12 @@ The site does NOT gain access to the camera. The camera images are only visible
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>

build/patches/Add-option-to-use-home-page-as-NTP.patch

@@ -20,12 +20,12 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
 @@ -7,6 +7,11 @@
      xmlns:android="http://schemas.android.com/apk/res/android">
  
-     <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
+     <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
 +        android:key="ntp_is_homepage_switch"
 +        android:summaryOn="@string/options_ntp_is_homepage_label"
 +        android:summaryOff="@string/options_ntp_is_homepage_label" />
 +
-+    <org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat
++    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
          android:key="homepage_switch"
          android:summaryOn="@string/text_on"
          android:summaryOff="@string/text_off" />
@@ -106,8 +106,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Hom
              return true;
          });
  
-+        ChromeSwitchPreferenceCompat mNTPIsHomepageSwitch =
-+                (ChromeSwitchPreferenceCompat) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
++        ChromeSwitchPreference mNTPIsHomepageSwitch =
++                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
 +        boolean isHomepageNTPEnabled = mHomepageManager.getPrefNTPIsHomepageEnabled();
 +        mNTPIsHomepageSwitch.setChecked(isHomepageNTPEnabled);
 +        mNTPIsHomepageSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
@@ -153,7 +153,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -666,6 +666,9 @@ CHAR-LIMIT guidelines:
+@@ -663,6 +663,9 @@ CHAR-LIMIT guidelines:
        <message name="IDS_OPTIONS_HOMEPAGE_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is opened when they tap on the home page button in the omnibox.">
          Open this page
        </message>
@@ -192,8 +192,8 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -314,6 +314,7 @@ extern const char kDeviceWebUsbAllowDevicesForUrls[];
- extern const char kLoginExtensionApiDataForNextLoginAttempt[];
+@@ -318,6 +318,7 @@ extern const char kSettingsShowBrowserBanner[];
+ extern const char kSettingsShowOSBanner[];
  #endif  // defined(OS_CHROMEOS)
  extern const char kShowHomeButton[];
 +extern const char kNewTabPageIsHomePage[];

build/patches/Add-site-settings-option-for-session-only-cookies.patch

@@ -14,7 +14,7 @@ Subject: Add site settings option for session-only cookies
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -36,6 +36,9 @@
+@@ -32,6 +32,9 @@
      <integer name="reload_button_level_reload">0</integer>
      <integer name="reload_button_level_stop">1</integer>
  
@@ -32,14 +32,14 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi
          android:defaultValue="true"
          android:persistent="false" />
 +    <!-- A toggle for cookies to be saved only until session exit, only shown for the Cookies category. -->
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
++    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
 +        android:key="cookies_session_only"
 +        android:title="@string/allow_cookies_session_only_title"
 +        android:summary="@string/allow_cookies_session_only_summary"
 +        android:defaultValue="true"
 +        android:persistent="false" />
      <!-- A toggle for enabling vibration in notifications. -->
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
          android:key="notifications_vibrate"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
      /**
       * @return Whether third-party cookie blocking is configured by policy
       */
-@@ -620,6 +624,10 @@ public class PrefServiceBridge {
+@@ -631,6 +635,10 @@ public class PrefServiceBridge {
          nativeSetBlockThirdPartyCookiesEnabled(enabled);
      }
  
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
      public void setDoNotTrackEnabled(boolean enabled) {
          nativeSetDoNotTrackEnabled(enabled);
      }
-@@ -1070,6 +1078,7 @@ public class PrefServiceBridge {
+@@ -1094,6 +1102,7 @@ public class PrefServiceBridge {
      private native boolean nativeGetAutoplayEnabled();
      private native boolean nativeGetBackgroundSyncEnabled();
      private native boolean nativeGetBlockThirdPartyCookiesEnabled();
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Pre
      private native boolean nativeGetBlockThirdPartyCookiesManaged();
      private native boolean nativeGetRememberPasswordsEnabled();
      private native boolean nativeGetPasswordManagerAutoSigninEnabled();
-@@ -1115,6 +1124,7 @@ public class PrefServiceBridge {
+@@ -1141,6 +1150,7 @@ public class PrefServiceBridge {
      private native void nativeSetAutoplayEnabled(boolean enabled);
      private native void nativeSetAllowCookiesEnabled(boolean enabled);
      private native void nativeSetBackgroundSyncEnabled(boolean enabled);
@@ -146,12 +146,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
          }
  
          // Configure/hide the notifications vibrate toggle, as needed.
-@@ -1005,6 +1015,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -1003,6 +1013,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
                  preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
      }
  
 +    private void updateCookiesSessionOnlyCheckBox() {
-+        ChromeBaseCheckBoxPreferenceCompat cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreferenceCompat)
++        ChromeBaseCheckBoxPreference cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreference)
 +                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
 +        cookiesSessionOnlyPref.setChecked(
 +                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
@@ -160,12 +160,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 +    }
 +
      private void updateNotificationsVibrateCheckBox() {
-         ChromeBaseCheckBoxPreferenceCompat preference =
-                 (ChromeBaseCheckBoxPreferenceCompat) getPreferenceScreen().findPreference(
+         ChromeBaseCheckBoxPreference preference =
+                 (ChromeBaseCheckBoxPreference) getPreferenceScreen().findPreference(
 diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
 --- a/chrome/android/java/strings/android_chrome_strings.grd
 +++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -904,6 +904,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -895,6 +895,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
          Prevent third-party websites from saving and reading cookie data
        </message>
@@ -199,7 +199,7 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
  static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
      JNIEnv* env,
      const JavaParamRef<jobject>& obj) {
-@@ -771,6 +782,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+@@ -785,6 +796,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
    GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
  }
  

build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch

@@ -0,0 +1,519 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 23 Nov 2019 10:55:16 +0100
+Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
+
+---
+ chrome/android/chrome_java_sources.gni             |  2 +
+ chrome/android/java/res/layout/doh_editor.xml      | 65 ++++++++++++++++
+ chrome/android/java/res/values/values.xml          |  2 +
+ chrome/android/java/res/xml/doh_preferences.xml    | 25 ++++++
+ .../android/java/res/xml/privacy_preferences.xml   |  5 ++
+ .../chrome/browser/preferences/DoHEditor.java      | 91 ++++++++++++++++++++++
+ .../chrome/browser/preferences/DoHPreferences.java | 52 +++++++++++++
+ .../chrome/browser/util/FeatureUtilities.java      | 25 ++++++
+ .../java/strings/android_chrome_strings.grd        | 11 +++
+ chrome/app/generated_resources.grd                 |  6 ++
+ chrome/browser/android/feature_utilities.cc        | 23 ++++++
+ .../browser/net/system_network_context_manager.cc  | 46 +++--------
+ chrome/common/chrome_features.cc                   |  4 +-
+ 13 files changed, 320 insertions(+), 37 deletions(-)
+ create mode 100644 chrome/android/java/res/layout/doh_editor.xml
+ create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
+
+diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
+--- a/chrome/android/chrome_java_sources.gni
++++ b/chrome/android/chrome_java_sources.gni
+@@ -1251,7 +1251,9 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java",
+   "java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java",
+   "java/src/org/chromium/chrome/browser/preferences/HomepageEditor.java",
++  "java/src/org/chromium/chrome/browser/preferences/DoHEditor.java",
+   "java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java",
++  "java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java",
+   "java/src/org/chromium/chrome/browser/preferences/HyperlinkPreference.java",
+   "java/src/org/chromium/chrome/browser/preferences/LearnMorePreference.java",
+   "java/src/org/chromium/chrome/browser/preferences/LegalInformationPreferences.java",
+diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/res/layout/doh_editor.xml
+@@ -0,0 +1,65 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright 2015 The Chromium Authors. All rights reserved.
++     Use of this source code is governed by a BSD-style license that can be
++     found in the LICENSE file. -->
++
++<FrameLayout
++    xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:app="http://schemas.android.com/apk/res-auto"
++    xmlns:tools="http://schemas.android.com/tools"
++    android:layout_width="match_parent"
++    android:layout_height="match_parent" >
++
++    <ScrollView
++        android:layout_width="match_parent"
++        android:layout_height="match_parent"
++        android:id="@+id/scroll_view"
++        android:fillViewport="true" >
++
++        <LinearLayout
++            android:layout_width="match_parent"
++            android:layout_height="wrap_content"
++            android:orientation="vertical"
++            android:focusableInTouchMode="true" >
++
++            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
++                android:id="@+id/doh_url"
++                style="@style/PreferenceScreenLayout"
++                android:layout_width="match_parent"
++                android:layout_height="wrap_content" >
++                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
++                <EditText
++                    tools:ignore="Autofill"
++                    android:id="@+id/doh_url_edit"
++                    android:layout_width="match_parent"
++                    android:layout_height="wrap_content"
++                    android:inputType="textUri"
++                    android:singleLine="true"
++                    android:hint="@string/options_doh_edit_label" />
++            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
++
++            <Space style="@style/ButtonBarTopSpacer" />
++            <View style="@style/ButtonBarTopDivider" />
++
++            <LinearLayout style="@style/ButtonBar" >
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/doh_reset"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/reset" />
++
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/doh_cancel"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/cancel" />
++
++                <org.chromium.ui.widget.ButtonCompat
++                    android:id="@+id/doh_save"
++                    style="@style/ButtonBarButton"
++                    android:text="@string/save" />
++            </LinearLayout>
++        </LinearLayout>
++    </ScrollView>
++
++    <include layout="@layout/preferences_action_bar_shadow"/>
++
++</FrameLayout>
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
++++ b/chrome/android/java/res/values/values.xml
+@@ -88,6 +88,8 @@
+     <integer name="download_infobar_bar_fill_in_delay">400</integer>
+     <integer name="download_infobar_bar_fill_out_delay">200</integer>
+ 
++    <string name="doh_help_url">https://www.bromite.org/doh</string>
++
+     <!-- Bottom navigation bar styling. -->
+     <bool name="window_light_navigation_bar">true</bool>
+ 
+diff --git a/chrome/android/java/res/xml/doh_preferences.xml b/chrome/android/java/res/xml/doh_preferences.xml
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/res/xml/doh_preferences.xml
+@@ -0,0 +1,25 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!-- Copyright 2015 The Chromium Authors. All rights reserved.
++     Use of this source code is governed by a BSD-style license that can be
++     found in the LICENSE file. -->
++
++<PreferenceScreen
++    xmlns:android="http://schemas.android.com/apk/res/android"
++    xmlns:app="http://schemas.android.com/apk/res-auto">
++
++    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
++        android:key="doh_switch"
++        android:summaryOn="@string/text_on"
++        android:summaryOff="@string/text_off" />
++
++    <org.chromium.chrome.browser.preferences.HyperlinkPreference
++        android:key="doh_help"
++        android:title="@string/doh_help"
++        app:url="@string/doh_help_url" />
++
++    <Preference
++        android:key="doh_edit"
++        android:title="@string/options_doh_edit_label"
++        android:fragment="org.chromium.chrome.browser.preferences.DoHEditor" />
++
++</PreferenceScreen>
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -19,6 +19,11 @@
+         android:key="can_make_payment"
+         android:title="@string/can_make_payment_title"
+         android:summary="@string/settings_can_make_payment_toggle_label" />
++    <Preference
++        android:fragment="org.chromium.chrome.browser.preferences.DoHPreferences"
++        android:key="doh"
++        android:title="@string/options_doh_title"
++        android:summary="@string/options_doh_summary" />
+     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+         android:key="preload_pages"
+         android:title="@string/preload_pages_title"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
+@@ -0,0 +1,91 @@
++// Copyright 2015 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++package org.chromium.chrome.browser.preferences;
++
++import android.os.Bundle;
++import android.support.v4.app.Fragment;
++import android.text.Editable;
++import android.text.TextWatcher;
++import android.view.LayoutInflater;
++import android.view.View;
++import android.view.ViewGroup;
++import android.widget.Button;
++import android.widget.EditText;
++
++import org.chromium.chrome.browser.util.FeatureUtilities;
++import org.chromium.chrome.R;
++import org.chromium.components.url_formatter.UrlFormatter;
++
++/**
++ * Provides the Java-UI for editing the DNS-over-HTTPS (DoH) preference.
++ */
++public class DoHEditor extends Fragment implements TextWatcher {
++    private EditText mDoHUrlEdit;
++    private Button mSaveButton;
++    private Button mResetButton;
++
++    @Override
++    public View onCreateView(LayoutInflater inflater, ViewGroup container,
++            Bundle savedInstanceState) {
++        super.onCreate(savedInstanceState);
++        getActivity().setTitle(R.string.options_doh_edit_title);
++
++        View v = inflater.inflate(R.layout.doh_editor, container, false);
++        View scrollView = v.findViewById(R.id.scroll_view);
++        scrollView.getViewTreeObserver().addOnScrollChangedListener(
++                PreferenceUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
++        mDoHUrlEdit = (EditText) v.findViewById(R.id.doh_url_edit);
++        mDoHUrlEdit.setText(FeatureUtilities.getDoHTemplates());
++        mDoHUrlEdit.addTextChangedListener(this);
++        mDoHUrlEdit.requestFocus();
++
++        initializeSaveCancelResetButtons(v);
++        return v;
++    }
++
++    @Override
++    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
++    }
++
++    @Override
++    public void onTextChanged(CharSequence s, int start, int before, int count) {
++        mSaveButton.setEnabled(s.length() != 0);
++        mResetButton.setEnabled(true);
++    }
++
++    @Override
++    public void afterTextChanged(Editable s) {
++    }
++
++    private void initializeSaveCancelResetButtons(View v) {
++        mResetButton = (Button) v.findViewById(R.id.doh_reset);
++        mResetButton.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                mDoHUrlEdit.setText(FeatureUtilities.getDoHTemplates());
++                getActivity().finish();
++            }
++        });
++
++        mSaveButton = (Button) v.findViewById(R.id.doh_save);
++        mSaveButton.setEnabled(false);
++        mSaveButton.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                FeatureUtilities.setDoHTemplates(
++                        mDoHUrlEdit.getText().toString());
++                getActivity().finish();
++            }
++        });
++
++        Button button = (Button) v.findViewById(R.id.doh_cancel);
++        button.setOnClickListener(new View.OnClickListener() {
++            @Override
++            public void onClick(View v) {
++                getActivity().finish();
++            }
++        });
++    }
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
+@@ -0,0 +1,52 @@
++// Copyright 2015 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++package org.chromium.chrome.browser.preferences;
++
++import android.os.Bundle;
++import android.support.v7.preference.Preference;
++import android.support.v7.preference.PreferenceFragmentCompat;
++
++import org.chromium.chrome.browser.util.FeatureUtilities;
++import org.chromium.base.VisibleForTesting;
++import org.chromium.chrome.R;
++
++/**
++ * Fragment that allows the user to configure DoH related preferences.
++ */
++public class DoHPreferences extends PreferenceFragmentCompat {
++    @VisibleForTesting
++    public static final String PREF_DOH_SWITCH = "doh_switch";
++    private static final String PREF_DOH_EDIT = "doh_edit";
++
++    private Preference mDoHEdit;
++
++    @Override
++    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
++        getActivity().setTitle(R.string.options_doh_title);
++        PreferenceUtils.addPreferencesFromResource(this, R.xml.doh_preferences);
++
++        ChromeSwitchPreference mDoHSwitch =
++                (ChromeSwitchPreference) findPreference(PREF_DOH_SWITCH);
++        boolean isDoHEnabled = FeatureUtilities.getDoHEnabled();
++        mDoHSwitch.setChecked(isDoHEnabled);
++        mDoHSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
++            FeatureUtilities.setDoHEnabled((boolean) newValue);
++            return true;
++        });
++
++        mDoHEdit = findPreference(PREF_DOH_EDIT);
++        updateCurrentDoHUrl();
++    }
++
++    private void updateCurrentDoHUrl() {
++        mDoHEdit.setSummary(FeatureUtilities.getDoHTemplates());
++    }
++
++    @Override
++    public void onResume() {
++        super.onResume();
++        updateCurrentDoHUrl();
++    }
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
+@@ -163,6 +163,27 @@ public class FeatureUtilities {
+         nativeSetCustomTabVisible(visible);
+     }
+ 
++     /**
++     * Records whether custom URL for DoH is enabled with native-side feature utilities.
++     * @param url Whether custom URL is enabled or not.
++     */
++     public static void setDoHEnabled(boolean enabled) {
++         nativeSetDoHEnabled(enabled);
++     }
++
++     public static boolean getDoHEnabled() {
++         return nativeGetDoHEnabled();
++     }
++
++     public static void setDoHTemplates(String t) {
++         nativeSetDoHTemplates(t);
++     }
++
++     public static String getDoHTemplates() {
++         return nativeGetDoHTemplates();
++     }
++
++
+     /**
+      * Records whether the activity is in multi-window mode with native-side feature utilities.
+      * @param isInMultiWindowMode Whether the activity is in Android N multi-window mode.
+@@ -897,6 +918,10 @@ public class FeatureUtilities {
+     }
+ 
+     private static native void nativeSetCustomTabVisible(boolean visible);
++    private static native void nativeSetDoHEnabled(boolean enabled);
++    private static native boolean nativeGetDoHEnabled();
++    private static native void nativeSetDoHTemplates(String templates);
++    private static native String nativeGetDoHTemplates();
+     private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
+     private static native boolean nativeIsNetworkServiceWarmUpEnabled();
+ }
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -656,6 +656,17 @@ CHAR-LIMIT guidelines:
+         Chrome Passwords
+       </message>
+ 
++      <!-- DoH preferences -->
++      <message name="IDS_OPTIONS_DOH_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used for DNS-over-HTTPS queries.">
++        Edit DoH template URLs
++      </message>
++      <message name="IDS_OPTIONS_DOH_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used for DNS-over-HTTPS queries.">
++        DoH template URLs
++      </message>
++      <message name="IDS_DOH_HELP" desc="The title of the hyperlink that allows users to visit the wiki page with instructions for DNS-over-HTTPS configuration.">
++        Visit help page
++      </message>
++
+       <!-- Homepage preferences -->
+       <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the home page button in the omnibox.">
+         Edit home page
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
++++ b/chrome/app/generated_resources.grd
+@@ -6507,6 +6507,12 @@ the Bookmarks menu.">
+         <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
+           Home page
+         </message>
++        <message name="IDS_OPTIONS_DOH_TITLE" desc="The title of the DNS-over-HTTPS option on Android" formatter_data="android_java">
++          Secure DNS
++        </message>
++        <message name="IDS_OPTIONS_DOH_SUMMARY" desc="The title of the DNS-over-HTTPS summary on Android" formatter_data="android_java">
++          Configure DNS-over-HTTPS (DoH) secure DNS
++        </message>
+       </if>
+ 
+       <!-- Autofill dialog: field labels. -->
+diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
+--- a/chrome/browser/android/feature_utilities.cc
++++ b/chrome/browser/android/feature_utilities.cc
+@@ -7,6 +7,9 @@
+ #include "chrome/android/chrome_jni_headers/FeatureUtilities_jni.h"
+ 
+ #include "base/android/jni_string.h"
++#include "chrome/browser/browser_process.h"
++#include "components/prefs/pref_service.h"
++#include "chrome/common/pref_names.h"
+ #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+ #include "components/ntp_snippets/content_suggestions_service.h"
+@@ -73,3 +76,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
+   return content::IsOutOfProcessNetworkService() &&
+          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
+ }
++
++static jboolean JNI_FeatureUtilities_GetDoHEnabled(JNIEnv* env) {
++  std::string doh_mode = g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsMode);
++  return ((doh_mode == "secure") || (doh_mode == "auto"));
++}
++
++static void JNI_FeatureUtilities_SetDoHEnabled(JNIEnv* env, jboolean enabled) {
++  if (enabled)
++    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "secure");
++  else
++    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "off");
++}
++
++static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetDoHTemplates(JNIEnv* env) {
++  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsTemplates));
++}
++
++static void JNI_FeatureUtilities_SetDoHTemplates(JNIEnv* env, const JavaParamRef<jstring>& templates) {
++  g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsTemplates, base::android::ConvertJavaStringToUTF8(env, templates));
++}
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
++++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -134,9 +134,14 @@ void GetStubResolverConfig(
+ 
+   std::string doh_templates =
+       local_state->GetString(prefs::kDnsOverHttpsTemplates);
+-  std::string server_method;
+-  if (!doh_templates.empty() &&
+-      *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
++  if (doh_templates.empty()) {
++    *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
++    doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
++  }
++
++  LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode;
++  if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
++    std::string server_method;
+     for (const std::string& server_template :
+          SplitString(doh_templates, " ", base::TRIM_WHITESPACE,
+                      base::SPLIT_WANT_NONEMPTY)) {
+@@ -404,40 +409,11 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+   // features before registering change callbacks for these preferences.
+   local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
+                                     base::Value(ShouldEnableAsyncDns()));
+-  std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
+-  std::string default_doh_templates = "";
+-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
+-    if (features::kDnsOverHttpsFallbackParam.Get()) {
+-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeAutomatic;
+-    } else {
+-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeSecure;
+-    }
+-    default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
+-  }
++  //NOTE: DoH fallback feature to insecure mode is not evaluated
+   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
+-                                    base::Value(default_doh_mode));
++                                    base::Value(chrome_browser_net::kDnsOverHttpsModeOff));
+   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates,
+-                                    base::Value(default_doh_templates));
+-
+-  // If the user has explicitly enabled or disabled the DoH experiment in
+-  // chrome://flags, store that choice in the user prefs so that it can be
+-  // persisted after the experiment ends. Also make sure to remove the stored
+-  // prefs value if the user has changed their chrome://flags selection to the
+-  // default.
+-  flags_ui::PrefServiceFlagsStorage flags_storage(local_state_);
+-  std::set<std::string> entries = flags_storage.GetFlags();
+-  if (entries.count("dns-over-https@1")) {
+-    // The user has "Enabled" selected.
+-    local_state_->SetString(prefs::kDnsOverHttpsMode,
+-                            chrome_browser_net::kDnsOverHttpsModeAutomatic);
+-  } else if (entries.count("dns-over-https@2")) {
+-    // The user has "Disabled" selected.
+-    local_state_->SetString(prefs::kDnsOverHttpsMode,
+-                            chrome_browser_net::kDnsOverHttpsModeOff);
+-  } else {
+-    // The user has "Default" selected.
+-    local_state_->ClearPref(prefs::kDnsOverHttpsMode);
+-  }
++                                    base::Value(features::kDnsOverHttpsTemplatesParam.Get()));
+ 
+   PrefChangeRegistrar::NamedChangeCallback dns_pref_callback =
+       base::BindRepeating(&OnStubResolverConfigChanged,
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
++++ b/chrome/common/chrome_features.cc
+@@ -271,12 +271,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
+ 
+ // Enable DNS over HTTPS (DoH).
+ const base::Feature kDnsOverHttps{"DnsOverHttps",
+-                                  base::FEATURE_DISABLED_BY_DEFAULT};
++                                  base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ // Set whether fallback to insecure DNS is allowed by default. This setting may
+ // be overridden for individual transactions.
+ const base::FeatureParam<bool> kDnsOverHttpsFallbackParam{&kDnsOverHttps,
+-                                                          "Fallback", true};
++                                                          "Fallback", false};
+ 
+ // Supply one or more space-separated DoH server URI templates to use when this
+ // feature is enabled. If no templates are specified, then a hardcoded mapping
+-- 
+2.11.0
+

build/patches/Allow-playing-audio-in-background.patch

@@ -3,29 +3,14 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200
 Subject: Allow playing audio in background
 
 ---
- chrome/browser/about_flags.cc      |  4 ++++
  media/blink/webmediaplayer_impl.cc | 12 +++++++++++-
  media/blink/webmediaplayer_impl.h  |  2 ++
- 3 files changed, 17 insertions(+), 1 deletion(-)
+ 2 files changed, 13 insertions(+), 1 deletion(-)
 
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1603,6 +1603,10 @@ const FeatureEntry kFeatureEntries[] = {
-     {"debug-packed-apps", flag_descriptions::kDebugPackedAppName,
-      flag_descriptions::kDebugPackedAppDescription, kOsDesktop,
-      SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
-+    {"resume-background-video",
-+     flag_descriptions::kResumeBackgroundVideoName,
-+     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
-     {"automatic-password-generation",
-      flag_descriptions::kAutomaticPasswordGenerationName,
-      flag_descriptions::kAutomaticPasswordGenerationDescription, kOsAll,
 diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
 --- a/media/blink/webmediaplayer_impl.cc
 +++ b/media/blink/webmediaplayer_impl.cc
-@@ -959,6 +959,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -976,6 +976,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -38,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3257,7 +3263,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3278,7 +3284,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
    // Audio only stream is allowed to play when in background.
    // TODO: We should check IsBackgroundOptimizationCandidate here. But we need
    // to move the logic of checking video frames out of that function.
@@ -54,7 +39,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
 --- a/media/blink/webmediaplayer_impl.h
 +++ b/media/blink/webmediaplayer_impl.h
-@@ -141,6 +141,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -142,6 +142,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
    // True if the loaded media has a playable video/audio track.
    bool HasVideo() const override;
    bool HasAudio() const override;

build/patches/Allow-website-sign-in-without-account-sign-in.patch

@@ -10,7 +10,7 @@ Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -145,7 +145,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+@@ -152,7 +152,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
    registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
                                  false);
  #endif

build/patches/Always-respect-async-dns-flag-regardless-of-SDK-version.patch

@@ -11,7 +11,7 @@ Do not read experiment value for cronet async DNS configuration
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -216,7 +216,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
+@@ -242,7 +242,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
  // Android this includes checking the Android version in the field trial.
  bool ShouldEnableAsyncDns() {
    bool feature_can_be_enabled = true;

build/patches/Always-show-home-page-settings.patch

@@ -19,7 +19,7 @@ This allows removing the home page button and restoring it from settings.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-@@ -347,18 +347,6 @@ public class ProcessInitializationHandler {
+@@ -356,18 +356,6 @@ public class ProcessInitializationHandler {
          deferredStartupHandler.addDeferredTask(new Runnable() {
              @Override
              public void run() {
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-@@ -207,15 +207,11 @@ public class MainPreferences extends PreferenceFragmentCompat
+@@ -206,15 +206,11 @@ public class MainPreferences extends PreferenceFragmentCompat
          updateSyncAndServicesPreference();
          updateSearchEnginePreference();
  
@@ -137,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
      private static Boolean sIsHomepageTileEnabled;
      private static Boolean sIsNewTabPageButtonEnabled;
      private static Boolean sIsBottomToolbarEnabled;
-@@ -176,7 +175,6 @@ public class FeatureUtilities {
+@@ -178,7 +177,6 @@ public class FeatureUtilities {
      public static void cacheNativeFlags() {
          cacheCommandLineOnNonRootedEnabled();
          FirstRunUtils.cacheFirstRunPrefs();
@@ -145,7 +145,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
          cacheHomepageTileEnabled();
          cacheNewTabPageButtonEnabled();
          cacheBottomToolbarEnabled();
-@@ -224,38 +222,6 @@ public class FeatureUtilities {
+@@ -228,38 +226,6 @@ public class FeatureUtilities {
          return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
      }
  
@@ -181,13 +181,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti
 -        sIsHomePageButtonForceEnabled = null;
 -    }
 -
-     private static void cacheNetworkService() {
-         boolean networkService = ChromeFeatureList.isEnabled(ChromeFeatureList.NETWORK_SERVICE);
- 
+     private static void cacheServiceManagerForDownloadResumption() {
+         boolean resumptionDownloadInReducedMode =
+                 ChromeFeatureList.isEnabled(ChromeFeatureList.SERVICE_MANAGER_FOR_DOWNLOAD);
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1774,9 +1774,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1932,9 +1932,6 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-chrome-duet-labels", flag_descriptions::kChromeDuetLabelsName,
       flag_descriptions::kChromeDuetLabelsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kChromeDuetLabeled)},
@@ -200,7 +200,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -136,7 +136,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -143,7 +143,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
      &kEphemeralTab,
      &kExploreSites,
      &kHandleMediaIntents,
@@ -208,7 +208,7 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
      &kHomepageTile,
      &kHorizontalTabSwitcherAndroid,
      &kIdentityDisc,
-@@ -413,9 +412,6 @@ const base::Feature kForegroundNotificationManager{
+@@ -439,9 +438,6 @@ const base::Feature kForegroundNotificationManager{
  const base::Feature kHandleMediaIntents{"HandleMediaIntents",
                                          base::FEATURE_ENABLED_BY_DEFAULT};
  
@@ -221,7 +221,7 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
 diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
 --- a/chrome/browser/android/chrome_feature_list.h
 +++ b/chrome/browser/android/chrome_feature_list.h
-@@ -72,7 +72,6 @@ extern const base::Feature kEphemeralTab;
+@@ -77,7 +77,6 @@ extern const base::Feature kEphemeralTab;
  extern const base::Feature kExploreSites;
  extern const base::Feature kForegroundNotificationManager;
  extern const base::Feature kHandleMediaIntents;

build/patches/AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch

@@ -35,15 +35,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
      // Channel access
      readonly attribute unsigned long numberOfChannels;
 -    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
--    [HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
+-    [HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
 +    //[HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-+    //[HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
-     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
++    //[HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
+     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long bufferOffset = 0);
  };
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -336,6 +336,7 @@ void AudioContext::StopRendering() {
+@@ -358,6 +358,7 @@ void AudioContext::StopRendering() {
  double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());

build/patches/Battery-API-return-nothing.patch

@@ -10,7 +10,7 @@ Include @thestinger's fix for correct charging/unknown values
 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
-@@ -44,45 +44,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+@@ -45,45 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
  }
  
  bool BatteryManager::charging() {

build/patches/Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

@@ -0,0 +1,319 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 30 Oct 2019 11:50:13 +0100
+Subject: Block all connection requests with 'qjz9zk' in the domain name or
+ with a 'trk:' scheme.
+
+An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
+This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
+---
+ .../chrome_autocomplete_scheme_classifier.cc       |  1 +
+ chrome/browser/history/history_utils.cc            |  1 +
+ chrome/browser/ui/singleton_tabs.cc                |  3 +-
+ chromecast/browser/url_request_context_factory.cc  |  7 ++++-
+ components/omnibox/browser/autocomplete_input.cc   |  7 +++--
+ components/url_formatter/url_fixer.cc              |  4 +++
+ .../browser/child_process_security_policy_impl.cc  |  1 +
+ net/BUILD.gn                                       |  2 ++
+ net/url_request/trk_protocol_handler.cc            | 26 +++++++++++++++++
+ net/url_request/trk_protocol_handler.h             | 33 ++++++++++++++++++++++
+ net/url_request/url_request.cc                     |  8 ++++++
+ net/url_request/url_request_context_builder.cc     |  4 +++
+ url/url_constants.cc                               |  1 +
+ url/url_constants.h                                |  1 +
+ url/url_util.cc                                    |  2 ++
+ 15 files changed, 97 insertions(+), 4 deletions(-)
+ create mode 100644 net/url_request/trk_protocol_handler.cc
+ create mode 100644 net/url_request/trk_protocol_handler.h
+
+diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+--- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
++++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
+@@ -28,6 +28,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+   if (base::IsStringASCII(scheme) &&
+       (ProfileIOData::IsHandledProtocol(scheme) ||
+        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
++       base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
+        base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
+     return metrics::OmniboxInputType::URL;
+diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
+--- a/chrome/browser/history/history_utils.cc
++++ b/chrome/browser/history/history_utils.cc
+@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
+       url.SchemeIs(content::kChromeDevToolsScheme) ||
+       url.SchemeIs(content::kChromeUIScheme) ||
+       url.SchemeIs(content::kViewSourceScheme) ||
++      url.SchemeIs(url::kTraceScheme) ||
+       url.SchemeIs(chrome::kChromeNativeScheme) ||
+       url.SchemeIs(chrome::kChromeSearchScheme) ||
+       url.SchemeIs(dom_distiller::kDomDistillerScheme) ||
+diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
+--- a/chrome/browser/ui/singleton_tabs.cc
++++ b/chrome/browser/ui/singleton_tabs.cc
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+ 
+     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
+     // removes the "view-source:" scheme which leads to incorrect matching.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme))
++    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
++        tab_url.SchemeIs(url::kTraceScheme))
+       continue;
+ 
+     GURL rewritten_tab_url = tab_url;
+diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc
+--- a/chromecast/browser/url_request_context_factory.cc
++++ b/chromecast/browser/url_request_context_factory.cc
+@@ -39,6 +39,7 @@
+ #include "net/http/http_stream_factory.h"
+ #include "net/proxy_resolution/proxy_resolution_service.h"
+ #include "net/ssl/ssl_config_service_defaults.h"
++#include "net/url_request/trk_protocol_handler.h"
+ #include "net/url_request/url_request_context.h"
+ #include "net/url_request/url_request_context_builder.h"
+ #include "net/url_request/url_request_context_getter.h"
+@@ -245,13 +246,17 @@ void URLRequestContextFactory::InitializeMainContextDependencies(
+       new net::URLRequestJobFactoryImpl());
+   // Keep ProtocolHandlers added in sync with
+   // CastContentBrowserClient::IsHandledURL().
++  bool set_protocol = false;
+   for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
+        it != protocol_handlers->end();
+        ++it) {
+-    bool set_protocol =
++    set_protocol =
+         job_factory->SetProtocolHandler(it->first, std::move(it->second));
+     DCHECK(set_protocol);
+   }
++  set_protocol = job_factory->SetProtocolHandler(
++      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
++  DCHECK(set_protocol);
+ 
+   // Set up interceptors in the reverse order.
+   std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
+diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
+--- a/components/omnibox/browser/autocomplete_input.cc
++++ b/components/omnibox/browser/autocomplete_input.cc
+@@ -496,7 +496,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+   // For the view-source and blob schemes, we should emphasize the host of the
+   // URL qualified by the view-source or blob prefix.
+   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
+-       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) &&
++       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) ||
++       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
+       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
+     // Obtain the URL prefixed by view-source or blob and parse it.
+     base::string16 real_url(text.substr(after_scheme_and_colon));
+@@ -569,7 +570,9 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) {
+ bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
+   std::string utf8_input(base::UTF16ToUTF8(input));
+   url::Component scheme;
+-  if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
++  if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &scheme)) {
++    return false;
++  } else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
+     utf8_input.erase(0, scheme.end() + 1);
+   }
+   return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
+diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
+--- a/components/url_formatter/url_fixer.cc
++++ b/components/url_formatter/url_fixer.cc
+@@ -552,6 +552,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+     }
+   }
+ 
++  if (scheme == url::kTraceScheme) {
++    return GURL();
++  }
++
+   // We handle the file scheme separately.
+   if (scheme == url::kFileScheme)
+     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
+diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
+--- a/content/browser/child_process_security_policy_impl.cc
++++ b/content/browser/child_process_security_policy_impl.cc
+@@ -507,6 +507,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+   RegisterWebSafeScheme(url::kHttpsScheme);
+   RegisterWebSafeScheme(url::kFtpScheme);
+   RegisterWebSafeScheme(url::kDataScheme);
++  RegisterWebSafeScheme(url::kTraceScheme);
+   RegisterWebSafeScheme("feed");
+ 
+   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -1787,6 +1787,8 @@ component("net") {
+       "url_request/report_sender.h",
+       "url_request/static_http_user_agent_settings.cc",
+       "url_request/static_http_user_agent_settings.h",
++      "url_request/trk_protocol_handler.cc",
++      "url_request/trk_protocol_handler.h",
+       "url_request/url_fetcher.cc",
+       "url_request/url_fetcher.h",
+       "url_request/url_fetcher_core.cc",
+diff --git a/net/url_request/trk_protocol_handler.cc b/net/url_request/trk_protocol_handler.cc
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/trk_protocol_handler.cc
+@@ -0,0 +1,26 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "net/url_request/trk_protocol_handler.h"
++
++#include "base/logging.h"
++#include "net/base/net_errors.h"
++#include "net/url_request/url_request_error_job.h"
++
++namespace net {
++
++TrkProtocolHandler::TrkProtocolHandler() = default;
++
++URLRequestJob* TrkProtocolHandler::MaybeCreateJob(
++    URLRequest* request, NetworkDelegate* network_delegate) const {
++  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
++  return new URLRequestErrorJob(
++      request, network_delegate, ERR_BLOCKED_BY_CLIENT);
++}
++
++bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
++  return true;
++}
++
++}  // namespace net
+diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protocol_handler.h
+new file mode 100644
+--- /dev/null
++++ b/net/url_request/trk_protocol_handler.h
+@@ -0,0 +1,33 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "net/base/net_export.h"
++#include "net/url_request/url_request_job_factory.h"
++
++namespace net {
++
++class URLRequestJob;
++
++// Implements a ProtocolHandler for Trk jobs.
++class NET_EXPORT TrkProtocolHandler
++    : public URLRequestJobFactory::ProtocolHandler {
++ public:
++  TrkProtocolHandler();
++  URLRequestJob* MaybeCreateJob(
++      URLRequest* request,
++      NetworkDelegate* network_delegate) const override;
++  bool IsSafeRedirectTarget(const GURL& location) const override;
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
++};
++
++}  // namespace net
++
++#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
+diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
+--- a/net/url_request/url_request.cc
++++ b/net/url_request/url_request.cc
+@@ -15,6 +15,7 @@
+ #include "base/metrics/histogram_macros.h"
+ #include "base/rand_util.h"
+ #include "base/stl_util.h"
++#include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/synchronization/lock.h"
+ #include "base/threading/thread_task_runner_handle.h"
+@@ -42,6 +43,7 @@
+ #include "net/url_request/url_request_redirect_job.h"
+ #include "url/gurl.h"
+ #include "url/origin.h"
++#include "url/url_constants.h"
+ 
+ using base::Time;
+ using std::string;
+@@ -612,6 +614,12 @@ URLRequest::URLRequest(const GURL& url,
+   // Sanity check out environment.
+   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
+ 
++  if (!url.SchemeIs(url::kTraceScheme) &&
++      base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
++    LOG(ERROR) << "Block URL in URLRequest: " << url;
++    url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
++  }
++
+   context->url_requests()->insert(this);
+   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
+     return NetLogURLRequestConstructorParams(url, priority_,
+diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
+--- a/net/url_request/url_request_context_builder.cc
++++ b/net/url_request/url_request_context_builder.cc
+@@ -40,6 +40,7 @@
+ #include "net/ssl/ssl_config_service_defaults.h"
+ #include "net/url_request/data_protocol_handler.h"
+ #include "net/url_request/static_http_user_agent_settings.h"
++#include "net/url_request/trk_protocol_handler.h"
+ #include "net/url_request/url_request_context.h"
+ #include "net/url_request/url_request_context_storage.h"
+ #include "net/url_request/url_request_intercepting_job_factory.h"
+@@ -641,6 +642,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+     job_factory->SetProtocolHandler(url::kDataScheme,
+                                     std::make_unique<DataProtocolHandler>());
+ 
++  job_factory->SetProtocolHandler(url::kTraceScheme,
++                                  std::make_unique<TrkProtocolHandler>());
++
+ #if !BUILDFLAG(DISABLE_FILE_SUPPORT)
+   if (file_enabled_) {
+     job_factory->SetProtocolHandler(
+diff --git a/url/url_constants.cc b/url/url_constants.cc
+--- a/url/url_constants.cc
++++ b/url/url_constants.cc
+@@ -26,6 +26,7 @@ const char kHttpsScheme[] = "https";
+ const char kJavaScriptScheme[] = "javascript";
+ const char kMailToScheme[] = "mailto";
+ const char kTelScheme[] = "tel";
++const char kTraceScheme[] = "trk";
+ const char kWsScheme[] = "ws";
+ const char kWssScheme[] = "wss";
+ 
+diff --git a/url/url_constants.h b/url/url_constants.h
+--- a/url/url_constants.h
++++ b/url/url_constants.h
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char kHttpsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
+ COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kTelScheme[];
++COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWssScheme[];
+ 
+diff --git a/url/url_util.cc b/url/url_util.cc
+--- a/url/url_util.cc
++++ b/url/url_util.cc
+@@ -52,6 +52,7 @@ struct SchemeRegistry {
+       kHttpsScheme,
+       kAboutScheme,
+       kDataScheme,
++      kTraceScheme,
+       kWssScheme,
+   };
+ 
+@@ -67,6 +68,7 @@ struct SchemeRegistry {
+       kAboutScheme,
+       kJavaScriptScheme,
+       kDataScheme,
++      kTraceScheme,
+   };
+ 
+   // Schemes that can be sent CORS requests.
+-- 
+2.11.0
+

build/patches/Bromite-AdBlock-engine-for-SystemWebView.patch

@@ -1,572 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 14 Sep 2019 10:14:54 +0200
-Subject: Bromite AdBlock engine for SystemWebView
-
----
- android_webview/browser/net/aw_network_delegate.cc |  71 ++++
- android_webview/browser/net/aw_network_delegate.h  |   3 +
- net/BUILD.gn                                       |   7 +
- net/url_request/adblock_intercept.cc               | 389 +++++++++++++++++++++
- net/url_request/adblock_intercept.h                |  35 ++
- 5 files changed, 505 insertions(+)
- create mode 100644 net/url_request/adblock_intercept.cc
- create mode 100644 net/url_request/adblock_intercept.h
-
-diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
---- a/android_webview/browser/net/aw_network_delegate.cc
-+++ b/android_webview/browser/net/aw_network_delegate.cc
-@@ -20,9 +20,11 @@
- #include "net/base/proxy_server.h"
- #include "net/http/http_response_headers.h"
- #include "net/proxy_resolution/proxy_info.h"
-+#include "net/url_request/adblock_intercept.h"
- #include "net/url_request/url_request.h"
- 
- using content::BrowserThread;
-+using content::ResourceRequestInfo;
- 
- namespace android_webview {
- 
-@@ -49,6 +51,75 @@ AwNetworkDelegate::AwNetworkDelegate() {}
- AwNetworkDelegate::~AwNetworkDelegate() {
- }
- 
-+#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
-+#define EMPTYJS "data:text/javascript;base64,Cg=="
-+#define EMPTYCSS "data:text/css;base64,Cg=="
-+
-+static bool requestIntercepted(net::URLRequest* request, GURL* new_url) {
-+    bool block = false, isValidUrl;
-+
-+    // skip invalid URLs and browser-initiated requests (which have no initiator)
-+    auto initiator = request->initiator();
-+    isValidUrl = request->url().is_valid() && initiator.has_value();
-+    std::string scheme = request->url().scheme();
-+    if (isValidUrl && scheme.length()) {
-+      std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
-+        if ("http" != scheme && "https" != scheme) {
-+          isValidUrl = false;
-+        }
-+    }
-+    ResourceRequestInfo* info;
-+    if (isValidUrl) {
-+      info = ResourceRequestInfo::ForRequest(request);
-+    }
-+
-+    // there are no per-site nor global ad/content settings when using the SystemWebView
-+    bool adblock_enabled = true;
-+    if (isValidUrl && info) {
-+      auto resource_type = info->GetResourceType();
-+
-+      if (adblock_enabled
-+        && content::ResourceType::kMainFrame != resource_type
-+        && net::adblock_intercept(request->url(), initiator->host(), resource_type)) {
-+        block = true;
-+      }
-+
-+      if (block) {
-+        switch (resource_type) {
-+          case content::ResourceType::kImage:
-+          case content::ResourceType::kFavicon:
-+            *new_url = GURL(TRANSPARENT1PXGIF);
-+            break;
-+          case content::ResourceType::kScript:
-+            *new_url = GURL(EMPTYJS);
-+            break;
-+          case content::ResourceType::kStylesheet:
-+            *new_url = GURL(EMPTYCSS);
-+            break;
-+          default:
-+            *new_url = GURL("");
-+            return true;
-+        }
-+      }
-+    } // valid URL and info
-+  return false;
-+}
-+#undef TRANSPARENT1PXGIF
-+#undef EMPTYJS
-+#undef EMPTYCSS
-+
-+int AwNetworkDelegate::OnBeforeURLRequest(net::URLRequest* request,
-+                         net::CompletionOnceCallback callback,
-+                         GURL* new_url) {
-+  if (request) {
-+    // most requests will be modified rather than intercepted
-+    if (requestIntercepted(request, new_url))
-+      return net::ERR_BLOCKED_BY_ADMINISTRATOR;
-+  } // request
-+
-+  return net::OK;
-+}
-+
- int AwNetworkDelegate::OnBeforeStartTransaction(
-     net::URLRequest* request,
-     net::CompletionOnceCallback callback,
-diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
---- a/android_webview/browser/net/aw_network_delegate.h
-+++ b/android_webview/browser/net/aw_network_delegate.h
-@@ -22,6 +22,9 @@ class AwNetworkDelegate : public net::NetworkDelegateImpl {
- 
-  private:
-   // NetworkDelegate implementation.
-+  int OnBeforeURLRequest(net::URLRequest* request,
-+                         net::CompletionOnceCallback callback,
-+                         GURL* new_url) override;
-   int OnBeforeStartTransaction(net::URLRequest* request,
-                                net::CompletionOnceCallback callback,
-                                net::HttpRequestHeaders* headers) override;
-diff --git a/net/BUILD.gn b/net/BUILD.gn
---- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1842,6 +1842,13 @@ component("net") {
-       "url_request/websocket_handshake_userdata_key.h",
-     ]
- 
-+    if (is_android) {
-+      sources += [
-+        "url_request/adblock_intercept.cc",
-+        "url_request/adblock_intercept.h"
-+      ]
-+    }
-+
-     if (enable_reporting) {
-       sources += [
-         "network_error_logging/network_error_logging_service.cc",
-diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_intercept.cc
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/adblock_intercept.cc
-@@ -0,0 +1,389 @@
-+/*
-+    This file is part of Bromite.
-+
-+    Bromite is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    Bromite is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
-+*/
-+#include "adblock_intercept.h"
-+
-+#ifdef ADB_TESTER
-+#include <cstddef>
-+#include <cstdlib>
-+#include <string.h>
-+
-+#include "log.h"
-+#include <tld.h>
-+
-+#else
-+
-+#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-+#include <android/log.h>
-+
-+#endif
-+
-+#include "net/url_request/adblock_entries.h"
-+
-+namespace net {
-+
-+const char *LOG_TAG = "Bromite";
-+
-+#ifdef ADB_TESTER
-+int adblock_rules_count() { return ADBLOCK_ENTRY_COUNT; }
-+#endif
-+
-+// True if the given canonical |host| is "[www.]<domain_in_lower_case>.<TLD>"
-+// with a valid TLD. If |subdomain_permission| is ALLOW_SUBDOMAIN, we check
-+// against host "*.<domain_in_lower_case>.<TLD>" instead. Will return the TLD
-+// string in |tld|, if specified and the |host| can be parsed.
-+static bool is_first_party(const char *l_host, int len, const char *l_url_host,
-+                           int b_len) {
-+  size_t tld_length;
-+
-+#ifdef ADB_TESTER
-+  char *found_tld;
-+
-+  if (TLD_SUCCESS != tld_get_z(l_host, &found_tld))
-+    return false;
-+  tld_length = strlen(found_tld);
-+  if (tld_length == 0)
-+    return false;
-+#else
-+  tld_length = net::registry_controlled_domains::GetCanonicalHostRegistryLength(
-+      l_host, net::registry_controlled_domains::EXCLUDE_UNKNOWN_REGISTRIES,
-+      net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
-+  if ((tld_length == 0) || (tld_length == std::string::npos))
-+    return false;
-+#endif
-+
-+  const char *tld = l_host + len - tld_length;
-+
-+  // Removes any subdomain from origin host.
-+  int i = len - tld_length - 2, top_i = i;
-+  if (i < 0) {
-+    return false;
-+  }
-+  const char *domain = l_host;
-+  for (; i >= 0; i--) {
-+    if (l_host[i] == '.') {
-+      int p_len = top_i - i;
-+      // skip "co" in "co.uk", "org" in "org.uk"
-+      if (p_len <= 3) {
-+        tld -= p_len + 1;
-+        continue;
-+      }
-+
-+      // segment is long enough, accept it at as a domain
-+      domain = l_host + i;
-+      len -= i;
-+      break;
-+    }
-+  }
-+
-+#ifdef ADBLOCK_LOG
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                      "%s: extracted domain suffix: \"%s\" (TLD=\"%s\")",
-+                      l_host, domain, tld);
-+#endif
-+
-+  // Check if supplied URL host matches, including the dot.
-+  if (b_len < len) {
-+    return false;
-+  }
-+  for (int i = 0; i < len; i++) {
-+    if (l_url_host[b_len - 1 - i] != domain[len - 1 - i])
-+      return false;
-+  }
-+
-+  // pass with flying colors
-+  return true;
-+}
-+
-+static char *strtolower(const char *str, int len, bool &should_free) {
-+  char *ret = NULL;
-+  for (int i = 0; i < len; i++) {
-+    if ((65 <= str[i]) && (str[i] <= 90)) {
-+      // first time a difference is found, allocate buffer and copy previous
-+      // characters (if any)
-+      if (ret == NULL) {
-+        ret = (char *)malloc(len + 1);
-+        if (i != 0)
-+          memcpy(ret, str, i);
-+      }
-+      // convert character to lower case
-+      ret[i] = str[i] + 32;
-+    } else {
-+      if (ret != NULL)
-+        ret[i] = str[i];
-+    }
-+  }
-+
-+  if (ret != NULL) {
-+    ret[len] = '\0';
-+    should_free = true;
-+    return ret;
-+  }
-+
-+  // return source, unchanged
-+  return (char *)str;
-+}
-+
-+static char *strtosep(const char *str, int len) {
-+  char *ret = (char *)malloc(len + 3);
-+  ret[0] = '^';
-+  for (int i = 0; i < len; i++) {
-+    if ((str[i] == ':') || (str[i] == '/') || (str[i] == '?') ||
-+        (str[i] == '&') || (str[i] == '=')) {
-+      ret[i + 1] = '^';
-+    } else {
-+      ret[i + 1] = str[i];
-+    }
-+  }
-+  // the index 'len' character is set by the previous loop
-+  ret[len + 1] = '^';
-+  ret[len + 2] = '\0';
-+  return ret;
-+}
-+
-+static bool url_matches(const char *c_url, char *c_url_sep, char *c_url_lower,
-+                        char *c_url_lower_sep, adblock_entry *entry) {
-+  bool match = false;
-+  // select comparison string based on case and separator presence (separator
-+  // takes some shortcuts)
-+  bool match_case = ((entry->flags & ADBLOCK_FLAG_MATCH_CASE) != 0);
-+  bool match_separator = ((entry->flags & ADBLOCK_FLAG_HAS_SEPARATOR) != 0);
-+  const char *match_url =
-+      match_case ? (match_separator ? c_url_sep : c_url)
-+                 : (match_separator ? c_url_lower_sep : c_url_lower);
-+
-+#ifdef ADBLOCK_LOG_MORE
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[case:%d][sep:%d][%s]",
-+                      match_case, match_separator, match_url);
-+#endif
-+  // check for all match parts at >= position of last match
-+  const char *last = match_url;
-+  for (int m = 0; const char *url_match = entry->matches[m]; m++) {
-+    bool is_last_match = entry->matches[m + 1] == NULL;
-+    const char *pos = strstr(last, url_match);
-+    match = (pos != NULL);
-+
-+#ifdef ADBLOCK_LOG_MORE
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s][found:%d][match:%d]",
-+                        entry->matches[m], pos == NULL ? 0 : 1, match ? 1 : 0);
-+#endif
-+    // check if the url starts with the first match part
-+    if (match && (m == 0) && ((entry->flags & ADBLOCK_FLAG_MATCH_BEGIN) != 0) &&
-+        (pos != match_url))
-+      match = false;
-+
-+    // check if the url ends with the last match part
-+    if (match && is_last_match &&
-+        ((entry->flags & ADBLOCK_FLAG_MATCH_END) != 0) &&
-+        (pos != &match_url[strlen(match_url) - strlen(entry->matches[m])]))
-+      match = false;
-+
-+    // check domain match
-+    if (match && (m == 0) &&
-+        ((entry->flags & ADBLOCK_FLAG_MATCH_DOMAIN) != 0) &&
-+        (pos != match_url) && (pos[-1] != '^') && (pos[-1] != '.') &&
-+        (pos[-1] != '/'))
-+      match = false;
-+
-+    // short circuit
-+    if (!match)
-+      break;
-+  }
-+  return match;
-+}
-+
-+bool url_match_domain(adblock_entry *entry, const std::string &origin_host) {
-+  bool match_domain = true;
-+  // check for a negative domain match
-+  if (entry->domains_skip) {
-+    if (origin_host.empty()) {
-+      // skip this rule, cannot match on domain
-+      return false;
-+    }
-+    for (int d = 0; const char *domain = entry->domains_skip[d]; d++) {
-+      if (domain == origin_host) {
-+        match_domain = false;
-+        break;
-+      }
-+    }
-+  }
-+
-+  // check for a required positive domain match
-+  if (entry->domains) {
-+    if (origin_host.empty()) {
-+      // skip this rule, cannot match on domain
-+      return false;
-+    }
-+    for (int d = 0; const char *domain = entry->domains[d]; d++) {
-+      if (domain != origin_host) {
-+        match_domain = false;
-+        break;
-+      }
-+    }
-+  }
-+  return match_domain;
-+}
-+
-+static bool url_match_party(adblock_entry *entry, const char *l_origin_host,
-+                            int origin_host_len, const char *l_url_host,
-+                            int url_host_len, bool &checked_fp, bool &fp) {
-+  bool wanted_fp;
-+  if ((entry->flags & ADBLOCK_FLAG_THIRD_PARTY) != 0) {
-+    wanted_fp = false;
-+  } else if ((entry->flags & ADBLOCK_FLAG_FIRST_PARTY) != 0) {
-+    wanted_fp = true;
-+  } else {
-+    // no-op
-+    return true;
-+  }
-+
-+  if (origin_host_len == 0) {
-+    // cannot match this rule, no origin host to determine first/third party
-+    return false;
-+  }
-+
-+  if (!checked_fp) {
-+    // is the URL a first-party to the current page's host?
-+    fp = is_first_party(l_origin_host, origin_host_len, l_url_host,
-+                        url_host_len);
-+
-+    checked_fp = true;
-+#ifdef ADB_TESTER
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                        "is_first_party(\"%s\", \"%s\") = %s", l_origin_host,
-+                        l_url_host, fp ? "true" : "false");
-+#endif
-+  }
-+
-+  return fp == wanted_fp;
-+}
-+
-+static bool resource_type_match(adblock_entry *entry,
-+                                content::ResourceType resource_type) {
-+  bool exclude;
-+  if ((entry->flags & ADBLOCK_FLAG_RESOURCE_TYPE_IN) != 0) {
-+    exclude = false;
-+  } else if ((entry->flags & ADBLOCK_FLAG_RESOURCE_TYPE_NOT_IN) != 0) {
-+    exclude = true;
-+  } else {
-+    // no resource type matching
-+    return true;
-+  }
-+
-+  // use a bitwise trick to test for the current resource type
-+  bool found = (entry->flags & (int(resource_type) << 16));
-+  if (!exclude)
-+    return found;
-+  return !found;
-+}
-+
-+int adblock_intercept(const GURL &url, const std::string &origin_host,
-+                      content::ResourceType resource_type) {
-+  // these are verified on caller when not testing
-+#ifdef ADB_TESTER
-+  if (!url.is_valid() || !url.SchemeIsHTTPOrHTTPS()) {
-+    return 0;
-+  }
-+#endif
-+
-+  bool free1 = false, free2 = false, free3 = false, free4 = false;
-+  int url_len = url.spec().size();
-+  const char *c_url = url.spec().c_str();
-+  char *c_url_lower = strtolower(c_url, url_len, free1);
-+  char *c_url_sep = strtosep(c_url, url_len);
-+  char *c_url_lower_sep = strtolower(c_url_sep, url_len + 2, free4);
-+
-+  // might be empty in case of no host
-+  const char *origin_host_cstr = origin_host.c_str();
-+  int origin_host_len = origin_host.size(), url_host_len = url.host().size();
-+
-+  // lower-case version of origin and url hosts
-+  const char *c_origin_host_lower =
-+                 strtolower(origin_host_cstr, origin_host_len, free2),
-+             *c_url_host_lower =
-+                 strtolower(url.host().c_str(), url_host_len, free3);
-+
-+#ifdef ADBLOCK_LOG
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "[%s with host '%s'] [%s]",
-+                      c_url, url.host().c_str(), origin_host_cstr);
-+#endif
-+
-+  bool checked_fp = false, fp = false;
-+
-+  bool intercept = false;
-+  for (int i = 0; i < ADBLOCK_ENTRY_COUNT; i++) {
-+    adblock_entry *entry = &ADBLOCK_ENTRIES[i];
-+
-+    // no use checking rules when we're intercepting, or exceptions when not
-+    bool check =
-+        (!intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) == 0)) ||
-+        (intercept && ((entry->flags & ADBLOCK_FLAG_EXCEPTION) != 0));
-+    if (!check)
-+      continue;
-+
-+    // check for resource type
-+    if (!resource_type_match(entry, resource_type))
-+      continue;
-+
-+    // check for domain matches, a quick branch out if not matching
-+    if (!url_match_domain(entry, origin_host))
-+      continue;
-+
-+    // check on the URL matcher
-+    if (!url_matches(c_url, c_url_sep, c_url_lower, c_url_lower_sep, entry))
-+      continue;
-+
-+    // finally check first/third-party
-+    if (!url_match_party(entry, c_origin_host_lower, origin_host_len,
-+                         c_url_host_lower, url_host_len, checked_fp, fp))
-+      continue;
-+
-+#ifdef ADBLOCK_LOG
-+    if (!intercept) {
-+      __android_log_print(ANDROID_LOG_INFO, LOG_TAG,
-+                          "--> intercept (#%d: \"%s\") (%x)", i,
-+                          entry->matches[0], entry->flags);
-+    } else {
-+      __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "--> pass (%d) (#%d)", i,
-+                          entry->flags);
-+    }
-+#endif
-+    intercept = !intercept;
-+  } // for each entry
-+
-+  if (free3)
-+    free((void *)c_url_host_lower);
-+  if (free2)
-+    free((void *)c_origin_host_lower);
-+  free(c_url_sep);
-+  if (free1)
-+    free(c_url_lower);
-+  if (free4)
-+    free(c_url_lower_sep);
-+
-+  if (intercept) {
-+#ifdef ADBLOCK_LOG
-+    __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "blocked");
-+#endif
-+    return 1;
-+  }
-+#ifdef ADBLOCK_LOG
-+  __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "pass");
-+#endif
-+  return 0;
-+}
-+
-+} // namespace net
-diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_intercept.h
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/adblock_intercept.h
-@@ -0,0 +1,35 @@
-+/*
-+    This file is part of Bromite.
-+
-+    Bromite is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    Bromite is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-+#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
-+
-+#include "content/public/common/resource_type.h"
-+#include "url/gurl.h"
-+
-+namespace net {
-+
-+#ifdef ADB_TESTER
-+int adblock_rules_count();
-+#endif
-+
-+int adblock_intercept(const GURL &url, const std::string &origin_host,
-+                      content::ResourceType resource_type);
-+
-+} // namespace net
-+
-+#endif // NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
--- 
-2.11.0
-

build/patches/Bromite-AdBlockUpdaterService.patch

@@ -24,10 +24,10 @@ Download filters by checking Last-Modified header first
  .../content/browser/ruleset_version.cc             |   1 +
  .../content/browser/ruleset_version.h              |   5 +
  .../content/browser/verified_ruleset_dealer.cc     |   2 +
- .../core/browser/subresource_filter_features.cc    | 115 +---------
+ .../core/browser/subresource_filter_features.cc    | 113 +---------
  .../core/common/common_features.cc                 |   2 +-
  .../frame_host/navigation_throttle_runner.cc       |  10 -
- 20 files changed, 818 insertions(+), 147 deletions(-)
+ 20 files changed, 817 insertions(+), 146 deletions(-)
  create mode 100644 components/component_updater/adblock_updater_service.cc
  create mode 100644 components/component_updater/adblock_updater_service.h
  create mode 100644 components/component_updater/download_filters_task.cc
@@ -77,7 +77,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
  namespace extensions {
  class EventRouterForwarder;
  }
-@@ -233,6 +238,8 @@ class BrowserProcess {
+@@ -229,6 +234,8 @@ class BrowserProcess {
  
    virtual component_updater::ComponentUpdateService* component_updater() = 0;
  
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1017,6 +1017,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1009,6 +1009,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -135,7 +135,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
    component_updater::SupervisedUserWhitelistInstaller*
    supervised_user_whitelist_installer() override;
-@@ -362,6 +363,8 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -361,6 +362,8 @@ class BrowserProcessImpl : public BrowserProcess,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
  
@@ -147,7 +147,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1739,8 +1739,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1722,8 +1722,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
  
    PreBrowserStart();
  
@@ -163,7 +163,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -64,7 +64,6 @@
+@@ -65,7 +65,6 @@
  #include "chrome/browser/hid/chrome_hid_delegate.h"
  #include "chrome/browser/language/translate_frame_binder.h"
  #include "chrome/browser/lifetime/browser_shutdown.h"
@@ -171,7 +171,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/media/router/media_router_feature.h"
  #include "chrome/browser/media/router/presentation/presentation_service_delegate_impl.h"
  #include "chrome/browser/media/router/presentation/receiver_presentation_service_delegate_impl.h"
-@@ -80,7 +79,6 @@
+@@ -81,7 +80,6 @@
  #include "chrome/browser/net_benchmarking.h"
  #include "chrome/browser/notifications/platform_notification_service_factory.h"
  #include "chrome/browser/notifications/platform_notification_service_impl.h"
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
  #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
  #include "chrome/browser/password_manager/chrome_password_manager_client.h"
-@@ -4085,16 +4083,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4044,16 +4042,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      content::NavigationHandle* handle) {
    std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
  
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(ENABLE_PLUGINS)
    std::unique_ptr<content::NavigationThrottle> flash_url_throttle =
        FlashDownloadInterception::MaybeCreateThrottleFor(handle);
-@@ -4204,12 +4192,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4163,12 +4151,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
    }
  #endif
  
@@ -1231,7 +1231,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
    // If ad tagging is enabled, turn on the dryrun automatically.
    bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
    const struct {
-@@ -123,25 +61,18 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -123,23 +61,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
      bool enabled_by_default;
      Configuration (*factory_method)();
    } kAvailablePresetConfigurations[] = {
@@ -1240,11 +1240,8 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
         &Configuration::MakePresetForLiveRunOnPhishingSites},
        {kPresetPerformanceTestingDryRunOnAllSites, ad_tagging_enabled,
         &Configuration::MakePresetForPerformanceTestingDryRunOnAllSites},
--      {kPresetLiveRunForBetterAds, true,
-+      {kPresetLiveRunForBetterAds, false,
-        &Configuration::MakePresetForLiveRunForBetterAds},
-       {kPresetLiveRunOnAllSites, true,
-        &Configuration::MakePresetForLiveRunOnAllSites}};
+       {kPresetLiveRunForBetterAds, true,
+        &Configuration::MakePresetForLiveRunForBetterAds}};
  
 -  CommaSeparatedStrings enabled_presets(
 -      TakeVariationParamOrReturnEmpty(params, kEnablePresetsParameterName));
@@ -1260,7 +1257,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
        enabled_configurations.push_back(available_preset.factory_method());
      }
    }
-@@ -149,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -147,46 +78,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
    return enabled_configurations;
  }
  
@@ -1330,7 +1327,7 @@ diff --git a/content/browser/frame_host/navigation_throttle_runner.cc b/content/
  #include "content/browser/frame_host/mixed_content_navigation_throttle.h"
  #include "content/browser/frame_host/navigation_handle_impl.h"
  #include "content/browser/frame_host/navigator_delegate.h"
-@@ -118,15 +117,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
+@@ -120,15 +119,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
         devtools_instrumentation::CreateNavigationThrottles(handle)) {
      AddThrottle(std::move(throttle));
    }

build/patches/Canvas-fingerprinting-mitigations-for-image-data-and-webGL.patch

@@ -1,292 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 24 Mar 2018 05:18:03 +0100
-Subject: Canvas: fingerprinting mitigations for image data and webGL
-
-Disable webGL renderer info and modify the color data returned by ToBlob,
-ToDataURL and getImageData so that it will contain randomly manipulated
-pixels (maximum 20) 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.
----
- .../canvas/canvas2d/canvas_rendering_context_2d.cc |   3 +-
- .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
- third_party/blink/renderer/platform/BUILD.gn       |   4 +-
- .../platform/graphics/image_data_buffer.cc         |   5 +
- .../platform/graphics/static_bitmap_image.cc       | 156 +++++++++++++++++++++
- .../platform/graphics/static_bitmap_image.h        |   2 +
- 6 files changed, 169 insertions(+), 5 deletions(-)
-
-diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
---- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -33,7 +33,6 @@
- 
- #include "third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.h"
- 
--#include "base/rand_util.h"
- #include "base/metrics/histogram_functions.h"
- #include "third_party/blink/public/common/features.h"
- #include "third_party/blink/public/platform/platform.h"
-@@ -817,7 +816,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
-       "Canvas.TextMetrics.MeasureText", elapsed);
- 
-   // scale text metrics by 3/1000000th
--  auto shuffleFactor = 1 + (base::RandDouble() - 0.5) * 0.000003;
-+  auto shuffleFactor = 1 + (canvas()->GetDocument().GetShuffleFactorX() - 0.5) * 0.000003;
-   text_metrics->Shuffle(shuffleFactor);
- 
-   return text_metrics;
-diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
---- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
- 
- WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
-     WebGLRenderingContextBase* context) {
--  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
-+  return nullptr;
- }
- 
- bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
--  return true;
-+  return false;
- }
- 
- const char* WebGLDebugRendererInfo::ExtensionName() {
-diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
---- a/third_party/blink/renderer/platform/BUILD.gn
-+++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1394,7 +1394,9 @@ jumbo_component("platform") {
-     "//third_party/blink/renderer:non_test_config",
-   ]
- 
--  include_dirs = []
-+  include_dirs = [
-+    "//third_party/skia/include/private", # For shuffler in graphics/static_bitmap_image.cc
-+  ]
- 
-   public_deps = [
-     ":blink_platform_public_deps",
-diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
---- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-+++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-@@ -35,6 +35,8 @@
- #include <memory>
- 
- #include "base/memory/ptr_util.h"
-+#include "base/rand_util.h"
-+#include "base/logging.h"
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -127,6 +129,9 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
-                                           const SkPixmap& pixmap) const {
-   DCHECK(is_valid_);
- 
-+  // shuffle subchannel color data within the pixmap
-+  StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
-+
-   if (mime_type == kMimeTypeJpeg) {
-     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,8 @@
- 
- #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
- 
-+#include "base/rand_util.h"
-+#include "base/logging.h"
- #include "base/numerics/checked_math.h"
- #include "gpu/command_buffer/client/gles2_interface.h"
- #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
-@@ -15,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/include/private/SkColorData.h"
- #include "third_party/skia/include/core/SkSurface.h"
- #include "third_party/skia/include/gpu/GrContext.h"
- #include "v8/include/v8.h"
-@@ -154,10 +157,163 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
-   DCHECK(read_pixels_successful ||
-          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
-              rect.X(), rect.Y(), info.width(), info.height())));
-+
-+  ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
-+
-   result.Transfer(dest_contents);
-   return true;
- }
- 
-+// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
-+#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
-+
-+#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
-+
-+void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
-+  auto w = info.width() - srcX, h = info.height() - srcY;
-+
-+  // skip tiny images; info.width()/height() can also be 0
-+  if ((w < 8) || (h < 8)) {
-+    return;
-+  }
-+
-+  // generate the first random number here
-+  double shuffleX = base::RandDouble();
-+
-+  // cap maximum pixels to change
-+  auto pixels = (w + h) / 128;
-+  if (pixels > 20) {
-+    pixels = 20;
-+  } else if (pixels < 2) {
-+    pixels = 2;
-+  }
-+
-+  auto colorType = info.colorType();
-+  auto fRowBytes = info.minRowBytes(); // stride
-+
-+  DLOG(INFO) << "BRM: ShuffleSubchannelColorData() w=" << w << " h=" << h << " colorType=" << colorType << " fRowBytes=" << fRowBytes;
-+
-+  // second random number (for y/height)
-+  double shuffleY = base::RandDouble();
-+
-+  // calculate random coordinates using bisection
-+  auto currentW = w, currentH = h;
-+  for(;pixels >= 0; pixels--) {
-+    int x = currentW * shuffleX, y = currentH * shuffleY;
-+
-+    // calculate randomisation amounts for each RGB component
-+    uint8_t shuffleR = base::RandInt(0, 4);
-+    uint8_t shuffleG = (shuffleR + x) % 4;
-+    uint8_t shuffleB = (shuffleG + y) % 4;
-+
-+    // manipulate pixel data to slightly change the R, G, B components
-+    switch (colorType) {
-+      case kAlpha_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = SkColorSetARGB(a, r, g, b);
-+      }
-+      break;
-+      case kGray_8_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
-+         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
-+      }
-+      break;
-+      case kRGB_565_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         unsigned    r = SkPacked16ToR32(*pixel);
-+         unsigned    g = SkPacked16ToG32(*pixel);
-+         unsigned    b = SkPacked16ToB32(*pixel);
-+
-+         r = shuffleComponent(r, 31, shuffleR);
-+         g = shuffleComponent(g, 63, shuffleG);
-+         b = shuffleComponent(b, 31, shuffleB);
-+
-+         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
-+         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
-+         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
-+
-+         *pixel = r16 | g16 | b16;
-+      }
-+      break;
-+      case kARGB_4444_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
-+
-+         r = shuffleComponent(r, 15, shuffleR);
-+         g = shuffleComponent(g, 15, shuffleG);
-+         b = shuffleComponent(b, 15, shuffleB);
-+         // alpha is left unchanged
-+
-+         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
-+         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
-+         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
-+         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
-+
-+         *pixel = r4 | b4 | g4 | a4;
-+      }
-+      break;
-+      case kRGBA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
-+                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
-+      }
-+      break;
-+      case kBGRA_8888_SkColorType:
-+      {
-+         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
-+         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
-+
-+         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
-+         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
-+         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
-+         // alpha is left unchanged
-+
-+         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
-+                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
-+      }
-+      break;
-+      default:
-+         // the remaining formats are not expected to be used in Chromium
-+         LOG(WARNING) << "BRM: ShuffleSubchannelColorData(): Ignoring pixel format";
-+         return;
-+    }
-+
-+    // keep bisecting or reset current width/height as needed
-+    if (x == 0) {
-+       currentW = w;
-+    } else {
-+       currentW = x;
-+    }
-+    if (y == 0) {
-+       currentH = h;
-+    } else {
-+       currentH = y;
-+    }
-+  }
-+}
-+
-+#undef writable_addr
-+#undef shuffleComponent
-+
- const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
-   static const gpu::SyncToken sync_token;
-   return sync_token;
-diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
---- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-+++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
-   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
-                                                  const SkImageInfo&);
- 
-+  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
-+
-   bool IsStaticBitmapImage() const override { return true; }
- 
-   // Methods overridden by all sub-classes
--- 
-2.11.0
-

build/patches/Disable-HEAD-requests-for-single-word-Omnibar-searches.patch

@@ -0,0 +1,54 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Oct 2019 10:21:19 +0100
+Subject: Disable HEAD requests for single-word Omnibar searches
+
+Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
+---
+ chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc | 8 ++++----
+ chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h  | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
++++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+@@ -85,8 +85,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
+       shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
+       load_state_(LOAD_NOT_SEEN),
+       fetch_state_(FETCH_NOT_COMPLETE) {
+-  if (alternate_nav_match_.destination_url.is_valid())
+-    CreateLoader(alternate_nav_match_.destination_url);
++//  if (alternate_nav_match_.destination_url.is_valid())
++//    CreateLoader(alternate_nav_match_.destination_url);
+ 
+   // We need to start by listening to AllSources, since we don't know which tab
+   // the navigation might occur in.
+@@ -286,7 +286,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
+   delete this;
+ }
+ 
+-void ChromeOmniboxNavigationObserver::CreateLoader(
++/*void ChromeOmniboxNavigationObserver::CreateLoader(
+     const GURL& destination_url) {
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
+@@ -327,4 +327,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
+   loader_->SetAllowHttpErrorResults(true);
+   loader_->SetOnRedirectCallback(base::BindRepeating(
+       &ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
+-}
++}*/
+diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
++++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+@@ -127,7 +127,7 @@ class ChromeOmniboxNavigationObserver : public OmniboxNavigationObserver,
+ 
+   // Creates a URL loader for |destination_url| and stores it in |loader_|.
+   // Does not start the loader.
+-  void CreateLoader(const GURL& destination_url);
++  //void CreateLoader(const GURL& destination_url);
+ 
+   const base::string16 text_;
+   const AutocompleteMatch match_;
+-- 
+2.11.0
+

build/patches/Disable-NTP-remote-suggestions-by-default.patch

@@ -26,7 +26,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 +    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kOptionalImagesEnabledFeature{
-     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_DISABLED_BY_DEFAULT};
+     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
 -- 
 2.11.0
 

build/patches/Disable-Omaha-update-checks.patch

@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -439,7 +439,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
+@@ -465,7 +465,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
      base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kJellyBeanSupported{"JellyBeanSupported",

build/patches/Disable-all-promo-dialogs.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 12 Jun 2018 15:09:26 +0200
-Subject: Disable signin/data reduction promos
+Subject: Disable all promo dialogs
 
 ---
  .../chrome/browser/ChromeTabbedActivity.java       | 30 +---------------------
@@ -9,7 +9,7 @@ Subject: Disable signin/data reduction promos
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -785,35 +785,7 @@ public class ChromeTabbedActivity
+@@ -799,35 +799,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
          try (TraceEvent e = TraceEvent.scoped(
                       "ChromeTabbedActivity.createToolbarButtonInProductHelpController")) {
              ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();

build/patches/Disable-contextual-search-by-default.patch

@@ -2,10 +2,24 @@ From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 23 Nov 2016 09:26:51 -0500
 Subject: Disable contextual search by default
 
+Disable contextual search in preference by default
 ---
- chrome/browser/profiles/profile.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ .../src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java  | 2 +-
+ chrome/browser/profiles/profile.cc                                      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+@@ -423,7 +423,7 @@ public class PrefServiceBridge {
+      * @return Whether the Contextual Search feature was disabled by the user explicitly.
+      */
+     public boolean isContextualSearchDisabled() {
+-        return getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_DISABLED);
++        return !getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_ENABLED);
+     }
+ 
+     /**
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc

build/patches/Disable-data-saver.patch

@@ -1,59 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 27 Oct 2017 15:53:37 +0200
-Subject: Disable data saver
-
----
- .../datareduction/DataReductionPreferenceFragment.java  | 17 +++++------------
- chrome/android/java/strings/android_chrome_strings.grd  |  3 ---
- 2 files changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPreferenceFragment.java
-@@ -45,10 +45,10 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
-     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         PreferenceUtils.addPreferencesFromResource(this, R.xml.data_reduction_preferences);
-         getActivity().setTitle(R.string.data_reduction_title_lite_mode);
--        boolean isEnabled = DataReductionProxySettings.getInstance().isDataReductionProxyEnabled();
--        mIsEnabled = !isEnabled;
--        mWasEnabledAtCreation = isEnabled;
--        updatePreferences(isEnabled);
-+
-+        mIsEnabled = false;
-+        mWasEnabledAtCreation = false;
-+        updatePreferences(false);
- 
-         setHasOptionsMenu(true);
- 
-@@ -143,14 +143,7 @@ public class DataReductionPreferenceFragment extends PreferenceFragmentCompat {
-      * Returns summary string.
-      */
-     public static String generateSummary(Resources resources) {
--        if (DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
--            String percent =
--                    DataReductionProxySettings.getInstance().getContentLengthPercentSavings();
--            return resources.getString(
--                    R.string.data_reduction_menu_item_summary_lite_mode, percent);
--        } else {
--            return (String) resources.getText(R.string.text_off);
--        }
-+        return (String) resources.getText(R.string.text_off);
-     }
- 
-     private void createDataReductionSwitch(boolean isEnabled) {
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
---- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -1285,9 +1285,6 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_DATA_REDUCTION_DESCRIPTION_LITE_MODE" desc="Text describing how the Lite mode feature works. Seen only before the user has enabled the feature.">
-         When Lite mode is on, Chrome uses Google servers to make pages load faster. Lite mode rewrites very slow pages to load only essential content. Lite mode does not apply to Incognito tabs.
-       </message>
--      <message name="IDS_DATA_REDUCTION_MENU_ITEM_SUMMARY_LITE_MODE" desc="Label that states the percent of mobile data that was saved by Lite mode. Lite mode allows users to to reduce their mobile data usage by compressing network traffic.">
--        <ph name="PERCENT">%1$s<ex>49%</ex></ph> data savings
--      </message>
-       <message name="IDS_DATA_REDUCTION_SAVINGS_LABEL" desc="Data Reduction statistics label that states the amount of mobile data that was saved by Lite mode. Lite mode allows users to to reduce their mobile data usage by compressing network traffic.">
-         data saved
-       </message>
--- 
-2.11.0
-

build/patches/Disable-dynamic-module-loading.patch

@@ -13,7 +13,7 @@ Subject: Disable dynamic module loading
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -410,19 +410,6 @@ chrome_java_sources = [
+@@ -418,19 +418,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/customtabs/content/TabCreationMode.java",
    "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java",
    "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityModule.java",
@@ -36,7 +36,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 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
-@@ -62,7 +62,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
+@@ -66,7 +66,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.Int
  import org.chromium.chrome.browser.customtabs.content.TabCreationMode;
  import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityComponent;
  import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityModule;
@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
  import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
-@@ -129,9 +128,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -136,9 +135,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
  
      private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
  
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      private ActivityTabTaskDescriptionHelper mTaskDescriptionHelper;
  
      private CustomTabNightModeStateController mNightModeStateController;
-@@ -298,12 +294,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -308,12 +304,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
      public void finishNativeInitialization() {
          if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
  
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
          mSessionHandler = new SessionHandler() {
  
              @Override
-@@ -433,10 +423,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -432,10 +422,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
          WebContents webContents = tab == null ? null : tab.getWebContents();
          mConnection.resetPostMessageHandlerForSession(
                  mIntentDataProvider.getSession(), webContents);
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      }
  
      @Override
-@@ -791,10 +777,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -794,10 +780,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
          if (mIntentDataProvider.isTrustedWebActivity()) {
              component.resolveTrustedWebActivityCoordinator();
          }
@@ -92,15 +92,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.ChromeSwitches;
+@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.ChromeSwitches;
  import org.chromium.chrome.browser.ChromeVersionInfo;
  import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.browserservices.BrowserSessionDataProvider;
+ import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
  import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
  import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
  import org.chromium.chrome.browser.util.ColorUtils;
-@@ -870,20 +869,8 @@ public class CustomTabIntentDataProvider extends BrowserSessionDataProvider {
+@@ -460,20 +459,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          // even receive the extras for using the feature.
          if (componentName == null) return false;
  
@@ -122,20 +122,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 +        return false;
      }
  
-     /**
+     @NonNull
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -57,8 +57,6 @@ import org.chromium.chrome.browser.browserservices.SessionHandler;
- import org.chromium.chrome.browser.browserservices.SessionDataHolder;
- import org.chromium.chrome.browser.browserservices.Origin;
+@@ -59,8 +59,6 @@ import org.chromium.chrome.browser.browserservices.Origin;
  import org.chromium.chrome.browser.browserservices.PostMessageHandler;
+ import org.chromium.chrome.browser.browserservices.SessionDataHolder;
+ import org.chromium.chrome.browser.browserservices.SessionHandler;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleLoader;
 -import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
  import org.chromium.chrome.browser.device.DeviceClassManager;
  import org.chromium.chrome.browser.init.ChainedTasks;
  import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-@@ -217,7 +215,6 @@ public class CustomTabsConnection {
+@@ -219,7 +217,6 @@ public class CustomTabsConnection {
  
      private volatile ChainedTasks mWarmupTasks;
  
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      /**
       * <strong>DO NOT CALL</strong>
       * Public to be instanciable from {@link ChromeApplication}. This is however
-@@ -1354,7 +1351,6 @@ public class CustomTabsConnection {
+@@ -1373,7 +1370,6 @@ public class CustomTabsConnection {
          if (ChromeApplication.isSevereMemorySignal(level)) {
              getInstance().mClientManager.cleanupUnusedSessions();
          }
@@ -151,9 +151,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
      }
  
      @VisibleForTesting
-@@ -1495,32 +1491,6 @@ public class CustomTabsConnection {
-             CustomTabsSessionToken session, String url, String origin, int referrerPolicy,
-             @DetachedResourceRequestMotivation int motivation);
+@@ -1510,32 +1506,6 @@ public class CustomTabsConnection {
+         recordSpeculationStatusOnSwap(SPECULATION_STATUS_ON_SWAP_BACKGROUND_TAB_NOT_MATCHED);
+     }
  
 -    public ModuleLoader getModuleLoader(ComponentName componentName, @Nullable String assetName) {
 -        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE_DEX_LOADING)) {
@@ -187,7 +187,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-@@ -14,8 +14,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigatio
+@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigatio
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabFactory;
  import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
@@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/depe
  import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
  import org.chromium.chrome.browser.dependency_injection.ActivityScope;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
-@@ -31,8 +29,6 @@ import dagger.Subcomponent;
+@@ -32,8 +30,6 @@ import dagger.Subcomponent;
  @ActivityScope
  public interface CustomTabActivityComponent extends ChromeActivityComponent {
      TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();

build/patches/Disable-fetching-of-all-field-trials.patch

@@ -46,11 +46,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -239,17 +239,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
--#if !defined(GOOGLE_CHROME_BUILD)
+-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
 -  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kVariationsServerURL) &&
 -      !g_should_fetch_for_testing) {

build/patches/Disable-media-router-and-remoting-by-default.patch

@@ -52,7 +52,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -436,7 +436,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -444,7 +444,7 @@ void ProfileImpl::RegisterProfilePrefs(
    registry->RegisterStringPref(
        prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

build/patches/Disable-metrics-collection-for-NTP-tiles.patch

@@ -78,7 +78,7 @@ diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
      "most_visited_sites.cc",
      "most_visited_sites.h",
      "ntp_tile.cc",
-@@ -77,7 +75,6 @@ source_set("unit_tests") {
+@@ -78,7 +76,6 @@ source_set("unit_tests") {
      "custom_links_manager_impl_unittest.cc",
      "custom_links_store_unittest.cc",
      "icon_cacher_impl_unittest.cc",

build/patches/Disable-metrics-on-all-I-O-threads.patch

@@ -10,7 +10,7 @@ Subject: Disable metrics on all I/O threads
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -917,7 +917,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -909,7 +909,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  #endif  // defined(OS_CHROMEOS)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -22,15 +22,15 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -49,8 +49,6 @@
+@@ -47,8 +47,6 @@
+ #include "components/content_settings/core/browser/host_content_settings_map.h"
  #include "components/cookie_config/cookie_store_util.h"
- #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
  #include "components/dom_distiller/core/url_constants.h"
 -#include "components/metrics/metrics_pref_names.h"
 -#include "components/metrics/metrics_service.h"
  #include "components/net_log/chrome_net_log.h"
  #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
- #include "components/prefs/pref_service.h"
+ #include "components/signin/public/base/signin_pref_names.h"
 -- 
 2.11.0
 

build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch

@@ -11,7 +11,7 @@ a corresponding user option to individually disable their usage.
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -434,13 +434,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -433,13 +433,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;

build/patches/Disable-plugins-enumeration.patch

@@ -9,7 +9,7 @@ Subject: Disable plugins enumeration
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -1186,10 +1186,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1234,10 +1234,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {

build/patches/Disable-promos-displayed-in-bookmarks-manager.patch

@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      @Override
-@@ -397,19 +391,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -387,19 +381,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
          if (currentUIState == BookmarkUIState.STATE_SEARCHING) return;
  
          assert currentUIState == BookmarkUIState.STATE_FOLDER : "Unexpected UI state";
@@ -220,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
-@@ -167,8 +167,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -186,8 +186,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
          assert mDelegate != null;
  
          switch (viewType) {
@@ -229,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
              case ViewType.SYNC_PROMO:
                  return mPromoHeaderManager.createSyncPromoHolder(parent);
              case ViewType.FOLDER:
-@@ -183,10 +181,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -202,10 +200,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
  
      @Override
      public void onBindViewHolder(ViewHolder holder, int position) {
@@ -239,9 +239,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
 -        } else if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
 +        if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
              BookmarkRow row = ((BookmarkRow) holder.itemView);
-             row.setBookmarkId(getIdByPosition(position), getLocationFromPosition(position));
-             row.setDragHandleOnTouchListener((v, event) -> {
-@@ -201,13 +196,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+             BookmarkId id = getIdByPosition(position);
+             row.setBookmarkId(id, getLocationFromPosition(position));
+@@ -229,13 +224,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
  
      @Override
      public void onViewRecycled(ViewHolder holder) {
@@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
      }
  
      /**
-@@ -352,9 +340,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -404,9 +392,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
                  case BookmarkPromoHeader.PromoState.PROMO_NONE:
                      mPromoHeaderType = ViewType.INVALID_PROMO;
                      break;
@@ -265,9 +265,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
                  case BookmarkPromoHeader.PromoState.PROMO_SYNC:
                      mPromoHeaderType = ViewType.SYNC_PROMO;
                      break;
-@@ -475,4 +460,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
-             return Location.MIDDLE;
-         }
+@@ -571,4 +556,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+     private void clearHighlight() {
+         mHighlightedBookmark = null;
      }
 -}
 \ No newline at end of file

build/patches/Disable-search-ready-omnibox-by-default.patch

@@ -9,7 +9,7 @@ Subject: Disable search-ready omnibox by default
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -494,7 +494,7 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
+@@ -518,7 +518,7 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
                                           base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kSearchReadyOmniboxFeature{

build/patches/Disable-seed-based-field-trials.patch

@@ -9,7 +9,7 @@ Subject: Disable seed-based field trials
 diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
 --- a/components/variations/service/variations_field_trial_creator.cc
 +++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -526,8 +526,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+@@ -535,8 +535,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
  #endif  // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
    bool used_seed = false;
    if (!used_testing_config) {

build/patches/Disable-signin-and-data-saver-preferences.patch

@@ -1,326 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 14:23:07 +0200
-Subject: Disable signin and data saver preferences
-
-Never show the data saver promo snackbar
----
- chrome/android/java/res/xml/main_preferences.xml   | 20 -----
- .../android/java/res/xml/privacy_preferences.xml   |  4 -
- .../browser/preferences/MainPreferences.java       | 86 +---------------------
- .../preferences/privacy/PrivacyPreferences.java    | 12 ---
- .../java/strings/android_chrome_strings.grd        |  6 --
- 5 files changed, 1 insertion(+), 127 deletions(-)
-
-diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
---- a/chrome/android/java/res/xml/main_preferences.xml
-+++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -7,21 +7,6 @@
-     android:orderingFromXml="false">
- 
-     <android.support.v7.preference.PreferenceCategory
--        android:key="account_section"
--        android:order="0"
--        android:title="@string/prefs_section_account"/>
--    <org.chromium.chrome.browser.preferences.sync.SignInPreference
--        android:key="sign_in"
--        android:order="1"
--        android:title="@string/sign_in_to_chrome"/>
--    <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
--        android:key="sync_and_services"
--        android:order="2"
--        android:layout="@layout/account_management_account_row"
--        android:title="@string/prefs_sync_and_services"
--        android:fragment="org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences"/>
--
--    <android.support.v7.preference.PreferenceCategory
-         android:key="basics_section"
-         android:order="3"
-         android:title="@string/prefs_section_basics"/>
-@@ -91,11 +76,6 @@
-         android:order="16"
-         android:title="@string/prefs_languages"/>
-     <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
--        android:fragment="org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferenceFragment"
--        android:key="data_reduction"
--        android:order="17"
--        android:title="@string/data_reduction_title_lite_mode"/>
--    <org.chromium.chrome.browser.preferences.ChromeBasePreferenceCompat
-         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
-         android:key="downloads"
-         android:order="18"
-diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
---- a/chrome/android/java/res/xml/privacy_preferences.xml
-+++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -28,8 +28,4 @@
-         android:title="@string/clear_browsing_data_title"
-         android:summary="@string/clear_browsing_data_summary"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
--    <org.chromium.chrome.browser.preferences.TextMessagePreferenceCompat
--        android:key="sync_and_services_link"
--        android:summary="@string/privacy_sync_and_services_link"
--        app:allowDividerBelow="false" />
- </android.support.v7.preference.PreferenceScreen>
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
-@@ -17,13 +17,11 @@ import org.chromium.base.ContextUtils;
- import org.chromium.base.VisibleForTesting;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
--import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.night_mode.NightModeUtils;
- import org.chromium.chrome.browser.offlinepages.prefetch.PrefetchConfiguration;
- import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
- import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
- import org.chromium.chrome.browser.preferences.autofill_assistant.AutofillAssistantPreferences;
--import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferenceFragment;
- import org.chromium.chrome.browser.preferences.developer.DeveloperPreferences;
- import org.chromium.chrome.browser.preferences.sync.SignInPreference;
- import org.chromium.chrome.browser.preferences.sync.SyncPreferenceUtils;
-@@ -42,16 +40,11 @@ import java.util.Map;
-  * The main settings screen, shown when the user first opens Settings.
-  */
- public class MainPreferences extends PreferenceFragmentCompat
--        implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
--                   SigninManager.SignInStateObserver {
--    public static final String PREF_ACCOUNT_SECTION = "account_section";
--    public static final String PREF_SIGN_IN = "sign_in";
--    public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
-+        implements TemplateUrlService.LoadListener {
-     public static final String PREF_SEARCH_ENGINE = "search_engine";
-     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
-     public static final String PREF_HOMEPAGE = "homepage";
-     public static final String PREF_UI_THEME = "ui_theme";
--    public static final String PREF_DATA_REDUCTION = "data_reduction";
-     public static final String PREF_NOTIFICATIONS = "notifications";
-     public static final String PREF_LANGUAGES = "languages";
-     public static final String PREF_DOWNLOADS = "downloads";
-@@ -65,7 +58,6 @@ public class MainPreferences extends PreferenceFragmentCompat
- 
-     private final ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
-     private final Map<String, Preference> mAllPreferences = new HashMap<>();
--    private SignInPreference mSignInPreference;
- 
-     public MainPreferences() {
-         setHasOptionsMenu(true);
-@@ -88,35 +80,16 @@ public class MainPreferences extends PreferenceFragmentCompat
-     @Override
-     public void onDestroy() {
-         super.onDestroy();
--        mSignInPreference.onPreferenceFragmentDestroyed();
-     }
- 
-     @Override
-     public void onStart() {
-         super.onStart();
--        SigninManager signinManager = IdentityServicesProvider.getSigninManager();
--        if (signinManager.isSigninSupported()) {
--            signinManager.addSignInStateObserver(this);
--            mSignInPreference.registerForUpdates();
--        }
--        ProfileSyncService syncService = ProfileSyncService.get();
--        if (syncService != null) {
--            syncService.addSyncStateChangedListener(this);
--        }
-     }
- 
-     @Override
-     public void onStop() {
-         super.onStop();
--        SigninManager signinManager = IdentityServicesProvider.getSigninManager();
--        if (signinManager.isSigninSupported()) {
--            signinManager.removeSignInStateObserver(this);
--            mSignInPreference.unregisterForUpdates();
--        }
--        ProfileSyncService syncService = ProfileSyncService.get();
--        if (syncService != null) {
--            syncService.removeSyncStateChangedListener(this);
--        }
-     }
- 
-     @Override
-@@ -129,12 +102,9 @@ public class MainPreferences extends PreferenceFragmentCompat
-         PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
-         cachePreferences();
- 
--        mSignInPreference.setOnStateChangedCallback(this::onSignInPreferenceStateChanged);
--
-         updatePasswordsPreference();
- 
-         setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
--        setManagedPreferenceDelegateForPreference(PREF_DATA_REDUCTION);
- 
-         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-             // If we are on Android O+ the Notifications preference should lead to the Android
-@@ -188,7 +158,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-             Preference preference = getPreferenceScreen().getPreference(index);
-             mAllPreferences.put(preference.getKey(), preference);
-         }
--        mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
-     }
- 
-     private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -198,13 +167,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-     }
- 
-     private void updatePreferences() {
--        if (IdentityServicesProvider.getSigninManager().isSigninSupported()) {
--            addPreferenceIfAbsent(PREF_SIGN_IN);
--        } else {
--            removePreferenceIfPresent(PREF_SIGN_IN);
--        }
--
--        updateSyncAndServicesPreference();
-         updateSearchEnginePreference();
- 
-         Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-@@ -224,10 +186,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-         } else {
-             removePreferenceIfPresent(PREF_DEVELOPER);
-         }
--
--        ChromeBasePreferenceCompat dataReduction =
--                (ChromeBasePreferenceCompat) findPreference(PREF_DATA_REDUCTION);
--        dataReduction.setSummary(DataReductionPreferenceFragment.generateSummary(getResources()));
-     }
- 
-     private Preference addPreferenceIfAbsent(String key) {
-@@ -241,13 +199,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-         if (preference != null) getPreferenceScreen().removePreference(preference);
-     }
- 
--    private void updateSyncAndServicesPreference() {
--        ChromeBasePreferenceCompat syncAndServices =
--                (ChromeBasePreferenceCompat) findPreference(PREF_SYNC_AND_SERVICES);
--        syncAndServices.setIcon(SyncPreferenceUtils.getSyncStatusIcon(getActivity()));
--        syncAndServices.setSummary(SyncPreferenceUtils.getSyncStatusSummary(getActivity()));
--    }
--
-     private void updateSearchEnginePreference() {
-         if (!TemplateUrlServiceFactory.get().isLoaded()) {
-             ChromeBasePreferenceCompat searchEnginePref =
-@@ -279,28 +230,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-         pref.setSummary(getResources().getString(isOn ? R.string.text_on : R.string.text_off));
-     }
- 
--    // SigninManager.SignInStateObserver implementation.
--    @Override
--    public void onSignedIn() {
--        // After signing in or out of a managed account, preferences may change or become enabled
--        // or disabled.
--        new Handler().post(() -> updatePreferences());
--    }
--
--    @Override
--    public void onSignedOut() {
--        updatePreferences();
--    }
--
--    private void onSignInPreferenceStateChanged() {
--        // Remove "Account" section header if the personalized sign-in promo is shown.
--        if (mSignInPreference.getState() == SignInPreference.State.PERSONALIZED_PROMO) {
--            removePreferenceIfPresent(PREF_ACCOUNT_SECTION);
--        } else {
--            addPreferenceIfAbsent(PREF_ACCOUNT_SECTION);
--        }
--    }
--
-     // TemplateUrlService.LoadListener implementation.
-     @Override
-     public void onTemplateUrlServiceLoaded() {
-@@ -308,11 +237,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-         updateSearchEnginePreference();
-     }
- 
--    @Override
--    public void syncStateChanged() {
--        updateSyncAndServicesPreference();
--    }
--
-     @VisibleForTesting
-     ManagedPreferenceDelegateCompat getManagedPreferenceDelegateForTest() {
-         return mManagedPreferenceDelegate;
-@@ -322,9 +246,6 @@ public class MainPreferences extends PreferenceFragmentCompat
-         return new ManagedPreferenceDelegateCompat() {
-             @Override
-             public boolean isPreferenceControlledByPolicy(Preference preference) {
--                if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
--                    return DataReductionProxySettings.getInstance().isDataReductionProxyManaged();
--                }
-                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
-                     return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
-                 }
-@@ -333,11 +254,6 @@ public class MainPreferences extends PreferenceFragmentCompat
- 
-             @Override
-             public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
--                if (PREF_DATA_REDUCTION.equals(preference.getKey())) {
--                    DataReductionProxySettings settings = DataReductionProxySettings.getInstance();
--                    return settings.isDataReductionProxyManaged()
--                            && !settings.isDataReductionProxyEnabled();
--                }
-                 if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
-                     return TemplateUrlServiceFactory.get().isDefaultSearchManaged();
-                 }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -22,7 +22,6 @@ import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.preferences.PrefServiceBridge;
- import org.chromium.chrome.browser.preferences.PreferenceUtils;
- import org.chromium.chrome.browser.preferences.PreferencesLauncher;
--import org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
- import org.chromium.ui.text.NoUnderlineClickableSpan;
-@@ -37,7 +36,6 @@ public class PrivacyPreferences
-     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
-     private static final String PREF_USAGE_STATS = "usage_stats_reporting";
-     private static final String PREF_DO_NOT_TRACK = "do_not_track";
--    private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
- 
-     private ManagedPreferenceDelegateCompat mManagedPreferenceDelegate;
- 
-@@ -62,16 +60,6 @@ public class PrivacyPreferences
-         networkPredictionPref.setOnPreferenceChangeListener(this);
-         networkPredictionPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
- 
--        Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
--        NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> {
--            PreferencesLauncher.launchSettingsPageCompat(getActivity(),
--                    SyncAndServicesPreferences.class,
--                    SyncAndServicesPreferences.createArguments(false));
--        });
--        syncAndServicesLink.setSummary(
--                SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
--                        new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
--
-         updateSummaries();
-     }
- 
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
---- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -339,9 +339,6 @@ CHAR-LIMIT guidelines:
-       </message>
- 
-       <!-- Sign-in, sync and personalization preferences -->
--      <message name="IDS_PREFS_SECTION_ACCOUNT" desc="Title for the group of account-related entries in Settings. [CHAR-LIMIT=32]">
--        Account
--      </message>
-       <message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR-LIMIT=27]">
-         Sign in to Chrome
-       </message>
-@@ -412,9 +409,6 @@ CHAR-LIMIT guidelines:
-       <message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
-         Sends URLs of pages you visit to Google
-       </message>
--      <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK" desc="The text for Privacy preferences that is shown after all preference rows.">
--        For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK">&lt;link&gt;</ph>Sync and Google services<ph name="END_LINK">&lt;/link&gt;</ph>
--      </message>
-       <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
-         Help improve Chrome's features and performance
-       </message>
--- 
-2.11.0
-

build/patches/Disable-some-signed-exchange-features.patch

@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 2 Nov 2019 16:22:56 +0100
+Subject: Disable some signed exchange features
+
+---
+ content/public/common/content_features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
+--- a/content/public/common/content_features.cc
++++ b/content/public/common/content_features.cc
+@@ -508,7 +508,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+ // Signed Exchange Reporting for distributors
+ // https://www.chromestatus.com/features/5687904902840320
+ const base::Feature kSignedExchangeReportingForDistributors{
+-    "SignedExchangeReportingForDistributors", base::FEATURE_ENABLED_BY_DEFAULT};
++    "SignedExchangeReportingForDistributors", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Subresource prefetching+loading via Signed HTTP Exchange
+ // https://www.chromestatus.com/features/5126805474246656
+@@ -518,7 +518,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+ // Origin-Signed HTTP Exchanges (for WebPackage Loading)
+ // https://www.chromestatus.com/features/5745285984681984
+ const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
+-                                        base::FEATURE_ENABLED_BY_DEFAULT};
++                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Whether to send a ping to the inner URL upon navigation or not.
+ const base::Feature kSignedHTTPExchangePingValidity{
+-- 
+2.11.0
+

build/patches/Disable-sync-services-menu-entry.patch

@@ -0,0 +1,44 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 11 Nov 2019 23:09:48 +0100
+Subject: Disable sync services menu entry
+
+---
+ chrome/android/java/res/xml/main_preferences.xml    | 6 ------
+ chrome/android/java/res/xml/privacy_preferences.xml | 7 -------
+ 2 files changed, 13 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
++++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -14,12 +14,6 @@
+         android:key="sign_in"
+         android:order="1"
+         android:title="@string/sign_in_to_chrome"/>
+-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
+-        android:key="sync_and_services"
+-        android:order="2"
+-        android:layout="@layout/account_management_account_row"
+-        android:title="@string/prefs_sync_and_services"
+-        android:fragment="org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences"/>
+ 
+     <PreferenceCategory
+         android:key="basics_section"
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -33,12 +33,5 @@
+         android:title="@string/clear_browsing_data_title"
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
+-    <android.support.v7.preference.Preference
+-        android:key="sync_and_services_link_divider"
+-        android:layout="@layout/divider_preference"
+-        android:selectable="false"/>
+-    <org.chromium.chrome.browser.preferences.TextMessagePreference
+-        android:key="sync_and_services_link"
+-        android:summary="@string/privacy_sync_and_services_link"
+         app:allowDividerBelow="false" />
+ </PreferenceScreen>
+-- 
+2.11.0
+

build/patches/Disable-third-party-cookies-by-default.patch

@@ -17,8 +17,8 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
 -      prefs::kBlockThirdPartyCookies, false,
 +      prefs::kBlockThirdPartyCookies, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterBooleanPref(
-       prefs::kCookieControlsEnabled, false,
+   registry->RegisterIntegerPref(
+       prefs::kCookieControlsMode,
 -- 
 2.11.0
 

build/patches/Disable-unused-permissions.patch

@@ -1,507 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 14 Apr 2019 12:08:27 +0200
-Subject: Disable unused permissions
-
-Disable sync adaptive and invalidation services from manifest
-
-Prevents authorization prompt for Play services on reboot
-
-Fixes building with debug symbols:
-
-ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
->>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
->>>               impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
-
-Fixup more permission removal
----
- chrome/android/BUILD.gn                            |   4 +-
- chrome/android/java/AndroidManifest.xml            |  27 -----
- .../chromium/chrome/browser/ChromeActivity.java    |  34 ------
- .../invalidation/impl/invalidation_service_util.cc |  21 ----
- .../invalidation/impl/invalidation_service_util.h  |   6 +-
- .../signin/SystemAccountManagerDelegate.java       |  38 +------
- .../components/sync/AndroidSyncSettings.java       |  24 +---
- .../chromium/net/HttpNegotiateAuthenticator.java   | 122 +--------------------
- .../chromoting/base/OAuthTokenFetcher.java         |   2 -
- 9 files changed, 13 insertions(+), 265 deletions(-)
-
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
---- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -1131,8 +1131,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
-   resources = [
-     "java/res_template/xml/file_paths.xml",
-     "java/res_template/xml/launchershortcuts.xml",
--    "java/res_template/xml/searchable.xml",
--    "java/res_template/xml/syncadapter.xml",
-+    "java/res_template/xml/searchable.xml"
-   ]
-   res_dir = "java/res_template"
-   variables = [ "manifest_package=$chrome_public_manifest_package" ]
-@@ -1143,7 +1142,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
-     "java/res_template/xml/file_paths.xml",
-     "java/res_template/xml/launchershortcuts.xml",
-     "java/res_template/xml/searchable.xml",
--    "java/res_template/xml/syncadapter.xml",
-   ]
-   res_dir = "java/res_template"
- 
-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
-@@ -47,22 +47,16 @@ by a child template that "extends" this file.
-     {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %}
-         <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-     {% endif %}
--    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-     <uses-permission android:name="android.permission.INTERNET"/>
--    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
-     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
-     <uses-permission android:name="android.permission.NFC"/>
-     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
--    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
--    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
-     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
--    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-     <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
-     <uses-permission android:name="android.permission.VIBRATE"/>
-     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
--    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
-     {% set enable_vr = enable_vr|default(0) %}
-     {% if enable_vr == "true" %}
-     <!-- Indicates use of Android's VR-mode, available only on Android N+. -->
-@@ -103,8 +97,6 @@ by a child template that "extends" this file.
-     <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" />
--
-     {% block extra_uses_permissions %}
-     {% endblock %}
- 
-@@ -981,16 +973,6 @@ by a child template that "extends" this file.
-                 android:resource="@xml/file_paths" />
-         </provider>
- 
--        <!-- Sync adapter for browser invalidation. -->
--        <service android:name="org.chromium.chrome.browser.invalidation.ChromeBrowserSyncAdapterService"
--            android:exported="false">
--            <intent-filter>
--                <action android:name="android.content.SyncAdapter" />
--            </intent-filter>
--            <meta-data android:name="android.content.SyncAdapter"
--                       android:resource="@xml/syncadapter" />
--        </service>
--
-         <!-- Broadcast receiver that will be notified of account changes -->
-         <receiver android:name="org.chromium.chrome.browser.services.AccountsChangedReceiver">
-             <intent-filter>
-@@ -1098,15 +1080,6 @@ by a child template that "extends" this file.
-         <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"/>
--        <service android:name="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"
--            android:exported="false">
--            <intent-filter>
--              <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/>
--            </intent-filter>
--        </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"
-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
-@@ -126,8 +126,6 @@ import org.chromium.chrome.browser.share.ShareMenuActionHandler;
- import org.chromium.chrome.browser.snackbar.BottomContainer;
- import org.chromium.chrome.browser.snackbar.SnackbarManager;
- import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable;
--import org.chromium.chrome.browser.sync.ProfileSyncService;
--import org.chromium.chrome.browser.sync.SyncController;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabBrowserControlsState;
- import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
-@@ -265,9 +263,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-     @SuppressLint("NewApi")
-     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
- 
--    // Observes when sync becomes ready to create the mContextReporter.
--    private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
--
-     @Nullable
-     private ChromeFullscreenManager mFullscreenManager;
- 
-@@ -906,28 +901,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-     private void createContextReporterIfNeeded() {
-         if (!mStarted) return; // Sync state reporting should work only in started state.
-         if (mContextReporter != null || getActivityTab() == null) return;
--
--        final SyncController syncController = SyncController.get(this);
--        final ProfileSyncService syncService = ProfileSyncService.get();
--
--        if (syncController != null && syncController.isSyncingUrlsWithKeystorePassphrase()) {
--            assert syncService != null;
--            mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(this);
--
--            if (mSyncStateChangedListener != null) {
--                syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
--                mSyncStateChangedListener = null;
--            }
--
--            return;
--        } else {
--            ContextReporter.reportSyncStatus(syncService);
--        }
--
--        if (mSyncStateChangedListener == null && syncService != null) {
--            mSyncStateChangedListener = () -> createContextReporterIfNeeded();
--            syncService.addSyncStateChangedListener(mSyncStateChangedListener);
--        }
-     }
- 
-     @Override
-@@ -995,13 +968,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-         if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
-             GSAAccountChangeListener.getInstance().disconnect();
-         }
--        if (mSyncStateChangedListener != null) {
--            ProfileSyncService syncService = ProfileSyncService.get();
--            if (syncService != null) {
--                syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
--            }
--            mSyncStateChangedListener = null;
--        }
-         if (mContextReporter != null) mContextReporter.disable();
- 
-         super.onStopWithNative();
-diff --git a/components/invalidation/impl/invalidation_service_util.cc b/components/invalidation/impl/invalidation_service_util.cc
---- a/components/invalidation/impl/invalidation_service_util.cc
-+++ b/components/invalidation/impl/invalidation_service_util.cc
-@@ -12,27 +12,6 @@
- 
- namespace invalidation {
- 
--notifier::NotifierOptions ParseNotifierOptions(
--    const base::CommandLine& command_line) {
--  notifier::NotifierOptions notifier_options;
--
--  if (command_line.HasSwitch(switches::kSyncNotificationHostPort)) {
--    notifier_options.xmpp_host_port =
--        net::HostPortPair::FromString(
--            command_line.GetSwitchValueASCII(
--                switches::kSyncNotificationHostPort));
--    DVLOG(1) << "Using " << notifier_options.xmpp_host_port.ToString()
--             << " for test sync notification server.";
--  }
--
--  notifier_options.allow_insecure_connection =
--      command_line.HasSwitch(switches::kSyncAllowInsecureXmppConnection);
--  DVLOG_IF(1, notifier_options.allow_insecure_connection)
--      << "Allowing insecure XMPP connections.";
--
--  return notifier_options;
--}
--
- std::string GenerateInvalidatorClientId() {
-   // Generate a GUID with 128 bits worth of base64-encoded randomness.
-   // This format is similar to that of sync's cache_guid.
-diff --git a/components/invalidation/impl/invalidation_service_util.h b/components/invalidation/impl/invalidation_service_util.h
---- a/components/invalidation/impl/invalidation_service_util.h
-+++ b/components/invalidation/impl/invalidation_service_util.h
-@@ -5,7 +5,7 @@
- #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
- #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_UTIL_H_
- 
--#include "jingle/notifier/base/notifier_options.h"
-+#include <string>
- 
- namespace base {
- class CommandLine;
-@@ -13,10 +13,6 @@ class CommandLine;
- 
- namespace invalidation {
- 
--// Parses the given command line for notifier options.
--notifier::NotifierOptions ParseNotifierOptions(
--    const base::CommandLine& command_line);
--
- // Generates a unique client ID for the invalidator.
- std::string GenerateInvalidatorClientId();
- 
-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
-@@ -167,16 +167,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
- 
-     @Override
-     public boolean hasFeatures(Account account, String[] features) {
--        if (!hasGetAccountsPermission()) {
--            return false;
--        }
--        try {
--            return mAccountManager.hasFeatures(account, features, null, null).getResult();
--        } catch (AuthenticatorException | IOException e) {
--            Log.e(TAG, "Error while checking features: ", e);
--        } catch (OperationCanceledException e) {
--            Log.e(TAG, "Checking features was cancelled. This should not happen.");
--        }
-         return false;
-     }
- 
-@@ -216,32 +206,10 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
-     public void updateCredentials(
-             Account account, Activity activity, final Callback<Boolean> callback) {
-         ThreadUtils.assertOnUiThread();
--        if (!hasManageAccountsPermission()) {
--            if (callback != null) {
--                ThreadUtils.postOnUiThread(() -> callback.onResult(false));
--            }
--            return;
-+        if (callback != null) {
-+            ThreadUtils.postOnUiThread(() -> callback.onResult(false));
-         }
--
--        AccountManagerCallback<Bundle> realCallback = future -> {
--            Bundle bundle = null;
--            try {
--                bundle = future.getResult();
--            } catch (AuthenticatorException | IOException e) {
--                Log.e(TAG, "Error while update credentials: ", e);
--            } catch (OperationCanceledException e) {
--                Log.w(TAG, "Updating credentials was cancelled.");
--            }
--            boolean success =
--                    bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
--            if (callback != null) {
--                callback.onResult(success);
--            }
--        };
--        // Android 4.4 throws NullPointerException if null is passed
--        Bundle emptyOptions = new Bundle();
--        mAccountManager.updateCredentials(
--                account, "android", emptyOptions, activity, realCallback, null);
-+        return;
-     }
- 
-     protected boolean hasGetAccountsPermission() {
-diff --git a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
---- a/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
-+++ b/components/sync/android/java/src/org/chromium/components/sync/AndroidSyncSettings.java
-@@ -212,13 +212,7 @@ public class AndroidSyncSettings {
- 
-     private void setChromeSyncEnabled(boolean value) {
-         synchronized (mLock) {
--            updateSyncability(null);
--            if (value == mChromeSyncEnabled || mAccount == null) return;
--            mChromeSyncEnabled = value;
--
--            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
--            mSyncContentResolverDelegate.setSyncAutomatically(mAccount, mContractAuthority, value);
--            StrictMode.setThreadPolicy(oldPolicy);
-+            mChromeSyncEnabled = false;
-         }
-         notifyObservers();
-     }
-@@ -299,19 +293,9 @@ public class AndroidSyncSettings {
-             boolean oldChromeSyncEnabled = mChromeSyncEnabled;
-             boolean oldMasterSyncEnabled = mMasterSyncEnabled;
- 
--            StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
--            if (mAccount != null) {
--                mIsSyncable =
--                        mSyncContentResolverDelegate.getIsSyncable(mAccount, mContractAuthority)
--                        == 1;
--                mChromeSyncEnabled = mSyncContentResolverDelegate.getSyncAutomatically(
--                        mAccount, mContractAuthority);
--            } else {
--                mIsSyncable = false;
--                mChromeSyncEnabled = false;
--            }
--            mMasterSyncEnabled = mSyncContentResolverDelegate.getMasterSyncAutomatically();
--            StrictMode.setThreadPolicy(oldPolicy);
-+            mIsSyncable = false;
-+            mChromeSyncEnabled = false;
-+            mMasterSyncEnabled = false;
- 
-             return oldChromeSyncEnabled != mChromeSyncEnabled
-                     || oldMasterSyncEnabled != mMasterSyncEnabled;
-diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
---- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
-+++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
-@@ -96,50 +96,7 @@ public class HttpNegotiateAuthenticator {
- 
-         @Override
-         public void run(AccountManagerFuture<Account[]> future) {
--            Account[] accounts;
--            try {
--                accounts = future.getResult();
--            } catch (OperationCanceledException | AuthenticatorException | IOException e) {
--                Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
--                nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
--                return;
--            }
--
--            if (accounts.length == 0) {
--                Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
--                                + "authentication. Please verify the configuration policies and "
--                                + "that the CONTACTS runtime permission is granted. ");
--                nativeSetResult(mRequestData.nativeResultObject,
--                        NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
--                return;
--            }
--
--            if (accounts.length > 1) {
--                Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
--                                + "kerberos authentication. Please fix the configuration by "
--                                + "providing a single account.",
--                        accounts.length);
--                nativeSetResult(mRequestData.nativeResultObject,
--                        NetError.ERR_MISSING_AUTH_CREDENTIALS, null);
--                return;
--            }
--
--            if (lacksPermission(ContextUtils.getApplicationContext(),
--                        "android.permission.USE_CREDENTIALS", true)) {
--                // Protecting the AccountManager#getAuthToken call.
--                // API  < 23 Requires the USE_CREDENTIALS permission or throws an exception.
--                // API >= 23 USE_CREDENTIALS permission is removed
--                Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
--                                + "granted. Aborting authentication.");
--                nativeSetResult(mRequestData.nativeResultObject,
--                        NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
--                return;
--            }
--            mRequestData.account = accounts[0];
--            mRequestData.accountManager.getAuthToken(mRequestData.account,
--                    mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
--                    new GetTokenCallback(mRequestData),
--                    new Handler(ThreadUtils.getUiThreadLooper()));
-+            // account-based authentication removed for privacy-violations concerns
-         }
-     }
- 
-@@ -152,41 +109,7 @@ public class HttpNegotiateAuthenticator {
- 
-         @Override
-         public void run(AccountManagerFuture<Bundle> future) {
--            Bundle result;
--            try {
--                result = future.getResult();
--            } catch (OperationCanceledException | AuthenticatorException | IOException e) {
--                Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
--                nativeSetResult(mRequestData.nativeResultObject, NetError.ERR_UNEXPECTED, null);
--                return;
--            }
--
--            if (result.containsKey(AccountManager.KEY_INTENT)) {
--                final Context appContext = ContextUtils.getApplicationContext();
--
--                // We wait for a broadcast that should be sent once the user is done interacting
--                // with the notification
--                // TODO(dgn) We currently hang around if the notification is swiped away, until
--                // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
--                // unrelated then we would wait again here. Maybe we should limit the number of
--                // retries in some way?
--                BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
--
--                    @Override
--                    public void onReceive(Context context, Intent intent) {
--                        appContext.unregisterReceiver(this);
--                        mRequestData.accountManager.getAuthToken(mRequestData.account,
--                                mRequestData.authTokenType, mRequestData.options,
--                                true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
--                                null);
--                    }
--
--                };
--                appContext.registerReceiver(broadcastReceiver,
--                        new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
--            } else {
--                processResult(result, mRequestData);
--            }
-+            // ditto
-         }
-     }
- 
-@@ -300,22 +223,7 @@ public class HttpNegotiateAuthenticator {
-      */
-     private void requestTokenWithoutActivity(
-             Context ctx, RequestData requestData, String[] features) {
--        if (lacksPermission(ctx, Manifest.permission.GET_ACCOUNTS, true /* onlyPreM */)) {
--            // Protecting the AccountManager#getAccountsByTypeAndFeatures call.
--            // API  < 23 Requires the GET_ACCOUNTS permission or throws an exception.
--            // API >= 23 Requires the GET_ACCOUNTS permission (CONTACTS permission group) or
--            //           returns only the accounts whose authenticator has a signature that
--            //           matches our app. Working with this restriction and not requesting
--            //           the permission is a valid use case in the context of WebView, so we
--            //           don't require it on M+
--            Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: GET_ACCOUNTS permission not "
--                            + "granted. Aborting authentication.");
--            nativeSetResult(requestData.nativeResultObject,
--                    NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
--            return;
--        }
--        requestData.accountManager.getAccountsByTypeAndFeatures(mAccountType, features,
--                new GetAccountsCallback(requestData), new Handler(ThreadUtils.getUiThreadLooper()));
-+        // ditto
-     }
- 
-     /**
-@@ -334,29 +242,7 @@ public class HttpNegotiateAuthenticator {
-      */
-     private void requestTokenWithActivity(
-             Context ctx, Activity activity, RequestData requestData, String[] features) {
--        boolean isPreM = Build.VERSION.SDK_INT < Build.VERSION_CODES.M;
--        String permission = isPreM
--                ? "android.permission.MANAGE_ACCOUNTS"
--                : Manifest.permission.GET_ACCOUNTS;
--
--        // Check if the AccountManager#getAuthTokenByFeatures call can be made.
--        // API  < 23 Requires the MANAGE_ACCOUNTS permission.
--        // API >= 23 Requires the GET_ACCOUNTS permission to behave properly. When it's not granted,
--        //           accounts not managed by the current application can't be retrieved. Depending
--        //           on the authenticator implementation, it might prompt to create an account, but
--        //           that won't be saved. This would be a bad user experience, so we also consider
--        //           it a failure case.
--        if (lacksPermission(ctx, permission, isPreM)) {
--            Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: %s permission not granted. "
--                       + "Aborting authentication", permission);
--            nativeSetResult(requestData.nativeResultObject,
--                    NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
--            return;
--        }
--
--        requestData.accountManager.getAuthTokenByFeatures(mAccountType, requestData.authTokenType,
--                features, activity, null, requestData.options, new GetTokenCallback(requestData),
--                new Handler(ThreadUtils.getUiThreadLooper()));
-+        // ditto
-     }
- 
-     /**
-diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
---- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
-+++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
-@@ -92,7 +92,6 @@ public class OAuthTokenFetcher {
- 
-     /** Begins fetching a token. Should be called on the main thread. */
-     public void fetch() {
--        fetchImpl(null);
-     }
- 
-     /**
-@@ -101,7 +100,6 @@ public class OAuthTokenFetcher {
-      * @param expiredToken A previously-fetched token which has expired.
-      */
-     public void clearAndFetch(String expiredToken) {
--        fetchImpl(expiredToken);
-     }
- 
-     private void fetchImpl(final String expiredToken) {
--- 
-2.11.0
-

build/patches/Disable-update-scheduler.patch

@@ -9,7 +9,7 @@ Subject: Disable update scheduler
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
-@@ -35,10 +35,7 @@ public class UpdateScheduler {
+@@ -36,10 +36,7 @@ public class UpdateScheduler {
  
      @CalledByNative
      /* package */ static boolean isAvailable() {
@@ -21,10 +21,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updat
      }
  
      /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
-@@ -108,4 +105,4 @@ public class UpdateScheduler {
- 
-     private native void nativeOnStartTask(long nativeBackgroundTaskUpdateScheduler);
-     private native void nativeOnStopTask(long nativeBackgroundTaskUpdateScheduler);
+@@ -112,4 +109,4 @@ public class UpdateScheduler {
+         void onStartTask(long nativeBackgroundTaskUpdateScheduler, UpdateScheduler caller);
+         void onStopTask(long nativeBackgroundTaskUpdateScheduler, UpdateScheduler caller);
+     }
 -}
 \ No newline at end of file
 +}

build/patches/Do-not-grant-notifications-to-default-search-engine.patch

@@ -63,7 +63,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -270,7 +270,7 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
+@@ -288,7 +288,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
  #if defined(OS_ANDROID)
  // Enable changing default downloads storage location on Android.
  const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",

build/patches/Do-not-ignore-download-location-prompt-setting.patch

@@ -6,13 +6,13 @@ Upstream has decided that it works as intended (https://bugs.chromium.org/p/chro
 but users would like to decide where to save a file even when there is no SD card available;
 do not skip the prompt in such cases.
 ---
- .../download/DownloadLocationDialogBridge.java     | 71 +++++++---------------
- 1 file changed, 21 insertions(+), 50 deletions(-)
+ .../download/DownloadLocationDialogBridge.java     | 73 +++++++---------------
+ 1 file changed, 21 insertions(+), 52 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadLocationDialogBridge.java
-@@ -31,9 +31,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+@@ -32,9 +32,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
      private PropertyModel mDialogModel;
      private DownloadLocationCustomView mCustomView;
      private ModalDialogManager mModalDialogManager;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
      private Context mContext;
  
      private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) {
-@@ -66,12 +63,28 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+@@ -67,12 +64,28 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
  
          mModalDialogManager = activity.getModalDialogManager();
          mContext = activity;
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
      }
  
      @Override
-@@ -104,48 +117,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+@@ -105,50 +118,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
          mCustomView = null;
      }
  
@@ -74,7 +74,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 -                assert(!TextUtils.isEmpty(dir.location));
 -                PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory(
 -                        dir.location);
--                nativeOnComplete(mNativeDownloadLocationDialogBridge, mSuggestedPath);
+-                DownloadLocationDialogBridgeJni.get().onComplete(
+-                        mNativeDownloadLocationDialogBridge, DownloadLocationDialogBridge.this,
+-                        mSuggestedPath);
 -            }
 -            return;
 -        }

build/patches/Do-not-store-passwords-by-default.patch

@@ -9,7 +9,7 @@ Subject: Do not store passwords by default
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -359,10 +359,10 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -202,10 +202,10 @@ void PasswordManager::RegisterProfilePrefs(
    registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
                                  false);
    registry->RegisterBooleanPref(

build/patches/Enable-changing-default-downloads-storage-location-by-default.patch

@@ -9,7 +9,7 @@ Subject: Enable changing default downloads storage location by default
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -270,7 +270,7 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
+@@ -288,7 +288,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
  #if defined(OS_ANDROID)
  // Enable changing default downloads storage location on Android.
  const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",

build/patches/Enable-download-rename-option-by-default.patch

@@ -9,8 +9,8 @@ Subject: Enable download rename option by default
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -395,7 +395,7 @@ const base::Feature kDownloadHomeShowStorageInfo{
-     "DownloadHomeShowStorageInfo", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -421,7 +421,7 @@ const base::Feature kDownloadNotificationBadge{
+     "DownloadNotificationBadge", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kDownloadRename{"DownloadRename",
 -                                    base::FEATURE_DISABLED_BY_DEFAULT};

build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -288,6 +288,10 @@ config("compiler") {
+@@ -282,6 +282,10 @@ config("compiler") {
        }
      }
  
@@ -52,7 +52,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 +
      # Linker warnings.
      if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
-         !(is_android && use_order_profiling) && !is_mac && !is_ios &&
+         !is_mac && !is_ios && current_os != "aix") {
 -- 
 2.11.0
 

build/patches/Enable-night-mode-menu-entry-by-default.patch

@@ -9,7 +9,7 @@ Subject: Enable night mode menu entry by default
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -235,7 +235,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
+@@ -246,7 +246,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
      "AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT};
  
  const base::Feature kAndroidNightMode{"AndroidNightMode",

build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch

@@ -9,7 +9,7 @@ Subject: Enable site per process isolation for devices with enough memory
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -609,11 +609,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
+@@ -617,11 +617,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
  // browser_features, as they are only used on the browser side.
  const base::Feature kSitePerProcess {
    "site-per-process",
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
  };
  
  // Controls a mode for dynamically process-isolating sites where the user has
-@@ -635,7 +631,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+@@ -643,7 +639,7 @@ const base::Feature kSiteIsolationForPasswordSites{
  // base::SysInfo::AmountOfPhysicalMemoryMB().
  const base::Feature kSitePerProcessOnlyForHighMemoryClients{
      "site-per-process-only-for-high-memory-clients",

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

@@ -9,7 +9,7 @@ Subject: Fix crash when accessing page info / site settings
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
-@@ -713,6 +713,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+@@ -761,6 +761,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
    if (status != CONTENT_SETTING_DEFAULT)
      return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
    PermissionContextBase* context = GetPermissionContext(permission);

build/patches/Hide-passwords-manager-link.patch

@@ -9,7 +9,7 @@ Subject: Hide passwords manager link
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
-@@ -242,7 +242,7 @@ public class SavePasswordsPreferences
+@@ -251,7 +251,7 @@ public class SavePasswordsPreferences
              return;
          }
  
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas
  
          PreferenceGroup passwordParent;
          if (mSearchQuery == null) {
-@@ -317,7 +317,7 @@ public class SavePasswordsPreferences
+@@ -326,7 +326,7 @@ public class SavePasswordsPreferences
              return;
          }
  

build/patches/Increase-number-of-autocomplete-matches-from-5-to-10.patch

@@ -0,0 +1,49 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Oct 2019 10:18:39 +0100
+Subject: Increase number of autocomplete matches from 5 to 10
+
+Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526874703
+---
+ components/omnibox/browser/autocomplete_result.cc | 7 ++-----
+ components/omnibox/browser/omnibox_field_trial.cc | 3 ++-
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
+--- a/components/omnibox/browser/autocomplete_result.cc
++++ b/components/omnibox/browser/autocomplete_result.cc
+@@ -48,17 +48,14 @@ struct MatchGURLHash {
+ // static
+ size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
+ #if (defined(OS_ANDROID))
+-  constexpr size_t kDefaultMaxAutocompleteMatches = 5;
++  constexpr size_t kDefaultMaxAutocompleteMatches = 10; // was 6, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
+   if (is_zero_suggest)
+     return kDefaultMaxAutocompleteMatches;
+ #else
+   constexpr size_t kDefaultMaxAutocompleteMatches = 6;
+ #endif  // defined(OS_ANDROID)
+ 
+-  return base::GetFieldTrialParamByFeatureAsInt(
+-      omnibox::kUIExperimentMaxAutocompleteMatches,
+-      OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam,
+-      kDefaultMaxAutocompleteMatches);
++  return kDefaultMaxAutocompleteMatches;
+ }
+ 
+ AutocompleteResult::AutocompleteResult() {
+diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
+--- a/components/omnibox/browser/omnibox_field_trial.cc
++++ b/components/omnibox/browser/omnibox_field_trial.cc
+@@ -321,7 +321,8 @@ void OmniboxFieldTrial::GetDemotionsByType(
+ 
+ size_t OmniboxFieldTrial::GetProviderMaxMatches(
+     AutocompleteProvider::Type provider) {
+-  size_t default_max_matches_per_provider = 3;
++  size_t default_max_matches_per_provider = 5; // was 3; this needs to be half the value of kDefaultMaxAutocompleteMatches from components/omnibox/browser/autocomplete_result.cc
++  return default_max_matches_per_provider;
+ 
+   std::string param_value = base::GetFieldTrialParamValueByFeature(
+       omnibox::kUIExperimentMaxAutocompleteMatches,
+-- 
+2.11.0
+

build/patches/Modify-default-preferences.patch

@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1177,7 +1177,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1150,7 +1150,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -113,7 +113,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/navigation_correction_tab_observer.cc b/chrome/browser/ui/navigation_correction_tab_observer.cc
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -55,7 +55,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
+@@ -42,7 +42,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
  // static
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
@@ -151,7 +151,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -425,10 +425,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
+@@ -516,10 +516,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
    bool enabled = IsAutofillEnabled();
    sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState()
                                 : AutofillSyncSigninState::kNumSyncStates;
@@ -163,7 +163,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
  
    return enabled;
  }
-@@ -704,10 +701,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
+@@ -803,10 +800,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
        // suggestions available.
        // TODO(mathp): Differentiate between number of suggestions available
        // (current metric) and number shown to the user.
@@ -175,7 +175,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
      }
    }
  
-@@ -1311,8 +1305,8 @@ void AutofillManager::Reset() {
+@@ -1427,8 +1421,8 @@ void AutofillManager::Reset() {
  #if defined(OS_ANDROID) || defined(OS_IOS)
    autofill_assistant_.Reset();
  #endif
@@ -189,7 +189,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -146,7 +146,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -150,7 +150,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
        prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
@@ -201,7 +201,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -433,12 +433,12 @@ void GetBookmarksMatchingProperties(BookmarkModel* model,
+@@ -443,12 +443,12 @@ bool DoesBookmarkContainWords(const base::string16& title,
  void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kShowBookmarkBar,
@@ -219,7 +219,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components/safe_browsing/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -153,9 +153,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -167,9 +167,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(

build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch

@@ -0,0 +1,732 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 30 Mar 2018 10:09:03 +0200
+Subject: Multiple fingerprinting mitigations for canvas, text and client
+ rectangles
+
+1. getClientRects, getBoundingClientRect, measureText: add fingerprinting mitigation
+
+Scale the result of Range::getClientRects, Element::getBoundingClientRect and
+Canvas::measureText by a random +/-3/1000000th of the original value for each
+float in the returned Rect/Quad.
+
+It contains improvements from ungoogled-chromium which add two flags:
+1. --fingerprinting-client-rects-noise to enable fingerprinting deception for Range::getClientRects and Element::getBoundingClientRect
+2. --fingerprinting-canvas-measuretext-noise to enable fingerprinting deception for Canvas::measureText
+
+2. Canvas: fingerprinting mitigations for image data and webGL
+
+Disable webGL renderer info and modify the color data returned by ToBlob,
+ToDataURL and getImageData so that it will contain randomly manipulated
+pixels (maximum 20) 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.
+
+Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data fingerprinting deception
+---
+ chrome/browser/BUILD.gn                            |   1 +
+ chrome/browser/about_flags.cc                      |  13 ++
+ content/browser/BUILD.gn                           |   1 +
+ .../renderer_host/render_process_host_impl.cc      |   4 +
+ content/child/BUILD.gn                             |   1 +
+ content/child/runtime_features.cc                  |   8 ++
+ .../blink/public/platform/web_runtime_features.h   |   3 +
+ third_party/blink/renderer/core/dom/document.cc    |  18 +++
+ third_party/blink/renderer/core/dom/document.h     |   7 +
+ third_party/blink/renderer/core/dom/element.cc     |   8 ++
+ third_party/blink/renderer/core/dom/range.cc       |  12 +-
+ .../renderer/core/html/canvas/text_metrics.cc      |  18 +++
+ .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
+ .../canvas/canvas2d/canvas_rendering_context_2d.cc |   8 +-
+ .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
+ third_party/blink/renderer/platform/BUILD.gn       |   5 +-
+ .../platform/exported/web_runtime_features.cc      |  12 ++
+ .../platform/graphics/image_data_buffer.cc         |   7 +
+ .../platform/graphics/static_bitmap_image.cc       | 159 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h        |   2 +
+ .../platform/runtime_enabled_features.json5        |   9 ++
+ third_party/ungoogled/BUILD.gn                     |  10 ++
+ third_party/ungoogled/ungoogled_switches.cc        |  18 +++
+ third_party/ungoogled/ungoogled_switches.h         |  18 +++
+ 24 files changed, 343 insertions(+), 5 deletions(-)
+ create mode 100644 third_party/ungoogled/BUILD.gn
+ create mode 100644 third_party/ungoogled/ungoogled_switches.cc
+ create mode 100644 third_party/ungoogled/ungoogled_switches.h
+
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -2200,6 +2200,7 @@ jumbo_split_static_library("browser") {
+     "//third_party/metrics_proto",
+     "//third_party/re2",
+     "//third_party/smhasher:cityhash",
++    "//third_party/ungoogled:switches",
+     "//third_party/webrtc_overrides",
+     "//third_party/webrtc_overrides:init_webrtc",
+     "//third_party/widevine/cdm:buildflags",
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -147,6 +147,7 @@
+ #include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
+ #include "third_party/leveldatabase/leveldb_features.h"
++#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "ui/accessibility/accessibility_switches.h"
+ #include "ui/base/ui_base_features.h"
+ #include "ui/base/ui_base_switches.h"
+@@ -1405,12 +1406,24 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
+      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
+      SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)},
++    {"fingerprinting-canvas-image-data-noise",
++     "Disable Canvas image data fingerprint deception",
++     "Slightly modifies at most 20 pixels in Canvas image data extracted via JS APIs",
++     kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kFingerprintingCanvasImageDataNoise)},
+     {"enable-webrtc-stun-origin", flag_descriptions::kWebrtcStunOriginName,
+      flag_descriptions::kWebrtcStunOriginDescription, kOsAll,
+      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
+     {"enable-webrtc-hybrid-agc", flag_descriptions::kWebrtcHybridAgcName,
+      flag_descriptions::kWebrtcHybridAgcDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebRtcHybridAgc)},
++    {"fingerprinting-client-rects-noise",
++     "Disable get*ClientRects() fingerprint deception",
++     "Scale the output values of Range::getClientRects() and Element::getBoundingClientRect() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
++     kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kFingerprintingClientRectsNoise)},
++    {"fingerprinting-canvas-measuretext-noise",
++     "Disable Canvas::measureText() fingerprint deception",
++     "Scale the output values of Canvas::measureText() with a randomly selected factor in the range -0.0003% to 0.0003%, which are recomputed on every document initialization.",
++     kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kFingerprintingCanvasMeasureTextNoise)},
+     {"enable-webrtc-new-encode-cpu-load-estimator",
+      flag_descriptions::kWebrtcNewEncodeCpuLoadEstimatorName,
+      flag_descriptions::kWebrtcNewEncodeCpuLoadEstimatorDescription, kOsAll,
+diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
+--- a/content/browser/BUILD.gn
++++ b/content/browser/BUILD.gn
+@@ -206,6 +206,7 @@ jumbo_source_set("browser") {
+     "//third_party/libyuv",
+     "//third_party/re2",
+     "//third_party/sqlite",
++    "//third_party/ungoogled:switches",
+     "//third_party/webrtc/modules/desktop_capture:primitives",
+     "//third_party/webrtc/rtc_base:rtc_base",
+     "//third_party/zlib",
+diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
+--- a/content/browser/renderer_host/render_process_host_impl.cc
++++ b/content/browser/renderer_host/render_process_host_impl.cc
+@@ -213,6 +213,7 @@
+ #include "third_party/blink/public/common/page/launching_process_state.h"
+ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
+ #include "third_party/blink/public/public_buildflags.h"
++#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "ui/accessibility/accessibility_switches.h"
+ #include "ui/base/ui_base_switches.h"
+@@ -2970,6 +2971,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+     switches::kEnableWebGLSwapChain,
+     switches::kEnableWebVR,
+     switches::kFileUrlPathAlias,
++    switches::kFingerprintingClientRectsNoise,
++    switches::kFingerprintingCanvasMeasureTextNoise,
++    switches::kFingerprintingCanvasImageDataNoise,
+     switches::kForceDisplayColorProfile,
+     switches::kForceDeviceScaleFactor,
+     switches::kForceGpuMemAvailableMb,
+diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
+--- a/content/child/BUILD.gn
++++ b/content/child/BUILD.gn
+@@ -120,6 +120,7 @@ target(link_target_type, "child") {
+     "//third_party/blink/public:scaled_resources",
+     "//third_party/blink/public/common",
+     "//third_party/ced",
++    "//third_party/ungoogled:switches",
+     "//third_party/zlib/google:compression_utils",
+     "//ui/base",
+     "//ui/events/blink",
+diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
+--- a/content/child/runtime_features.cc
++++ b/content/child/runtime_features.cc
+@@ -23,6 +23,7 @@
+ #include "services/network/public/cpp/features.h"
+ #include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/platform/web_runtime_features.h"
++#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "ui/base/ui_base_features.h"
+ #include "ui/events/blink/blink_features.h"
+ #include "ui/gfx/switches.h"
+@@ -461,6 +462,13 @@ void SetIndividualRuntimeFeatures(
+     WebRuntimeFeatures::EnableAllowSyncXHRInPageDismissal(true);
+   }
+ 
++  WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
++      !command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
++  WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(
++      !command_line.HasSwitch(switches::kFingerprintingCanvasMeasureTextNoise));
++  WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(
++      !command_line.HasSwitch(switches::kFingerprintingCanvasImageDataNoise));
++
+   WebRuntimeFeatures::EnableAutoplayIgnoresWebAudio(
+       base::FeatureList::IsEnabled(media::kAutoplayIgnoreWebAudio));
+ 
+diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
+--- a/third_party/blink/public/platform/web_runtime_features.h
++++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -228,6 +228,9 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
+   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
+   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
++  BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
++  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasMeasureTextNoise(bool);
++  BLINK_PLATFORM_EXPORT static void EnableFingerprintingCanvasImageDataNoise(bool);
+   BLINK_PLATFORM_EXPORT static void EnableShadowDOMV0(bool);
+   BLINK_PLATFORM_EXPORT static void EnableCustomElementsV0(bool);
+   BLINK_PLATFORM_EXPORT static void EnableHTMLImports(bool);
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
++++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -35,6 +35,7 @@
+ #include "base/auto_reset.h"
+ #include "base/macros.h"
+ #include "base/optional.h"
++#include "base/rand_util.h"
+ #include "base/time/time.h"
+ #include "cc/input/overscroll_behavior.h"
+ #include "cc/input/scroll_snap_data.h"
+@@ -1199,6 +1200,15 @@ Document::Document(const DocumentInit& initializer,
+ #ifndef NDEBUG
+   liveDocumentSet().insert(this);
+ #endif
++
++  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    // Precompute -0.0003% to 0.0003% noise factor for get*ClientRect*() fingerprinting
++    noise_factor_x_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
++    noise_factor_y_ = 1 + (base::RandDouble() - 0.5) * 0.000003;
++  } else {
++    noise_factor_x_ = 1;
++    noise_factor_y_ = 1;
++  }
+ }
+ 
+ Document::~Document() {
+@@ -1227,6 +1237,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
+                                      Position::BeforeNode(*shadow_host));
+ }
+ 
++double Document::GetNoiseFactorX() {
++  return noise_factor_x_;
++}
++
++double Document::GetNoiseFactorY() {
++  return noise_factor_y_;
++}
++
+ SelectorQueryCache& Document::GetSelectorQueryCache() {
+   if (!selector_query_cache_)
+     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
+diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
+--- a/third_party/blink/renderer/core/dom/document.h
++++ b/third_party/blink/renderer/core/dom/document.h
+@@ -408,6 +408,10 @@ class CORE_EXPORT Document : public ContainerNode,
+     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
+   }
+ 
++  // Values for get*ClientRect fingerprint deception
++  double GetNoiseFactorX();
++  double GetNoiseFactorY();
++
+   String visibilityState() const;
+   bool IsPageVisible() const;
+   bool hidden() const;
+@@ -1905,6 +1909,9 @@ class CORE_EXPORT Document : public ContainerNode,
+ 
+   base::ElapsedTimer start_time_;
+ 
++  double noise_factor_x_;
++  double noise_factor_y_;
++
+   Member<ScriptRunner> script_runner_;
+ 
+   HeapVector<Member<ScriptElementBase>> current_script_stack_;
+diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
+--- a/third_party/blink/renderer/core/dom/element.cc
++++ b/third_party/blink/renderer/core/dom/element.cc
+@@ -1630,6 +1630,11 @@ DOMRectList* Element::getClientRects() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
+       quads, *element_layout_object);
++  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    for (FloatQuad& quad : quads) {
++      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
++    }
++  }
+   return DOMRectList::Create(quads);
+ }
+ 
+@@ -1647,6 +1652,9 @@ DOMRect* Element::getBoundingClientRect() {
+   DCHECK(element_layout_object);
+   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
+                                                         *element_layout_object);
++  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    result.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
++  }
+   return DOMRect::FromFloatRect(result);
+ }
+ 
+diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
+--- a/third_party/blink/renderer/core/dom/range.cc
++++ b/third_party/blink/renderer/core/dom/range.cc
+@@ -1631,11 +1631,21 @@ DOMRectList* Range::getClientRects() const {
+   Vector<FloatQuad> quads;
+   GetBorderAndTextQuads(quads);
+ 
++  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    for (FloatQuad& quad : quads) {
++      quad.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
++    }
++  }
++
+   return DOMRectList::Create(quads);
+ }
+ 
+ DOMRect* Range::getBoundingClientRect() const {
+-  return DOMRect::FromFloatRect(BoundingRect());
++  auto rect = BoundingRect();
++  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
++    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
++  }
++  return DOMRect::FromFloatRect(rect);
+ }
+ 
+ // TODO(editing-dev): We should make
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+@@ -54,6 +54,24 @@ TextMetrics::TextMetrics(const Font& font,
+   Update(font, direction, baseline, align, text);
+ }
+ 
++void TextMetrics::Shuffle(const double factor) {
++  // x-direction
++  width_ *= factor;
++  actual_bounding_box_left_ *= factor;
++  actual_bounding_box_right_ *= factor;
++
++  // y-direction
++  font_bounding_box_ascent_ *= factor;
++  font_bounding_box_descent_ *= factor;
++  actual_bounding_box_ascent_ *= factor;
++  actual_bounding_box_descent_ *= factor;
++  em_height_ascent_ *= factor;
++  em_height_descent_ *= factor;
++  baselines_->setAlphabetic(baselines_->alphabetic() * factor);
++  baselines_->setHanging(baselines_->hanging() * factor);
++  baselines_->setIdeographic(baselines_->ideographic() * factor);
++}
++
+ void TextMetrics::Update(const Font& font,
+                          const TextDirection& direction,
+                          const TextBaseline& baseline,
+diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
++++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
+@@ -64,6 +64,8 @@ class CORE_EXPORT TextMetrics final : public ScriptWrappable {
+ 
+   void Trace(Visitor*) override;
+ 
++  void Shuffle(const double factor);
++
+  private:
+   void Update(const Font&,
+               const TextDirection&,
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+@@ -811,9 +811,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+   else
+     direction = ToTextDirection(GetState().GetDirection(), canvas());
+ 
+-  return MakeGarbageCollected<TextMetrics>(font, direction,
++  TextMetrics* text_metrics = MakeGarbageCollected<TextMetrics>(font, direction,
+                                            GetState().GetTextBaseline(),
+                                            GetState().GetTextAlign(), text);
++
++  // Scale text metrics if enabled
++  if (RuntimeEnabledFeatures::FingerprintingCanvasMeasureTextNoiseEnabled()) {
++    text_metrics->Shuffle(canvas()->GetDocument().GetNoiseFactorX());
++  }
++  return text_metrics;
+ }
+ 
+ void CanvasRenderingContext2D::DrawTextInternal(
+diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
++++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
+@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
+ 
+ WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
+     WebGLRenderingContextBase* context) {
+-  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
++  return nullptr;
+ }
+ 
+ bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
+-  return true;
++  return false;
+ }
+ 
+ const char* WebGLDebugRendererInfo::ExtensionName() {
+diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
+--- a/third_party/blink/renderer/platform/BUILD.gn
++++ b/third_party/blink/renderer/platform/BUILD.gn
+@@ -1417,7 +1417,9 @@ jumbo_component("platform") {
+     "//third_party/blink/renderer:non_test_config",
+   ]
+ 
+-  include_dirs = []
++  include_dirs = [
++    "//third_party/skia/include/private", # For shuffler in graphics/static_bitmap_image.cc
++  ]
+ 
+   public_deps = [
+     ":blink_platform_public_deps",
+@@ -1450,6 +1452,7 @@ jumbo_component("platform") {
+     "//third_party/ced",
+     "//third_party/emoji-segmenter",
+     "//third_party/icu",
++    "//third_party/ungoogled:switches",
+     "//third_party/webrtc/api:libjingle_logging_api",
+     "//third_party/webrtc/api/audio_codecs/L16:audio_decoder_L16",
+     "//third_party/webrtc/api/audio_codecs/L16:audio_encoder_L16",
+diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
++++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
+@@ -722,4 +722,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
+   RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
+ }
+ 
++void WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(bool enable) {
++  RuntimeEnabledFeatures::SetFingerprintingClientRectsNoiseEnabled(enable);
++}
++
++void WebRuntimeFeatures::EnableFingerprintingCanvasMeasureTextNoise(bool enable) {
++  RuntimeEnabledFeatures::SetFingerprintingCanvasMeasureTextNoiseEnabled(enable);
++}
++
++void WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(bool enable) {
++  RuntimeEnabledFeatures::SetFingerprintingCanvasImageDataNoiseEnabled(enable);
++}
++
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+--- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
++++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
+@@ -35,6 +35,8 @@
+ #include <memory>
+ 
+ #include "base/memory/ptr_util.h"
++#include "base/rand_util.h"
++#include "base/logging.h"
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+@@ -127,6 +129,11 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
+                                           const SkPixmap& pixmap) const {
+   DCHECK(is_valid_);
+ 
++  if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
++    // shuffle subchannel color data within the pixmap
++    StaticBitmapImage::ShuffleSubchannelColorData(pixmap_.writable_addr(), pixmap_.info(), 0, 0);
++  }
++
+   if (mime_type == kMimeTypeJpeg) {
+     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,8 @@
+ 
+ #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
+ 
++#include "base/rand_util.h"
++#include "base/logging.h"
+ #include "base/numerics/checked_math.h"
+ #include "gpu/command_buffer/client/gles2_interface.h"
+ #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
+@@ -11,12 +13,14 @@
+ #include "third_party/blink/renderer/platform/graphics/image_observer.h"
+ #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
+ #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
++#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+ #include "third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h"
+ #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/include/core/SkSurface.h"
+ #include "third_party/skia/include/gpu/GrContext.h"
++#include "third_party/skia/include/private/SkColorData.h"
+ #include "v8/include/v8.h"
+ 
+ namespace blink {
+@@ -154,10 +158,165 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+   DCHECK(read_pixels_successful ||
+          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
+              rect.X(), rect.Y(), info.width(), info.height())));
++
++  if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
++    ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
++  }
++
+   result.Transfer(dest_contents);
+   return true;
+ }
+ 
++// set the component to maximum-delta if it is >= maximum, or add to existing color component (color + delta)
++#define shuffleComponent(color, max, delta) ( (color) >= (max) ? ((max)-(delta)) : ((color)+(delta)) )
++
++#define writable_addr(T, p, stride, x, y) (T*)((const char *)p + y * stride + x * sizeof(T))
++
++void StaticBitmapImage::ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY) {
++  auto w = info.width() - srcX, h = info.height() - srcY;
++
++  // skip tiny images; info.width()/height() can also be 0
++  if ((w < 8) || (h < 8)) {
++    return;
++  }
++
++  // generate the first random number here
++  double shuffleX = base::RandDouble();
++
++  // cap maximum pixels to change
++  auto pixels = (w + h) / 128;
++  if (pixels > 20) {
++    pixels = 20;
++  } else if (pixels < 2) {
++    pixels = 2;
++  }
++
++  auto colorType = info.colorType();
++  auto fRowBytes = info.minRowBytes(); // stride
++
++  DLOG(INFO) << "BRM: ShuffleSubchannelColorData() w=" << w << " h=" << h << " colorType=" << colorType << " fRowBytes=" << fRowBytes;
++
++  // second random number (for y/height)
++  double shuffleY = base::RandDouble();
++
++  // calculate random coordinates using bisection
++  auto currentW = w, currentH = h;
++  for(;pixels >= 0; pixels--) {
++    int x = currentW * shuffleX, y = currentH * shuffleY;
++
++    // calculate randomisation amounts for each RGB component
++    uint8_t shuffleR = base::RandInt(0, 4);
++    uint8_t shuffleG = (shuffleR + x) % 4;
++    uint8_t shuffleB = (shuffleG + y) % 4;
++
++    // manipulate pixel data to slightly change the R, G, B components
++    switch (colorType) {
++      case kAlpha_8_SkColorType:
++      {
++         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
++         auto r = SkColorGetR(*pixel), g = SkColorGetG(*pixel), b = SkColorGetB(*pixel), a = SkColorGetA(*pixel);
++
++         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
++         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
++         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
++         // alpha is left unchanged
++
++         *pixel = SkColorSetARGB(a, r, g, b);
++      }
++      break;
++      case kGray_8_SkColorType:
++      {
++         auto *pixel = writable_addr(uint8_t, addr, fRowBytes, x, y);
++         *pixel = shuffleComponent(*pixel, UINT8_MAX-1, shuffleB);
++      }
++      break;
++      case kRGB_565_SkColorType:
++      {
++         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
++         unsigned    r = SkPacked16ToR32(*pixel);
++         unsigned    g = SkPacked16ToG32(*pixel);
++         unsigned    b = SkPacked16ToB32(*pixel);
++
++         r = shuffleComponent(r, 31, shuffleR);
++         g = shuffleComponent(g, 63, shuffleG);
++         b = shuffleComponent(b, 31, shuffleB);
++
++         unsigned r16 = (r & SK_R16_MASK) << SK_R16_SHIFT;
++         unsigned g16 = (g & SK_G16_MASK) << SK_G16_SHIFT;
++         unsigned b16 = (b & SK_B16_MASK) << SK_B16_SHIFT;
++
++         *pixel = r16 | g16 | b16;
++      }
++      break;
++      case kARGB_4444_SkColorType:
++      {
++         auto *pixel = writable_addr(uint16_t, addr, fRowBytes, x, y);
++         auto a = SkGetPackedA4444(*pixel), r = SkGetPackedR4444(*pixel), g = SkGetPackedG4444(*pixel), b = SkGetPackedB4444(*pixel);
++
++         r = shuffleComponent(r, 15, shuffleR);
++         g = shuffleComponent(g, 15, shuffleG);
++         b = shuffleComponent(b, 15, shuffleB);
++         // alpha is left unchanged
++
++         unsigned a4 = (a & 0xF) << SK_A4444_SHIFT;
++         unsigned r4 = (r & 0xF) << SK_R4444_SHIFT;
++         unsigned g4 = (g & 0xF) << SK_G4444_SHIFT;
++         unsigned b4 = (b & 0xF) << SK_B4444_SHIFT;
++
++         *pixel = r4 | b4 | g4 | a4;
++      }
++      break;
++      case kRGBA_8888_SkColorType:
++      {
++         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
++         auto a = SkGetPackedA32(*pixel), r = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), b = SkGetPackedB32(*pixel);
++
++         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
++         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
++         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
++         // alpha is left unchanged
++
++         *pixel = (a << SK_A32_SHIFT) | (r << SK_R32_SHIFT) |
++                  (g << SK_G32_SHIFT) | (b << SK_B32_SHIFT);
++      }
++      break;
++      case kBGRA_8888_SkColorType:
++      {
++         auto *pixel = writable_addr(uint32_t, addr, fRowBytes, x, y);
++         auto a = SkGetPackedA32(*pixel), b = SkGetPackedR32(*pixel), g = SkGetPackedG32(*pixel), r = SkGetPackedB32(*pixel);
++
++         r = shuffleComponent(r, UINT8_MAX-1, shuffleR);
++         g = shuffleComponent(g, UINT8_MAX-1, shuffleG);
++         b = shuffleComponent(b, UINT8_MAX-1, shuffleB);
++         // alpha is left unchanged
++
++         *pixel = (a << SK_BGRA_A32_SHIFT) | (r << SK_BGRA_R32_SHIFT) |
++                  (g << SK_BGRA_G32_SHIFT) | (b << SK_BGRA_B32_SHIFT);
++      }
++      break;
++      default:
++         // the remaining formats are not expected to be used in Chromium
++         LOG(WARNING) << "BRM: ShuffleSubchannelColorData(): Ignoring pixel format";
++         return;
++    }
++
++    // keep bisecting or reset current width/height as needed
++    if (x == 0) {
++       currentW = w;
++    } else {
++       currentW = x;
++    }
++    if (y == 0) {
++       currentH = h;
++    } else {
++       currentH = y;
++    }
++  }
++}
++
++#undef writable_addr
++#undef shuffleComponent
++
+ const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
+   static const gpu::SyncToken sync_token;
+   return sync_token;
+diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+--- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
++++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
+@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
+                                                  const SkImageInfo&);
+ 
++  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
++
+   bool IsStaticBitmapImage() const override { return true; }
+ 
+   // Methods overridden by all sub-classes
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
++++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -677,6 +677,15 @@
+       name: "FileSystem",
+       status: "stable",
+     },
++    {
++      name: "FingerprintingClientRectsNoise",
++    },
++    {
++      name: "FingerprintingCanvasMeasureTextNoise",
++    },
++    {
++      name: "FingerprintingCanvasImageDataNoise",
++    },
+     // FirstContentfulPaintPlusPlus enables the Largest Text Paint metric, Last
+     // Text Paint metric, Largest Image Paint metric and Last Image Paint
+     // metric. See also: http://bit.ly/fcp_plus_plus
+diff --git a/third_party/ungoogled/BUILD.gn b/third_party/ungoogled/BUILD.gn
+new file mode 100644
+--- /dev/null
++++ b/third_party/ungoogled/BUILD.gn
+@@ -0,0 +1,10 @@
++# Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++component("switches") {
++  sources = [
++    "ungoogled_switches.h",
++    "ungoogled_switches.cc",
++  ]
++}
+diff --git a/third_party/ungoogled/ungoogled_switches.cc b/third_party/ungoogled/ungoogled_switches.cc
+new file mode 100644
+--- /dev/null
++++ b/third_party/ungoogled/ungoogled_switches.cc
+@@ -0,0 +1,18 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "third_party/ungoogled/ungoogled_switches.h"
++
++namespace switches {
++
++// Enable fingerprinting deception for getClientRects and getBoundingClientRect
++const char kFingerprintingClientRectsNoise[] = "fingerprinting-client-rects-noise";
++
++// Enable fingerprinting deception for measureText
++const char kFingerprintingCanvasMeasureTextNoise[] = "fingerprinting-canvas-measuretext-noise";
++
++// Enable fingerprinting deception for Canvas image data
++const char kFingerprintingCanvasImageDataNoise[] = "fingerprinting-canvas-image-data-noise";
++
++}  // namespace switches
+diff --git a/third_party/ungoogled/ungoogled_switches.h b/third_party/ungoogled/ungoogled_switches.h
+new file mode 100644
+--- /dev/null
++++ b/third_party/ungoogled/ungoogled_switches.h
+@@ -0,0 +1,18 @@
++// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// Defines all the fingerprinting command-line switches.
++
++#ifndef THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
++#define THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
++
++namespace switches {
++
++extern const char kFingerprintingClientRectsNoise[];
++extern const char kFingerprintingCanvasMeasureTextNoise[];
++extern const char kFingerprintingCanvasImageDataNoise[];
++
++}
++
++#endif  // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
+-- 
+2.11.0
+

build/patches/Never-fetch-popular-sites.patch

@@ -9,7 +9,7 @@ Subject: Never fetch popular sites
 diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
 --- a/components/ntp_tiles/popular_sites_impl.cc
 +++ b/components/ntp_tiles/popular_sites_impl.cc
-@@ -280,6 +280,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+@@ -283,6 +283,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
    DCHECK(!callback_);
    callback_ = callback;
  

build/patches/Never-send-any-crash-upload-data.patch

@@ -9,7 +9,7 @@ Subject: Never send any crash upload data
 diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -126,6 +126,9 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -125,6 +125,9 @@ void TraceCrashServiceUploader::DoUpload(
      std::unique_ptr<const base::DictionaryValue> metadata,
      const UploadProgressCallback& progress_callback,
      UploadDoneCallback done_callback) {

build/patches/Remove-SMS-integration.patch

@@ -0,0 +1,104 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 3 Nov 2019 08:22:29 +0100
+Subject: Remove SMS integration
+
+---
+ content/public/android/BUILD.gn                    |  2 -
+ .../org/chromium/content/browser/sms/Wrappers.java | 74 ----------------------
+ 2 files changed, 76 deletions(-)
+ delete mode 100644 content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
+
+diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
+--- a/content/public/android/BUILD.gn
++++ b/content/public/android/BUILD.gn
+@@ -231,8 +231,6 @@ android_library("content_java") {
+     "java/src/org/chromium/content/browser/selection/SmartSelectionClient.java",
+     "java/src/org/chromium/content/browser/selection/SmartSelectionMetricsLogger.java",
+     "java/src/org/chromium/content/browser/selection/SmartSelectionProvider.java",
+-    "java/src/org/chromium/content/browser/sms/SmsReceiver.java",
+-    "java/src/org/chromium/content/browser/sms/Wrappers.java",
+     "java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
+     "java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
+     "java/src/org/chromium/content/common/ContentSwitchUtils.java",
+diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
+deleted file mode 100644
+--- a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
++++ /dev/null
+@@ -1,74 +0,0 @@
+-// Copyright 2019 The Chromium Authors. All rights reserved.
+-// Use of this source code is governed by a BSD-style license that can be
+-// found in the LICENSE file.
+-
+-package org.chromium.content.browser.sms;
+-
+-import android.content.BroadcastReceiver;
+-import android.content.Context;
+-import android.content.ContextWrapper;
+-import android.content.Intent;
+-import android.content.IntentFilter;
+-
+-import com.google.android.gms.auth.api.phone.SmsRetrieverClient;
+-import com.google.android.gms.tasks.Task;
+-
+-class Wrappers {
+-    // Prevent instantiation.
+-    private Wrappers() {}
+-
+-    /**
+-     * Wraps com.google.android.gms.auth.api.phone.SmsRetrieverClient.
+-     */
+-    static class SmsRetrieverClientWrapper {
+-        private final SmsRetrieverClient mSmsRetrieverClient;
+-        private SmsReceiverContext mContext;
+-
+-        public SmsRetrieverClientWrapper(SmsRetrieverClient smsRetrieverClient) {
+-            mSmsRetrieverClient = smsRetrieverClient;
+-        }
+-
+-        public void setContext(SmsReceiverContext context) {
+-            mContext = context;
+-        }
+-
+-        public SmsReceiverContext getContext() {
+-            return mContext;
+-        }
+-
+-        public Task<Void> startSmsRetriever() {
+-            return mSmsRetrieverClient.startSmsRetriever();
+-        }
+-    }
+-
+-    /**
+-     * Extends android.content.ContextWrapper to store and retrieve the
+-     * registered BroadcastReceiver.
+-     */
+-    static class SmsReceiverContext extends ContextWrapper {
+-        private BroadcastReceiver mReceiver;
+-
+-        public SmsReceiverContext(Context context) {
+-            super(context);
+-        }
+-
+-        public BroadcastReceiver getRegisteredReceiver() {
+-            return mReceiver;
+-        }
+-
+-        // ---------------------------------------------------------------------
+-        // Context overrides:
+-
+-        @Override
+-        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
+-            mReceiver = receiver;
+-            return super.registerReceiver(receiver, filter);
+-        }
+-
+-        @Override
+-        public void unregisterReceiver(BroadcastReceiver receiver) {
+-            mReceiver = null;
+-            super.unregisterReceiver(receiver);
+-        }
+-    }
+-}
+-- 
+2.11.0
+

build/patches/Remove-background-sync-and-translate-menu-options.patch

@@ -24,7 +24,7 @@ diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/
 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
 --- 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
-@@ -74,7 +74,7 @@ public class SiteSettingsPreferences
+@@ -73,7 +73,7 @@ public class SiteSettingsPreferences
              // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
              // menus.
              for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
@@ -33,7 +33,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
                  getPreferenceScreen().removePreference(findPreference(i));
              }
              getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
-@@ -115,7 +115,6 @@ public class SiteSettingsPreferences
+@@ -111,7 +111,6 @@ public class SiteSettingsPreferences
                  websitePrefs.add(Type.ADS);
              }
              websitePrefs.add(Type.AUTOMATIC_DOWNLOADS);

build/patches/Remove-dependency-on-com.google.android.gcm.patch

@@ -0,0 +1,132 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 09:29:52 +0100
+Subject: Remove dependency on com.google.android.gcm
+
+---
+ third_party/android_sdk/BUILD.gn                   |  3 --
+ .../external/client/android2/AndroidManifest.xml   | 35 ----------------------
+ .../channel/AndroidMessageReceiverService.java     | 17 -----------
+ .../channel/AndroidMessageSenderService.java       |  3 +-
+ 4 files changed, 1 insertion(+), 57 deletions(-)
+
+diff --git a/third_party/android_sdk/BUILD.gn b/third_party/android_sdk/BUILD.gn
+--- a/third_party/android_sdk/BUILD.gn
++++ b/third_party/android_sdk/BUILD.gn
+@@ -67,7 +67,4 @@ if (enable_java_templates) {
+     testonly = true
+     java_files = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
+   }
+-  android_java_prebuilt("android_gcm_java") {
+-    jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar"
+-  }
+ }
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml
+@@ -4,10 +4,6 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.google.ipc.invalidation.client.android2">
+ 
+-  <!-- App receives GCM messages. -->
+-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+-  <!-- GCM connects to Google Services. -->
+-  <uses-permission android:name="android.permission.INTERNET" />
+   <!-- Keeps the processor from sleeping when a message is received. -->
+   <uses-permission android:name="android.permission.WAKE_LOCK" />
+ 
+@@ -16,40 +12,9 @@
+     <service android:exported="false"
+         android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/>
+ 
+-    <!-- Ticl sender. -->
+-    <service android:exported="false"
+-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/>
+-
+     <!-- Receiver for scheduler alarms. -->
+     <receiver android:exported="false"
+         android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/>
+ 
+-    <!-- GCM Broadcast Receiver -->
+-    <receiver android:exported="true"
+-        android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver"
+-        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="com.google.ipc.invalidation.ticl.android2" />
+-      </intent-filter>
+-    </receiver>
+-
+-    <!-- GCM multiplexer -->
+-    <service android:exported="false"
+-        android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener">
+-      <meta-data android:name="sender_ids" android:value="ipc.invalidation@gmail.com"/>
+-    </service>
+-
+-    <!-- Invalidation service multiplexed GCM receiver -->
+-    <service android:exported="false"
+-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService"
+-        android:enabled="true"/>
+-    <receiver android:exported="false"
+-        android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver">
+-      <intent-filter>
+-        <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT" />
+-      </intent-filter>
+-    </receiver>
+   </application>
+ </manifest>
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageReceiverService.java
+@@ -15,7 +15,6 @@
+  */
+ package com.google.ipc.invalidation.ticl.android2.channel;
+ 
+-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.external.client.contrib.MultiplexingGcmListener;
+@@ -126,20 +125,4 @@ public class AndroidMessageReceiverService extends MultiplexingGcmListener.Abstr
+     // now, there is nothing to do.
+   }
+ 
+-  /**
+-   * Initializes GCM as a convenience method for tests. In production, applications should handle
+-   * this.
+-   */
+-  public static void initializeGcmForTest(Context context, Logger logger, String senderId) {
+-    // Initialize GCM.
+-    GCMRegistrar.checkDevice(context);
+-    GCMRegistrar.checkManifest(context);
+-    String regId = GCMRegistrar.getRegistrationId(context);
+-    if (regId.isEmpty()) {
+-      logger.info("Not registered with GCM; registering");
+-      GCMRegistrar.register(context, senderId);
+-    } else {
+-      logger.fine("Already registered with GCM: %s", regId);
+-    }
+-  }
+ }
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidMessageSenderService.java
+@@ -15,7 +15,6 @@
+  */
+ package com.google.ipc.invalidation.ticl.android2.channel;
+ 
+-import com.google.android.gcm.GCMRegistrar;
+ import com.google.ipc.invalidation.common.GcmSharedConstants;
+ import com.google.ipc.invalidation.external.client.SystemResources.Logger;
+ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
+@@ -395,7 +394,7 @@ public class AndroidMessageSenderService extends IntentService {
+         // No client key when using old style registration id.
+         clientKey = "";
+         try {
+-            registrationId = GCMRegistrar.getRegistrationId(context);
++        registrationId = null;
+         } catch (RuntimeException exception) {
+             // GCMRegistrar#getRegistrationId occasionally throws a runtime exception. Catching the
+             // exception rather than crashing.
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.auth.patch

@@ -0,0 +1,186 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 09:22:31 +0100
+Subject: Remove dependency on com.google.android.gms.auth
+
+---
+ chrome/android/BUILD.gn                            |  1 -
+ components/signin/core/browser/android/BUILD.gn    |  1 -
+ .../components/signin/AccountIdProvider.java       | 10 +----
+ .../signin/SystemAccountManagerDelegate.java       | 15 +-------
+ content/public/android/BUILD.gn                    |  1 -
+ content/test/BUILD.gn                              |  1 -
+ third_party/android_deps/BUILD.gn                  | 44 ----------------------
+ third_party/robolectric/BUILD.gn                   |  1 -
+ 8 files changed, 2 insertions(+), 72 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -267,7 +267,6 @@ android_library("chrome_java") {
+     ":thumbnail_cache_entry_proto_java",
+     ":update_proto_java",
+     ":usage_stats_proto_java",
+-    "$google_play_services_package:google_play_services_auth_base_java",
+     "$google_play_services_package:google_play_services_base_java",
+     "$google_play_services_package:google_play_services_basement_java",
+     "$google_play_services_package:google_play_services_cast_framework_java",
+diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
+--- a/components/signin/core/browser/android/BUILD.gn
++++ b/components/signin/core/browser/android/BUILD.gn
+@@ -15,7 +15,6 @@ generate_jni("jni_headers") {
+ 
+ android_library("java") {
+   deps = [
+-    "$google_play_services_package:google_play_services_auth_base_java",
+     "$google_play_services_package:google_play_services_base_java",
+     "$google_play_services_package:google_play_services_basement_java",
+     "//base:base_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 ignored = 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/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
+@@ -24,9 +24,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", 1);
+     }
+ 
+     @Override
+diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
+--- a/content/public/android/BUILD.gn
++++ b/content/public/android/BUILD.gn
+@@ -52,7 +52,6 @@ action("generate_sandboxed_service_srcjar") {
+ android_library("content_java") {
+   deps = [
+     ":content_java_resources",
+-    "$google_play_services_package:google_play_services_auth_api_phone_java",
+     "$google_play_services_package:google_play_services_base_java",
+     "$google_play_services_package:google_play_services_basement_java",
+     "$google_play_services_package:google_play_services_tasks_java",
+diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
+--- a/content/test/BUILD.gn
++++ b/content/test/BUILD.gn
+@@ -2442,7 +2442,6 @@ if (is_android) {
+     testonly = true
+     java_files = content_java_sources_needing_jni
+     deps = [
+-      "$google_play_services_package:google_play_services_auth_api_phone_java",
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -772,50 +772,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_auth_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info"
+-  deps = [
+-    ":google_play_services_auth_api_phone_java",
+-    ":google_play_services_auth_base_java",
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_auth_api_phone_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_auth_api_phone/com_google_android_gms_play_services_auth_api_phone.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_auth_base_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("google_play_services_base_java") {
+   aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-15.0.1.aar"
+   info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
+diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
+--- a/third_party/robolectric/BUILD.gn
++++ b/third_party/robolectric/BUILD.gn
+@@ -938,7 +938,6 @@ java_library("shadows_play_services_java") {
+     ":robolectric_shadowapi_java",
+     ":robolectric_utils_java",
+     ":shadows_core_java",
+-    "$google_play_services_package:google_play_services_auth_base_java",
+     "$google_play_services_package:google_play_services_base_java",
+     "$google_play_services_package:google_play_services_basement_java",
+     "//third_party/android_deps:android_support_v4_java",
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch

@@ -0,0 +1,798 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 08:58:19 +0100
+Subject: Remove dependency on
+ com.google.android.gms.common/auth/signin/dynamic,
+ com.google.android.gms.tasks
+
+---
+ chrome/android/BUILD.gn                            |  8 ---
+ chrome/android/features/media_router/BUILD.gn      |  2 -
+ .../browser/media/router/ChromeMediaRouter.java    |  7 +-
+ chrome/android/java/AndroidManifest.xml            |  9 ---
+ .../src/org/chromium/chrome/browser/AppHooks.java  | 14 +---
+ .../chromium/chrome/browser/ChromeVersionInfo.java | 12 +---
+ .../browser/component_updater/UpdateScheduler.java |  3 -
+ .../browser/externalauth/ExternalAuthUtils.java    | 14 ++--
+ .../externalauth/UserRecoverableErrorHandler.java  |  7 --
+ .../browser/gcore/ChromeGoogleApiClientImpl.java   | 25 +------
+ .../browser/gcore/GoogleApiClientHelper.java       | 82 +---------------------
+ .../chrome/browser/omaha/UpdateStatusProvider.java | 10 +--
+ .../browser/preferences/PreferencesLauncher.java   |  5 +-
+ chrome/test/android/BUILD.gn                       |  2 -
+ components/background_task_scheduler/BUILD.gn      | 10 ---
+ components/signin/core/browser/android/BUILD.gn    |  2 -
+ .../signin/GmsAvailabilityException.java           |  4 +-
+ content/public/android/BUILD.gn                    |  3 -
+ content/test/BUILD.gn                              |  3 -
+ device/BUILD.gn                                    |  2 -
+ remoting/android/client_java_tmpl.gni              |  3 -
+ services/BUILD.gn                                  |  4 --
+ services/device/geolocation/BUILD.gn               |  2 -
+ services/shape_detection/BUILD.gn                  |  2 -
+ third_party/android_deps/BUILD.gn                  | 38 ----------
+ third_party/cacheinvalidation/BUILD.gn             |  1 -
+ third_party/robolectric/BUILD.gn                   |  2 -
+ 27 files changed, 16 insertions(+), 260 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -267,9 +267,6 @@ android_library("chrome_java") {
+     ":thumbnail_cache_entry_proto_java",
+     ":update_proto_java",
+     ":usage_stats_proto_java",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+-    "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+     "//base:jni_java",
+     "//chrome/android/features/keyboard_accessory:public_java",
+@@ -685,8 +682,6 @@ junit_binary("chrome_junit_tests") {
+     ":chrome_java",
+     ":chrome_junit_test_support",
+     ":partner_location_descriptor_proto_java",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+     "//base:base_junit_test_support",
+@@ -784,9 +779,6 @@ android_library("chrome_test_java") {
+     ":browser_java_test_support",
+     ":chrome_test_util_java",
+     ":partner_location_descriptor_proto_java",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+-    "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+     "//base/test:test_support_java",
+diff --git a/chrome/android/features/media_router/BUILD.gn b/chrome/android/features/media_router/BUILD.gn
+--- a/chrome/android/features/media_router/BUILD.gn
++++ b/chrome/android/features/media_router/BUILD.gn
+@@ -9,8 +9,6 @@ import("//chrome/common/features.gni")
+ android_library("java") {
+   deps = [
+     ":java_resources",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+     "//base:base_java",
+     "//base:jni_java",
+     "//chrome/android:chrome_java",
+diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
+--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
++++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
+@@ -7,9 +7,6 @@ package org.chromium.chrome.browser.media.router;
+ import android.support.annotation.Nullable;
+ import android.support.v7.media.MediaRouter;
+ 
+-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;
+@@ -43,9 +40,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
+                     int googleApiAvailabilityResult =
+                             AppHooks.get().isGoogleApiAvailableWithMinApkVersion(
+                                     MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
+-                    if (googleApiAvailabilityResult != ConnectionResult.SUCCESS) {
+-                        GoogleApiAvailability.getInstance().showErrorNotification(
+-                                ContextUtils.getApplicationContext(), googleApiAvailabilityResult);
++                    if (true) {
+                         return;
+                     }
+                     MediaRouteProvider cafProvider = CafMediaRouteProvider.create(manager);
+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
+@@ -889,15 +889,6 @@ by a child template that "extends" this file.
+             </intent-filter>
+           </activity>
+ 
+-        <!-- Activity for dispatching intents to Instant Apps. -->
+-        <activity
+-            android:name="org.chromium.chrome.browser.instantapps.AuthenticatedProxyActivity"
+-            android:exported="false"
+-            android:theme="@android:style/Theme.NoDisplay"
+-            android:noHistory="true"
+-            android:excludeFromRecents="true">
+-        </activity>
+-
+         <activity
+             android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
+             android:exported="false"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+@@ -15,9 +15,6 @@ import android.support.annotation.Nullable;
+ import android.view.View;
+ import android.view.inputmethod.InputConnection;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.Callback;
+ import org.chromium.base.CommandLine;
+ import org.chromium.base.ContextUtils;
+@@ -419,16 +416,7 @@ public abstract class AppHooks {
+      * same as {@link GoogleApiAvailability#isGooglePlayServicesAvailable()}.
+      */
+     public int isGoogleApiAvailableWithMinApkVersion(int minApkVersion) {
+-        try {
+-            PackageInfo gmsPackageInfo =
+-                    ContextUtils.getApplicationContext().getPackageManager().getPackageInfo(
+-                            GoogleApiAvailability.GOOGLE_PLAY_SERVICES_PACKAGE, /* flags= */ 0);
+-            int apkVersion = gmsPackageInfo.versionCode;
+-            if (apkVersion >= minApkVersion) return ConnectionResult.SUCCESS;
+-        } catch (PackageManager.NameNotFoundException e) {
+-            return ConnectionResult.SERVICE_MISSING;
+-        }
+-        return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
++        return 1;  /* SERVICE_MISSING*/
+     }
+ 
+     /**
+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;
+@@ -95,7 +93,7 @@ public class ChromeVersionInfo {
+     public static String getGmsInfo() {
+         Context context = ContextUtils.getApplicationContext();
+ 
+-        final long sdkVersion = GoogleApiAvailability.GOOGLE_PLAY_SERVICES_VERSION_CODE;
++        final long sdkVersion = 12600000;
+         final long installedGmsVersion = getPlayServicesApkVersionNumber(context);
+ 
+         final String accessType;
+@@ -112,12 +110,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;
+-        }
++        return 0;
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
+@@ -6,9 +6,6 @@ package org.chromium.chrome.browser.component_updater;
+ 
+ import android.os.Build;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.annotations.JNINamespace;
+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
+@@ -13,9 +13,6 @@ import android.os.Binder;
+ 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.CommandLine;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+@@ -157,9 +154,7 @@ public class ExternalAuthUtils {
+      *         when it is updating.
+      */
+     public boolean isGooglePlayServicesMissing(final Context context) {
+-        final int resultCode = checkGooglePlayServicesAvailable(context);
+-        return (resultCode == ConnectionResult.SERVICE_MISSING
+-                || resultCode == ConnectionResult.SERVICE_INVALID);
++        return true;
+     }
+ 
+     /**
+@@ -181,7 +176,6 @@ public class ExternalAuthUtils {
+ 
+         Context context = ContextUtils.getApplicationContext();
+         final int resultCode = checkGooglePlayServicesAvailable(context);
+-        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)) {
+@@ -251,7 +245,7 @@ public class ExternalAuthUtils {
+     protected int checkGooglePlayServicesAvailable(final Context context) {
+         // TODO(crbug.com/577190): Temporarily allowing disk access until more permanent fix is in.
+         try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
+-            return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context);
++            return 1; /*SERVICE_MISSING*/
+         }
+     }
+ 
+@@ -263,7 +257,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;
+     }
+ 
+     /**
+@@ -273,6 +267,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;
+ 
+@@ -97,7 +95,6 @@ public abstract class UserRecoverableErrorHandler {
+             if (!sNotificationShown.getAndSet(true)) {
+                 return;
+             }
+-            GoogleApiAvailability.getInstance().showErrorNotification(context, errorCode);
+         }
+     }
+ 
+@@ -190,11 +187,7 @@ public abstract class UserRecoverableErrorHandler {
+                 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()) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java
+@@ -6,9 +6,6 @@ package org.chromium.chrome.browser.gcore;
+ 
+ import android.content.Context;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.api.GoogleApiClient;
+-
+ import org.chromium.base.Log;
+ import org.chromium.base.TraceEvent;
+ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+@@ -22,7 +19,6 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
+     private static final String TAG = "Icing";
+ 
+     private final Context mApplicationContext;
+-    private final GoogleApiClient mClient;
+ 
+     /**
+      * @param context its application context will be exposed through
+@@ -31,10 +27,9 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
+      * @param requireFirstPartyBuild true if the given client can only be used in a first-party
+      *            build.
+      */
+-    public ChromeGoogleApiClientImpl(Context context, GoogleApiClient client,
++    public ChromeGoogleApiClientImpl(Context context,
+             boolean requireFirstPartyBuild) {
+         mApplicationContext = context.getApplicationContext();
+-        mClient = client;
+         if (requireFirstPartyBuild && !ExternalAuthUtils.getInstance().isChromeGoogleSigned()) {
+             throw new IllegalStateException("GoogleApiClient requires first-party build");
+         }
+@@ -42,7 +37,6 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
+ 
+     @Override
+     public void disconnect() {
+-        mClient.disconnect();
+     }
+ 
+     @Override
+@@ -58,24 +52,11 @@ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient {
+     @Override
+     public boolean connectWithTimeout(long timeout) {
+         TraceEvent.begin("ChromeGoogleApiClientImpl:connectWithTimeout");
+-        try {
+-            ConnectionResult result = mClient.blockingConnect(timeout, TimeUnit.MILLISECONDS);
+-            if (!result.isSuccess()) {
+-                Log.e(TAG, "Connection to GmsCore unsuccessful. Error %d", result.getErrorCode());
+-            } else {
+-                Log.d(TAG, "Connection to GmsCore successful.");
+-            }
+-            return result.isSuccess();
+-        } finally {
+-            TraceEvent.end("ChromeGoogleApiClientImpl:connectWithTimeout");
+-        }
++        TraceEvent.end("ChromeGoogleApiClientImpl:connectWithTimeout");
++        return false;
+     }
+ 
+     public Context getApplicationContext() {
+         return mApplicationContext;
+     }
+-
+-    public GoogleApiClient getApiClient() {
+-        return mClient;
+-    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApiClientHelper.java
+@@ -7,11 +7,6 @@ package org.chromium.chrome.browser.gcore;
+ import android.os.Bundle;
+ import android.os.Handler;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.api.GoogleApiClient;
+-import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
+-import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
+-
+ import org.chromium.base.ApplicationStatus;
+ import org.chromium.base.ApplicationStatus.ApplicationStateListener;
+ import org.chromium.base.Log;
+@@ -67,30 +62,16 @@ import org.chromium.base.ThreadUtils;
+  * }
+  * </pre>
+  */
+-public class GoogleApiClientHelper
+-        implements OnConnectionFailedListener, ConnectionCallbacks {
++public class GoogleApiClientHelper {
+     private static final String TAG = "GCore";
+ 
+     private int mResolutionAttempts;
+     private boolean mWasConnectedBefore;
+     private final Handler mHandler = new Handler(ThreadUtils.getUiThreadLooper());
+-    private final GoogleApiClient mClient;
+     private long mDisconnectionDelayMs;
+     private Runnable mPendingDisconnect;
+ 
+     /**
+-     * Creates a helper and enrolls it in the various connection management features.
+-     * See the class documentation for {@link GoogleApiClientHelper} for more information.
+-     *
+-     * @param client The client to wrap.
+-     */
+-    public GoogleApiClientHelper(GoogleApiClient client) {
+-        mClient = client;
+-        enableConnectionRetrying(true);
+-        enableLifecycleManagement(true);
+-    }
+-
+-    /**
+      * Opts in or out of lifecycle management. The client's connection will be closed and reopened
+      * when Chrome goes in and out of background.
+      *
+@@ -116,13 +97,6 @@ public class GoogleApiClientHelper
+      * Enabling or disabling it while it is already enabled or disabled has no effect.
+      */
+     public void enableConnectionRetrying(boolean enabled) {
+-        if (enabled) {
+-            mClient.registerConnectionCallbacks(this);
+-            mClient.registerConnectionFailedListener(this);
+-        } else {
+-            mClient.unregisterConnectionCallbacks(this);
+-            mClient.unregisterConnectionFailedListener(this);
+-        }
+     }
+ 
+     /**
+@@ -155,21 +129,11 @@ public class GoogleApiClientHelper
+         // Cancel and reschedule the disconnection if we are in the background. We do it early to
+         // avoid race conditions between a disconnect on the UI thread and the connect below.
+         if (!ApplicationStatus.hasVisibleActivities()) scheduleDisconnection();
+-
+-        // The client might be disconnected if we were idle in the background for too long.
+-        if (!mClient.isConnected() && !mClient.isConnecting()) {
+-            Log.d(TAG, "Reconnecting the client.");
+-            mClient.connect();
+-        }
+     }
+ 
+     void restoreConnectedState() {
+         // If we go back to the foreground before a delayed disconnect happens, cancel it.
+         cancelPendingDisconnection();
+-
+-        if (mWasConnectedBefore) {
+-            mClient.connect();
+-        }
+     }
+ 
+     /**
+@@ -192,12 +156,6 @@ public class GoogleApiClientHelper
+     }
+ 
+     private void disconnect() {
+-        if (mClient.isConnected() || mClient.isConnecting()) {
+-            mWasConnectedBefore = true;
+-        }
+-
+-        // We always call disconnect to abort possibly pending connection requests.
+-        mClient.disconnect();
+     }
+ 
+     private void cancelPendingDisconnection() {
+@@ -207,43 +165,7 @@ public class GoogleApiClientHelper
+         mPendingDisconnect = null;
+     }
+ 
+-    @Override
+-    public void onConnectionFailed(ConnectionResult result) {
+-        if (!isErrorRecoverableByRetrying(result.getErrorCode())) {
+-            Log.d(TAG, "Not retrying managed client connection. Unrecoverable error: %d",
+-                    result.getErrorCode());
+-            return;
+-        }
+-
+-        if (mResolutionAttempts < ConnectedTask.RETRY_NUMBER_LIMIT) {
+-            Log.d(TAG, "Retrying managed client connection. attempt %d/%d - errorCode: %d",
+-                    mResolutionAttempts, ConnectedTask.RETRY_NUMBER_LIMIT, result.getErrorCode());
+-            mResolutionAttempts += 1;
+-
+-            mHandler.postDelayed(new Runnable() {
+-                @Override
+-                public void run() {
+-                    mClient.connect();
+-                }
+-            }, ConnectedTask.CONNECTION_RETRY_TIME_MS);
+-        }
+-    }
+-
+-    @Override
+-    public void onConnected(Bundle connectionHint) {
+-        mResolutionAttempts = 0;
+-    }
+-
+-    @Override
+-    public void onConnectionSuspended(int cause) {
+-        // GoogleApiClient handles retrying on suspension itself. Logging in case it didn't succeed
+-        // for some reason.
+-        Log.w(TAG, "Managed client connection suspended. Cause: %d", cause);
+-    }
+-
+     private static boolean isErrorRecoverableByRetrying(int errorCode) {
+-        return errorCode == ConnectionResult.INTERNAL_ERROR
+-                || errorCode == ConnectionResult.NETWORK_ERROR
+-                || errorCode == ConnectionResult.SERVICE_UPDATING;
++        return false;
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+@@ -19,8 +19,6 @@ import android.support.annotation.NonNull;
+ import android.support.annotation.Nullable;
+ import android.text.TextUtils;
+ 
+-import com.google.android.gms.common.GooglePlayServicesUtil;
+-
+ import org.chromium.base.ActivityState;
+ import org.chromium.base.ApplicationStatus;
+ import org.chromium.base.ApplicationStatus.ActivityStateListener;
+@@ -463,13 +461,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
+         }
+ 
+         private boolean isGooglePlayStoreAvailable(Context context) {
+-            try {
+-                context.getPackageManager().getPackageInfo(
+-                        GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE, 0);
+-            } catch (PackageManager.NameNotFoundException e) {
+-                return false;
+-            }
+-            return true;
++            return false;
+         }
+ 
+         @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java
+@@ -12,8 +12,6 @@ import android.os.Bundle;
+ import android.support.annotation.Nullable;
+ import android.support.v4.app.Fragment;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-
+ import org.chromium.base.annotations.CalledByNative;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.metrics.RecordUserAction;
+@@ -202,8 +200,7 @@ public class PreferencesLauncher {
+         int minGooglePlayServicesVersion = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
+                 GOOGLE_ACCOUNT_PWM_UI, MIN_GOOGLE_PLAY_SERVICES_VERSION_PARAM,
+                 DEFAULT_MIN_GOOGLE_PLAY_SERVICES_APK_VERSION);
+-        if (AppHooks.get().isGoogleApiAvailableWithMinApkVersion(minGooglePlayServicesVersion)
+-                != ConnectionResult.SUCCESS)
++        if (true)
+             return false;
+ 
+         if (!ChromeFeatureList.isEnabled(GOOGLE_ACCOUNT_PWM_UI)) return false;
+diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
+--- a/chrome/test/android/BUILD.gn
++++ b/chrome/test/android/BUILD.gn
+@@ -153,8 +153,6 @@ android_library("chrome_java_test_support") {
+     "javatests/src/org/chromium/chrome/test/util/TranslateUtil.java",
+   ]
+   deps = [
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+     "//chrome/android:chrome_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
+@@ -52,9 +52,6 @@ if (is_android) {
+     deps = [
+       ":background_task_scheduler_task_ids_java",
+       ":scheduled_task_java",
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//content/public/android:content_java",
+       "//third_party/android_deps:com_android_support_support_annotations_java",
+@@ -75,9 +72,6 @@ if (is_android) {
+     deps = [
+       ":background_task_scheduler_java",
+       ":background_task_scheduler_task_ids_java",
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//content/public/test/android:content_java_test_support",
+@@ -104,10 +98,6 @@ if (is_android) {
+ 
+     deps = [
+       ":background_task_scheduler_java",
+-      "$google_play_services_package:google_play_services_auth_base_java",
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//base:base_junit_test_support",
+diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn
+--- a/components/signin/core/browser/android/BUILD.gn
++++ b/components/signin/core/browser/android/BUILD.gn
+@@ -15,8 +15,6 @@ generate_jni("jni_headers") {
+ 
+ android_library("java") {
+   deps = [
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+     "//base:base_java",
+     "//base:jni_java",
+     "//net/android:net_java",
+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/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
+--- a/content/public/android/BUILD.gn
++++ b/content/public/android/BUILD.gn
+@@ -52,9 +52,6 @@ action("generate_sandboxed_service_srcjar") {
+ android_library("content_java") {
+   deps = [
+     ":content_java_resources",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+-    "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+     "//base:jni_java",
+     "//components/download/public/common:public_java",
+diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
+--- a/content/test/BUILD.gn
++++ b/content/test/BUILD.gn
+@@ -2442,9 +2442,6 @@ if (is_android) {
+     testonly = true
+     java_files = content_java_sources_needing_jni
+     deps = [
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//content/public/android:content_java",
+     ]
+diff --git a/device/BUILD.gn b/device/BUILD.gn
+--- a/device/BUILD.gn
++++ b/device/BUILD.gn
+@@ -386,8 +386,6 @@ if (is_android) {
+   junit_binary("device_junit_tests") {
+     java_files = [ "gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java" ]
+     deps = [
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//base:base_junit_test_support",
+diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni
+--- a/remoting/android/client_java_tmpl.gni
++++ b/remoting/android/client_java_tmpl.gni
+@@ -101,9 +101,6 @@ template("remoting_android_client_java_tmpl") {
+ 
+     if (defined(invoker.play_services_package)) {
+       deps += [
+-        "${invoker.play_services_package}:google_play_services_auth_base_java",
+-        "${invoker.play_services_package}:google_play_services_base_java",
+-        "${invoker.play_services_package}:google_play_services_basement_java",
+       ]
+     }
+ 
+diff --git a/services/BUILD.gn b/services/BUILD.gn
+--- a/services/BUILD.gn
++++ b/services/BUILD.gn
+@@ -107,8 +107,6 @@ if (is_android) {
+       "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
+     ]
+     deps = [
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//base:base_junit_test_support",
+@@ -136,8 +134,6 @@ if (is_android) {
+       "shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
+     ]
+     deps = [
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//mojo/public/java:base_java",
+diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
+--- a/services/device/geolocation/BUILD.gn
++++ b/services/device/geolocation/BUILD.gn
+@@ -141,8 +141,6 @@ if (is_android) {
+     deps = [
+       ":geolocation",
+       ":geolocation_jni_headers",
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+       "//base:base_java",
+       "//components/location/android:location_java",
+       "//services/device/public/java:geolocation_java",
+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
+@@ -89,8 +89,6 @@ if (is_android) {
+     ]
+ 
+     deps = [
+-      "$google_play_services_package:google_play_services_base_java",
+-      "$google_play_services_package:google_play_services_basement_java",
+       "//base:base_java",
+       "//mojo/public/java:base_java",
+       "//mojo/public/java:bindings_java",
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -772,44 +772,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_base_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
+-  deps = [
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_basement_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
+-  deps = [
+-    ":com_android_support_support_v4_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-  input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_tasks_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
+-  deps = [
+-    ":google_play_services_basement_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("com_google_android_material_material_java") {
+   aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
+   info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
+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
+@@ -137,7 +137,6 @@ if (is_android) {
+     jacoco_never_instrument = true
+     deps = [
+       ":cacheinvalidation_proto_java",
+-      "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//third_party/android_protobuf:protobuf_nano_javalib",
+     ]
+diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn
+--- a/third_party/robolectric/BUILD.gn
++++ b/third_party/robolectric/BUILD.gn
+@@ -938,8 +938,6 @@ java_library("shadows_play_services_java") {
+     ":robolectric_shadowapi_java",
+     ":robolectric_utils_java",
+     ":shadows_core_java",
+-    "$google_play_services_package:google_play_services_base_java",
+-    "$google_play_services_package:google_play_services_basement_java",
+     "//third_party/android_deps:android_support_v4_java",
+     "//third_party/gson:gson_java",
+     "//third_party/guava:guava_java",
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch

@@ -0,0 +1,554 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 07:58:48 +0100
+Subject: Remove dependency on com.google.android.gms.fido,
+ com.google.android.gms.iid, com.google.android.gms.instantapps,
+ com.google.android.gms.location
+
+---
+ chrome/android/BUILD.gn                            |   5 -
+ .../externalnav/ExternalNavigationHandler.java     |   3 -
+ .../browser/instantapps/InstantAppsHandler.java    |  59 +-----------
+ components/gcm_driver/instance_id/android/BUILD.gn |   2 -
+ .../instance_id/InstanceIDWithSubtype.java         |  28 +-----
+ device/BUILD.gn                                    |   1 -
+ services/device/geolocation/BUILD.gn               |   1 -
+ .../geolocation/LocationProviderGmsCore.java       | 103 +--------------------
+ third_party/android_deps/BUILD.gn                  |  58 ------------
+ third_party/cacheinvalidation/BUILD.gn             |   1 -
+ .../client/android2/AndroidManifestUpdatedGcm.xml  |   3 -
+ 11 files changed, 9 insertions(+), 255 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -271,8 +271,6 @@ android_library("chrome_java") {
+     "$google_play_services_package:google_play_services_basement_java",
+     "$google_play_services_package:google_play_services_cast_framework_java",
+     "$google_play_services_package:google_play_services_cast_java",
+-    "$google_play_services_package:google_play_services_fido_java",
+-    "$google_play_services_package:google_play_services_iid_java",
+     "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+     "//base:jni_java",
+@@ -693,7 +691,6 @@ junit_binary("chrome_junit_tests") {
+     "$google_play_services_package:google_play_services_basement_java",
+     "$google_play_services_package:google_play_services_cast_framework_java",
+     "$google_play_services_package:google_play_services_cast_java",
+-    "$google_play_services_package:google_play_services_fido_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+     "//base:base_junit_test_support",
+@@ -795,8 +792,6 @@ android_library("chrome_test_java") {
+     "$google_play_services_package:google_play_services_basement_java",
+     "$google_play_services_package:google_play_services_cast_framework_java",
+     "$google_play_services_package:google_play_services_cast_java",
+-    "$google_play_services_package:google_play_services_fido_java",
+-    "$google_play_services_package:google_play_services_iid_java",
+     "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+@@ -581,7 +581,6 @@ public class ExternalNavigationHandler {
+         if (shouldProxyForInstantApps) {
+             RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",
+                     AiaIntent.SERP, AiaIntent.NUM_ENTRIES);
+-            intent.putExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER, true);
+         } else if (isDirectInstantAppsIntent) {
+             // For security reasons, we disable all intent:// URLs to Instant Apps that are
+             // not coming from SERP.
+@@ -590,8 +589,6 @@ public class ExternalNavigationHandler {
+                     AiaIntent.OTHER, AiaIntent.NUM_ENTRIES);
+             return OverrideUrlLoadingResult.NO_OVERRIDE;
+         } else {
+-            // Make sure this extra is not sent unless we've done the verification.
+-            intent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
+         }
+ 
+         boolean deviceCanHandleIntent = deviceCanHandleIntent(intent);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/instantapps/InstantAppsHandler.java
+@@ -42,36 +42,6 @@ public class InstantAppsHandler {
+     // TODO(mariakhomenko): Use system once we roll to O SDK.
+     private static final int FLAG_DO_NOT_LAUNCH = 0x00000200;
+ 
+-    // TODO(mariakhomenko): Depend directly on the constants once we roll to v8 libraries.
+-    private static final String DO_NOT_LAUNCH_EXTRA =
+-            "com.google.android.gms.instantapps.DO_NOT_LAUNCH_INSTANT_APP";
+-
+-    protected static final String IS_REFERRER_TRUSTED_EXTRA =
+-            "com.google.android.gms.instantapps.IS_REFERRER_TRUSTED";
+-
+-    protected static final String IS_USER_CONFIRMED_LAUNCH_EXTRA =
+-            "com.google.android.gms.instantapps.IS_USER_CONFIRMED_LAUNCH";
+-
+-    protected static final String TRUSTED_REFERRER_PKG_EXTRA =
+-            "com.google.android.gms.instantapps.TRUSTED_REFERRER_PKG";
+-
+-    public static final String IS_GOOGLE_SEARCH_REFERRER =
+-            "com.google.android.gms.instantapps.IS_GOOGLE_SEARCH_REFERRER";
+-
+-    private static final String BROWSER_LAUNCH_REASON =
+-            "com.google.android.gms.instantapps.BROWSER_LAUNCH_REASON";
+-
+-    private static final String SUPERVISOR_PKG = "com.google.android.instantapps.supervisor";
+-
+-    private static final String[] SUPERVISOR_START_ACTIONS = {
+-            "com.google.android.instantapps.START", "com.google.android.instantapps.nmr1.INSTALL",
+-            "com.google.android.instantapps.nmr1.VIEW"};
+-
+-    // Instant Apps system resolver activity on N-MR1+.
+-    @VisibleForTesting
+-    public static final String EPHEMERAL_INSTALLER_CLASS =
+-            "com.google.android.gms.instantapps.routing.EphemeralInstallerActivity";
+-
+     /** Finch experiment name. */
+     private static final String INSTANT_APPS_EXPERIMENT_NAME = "InstantApps";
+ 
+@@ -123,14 +93,6 @@ public class InstantAppsHandler {
+      * @return Whether the given intent is going to open an Instant App.
+      */
+     public static boolean isIntentToInstantApp(Intent intent) {
+-        if (SUPERVISOR_PKG.equals(intent.getPackage())) return true;
+-
+-        String intentAction = intent.getAction();
+-        for (String action : SUPERVISOR_START_ACTIONS) {
+-            if (action.equals(intentAction)) {
+-                return true;
+-            }
+-        }
+         return false;
+     }
+ 
+@@ -167,13 +129,7 @@ public class InstantAppsHandler {
+             sFallbackIntentTimes.record(SystemClock.elapsedRealtime() - startTime);
+             intent.removeExtra(INSTANT_APP_START_TIME_EXTRA);
+         }
+-        int callSource = IntentUtils.safeGetIntExtra(intent, BROWSER_LAUNCH_REASON, 0);
+-        if (callSource > 0 && callSource < SOURCE_BOUNDARY) {
+-            sFallbackCallSource.record(callSource);
+-            intent.removeExtra(BROWSER_LAUNCH_REASON);
+-        } else if (callSource >= SOURCE_BOUNDARY) {
+-            Log.e(TAG, "Unexpected call source constant for Instant Apps: " + callSource);
+-        }
++        Log.e(TAG, "Unexpected call source constant for Instant Apps");
+     }
+ 
+     /**
+@@ -208,14 +164,6 @@ public class InstantAppsHandler {
+             return false;
+         }
+ 
+-        if (IntentUtils.safeGetBooleanExtra(intent, DO_NOT_LAUNCH_EXTRA, false)
+-                || (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+-                           && (intent.getFlags() & FLAG_DO_NOT_LAUNCH) != 0)) {
+-            maybeRecordFallbackStats(intent);
+-            Log.i(TAG, "Not handling with Instant Apps (DO_NOT_LAUNCH_EXTRA)");
+-            return false;
+-        }
+-
+         if (IntentUtils.safeGetBooleanExtra(
+                 intent, IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, false)
+                 || IntentUtils.safeHasExtra(intent, ShortcutHelper.EXTRA_SOURCE)
+@@ -240,7 +188,6 @@ public class InstantAppsHandler {
+         }
+ 
+         Intent callbackIntent = new Intent(intent);
+-        callbackIntent.putExtra(DO_NOT_LAUNCH_EXTRA, true);
+         callbackIntent.putExtra(INSTANT_APP_START_TIME_EXTRA, startTime);
+ 
+         return tryLaunchingInstantApp(context, intent, isCustomTabsIntent, callbackIntent);
+@@ -343,12 +290,9 @@ public class InstantAppsHandler {
+         Intent iaIntent = data.getIntent();
+         if (data.getReferrer() != null) {
+             iaIntent.putExtra(Intent.EXTRA_REFERRER, data.getReferrer());
+-            iaIntent.putExtra(IS_REFERRER_TRUSTED_EXTRA, true);
+         }
+ 
+         Context appContext = ContextUtils.getApplicationContext();
+-        iaIntent.putExtra(TRUSTED_REFERRER_PKG_EXTRA, appContext.getPackageName());
+-        iaIntent.putExtra(IS_USER_CONFIRMED_LAUNCH_EXTRA, true);
+ 
+         try {
+             appContext.startActivity(iaIntent);
+@@ -394,7 +338,6 @@ public class InstantAppsHandler {
+         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+             return info.isInstantAppAvailable;
+         } else if (info.activityInfo != null) {
+-            return EPHEMERAL_INSTALLER_CLASS.equals(info.activityInfo.name);
+         }
+ 
+         return false;
+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
+@@ -18,7 +18,6 @@ generate_jni("test_support_jni_headers") {
+ 
+ android_library("instance_id_driver_java") {
+   deps = [
+-    "$google_play_services_package:google_play_services_iid_java",
+     "//base:base_java",
+     "//components/gcm_driver/android:gcm_driver_java",
+   ]
+@@ -34,7 +33,6 @@ android_library("instance_id_driver_java") {
+ android_library("instance_id_driver_test_support_java") {
+   deps = [
+     ":instance_id_driver_java",
+-    "$google_play_services_package:google_play_services_iid_java",
+     "//base:base_java",
+   ]
+ 
+diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java
+--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java
++++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDWithSubtype.java
+@@ -8,8 +8,6 @@ import android.content.Context;
+ import android.os.Bundle;
+ import android.text.TextUtils;
+ 
+-import com.google.android.gms.iid.InstanceID;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.VisibleForTesting;
+ 
+@@ -25,8 +23,6 @@ public class InstanceIDWithSubtype {
+     // Must match the private InstanceID.OPTION_SUBTYPE, which is guaranteed to not change.
+     private static final String OPTION_SUBTYPE = "subtype";
+ 
+-    private final InstanceID mInstanceID;
+-
+     /**
+      * Cached instances. May be accessed from multiple threads; synchronize on sSubtypeInstancesLock
+      */
+@@ -38,10 +34,6 @@ public class InstanceIDWithSubtype {
+     @VisibleForTesting
+     protected static FakeFactory sFakeFactoryForTesting;
+ 
+-    protected InstanceIDWithSubtype(InstanceID instanceID) {
+-        mInstanceID = instanceID;
+-    }
+-
+     /**
+      * Returns an instance of this class. Unlike {@link InstanceID#getInstance(Context)}, it is not
+      * a singleton, but instead a different instance will be returned for each {@code subtype}.
+@@ -57,11 +49,6 @@ public class InstanceIDWithSubtype {
+                 if (sFakeFactoryForTesting != null) {
+                     existing = sFakeFactoryForTesting.create(subtype);
+                 } else {
+-                    Bundle options = new Bundle();
+-                    options.putCharSequence(OPTION_SUBTYPE, subtype);
+-                    InstanceID instanceID =
+-                            InstanceID.getInstance(ContextUtils.getApplicationContext(), options);
+-                    existing = new InstanceIDWithSubtype(instanceID);
+                 }
+                 sSubtypeInstances.put(subtype, existing);
+             }
+@@ -70,35 +57,30 @@ public class InstanceIDWithSubtype {
+     }
+ 
+     public String getSubtype() {
+-        return mInstanceID.getSubtype();
++        return "";
+     }
+ 
+     public String getId() {
+-        return mInstanceID.getId();
++        return "";
+     }
+ 
+     public long getCreationTime() {
+-        return mInstanceID.getCreationTime();
++        return 0;
+     }
+ 
+     public void deleteInstanceID() throws IOException {
+-        synchronized (sSubtypeInstancesLock) {
+-            sSubtypeInstances.remove(mInstanceID.getSubtype());
+-            mInstanceID.deleteInstanceID();
+-        }
+     }
+ 
+     public void deleteToken(String authorizedEntity, String scope) throws IOException {
+-        mInstanceID.deleteToken(authorizedEntity, scope);
+     }
+ 
+     public String getToken(String authorizedEntity, String scope) throws IOException {
+-        return mInstanceID.getToken(authorizedEntity, scope);
++        return "";
+     }
+ 
+     public String getToken(String authorizedEntity, String scope, Bundle extras)
+             throws IOException {
+-        return mInstanceID.getToken(authorizedEntity, scope, extras);
++        return "";
+     }
+ 
+     /** Fake subclasses can set {@link #sFakeFactoryForTesting} to an implementation of this. */
+diff --git a/device/BUILD.gn b/device/BUILD.gn
+--- a/device/BUILD.gn
++++ b/device/BUILD.gn
+@@ -388,7 +388,6 @@ if (is_android) {
+     deps = [
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_location_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//base:base_junit_test_support",
+diff --git a/services/device/geolocation/BUILD.gn b/services/device/geolocation/BUILD.gn
+--- a/services/device/geolocation/BUILD.gn
++++ b/services/device/geolocation/BUILD.gn
+@@ -143,7 +143,6 @@ if (is_android) {
+       ":geolocation_jni_headers",
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_location_java",
+       "//base:base_java",
+       "//components/location/android:location_java",
+       "//services/device/public/java:geolocation_java",
+diff --git a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
+--- a/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
++++ b/services/device/geolocation/android/java/src/org/chromium/device/geolocation/LocationProviderGmsCore.java
+@@ -8,16 +8,6 @@ import android.content.Context;
+ import android.location.Location;
+ import android.os.Bundle;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-import com.google.android.gms.common.api.GoogleApiClient;
+-import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
+-import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
+-import com.google.android.gms.location.FusedLocationProviderApi;
+-import com.google.android.gms.location.LocationListener;
+-import com.google.android.gms.location.LocationRequest;
+-import com.google.android.gms.location.LocationServices;
+-
+ import org.chromium.base.Log;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.components.location.LocationUtils;
+@@ -27,126 +17,39 @@ import org.chromium.components.location.LocationUtils;
+  *
+  * https://developers.google.com/android/reference/com/google/android/gms/location/package-summary
+  */
+-public class LocationProviderGmsCore implements ConnectionCallbacks, OnConnectionFailedListener,
+-                                                LocationListener, LocationProvider {
++public class LocationProviderGmsCore implements LocationProvider {
+     private static final String TAG = "cr_LocationProvider";
+ 
+     // Values for the LocationRequest's setInterval for normal and high accuracy, respectively.
+     private static final long UPDATE_INTERVAL_MS = 1000;
+     private static final long UPDATE_INTERVAL_FAST_MS = 500;
+ 
+-    private final GoogleApiClient mGoogleApiClient;
+-    private FusedLocationProviderApi mLocationProviderApi = LocationServices.FusedLocationApi;
+-
+     private boolean mEnablehighAccuracy;
+-    private LocationRequest mLocationRequest;
+ 
+     public static boolean isGooglePlayServicesAvailable(Context context) {
+-        return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context)
+-                == ConnectionResult.SUCCESS;
++        return false;
+     }
+ 
+     LocationProviderGmsCore(Context context) {
+         Log.i(TAG, "Google Play Services");
+-        mGoogleApiClient = new GoogleApiClient.Builder(context)
+-                                   .addApi(LocationServices.API)
+-                                   .addConnectionCallbacks(this)
+-                                   .addOnConnectionFailedListener(this)
+-                                   .build();
+-        assert mGoogleApiClient != null;
+-    }
+-
+-    LocationProviderGmsCore(GoogleApiClient client, FusedLocationProviderApi locationApi) {
+-        mGoogleApiClient = client;
+-        mLocationProviderApi = locationApi;
+-    }
+-
+-    // ConnectionCallbacks implementation
+-    @Override
+-    public void onConnected(Bundle connectionHint) {
+-        ThreadUtils.assertOnUiThread();
+-
+-        mLocationRequest = LocationRequest.create();
+-        if (mEnablehighAccuracy) {
+-            // With enableHighAccuracy, request a faster update interval and configure the provider
+-            // for high accuracy mode.
+-            mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+-                    .setInterval(UPDATE_INTERVAL_FAST_MS);
+-        } else {
+-            // Use balanced mode by default. In this mode, the API will prefer the network provider
+-            // but may use sensor data (for instance, GPS) if high accuracy is requested by another
+-            // app.
+-            //
+-            // If location is configured for sensors-only then elevate the priority to ensure GPS
+-            // and other sensors are used.
+-            if (LocationUtils.getInstance().isSystemLocationSettingSensorsOnly()) {
+-                mLocationRequest.setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY);
+-            } else {
+-                mLocationRequest.setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+-            }
+-            mLocationRequest.setInterval(UPDATE_INTERVAL_MS);
+-        }
+-
+-        final Location location = mLocationProviderApi.getLastLocation(mGoogleApiClient);
+-        if (location != null) {
+-            LocationProviderAdapter.onNewLocationAvailable(location);
+-        }
+-
+-        try {
+-            // Request updates on UI Thread replicating LocationProviderAndroid's behaviour.
+-            mLocationProviderApi.requestLocationUpdates(
+-                    mGoogleApiClient, mLocationRequest, this, ThreadUtils.getUiThreadLooper());
+-        } catch (IllegalStateException | SecurityException e) {
+-            // IllegalStateException is thrown "If this method is executed in a thread that has not
+-            // called Looper.prepare()". SecurityException is thrown if there is no permission, see
+-            // https://crbug.com/731271.
+-            Log.e(TAG, " mLocationProviderApi.requestLocationUpdates() " + e);
+-            LocationProviderAdapter.newErrorAvailable(
+-                    "Failed to request location updates: " + e.toString());
+-            assert false;
+-        }
+-    }
+-
+-    @Override
+-    public void onConnectionSuspended(int cause) {}
+-
+-    // OnConnectionFailedListener implementation
+-    @Override
+-    public void onConnectionFailed(ConnectionResult result) {
+-        LocationProviderAdapter.newErrorAvailable(
+-                "Failed to connect to Google Play Services: " + result.toString());
+     }
+ 
+     // LocationProvider implementation
+     @Override
+     public void start(boolean enableHighAccuracy) {
+         ThreadUtils.assertOnUiThread();
+-        if (mGoogleApiClient.isConnected()) mGoogleApiClient.disconnect();
+ 
+         mEnablehighAccuracy = enableHighAccuracy;
+-        mGoogleApiClient.connect(); // Should return via onConnected().
+     }
+ 
+     @Override
+     public void stop() {
+         ThreadUtils.assertOnUiThread();
+-        if (!mGoogleApiClient.isConnected()) return;
+-
+-        mLocationProviderApi.removeLocationUpdates(mGoogleApiClient, this);
+-
+-        mGoogleApiClient.disconnect();
+     }
+ 
+     @Override
+     public boolean isRunning() {
+         assert ThreadUtils.runningOnUiThread();
+-        if (mGoogleApiClient == null) return false;
+-        return mGoogleApiClient.isConnecting() || mGoogleApiClient.isConnected();
+-    }
+-
+-    // LocationListener implementation
+-    @Override
+-    public void onLocationChanged(Location location) {
+-        LocationProviderAdapter.onNewLocationAvailable(location);
++        return false;
+     }
+ }
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -830,64 +830,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_fido_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_iid_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_stats_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_instantapps_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_instantapps/play-services-instantapps-16.0.0.aar"
+-  info_path = "libs/com_google_android_gms_play_services_instantapps/com_google_android_gms_play_services_instantapps.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_location_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_location/play-services-location-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_location/com_google_android_gms_play_services_location.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_places_placereport_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("google_play_services_tasks_java") {
+   aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
+   info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
+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
+@@ -137,7 +137,6 @@ if (is_android) {
+     jacoco_never_instrument = true
+     deps = [
+       ":cacheinvalidation_proto_java",
+-      "$google_play_services_package:google_play_services_iid_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//third_party/android_protobuf:protobuf_nano_javalib",
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
+@@ -27,9 +27,6 @@
+     <!-- InstanceID Listener Service -->
+     <service android:exported="false"
+         android:name="com.google.ipc.invalidation.ticl2.android2.channel.AndroidInstanceIDListenerService">
+-        <intent-filter>
+-            <action android:name="com.google.android.gms.iid.InstanceID"/>
+-        </intent-filter>
+     </service>
+   </application>
+ </manifest>
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch

@@ -0,0 +1,71 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 07:57:37 +0100
+Subject: Remove dependency on com.google.android.gms.flags,
+ com.google.android.gms.location.places, com.google.android.gms.stats
+
+---
+ third_party/android_deps/BUILD.gn | 49 ---------------------------------------
+ 1 file changed, 49 deletions(-)
+
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -1499,55 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_flags_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //tools/android/roll/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_places_placereport_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //tools/android/roll/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_basement_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_stats_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_stats/play-services-stats-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_stats/com_google_android_gms_play_services_stats.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //tools/android/roll/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_basement_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ java_prebuilt("com_google_code_findbugs_jsr305_java") {
+   jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-1.3.9.jar"
+   output_name = "com_google_code_findbugs_jsr305"
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.gcm.patch

@@ -0,0 +1,749 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Sat, 2 Nov 2019 07:56:44 +0100
+Subject: Remove dependency on com.google.android.gms.gcm
+
+It also disalbes Snippets, auto-update of offline pages and launching browser from background service.
+The snippets are already disabled in native codes, this will disable it on Java level.
+---
+ chrome/android/BUILD.gn                            |  3 -
+ .../chrome/browser/BackgroundSyncLauncher.java     | 17 +----
+ .../chrome/browser/ChromeBackgroundService.java    | 79 +------------------
+ .../invalidation/InvalidationController.java       |  1 +
+ .../browser/ntp/snippets/SnippetsLauncher.java     |  2 +-
+ .../services/gcm/ChromeGcmListenerService.java     | 58 +-------------
+ components/background_task_scheduler/BUILD.gn      |  3 -
+ .../BackgroundTaskGcmTaskService.java              | 63 +--------------
+ .../BackgroundTaskSchedulerFactory.java            |  6 +-
+ .../BackgroundTaskSchedulerGcmNetworkManager.java  | 14 +---
+ third_party/android_deps/BUILD.gn                  | 15 ----
+ third_party/cacheinvalidation/BUILD.gn             |  1 -
+ .../client/android2/AndroidManifestUpdatedGcm.xml  | 20 -----
+ .../android2/channel/AndroidGcmController.java     | 42 +---------
+ .../channel/AndroidInstanceIDListenerService.java  | 13 +---
+ .../channel/GcmRegistrationTaskService.java        | 89 +---------------------
+ 16 files changed, 14 insertions(+), 412 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -272,7 +272,6 @@ android_library("chrome_java") {
+     "$google_play_services_package:google_play_services_cast_framework_java",
+     "$google_play_services_package:google_play_services_cast_java",
+     "$google_play_services_package:google_play_services_fido_java",
+-    "$google_play_services_package:google_play_services_gcm_java",
+     "$google_play_services_package:google_play_services_iid_java",
+     "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+@@ -798,7 +797,6 @@ android_library("chrome_test_java") {
+     "$google_play_services_package:google_play_services_cast_framework_java",
+     "$google_play_services_package:google_play_services_cast_java",
+     "$google_play_services_package:google_play_services_fido_java",
+-    "$google_play_services_package:google_play_services_gcm_java",
+     "$google_play_services_package:google_play_services_iid_java",
+     "$google_play_services_package:google_play_services_tasks_java",
+     "//base:base_java",
+@@ -1543,7 +1541,6 @@ android_library("browser_java_test_support") {
+   ]
+   deps = [
+     ":chrome_java",
+-    "$google_play_services_package:google_play_services_gcm_java",
+     "//base:base_java",
+     "//base:base_java_test_support",
+     "//chrome/android/public/profiles:java",
+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
+@@ -41,7 +41,7 @@ public class BackgroundSyncLauncher {
+      * Automatic GCM use is disabled by tests, and also by this class if it is determined on
+      * creation that the installed Play Services library is out of date.
+      */
+-    private static boolean sGCMEnabled = true;
++    private static boolean sGCMEnabled;
+ 
+     @VisibleForTesting
+     protected AsyncTask<Void> mLaunchBrowserIfStoppedTask;
+@@ -140,20 +140,7 @@ public class BackgroundSyncLauncher {
+      */
+     @CalledByNative
+     private static boolean shouldDisableBackgroundSync() {
+-        // Check to see if Play Services is up to date, and disable GCM if not.
+-        // This will not automatically set {@link sGCMEnabled} to true, in case it has been
+-        // disabled in tests.
+-        if (sGCMEnabled) {
+-            boolean isAvailable = true;
+-            if (!ExternalAuthUtils.canUseGooglePlayServices()) {
+-                setGCMEnabled(false);
+-                Log.i(TAG, "Disabling Background Sync because Play Services is not up to date.");
+-                isAvailable = false;
+-            }
+-            RecordHistogram.recordBooleanHistogram(
+-                    "BackgroundSync.LaunchTask.PlayServicesAvailable", isAvailable);
+-        }
+-        return !sGCMEnabled;
++        return true;
+     }
+ 
+     @VisibleForTesting
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
+@@ -6,10 +6,6 @@ package org.chromium.chrome.browser;
+ 
+ import android.content.Context;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.GcmTaskService;
+-import com.google.android.gms.gcm.TaskParams;
+-
+ import org.chromium.base.Log;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.library_loader.ProcessInitException;
+@@ -27,67 +23,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
+  * browser needs to be launched for scheduled tasks, or in response to changing network or power
+  * conditions.
+  */
+-public class ChromeBackgroundService extends GcmTaskService {
++public class ChromeBackgroundService {
+     private static final String TAG = "BackgroundService";
+ 
+-    @Override
+-    @VisibleForTesting
+-    public int onRunTask(final TaskParams params) {
+-        final String taskTag = params.getTag();
+-        final Context context = this;
+-        PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
+-            switch (taskTag) {
+-                case BackgroundSyncLauncher.TASK_TAG:
+-                    handleBackgroundSyncEvent(context, taskTag);
+-                    break;
+-
+-                case OfflinePageUtils.TASK_TAG:
+-                    // Offline pages are migrating to BackgroundTaskScheduler, therefore getting
+-                    // a task through ChromeBackgroundSerivce should cause a rescheduling using
+-                    // the new component.
+-                    rescheduleOfflinePages();
+-                    break;
+-
+-                case SnippetsLauncher.TASK_TAG_WIFI:
+-                case SnippetsLauncher.TASK_TAG_FALLBACK:
+-                    handleSnippetsOnPersistentSchedulerWakeUp(context, taskTag);
+-                    break;
+-
+-                // This is only for tests.
+-                case ServiceManagerStartupUtils.TASK_TAG:
+-                    handleServicificationStartupTask(context, taskTag);
+-                    break;
+-
+-                default:
+-                    Log.i(TAG, "Unknown task tag " + taskTag);
+-                    break;
+-            }
+-        });
+-
+-        return GcmNetworkManager.RESULT_SUCCESS;
+-    }
+-
+-    private void handleBackgroundSyncEvent(Context context, String tag) {
+-        if (!BackgroundSyncLauncher.hasInstance()) {
+-            // Start the browser. The browser's BackgroundSyncManager (for the active profile) will
+-            // start, check the network, and run any necessary sync events. This task runs with a
+-            // wake lock, but has a three minute timeout, so we need to start the browser in its
+-            // own task.
+-            // TODO(jkarlin): Protect the browser sync event with a wake lock.
+-            // See crbug.com/486020.
+-            launchBrowser(context, tag);
+-        }
+-    }
+-
+-    private void handleSnippetsOnPersistentSchedulerWakeUp(Context context, String tag) {
+-        if (!SnippetsLauncher.hasInstance()) launchBrowser(context, tag);
+-        snippetsOnPersistentSchedulerWakeUp();
+-    }
+-
+-    private void handleServicificationStartupTask(Context context, String tag) {
+-        launchBrowser(context, tag);
+-    }
+-
+     @VisibleForTesting
+     protected void snippetsOnPersistentSchedulerWakeUp() {
+         SnippetsBridge.onPersistentSchedulerWakeUp();
+@@ -115,23 +53,8 @@ public class ChromeBackgroundService extends GcmTaskService {
+     protected void rescheduleBackgroundSyncTasksOnUpgrade() {
+     }
+ 
+-    private void handleSnippetsOnBrowserUpgraded() {
+-        if (SnippetsLauncher.shouldNotifyOnBrowserUpgraded()) {
+-            if (!SnippetsLauncher.hasInstance()) {
+-                launchBrowser(this, /*tag=*/""); // The |tag| doesn't matter here.
+-            }
+-            snippetsOnBrowserUpgraded();
+-        }
+-    }
+-
+     /** Reschedules offline pages (using appropriate version of Background Task Scheduler). */
+     protected void rescheduleOfflinePages() {
+         BackgroundScheduler.getInstance().reschedule();
+     }
+-
+-    @Override
+-    public void onInitializeTasks() {
+-        rescheduleBackgroundSyncTasksOnUpgrade();
+-        handleSnippetsOnBrowserUpgraded();
+-    }
+ }
+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
+@@ -167,6 +167,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
+ 
+         // Ensure GCM has been initialized.
+         ensureGcmIsInitialized();
++        if (!mGcmInitialized) return;
+ 
+         // Do not apply changes to {@link #mSessionInvalidationsEnabled} yet because the timer task
+         // may be scheduled far into the future.
+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
+@@ -35,7 +35,7 @@ public class SnippetsLauncher {
+     // If it is non-null then the browser is running.
+     private static SnippetsLauncher sInstance;
+ 
+-    private boolean mGCMEnabled = true;
++    private boolean mGCMEnabled;
+ 
+     /**
+      * Create a SnippetsLauncher object, which is owned by C++.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
+@@ -11,7 +11,6 @@ import android.os.Bundle;
+ import android.os.SystemClock;
+ import android.text.TextUtils;
+ 
+-import com.google.android.gms.gcm.GcmListenerService;
+ import com.google.ipc.invalidation.ticl.android2.channel.AndroidGcmController;
+ 
+ import org.chromium.base.ContextUtils;
+@@ -35,62 +34,9 @@ import org.chromium.content_public.browser.UiThreadTaskTraits;
+ /**
+  * Receives Downstream messages and status of upstream messages from GCM.
+  */
+-public class ChromeGcmListenerService extends GcmListenerService {
++public class ChromeGcmListenerService {
+     private static final String TAG = "ChromeGcmListener";
+ 
+-    @Override
+-    public void onCreate() {
+-        ProcessInitializationHandler.getInstance().initializePreNative();
+-        super.onCreate();
+-    }
+-
+-    @Override
+-    public void onMessageReceived(final String from, final Bundle data) {
+-        boolean hasCollapseKey = !TextUtils.isEmpty(data.getString("collapse_key"));
+-        GcmUma.recordDataMessageReceived(ContextUtils.getApplicationContext(), hasCollapseKey);
+-
+-        String invalidationSenderId = AndroidGcmController.get(this).getSenderId();
+-        if (from.equals(invalidationSenderId)) {
+-            AndroidGcmController.get(this).onMessageReceived(data);
+-            return;
+-        }
+-
+-        // Dispatch the message to the GCM Driver for native features.
+-        PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
+-            GCMMessage message = null;
+-            try {
+-                message = new GCMMessage(from, data);
+-            } catch (IllegalArgumentException e) {
+-                Log.e(TAG, "Received an invalid GCM Message", e);
+-                return;
+-            }
+-
+-            scheduleOrDispatchMessageToDriver(message);
+-        });
+-    }
+-
+-    @Override
+-    public void onMessageSent(String msgId) {
+-        Log.d(TAG, "Message sent successfully. Message id: " + msgId);
+-        GcmUma.recordGcmUpstreamHistogram(
+-                ContextUtils.getApplicationContext(), GcmUma.UMA_UPSTREAM_SUCCESS);
+-    }
+-
+-    @Override
+-    public void onSendError(String msgId, String error) {
+-        Log.w(TAG, "Error in sending message. Message id: " + msgId + " Error: " + error);
+-        GcmUma.recordGcmUpstreamHistogram(
+-                ContextUtils.getApplicationContext(), GcmUma.UMA_UPSTREAM_SEND_FAILED);
+-    }
+-
+-    @Override
+-    public void onDeletedMessages() {
+-        // TODO(johnme): Ask GCM to include the subtype in this event.
+-        Log.w(TAG, "Push messages were deleted, but we can't tell the Service Worker as we don't"
+-                + "know what subtype (app ID) it occurred for.");
+-        GcmUma.recordDeletedMessages(ContextUtils.getApplicationContext());
+-    }
+-
+     /**
+      * Returns if we deliver the GCMMessage with a background service by calling
+      * Context#startService. This will only work if Android has put us in a whitelist to allow
+@@ -225,8 +171,6 @@ public class ChromeGcmListenerService extends GcmListenerService {
+ 
+         try {
+             ChromeBrowserInitializer.getInstance(applicationContext).handleSynchronousStartup();
+-            GCMDriver.dispatchMessage(message);
+-
+         } catch (ProcessInitException e) {
+             Log.e(TAG, "ProcessInitException while starting the browser process");
+ 
+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
+@@ -54,7 +54,6 @@ if (is_android) {
+       ":scheduled_task_java",
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_gcm_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//content/public/android:content_java",
+@@ -78,7 +77,6 @@ if (is_android) {
+       ":background_task_scheduler_task_ids_java",
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_gcm_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+@@ -109,7 +107,6 @@ if (is_android) {
+       "$google_play_services_package:google_play_services_auth_base_java",
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_gcm_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java
+--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java
++++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskGcmTaskService.java
+@@ -6,10 +6,6 @@ package org.chromium.components.background_task_scheduler;
+ 
+ import android.os.Build;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.GcmTaskService;
+-import com.google.android.gms.gcm.TaskParams;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.ThreadUtils;
+@@ -20,7 +16,7 @@ import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.atomic.AtomicBoolean;
+ 
+ /** Delegates calls out to various tasks that need to run in the background. */
+-public class BackgroundTaskGcmTaskService extends GcmTaskService {
++public class BackgroundTaskGcmTaskService {
+     private static final String TAG = "BkgrdTaskGcmTS";
+ 
+     private BackgroundTaskSchedulerGcmNetworkManager.Clock mClock = System::currentTimeMillis;
+@@ -90,63 +86,6 @@ public class BackgroundTaskGcmTaskService extends GcmTaskService {
+     }
+ 
+     @Override
+-    public int onRunTask(TaskParams params) {
+-        final TaskParameters taskParams =
+-                BackgroundTaskSchedulerGcmNetworkManager.getTaskParametersFromTaskParams(params);
+-
+-        final BackgroundTask backgroundTask =
+-                BackgroundTaskSchedulerFactory.getBackgroundTaskFromTaskId(taskParams.getTaskId());
+-        if (backgroundTask == null) {
+-            Log.w(TAG, "Failed to start task. Could not instantiate BackgroundTask class.");
+-            // Cancel task if the BackgroundTask class is not found anymore. We assume this means
+-            // that the task has been deprecated.
+-            BackgroundTaskSchedulerFactory.getScheduler().cancel(
+-                    ContextUtils.getApplicationContext(), taskParams.getTaskId());
+-            return GcmNetworkManager.RESULT_FAILURE;
+-        }
+-
+-        if (BackgroundTaskSchedulerGcmNetworkManager.didTaskExpire(
+-                    params, mClock.currentTimeMillis())) {
+-            BackgroundTaskSchedulerUma.getInstance().reportTaskExpired(taskParams.getTaskId());
+-            return GcmNetworkManager.RESULT_FAILURE;
+-        }
+-
+-        final Waiter waiter = new Waiter(Waiter.MAX_TIMEOUT_SECONDS);
+-
+-        final AtomicBoolean taskNeedsBackgroundProcessing = new AtomicBoolean();
+-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+-            @Override
+-            public void run() {
+-                BackgroundTaskSchedulerUma.getInstance().reportTaskStarted(taskParams.getTaskId());
+-                taskNeedsBackgroundProcessing.set(
+-                        backgroundTask.onStartTask(ContextUtils.getApplicationContext(), taskParams,
+-                                new TaskFinishedCallbackGcmTaskService(waiter)));
+-            }
+-        });
+-
+-        if (!taskNeedsBackgroundProcessing.get()) return GcmNetworkManager.RESULT_SUCCESS;
+-
+-        waiter.startWaiting();
+-
+-        if (waiter.isRescheduleNeeded()) return GcmNetworkManager.RESULT_RESCHEDULE;
+-        if (!waiter.hasTaskTimedOut()) return GcmNetworkManager.RESULT_SUCCESS;
+-
+-        final AtomicBoolean taskNeedsRescheduling = new AtomicBoolean();
+-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+-            @Override
+-            public void run() {
+-                BackgroundTaskSchedulerUma.getInstance().reportTaskStopped(taskParams.getTaskId());
+-                taskNeedsRescheduling.set(backgroundTask.onStopTask(
+-                        ContextUtils.getApplicationContext(), taskParams));
+-            }
+-        });
+-
+-        if (taskNeedsRescheduling.get()) return GcmNetworkManager.RESULT_RESCHEDULE;
+-
+-        return GcmNetworkManager.RESULT_SUCCESS;
+-    }
+-
+-    @Override
+     public void onInitializeTasks() {
+         // Ignore the event on OSs supporting JobScheduler.
+         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
+diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
+--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
++++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
+@@ -17,11 +17,7 @@ public final class BackgroundTaskSchedulerFactory {
+     private static BackgroundTaskFactory sBackgroundTaskFactory;
+ 
+     static BackgroundTaskSchedulerDelegate getSchedulerDelegateForSdk(int sdkInt) {
+-        if (sdkInt >= Build.VERSION_CODES.M) {
+-            return new BackgroundTaskSchedulerJobService();
+-        } else {
+-            return new BackgroundTaskSchedulerGcmNetworkManager();
+-        }
++        return new BackgroundTaskSchedulerJobService(); /* minSDK is 24 */
+     }
+ 
+     /**
+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
+@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
+  * An implementation of {@link BackgroundTaskSchedulerDelegate} that uses the Play Services
+  * {@link GcmNetworkManager} to schedule jobs.
+  */
+-class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedulerDelegate {
++class BackgroundTaskSchedulerGcmNetworkManager {
+     private static final String TAG = "BkgrdTaskSchedGcmNM";
+ 
+     /** Delta time for expiration checks, after the end time. */
+@@ -34,18 +34,6 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
+         sClock = clock;
+     }
+ 
+-    @Override
+-    public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
+-        ThreadUtils.assertOnUiThread();
+-
+-        return false;
+-    }
+-
+-    @Override
+-    public void cancel(Context context, int taskId) {
+-        ThreadUtils.assertOnUiThread();
+-    }
+-
+     private static String taskIdToTaskTag(int taskId) {
+         return Integer.toString(taskId);
+     }
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -844,21 +844,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_gcm_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_iid_java",
+-    ":google_play_services_stats_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("google_play_services_iid_java") {
+   aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-15.0.1.aar"
+   info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
+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
+@@ -137,7 +137,6 @@ if (is_android) {
+     jacoco_never_instrument = true
+     deps = [
+       ":cacheinvalidation_proto_java",
+-      "$google_play_services_package:google_play_services_gcm_java",
+       "$google_play_services_package:google_play_services_iid_java",
+       "$google_play_services_package:google_play_services_tasks_java",
+       "//base:base_java",
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/external/client/android2/AndroidManifestUpdatedGcm.xml
+@@ -24,17 +24,6 @@
+     <receiver android:exported="false"
+         android:name="com.google.ipc.invalidation.ticl2.android2.AndroidInternalScheduler$AlarmReceiver"/>
+ 
+-    <!-- GCM Broadcast Receiver -->
+-    <receiver android:exported="true"
+-        android:name="com.google.android.gms.gcm.GcmReceiver"
+-        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="com.google.ipc.invalidation.client2.android2"/>
+-        </intent-filter>
+-    </receiver>
+-
+     <!-- InstanceID Listener Service -->
+     <service android:exported="false"
+         android:name="com.google.ipc.invalidation.ticl2.android2.channel.AndroidInstanceIDListenerService">
+@@ -42,14 +31,5 @@
+             <action android:name="com.google.android.gms.iid.InstanceID"/>
+         </intent-filter>
+     </service>
+-
+-    <!-- GcmTaskService for registration -->
+-    <service android:name="com.google.ipc.invalidation.ticl2.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>
+   </application>
+ </manifest>
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidGcmController.java
+@@ -15,8 +15,6 @@
+  */
+ package com.google.ipc.invalidation.ticl.android2.channel;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.OneoffTask;
+ import com.google.ipc.invalidation.common.GcmSharedConstants;
+ import com.google.ipc.invalidation.external.client.SystemResources.Logger;
+ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
+@@ -50,7 +48,7 @@ public class AndroidGcmController {
+ 
+   private static AndroidGcmController androidGcmController;
+ 
+-  private GcmNetworkManager gcmNetworkManager;
++//  private GcmNetworkManager gcmNetworkManager;
+ 
+   private Context context;
+ 
+@@ -64,33 +62,13 @@ public class AndroidGcmController {
+   public static AndroidGcmController get(Context context) {
+     synchronized (lock) {
+       if (androidGcmController == null) {
+-        androidGcmController =
+-            new AndroidGcmController(context, GcmNetworkManager.getInstance(context));
++        androidGcmController = null;
+       }
+     }
+     return androidGcmController;
+   }
+ 
+   /**
+-   * Override AndroidGcmController with a custom GcmNetworkManager in tests. This overrides the
+-   * existing instance of AndroidGcmController if any.
+-   *
+-   * @param context the application context.
+-   * @param gcmNetworkManager the custom GcmNetworkManager to use.
+-   */
+-  public static void overrideAndroidGcmControllerForTests(
+-      Context context, GcmNetworkManager gcmNetworkManager) {
+-    synchronized (lock) {
+-      androidGcmController = new AndroidGcmController(context, gcmNetworkManager);
+-    }
+-  }
+-
+-  private AndroidGcmController(Context context, GcmNetworkManager gcmNetworkManager) {
+-    this.context = context;
+-    this.gcmNetworkManager = gcmNetworkManager;
+-  }
+-
+-  /**
+    * Returns true if no registration token is stored or the current application version is higher
+    * than the version for the token stored.
+    */
+@@ -142,21 +120,7 @@ public class AndroidGcmController {
+       return;
+     }
+ 
+-    OneoffTask registrationTask =
+-        new OneoffTask.Builder()
+-            .setExecutionWindow(0, 1)
+-            .setTag(AndroidChannelConstants.GCM_REGISTRATION_TASK_SERVICE_TAG)
+-            .setService(GcmRegistrationTaskService.class)
+-            .build();
+-
+-    try {
+-      gcmNetworkManager.schedule(registrationTask);
+-    } catch (IllegalArgumentException exception) {
+-      // Scheduling the service can throw an exception due to a framework error on Android when
+-      // the the look up for the GCMTaskService being scheduled to be run fails.
+-      // See crbug/548314.
+-      logger.warning("Failed to schedule GCM registration task. Exception: %s", exception);
+-    }
++    logger.warning("Failed to schedule GCM registration task.");
+   }
+ 
+   /**
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidInstanceIDListenerService.java
+@@ -15,7 +15,6 @@
+  */
+ package com.google.ipc.invalidation.ticl.android2.channel;
+ 
+-import com.google.android.gms.iid.InstanceIDListenerService;
+ import com.google.ipc.invalidation.external.client.SystemResources.Logger;
+ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
+ 
+@@ -23,16 +22,6 @@ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger
+  * Implementation of {@link InstanceIDListenerService} to receive notifications from GCM to
+  * update the registration token.
+  */
+-public class AndroidInstanceIDListenerService extends InstanceIDListenerService {
++public class AndroidInstanceIDListenerService {
+   private static final Logger logger = AndroidLogger.forTag("InstanceIDListener");
+-  
+-  /**
+-   * Called when the token needs to updated. {@link AndroidGcmController#fetchToken} clears the
+-   * current token and schedules a task to fetch a new token.
+-   */
+-  @Override
+-  public void onTokenRefresh() {
+-    logger.info("Received token refresh request");
+-    AndroidGcmController.get(this).fetchToken();
+-  }
+ }
+diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java
+--- a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java
++++ b/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java
+@@ -15,11 +15,6 @@
+  */
+ package com.google.ipc.invalidation.ticl.android2.channel;
+ 
+-import com.google.android.gms.gcm.GcmNetworkManager;
+-import com.google.android.gms.gcm.GcmTaskService;
+-import com.google.android.gms.gcm.GoogleCloudMessaging;
+-import com.google.android.gms.gcm.TaskParams;
+-import com.google.android.gms.iid.InstanceID;
+ import com.google.ipc.invalidation.common.GcmSharedConstants;
+ import com.google.ipc.invalidation.external.client.SystemResources.Logger;
+ import com.google.ipc.invalidation.external.client.android.service.AndroidLogger;
+@@ -42,88 +37,6 @@ import java.io.IOException;
+  * failure to fetch the token, the task is rescheduled using the GcmNetworkManager which uses
+  * exponential back-offs to control when the task is executed.
+  */
+-public class GcmRegistrationTaskService extends GcmTaskService {
++public class GcmRegistrationTaskService {
+   private static final Logger logger = AndroidLogger.forTag("RegistrationTaskService");
+-
+-  public InstanceID getInstanceID(Context context) {
+-    return InstanceID.getInstance(context);
+-  }
+-
+-  /**
+-   * Called when the task is ready to be executed. Registers with GCM using
+-   * {@link InstanceID#getToken} and stores the registration token.
+-   *
+-   * <p>Returns {@link GcmNetworkManager#RESULT_SUCCESS} when the token is successfully retrieved.
+-   * On failure {@link GcmNetworkManager#RESULT_RESCHEDULE} is used which reschedules the service
+-   * to be executed again using exponential back-off.
+-   */
+-  @Override
+-  public int onRunTask(TaskParams params) {
+-    if (!AndroidChannelConstants.GCM_REGISTRATION_TASK_SERVICE_TAG.equals(params.getTag())) {
+-     logger.warning("Unknown task received with tag: %s", params.getTag());
+-     return GcmNetworkManager.RESULT_FAILURE;
+-    }
+-
+-    String senderId = GcmSharedConstants.GCM_UPDATED_SENDER_ID;
+-    try {
+-      String token = getInstanceID(this).getToken(
+-          senderId, GoogleCloudMessaging.INSTANCE_ID_SCOPE, null);
+-      storeToken(token);
+-      return GcmNetworkManager.RESULT_SUCCESS;
+-    } catch (IOException exception) {
+-      logger.warning("Failed to get token for sender: %s. Exception : %s", senderId, exception);
+-      return GcmNetworkManager.RESULT_RESCHEDULE;
+-    } catch (SecurityException exception) {
+-      // InstanceID#getToken occasionally throws a security exception when trying send the
+-      // registration intent to GMSCore. Catching the exception here to prevent crashes.
+-      logger.warning("Security exception when fetching token: %s", exception);
+-      return GcmNetworkManager.RESULT_RESCHEDULE;
+-    }
+-  }
+-
+-  /** Stores the registration token and the current application version in Shared Preferences. */
+-  private void storeToken(String token) {
+-      AndroidChannelPreferences.setRegistrationToken(token);
+-      AndroidChannelPreferences.setAppVersion(
+-              CommonUtils.getPackageVersion(this, getPackageName()));
+-      // Send the updated token to the server.
+-      updateServer();
+-  }
+-
+-  /** Sends a message to the server to update the GCM registration token. */
+-  private void updateServer() {
+-    // Inform the sender service that the registration token has changed. If the sender service
+-    // had buffered a message because no registration token was previously available, this intent
+-    // will cause it to send that message.
+-    Intent sendBuffered = new Intent();
+-    final String ignoredData = "";
+-    sendBuffered.putExtra(AndroidChannelConstants.MESSAGE_SENDER_SVC_GCM_REGID_CHANGE, ignoredData);
+-
+-    // Select the sender service to use for upstream message.
+-    if (AndroidChannelPreferences.getGcmChannelType() == GcmChannelType.GCM_UPSTREAM) {
+-        String upstreamServiceClass = new AndroidTiclManifest(this).getGcmUpstreamServiceClass();
+-        if (upstreamServiceClass == null) {
+-            logger.warning("GcmUpstreamSenderService class not found.");
+-            return;
+-        }
+-        sendBuffered.setClassName(this, upstreamServiceClass);
+-    } else {
+-        sendBuffered.setClass(this, AndroidMessageSenderService.class);
+-    }
+-    try {
+-      startService(sendBuffered);
+-    } catch (IllegalStateException exception) {
+-      logger.warning("Unable to send buffered message(s): %s", exception);
+-    }
+-
+-    // Inform the Ticl service that the registration id has changed. This will cause it to send
+-    // a message to the data center and update the GCM registration id stored at the data center.
+-    Intent updateServer = ProtocolIntents.InternalDowncalls.newNetworkAddrChangeIntent();
+-    updateServer.setClassName(this, new AndroidTiclManifest(this).getTiclServiceClass());
+-    try {
+-      startService(updateServer);
+-    } catch (IllegalStateException exception) {
+-      logger.warning("Unable to inform server about new registration id: %s", exception);
+-    }
+-  }
+ }
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch

@@ -0,0 +1,575 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Fri, 1 Nov 2019 23:10:47 +0100
+Subject: Remove dependency on com.google.android.gms.vision,
+ com.google.android.gms.clearcut, com.google.android.gms.phenotype
+
+---
+ services/BUILD.gn                                  |   4 -
+ services/shape_detection/BUILD.gn                  |   2 -
+ .../shape_detection/BarcodeDetectionImpl.java      | 114 +------------------
+ .../BarcodeDetectionProviderImpl.java              |  18 +--
+ .../shape_detection/FaceDetectionImplGmsCore.java  | 122 +--------------------
+ .../shape_detection/TextDetectionImpl.java         |  60 +---------
+ third_party/android_deps/BUILD.gn                  |  66 -----------
+ 7 files changed, 10 insertions(+), 376 deletions(-)
+
+diff --git a/services/BUILD.gn b/services/BUILD.gn
+--- a/services/BUILD.gn
++++ b/services/BUILD.gn
+@@ -109,8 +109,6 @@ if (is_android) {
+     deps = [
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_vision_common_java",
+-      "$google_play_services_package:google_play_services_vision_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//base:base_junit_test_support",
+@@ -140,8 +138,6 @@ if (is_android) {
+     deps = [
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_vision_common_java",
+-      "$google_play_services_package:google_play_services_vision_java",
+       "//base:base_java",
+       "//base:base_java_test_support",
+       "//mojo/public/java:base_java",
+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
+@@ -91,8 +91,6 @@ if (is_android) {
+     deps = [
+       "$google_play_services_package:google_play_services_base_java",
+       "$google_play_services_package:google_play_services_basement_java",
+-      "$google_play_services_package:google_play_services_vision_common_java",
+-      "$google_play_services_package:google_play_services_vision_java",
+       "//base:base_java",
+       "//mojo/public/java:base_java",
+       "//mojo/public/java:bindings_java",
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java
+@@ -8,10 +8,6 @@ import android.graphics.Point;
+ import android.graphics.Rect;
+ import android.util.SparseArray;
+ 
+-import com.google.android.gms.vision.Frame;
+-import com.google.android.gms.vision.barcode.Barcode;
+-import com.google.android.gms.vision.barcode.BarcodeDetector;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.gfx.mojom.PointF;
+@@ -28,50 +24,7 @@ import org.chromium.shape_detection.mojom.BarcodeFormat;
+ public class BarcodeDetectionImpl implements BarcodeDetection {
+     private static final String TAG = "BarcodeDetectionImpl";
+ 
+-    private BarcodeDetector mBarcodeDetector;
+-
+     public BarcodeDetectionImpl(BarcodeDetectorOptions options) {
+-        int formats = Barcode.ALL_FORMATS;
+-        if (options.formats != null && options.formats.length > 0) {
+-            formats = 0;
+-            // Keep this list in sync with the constants defined in
+-            // com.google.android.gms.vision.barcode.Barcode and the list of
+-            // supported formats in BarcodeDetectionProviderImpl.
+-            for (int i = 0; i < options.formats.length; ++i) {
+-                if (options.formats[i] == BarcodeFormat.AZTEC) {
+-                    formats |= Barcode.AZTEC;
+-                } else if (options.formats[i] == BarcodeFormat.CODE_128) {
+-                    formats |= Barcode.CODE_128;
+-                } else if (options.formats[i] == BarcodeFormat.CODE_39) {
+-                    formats |= Barcode.CODE_39;
+-                } else if (options.formats[i] == BarcodeFormat.CODE_93) {
+-                    formats |= Barcode.CODE_93;
+-                } else if (options.formats[i] == BarcodeFormat.CODABAR) {
+-                    formats |= Barcode.CODABAR;
+-                } else if (options.formats[i] == BarcodeFormat.DATA_MATRIX) {
+-                    formats |= Barcode.DATA_MATRIX;
+-                } else if (options.formats[i] == BarcodeFormat.EAN_13) {
+-                    formats |= Barcode.EAN_13;
+-                } else if (options.formats[i] == BarcodeFormat.EAN_8) {
+-                    formats |= Barcode.EAN_8;
+-                } else if (options.formats[i] == BarcodeFormat.ITF) {
+-                    formats |= Barcode.ITF;
+-                } else if (options.formats[i] == BarcodeFormat.PDF417) {
+-                    formats |= Barcode.PDF417;
+-                } else if (options.formats[i] == BarcodeFormat.QR_CODE) {
+-                    formats |= Barcode.QR_CODE;
+-                } else if (options.formats[i] == BarcodeFormat.UPC_A) {
+-                    formats |= Barcode.UPC_A;
+-                } else if (options.formats[i] == BarcodeFormat.UPC_E) {
+-                    formats |= Barcode.UPC_E;
+-                } else {
+-                    Log.e(TAG, "Unsupported barcode format hint: " + options.formats[i]);
+-                }
+-            }
+-        }
+-        mBarcodeDetector = new BarcodeDetector.Builder(ContextUtils.getApplicationContext())
+-                                   .setBarcodeFormats(formats)
+-                                   .build();
+     }
+ 
+     @Override
+@@ -80,47 +33,12 @@ public class BarcodeDetectionImpl implements BarcodeDetection {
+         // on the device; this happens "fast", but it might have not completed,
+         // bail in this case. Also, the API was disabled between and v.9.0 and
+         // v.9.2, see https://developers.google.com/android/guides/releases.
+-        if (!mBarcodeDetector.isOperational()) {
+-            Log.e(TAG, "BarcodeDetector is not operational");
+-            callback.call(new BarcodeDetectionResult[0]);
+-            return;
+-        }
+-
+-        Frame frame = BitmapUtils.convertToFrame(bitmapData);
+-        if (frame == null) {
+-            Log.e(TAG, "Error converting Mojom Bitmap to Frame");
+-            callback.call(new BarcodeDetectionResult[0]);
+-            return;
+-        }
+-
+-        final SparseArray<Barcode> barcodes = mBarcodeDetector.detect(frame);
+-
+-        BarcodeDetectionResult[] barcodeArray = new BarcodeDetectionResult[barcodes.size()];
+-        for (int i = 0; i < barcodes.size(); i++) {
+-            barcodeArray[i] = new BarcodeDetectionResult();
+-            final Barcode barcode = barcodes.valueAt(i);
+-            barcodeArray[i].rawValue = barcode.rawValue;
+-            final Rect rect = barcode.getBoundingBox();
+-            barcodeArray[i].boundingBox = new RectF();
+-            barcodeArray[i].boundingBox.x = rect.left;
+-            barcodeArray[i].boundingBox.y = rect.top;
+-            barcodeArray[i].boundingBox.width = rect.width();
+-            barcodeArray[i].boundingBox.height = rect.height();
+-            final Point[] corners = barcode.cornerPoints;
+-            barcodeArray[i].cornerPoints = new PointF[corners.length];
+-            for (int j = 0; j < corners.length; j++) {
+-                barcodeArray[i].cornerPoints[j] = new PointF();
+-                barcodeArray[i].cornerPoints[j].x = corners[j].x;
+-                barcodeArray[i].cornerPoints[j].y = corners[j].y;
+-            }
+-            barcodeArray[i].format = toBarcodeFormat(barcode.format);
+-        }
+-        callback.call(barcodeArray);
++        Log.e(TAG, "BarcodeDetector is not operational");
++        callback.call(new BarcodeDetectionResult[0]);
+     }
+ 
+     @Override
+     public void close() {
+-        mBarcodeDetector.release();
+     }
+ 
+     @Override
+@@ -129,34 +47,6 @@ public class BarcodeDetectionImpl implements BarcodeDetection {
+     }
+ 
+     private int toBarcodeFormat(int format) {
+-        switch (format) {
+-            case Barcode.CODE_128:
+-                return BarcodeFormat.CODE_128;
+-            case Barcode.CODE_39:
+-                return BarcodeFormat.CODE_39;
+-            case Barcode.CODE_93:
+-                return BarcodeFormat.CODE_93;
+-            case Barcode.CODABAR:
+-                return BarcodeFormat.CODABAR;
+-            case Barcode.DATA_MATRIX:
+-                return BarcodeFormat.DATA_MATRIX;
+-            case Barcode.EAN_13:
+-                return BarcodeFormat.EAN_13;
+-            case Barcode.EAN_8:
+-                return BarcodeFormat.EAN_8;
+-            case Barcode.ITF:
+-                return BarcodeFormat.ITF;
+-            case Barcode.QR_CODE:
+-                return BarcodeFormat.QR_CODE;
+-            case Barcode.UPC_A:
+-                return BarcodeFormat.UPC_A;
+-            case Barcode.UPC_E:
+-                return BarcodeFormat.UPC_E;
+-            case Barcode.PDF417:
+-                return BarcodeFormat.PDF417;
+-            case Barcode.AZTEC:
+-                return BarcodeFormat.AZTEC;
+-        }
+         return BarcodeFormat.UNKNOWN;
+     }
+ }
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java
++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.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.base.Log;
+ import org.chromium.mojo.bindings.InterfaceRequest;
+@@ -35,12 +32,6 @@ public class BarcodeDetectionProviderImpl implements BarcodeDetectionProvider {
+         // Keep this list in sync with the constants defined in
+         // com.google.android.gms.vision.barcode.Barcode and the format hints
+         // supported by BarcodeDetectionImpl.
+-        int[] supportedFormats = {BarcodeFormat.AZTEC, BarcodeFormat.CODE_128,
+-                BarcodeFormat.CODE_39, BarcodeFormat.CODE_93, BarcodeFormat.CODABAR,
+-                BarcodeFormat.DATA_MATRIX, BarcodeFormat.EAN_13, BarcodeFormat.EAN_8,
+-                BarcodeFormat.ITF, BarcodeFormat.PDF417, BarcodeFormat.QR_CODE, BarcodeFormat.UPC_A,
+-                BarcodeFormat.UPC_E};
+-        callback.call(supportedFormats);
+     }
+ 
+     @Override
+@@ -50,12 +41,7 @@ public class BarcodeDetectionProviderImpl implements BarcodeDetectionProvider {
+     public void onConnectionError(MojoException e) {}
+ 
+     public static BarcodeDetectionProvider create() {
+-        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                    ContextUtils.getApplicationContext())
+-                != ConnectionResult.SUCCESS) {
+-            Log.e(TAG, "Google Play Services not available");
+-            return null;
+-        }
+-        return new BarcodeDetectionProviderImpl();
++        Log.e(TAG, "Google Play Services not available");
++        return null;
+     }
+ }
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java
++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java
+@@ -7,11 +7,6 @@ package org.chromium.shape_detection;
+ import android.graphics.PointF;
+ import android.util.SparseArray;
+ 
+-import com.google.android.gms.vision.Frame;
+-import com.google.android.gms.vision.face.Face;
+-import com.google.android.gms.vision.face.FaceDetector;
+-import com.google.android.gms.vision.face.Landmark;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.gfx.mojom.RectF;
+@@ -36,133 +31,20 @@ public class FaceDetectionImplGmsCore implements FaceDetection {
+     private static final int MAX_EULER_Z = 15;
+     private final int mMaxFaces;
+     private final boolean mFastMode;
+-    private final FaceDetector mFaceDetector;
+ 
+     FaceDetectionImplGmsCore(FaceDetectorOptions options) {
+-        FaceDetector.Builder builder =
+-                new FaceDetector.Builder(ContextUtils.getApplicationContext());
+         mMaxFaces = Math.min(options.maxDetectedFaces, MAX_FACES);
+         mFastMode = options.fastMode;
+-
+-        try {
+-            builder.setMode(mFastMode ? FaceDetector.FAST_MODE : FaceDetector.ACCURATE_MODE);
+-            builder.setLandmarkType(FaceDetector.ALL_LANDMARKS);
+-            if (mMaxFaces == 1) {
+-                builder.setProminentFaceOnly(true);
+-            }
+-        } catch (IllegalArgumentException e) {
+-            Log.e(TAG, "Unexpected exception " + e);
+-            assert false;
+-        }
+-
+-        mFaceDetector = builder.build();
+     }
+ 
+     @Override
+     public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
+-        // The vision library will be downloaded the first time the API is used
+-        // on the device; this happens "fast", but it might have not completed,
+-        // bail in this case.
+-        if (!mFaceDetector.isOperational()) {
+-            Log.e(TAG, "FaceDetector is not operational");
+-
+-            // Fallback to Android's FaceDetectionImpl.
+-            FaceDetectorOptions options = new FaceDetectorOptions();
+-            options.fastMode = mFastMode;
+-            options.maxDetectedFaces = mMaxFaces;
+-            FaceDetectionImpl detector = new FaceDetectionImpl(options);
+-            detector.detect(bitmapData, callback);
+-            return;
+-        }
+-
+-        Frame frame = BitmapUtils.convertToFrame(bitmapData);
+-        if (frame == null) {
+-            Log.e(TAG, "Error converting Mojom Bitmap to Frame");
+-            callback.call(new FaceDetectionResult[0]);
+-            return;
+-        }
+-
+-        final SparseArray<Face> faces = mFaceDetector.detect(frame);
+-
+-        FaceDetectionResult[] faceArray = new FaceDetectionResult[faces.size()];
+-        for (int i = 0; i < faces.size(); i++) {
+-            faceArray[i] = new FaceDetectionResult();
+-            final Face face = faces.valueAt(i);
+-
+-            final List<Landmark> landmarks = face.getLandmarks();
+-            ArrayList<org.chromium.shape_detection.mojom.Landmark> mojoLandmarks =
+-                    new ArrayList<org.chromium.shape_detection.mojom.Landmark>(landmarks.size());
+-
+-            int leftEyeIndex = -1;
+-            int rightEyeIndex = -1;
+-            int bottomMouthIndex = -1;
+-            for (int j = 0; j < landmarks.size(); j++) {
+-                final Landmark landmark = landmarks.get(j);
+-                final int landmarkType = landmark.getType();
+-                if (landmarkType != Landmark.LEFT_EYE && landmarkType != Landmark.RIGHT_EYE
+-                        && landmarkType != Landmark.BOTTOM_MOUTH
+-                        && landmarkType != Landmark.NOSE_BASE) {
+-                    continue;
+-                }
+-
+-                org.chromium.shape_detection.mojom.Landmark mojoLandmark =
+-                        new org.chromium.shape_detection.mojom.Landmark();
+-                mojoLandmark.locations = new org.chromium.gfx.mojom.PointF[1];
+-                mojoLandmark.locations[0] = new org.chromium.gfx.mojom.PointF();
+-                mojoLandmark.locations[0].x = landmark.getPosition().x;
+-                mojoLandmark.locations[0].y = landmark.getPosition().y;
+-
+-                if (landmarkType == Landmark.LEFT_EYE) {
+-                    mojoLandmark.type = LandmarkType.EYE;
+-                    leftEyeIndex = j;
+-                } else if (landmarkType == Landmark.RIGHT_EYE) {
+-                    mojoLandmark.type = LandmarkType.EYE;
+-                    rightEyeIndex = j;
+-                } else if (landmarkType == Landmark.BOTTOM_MOUTH) {
+-                    mojoLandmark.type = LandmarkType.MOUTH;
+-                    bottomMouthIndex = j;
+-                } else {
+-                    assert landmarkType == Landmark.NOSE_BASE;
+-                    mojoLandmark.type = LandmarkType.NOSE;
+-                }
+-                mojoLandmarks.add(mojoLandmark);
+-            }
+-            faceArray[i].landmarks = mojoLandmarks.toArray(
+-                    new org.chromium.shape_detection.mojom.Landmark[mojoLandmarks.size()]);
+-
+-            final PointF corner = face.getPosition();
+-            faceArray[i].boundingBox = new RectF();
+-            if (leftEyeIndex != -1 && rightEyeIndex != -1
+-                    && Math.abs(face.getEulerZ()) < MAX_EULER_Z) {
+-                // Tighter calculation of the bounding box because the GMScore
+-                // and Android Face APIs give different results.
+-                final PointF leftEyePoint = landmarks.get(leftEyeIndex).getPosition();
+-                final PointF rightEyePoint = landmarks.get(rightEyeIndex).getPosition();
+-                final float eyesDistance = leftEyePoint.x - rightEyePoint.x;
+-                final float eyeMouthDistance = bottomMouthIndex != -1
+-                        ? landmarks.get(bottomMouthIndex).getPosition().y - leftEyePoint.y
+-                        : -1;
+-                final PointF midEyePoint =
+-                        new PointF(corner.x + face.getWidth() / 2, leftEyePoint.y);
+-                faceArray[i].boundingBox.x = 2 * rightEyePoint.x - midEyePoint.x;
+-                faceArray[i].boundingBox.y = midEyePoint.y - eyesDistance;
+-                faceArray[i].boundingBox.width = 2 * eyesDistance;
+-                faceArray[i].boundingBox.height = eyeMouthDistance > eyesDistance
+-                        ? eyeMouthDistance + eyesDistance
+-                        : 2 * eyesDistance;
+-            } else {
+-                faceArray[i].boundingBox.x = corner.x;
+-                faceArray[i].boundingBox.y = corner.y;
+-                faceArray[i].boundingBox.width = face.getWidth();
+-                faceArray[i].boundingBox.height = face.getHeight();
+-            }
+-        }
+-        callback.call(faceArray);
++        Log.e(TAG, "FaceDetector is not operational");
++        callback.call(new FaceDetectionResult[0]);
+     }
+ 
+     @Override
+     public void close() {
+-        mFaceDetector.release();
+     }
+ 
+     @Override
+diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
+--- a/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
++++ b/services/shape_detection/android/java/src/org/chromium/shape_detection/TextDetectionImpl.java
+@@ -8,12 +8,6 @@ import android.graphics.Point;
+ import android.graphics.Rect;
+ import android.util.SparseArray;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GoogleApiAvailability;
+-import com.google.android.gms.vision.Frame;
+-import com.google.android.gms.vision.text.TextBlock;
+-import com.google.android.gms.vision.text.TextRecognizer;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.gfx.mojom.PointF;
+@@ -29,58 +23,17 @@ import org.chromium.shape_detection.mojom.TextDetectionResult;
+ public class TextDetectionImpl implements TextDetection {
+     private static final String TAG = "TextDetectionImpl";
+ 
+-    private TextRecognizer mTextRecognizer;
+-
+     public TextDetectionImpl() {
+-        mTextRecognizer = new TextRecognizer.Builder(ContextUtils.getApplicationContext()).build();
+     }
+ 
+     @Override
+     public void detect(org.chromium.skia.mojom.Bitmap bitmapData, DetectResponse callback) {
+-        // The vision library will be downloaded the first time the API is used
+-        // on the device; this happens "fast", but it might have not completed,
+-        // bail in this case. Also, the API was disabled between and v.9.0 and
+-        // v.9.2, see https://developers.google.com/android/guides/releases.
+-        if (!mTextRecognizer.isOperational()) {
+-            Log.e(TAG, "TextDetector is not operational");
+-            callback.call(new TextDetectionResult[0]);
+-            return;
+-        }
+-
+-        Frame frame = BitmapUtils.convertToFrame(bitmapData);
+-        if (frame == null) {
+-            Log.e(TAG, "Error converting Mojom Bitmap to Frame");
+-            callback.call(new TextDetectionResult[0]);
+-            return;
+-        }
+-
+-        final SparseArray<TextBlock> textBlocks = mTextRecognizer.detect(frame);
+-
+-        TextDetectionResult[] detectedTextArray = new TextDetectionResult[textBlocks.size()];
+-        for (int i = 0; i < textBlocks.size(); i++) {
+-            detectedTextArray[i] = new TextDetectionResult();
+-            final TextBlock textBlock = textBlocks.valueAt(i);
+-            detectedTextArray[i].rawValue = textBlock.getValue();
+-            final Rect rect = textBlock.getBoundingBox();
+-            detectedTextArray[i].boundingBox = new RectF();
+-            detectedTextArray[i].boundingBox.x = rect.left;
+-            detectedTextArray[i].boundingBox.y = rect.top;
+-            detectedTextArray[i].boundingBox.width = rect.width();
+-            detectedTextArray[i].boundingBox.height = rect.height();
+-            final Point[] corners = textBlock.getCornerPoints();
+-            detectedTextArray[i].cornerPoints = new PointF[corners.length];
+-            for (int j = 0; j < corners.length; j++) {
+-                detectedTextArray[i].cornerPoints[j] = new PointF();
+-                detectedTextArray[i].cornerPoints[j].x = corners[j].x;
+-                detectedTextArray[i].cornerPoints[j].y = corners[j].y;
+-            }
+-        }
+-        callback.call(detectedTextArray);
++        Log.e(TAG, "TextDetector is not operational");
++        callback.call(new TextDetectionResult[0]);
+     }
+ 
+     @Override
+     public void close() {
+-        mTextRecognizer.release();
+     }
+ 
+     @Override
+@@ -89,12 +42,7 @@ public class TextDetectionImpl implements TextDetection {
+     }
+ 
+     public static TextDetection create() {
+-        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                    ContextUtils.getApplicationContext())
+-                != ConnectionResult.SUCCESS) {
+-            Log.e(TAG, "Google Play Services not available");
+-            return null;
+-        }
+-        return new TextDetectionImpl();
++        Log.e(TAG, "Google Play Services not available");
++        return null;
+     }
+ }
+diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
+--- a/third_party/android_deps/BUILD.gn
++++ b/third_party/android_deps/BUILD.gn
+@@ -900,35 +900,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_vision_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_vision/play-services-vision-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_vision_common_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_vision_common_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_vision_common/play-services-vision-common-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_vision_common/com_google_android_gms_play_services_vision_common.info"
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_clearcut_java",
+-    ":google_play_services_flags_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("com_google_android_material_material_java") {
+   aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
+   info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
+@@ -1528,25 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_clearcut_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_clearcut/play-services-clearcut-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //tools/android/roll/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_phenotype_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("google_play_services_flags_java") {
+   aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
+   info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
+@@ -1564,24 +1516,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
+ }
+ 
+ # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+-android_aar_prebuilt("google_play_services_phenotype_java") {
+-  aar_path = "libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-15.0.1.aar"
+-  info_path = "libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
+-
+-  # To remove visibility constraint, add this dependency to
+-  # //tools/android/roll/android_deps/build.gradle.
+-  visibility = [ ":*" ]
+-  deps = [
+-    ":google_play_services_base_java",
+-    ":google_play_services_basement_java",
+-    ":google_play_services_tasks_java",
+-  ]
+-
+-  # Removing drawables from GMS .aars as they are unused bloat.
+-  strip_drawables = true
+-}
+-
+-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
+ android_aar_prebuilt("google_play_services_places_placereport_java") {
+   aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-15.0.1.aar"
+   info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
+-- 
+2.11.0
+

build/patches/Remove-dependency-on-com.google.android.play.patch

@@ -0,0 +1,496 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Fri, 1 Nov 2019 23:01:41 +0100
+Subject: Remove dependency on com.google.android.play
+
+---
+ chrome/android/BUILD.gn                            |   1 -
+ .../omaha/inline/FakeAppUpdateManagerWrapper.java  |  60 +-----
+ .../inline/InlineUpdateControllerFactory.java      |  16 --
+ .../omaha/inline/PlayInlineUpdateController.java   | 226 +--------------------
+ components/module_installer/android/BUILD.gn       |   1 -
+ third_party/google_android_play_core/BUILD.gn      |   5 -
+ 6 files changed, 3 insertions(+), 306 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -387,7 +387,6 @@ android_library("chrome_java") {
+     "//third_party/cct_dynamic_module:cct_dynamic_module_java",
+     "//third_party/feed:feed_lib_proto_java",
+     "//third_party/gif_player:gif_player_java",
+-    "//third_party/google_android_play_core:com_google_android_play_core_java",
+     "//third_party/jsr-305:jsr_305_javalib",
+     "//ui/android:ui_java",
+     "//ui/base/mojom:mojom_java",
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/FakeAppUpdateManagerWrapper.java
+@@ -10,11 +10,6 @@ import android.os.Looper;
+ import android.os.Message;
+ import android.support.annotation.IntDef;
+ 
+-import com.google.android.play.core.appupdate.AppUpdateInfo;
+-import com.google.android.play.core.appupdate.testing.FakeAppUpdateManager;
+-import com.google.android.play.core.install.model.AppUpdateType;
+-import com.google.android.play.core.tasks.Task;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.task.PostTask;
+ import org.chromium.chrome.browser.ChromeActivity;
+@@ -30,7 +25,7 @@ import java.lang.ref.WeakReference;
+  * wrapper isn't meant to be used for a full integration test, but simulating all of the possible
+  * error cases is a bit easier to do here.
+  */
+-public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
++public class FakeAppUpdateManagerWrapper {
+     private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
+     private static final int STEP_DELAY_MS = 5000;
+     private static final int TOAST_DURATION_MS = 2000;
+@@ -107,15 +102,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+             switch (event) {
+                 case Event.UPDATE_AVAILABLE:
+                     w.toast("Making app update available.");
+-                    w.setUpdateAvailable(10000 /* Figure out a better version? */);
+                     return;
+                 case Event.USER_ACCEPTS_UPDATE:
+                     w.toast("User accepts update.");
+-                    w.userAcceptsUpdate();
+                     return;
+                 case Event.USER_REJECTS_UPDATE:
+                     w.toast("User rejects update.");
+-                    w.userRejectsUpdate();
+                     return;
+                 case Event.TRIGGER_DOWNLOAD:
+                     w.toast("Triggering download.");
+@@ -123,27 +115,21 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+                     return;
+                 case Event.DOWNLOAD_STARTS:
+                     w.toast("Download has started.");
+-                    w.downloadStarts();
+                     return;
+                 case Event.DOWNLOAD_FAILS:
+                     w.toast("Triggering download failure.");
+-                    w.downloadFails();
+                     return;
+                 case Event.USER_CANCELS_DOWNLOAD:
+                     w.toast("Triggering cancellation of download.");
+-                    w.userCancelsDownload();
+                     return;
+                 case Event.DOWNLOAD_COMPLETES:
+                     w.toast("Download completes.");
+-                    w.downloadCompletes();
+                     return;
+                 case Event.INSTALL_FAILS:
+                     w.toast("Triggering install failure.");
+-                    w.installFails();
+                     return;
+                 case Event.INSTALL_COMPLETES:
+                     w.toast("Triggering install completion.");
+-                    w.installCompletes();
+                     return;
+                 default:
+                     w.toast("Unknown event.");
+@@ -158,56 +144,12 @@ public class FakeAppUpdateManagerWrapper extends FakeAppUpdateManager {
+      * @param endState at which point should the inline update flow end.
+      */
+     FakeAppUpdateManagerWrapper(@Type int endState) {
+-        super(ContextUtils.getApplicationContext());
+         mType = endState;
+         mEventHandler = new EventHandler(this);
+ 
+         if (mType != Type.NONE) execute(Event.UPDATE_AVAILABLE);
+     }
+ 
+-    // FakeAppUpdateManager implementation.
+-    @Override
+-    public boolean startUpdateFlowForResult(AppUpdateInfo appUpdateInfo,
+-            @AppUpdateType int appUpdateType, Activity activity, int requestCode) {
+-        toast("Starting update flow.");
+-        // TODO(dtrainor): Simulate exceptions being thrown or returning false from the super call.
+-        boolean success =
+-                super.startUpdateFlowForResult(appUpdateInfo, appUpdateType, activity, requestCode);
+-        if (!success) return false;
+-
+-        assert activity instanceof ChromeActivity : "Unexpected triggering activity.";
+-
+-        final int resultCode;
+-        if (mType == Type.FAIL_DIALOG_CANCEL) {
+-            resultCode = Activity.RESULT_CANCELED;
+-        } else if (mType == Type.FAIL_DIALOG_UPDATE_FAILED) {
+-            resultCode = RESULT_IN_APP_UPDATE_FAILED;
+-        } else {
+-            resultCode = Activity.RESULT_OK;
+-        }
+-
+-        PostTask.postDelayedTask(UiThreadTaskTraits.DEFAULT, () -> {
+-            triggerDialogResponse((ChromeActivity) activity, requestCode, resultCode);
+-        }, STEP_DELAY_MS);
+-
+-        return true;
+-    }
+-
+-    @Override
+-    public Task<Void> completeUpdate() {
+-        toast("Completing update.");
+-        Task<Void> result = super.completeUpdate();
+-
+-        if (mType == Type.FAIL_INSTALL) {
+-            postDelayedEvent(Event.INSTALL_FAILS);
+-        } else {
+-            postDelayedEvent(Event.INSTALL_COMPLETES);
+-            // This doesn't actually restart Chrome in this case.
+-        }
+-
+-        return result;
+-    }
+-
+     private void triggerDialogResponse(ChromeActivity activity, int requestCode, int resultCode) {
+         if (resultCode == Activity.RESULT_OK) {
+             execute(Event.USER_ACCEPTS_UPDATE);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+@@ -4,8 +4,6 @@
+ 
+ package org.chromium.chrome.browser.omaha.inline;
+ 
+-import com.google.android.play.core.appupdate.AppUpdateManagerFactory;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.omaha.UpdateConfigs;
+@@ -20,20 +18,6 @@ public class InlineUpdateControllerFactory {
+     public static InlineUpdateController create(Runnable callback) {
+         @FakeAppUpdateManagerWrapper.Type
+         int mockInlineEndState = UpdateConfigs.getMockInlineScenarioEndState();
+-        if (mockInlineEndState != FakeAppUpdateManagerWrapper.Type.NO_SIMULATION) {
+-            // The config requires to run through a test controller, using the
+-            // PlayInlineUpdateController, but with a fake Google Play backend that automatically
+-            // goes through a scenario flow.
+-            return new PlayInlineUpdateController(
+-                    callback, new FakeAppUpdateManagerWrapper(mockInlineEndState));
+-        }
+-
+-        if (ChromeFeatureList.isEnabled(ChromeFeatureList.INLINE_UPDATE_FLOW)) {
+-            // The application configuration requires to use the real Google Play backend for inline
+-            // updates.
+-            return new PlayInlineUpdateController(
+-                    callback, AppUpdateManagerFactory.create(ContextUtils.getApplicationContext()));
+-        }
+ 
+         // No test scenario was in place, and the inline flow has not been enabled, so use a
+         // controller with no functionality.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java
+@@ -9,15 +9,6 @@ import android.content.IntentSender.SendIntentException;
+ import android.support.annotation.IntDef;
+ import android.support.annotation.Nullable;
+ 
+-import com.google.android.play.core.appupdate.AppUpdateInfo;
+-import com.google.android.play.core.appupdate.AppUpdateManager;
+-import com.google.android.play.core.install.InstallState;
+-import com.google.android.play.core.install.InstallStateUpdatedListener;
+-import com.google.android.play.core.install.model.AppUpdateType;
+-import com.google.android.play.core.install.model.InstallErrorCode;
+-import com.google.android.play.core.install.model.InstallStatus;
+-import com.google.android.play.core.install.model.UpdateAvailability;
+-
+ import org.chromium.base.Log;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
+@@ -31,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
+  * in the foreground.
+  */
+ public class PlayInlineUpdateController
+-        implements InlineUpdateController, InstallStateUpdatedListener {
++        implements InlineUpdateController {
+     /**
+      * Converts Play's InstallErrorCode enum to a stable monotomically incrementing Chrome enum.
+      * This is used for metric stability.
+@@ -126,26 +117,9 @@ public class PlayInlineUpdateController
+     private static final int RESULT_IN_APP_UPDATE_FAILED = 1;
+     private static final int REQUEST_CODE = 8123;
+ 
+-    private final Runnable mCallback;
+-    private final AppUpdateManager mAppUpdateManager;
+-
+     private boolean mEnabled;
+     private @Nullable @UpdateState Integer mUpdateState;
+ 
+-    private AppUpdateInfo mAppUpdateInfo;
+-    private @Nullable @UpdateAvailability Integer mUpdateAvailability;
+-    private @Nullable @InstallStatus Integer mInstallStatus;
+-
+-    /**
+-     * Builds an instance of {@link PlayInlineUpdateController}.
+-     * @param callback The {@link Runnable} to notify when an inline update state change occurs.
+-     */
+-    PlayInlineUpdateController(Runnable callback, AppUpdateManager appUpdateManager) {
+-        mCallback = callback;
+-        mAppUpdateManager = appUpdateManager;
+-        setEnabled(true);
+-    }
+-
+     // InlineUpdateController implementation.
+     @Override
+     public void setEnabled(boolean enabled) {
+@@ -154,10 +128,8 @@ public class PlayInlineUpdateController
+ 
+         if (mEnabled) {
+             mUpdateState = UpdateState.NONE;
+-            mAppUpdateManager.registerListener(this);
+             pullCurrentState();
+         } else {
+-            mAppUpdateManager.unregisterListener(this);
+         }
+     }
+ 
+@@ -168,220 +140,26 @@ public class PlayInlineUpdateController
+ 
+     @Override
+     public void startUpdate(Activity activity) {
+-        try {
+-            boolean success = mAppUpdateManager.startUpdateFlowForResult(
+-                    mAppUpdateInfo, AppUpdateType.FLEXIBLE, activity, REQUEST_CODE);
+-            Log.i(TAG, "startUpdateFlowForResult() returned " + success);
+-
+-            if (!success) recordCallFailure(CallFailure.START_FAILED);
+-        } catch (SendIntentException exception) {
+-            mInstallStatus = InstallStatus.FAILED;
+-            Log.i(TAG, "startUpdateFlowForResult() threw an exception.");
+-            recordCallFailure(CallFailure.START_EXCEPTION);
+-        }
+-        // TODO(dtrainor): Use success.
+     }
+ 
+     @Override
+     public void completeUpdate() {
+-        mAppUpdateManager.completeUpdate()
+-                .addOnSuccessListener(unused -> {
+-                    Log.i(TAG, "completeUpdate() success.");
+-                    pushStatus();
+-                })
+-                .addOnFailureListener(exception -> {
+-                    Log.i(TAG, "completeUpdate() failed.");
+-                    recordCallFailure(CallFailure.COMPLETE_FAILED);
+-                    mInstallStatus = InstallStatus.FAILED;
+-                    pushStatus();
+-                });
+-    }
+-
+-    // InstallStateUpdatedListener implementation.
+-    @Override
+-    public void onStateUpdate(InstallState state) {
+-        Log.i(TAG,
+-                "onStateUpdate(" + state.installStatus() + ", " + state.installErrorCode() + ")");
+-
+-        if (state.installStatus() != mInstallStatus) {
+-            RecordHistogram.recordEnumeratedHistogram("GoogleUpdate.Inline.StateChange.Error."
+-                            + installStatusToEnumSuffix(state.installStatus()),
+-                    installErrorCodeToMetrics(state.installErrorCode()),
+-                    InstallErrorCodeMetrics.NUM_ENTRIES);
+-        }
+-
+-        mInstallStatus = state.installStatus();
+-        pushStatus();
+     }
+ 
+     private void pullCurrentState() {
+-        mAppUpdateManager.getAppUpdateInfo()
+-                .addOnSuccessListener(info -> {
+-                    mAppUpdateInfo = info;
+-                    mUpdateAvailability = info.updateAvailability();
+-                    mInstallStatus = info.installStatus();
+-                    Log.i(TAG,
+-                            "pullCurrentState(" + mUpdateAvailability + ", " + mInstallStatus
+-                                    + ") success.");
+-                    recordOnAppUpdateInfo(info);
+-                    pushStatus();
+-                })
+-                .addOnFailureListener(exception -> {
+-                    mAppUpdateInfo = null;
+-                    mUpdateAvailability = UpdateAvailability.UNKNOWN;
+-                    mInstallStatus = InstallStatus.UNKNOWN;
+-                    Log.i(TAG, "pullCurrentState() failed.");
+-                    recordCallFailure(CallFailure.QUERY_FAILED);
+-                    pushStatus();
+-                });
+     }
+ 
+     private void pushStatus() {
+-        if (!mEnabled || mUpdateAvailability == null || mInstallStatus == null) return;
+-
+-        @UpdateState
+-        int newState = toUpdateState(mUpdateAvailability, mInstallStatus);
+-        if (mUpdateState != null && mUpdateState == newState) return;
+-
+-        Log.i(TAG, "Pushing inline update state to " + newState);
+-        mUpdateState = newState;
+-        mCallback.run();
+     }
+ 
+     private static @UpdateState int toUpdateState(
+-            @UpdateAvailability int updateAvailability, @InstallStatus int installStatus) {
++            int updateAvailability, int installStatus) {
+         @UpdateState
+         int newStatus = UpdateState.NONE;
+ 
+-        // Note, use InstallStatus first then UpdateAvailability if InstallStatus doesn't indicate
+-        // a currently active install.
+-        switch (installStatus) {
+-            case InstallStatus.PENDING:
+-                // Intentional fall through.
+-            case InstallStatus.DOWNLOADING:
+-                newStatus = UpdateState.INLINE_UPDATE_DOWNLOADING;
+-                break;
+-            case InstallStatus.DOWNLOADED:
+-                newStatus = UpdateState.INLINE_UPDATE_READY;
+-                break;
+-            case InstallStatus.FAILED:
+-                newStatus = UpdateState.INLINE_UPDATE_FAILED;
+-                break;
+-        }
+-
+-        if (newStatus == UpdateState.NONE) {
+-            switch (updateAvailability) {
+-                case UpdateAvailability.UPDATE_AVAILABLE:
+-                    newStatus = UpdateState.INLINE_UPDATE_AVAILABLE;
+-                    break;
+-            }
+-        }
+-
+         return newStatus;
+     }
+ 
+-    private static String installStatusToEnumSuffix(@InstallStatus int status) {
+-        switch (status) {
+-            case InstallStatus.UNKNOWN:
+-                return "Unknown";
+-            case InstallStatus.REQUIRES_UI_INTENT:
+-                return "RequiresUiIntent";
+-            case InstallStatus.PENDING:
+-                return "Pending";
+-            case InstallStatus.DOWNLOADING:
+-                return "Downloading";
+-            case InstallStatus.DOWNLOADED:
+-                return "Downloaded";
+-            case InstallStatus.INSTALLING:
+-                return "Installing";
+-            case InstallStatus.INSTALLED:
+-                return "Installed";
+-            case InstallStatus.FAILED:
+-                return "Failed";
+-            case InstallStatus.CANCELED:
+-                return "Canceled";
+-            default:
+-                return "Untracked";
+-        }
+-    }
+-
+-    private static @InstallErrorCodeMetrics int installErrorCodeToMetrics(
+-            @InstallErrorCode int error) {
+-        switch (error) {
+-            case InstallErrorCode.NO_ERROR:
+-                return InstallErrorCodeMetrics.NO_ERROR;
+-            case InstallErrorCode.NO_ERROR_PARTIALLY_ALLOWED:
+-                return InstallErrorCodeMetrics.NO_ERROR_PARTIALLY_ALLOWED;
+-            case InstallErrorCode.ERROR_UNKNOWN:
+-                return InstallErrorCodeMetrics.ERROR_UNKNOWN;
+-            case InstallErrorCode.ERROR_API_NOT_AVAILABLE:
+-                return InstallErrorCodeMetrics.ERROR_API_NOT_AVAILABLE;
+-            case InstallErrorCode.ERROR_INVALID_REQUEST:
+-                return InstallErrorCodeMetrics.ERROR_INVALID_REQUEST;
+-            case InstallErrorCode.ERROR_INSTALL_UNAVAILABLE:
+-                return InstallErrorCodeMetrics.ERROR_INSTALL_UNAVAILABLE;
+-            case InstallErrorCode.ERROR_INSTALL_NOT_ALLOWED:
+-                return InstallErrorCodeMetrics.ERROR_INSTALL_NOT_ALLOWED;
+-            case InstallErrorCode.ERROR_DOWNLOAD_NOT_PRESENT:
+-                return InstallErrorCodeMetrics.ERROR_DOWNLOAD_NOT_PRESENT;
+-            case InstallErrorCode.ERROR_INTERNAL_ERROR:
+-                return InstallErrorCodeMetrics.ERROR_INTERNAL_ERROR;
+-            default:
+-                return InstallErrorCodeMetrics.ERROR_UNTRACKED;
+-        }
+-    }
+-
+-    private static @UpdateAvailabilityMetric int updateAvailabilityToMetrics(
+-            @UpdateAvailability int updateAvailability) {
+-        switch (updateAvailability) {
+-            case UpdateAvailability.UNKNOWN:
+-                return UpdateAvailabilityMetric.UNKNOWN;
+-            case UpdateAvailability.UPDATE_NOT_AVAILABLE:
+-                return UpdateAvailabilityMetric.UPDATE_NOT_AVAILABLE;
+-            case UpdateAvailability.UPDATE_AVAILABLE:
+-                return UpdateAvailabilityMetric.UPDATE_AVAILABLE;
+-            case UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS:
+-                return UpdateAvailabilityMetric.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS;
+-            default:
+-                return UpdateAvailabilityMetric.UNTRACKED;
+-        }
+-    }
+-
+-    private static @InstallStatusMetric int installStatusToMetrics(
+-            @InstallStatus int installStatus) {
+-        switch (installStatus) {
+-            case InstallStatus.UNKNOWN:
+-                return InstallStatusMetric.UNKNOWN;
+-            case InstallStatus.REQUIRES_UI_INTENT:
+-                return InstallStatusMetric.REQUIRES_UI_INTENT;
+-            case InstallStatus.PENDING:
+-                return InstallStatusMetric.PENDING;
+-            case InstallStatus.DOWNLOADING:
+-                return InstallStatusMetric.DOWNLOADING;
+-            case InstallStatus.DOWNLOADED:
+-                return InstallStatusMetric.DOWNLOADED;
+-            case InstallStatus.INSTALLING:
+-                return InstallStatusMetric.INSTALLING;
+-            case InstallStatus.INSTALLED:
+-                return InstallStatusMetric.INSTALLED;
+-            case InstallStatus.FAILED:
+-                return InstallStatusMetric.FAILED;
+-            case InstallStatus.CANCELED:
+-                return InstallStatusMetric.CANCELED;
+-            default:
+-                return InstallStatusMetric.UNTRACKED;
+-        }
+-    }
+-
+-    private static void recordOnAppUpdateInfo(AppUpdateInfo info) {
+-        RecordHistogram.recordEnumeratedHistogram(
+-                "GoogleUpdate.Inline.AppUpdateInfo.UpdateAvailability",
+-                updateAvailabilityToMetrics(info.updateAvailability()),
+-                UpdateAvailabilityMetric.NUM_ENTRIES);
+-        RecordHistogram.recordEnumeratedHistogram("GoogleUpdate.Inline.AppUpdateInfo.InstallStatus",
+-                installStatusToMetrics(info.installStatus()), InstallStatusMetric.NUM_ENTRIES);
+-    }
+-
+     private static void recordCallFailure(@CallFailure int failure) {
+         RecordHistogram.recordEnumeratedHistogram(
+                 "GoogleUpdate.Inline.CallFailure", failure, CallFailure.NUM_ENTRIES);
+diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
+--- a/components/module_installer/android/BUILD.gn
++++ b/components/module_installer/android/BUILD.gn
+@@ -23,7 +23,6 @@ android_library("module_installer_java") {
+   deps = [
+     "//base:base_java",
+     "//components/crash/android:java",
+-    "//third_party/google_android_play_core:com_google_android_play_core_java",
+   ]
+ 
+   srcjar_deps = [ ":module_installer_build_config" ]
+diff --git a/third_party/google_android_play_core/BUILD.gn b/third_party/google_android_play_core/BUILD.gn
+--- a/third_party/google_android_play_core/BUILD.gn
++++ b/third_party/google_android_play_core/BUILD.gn
+@@ -3,8 +3,3 @@
+ # found in the LICENSE file.
+ 
+ import("//build/config/android/rules.gni")
+-
+-android_aar_prebuilt("com_google_android_play_core_java") {
+-  aar_path = "core-1.6.4.aar"
+-  info_path = "com_google_android_play_core.info"
+-}
+-- 
+2.11.0
+

build/patches/Remove-help-menu-item.patch

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 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
-@@ -2087,15 +2087,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2076,15 +2076,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 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
-@@ -626,7 +626,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -624,7 +624,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
      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

build/patches/Remove-play-dependency-for-module-installer.patch

@@ -0,0 +1,481 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 2 Nov 2019 16:27:51 +0100
+Subject: Remove play dependency for module installer
+
+---
+ .../FakeModuleInstallerBackend.java                |  16 +-
+ .../module_installer/ModuleInstallerImpl.java      | 150 ---------------
+ .../PlayCoreModuleInstallerBackend.java            | 210 +--------------------
+ 3 files changed, 10 insertions(+), 366 deletions(-)
+
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/FakeModuleInstallerBackend.java
+@@ -7,9 +7,6 @@ package org.chromium.components.module_installer;
+ import android.content.Context;
+ import android.content.pm.PackageManager;
+ 
+-import com.google.android.play.core.splitcompat.SplitCompat;
+-import com.google.android.play.core.splitcompat.ingestion.Verifier;
+-
+ import org.chromium.base.BuildInfo;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+@@ -132,18 +129,7 @@ class FakeModuleInstallerBackend extends ModuleInstallerBackend {
+             return false;
+         }
+ 
+-        // Check that the module's signature matches Chrome's.
+-        try {
+-            Verifier verifier = new Verifier(context);
+-            if (!verifier.verifySplits()) {
+-                return false;
+-            }
+-        } catch (IOException | PackageManager.NameNotFoundException e) {
+-            return false;
+-        }
+-
+-        // Tell SplitCompat to do a full emulation of the module.
+-        return SplitCompat.fullInstall(context);
++        return false;
+     }
+ 
+     private File joinPaths(String... paths) {
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/ModuleInstallerImpl.java
+@@ -11,9 +11,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
+ import android.os.Build;
+ import android.text.TextUtils;
+ 
+-import com.google.android.play.core.splitcompat.SplitCompat;
+-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
+-
+ import org.chromium.base.BuildInfo;
+ import org.chromium.base.CommandLine;
+ import org.chromium.base.ContextUtils;
+@@ -57,152 +54,5 @@ import java.util.TreeSet;
+         sInstance = moduleInstaller;
+     }
+ 
+-    @Override
+-    public void init() {
+-        try (Timer ignored1 = new Timer()) {
+-            if (sAppContextSplitCompatted) return;
+-            // SplitCompat.install may copy modules into Chrome's internal folder or clean them up.
+-            try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) {
+-                SplitCompat.install(ContextUtils.getApplicationContext());
+-                sAppContextSplitCompatted = true;
+-            }
+-            // SplitCompat.install may add emulated modules. Thus, update crash keys.
+-            updateCrashKeys();
+-        }
+-    }
+-
+-    @Override
+-    public void initActivity(Activity activity) {
+-        try (Timer ignored = new Timer()) {
+-            // SplitCompat#install should always be run for the application first before it is run
+-            // for any activities.
+-            init();
+-            SplitCompat.installActivity(activity);
+-        }
+-    }
+-
+-    @Override
+-    public void recordModuleAvailability() {
+-        try (Timer ignored = new Timer()) {
+-            getBackend().recordModuleAvailability();
+-        }
+-    }
+-
+-    @Override
+-    public void recordStartupTime() {
+-        getBackend().recordStartupTime(Timer.getTotalTime());
+-    }
+-
+-    @Override
+-    public void updateCrashKeys() {
+-        try (Timer ignored = new Timer()) {
+-            Context context = ContextUtils.getApplicationContext();
+-
+-            // Get modules that are fully installed as split APKs (excluding base which is always
+-            // installed). Tree set to have ordered and, thus, deterministic results.
+-            Set<String> fullyInstalledModules = new TreeSet<>();
+-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+-                // Split APKs are only supported on Android L+.
+-                try {
+-                    PackageInfo packageInfo = context.getPackageManager().getPackageInfo(
+-                            BuildInfo.getInstance().packageName, 0);
+-                    if (packageInfo.splitNames != null) {
+-                        fullyInstalledModules.addAll(Arrays.asList(packageInfo.splitNames));
+-                    }
+-                } catch (NameNotFoundException e) {
+-                    throw new RuntimeException(e);
+-                }
+-            }
+-
+-            // Create temporary split install manager to retrieve both fully installed and emulated
+-            // modules. Then remove fully installed ones to get emulated ones only. Querying the
+-            // installed modules can only be done if splitcompat has already been called. Otherwise,
+-            // emulation of later modules won't work. If splitcompat has not been called no modules
+-            // are emulated. Therefore, use an empty set in that case.
+-            Set<String> emulatedModules = new TreeSet<>();
+-            if (sAppContextSplitCompatted) {
+-                emulatedModules.addAll(
+-                        SplitInstallManagerFactory.create(context).getInstalledModules());
+-                emulatedModules.removeAll(fullyInstalledModules);
+-            }
+-
+-            CrashKeys.getInstance().set(
+-                    CrashKeyIndex.INSTALLED_MODULES, encodeCrashKeyValue(fullyInstalledModules));
+-            CrashKeys.getInstance().set(
+-                    CrashKeyIndex.EMULATED_MODULES, encodeCrashKeyValue(emulatedModules));
+-        }
+-    }
+-
+-    @Override
+-    public void install(String moduleName, OnModuleInstallFinishedListener onFinishedListener) {
+-        try (Timer ignored = new Timer()) {
+-            ThreadUtils.assertOnUiThread();
+-
+-            if (!mModuleNameListenerMap.containsKey(moduleName)) {
+-                mModuleNameListenerMap.put(moduleName, new LinkedList<>());
+-            }
+-            List<OnModuleInstallFinishedListener> onFinishedListeners =
+-                    mModuleNameListenerMap.get(moduleName);
+-            onFinishedListeners.add(onFinishedListener);
+-            if (onFinishedListeners.size() > 1) {
+-                // Request is already running.
+-                return;
+-            }
+-            getBackend().install(moduleName);
+-        }
+-    }
+-
+-    @Override
+-    public void installDeferred(String moduleName) {
+-        try (Timer ignored = new Timer()) {
+-            ThreadUtils.assertOnUiThread();
+-            getBackend().installDeferred(moduleName);
+-        }
+-    }
+-
+-    private void onFinished(boolean success, List<String> moduleNames) {
+-        // Add timer to this private method since it is passed as a callback.
+-        try (Timer ignored = new Timer()) {
+-            ThreadUtils.assertOnUiThread();
+-
+-            mActivityObserver.onModuleInstalled();
+-
+-            for (String moduleName : moduleNames) {
+-                List<OnModuleInstallFinishedListener> onFinishedListeners =
+-                        mModuleNameListenerMap.get(moduleName);
+-                if (onFinishedListeners == null) continue;
+-
+-                for (OnModuleInstallFinishedListener listener : onFinishedListeners) {
+-                    listener.onFinished(success);
+-                }
+-                mModuleNameListenerMap.remove(moduleName);
+-            }
+-
+-            if (mModuleNameListenerMap.isEmpty()) {
+-                mBackend.close();
+-                mBackend = null;
+-            }
+-
+-            updateCrashKeys();
+-        }
+-    }
+-
+-    private ModuleInstallerBackend getBackend() {
+-        if (mBackend == null) {
+-            ModuleInstallerBackend.OnFinishedListener listener = this::onFinished;
+-            mBackend = CommandLine.getInstance().hasSwitch(FAKE_FEATURE_MODULE_INSTALL)
+-                    ? new FakeModuleInstallerBackend(listener)
+-                    : new PlayCoreModuleInstallerBackend(listener);
+-        }
+-        return mBackend;
+-    }
+-
+-    private String encodeCrashKeyValue(Set<String> moduleNames) {
+-        if (moduleNames.isEmpty()) return "<none>";
+-        // Values with dots are interpreted as URLs. Some module names have dots in them. Make sure
+-        // they don't get sanitized.
+-        return TextUtils.join(",", moduleNames).replace('.', '$');
+-    }
+-
+     private ModuleInstallerImpl() {}
+ }
+diff --git a/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java b/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
+--- a/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
++++ b/components/module_installer/android/java/src/org/chromium/components/module_installer/PlayCoreModuleInstallerBackend.java
+@@ -7,15 +7,6 @@ package org.chromium.components.module_installer;
+ import android.content.SharedPreferences;
+ import android.util.SparseLongArray;
+ 
+-import com.google.android.play.core.splitinstall.SplitInstallException;
+-import com.google.android.play.core.splitinstall.SplitInstallManager;
+-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
+-import com.google.android.play.core.splitinstall.SplitInstallRequest;
+-import com.google.android.play.core.splitinstall.SplitInstallSessionState;
+-import com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener;
+-import com.google.android.play.core.splitinstall.model.SplitInstallErrorCode;
+-import com.google.android.play.core.splitinstall.model.SplitInstallSessionStatus;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.metrics.CachedMetrics.EnumeratedHistogramSample;
+@@ -33,14 +24,13 @@ import java.util.Set;
+  * Backend that uses the Play Core SDK to download a module from Play and install it subsequently.
+  */
+ /* package */ class PlayCoreModuleInstallerBackend
+-        extends ModuleInstallerBackend implements SplitInstallStateUpdatedListener {
++        extends ModuleInstallerBackend {
+     private static class InstallTimes {
+         public final boolean mIsCached;
+         public final SparseLongArray mInstallTimes = new SparseLongArray();
+ 
+         public InstallTimes(boolean isCached) {
+             mIsCached = isCached;
+-            mInstallTimes.put(SplitInstallSessionStatus.UNKNOWN, System.currentTimeMillis());
+         }
+     }
+ 
+@@ -50,7 +40,6 @@ import java.util.Set;
+     private static final String KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY =
+             "key_modules_deferred_requested_previously";
+     private final Map<String, InstallTimes> mInstallTimesMap = new HashMap<>();
+-    private final SplitInstallManager mManager;
+     private boolean mIsClosed;
+ 
+     // FeatureModuleInstallStatus defined in //tools/metrics/histograms/enums.xml.
+@@ -90,183 +79,31 @@ import java.util.Set;
+     // Keep this one at the end and increment appropriately when adding new status.
+     private static final int AVAILABILITY_STATUS_COUNT = 3;
+ 
+-    /** Records via UMA all modules that have been requested and are currently installed. */
+-    @Override
+-    /* package */ void recordModuleAvailability() {
+-        SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
+-        Set<String> requestedModules = new HashSet<>();
+-        requestedModules.addAll(
+-                prefs.getStringSet(KEY_MODULES_ONDEMAND_REQUESTED_PREVIOUSLY, new HashSet<>()));
+-        requestedModules.addAll(
+-                prefs.getStringSet(KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY, new HashSet<>()));
+-        Set<String> installedModules = mManager.getInstalledModules();
+-
+-        for (String name : requestedModules) {
+-            EnumeratedHistogramSample sample = new EnumeratedHistogramSample(
+-                    "Android.FeatureModules.AvailabilityStatus." + name, AVAILABILITY_STATUS_COUNT);
+-            if (installedModules.contains(name)) {
+-                sample.record(AVAILABILITY_STATUS_INSTALLED_REQUESTED);
+-            } else {
+-                sample.record(AVAILABILITY_STATUS_REQUESTED);
+-            }
+-        }
+-
+-        for (String name : installedModules) {
+-            if (!requestedModules.contains(name)) {
+-                // Module appeared without being requested. Weird.
+-                EnumeratedHistogramSample sample = new EnumeratedHistogramSample(
+-                        "Android.FeatureModules.AvailabilityStatus." + name,
+-                        AVAILABILITY_STATUS_COUNT);
+-                sample.record(AVAILABILITY_STATUS_INSTALLED_UNREQUESTED);
+-            }
+-        }
+-    }
+-
+-    @Override
+-    /* package */ void recordStartupTime(long durationMs) {
+-        TimesHistogramSample sample =
+-                new TimesHistogramSample("Android.FeatureModules.StartupTime");
+-        sample.record(durationMs);
+-    }
+-
+     /* package */ PlayCoreModuleInstallerBackend(OnFinishedListener listener) {
+         super(listener);
+-        // MUST call init before creating a SplitInstallManager.
+-        ModuleInstaller.getInstance().init();
+-        mManager = SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
+-        mManager.registerListener(this);
+     }
+ 
+     @Override
+-    public void install(String moduleName) {
++    public void close() {
+         assert !mIsClosed;
+-
+-        // Record start time in order to later report the install duration via UMA. We want to make
+-        // a difference between modules that have been requested first before and after the last
+-        // Chrome start. Modules that have been requested before may install quicker as they may be
+-        // installed form cache. To do this, we use shared prefs to track modules previously
+-        // requested. Additionally, storing requested modules helps us to record module install
+-        // status at next Chrome start.
+-        assert !mInstallTimesMap.containsKey(moduleName);
+-        mInstallTimesMap.put(moduleName,
+-                new InstallTimes(storeModuleRequested(
+-                        moduleName, KEY_MODULES_ONDEMAND_REQUESTED_PREVIOUSLY)));
+-
+-        SplitInstallRequest request =
+-                SplitInstallRequest.newBuilder().addModule(moduleName).build();
+-
+-        mManager.startInstall(request).addOnFailureListener(exception -> {
+-            int status = exception instanceof SplitInstallException
+-                    ? getHistogramCode(((SplitInstallException) exception).getErrorCode())
+-                    : INSTALL_STATUS_UNKNOWN_REQUEST_ERROR;
+-            Log.e(TAG, "Failed to request module '%s': error code %s", moduleName, status);
+-            // If we reach this error condition |onStateUpdate| won't be called. Thus, call
+-            // |onFinished| here.
+-            finish(false, Collections.singletonList(moduleName), status);
+-        });
++        mIsClosed = true;
+     }
+ 
+     @Override
+-    public void installDeferred(String moduleName) {
+-        assert !mIsClosed;
+-        mManager.deferredInstall(Collections.singletonList(moduleName));
+-        storeModuleRequested(moduleName, KEY_MODULES_DEFERRED_REQUESTED_PREVIOUSLY);
++    /* package */ void recordModuleAvailability() {
++        SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
+     }
+ 
+     @Override
+-    public void close() {
+-        assert !mIsClosed;
+-        mManager.unregisterListener(this);
+-        mIsClosed = true;
++    /* package */ void recordStartupTime(long durationMs) {
+     }
+ 
+     @Override
+-    public void onStateUpdate(SplitInstallSessionState state) {
+-        assert !mIsClosed;
+-        Log.i(TAG, "Status for modules '%s' updated to %d", state.moduleNames(), state.status());
+-        switch (state.status()) {
+-            case SplitInstallSessionStatus.DOWNLOADING:
+-            case SplitInstallSessionStatus.INSTALLING:
+-            case SplitInstallSessionStatus.INSTALLED:
+-                for (String name : state.moduleNames()) {
+-                    mInstallTimesMap.get(name).mInstallTimes.put(
+-                            state.status(), System.currentTimeMillis());
+-                }
+-                if (state.status() == SplitInstallSessionStatus.INSTALLED) {
+-                    finish(true, state.moduleNames(), INSTALL_STATUS_SUCCESS);
+-                }
+-                break;
+-            // DOWNLOADED only gets sent if SplitCompat is not enabled. That's an error.
+-            // SplitCompat should always be enabled.
+-            case SplitInstallSessionStatus.DOWNLOADED:
+-            case SplitInstallSessionStatus.CANCELED:
+-            case SplitInstallSessionStatus.FAILED:
+-                int status;
+-                if (state.status() == SplitInstallSessionStatus.DOWNLOADED) {
+-                    status = INSTALL_STATUS_NO_SPLITCOMPAT;
+-                } else if (state.status() == SplitInstallSessionStatus.CANCELED) {
+-                    status = INSTALL_STATUS_CANCELLATION;
+-                } else {
+-                    status = getHistogramCode(state.errorCode());
+-                }
+-                Log.e(TAG, "Failed to install modules '%s': error code %s", state.moduleNames(),
+-                        status);
+-                finish(false, state.moduleNames(), status);
+-                break;
+-        }
+-    }
+-
+-    private void finish(boolean success, List<String> moduleNames, int eventId) {
+-        for (String name : moduleNames) {
+-            RecordHistogram.recordEnumeratedHistogram(
+-                    "Android.FeatureModules.InstallStatus." + name, eventId, INSTALL_STATUS_COUNT);
+-            if (success) {
+-                recordInstallTimes(name);
+-            }
+-        }
+-        onFinished(success, moduleNames);
++    public void install(String moduleName) {
+     }
+ 
+-    /**
+-     * Gets the UMA code based on a SplitInstall error code
+-     * @param errorCode The error code
+-     * @return int The User Metric Analysis code
+-     */
+-    private int getHistogramCode(@SplitInstallErrorCode int errorCode) {
+-        switch (errorCode) {
+-            case SplitInstallErrorCode.ACCESS_DENIED:
+-                return INSTALL_STATUS_ACCESS_DENIED;
+-            case SplitInstallErrorCode.ACTIVE_SESSIONS_LIMIT_EXCEEDED:
+-                return INSTALL_STATUS_ACTIVE_SESSIONS_LIMIT_EXCEEDED;
+-            case SplitInstallErrorCode.API_NOT_AVAILABLE:
+-                return INSTALL_STATUS_API_NOT_AVAILABLE;
+-            case SplitInstallErrorCode.INCOMPATIBLE_WITH_EXISTING_SESSION:
+-                return INSTALL_STATUS_INCOMPATIBLE_WITH_EXISTING_SESSION;
+-            case SplitInstallErrorCode.INSUFFICIENT_STORAGE:
+-                return INSTALL_STATUS_INSUFFICIENT_STORAGE;
+-            case SplitInstallErrorCode.INVALID_REQUEST:
+-                return INSTALL_STATUS_INVALID_REQUEST;
+-            case SplitInstallErrorCode.MODULE_UNAVAILABLE:
+-                return INSTALL_STATUS_MODULE_UNAVAILABLE;
+-            case SplitInstallErrorCode.NETWORK_ERROR:
+-                return INSTALL_STATUS_NETWORK_ERROR;
+-            case SplitInstallErrorCode.NO_ERROR:
+-                return INSTALL_STATUS_NO_ERROR;
+-            case SplitInstallErrorCode.SERVICE_DIED:
+-                return INSTALL_STATUS_SERVICE_DIED;
+-            case SplitInstallErrorCode.SESSION_NOT_FOUND:
+-                return INSTALL_STATUS_SESSION_NOT_FOUND;
+-            case SplitInstallErrorCode.SPLITCOMPAT_COPY_ERROR:
+-                return INSTALL_STATUS_SPLITCOMPAT_COPY_ERROR;
+-            case SplitInstallErrorCode.SPLITCOMPAT_EMULATION_ERROR:
+-                return INSTALL_STATUS_SPLITCOMPAT_EMULATION_ERROR;
+-            case SplitInstallErrorCode.SPLITCOMPAT_VERIFICATION_ERROR:
+-                return INSTALL_STATUS_SPLITCOMPAT_VERIFICATION_ERROR;
+-            case SplitInstallErrorCode.INTERNAL_ERROR:
+-                return INSTALL_STATUS_INTERNAL_ERROR;
+-            default:
+-                return INSTALL_STATUS_UNKNOWN_SPLITINSTALL_ERROR;
+-        }
++    @Override
++    public void installDeferred(String moduleName) {
+     }
+ 
+     /**
+@@ -286,33 +123,4 @@ import java.util.Set;
+         editor.apply();
+         return modulesRequestedPreviously.contains(moduleName);
+     }
+-
+-    /** Records via UMA module install times divided into install steps. */
+-    private void recordInstallTimes(String moduleName) {
+-        recordInstallTime(moduleName, "", SplitInstallSessionStatus.UNKNOWN,
+-                SplitInstallSessionStatus.INSTALLED);
+-        recordInstallTime(moduleName, ".PendingDownload", SplitInstallSessionStatus.UNKNOWN,
+-                SplitInstallSessionStatus.DOWNLOADING);
+-        recordInstallTime(moduleName, ".Download", SplitInstallSessionStatus.DOWNLOADING,
+-                SplitInstallSessionStatus.INSTALLING);
+-        recordInstallTime(moduleName, ".Installing", SplitInstallSessionStatus.INSTALLING,
+-                SplitInstallSessionStatus.INSTALLED);
+-    }
+-
+-    private void recordInstallTime(
+-            String moduleName, String histogramSubname, int startKey, int endKey) {
+-        assert mInstallTimesMap.containsKey(moduleName);
+-        InstallTimes installTimes = mInstallTimesMap.get(moduleName);
+-        if (installTimes.mInstallTimes.get(startKey) == 0
+-                || installTimes.mInstallTimes.get(endKey) == 0) {
+-            // Time stamps for install times have not been stored. Don't record anything to not skew
+-            // data.
+-            return;
+-        }
+-        RecordHistogram.recordLongTimesHistogram(
+-                String.format("Android.FeatureModules.%sInstallDuration%s.%s",
+-                        installTimes.mIsCached ? "Cached" : "Uncached", histogramSubname,
+-                        moduleName),
+-                installTimes.mInstallTimes.get(endKey) - installTimes.mInstallTimes.get(startKey));
+-    }
+ }
+-- 
+2.11.0
+

build/patches/Remove-recent-tabs-signin.patch

@@ -1,180 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 15 May 2019 17:08:35 +0200
-Subject: Remove recent tabs signin
-
----
- .../chrome/browser/signin/SigninManager.java       | 63 +++-------------------
- .../android/signin/signin_manager_android.cc       |  3 +-
- 2 files changed, 7 insertions(+), 59 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
-@@ -27,10 +27,7 @@ import org.chromium.base.annotations.NativeMethods;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.task.PostTask;
--import org.chromium.components.signin.AccountIdProvider;
- import org.chromium.components.signin.AccountManagerFacade;
--import org.chromium.components.signin.AccountTrackerService;
--import org.chromium.components.signin.ChromeSigninController;
- import org.chromium.content_public.browser.UiThreadTaskTraits;
- 
- import java.util.ArrayList;
-@@ -46,7 +43,7 @@ import java.util.List;
-  * <p/>
-  * See chrome/browser/signin/signin_manager_android.h for more details.
-  */
--public class SigninManager implements AccountTrackerService.OnSystemAccountsSeededListener {
-+public class SigninManager {
-     private static final String TAG = "SigninManager";
- 
-     /**
-@@ -187,7 +184,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-     private long mNativeSigninManagerAndroid;
-     private final Context mContext;
-     private final SigninManagerDelegate mDelegate;
--    private final AccountTrackerService mAccountTrackerService;
-     private final ObserverList<SignInStateObserver> mSignInStateObservers = new ObserverList<>();
-     private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
-             new ObserverList<>();
-@@ -222,28 +218,23 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-      */
-     @CalledByNative
-     private static SigninManager create(long nativeSigninManagerAndroid,
--            SigninManagerDelegate delegate, AccountTrackerService accountTrackerService) {
-+            SigninManagerDelegate delegate) {
-         assert nativeSigninManagerAndroid != 0;
-         assert delegate != null;
--        assert accountTrackerService != null;
-         return new SigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
--                delegate, accountTrackerService);
-+                delegate);
-     }
- 
-     @VisibleForTesting
--    SigninManager(Context context, long nativeSigninManagerAndroid, SigninManagerDelegate delegate,
--            AccountTrackerService accountTrackerService) {
-+    SigninManager(Context context, long nativeSigninManagerAndroid, SigninManagerDelegate delegate) {
-         ThreadUtils.assertOnUiThread();
-         assert context != null;
-         mContext = context;
-         mNativeSigninManagerAndroid = nativeSigninManagerAndroid;
-         mDelegate = delegate;
--        mAccountTrackerService = accountTrackerService;
- 
-         mSigninAllowedByPolicy =
-                 SigninManagerJni.get().isSigninAllowedByPolicy(this, mNativeSigninManagerAndroid);
--
--        mAccountTrackerService.addSystemAccountsSeededListener(this);
-     }
- 
-     /**
-@@ -252,7 +243,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-      */
-     @CalledByNative
-     public void destroy() {
--        mAccountTrackerService.removeSystemAccountsSeededListener(this);
-         mNativeSigninManagerAndroid = 0;
-     }
- 
-@@ -289,8 +279,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-      * Returns true if signin can be started now.
-      */
-     public boolean isSignInAllowed() {
--        return !mFirstRunCheckIsPending && mSignInState == null && mSigninAllowedByPolicy
--                && ChromeSigninController.get().getSignedInUser() == null && isSigninSupported();
-+	return false;
-     }
- 
-     /**
-@@ -348,27 +337,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-     }
- 
-     /**
--    * Continue pending sign in after system accounts have been seeded into AccountTrackerService.
--    */
--    @Override
--    public void onSystemAccountsSeedingComplete() {
--        if (mSignInState != null && mSignInState.mBlockedOnAccountSeeding) {
--            mSignInState.mBlockedOnAccountSeeding = false;
--            progressSignInFlowCheckPolicy();
--        }
--    }
--
--    /**
--    * Clear pending sign in when system accounts in AccountTrackerService were refreshed.
--    */
--    @Override
--    public void onSystemAccountsChanged() {
--        if (mSignInState != null) {
--            abortSignIn();
--        }
--    }
--
--    /**
-      * Starts the sign-in flow, and executes the callback when finished.
-      *
-      * If an activity is provided, it is considered an "interactive" sign-in and the user can be
-@@ -423,16 +391,7 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-     }
- 
-     private void progressSignInFlowSeedSystemAccounts() {
--        if (mAccountTrackerService.checkAndSeedSystemAccounts()) {
--            progressSignInFlowCheckPolicy();
--        } else if (AccountIdProvider.getInstance().canBeUsed()) {
--            mSignInState.mBlockedOnAccountSeeding = true;
--        } else {
--            Activity activity = mSignInState.mActivity;
--            mDelegate.handleGooglePlayServicesUnavailability(activity, !isForceSigninEnabled());
--            Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
--            abortSignIn();
--        }
-+        mSignInState.mBlockedOnAccountSeeding = true;
-     }
- 
-     /**
-@@ -467,14 +426,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
-         // This method should be called at most once per sign-in flow.
-         assert mSignInState != null;
- 
--        SigninManagerJni.get().onSignInCompleted(
--                this, mNativeSigninManagerAndroid, mSignInState.mAccount.name);
--
--        // Cache the signed-in account name. This must be done after the native call, otherwise
--        // sync tries to start without being signed in natively and crashes.
--        ChromeSigninController.get().setSignedInAccountName(mSignInState.mAccount.name);
--        mDelegate.enableSync(mSignInState.mAccount);
--
-         if (mSignInState.mCallback != null) {
-             mSignInState.mCallback.onSignInComplete();
-         }
-@@ -642,12 +593,10 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
- 
-         // Native sign-out must happen before resetting the account so data is deleted correctly.
-         // http://crbug.com/589028
--        ChromeSigninController.get().setSignedInAccountName(null);
-         if (mSignOutState.mWipeDataHooks != null) mSignOutState.mWipeDataHooks.preWipeData();
-         mDelegate.disableSyncAndWipeData(
-                 mSignOutState.mManagementDomain != null || mSignOutState.mForceWipeUserData,
-                 this::onProfileDataWiped);
--        mAccountTrackerService.invalidateAccountSeedStatus(true);
-     }
- 
-     @VisibleForTesting
-diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc
---- a/chrome/browser/android/signin/signin_manager_android.cc
-+++ b/chrome/browser/android/signin/signin_manager_android.cc
-@@ -53,8 +53,7 @@ SigninManagerAndroid::SigninManagerAndroid(
- 
-   java_signin_manager_ = Java_SigninManager_create(
-       base::android::AttachCurrentThread(), reinterpret_cast<intptr_t>(this),
--      signin_manager_delegate_->GetJavaObject(),
--      identity_manager_->LegacyGetAccountTrackerServiceJavaObject());
-+      signin_manager_delegate_->GetJavaObject());
- }
- 
- base::android::ScopedJavaLocalRef<jobject>
--- 
-2.11.0
-

build/patches/Replace-DoH-probe-domain-with-RIPE-domain.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Oct 2019 10:00:13 +0100
+Subject: Replace DoH probe domain with RIPE domain
+
+---
+ net/dns/dns_transaction.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -816,7 +816,7 @@ class DnsTCPAttempt : public DnsAttempt {
+ 
+ // ----------------------------------------------------------------------------
+ 
+-const char kDoHProbeHostname[] = "www.gstatic.com";
++const char kDoHProbeHostname[] = "www.ripe.net";
+ 
+ const net::BackoffEntry::Policy kProbeBackoffPolicy = {
+     // Apply exponential backoff rules after the first error.
+-- 
+2.11.0
+

build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch

@@ -0,0 +1,135 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 10 Oct 2019 23:30:16 +0200
+Subject: Revert "Cleanup Search Ready Omnibox flag since it has launched"
+
+This reverts commit ae458edcc8422d0815d0e82261e71fe10d7d6fc2.
+---
+ .../java/src/org/chromium/chrome/browser/ChromeFeatureList.java    | 1 +
+ .../chrome/browser/omnibox/suggestions/AutocompleteMediator.java   | 7 +++++++
+ chrome/browser/about_flags.cc                                      | 3 +++
+ chrome/browser/android/chrome_feature_list.cc                      | 4 ++++
+ chrome/browser/android/chrome_feature_list.h                       | 1 +
+ chrome/browser/flag-metadata.json                                  | 5 +++++
+ chrome/browser/flag_descriptions.cc                                | 5 +++++
+ chrome/browser/flag_descriptions.h                                 | 3 +++
+ 8 files changed, 29 insertions(+)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+@@ -303,6 +303,7 @@ public abstract class ChromeFeatureList {
+     public static final String REMOVE_NAVIGATION_HISTORY = "RemoveNavigationHistory";
+     public static final String REORDER_BOOKMARKS = "ReorderBookmarks";
+     public static final String REVAMPED_CONTEXT_MENU = "RevampedContextMenu";
++    public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
+     public static final String SEND_TAB_TO_SELF = "SyncSendTabToSelf";
+     public static final String SERVICE_MANAGER_FOR_DOWNLOAD = "ServiceManagerForDownload";
+     public static final String SERVICE_WORKER_PAYMENT_APPS = "ServiceWorkerPaymentApps";
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+@@ -321,6 +321,13 @@ class AutocompleteMediator
+     void onNativeInitialized() {
+         mNativeInitialized = true;
+ 
++        // The feature is instantiated in the constructor to simplify plumbing. If the feature is
++        // actually disabled, null out the coordinator.
++        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SEARCH_READY_OMNIBOX)) {
++            mEditUrlProcessor.destroy();
++            mEditUrlProcessor = null;
++        }
++
+         mShowSuggestionFavicons =
+                 ChromeFeatureList.isEnabled(ChromeFeatureList.OMNIBOX_SHOW_SUGGESTION_FAVICONS);
+ 
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
++++ b/chrome/browser/about_flags.cc
+@@ -1966,6 +1966,9 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-homepage-tile", flag_descriptions::kHomepageTileName,
+      flag_descriptions::kHomepageTileDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kHomepageTile)},
++    {"enable-search-ready-omnibox", flag_descriptions::kSearchReadyOmniboxName,
++     flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
++     FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
+     {"enable-bookmark-reorder", flag_descriptions::kReorderBookmarksName,
+      flag_descriptions::kReorderBookmarksDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kReorderBookmarks)},
+diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
+--- a/chrome/browser/android/chrome_feature_list.cc
++++ b/chrome/browser/android/chrome_feature_list.cc
+@@ -164,6 +164,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+     &kReaderModeInCCT,
+     &kReorderBookmarks,
+     &kRevampedContextMenu,
++    &kSearchReadyOmniboxFeature,
+     &kSearchEnginePromoExistingDevice,
+     &kSearchEnginePromoNewDevice,
+     &kServiceManagerForBackgroundPrefetch,
+@@ -516,6 +517,9 @@ const base::Feature kReorderBookmarks{"ReorderBookmarks",
+ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
++const base::Feature kSearchReadyOmniboxFeature{
++    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
++
+ const base::Feature kServiceManagerForBackgroundPrefetch{
+     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
+--- a/chrome/browser/android/chrome_feature_list.h
++++ b/chrome/browser/android/chrome_feature_list.h
+@@ -101,6 +101,7 @@ extern const base::Feature kReaderModeInCCT;
+ extern const base::Feature kRevampedContextMenu;
+ extern const base::Feature kSearchEnginePromoExistingDevice;
+ extern const base::Feature kSearchEnginePromoNewDevice;
++extern const base::Feature kSearchReadyOmniboxFeature;
+ extern const base::Feature kServiceManagerForBackgroundPrefetch;
+ extern const base::Feature kServiceManagerForDownload;
+ extern const base::Feature kSettingsModernStatusBar;
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
++++ b/chrome/browser/flag-metadata.json
+@@ -1626,6 +1626,11 @@
+     "expiry_milestone": 78
+   },
+   {
++    "name": "enable-search-ready-omnibox",
++    "owners": [ "mdjones" ],
++    "expiry_milestone": -1
++  },
++  {
+     "name": "enable-send-tab-to-self",
+     "owners": [ "//components/send_tab_to_self/OWNERS" ],
+     "expiry_milestone": 77
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
++++ b/chrome/browser/flag_descriptions.cc
+@@ -2695,6 +2695,11 @@ const char kSafeBrowsingUseLocalBlacklistsV2Description[] =
+     "process to check the Safe Browsing reputation of URLs without calling "
+     "into GmsCore for every URL.";
+ 
++const char kSearchReadyOmniboxName[] = "Search Ready Omnibox";
++const char kSearchReadyOmniboxDescription[] =
++    "Clears the omnibox and adds a suggestion item to share, copy, or edit the "
++    "URL.";
++
+ const char kSetMarketUrlForTestingName[] = "Set market URL for testing";
+ const char kSetMarketUrlForTestingDescription[] =
+     "When enabled, sets the market URL for use in testing the update menu "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
++++ b/chrome/browser/flag_descriptions.h
+@@ -1594,6 +1594,9 @@ extern const char kReaderModeInCCTDescription[];
+ extern const char kSafeBrowsingUseLocalBlacklistsV2Name[];
+ extern const char kSafeBrowsingUseLocalBlacklistsV2Description[];
+ 
++extern const char kSearchReadyOmniboxName[];
++extern const char kSearchReadyOmniboxDescription[];
++
+ extern const char kSetMarketUrlForTestingName[];
+ extern const char kSetMarketUrlForTestingDescription[];
+ 
+-- 
+2.11.0
+

build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch

@@ -0,0 +1,37 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 14 Oct 2019 20:27:33 +0200
+Subject: Revert "[Merge to M78] Enable AImageReader by default."
+
+This reverts commit 60c3d4531b180b911767fb3ea7c3553d7f408c25.
+---
+ gpu/config/gpu_finch_features.cc | 2 +-
+ media/base/media_switches.cc     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
+--- a/gpu/config/gpu_finch_features.cc
++++ b/gpu/config/gpu_finch_features.cc
+@@ -31,7 +31,7 @@ bool FieldIsInBlacklist(const char* current_value, std::string blacklist_str) {
+ #if defined(OS_ANDROID)
+ // Use android AImageReader when playing videos with MediaPlayer.
+ const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
++                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Use android SurfaceControl API for managing display compositor's buffer queue
+ // and using overlays on Android.
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+--- a/media/base/media_switches.cc
++++ b/media/base/media_switches.cc
+@@ -417,7 +417,7 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
+ 
+ // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+ const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
++                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Prevents using SurfaceLayer for videos. This is meant to be used by embedders
+ // that cannot support SurfaceLayer at the moment.
+-- 
+2.11.0
+

build/patches/Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 26 Sep 2019 00:00:43 +0200
+Subject: Revert "Remove UnifiedConsent from ChromeFeatureList"
+
+This reverts commit c513d4c926a42ba6cc5eccfd5e85ba64c38bf0c1.
+---
+ .../android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java  | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+@@ -339,6 +339,7 @@ public abstract class ChromeFeatureList {
+     public static final String TRUSTED_WEB_ACTIVITY_NOTIFICATION_DELEGATION_ENROLMENT =
+             "TrustedWebActivityNotificationDelegationAutoEnrolment";
+     public static final String VIDEO_PERSISTENCE = "VideoPersistence";
++    public static final String UNIFIED_CONSENT = "UnifiedConsent";
+     public static final String USAGE_STATS = "UsageStats";
+     public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback";
+     public static final String USER_ACTIVATION_V2 = "UserActivationV2";
+-- 
+2.11.0
+