Release 78.0.3904.63

Restore index meta to updated Remove-Sync-and-Translate-menu.patch

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+liberapay: csagan5
+custom: https://www.bromite.org/#donate

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,25 +4,37 @@ about: Create a Bromite bug report
 
 ---
 
-**Version**
+**Bromite version**
 
-Version: `v67...`
+Version: `76.0...`
 Arch: `arm` or `arm64` or `x86`
+Android version: (example: `9.0`)
+Device model: (example: `SM-G960UZKABST`)
+
+**Is this bug about the SystemWebView?**
+Yes/No
+
+No support for SystemWebView installations is provided.
 
 **Is the bug reproducible with latest version?**
-`Bug must be reproducible with latest version`
 
-**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
-`Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
-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; all Chromium issues reported here will be closed as `invalid`.
+Do not report bugs which are not reproducible with latest version
+
+**Can the bug be reproduced with corresponding Chromium version?**
+
+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?**
+
 If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+
+Write here a clear and concise description of the bug.
 
 **To Reproduce**
+
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
@@ -30,7 +42,9 @@ Steps to reproduce the behavior:
 4. See error
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+
+If applicable, add screenshots to help explain your problem. Otherwise remove this section.

.github/ISSUE_TEMPLATE/feature_request.md

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

CHANGELOG.md

@@ -1,3 +1,273 @@
+# 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
+* keep using Bromite engine for SystemWebView
+* enable subresource filter for all sites
+* disable subresource filter popup
+* enable IPv6 probing by default
+* drop DnsTransaction default security level patch
+* drop patch to visualize all type of extensions
+* drop patches for Network Service
+* enable CFI for all architectures except x86
+
+# 76.0.3809.129
+* disable CFI to fix x86 crashes (fixes https://github.com/bromite/bromite/issues/357)
+
+# 76.0.3809.115
+* disable search-ready omnibox by default
+* disable unified consent
+
+# 76.0.3809.100
+* use default feature flags for autofill (fixes https://github.com/bromite/bromite/issues/348)
+
+# 76.0.3809.91
+
+# 76.0.3809.85
+* add flag to toggle Network Service
+* disable Network Service by default
+* do not record UMA for network errors
+* use fixed User Agent and Android OS version
+* dropped patch for history requirement of user gesture
+
+# 75.0.3770.139
+* disable media router and remoting by default (fixes https://github.com/bromite/bromite/issues/281)
+* enable CFI in GN build flags
+
+# 75.0.3770.132
+
+# 75.0.3770.109
+* disable payment support by default
+* disable background sync by default
+* better patch from GrapheneOS/Vanadium for disabling sensors access (fixes https://github.com/bromite/bromite/issues/319)
+* use new patch for content settings sensors allow/block (fixes https://github.com/bromite/bromite/issues/319)
+* fix impossible values in Battery Status API (fixes https://github.com/bromite/bromite/issues/322)
+
+# 75.0.3770.86
+
+# 75.0.3770.82
+
+# 75.0.3770.70
+* enable changing default downloads storage location by default
+* enable download rename option by default
+* disable offline pages in the downloads home to be opened in CCT by default
+* increase minimum SDK from 17 to 19 (fixes https://github.com/bromite/bromite/issues/310)
+* prefs: disable SigninAllowed by default
+* prefs: always prompt for download directory by default
+* build: remove calling untrusted hooks
+
+# 75.0.3770.53
+* fix crash when downloading or from browser-initiated requests (fixes https://github.com/bromite/bromite/issues/309)
+
+# 75.0.3770.50
+* disable dynamic module loading
+* more fixes to allow building for SDK 17
+
+# 74.0.3729.162
+* remove recent tabs signin
+
+# 74.0.3729.154
+
+# 74.0.3729.141
+
+# 74.0.3729.122
+* remove more unnecessary permissions
+
+# 74.0.3729.106
+* remove account/sync menu entries (fixes https://github.com/bromite/bromite/issues/285)
+* fix failed debug builds
+
+# 74.0.3729.86
+* enable dark mode settings entry by default
+* fix permission request for Play services on reboot (fixes https://github.com/bromite/bromite/issues/281)
+
+# 74.0.3729.80
+* increase minimum SDK version to 17 (Jelly Bean 4.2)
+* dropped obsolete patch for hyperlink auditing disable
+
+# 73.0.3683.107
+* dropped patch to disable smooth scrolling
+* fixed custom tab intents issue (fixes https://github.com/bromite/bromite/issues/279)
+
+# 73.0.3683.105
+* removed Fanboy's Annoyance List and Peter Lowe's adservers list from filters
+
+# 73.0.3683.97 
+* dropped redundant patch to hide NTP tiles (use home page + about:blank)
+
+# 73.0.3683.88
+* add option to use home page as NTP
+
+# 73.0.3683.82
+* remove force home page button flag
+* enable site per process isolation for devices with memory > 1GB
+* use 64-bit processes for SystemWebView
+* disable local field trials seed (redundant)
+* fix patch for classic new tab page (redundant)
+
+# 73.0.3683.79
+* add missing Qwant engine from default engines list (fixes https://github.com/bromite/bromite/issues/262)
+* DoH: include upstream patch for DNS secure mode
+* DoH: enable DNS secure mode by default
+
+# 73.0.3683.70
+
+# 73.0.3683.61
+* drop patches with functionality now available from upstream (DuckDuckGo and Qwant search engines, TLS 1.3 final)
+* add only DuckDuckGo Lite search engine
+* provide image URL for Qwant
+* disable safe browsing subresource filter by default
+* fix PAC URL support in proxy configuration
+
+# 72.0.3626.120
+* add support for resource type in adblock engine (fixes https://github.com/bromite/bromite/issues/115)
+* adblock engine speed optimizations
+* use adblock engine also in SystemWebView
+* add back uBlock Origin and EasyList filters
+* added Fanboy's Annoyance List
+
+# 72.0.3626.119
+* use AdGuard filters
+* fixes for new tile rows usage
+* re-introduce patch to hide NTP tiles
+* disable NTP tile metrics collection
+
+# 72.0.3626.114
+* use 4 tile rows instead of 2 in the new tab page
+* do not grant geolocation permission to default search engine (fixes https://github.com/bromite/bromite/issues/250)
+
+# 72.0.3626.108
+
+# 72.0.3626.99
+
+# 72.0.3626.87
+* update bookmarks view after import
+
+# 72.0.3626.81
+* serve empty content for blocked scripts/images (fixes https://github.com/bromite/bromite/issues/238)
+* keep support of Jelly Bean (workaround for upstream https://bugs.chromium.org/p/chromium/issues/detail?id=923477)
+
+# 72.0.3626.73
+
+# 72.0.3626.68
+* do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+* remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903)
+* AV1 codec support
+
+# 71.0.3578.132
+* add patches from AndroidHardening project (fixes https://github.com/bromite/bromite/issues/226)
+
+# 71.0.3578.123
+* disable jumbo builds (fixes https://github.com/bromite/bromite/issues/216 and https://github.com/bromite/bromite/issues/219)
+* disable preview fetching
+* do not consider Android Jelly Bean unsupported
+
+# 71.0.3578.120
+* fix breakage of translate quick answers by anti-AMP (fixes https://github.com/bromite/bromite/issues/210)
+
+# 71.0.3578.115
+* add AdGuard DNS-over-HTTPS option
+* use green icon for SystemWebView
+
+# 71.0.3578.110
+
+# 71.0.3578.104
+* fix AMP links sanitisation; have it working for news as well (fixes https://github.com/bromite/bromite/issues/202)
+* revert upstream patch responsible for the broken save dialog prompt (upstream: https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+
+# 71.0.3578.101
+
+# 71.0.3578.98
+* do not ask permissions for camera when importing bookmarks (fixes https://github.com/bromite/bromite/issues/200)
+
+# 71.0.3578.88
+* add proxy configuration page (see https://github.com/bromite/bromite/wiki/ProxyConfiguration)
+* use more recent versions in User-Agent (fixes https://github.com/bromite/bromite/issues/156)
+
+# 71.0.3578.85
+* fix blurry adaptive icon (fixes https://github.com/bromite/bromite/issues/197)
+
+# 71.0.3578.76
+
+# 71.0.3578.72
+* add flag to disable IPv6 probes
+
+# 70.0.3538.107
+* added adaptive icon (fixes https://github.com/bromite/bromite/issues/181)
+* do not change randomisation at each call (fixes https://github.com/bromite/bromite/issues/177)
+* do not enable #enable-scroll-anchor-serialization by default
+
+# 70.0.3538.102
+* do not grant notifications to default search engine
+* remove all promos from bookmark manager page
+* re-introduced various patches to eradicate binary blob dependencies (only Cast left)
+* remove contacts picker permission
+
+# 70.0.3538.95
+* fix crash on bookmark edit activity (fixes https://github.com/bromite/bromite/issues/172)
+* fix slow chrome://flags (fixes https://github.com/bromite/bromite/issues/173)
+* enable TLS 1.3 final support by default (fixes https://github.com/bromite/bromite/issues/174)
+* dropped some patches related to GCM/GMS on suspicion of being related to random crashes
+
+# 70.0.3538.87
+* enable history requirement of user gesture (fixes https://github.com/bromite/bromite/issues/171)
+* enable serialization of scroll position changes while loading (fixes https://github.com/bromite/bromite/issues/171)
+* remove passwords keyboard accessory option (fixes https://github.com/bromite/bromite/issues/171)
+* some improvements to bookmark import/export interaction
+* add flag to disable orientation API, disabled by default
+* disable device motion API by default (fixes https://github.com/bromite/bromite/issues/171)
+
+# 70.0.3538.83
+* fix keep session cookies option showing on all site settings views
+* fix blank site settings entry showing (fixes https://github.com/bromite/bromite/issues/166)
+* offer builtin autocomplete for chrome://flags quick access
+
+# 70.0.3538.80
+* add flag to disable video resume functionality, allowing to not pause video playback on tab switch (fixes https://github.com/bromite/bromite/issues/108)
+* prevent "are you there" prompts from appearing when playing videos
+* completely disable update scheduler checks to fix a related crash
+
+# 70.0.3538.77
+* disable generic sensor APIs by default (fixes https://github.com/bromite/bromite/issues/160)
+* introduce flag to disable device motion API (fixes https://github.com/bromite/bromite/issues/160)
+* add Quad9 as a DNS-over-HTTPS (DoH) option (fixes https://github.com/bromite/bromite/issues/140)
+
+# 70.0.3538.71
+* fix bug with canvas fingerprinting (fixes https://github.com/bromite/bromite/issues/154)
+
+# 70.0.3538.67
+* re-enabled DNS-over-HTTPS (DoH) flag (fixes https://github.com/bromite/bromite/issues/139)
+* dropped GCM removal patch
+* disable kSigninAllowedOnNextStartup by default
+* permanently disable query-in-omnibox (fixes https://github.com/bromite/bromite/issues/143)
+
+# 69.0.3497.113
+* disabled DNS-over-HTTPS (DoH) flag, not working since 69.0.3497.73 (see https://github.com/bromite/bromite/issues/139)
+
+# 69.0.3497.109
+
+# 69.0.3497.102
+* ungoogled-chromium: disable network time tracker
+* ungoogled-chromium: remove third-party/analytics
+* ungoogled-chromium: always use local Devtools instead of remote files
+* build without safebrowsing
+* drop "Hide NTP tiles" flag
+
+# 69.0.3497.91
+* fixed crash when accessing site settings media preferences (fixes https://github.com/bromite/bromite/issues/122)
+
 # 69.0.3497.73
 * enabled WebRTC
 * drop clear HTTP cache patch

README.md

@@ -6,9 +6,7 @@
 
 Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.
 
-Bromite is only available for Android v4.1 and above.
-
-See [open issues](https://github.com/bromite/bromite/issues) for the development in progress.
+Bromite is only available for Android v4.4 and above.
 
 <img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />
 
@@ -21,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)
+[&rarr; Support development with a donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2): [![paypal](/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`
 
@@ -35,26 +31,33 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 No.
 This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
 
+Additionally, these features would not be privacy-friendly.
+
 ## Does Bromite require root?
 No.
 
+## Is Bromite de-googled?
+
+Yes, although this has not been verified (and hardly can be) under all situations; if you were to find connections to cloud-based services please report them via the issue tracker.
+Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).
+
 ## What is the SystemWebView?
 It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
 
+See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.
+
 ## How to enable DNS-over-HTTPS?
 
 See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
 
-## Can you add dark mode/some cool themes?
-No.
-Bromite is about adblocking and privacy.
-
 ## Can you add HTTPS everywhere?
 No.
-We cannot add add-ons to Bromite (merely some features) and anyway HTTPS everywhere in particular is too invasive to be easily maintained across new releases.
+We cannot add add-ons to Bromite (merely some features).
 
 ## Is Bromite on Play Store?
-No, and this is unlikely to change. The Play Store would not allow total freedom on the adblocking choice, amongst other limitations.
+No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
+
+Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.
 
 ## Is Bromite on F-Droid?
 It is not on the official F-Droid repository and there are no (more) plans to submit it.
@@ -62,37 +65,46 @@ It is not on the official F-Droid repository and there are no (more) plans to su
 You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Does Bromite support WebRTC?
-No, it is not built-in.
+Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
 
 # Features
 
-* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
+* native adblock engine
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google/CloudFlare servers
+* 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
 * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
-* chrome flags to hide NTP tiles, disable custom intents and clear session on exit
+* chrome flags to disable custom intents and clear session on exit
 * always-incognito mode
+* completely removed safe browsing and other privacy-unfriendly features
+* anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
+* use fixed User-Agent to conceal real model and browser version
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
-* webRTC, canvas, audio and other anti-fingerprinting mitigations
+* security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project
 
 ## Features not related to privacy
 * import/export bookmarks
-* allow playing videos in background
+* allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
+* [AV1 codec support](https://github.com/bromite/bromite/wiki/AV1-support)
 * built with official speed optimizations
 
-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/build/patches
+
+# Privacy limitations
+
+Bromite's privacy features, including anti-fingerprinting mitigations (which can be easily circumvented), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://2019.www.torproject.org/projects/torbrowser.html.en) in such cases.
 
 # Releases
 
-All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device.
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise).
 
 Each tag corresponds to a Chromium Stable release tag.
 
-Bromite is currently built for ARM, ARM64 and x86 and for the Android SDKs versions 16 and 21
-Additionally, [SystemWebView](https://www.bromite.org/system_web_view) and the [vanilla Chromium](https://www.bromite.org/chromium) builds are provided.
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK versions 19 and 21; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK21+).
+For every Bromite build you can always find a matching [vanilla Chromium](https://www.bromite.org/chromium) build which is used for example to verify which issues are specific to Bromite or not.
 
-The official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).
+All official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Integrity and authenticity
 
@@ -102,7 +114,6 @@ $ sha256sum --check brm_68.0.3440.54.sha256.txt
 arm64_SystemWebView.apk: OK
 arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
-arm64_MonochromePublic.apk: OK
 ```
 
 If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
@@ -125,15 +136,30 @@ 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/`. This file is only used for the SystemWebView.
+
+## 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
+* [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
-* [AdBlock Plus](https://adblockplus.org/), [uBlock Origin](https://github.com/uBlockOrigin), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included
+* 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)
 
 # License
 

build/GN_ARGS

@@ -0,0 +1,32 @@
+android_channel="stable"
+blink_symbol_level=1
+dcheck_always_on=false
+debuggable_apks=false
+enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+enable_av1_decoder=true
+enable_hangout_services_extension=false
+enable_mdns=false
+enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
+enable_nacl=false
+enable_nacl_nonsfi=false
+enable_remoting=false
+enable_reporting=false
+enable_resource_whitelist_generation=false
+enable_vr=false
+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
+safe_browsing_mode=0
+strip_absolute_paths_from_debug_symbols=true
+strip_debug_info=false
+symbol_level=1
+target_os="android"
+use_debug_fission=true
+use_errorprone_java_compiler=false
+use_jumbo_build=false
+use_official_google_api_keys=false
+use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true
+use_sysroot=false

build/patches/AV1-codec-support.patch

@@ -0,0 +1,234 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 16 Dec 2018 15:24:19 +0100
+Subject: AV1 codec support
+
+libaom build fixes (requires -fPIC)
+Report AV1 as playable on Android
+---
+ media/base/mime_util_internal.cc                                    | 6 +++++-
+ third_party/libaom/BUILD.gn                                         | 6 ++++--
+ third_party/libaom/libaom_srcs.gni                                  | 5 +++++
+ .../source/config/linux/arm-neon-cpu-detect/config/aom_config.asm   | 2 +-
+ .../source/config/linux/arm-neon-cpu-detect/config/aom_config.h     | 2 +-
+ .../libaom/source/config/linux/arm-neon/config/aom_config.asm       | 2 +-
+ third_party/libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +-
+ third_party/libaom/source/config/linux/arm/config/aom_config.asm    | 2 +-
+ third_party/libaom/source/config/linux/arm/config/aom_config.h      | 2 +-
+ third_party/libaom/source/config/linux/arm64/config/aom_config.asm  | 2 +-
+ third_party/libaom/source/config/linux/arm64/config/aom_config.h    | 2 +-
+ .../libaom/source/config/linux/generic/config/aom_config.asm        | 2 +-
+ third_party/libaom/source/config/linux/generic/config/aom_config.h  | 2 +-
+ third_party/libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-
+ third_party/libaom/source/config/linux/x64/config/aom_config.h      | 2 +-
+ 15 files changed, 26 insertions(+), 15 deletions(-)
+
+diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
+--- a/media/base/mime_util_internal.cc
++++ b/media/base/mime_util_internal.cc
+@@ -564,9 +564,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
+     case THEORA:
+       return false;
+ 
+-    // AV1 is not supported on Android yet.
++    // AV1 is supported on Android.
+     case AV1:
++#if BUILDFLAG(ENABLE_AV1_DECODER)
++      return true;
++#else
+       return false;
++#endif
+ 
+     // ----------------------------------------------------------------------
+     // The remaining codecs may be supported depending on platform abilities.
+diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
+--- a/third_party/libaom/BUILD.gn
++++ b/third_party/libaom/BUILD.gn
+@@ -74,7 +74,7 @@ if (enable_libaom_decoder) {
+       sources = aom_dsp_common_asm_sse2
+       sources += aom_dsp_common_asm_ssse3
+       sources += aom_ports_asm_x86
+-      defines = [ "CHROMIUM" ]
++      defines = [ "CHROMIUM", "PIC" ]
+       include_dirs = libaom_include_dirs
+     }
+ 
+@@ -158,7 +158,7 @@ if (enable_libaom_decoder) {
+       configs += [ "//build/config/compiler:no_chromium_code" ]
+       if (current_cpu == "arm") {
+         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+-        cflags = [ "-mfpu=neon" ]
++        cflags = [ "-mfpu=neon", "-fPIC" ]
+       }
+       configs += [ ":libaom_config" ]
+ 
+@@ -203,6 +203,8 @@ if (enable_libaom_decoder) {
+     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
+         cpu_arch_full == "arm-neon-cpu-detect") {
+       deps += [ ":libaom_intrinsics_neon" ]
++      # will detect CPU
++      sources += aom_ports_arm_sources
+     }
+     if (is_android) {
+       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
+@@ -488,6 +488,11 @@ aom_mem_sources = [
+ 
+ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
+ 
++aom_ports_arm_sources = [
++  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
++  "//third_party/libaom/source/libaom/aom_ports/arm.h",
++ ]
++
+ aom_rtcd_sources = [
+   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl",
+   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c",
+diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
++CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
+ CONFIG_SHARED equ 0
+diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+ #define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
++CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+ CONFIG_SHARED equ 0
+diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+ #define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
++CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+ CONFIG_SHARED equ 0
+diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+ #define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
++CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
+ CONFIG_SHARED equ 0
+diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
+ #define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
+@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_ONE_PASS_SVM equ 0
+ CONFIG_OS_SUPPORT equ 1
+-CONFIG_PIC equ 0
++CONFIG_PIC equ 1
+ CONFIG_RD_DEBUG equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
+ CONFIG_SHARED equ 0
+diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+ #define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
++++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
+@@ -35,7 +35,7 @@
+ %define CONFIG_NORMAL_TILE_MODE 1
+ %define CONFIG_ONE_PASS_SVM 0
+ %define CONFIG_OS_SUPPORT 1
+-%define CONFIG_PIC 0
++%define CONFIG_PIC 1
+ %define CONFIG_RD_DEBUG 0
+ %define CONFIG_RUNTIME_CPU_DETECT 1
+ %define CONFIG_SHARED 0
+diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
+--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
++++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
+@@ -47,7 +47,7 @@
+ #define CONFIG_NORMAL_TILE_MODE 1
+ #define CONFIG_ONE_PASS_SVM 0
+ #define CONFIG_OS_SUPPORT 1
+-#define CONFIG_PIC 0
++#define CONFIG_PIC 1
+ #define CONFIG_RD_DEBUG 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+ #define CONFIG_SHARED 0
+-- 
+2.11.0
+

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

@@ -0,0 +1,625 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 11:06:18 +0200
+Subject: Add DuckDuckGo Lite search engine
+
+---
+ .../search_engines/prepopulated_engines.json       |  10 ++
+ components/search_engines/search_engine_type.h     |   1 +
+ .../template_url_prepopulate_data.cc               | 129 +++++++++++----------
+ 3 files changed, 76 insertions(+), 64 deletions(-)
+
+diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
+--- a/components/search_engines/prepopulated_engines.json
++++ b/components/search_engines/prepopulated_engines.json
+@@ -91,6 +91,16 @@
+       "id": 68
+     },
+ 
++    "duckduckgo_light": {
++      "name": "DuckDuckGo Light",
++      "keyword": "duckduckgo.com/lite",
++      "favicon_url": "https://duckduckgo.com/favicon.ico",
++      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
++      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
++      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
++      "id": 12
++    },
++
+     "duckduckgo": {
+       "name": "DuckDuckGo",
+       "keyword": "duckduckgo.com",
+diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
+--- a/components/search_engines/search_engine_type.h
++++ b/components/search_engines/search_engine_type.h
+@@ -65,6 +65,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_360,
+   SEARCH_ENGINE_COCCOC,
+   SEARCH_ENGINE_DUCKDUCKGO,
++  SEARCH_ENGINE_DUCKDUCKGOLIGHT,
+   SEARCH_ENGINE_PARSIJOO,
+   SEARCH_ENGINE_QWANT,
+   SEARCH_ENGINE_STARTPAGE,
+diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
+--- a/components/search_engines/template_url_prepopulate_data.cc
++++ b/components/search_engines/template_url_prepopulate_data.cc
+@@ -35,6 +35,7 @@ const PrepopulatedEngine* const engines_default[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Note, the below entries are sorted by country code, not the name in comment.
+@@ -44,7 +45,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Albania
+@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_ar,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Austria
+@@ -68,7 +69,7 @@ const PrepopulatedEngine* const engines_AT[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_at,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Australia
+@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_au,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Bosnia and Herzegovina
+@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Bulgaria
+@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Bolivia
+@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Brazil
+@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_br,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Belarus
+@@ -156,19 +157,19 @@ const PrepopulatedEngine* const engines_BZ[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Canada
+ const PrepopulatedEngine* const engines_CA[] = {
+-    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo,
++    &googleen, &google, &startpage, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Switzerland
+ const PrepopulatedEngine* const engines_CH[] = {
+     &googleen, &google, &startpage,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo_ch,
+ };
+ 
+@@ -177,7 +178,7 @@ const PrepopulatedEngine* const engines_CL[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_cl,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // China
+@@ -190,7 +191,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+     &googleen, &google, &startpage,
+     &yahoo_co,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Costa Rica
+@@ -198,7 +199,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Czech Republic
+@@ -214,7 +215,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_de,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Denmark
+@@ -222,7 +223,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_dk,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Dominican Republic
+@@ -230,7 +231,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Algeria
+@@ -246,7 +247,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Estonia
+@@ -270,7 +271,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_es,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Finland
+@@ -278,7 +279,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_fi,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Faroe Islands
+@@ -286,7 +287,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // France
+@@ -302,7 +303,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_uk,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Greece
+@@ -310,7 +311,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Guatemala
+@@ -318,7 +319,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Hong Kong
+@@ -334,7 +335,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Croatia
+@@ -342,7 +343,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Hungary
+@@ -350,7 +351,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+     &googleen, &google, &startpage,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Indonesia
+@@ -358,7 +359,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+     &googleen, &google, &startpage,
+     &yahoo_id,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Ireland
+@@ -366,7 +367,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Israel
+@@ -382,7 +383,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+     &googleen, &google, &startpage,
+     &yahoo_in,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Iraq
+@@ -405,7 +406,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Italy
+@@ -413,7 +414,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Jamaica
+@@ -421,7 +422,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Jordan
+@@ -445,7 +446,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+     &googleen, &google, &startpage,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // South Korea
+@@ -477,14 +478,14 @@ const PrepopulatedEngine* const engines_LB[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Liechtenstein
+ const PrepopulatedEngine* const engines_LI[] = {
+     &googleen, &google, &startpage,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo,
+ };
+ 
+@@ -500,7 +501,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+ const PrepopulatedEngine* const engines_LU[] = {
+     &googleen, &google, &startpage,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo,
+ };
+ 
+@@ -533,7 +534,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Moldova
+@@ -541,7 +542,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+     &googleen, &google, &startpage,
+     &yandex_ru,
+     &mail_ru,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Montenegro
+@@ -557,7 +558,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+     &googleen, &google, &startpage,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Mexico
+@@ -565,7 +566,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_mx,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Malaysia
+@@ -581,7 +582,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Netherlands
+@@ -589,7 +590,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_nl,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Norway
+@@ -597,14 +598,14 @@ const PrepopulatedEngine* const engines_NO[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // New Zealand
+ const PrepopulatedEngine* const engines_NZ[] = {
+     &googleen, &google, &startpage,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &yahoo_nz,
+ };
+ 
+@@ -621,7 +622,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Peru
+@@ -629,7 +630,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+     &googleen, &google, &startpage,
+     &yahoo_pe,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Philippines
+@@ -637,7 +638,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+     &googleen, &google, &startpage,
+     &yahoo_ph,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Pakistan
+@@ -653,7 +654,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Puerto Rico
+@@ -661,7 +662,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Portugal
+@@ -669,7 +670,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Paraguay
+@@ -677,7 +678,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Qatar
+@@ -693,7 +694,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Serbia
+@@ -701,7 +702,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+     &googleen, &google, &startpage,
+     &yahoo,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Russia
+@@ -733,7 +734,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo_se,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Singapore
+@@ -749,7 +750,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Slovakia
+@@ -757,7 +758,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // El Salvador
+@@ -765,7 +766,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Syria
+@@ -805,7 +806,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Taiwan
+@@ -837,7 +838,7 @@ const PrepopulatedEngine* const engines_US[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Uruguay
+@@ -845,7 +846,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Venezuela
+@@ -853,7 +854,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+     &googleen, &google, &startpage,
+     &yahoo_ve,
+     &bing,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Vietnam
+@@ -877,7 +878,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+     &googleen, &google, &startpage,
+     &bing,
+     &yahoo,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+ };
+ 
+ // Zimbabwe
+@@ -897,7 +898,7 @@ const PrepopulatedEngine* const kAllEngines[] = {
+     &bing,
+     &coccoc,
+     &daum,
+-    &duckduckgo,
++    &duckduckgo, &duckduckgo_light,
+     &googleen, &google, &startpage,
+     &mail_ru,
+     &naver,
+-- 
+2.11.0
+

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

@@ -0,0 +1,226 @@
+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/net/system_network_context_manager.cc   | 18 +++++++++++-------
+ .../common/network_features.cc                         |  6 ++++++
+ .../common/network_features.h                          |  6 ++++++
+ .../common/network_switch_list.h                       |  4 ++++
+ net/base/load_flags_list.h                             |  6 ++++++
+ net/dns/dns_transaction.cc                             |  4 ++--
+ net/url_request/url_request_http_job.cc                | 16 +++++++++++-----
+ 8 files changed, 57 insertions(+), 14 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
+@@ -417,6 +417,14 @@ const FeatureEntry::FeatureVariation kCCTModuleCacheVariations[] = {
+      base::size(kCCTModuleCache_ThirtyMinutes), nullptr},
+ };
+ 
++const FeatureEntry::Choice kDnsOverHttpsChoices[] = {
++    {features::kDnsOverHttpsChoiceDefault, "", ""},
++    {features::kDnsOverHttpsChoiceGoogle, switches::kDnsOverHttpsServer, "https://dns.google/dns-query"},
++    {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::FeatureParam kForceDark_SimpleHsl[] = {
+@@ -3578,6 +3586,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/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
+@@ -25,6 +25,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/net/dns_util.h"
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #include "chrome/browser/ssl/ssl_config_service_manager.h"
+@@ -142,6 +143,7 @@ void GetStubResolverConfig(
+                      base::SPLIT_WANT_NONEMPTY)) {
+       if (!chrome_browser_net::IsValidDohTemplate(server_template,
+                                                   &server_method)) {
++        LOG(ERROR) << "Invalid DoH template: " << server_template << " with method " << server_method;
+         continue;
+       }
+ 
+@@ -406,14 +408,16 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+                                     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();
++
++  std::string server =
++      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
++      switches::kDnsOverHttpsServer);
++  if (!server.empty()) {
++    default_doh_mode = chrome_browser_net::kDnsOverHttpsModeSecure;
++    // will use POST when URLs do not contain a 'dns' query parameter
++    default_doh_templates = server;
+   }
++
+   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
+                                     base::Value(default_doh_mode));
+   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates,
+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,4 +8,10 @@
+ 
+ namespace features {
+ 
++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,6 +10,12 @@
+ 
+ namespace features {
+ 
++// 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 char kDnsOverHttpsChoiceDefault[],
++   kDnsOverHttpsChoiceGoogle[], kDnsOverHttpsChoiceCloudflare[], kDnsOverHttpsChoiceQuad9[],
++   kDnsOverHttpsChoiceAdGuard[];
++
+ }  // 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
+@@ -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
+@@ -117,3 +117,9 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 18)
+ // is considered privileged, and therefore this flag must only be set from a
+ // trusted process.
+ LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 19)
++
++// 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 << 20)
+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
+@@ -403,7 +403,7 @@ class DnsHTTPAttempt : public DnsAttempt, public URLRequest::Delegate {
+     // perspective to prevent the client from sending AIA requests).
+     request_->SetLoadFlags(request_->load_flags() | LOAD_DISABLE_CACHE |
+                            LOAD_BYPASS_PROXY |
+-                           LOAD_DISABLE_CERT_NETWORK_FETCHES);
++                           LOAD_DISABLE_CERT_NETWORK_FETCHES | LOAD_MINIMAL_HEADERS);
+     request_->set_allow_credentials(false);
+   }
+ 
+@@ -997,7 +997,7 @@ class DnsTransactionImpl : public DnsTransaction,
+         had_tcp_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
+@@ -339,6 +339,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()) {
+@@ -354,11 +355,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-an-always-incognito-mode.patch

@@ -1,41 +1,52 @@
 From: Ryan Archer <ryan.bradley.archer@gmail.com>
 Date: Wed, 2 Aug 2017 01:41:28 -0400
-Subject: Add an always-incognito mode.
+Subject: Add an always-incognito mode
 
 More specifically, add a preference that causes all new tabs and all
 clicked links to launch as incognito.
 ---
+ chrome/android/chrome_java_sources.gni             |  1 +
  .../android/java/res/xml/privacy_preferences.xml   |  5 ++
- .../browser/AlwaysIncognitoLinkInterceptor.java    | 72 ++++++++++++++++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  4 ++
- .../chrome/browser/appmenu/AppMenuHandler.java     | 12 ++++
- .../contextmenu/ChromeContextMenuPopulator.java    |  7 +++
- .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 +++++++-
- .../java/strings/android_chrome_strings.grd        |  6 ++
- chrome/android/java_sources.gni                    |  1 +
- 8 files changed, 130 insertions(+), 1 deletion(-)
+ .../browser/AlwaysIncognitoLinkInterceptor.java    | 73 ++++++++++++++++++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  5 ++
+ .../chrome/browser/appmenu/AppMenuHandlerImpl.java | 11 ++++
+ .../contextmenu/ChromeContextMenuPopulator.java    |  9 ++-
+ .../chrome/browser/tabmodel/ChromeTabCreator.java  | 24 ++++++-
+ .../java/strings/android_chrome_strings.grd        |  8 +++
+ 8 files changed, 134 insertions(+), 2 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.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
+@@ -3,6 +3,7 @@
+ # found in the LICENSE file.
+ 
+ chrome_java_sources = [
++  "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
+   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
+   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
+   "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.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
-@@ -20,6 +20,11 @@
-         android:summary="@string/close_tabs_on_exit_summary"
-         android:defaultValue="false" />
+@@ -21,6 +21,11 @@
+         android:title="@string/can_make_payment_title"
+         android:summary="@string/settings_can_make_payment_toggle_label" />
      <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" />
 +    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-         android:key="safe_browsing_extended_reporting"
-         android:title="@string/safe_browsing_extended_reporting_title"
-         android:summary="@string/safe_browsing_extended_reporting_summary" />
+         android:key="preload_pages"
+         android:title="@string/preload_pages_title"
+         android:summary="@string/preload_pages_summary"
 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
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,73 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -47,6 +58,7 @@ new file mode 100644
 +import org.chromium.chrome.browser.tab.EmptyTabObserver;
 +import org.chromium.chrome.browser.tab.Tab;
 +import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
++import org.chromium.chrome.browser.tabmodel.TabLaunchType;
 +import org.chromium.chrome.browser.tabmodel.TabModel;
 +import org.chromium.content_public.browser.LoadUrlParams;
 +
@@ -98,7 +110,7 @@ new file mode 100644
 +            return;
 +        }
 +
-+        tab.getActivity().getTabCreator(true).createNewTab(new LoadUrlParams(url), TabModel.TabLaunchType.FROM_LINK, tab);
++        tab.getActivity().getTabCreator(true).createNewTab(new LoadUrlParams(url), TabLaunchType.FROM_LINK, tab);
 +
 +        if ((url.equals(lastUrl)) || (!tab.canGoBack())) {
 +            // this call was triggered by a reload
@@ -111,15 +123,16 @@ new file mode 100644
 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
-@@ -238,6 +238,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
+@@ -225,6 +225,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ 
+     private static final int RECORD_MULTI_WINDOW_SCREEN_WIDTH_DELAY_MS = 5000;
  
-     // Observes when sync becomes ready to create the mContextReporter.
 +    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-     private ProfileSyncService.SyncStateChangedListener mSyncStateChangedListener;
- 
-     private ChromeFullscreenManager mFullscreenManager;
-@@ -1630,6 +1631,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
++
+     /**
+      * Timeout in ms for reading PartnerBrowserCustomizations provider.
+      */
+@@ -1650,6 +1652,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -129,28 +142,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.
          return incognito ? mIncognitoTabCreator : mRegularTabCreator;
      }
  
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandler.java
-@@ -17,6 +17,7 @@ import android.view.View;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandlerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandlerImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandlerImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuHandlerImpl.java
+@@ -20,6 +20,7 @@ import android.view.WindowManager;
  import android.widget.PopupMenu;
  
- import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.base.Callback;
 +import org.chromium.base.ContextUtils;
- import org.chromium.chrome.R;
+ import org.chromium.base.ObservableSupplier;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.base.metrics.RecordUserAction;
+@@ -57,6 +58,8 @@ class AppMenuHandlerImpl
+     private @Nullable OverviewModeBehavior mOverviewModeBehavior;
+     private OverviewModeBehavior.OverviewModeObserver mOverviewModeObserver;
  
- import java.util.ArrayList;
-@@ -26,6 +27,9 @@ import java.util.ArrayList;
-  * AppMenuObservers about these actions.
-  */
- public class AppMenuHandler {
-+
 +    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
 +
-     private AppMenu mAppMenu;
-     private AppMenuDragHelper mAppMenuDragHelper;
-     private Menu mMenu;
-@@ -167,6 +171,14 @@ public class AppMenuHandler {
+     /**
+      * 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
+@@ -267,6 +270,14 @@ class AppMenuHandlerImpl
          if (mDelegate.shouldShowHeader(appRect.height())) {
              headerResourceId = mDelegate.getHeaderResourceId();
          }
@@ -163,44 +175,46 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        }
 +
          mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y,
-                 footerResourceId, headerResourceId, mHighlightMenuId, showFromBottom);
-         mAppMenuDragHelper.onShow(startDragging);
+                 footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight,
+                 showFromBottom);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -14,6 +14,7 @@ import android.view.ContextMenu;
- import android.webkit.MimeTypeMap;
+@@ -15,6 +15,7 @@ import android.webkit.URLUtil;
  
- import org.chromium.base.CollectionUtil;
-+import org.chromium.base.ContextUtils;
  import org.chromium.base.library_loader.LibraryProcessType;
  import org.chromium.base.metrics.RecordHistogram;
++import org.chromium.base.ContextUtils;
  import org.chromium.chrome.R;
-@@ -45,6 +46,7 @@ import java.util.Set;
-  */
- public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+ import org.chromium.chrome.browser.ChromeFeatureList;
+ import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel;
+@@ -46,6 +47,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
      private static final String TAG = "CCMenuPopulator";
+     private final ContextMenuItemDelegate mDelegate;
+     private final @ContextMenuMode int mMode;
 +    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-     private static final ShareContextMenuItem SHARE_IMAGE =
-             new ShareContextMenuItem(R.drawable.ic_share_white_24dp,
-                     R.string.contextmenu_share_image, R.id.contextmenu_share_image, false);
-@@ -479,6 +481,11 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
-             disabledOptions.add(ChromeContextMenuItem.OPEN_IN_INCOGNITO_TAB);
-         }
  
-+        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
-+                && !mDelegate.isIncognito()) {
-+            disabledOptions.add(ChromeContextMenuItem.OPEN_IN_NEW_TAB);
-+        }
-+
-         if (params.getLinkText().trim().isEmpty() || params.isImage()) {
-             disabledOptions.add(ChromeContextMenuItem.COPY_LINK_TEXT);
-         }
+     /**
+      * Defines the Groups of each Context Menu Item
+@@ -298,7 +300,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+             if (FirstRunStatus.getFirstRunFlowComplete() && mMode == ContextMenuMode.NORMAL
+                     && !isEmptyUrl(params.getUrl())
+                     && UrlUtilities.isAcceptedScheme(params.getUrl())) {
+-                linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
++                if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)
++                       && !mDelegate.isIncognito()) {
++                    // disallow open in new tab
++                } else {
++                    linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
++                }
+                 if (!mDelegate.isIncognito() && mDelegate.isIncognitoSupported()) {
+                     linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_INCOGNITO_TAB));
+                 }
 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;
@@ -208,17 +222,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.base.TraceEvent;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.ChromeActivity;
- import org.chromium.chrome.browser.ChromeFeatureList;
  import org.chromium.chrome.browser.IntentHandler;
-@@ -19,6 +21,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
- import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+ import org.chromium.chrome.browser.ServiceTabLauncher;
+@@ -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.TabDelegateFactory;
+ import org.chromium.chrome.browser.tab.TabAssociatedApp;
+ import org.chromium.chrome.browser.tab.TabBuilder;
 +import org.chromium.chrome.browser.tab.TabObserver;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
- import org.chromium.chrome.browser.util.IntentUtils;
-@@ -36,6 +39,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+ import org.chromium.chrome.browser.tab.TabDelegateFactory;
+ import org.chromium.chrome.browser.tab.TabParentIntent;
+ import org.chromium.chrome.browser.tab.TabRedirectHandler;
+@@ -37,6 +40,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
  
      private final ChromeActivity mActivity;
      private final boolean mIncognito;
@@ -238,7 +252,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
      }
  
      @Override
-@@ -159,6 +168,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -171,6 +180,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                          tab.getWebContents());
              }
  
@@ -250,17 +264,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
              return tab;
          } finally {
 @@ -199,6 +212,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-         Tab tab = Tab.createLiveTab(
-                 Tab.INVALID_TAB_ID, mIncognito, mNativeWindow, type, parentId, !openInForeground);
-         tab.initialize(webContents, mTabContentManager, delegateFactory, !openInForeground, false);
+                           .setWindow(mNativeWindow)
+                           .setLaunchType(type)
+                           .build();
 +
 +        if (mExtraLogic != null) {
 +            tab.addObserver(mExtraLogic);
 +        }
 +
+         tab.initialize(webContents, delegateFactory, !openInForeground, null, false);
          mTabModel.addTab(tab, position, type);
          return true;
-     }
 @@ -242,7 +260,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
       */
      public Tab launchUrlFromExternalApp(String url, String referer, String headers,
@@ -269,9 +283,9 @@ 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
-@@ -302,6 +319,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-         tab.initialize(
-                 null, mTabContentManager, createDefaultTabDelegateFactory(), !selectTab, false);
+@@ -307,6 +324,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+                 state.isIncognito());
+         tab.initialize(null, createDefaultTabDelegateFactory(), !selectTab, state, false);
          assert state.isIncognito() == mIncognito;
 +
 +        if (mExtraLogic != null) {
@@ -284,30 +298,21 @@ 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
-@@ -676,6 +676,12 @@ CHAR-LIMIT guidelines:
-       <message name="IDS_SAFE_BROWSING_SCOUT_REPORTING_SUMMARY" desc="Body text for Chrome setting under 'Help Improve Safe Browsing'. This feature sends small amounts of data to Google about potentially-dangerous pages to help Safe Browsing improve Chrome's protection against malware and phishing.">
-         Sends some system information and page content to Google
+@@ -689,6 +689,14 @@ CHAR-LIMIT guidelines:
+         Search and site suggestions disabled
        </message>
+ 
++      <!-- always incognito -->
 +      <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
 +        Open links in incognito tabs always
 +      </message>
 +      <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
 +        Opens links in incognito tabs when you click on new tab or on a link
 +      </message>
-       <message name="IDS_SAFE_BROWSING_TITLE" desc="Title for safe browsing.">
-         Safe Browsing
-       </message>
-diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
---- a/chrome/android/java_sources.gni
-+++ b/chrome/android/java_sources.gni
-@@ -8,6 +8,7 @@ import("//device/vr/buildflags/buildflags.gni")
- import("//chrome/android/feed/feed_java_sources.gni")
- 
- chrome_java_sources = [
-+  "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java",
-   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
-   "java/src/org/chromium/chrome/browser/ActivityTabTaskDescriptionHelper.java",
-   "java/src/org/chromium/chrome/browser/ActivityTaskDescriptionIconGenerator.java",
++
+       <!-- Themes preferences -->
+       <message name="IDS_PREFS_THEMES" desc="Title for the Themes preferences. [CHAR-LIMIT=32]">
+         Themes
 -- 
-2.7.4
+2.11.0
 

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

@@ -1,46 +1,66 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 1 Aug 2018 09:19:40 +0200
-Subject: Add bookmark import/export actions in bookmarks activity and page
+Subject: Add bookmark import/export actions
 
+Add bookmark import/export actions in bookmarks activity and page
+Reduce permissions needed for bookmarks import/export
+Completely remove contacts picker permission from the file dialog
 ---
+ chrome/android/java/AndroidManifest.xml            |   1 -
  .../java/res/menu/bookmark_action_bar_menu.xml     |  14 ++
  .../browser/bookmarks/BookmarkActionBar.java       |  12 ++
- .../chrome/browser/bookmarks/BookmarkActivity.java |  19 ++
- .../chrome/browser/bookmarks/BookmarkBridge.java   |  21 ++
+ .../chrome/browser/bookmarks/BookmarkActivity.java |  15 ++
+ .../chrome/browser/bookmarks/BookmarkBridge.java   |  46 +++++
  .../chrome/browser/bookmarks/BookmarkDelegate.java |  10 +
  .../chrome/browser/bookmarks/BookmarkManager.java  |  20 ++
  .../chrome/browser/bookmarks/BookmarkPage.java     |   1 +
  .../java/strings/android_chrome_strings.grd        |   6 +
  chrome/browser/BUILD.gn                            |   8 +-
- .../browser/android/bookmarks/bookmark_bridge.cc   | 219 +++++++++++++++++++++
- chrome/browser/android/bookmarks/bookmark_bridge.h |  19 +-
- chrome/browser/importer/profile_writer.cc          |   2 +
+ .../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 +
  chrome/common/BUILD.gn                             |   3 +
  chrome/utility/BUILD.gn                            |   7 +-
  chrome/utility/importer/bookmark_html_reader.cc    |  27 ++-
  chrome/utility/importer/bookmark_html_reader.h     |   9 +
- 16 files changed, 387 insertions(+), 10 deletions(-)
+ .../src/org/chromium/ui/base/SelectFileDialog.java |  18 +-
+ 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, 446 insertions(+), 14 deletions(-)
 
+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
+@@ -34,7 +34,6 @@ by a child template that "extends" this file.
+     {% endif %}
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH"/>
+     <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN"/>
+-    <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
+     <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
+     <!-- notouch build doesn't support downloads home and shouldn't need this permission -->
+     {% set notouch_build = notouch_build|default(0) %}
 diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 --- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 +++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
 @@ -22,6 +22,20 @@
              app:showAsAction="ifRoom"
-             app:iconTint="@color/dark_mode_tint" />
+             app:iconTint="@color/standard_mode_tint" />
          <item
 +            android:id="@+id/import_menu_id"
-+            android:icon="@drawable/add_circle_blue"
++            android:icon="@drawable/ic_folder_blue_24dp"
 +            android:title="@string/import_bookmarks"
 +            android:visible="true"
 +            app:showAsAction="ifRoom"
-+            app:iconTint="@color/dark_mode_tint" />
++            app:iconTint="@color/standard_mode_tint" />
 +        <item
 +            android:id="@+id/export_menu_id"
 +            android:icon="@drawable/ic_file_download_white_24dp"
 +            android:title="@string/export_bookmarks"
 +            android:visible="true"
 +            app:showAsAction="ifRoom"
-+            app:iconTint="@color/dark_mode_tint" />
++            app:iconTint="@color/standard_mode_tint" />
 +        <item
              android:id="@+id/close_menu_id"
              android:icon="@drawable/btn_close"
@@ -48,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
-@@ -82,6 +82,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;
@@ -61,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          }
  
          SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
-@@ -125,6 +131,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);
@@ -70,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);
      }
-@@ -134,6 +142,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -150,6 +158,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          super.showNormalView();
  
          if (mDelegate == null) {
@@ -79,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);
          }
-@@ -166,6 +176,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);
  
@@ -93,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
 @@ -12,6 +12,7 @@ import org.chromium.base.VisibleForTesting;
  import org.chromium.chrome.browser.SnackbarActivity;
- import org.chromium.chrome.browser.UrlConstants;
+ import org.chromium.chrome.browser.util.UrlConstants;
  import org.chromium.components.bookmarks.BookmarkId;
 +import org.chromium.ui.base.ActivityWindowAndroid;
  
@@ -107,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
      public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
  
-@@ -32,6 +34,22 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -32,6 +34,18 @@ public class BookmarkActivity extends SnackbarActivity {
          if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
          mBookmarkManager.updateForUrl(url);
          setContentView(mBookmarkManager.getView());
@@ -116,10 +136,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState);
 +        mWindowAndroid.restoreInstanceState(savedInstanceState);
 +        mBookmarkManager.setWindow(mWindowAndroid);
-+        // Set up the animation placeholder to be the SurfaceView. This disables the
-+        // SurfaceView's 'hole' clipping during animations that are notified to the window.
-+//        mWindowAndroid.setAnimationPlaceholderView(
-+//                mBookmarkManager.getContentViewRenderView().getSurfaceView());
 +    }
 +
 +    @Override
@@ -130,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      }
  
      @Override
-@@ -48,6 +66,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -48,6 +62,7 @@ public class BookmarkActivity extends SnackbarActivity {
      @Override
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
@@ -141,15 +157,35 @@ 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/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -18,6 +18,7 @@ import org.chromium.chrome.browser.profiles.Profile;
+@@ -4,7 +4,11 @@
+ 
+ package org.chromium.chrome.browser.bookmarks;
+ 
++import android.content.Intent;
++import android.content.Context;
++import android.net.Uri;
+ import android.os.SystemClock;
++import android.provider.Browser;
+ import android.text.TextUtils;
+ import android.util.Pair;
+ 
+@@ -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;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.components.bookmarks.BookmarkId;
  import org.chromium.components.bookmarks.BookmarkType;
  import org.chromium.components.url_formatter.UrlFormatter;
++import org.chromium.ui.base.PageTransition;
 +import org.chromium.ui.base.WindowAndroid;
  
  import java.util.ArrayList;
  import java.util.List;
-@@ -508,6 +509,24 @@ public class BookmarkBridge {
+@@ -525,6 +533,24 @@ public class BookmarkBridge {
      }
  
      /**
@@ -158,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);
 +    }
 +
 +    /**
@@ -167,26 +203,51 @@ 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.
-@@ -906,6 +925,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);
+@@ -877,6 +903,24 @@ public class BookmarkBridge {
+         depthList.add(depth);
+     }
+ 
++    @CalledByNative
++    public void bookmarksExported(String bookmarksPath) {
++        Context context = ContextUtils.getApplicationContext();
++
++        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("file://" + bookmarksPath));
++        intent.putExtra(Browser.EXTRA_APPLICATION_ID,
++                        context.getPackageName());
++        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
++        intent.putExtra(IntentHandler.EXTRA_PAGE_TRANSITION_TYPE, PageTransition.AUTO_BOOKMARK);
++
++        // If the bookmark manager is shown in a tab on a phone (rather than in a separate
++        // activity) the component name may be null. Send the intent through
++        // ChromeLauncherActivity instead to avoid crashing. See crbug.com/615012.
++        intent.setClass(context, ChromeLauncherActivity.class);
++
++        IntentHandler.startActivityForTrustedIntent(intent);
++    }
++
+     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++) {
+@@ -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
-@@ -69,6 +69,16 @@ interface BookmarkDelegate {
+@@ -70,6 +70,16 @@ interface BookmarkDelegate {
      void openSearchUI();
  
      /**
@@ -207,14 +268,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 @@ -22,6 +22,7 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.BasicNativePage;
+ import org.chromium.chrome.browser.ChromeFeatureList;
  import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
  import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;
 +import org.chromium.chrome.browser.ChromeActivity;
  import org.chromium.chrome.browser.favicon.LargeIconBridge;
- import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
- import org.chromium.chrome.browser.profiles.Profile;
-@@ -31,6 +32,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
+ import org.chromium.chrome.browser.gesturenav.HistoryNavigationDelegate;
+ import org.chromium.chrome.browser.native_page.BasicNativePage;
+@@ -34,6 +35,7 @@ import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
  import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
  import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
  import org.chromium.components.bookmarks.BookmarkId;
@@ -222,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  
  import java.util.Stack;
  
-@@ -55,6 +57,7 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+@@ -58,6 +60,7 @@ public class BookmarkManager
      private Activity mActivity;
      private ViewGroup mMainView;
      private BookmarkModel mBookmarkModel;
@@ -230,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;
-@@ -267,6 +270,13 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+@@ -362,6 +365,13 @@ public class BookmarkManager
      }
  
      /**
@@ -244,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
       * @return Current URL representing the UI state of bookmark manager. If no state has been shown
       *         yet in this session, on phone return last used state stored in preference; on tablet
       *         return the url previously set by {@link #updateForUrl(String)}.
-@@ -414,6 +424,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+@@ -523,6 +533,16 @@ public class BookmarkManager
      }
  
      @Override
@@ -268,14 +329,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          mManager = new BookmarkManager(
                  activity, false, ((SnackbarManageable) activity).getSnackbarManager());
          mManager.setBasicNativePage(this);
-+        mManager.setWindow(activity.getWindowAndroid());
++	mManager.setWindow(activity.getWindowAndroid());
+         mManager.setHistoryNavigationDelegate(host.createHistoryNavigationDelegate());
          mTitle = activity.getString(R.string.bookmarks);
      }
- 
 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
-@@ -209,6 +209,12 @@ CHAR-LIMIT guidelines:
+@@ -236,6 +236,12 @@ CHAR-LIMIT guidelines:
        <message name="IDS_SEARCH" desc="The label for a search button.">
          Search
        </message>
@@ -291,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
-@@ -137,6 +137,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",
@@ -301,9 +362,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 +    "bookmarks/bookmark_html_writer.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
-     "bookmarks/bookmark_stats.cc",
-@@ -2479,8 +2483,6 @@ jumbo_split_static_library("browser") {
-       "banners/app_banner_infobar_delegate_desktop.h",
+     "bookmarks/chrome_bookmark_client.cc",
+@@ -3006,8 +3010,6 @@ jumbo_split_static_library("browser") {
+       "badging/badge_manager_factory.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
 -      "bookmarks/bookmark_html_writer.cc",
@@ -311,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",
-@@ -2569,8 +2571,6 @@ jumbo_split_static_library("browser") {
+@@ -3114,8 +3116,6 @@ jumbo_split_static_library("browser") {
        "importer/importer_uma.h",
        "importer/in_process_importer_bridge.cc",
        "importer/in_process_importer_bridge.h",
@@ -323,52 +384,29 @@ 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
-@@ -9,18 +9,29 @@
- 
- #include <memory>
+@@ -41,6 +41,21 @@
+ #include "components/undo/undo_manager.h"
+ #include "content/public/browser/browser_thread.h"
  
 +#include "base/android/content_uri_utils.h"
- #include "base/android/jni_array.h"
- #include "base/android/jni_string.h"
 +#include "base/android/path_utils.h"
- #include "base/containers/stack.h"
- #include "base/containers/stack_container.h"
- #include "base/i18n/string_compare.h"
 +#include "base/strings/utf_string_conversions.h"
 +#include "chrome/utility/importer/bookmark_html_reader.h"
 +#include "chrome/browser/bookmarks/bookmark_html_writer.h"
- #include "chrome/browser/bookmarks/bookmark_model_factory.h"
- #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 +#include "chrome/browser/importer/profile_writer.h"
 +#include "chrome/browser/platform_util.h"
 +#include "chrome/browser/ui/chrome_select_file_policy.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profile_android.h"
- #include "chrome/browser/signin/signin_manager_factory.h"
- #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 +#include "chrome/common/importer/imported_bookmark_entry.h"
 +#include "chrome/common/importer/importer_data_types.h"
 +#include "chrome/common/url_constants.h"
- #include "components/bookmarks/browser/bookmark_model.h"
- #include "components/bookmarks/browser/bookmark_utils.h"
- #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
-@@ -30,11 +41,14 @@
- #include "components/bookmarks/managed/managed_bookmark_service.h"
- #include "components/prefs/pref_service.h"
- #include "components/query_parser/query_parser.h"
 +#include "components/search_engines/template_url.h"
- #include "components/signin/core/browser/signin_manager.h"
- #include "components/undo/bookmark_undo_service.h"
- #include "components/undo/undo_manager.h"
 +#include "components/url_formatter/url_fixer.h"
- #include "content/public/browser/browser_thread.h"
- #include "jni/BookmarkBridge_jni.h"
 +#include "ui/android/window_android.h"
- 
++
  using base::android::AttachCurrentThread;
  using base::android::ConvertUTF8ToJavaString;
-@@ -53,6 +67,57 @@ using bookmarks::BookmarkPermanentNode;
+ using base::android::ConvertUTF16ToJavaString;
+@@ -58,6 +73,56 @@ using bookmarks::BookmarkPermanentNode;
  using bookmarks::BookmarkType;
  using content::BrowserThread;
  
@@ -383,7 +421,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +
 +  // Filter out the URLs with unsupported schemes.
 +  const char* const kInvalidSchemes[] = {"wyciwyg", "place"};
-+  for (size_t i = 0; i < arraysize(kInvalidSchemes); ++i) {
++  for (size_t i = 0; i < base::size(kInvalidSchemes); ++i) {
 +    if (url.SchemeIs(kInvalidSchemes[i]))
 +      return false;
 +  }
@@ -396,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()));
@@ -426,7 +463,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
  namespace {
  
  class BookmarkTitleComparer {
-@@ -129,6 +194,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -134,6 +199,10 @@ BookmarkBridge::~BookmarkBridge() {
    bookmark_model_->RemoveObserver(this);
    if (partner_bookmarks_shim_)
      partner_bookmarks_shim_->RemoveObserver(this);
@@ -437,7 +474,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -470,6 +539,156 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -475,6 +544,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -445,6 +482,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +                                       const JavaParamRef<jobject>& obj,
 +                                       const JavaParamRef<jobject>& java_window) {
 +  DCHECK(IsLoaded());
++  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 +
 +  ui::WindowAndroid* window =
 +      ui::WindowAndroid::FromJavaWindowAndroid(java_window);
@@ -453,48 +491,46 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  select_file_dialog_ = ui::SelectFileDialog::Create(
 +    this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
 +
-+  //NOTE: extension and description are not used on Android
++  //NOTE: extension and description are not used on Android, thus not set
 +  ui::SelectFileDialog::FileTypeInfo file_type_info;
-+  file_type_info.extensions.resize(1);
-+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
-+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
-+  file_type_info.extension_description_overrides.push_back(base::ASCIIToUTF16("Netscape Bookmark"));
-+  file_type_info.allowed_paths =
-+      ui::SelectFileDialog::FileTypeInfo::NATIVE_OR_DRIVE_PATH;
 +
-+  const base::FilePath file_path;
++  const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
++
++  // Android needs the original MIME types and an additional capture value.
++  std::pair<std::vector<base::string16>, bool> accept_types =
++      std::make_pair(v_accept_types, /* use_media_capture */ false);
 +
 +  select_file_dialog_->SelectFile(
 +        ui::SelectFileDialog::SELECT_OPEN_FILE,
 +        base::string16(),
-+        file_path,
-+        NULL,
++        export_path_,
++        &file_type_info,
 +        0,
 +        base::FilePath::StringType(),
 +        window,
-+        NULL);
-+}
-+
-+void ExporterCallback(Profile* profile, const base::FilePath& path) {
-+  bookmark_html_writer::WriteBookmarks(profile, path, NULL);
-+  //NOTE: nothing will be written if write permission has not been granted before
-+  LOG(INFO) << "Bookmarks exported successfully in " << path;
++        &accept_types
++  );
 +}
 +
 +void BookmarkBridge::ExportBookmarks(JNIEnv* env,
 +                                       const JavaParamRef<jobject>& obj) {
 +  DCHECK(IsLoaded());
-+  base::FilePath path;
-+  if (!base::android::GetDownloadsDirectory(&path)) {
-+    LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
-+    return;
++  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
++
++  if (export_path_.empty()) {
++    if (!base::android::GetDownloadsDirectory(&export_path_)) {
++      LOG(ERROR) << "Could not retrieve downloads directory for bookmarks export";
++      return;
++    }
++    export_path_ = export_path_.Append(FILE_PATH_LITERAL("bookmarks.html"));
 +  }
 +
-+  path = path.Append(FILE_PATH_LITERAL("bookmarks.html"));
++  bookmark_html_writer::WriteBookmarks(profile_, export_path_, NULL);
 +
-+//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
-+//                            base::BindOnce(&ExporterCallback, profile_, path));
-+  ExporterCallback(profile_, path);
++  Java_BookmarkBridge_bookmarksExported(env, obj, ConvertUTF8ToJavaString(env, export_path_.MaybeAsASCII()));
++
++  //NOTE: nothing will be written if write permission has not been granted before
++  LOG(INFO) << "Bookmarks exported successfully to " << export_path_;
 +}
 +
 +// Attempts to create a TemplateURL from the provided data. |title| is optional.
@@ -513,8 +549,44 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  return std::make_unique<TemplateURL>(data);
 +}
 +
-+void ImporterCallback(Profile* profile, const base::FilePath& path, const std::string& contents) {
-+  // this import logic comes from BookmarksFileImporter class
++void BookmarkBridge::FileSelected(const base::FilePath& path, int index,
++                            void* params) {
++  base::File file;
++  if (path.IsContentUri()) {
++    file = base::OpenContentUriForRead(path);
++  } else {
++    file.Initialize(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
++  }
++  if (!file.IsValid()) {
++    select_file_dialog_->ShowToast("Cannot open bookmarks file for import");
++    return;
++  }
++
++  auto fileLength = file.GetLength();
++  if (-1 == fileLength) {
++    select_file_dialog_->ShowToast("Cannot read bookmarks file length");
++    return;
++  }
++
++  if (fileLength > 10 * 1024 * 1024) {
++    select_file_dialog_->ShowToast("Bookmark file is bigger than 10MB");
++    return;
++  }
++
++  std::vector<char> buffer(fileLength);
++  if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
++    select_file_dialog_->ShowToast("Could not read bookmarks file");
++    return;
++  }
++
++  if (buffer.empty()) {
++    select_file_dialog_->ShowToast("Empty bookmarks file");
++    return;
++  }
++
++  std::string contents(buffer.begin(), buffer.end());
++
++  // the following import logic comes from BookmarksFileImporter class
 +  std::vector<ImportedBookmarkEntry> bookmarks;
 +  std::vector<importer::SearchEngineInfo> search_engines;
 +
@@ -526,11 +598,11 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +      &search_engines,
 +      nullptr);
 +
-+  // writing to profile will begin extensive changes and use the same bookmarks model for persisting changes
-+  auto *writer = new ProfileWriter(profile);
++  auto *writer = new ProfileWriter(profile_);
 +
 +  if (!bookmarks.empty()) {
-+    writer->AddBookmarks(bookmarks, base::ASCIIToUTF16("Imported"));
++    // adding bookmarks will begin extensive changes to the model
++    writer->AddBookmarksWithModel(bookmark_model_, bookmarks, base::ASCIIToUTF16("Imported"));
 +  }
 +  if (!search_engines.empty()) {
 +    TemplateURLService::OwnedTemplateURLVector owned_template_urls;
@@ -543,49 +615,10 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +    writer->AddKeywords(std::move(owned_template_urls), false);
 +  }
 +
++  select_file_dialog_->ShowToast("Bookmarks import complete");
++
 +  LOG(INFO) << "Imported " << bookmarks.size() << " bookmarks and " <<
-+		search_engines.size() << " search engines from " << path;
-+}
-+
-+void BookmarkBridge::FileSelected(const base::FilePath& path, int index,
-+                            void* params) {
-+  base::File file;
-+  if (path.IsContentUri()) {
-+    file = base::OpenContentUriForRead(path);
-+  } else {
-+    file.Initialize(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-+  }
-+  if (!file.IsValid()) {
-+    LOG(ERROR) << "Cannot open bookmarks file for import";
-+    return;
-+  }
-+
-+  auto fileLength = file.GetLength();
-+  if (-1 == fileLength) {
-+    LOG(ERROR) << "Cannot read bookmarks file length";
-+    return;
-+  }
-+
-+  if (fileLength > 10 * 1024 * 1024) {
-+    LOG(ERROR) << "Bookmarks file is too big";
-+    return;
-+  }
-+
-+  std::vector<char> buffer(fileLength);
-+  if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
-+    LOG(ERROR) << "Could not read bookmarks file";
-+    return;
-+  }
-+
-+  if (buffer.empty()) {
-+    LOG(ERROR) << "Empty bookmarks file";
-+    return;
-+  }
-+
-+  std::string content(buffer.begin(), buffer.end());
-+//  base::PostTaskWithTraits(FROM_HERE, {base::MayBlock()},
-+//                            base::BindOnce(&ImporterCallback, profile_, path, content));
-+  ImporterCallback(profile_, path, content);
++		search_engines.size() << " search engines from " << path.MaybeAsASCII();
 +}
 +
 +void BookmarkBridge::FileSelectionCanceled(void* params) {
@@ -597,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"
@@ -606,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,
@@ -616,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);
  
@@ -626,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);
-@@ -116,6 +125,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);
  
@@ -643,7 +676,14 @@ 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,6 +283,7 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -274,12 +290,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+   void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
+ 
+   Profile* profile_;
++  base::FilePath export_path_;
+   JavaObjectWeakGlobalRef weak_java_ref_;
+   bookmarks::BookmarkModel* bookmark_model_;  // weak
+   bookmarks::ManagedBookmarkService* managed_bookmark_service_;  // weak
    std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
        grouped_bookmark_actions_;
    PrefChangeRegistrar pref_change_registrar_;
@@ -654,7 +694,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
 diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
 --- a/chrome/browser/importer/profile_writer.cc
 +++ b/chrome/browser/importer/profile_writer.cc
-@@ -109,12 +109,14 @@ void ProfileWriter::AddHistoryPage(const history::URLRows& page,
+@@ -96,12 +96,14 @@ void ProfileWriter::AddHistoryPage(const history::URLRows& page,
      HistoryServiceFactory::GetForProfile(profile_,
                                           ServiceAccessType::EXPLICIT_ACCESS)
          ->AddPagesWithDetails(page, visit_source);
@@ -662,17 +702,57 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer
    // Measure the size of the history page after Auto Import on first run.
    if (first_run::IsChromeFirstRun() &&
        visit_source == history::SOURCE_IE_IMPORTED) {
-     UMA_HISTOGRAM_COUNTS("Import.ImportedHistorySize.AutoImportFromIE",
-                          page.size());
+     UMA_HISTOGRAM_COUNTS_1M("Import.ImportedHistorySize.AutoImportFromIE",
+                             page.size());
    }
 +#endif
  }
  
  void ProfileWriter::AddHomepage(const GURL& home_page) {
+@@ -122,6 +124,16 @@ void ProfileWriter::AddBookmarks(
+     return;
+ 
+   BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
++  AddBookmarksWithModel(model, bookmarks, top_level_folder_name);
++}
++
++void ProfileWriter::AddBookmarksWithModel(
++    BookmarkModel* model,
++    const std::vector<ImportedBookmarkEntry>& bookmarks,
++    const base::string16& top_level_folder_name) {
++  if (bookmarks.empty())
++    return;
++
+   DCHECK(model->loaded());
+ 
+   // If the bookmark bar is currently empty, we should import directly to it.
+diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h
+--- a/chrome/browser/importer/profile_writer.h
++++ b/chrome/browser/importer/profile_writer.h
+@@ -12,6 +12,7 @@
+ #include "base/strings/string16.h"
+ #include "base/time/time.h"
+ #include "build/build_config.h"
++#include "components/bookmarks/browser/bookmark_model.h"
+ #include "components/favicon_base/favicon_usage_data.h"
+ #include "components/history/core/browser/history_types.h"
+ #include "components/search_engines/template_url_service.h"
+@@ -67,6 +68,11 @@ class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> {
+       const std::vector<ImportedBookmarkEntry>& bookmarks,
+       const base::string16& top_level_folder_name);
+ 
++  virtual void AddBookmarksWithModel(
++      bookmarks::BookmarkModel* model,
++      const std::vector<ImportedBookmarkEntry>& bookmarks,
++      const base::string16& top_level_folder_name);
++
+   virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);
+ 
+   // Adds the TemplateURLs in |template_urls| to the local store.
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -436,6 +436,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",
@@ -685,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
-@@ -55,8 +55,6 @@ static_library("utility") {
+@@ -66,8 +66,6 @@ static_library("utility") {
  
    if (!is_android) {
      sources += [
@@ -694,8 +774,8 @@ 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",
-@@ -158,6 +156,11 @@ static_library("utility") {
-     ]
+@@ -160,6 +158,11 @@ static_library("utility") {
+     }
    }
  
 +  sources += [
@@ -812,6 +892,123 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
  // Returns true if |url| should be imported as a search engine, i.e. because it
  // has replacement terms. Chrome treats such bookmarks as search engines rather
  // than true bookmarks.
+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
+@@ -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;
++import org.chromium.ui.widget.Toast;
+ import org.chromium.ui.UiUtils;
+ 
+ import java.io.File;
+@@ -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/";
++    private static final String HTML_TYPE = "text/html";
+     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 + "*";
+@@ -130,6 +132,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+         mFileTypes = fileTypes;
+     }
+ 
++    @CalledByNative
++    private void showToast(String message) {
++        Toast.makeText(ContextUtils.getApplicationContext(), message, Toast.LENGTH_LONG).show();
++    }
++
+     /**
+      * Creates and starts an intent based on the passed fileTypes and capture value.
+      * @param fileTypes MIME types requested (i.e. "image/*")
+@@ -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();
+-        if (shouldUsePhotoPicker) {
++        if (shouldUsePhotoPicker || shouldShowHtmlTypes()) {
+             if (!window.hasPermission(storagePermission)) missingPermissions.add(storagePermission);
+         } else {
+             if (((mSupportsImageCapture && shouldShowImageTypes())
+@@ -185,7 +192,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+                         }
+ 
+                         // TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
+-                        if (shouldUsePhotoPicker) {
++                        if (shouldUsePhotoPicker || shouldShowHtmlTypes()) {
+                             if (permissions.length != requestPermissions.length) {
+                                 throw new RuntimeException(
+                                         String.format("Permissions arrays misaligned: %d != %d",
+@@ -199,7 +206,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+                             }
+                         }
+ 
+-                        if (shouldUsePhotoPicker && permissions[i].equals(storagePermission)) {
++                        if ((shouldUsePhotoPicker || shouldShowHtmlTypes()) && permissions[i].equals(storagePermission)) {
+                             onFileNotSelected();
+                             return;
+                         }
+@@ -348,6 +355,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+             }
+             if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
+         }
++        if (mimeTypes.size() == 0) return null;
+         return mimeTypes;
+     }
+ 
+@@ -625,6 +633,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+         return countAcceptTypesFor(specificType) > 0;
+     }
+ 
++    private boolean shouldShowHtmlTypes() {
++        return countAcceptTypesFor(HTML_TYPE) > 0;
++    }
++
+     private boolean shouldShowImageTypes() {
+         return shouldShowTypes(ALL_IMAGE_TYPES, IMAGE_TYPE);
+     }
+diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
+--- a/ui/shell_dialogs/select_file_dialog.h
++++ b/ui/shell_dialogs/select_file_dialog.h
+@@ -192,6 +192,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
+                   void* params);
+   bool HasMultipleFileTypeChoices();
+ 
++  virtual void ShowToast(const std::string& message) = 0;
++
+  protected:
+   friend class base::RefCountedThreadSafe<SelectFileDialog>;
+ 
+diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
+--- a/ui/shell_dialogs/select_file_dialog_android.cc
++++ b/ui/shell_dialogs/select_file_dialog_android.cc
+@@ -139,6 +139,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+                                    owning_window->GetJavaObject());
+ }
+ 
++void SelectFileDialogImpl::ShowToast(const std::string& message) {
++  JNIEnv* env = base::android::AttachCurrentThread();
++
++  Java_SelectFileDialog_showToast(env, java_object_, base::android::ConvertUTF8ToJavaString(env, message));
++}
++
+ SelectFileDialogImpl::~SelectFileDialogImpl() {
+ }
+ 
+diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
+--- a/ui/shell_dialogs/select_file_dialog_android.h
++++ b/ui/shell_dialogs/select_file_dialog_android.h
+@@ -55,6 +55,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
+                       gfx::NativeWindow owning_window,
+                       void* params) override;
+ 
++  void ShowToast(const std::string& message) override;
++
+  protected:
+   ~SelectFileDialogImpl() override;
+ 
 -- 
-2.7.4
+2.11.0
 

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

@@ -3,17 +3,17 @@ Date: Wed, 29 Aug 2018 11:03:44 +0200
 Subject: Add custom tab intents privacy option
 
 ---
- chrome/android/java/res/values/values.xml                      |  3 +++
- chrome/android/java/res/xml/privacy_preferences.xml            |  5 +++++
- .../org/chromium/chrome/browser/LaunchIntentDispatcher.java    |  2 ++
- .../chrome/browser/preferences/privacy/PrivacyPreferences.java | 10 ++++++++++
- chrome/android/java/strings/android_chrome_strings.grd         |  7 +++++++
- 5 files changed, 27 insertions(+)
+ chrome/android/java/res/values/values.xml                     |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml           |  5 +++++
+ .../org/chromium/chrome/browser/LaunchIntentDispatcher.java   |  2 ++
+ .../browser/preferences/privacy/PrivacyPreferences.java       | 11 +++++++++++
+ chrome/android/java/strings/android_chrome_strings.grd        |  7 +++++++
+ 5 files changed, 28 insertions(+)
 
 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,88 +26,89 @@ 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
-@@ -52,6 +52,11 @@
-         android:title="@string/clear_browsing_data_title"
-         android:summary="@string/clear_browsing_data_summary"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
+@@ -30,6 +30,11 @@
+         android:title="@string/preload_pages_title"
+         android:summary="@string/preload_pages_summary"
+         android:persistent="false" />
 +    <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.TextMessageWithLinkAndIconPreference
-         android:key="sync_and_services_link"
-         android:summary="@string/privacy_sync_and_services_link"/>
+     <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/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
-@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.metrics.MediaNotificationUma;
- 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;
 +import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
-@@ -274,6 +275,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+ import org.chromium.chrome.browser.util.FeatureUtilities;
+@@ -273,6 +274,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
 +        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacyPreferences.PREF_ALLOW_CUSTOM_TAB_INTENTS, false)) return false;
-         if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
-                 || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
-             return false;
+         // CCT is disabled in noTouch mode except for some Chrome-internal exceptions.
+         if (FeatureUtilities.isNoTouchModeEnabled()
+                 && !IntentHandler.wasIntentSenderChrome(intent)) {
 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
-@@ -41,6 +41,7 @@ public class PrivacyPreferences extends PreferenceFragment
-             "safe_browsing_extended_reporting";
-     private static final String PREF_SAFE_BROWSING_SCOUT_REPORTING =
-             "safe_browsing_scout_reporting";
+@@ -43,6 +43,8 @@ public class PrivacyPreferences
+ 
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+ 
 +    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
-     private static final String PREF_SAFE_BROWSING = "safe_browsing";
-     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
-@@ -134,6 +135,11 @@ public class PrivacyPreferences extends PreferenceFragment
-                     ? PREF_SAFE_BROWSING_EXTENDED_REPORTING : PREF_SAFE_BROWSING_SCOUT_REPORTING;
-         preferenceScreen.removePreference(findPreference(extended_reporting_pref_to_remove));
++
+     @Override
+     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
+@@ -99,6 +101,10 @@ public class PrivacyPreferences
+         String key = preference.getKey();
+         if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setSearchSuggestEnabled((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();
+         }
+ 
+         return true;
+@@ -134,6 +140,11 @@ public class PrivacyPreferences
+                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
+         }
  
 +        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
 +                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
 +        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
 +        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
-         ChromeBaseCheckBoxPreference safeBrowsingPref =
-                 (ChromeBaseCheckBoxPreference) findPreference(PREF_SAFE_BROWSING);
-         safeBrowsingPref.setOnPreferenceChangeListener(this);
-@@ -153,6 +159,10 @@ public class PrivacyPreferences extends PreferenceFragment
-                    || PREF_SAFE_BROWSING_SCOUT_REPORTING.equals(key)) {
-             PrefServiceBridge.getInstance().setSafeBrowsingExtendedReportingEnabled(
-                     (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);
-             recordNetworkPredictionEnablingUMA((boolean) newValue);
+         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
+         if (doNotTrackPref != null) {
+             doNotTrackPref.setSummary(prefServiceBridge.isDoNotTrackEnabled() ? textOn : textOff);
 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
-@@ -3615,6 +3615,13 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
-         Browse
+@@ -4026,6 +4026,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>
- 
++      <!-- Allow custom tab intents -->
 +      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
 +        Allow custom tab intents
 +      </message>
 +      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
 +        Allow applications to open custom tab intents, similar to webview.
 +      </message>
-+
-       <!-- Migration strings -->
-       <message name="IDS_UPDATING_CHROME" desc="String that indicates that Chrome is updating">
-         Updating Chrome...
+ 
+       <!-- Autofill Assistant preferences -->
+       <message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR-LIMIT=32]">
 -- 
-2.7.4
+2.11.0
 

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

@@ -13,7 +13,7 @@ Corrected Exit functionality
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -78,6 +78,8 @@
+@@ -80,6 +80,8 @@
              android:title="@string/menu_help" />
          <item android:id="@+id/enter_vr_id"
              android:title="@string/enter_vr" />
@@ -25,19 +25,19 @@ 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
-@@ -2022,6 +2022,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             RecordUserAction.record("MobileMenuSettings");
-         } else if (id == R.id.show_menu) {
-             showAppMenuForKeyboardEvent();
+@@ -2137,6 +2137,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+                     new AddToHomescreenManager(this, currentTab);
+             addToHomescreenManager.start();
+             RecordUserAction.record("MobileMenuAddToHomescreen");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
-         } else if (id == R.id.find_in_page_id) {
-             if (mFindToolbarManager == null) return false;
- 
+         } else if (id == R.id.open_webapk_id) {
+             Context context = ContextUtils.getApplicationContext();
+             String packageName =
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
-@@ -87,7 +87,11 @@ class ChromeLifetimeController implements ApplicationLifetime.Observer,
+@@ -82,7 +82,11 @@ class ChromeLifetimeController implements ApplicationLifetime.Observer,
  
          // Kick off a timer to kill the process after a delay, which fires only if the Activities
          // take too long to be finished.
@@ -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
-@@ -2837,6 +2837,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2953,6 +2953,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>
@@ -64,5 +64,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
          Close all tabs
        </message>
 -- 
-2.7.4
+2.11.0
 

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

@@ -6,19 +6,20 @@ With the introduction of this flag it is possible to increase the maximum
 allowed connections per host; this can however be detrimental to devices
 with limited CPU/memory resources and it is disabled by default.
 ---
- chrome/browser/about_flags.cc                            |  8 ++++++++
- chrome/browser/flag_descriptions.cc                      |  4 ++++
- chrome/browser/flag_descriptions.h                       |  3 +++
- .../common/network_features.cc                           |  3 +++
- .../common/network_features.h                            |  4 ++++
- .../common/network_switch_list.h                         |  4 ++++
- net/socket/client_socket_pool_manager.cc                 | 16 ++++++++++++++++
- 7 files changed, 42 insertions(+)
+ chrome/browser/about_flags.cc                           |  8 ++++++++
+ chrome/browser/flag_descriptions.cc                     |  4 ++++
+ chrome/browser/flag_descriptions.h                      |  3 +++
+ .../common/network_features.cc                          |  3 +++
+ .../common/network_features.h                           |  4 ++++
+ .../common/network_switch_list.h                        |  4 ++++
+ .../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
-@@ -839,6 +839,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -676,6 +676,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
       net::kEffectiveConnectionType4G},
  };
  
@@ -30,22 +31,22 @@ 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 ==
-@@ -2432,6 +2437,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kMaterialDesignIncognitoNTPName,
-      flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(features::kMaterialDesignIncognitoNTP)},
+@@ -2533,6 +2538,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kPassiveDocumentEventListenersName,
+      flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
 +    {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
 +     flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
 +     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
-     {"safe-search-url-reporting",
-      flag_descriptions::kSafeSearchUrlReportingName,
-      flag_descriptions::kSafeSearchUrlReportingDescription, kOsAll,
+     {"document-passive-wheel-event-listeners",
+      flag_descriptions::kPassiveDocumentWheelEventListenersName,
+      flag_descriptions::kPassiveDocumentWheelEventListenersDescription, kOsAll,
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1065,6 +1065,10 @@ const char kMaterialDesignIncognitoNTPDescription[] =
-     "If enabled, the Incognito New Tab page uses the new material design with "
-     "a better readable text.";
+@@ -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";
  
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -57,9 +58,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
-@@ -667,6 +667,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
- extern const char kMaterialDesignIncognitoNTPName[];
- extern const char kMaterialDesignIncognitoNTPDescription[];
+@@ -761,6 +761,9 @@ extern const char kMarkHttpAsWarning[];
+ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
+ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
  
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -77,9 +78,9 @@ diff --git a/components/network_session_configurator/common/network_features.cc
 +const char kMaxConnectionsPerHostChoiceDefault[] = "6",
 +                 kMaxConnectionsPerHostChoice15[] = "15";
 +
- const base::Feature kTokenBinding{"token-binding",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ const char kDnsOverHttpsChoiceDefault[] = "Disabled",
+                  kDnsOverHttpsChoiceGoogle[] = "Google",
+                  kDnsOverHttpsChoiceCloudflare[] = "Cloudflare",
 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
@@ -91,13 +92,13 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 +                 kMaxConnectionsPerHostChoice6[],
 +                 kMaxConnectionsPerHostChoice15[];
 +
- // Enables token binding
- // (https://www.ietf.org/id/draft-ietf-tokbind-protocol-04.txt).
- NETWORK_SESSION_CONFIGURATOR_EXPORT extern const base::Feature kTokenBinding;
+ // 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 char kDnsOverHttpsChoiceDefault[],
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
-@@ -21,6 +21,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
+@@ -22,6 +22,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
  // Enables the QUIC protocol.  This is a temporary testing flag.
  NETWORK_SWITCH(kEnableQuic, "enable-quic")
  
@@ -105,32 +106,35 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 +// (15 instead of 6, mirroring the value Mozilla uses).
 +NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
 +
- // Enable use of experimental TCP sockets API for sending data in the
- // SYN packet.
- NETWORK_SWITCH(kEnableTcpFastOpen, "enable-tcp-fastopen")
+ // Ignores certificate-related errors.
+ NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors")
+ 
+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",
++    "//components/network_session_configurator/common"
+   ]
+   if (is_ios) {
+     libs = [ "UIKit.framework" ]
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -6,8 +6,10 @@
- 
- #include <memory>
- 
-+#include "base/command_line.h"
- #include "base/logging.h"
- #include "base/strings/stringprintf.h"
-+#include "base/strings/string_number_conversions.h"
- #include "net/base/load_flags.h"
- #include "net/http/http_proxy_client_socket_pool.h"
- #include "net/http/http_request_info.h"
-@@ -19,6 +21,7 @@
- #include "net/socket/ssl_client_socket_pool.h"
- #include "net/socket/transport_client_socket_pool.h"
+@@ -20,6 +20,10 @@
+ #include "net/socket/client_socket_pool.h"
+ #include "net/socket/connect_job.h"
  #include "net/ssl/ssl_config.h"
 +#include "components/network_session_configurator/common/network_switches.h"
++
++#include "base/command_line.h"
++#include "base/strings/string_number_conversions.h"
  
  namespace net {
  
-@@ -316,6 +319,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);
@@ -151,5 +155,5 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  }
  
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,84 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 25 Oct 2018 23:13:34 +0200
+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       | 8 ++++----
+ chrome/browser/flag_descriptions.cc | 5 +++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ media/base/media_switches.cc        | 6 +-----
+ 4 files changed, 13 insertions(+), 9 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)},
+@@ -1603,10 +1607,6 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kAppNotificationStatusMessaging)},
+ #endif  // OS_ANDROID
+     {"enable-devtools-experiments", flag_descriptions::kDevtoolsExperimentsName,
+-    {"resume-background-video",
+-     flag_descriptions::kResumeBackgroundVideoName,
+-     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
+-     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
+      flag_descriptions::kDevtoolsExperimentsDescription, kOsDesktop,
+      SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)},
+     {"silent-debugger-extension-api",
+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
+@@ -876,6 +876,11 @@ const char kMemlogStackModeNative[] = "Native";
+ const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
+ const char kMemlogStackModePseudo[] = "Trace events";
+ 
++const char kResumeBackgroundVideoName[] = "Resume background video.";
++const char kResumeBackgroundVideoDescription[] =
++    "Resume background video playback when tab re-gains focus; additionally, "
++    "it will pause video playback every single time you switch tabs.";
++
+ const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording";
+ const char kEnablePixelCanvasRecordingDescription[] =
+     "Pixel canvas recording allows the compositor to raster contents aligned "
+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
+@@ -520,6 +520,9 @@ extern const char kEnablePortalsDescription[];
+ extern const char kEnablePictureInPictureName[];
+ extern const char kEnablePictureInPictureDescription[];
+ 
++extern const char kResumeBackgroundVideoName[];
++extern const char kResumeBackgroundVideoDescription[];
++
+ extern const char kEnablePixelCanvasRecordingName[];
+ extern const char kEnablePixelCanvasRecordingDescription[];
+ 
+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
+@@ -212,11 +212,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+ // when in background.
+ const base::Feature kResumeBackgroundVideo {
+   "resume-background-video",
+-#if defined(OS_ANDROID)
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
++   base::FEATURE_DISABLED_BY_DEFAULT
+ };
+ 
+ // Enable Media Capabilities with finch-parameters.
+-- 
+2.11.0
+

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

@@ -0,0 +1,156 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+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/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
+@@ -3193,6 +3193,11 @@ const FeatureEntry kFeatureEntries[] = {
+          kMarkHttpAsFeatureVariations,
+          "HTTPReallyBadFinal")},
+ 
++    {"ipv6-probing",
++     flag_descriptions::kIPv6ProbingName,
++     flag_descriptions::kIPv6ProbingDescription, kOsAll,
++     FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
++
+ #if !defined(OS_ANDROID)
+     {"enable-web-authentication-testing-api",
+      flag_descriptions::kEnableWebAuthenticationTestingAPIName,
+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
+@@ -2512,6 +2512,10 @@ const char kForegroundNotificationManagerDescription[] =
+ const char kHomePageButtonName[] = "Force Enable Home Page Button";
+ const char kHomePageButtonDescription[] = "Displays a home button if enabled.";
+ 
++const char kIPv6ProbingName[] = "Enable IPv6 probing.";
++const char kIPv6ProbingDescription[] =
++    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
++
+ const char kHomepageTileName[] =
+     "Enable Homepage tile shown in Suggested Tiles";
+ const char kHomepageTileDescription[] =
+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
+@@ -523,6 +523,9 @@ extern const char kEnableNewDownloadBackendDescription[];
+ extern const char kEnablePortalsName[];
+ extern const char kEnablePortalsDescription[];
+ 
++extern const char kIPv6ProbingName[];
++extern const char kIPv6ProbingDescription[];
++
+ extern const char kEnablePictureInPictureName[];
+ extern const char kEnablePictureInPictureDescription[];
+ 
+diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresource_filter/tools/BUILD.gn
+--- a/components/subresource_filter/tools/BUILD.gn
++++ b/components/subresource_filter/tools/BUILD.gn
+@@ -52,6 +52,8 @@ if (!is_ios) {
+     deps = [
+       ":tools_lib",
+       "//base",
++      "//components/network_session_configurator/common",
++      "//services/network/public/cpp"
+     ]
+   }
+ 
+@@ -65,6 +67,8 @@ if (!is_ios) {
+       ":tools_lib",
+       "../core/common",
+       "//base",
++      "//components/network_session_configurator/common",
++      "//services/network/public/cpp",
+     ]
+   }
+ 
+@@ -76,6 +80,8 @@ if (!is_ios) {
+       "ruleset_converter:support",
+       "//base",
+       "//third_party/protobuf:protobuf_lite",
++      "//components/network_session_configurator/common",
++      "//services/network/public/cpp"
+     ]
+   }
+ 
+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",
+-    "//components/network_session_configurator/common"
++    "//components/network_session_configurator/common",
++    "//services/network/public/cpp",
+   ]
+   if (is_ios) {
+     libs = [ "UIKit.framework" ]
+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
+@@ -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"
++#include "services/network/public/cpp/features.h"
+ #include "url/url_canon_ip.h"
+ 
+ #if BUILDFLAG(ENABLE_MDNS)
+@@ -3209,8 +3210,13 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+   bool cached = true;
+   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
+       kIPv6ProbePeriodMs) {
+-    last_ipv6_probe_result_ =
+-        IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
++    if (!base::FeatureList::IsEnabled(network::features::kIPv6Probing)) {
++      // pretend IPv6 connectivy probe is successful when probing is disabled
++      last_ipv6_probe_result_ = true;
++    } else {
++      last_ipv6_probe_result_ =
++          IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
++    }
+     last_ipv6_probe_time_ = tick_clock_->NowTicks();
+     cached = false;
+   }
+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
+@@ -46,6 +46,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
+ const base::Feature kThrottleDelayable{"ThrottleDelayable",
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
+ 
++// Enable IPv6 ping probes to RIPE DNS.
++const base::Feature kIPv6Probing{"IPv6Probing",
++                                       base::FEATURE_ENABLED_BY_DEFAULT};
++
+ // When kPriorityRequestsDelayableOnSlowConnections is enabled, HTTP
+ // requests fetched from a SPDY/QUIC/H2 proxies can be delayed by the
+ // ResourceScheduler just as HTTP/1.1 resources are. However, requests from such
+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
+@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kNetworkService;
+ COMPONENT_EXPORT(NETWORK_CPP)
++extern const base::Feature kIPv6Probing;
++COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kOutOfBlinkCors;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kReporting;
+-- 
+2.11.0
+

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

@@ -0,0 +1,184 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:29:53 +0200
+Subject: Add flags to disable device motion and orientation APIs
+
+Both flags will be disabled by default and prevent usage of gyroscope and
+legacy acceleration events.
+---
+ chrome/browser/about_flags.cc                                  |  6 ++++++
+ chrome/browser/flag_descriptions.cc                            |  8 ++++++++
+ chrome/browser/flag_descriptions.h                             |  6 ++++++
+ content/child/runtime_features.cc                              |  3 +++
+ content/public/common/content_features.cc                      | 10 ++++++++++
+ content/public/common/content_features.h                       |  2 ++
+ third_party/blink/public/platform/web_runtime_features.h       |  2 ++
+ third_party/blink/renderer/modules/modules_initializer.cc      |  9 ++++++---
+ .../blink/renderer/platform/exported/web_runtime_features.cc   |  8 ++++++++
+ .../blink/renderer/platform/runtime_enabled_features.json5     |  8 ++++++++
+ 10 files changed, 59 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
+@@ -1593,6 +1593,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-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
+@@ -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[] =
++    "Enable device motion API which is used to detect changes in acceleration";
++
++const char kEnableDeviceOrientationName[] = "Enable device orientation";
++const char kEnableDeviceOrientationDescription[] =
++    "Enable device orientation API which is used to detect changes in orientation";
++
+ const char kEnableGenericSensorExtraClassesName[] =
+     "Generic Sensor Extra Classes";
+ const char kEnableGenericSensorExtraClassesDescription[] =
+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
+@@ -398,6 +398,12 @@ extern const char kEnableTLS13EarlyDataDescription[];
+ extern const char kWinrtSensorsImplementationName[];
+ extern const char kWinrtSensorsImplementationDescription[];
+ 
++extern const char kEnableDeviceMotionName[];
++extern const char kEnableDeviceMotionDescription[];
++
++extern const char kEnableDeviceOrientationName[];
++extern const char kEnableDeviceOrientationDescription[];
++
+ extern const char kEnableGenericSensorExtraClassesName[];
+ extern const char kEnableGenericSensorExtraClassesDescription[];
+ 
+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
+@@ -84,6 +84,9 @@ void SetIndividualRuntimeFeatures(
+       base::FeatureList::IsEnabled(features::kSharedArrayBuffer) ||
+       base::FeatureList::IsEnabled(features::kWebAssemblyThreads));
+ 
++  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
++  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
++
+   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
+     WebRuntimeFeatures::EnableSharedWorker(false);
+ 
+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
+@@ -685,6 +685,16 @@ const base::Feature kExperimentalProductivityFeatures{
+ // TODO(rouslan): Remove this.
+ const base::Feature kWebPayments{"WebPayments",
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
++// Enables the device motion API used to track device acceleration;
++// no user authorization or notifications happens when in use.
++const base::Feature kDeviceMotion{"DeviceMotion",
++                                    base::FEATURE_DISABLED_BY_DEFAULT};
++
++// Enables the device orientation API used to track device orientation;
++// no user authorization or notifications happens when in use.
++const base::Feature kDeviceOrientation{"DeviceOrientation",
++                                    base::FEATURE_DISABLED_BY_DEFAULT};
++
+ 
+ // Makes WebRTC use ECDSA certs by default (i.e., when no cert type was
+ // specified in JS).
+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
+@@ -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;
+ 
++CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
++
+ #if defined(OS_ANDROID)
+ CONTENT_EXPORT extern const base::Feature kAndroidAutofillAccessibility;
+ CONTENT_EXPORT extern const base::Feature
+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
+@@ -91,6 +91,8 @@ class WebRuntimeFeatures {
+   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 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
+@@ -244,9 +244,12 @@ void ModulesInitializer::InitInspectorAgentSession(
+ void ModulesInitializer::OnClearWindowObjectInMainWorld(
+     Document& document,
+     const Settings& settings) const {
+-  DeviceMotionController::From(document);
+-  DeviceOrientationController::From(document);
+-  DeviceOrientationAbsoluteController::From(document);
++  if (RuntimeEnabledFeatures::DeviceMotionEnabled())
++    DeviceMotionController::From(document);
++  if (RuntimeEnabledFeatures::DeviceOrientationEnabled()) {
++    DeviceOrientationController::From(document);
++    DeviceOrientationAbsoluteController::From(document);
++  }
+   NavigatorGamepad::From(document);
+   NavigatorServiceWorker::From(document);
+   DOMWindowStorageController::From(document);
+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
+@@ -160,6 +160,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
+   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
+ }
+ 
++void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
++  RuntimeEnabledFeatures::SetDeviceMotionEnabled(enable);
++}
++
++void WebRuntimeFeatures::EnableDeviceOrientation(bool enable) {
++  RuntimeEnabledFeatures::SetDeviceOrientationEnabled(enable);
++}
++
+ void WebRuntimeFeatures::EnableKeyboardFocusableScrollers(bool enable) {
+   RuntimeEnabledFeatures::SetKeyboardFocusableScrollersEnabled(enable);
+ }
+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
+@@ -1119,6 +1119,14 @@
+       status: "experimental",
+     },
+     {
++      name: "DeviceMotion",
++      status: "stable",
++    },
++    {
++      name: "DeviceOrientation",
++      status: "stable",
++    },
++    {
+       name: "OnDeviceChange",
+       // Android does not yet support SystemMonitor.
+       status: {"Android": "", "default": "stable"},
+-- 
+2.11.0
+

build/patches/Add-global-menu-entry-to-toggle-AdBlocker.patch

@@ -0,0 +1,193 @@
+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
+
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
+ chrome/android/java/res/menu/main_menu.xml         | 11 ++++++
+ .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
+ .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java     | 40 ++++++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  2 ++
+ .../java/strings/android_chrome_strings.grd        | 11 ++++++
+ 7 files changed, 92 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/menu/custom_tabs_menu.xml
++++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
+@@ -75,6 +75,18 @@
+                   android:checkable="true" />
+           </menu>
+         </item>
++        <item android:id="@+id/enable_adblock_row_menu_id"
++            android:title="@null"
++            android:orderInCategory="2">
++          <menu>
++              <item android:id="@+id/enable_adblock_id"
++                  android:title="@string/menu_enable_adblock" />
++              <item android:id="@+id/enable_adblock_check_id"
++                  android:title="@null"
++                  android:checkable="true" />
++          </menu>
++        </item>
++
+         <!-- Title is intentionally left blank in xml and will be set in java. -->
+         <item android:id="@+id/open_in_browser_id"
+             android:title=""
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
++++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -84,6 +84,17 @@
+           </menu>
+         </item>
+ 
++        <item android:id="@+id/enable_adblock_row_menu_id"
++            android:title="@null">
++          <menu>
++              <item android:id="@+id/enable_adblock_id"
++                  android:title="@string/menu_enable_adblock" />
++              <item android:id="@+id/enable_adblock_check_id"
++                  android:title="@null"
++                  android:checkable="true" />
++          </menu>
++        </item>
++
+         <item android:id="@+id/reader_mode_prefs_id"
+             android:title="@string/menu_reader_mode_prefs"
+             android:icon="@drawable/reader_mode_prefs_icon" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -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());
++        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
++            final boolean reloadOnChange = !currentTab.isNativePage();
++            final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled);
++            if (reloadOnChange) {
++                currentTab.reload();
++            }
++            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else {
+             return false;
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -1757,6 +1757,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+                 reportNewTabShortcutUsed(true);
+                 getTabCreator(true).launchNTP();
+             }
++        } else if (id == R.id.enable_adblock_id || id == R.id.enable_adblock_check_id) {
++            final boolean reloadOnChange = !currentTab.isNativePage();
++            final boolean adblockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, adblockEnabled);
++            if (reloadOnChange) {
++                currentTab.reload();
++            }
++            RecordUserAction.record("MobileMenuRequestEnableAdBlock");
+         } else if (id == R.id.all_bookmarks_menu_id) {
+             if (currentTab != null) {
+                 getCompositorViewHolder().hideKeyboard(() -> {
+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
+@@ -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.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;
+@@ -224,6 +225,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+             // Prepare translate menu button.
+             prepareTranslateMenuItem(menu, currentTab);
+ 
++            updateEnableAdBlockMenuItem(menu, currentTab);
++
+             // 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
+@@ -299,6 +302,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                 PrefServiceBridge.getInstance().isIncognitoModeManaged());
+     }
+ 
++     /**
++     * Updates the enable AdBlock item's state.
++     *
++     * @param menu {@link Menu} for enable adblock
++     * @param currentTab      Current tab being displayed.
++     */
++    protected void updateEnableAdBlockMenuItem(
++            Menu menu, Tab currentTab) {
++        MenuItem enableMenuRow = menu.findItem(R.id.enable_adblock_row_menu_id);
++        MenuItem enableMenuLabel = menu.findItem(R.id.enable_adblock_id);
++        MenuItem enableMenuCheck = menu.findItem(R.id.enable_adblock_check_id);
++
++
++        // Hide enable adblock on all chrome:// pages except for the NTP.
++        String url = currentTab.getUrl();
++        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
++                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
++        // Also hide enable javascsript on Reader Mode.
++        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
++
++        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
++        enableMenuRow.setVisible(itemVisible);
++        if (!itemVisible) return;
++
++        boolean adBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
++
++        // Mark the checkbox if adblock is globally activate.
++        enableMenuCheck.setChecked(adBlockEnabled);
++
++        // This title doesn't seem to be displayed by Android, but it is used to set up
++        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
++        enableMenuLabel.setTitleCondensed(adBlockEnabled
++                        ? mContext.getString(R.string.menu_enable_adblock_on)
++                        : mContext.getString(R.string.menu_enable_adblock_off));
++    }
++
++
+     /**
+      * Sets the visibility and labels of the "Add to Home screen" and "Open WebAPK" menu items.
+      */
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
+@@ -201,6 +201,8 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+                 }
+             }
+ 
++            updateEnableAdBlockMenuItem(menu, currentTab);
++
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+             updateEnableJavascriptMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -2958,6 +2958,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>
++      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Enable AdBlock is selected.">
++        Turn off AdBlock
++      </message>
++      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Enable AdBlock is unselected.">
++        Turn on AdBlock
++      </message>
++
+       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
+         Appearance
+       </message>
+-- 
+2.11.0
+

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

@@ -3,13 +3,13 @@ Date: Wed, 18 Oct 2017 21:26:53 +0200
 Subject: Add menu option to toggle global Javascript preference
 
 ---
- chrome/android/java/res/menu/custom_tabs_menu.xml  | 13 ++++++++
+ chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
  chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
  .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
  .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../browser/appmenu/AppMenuPropertiesDelegate.java | 38 ++++++++++++++++++++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java     | 39 ++++++++++++++++++++++
  .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../java/strings/android_chrome_strings.grd        | 11 +++++++
+ .../java/strings/android_chrome_strings.grd        | 11 ++++++
  7 files changed, 92 insertions(+)
 
 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
@@ -23,10 +23,10 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
          <item android:id="@+id/request_desktop_site_row_menu_id"
              android:title="@null"
              android:orderInCategory="2">
-@@ -61,6 +62,18 @@
-           </menu>
-         </item>
- 
+@@ -63,6 +64,17 @@
+         <item android:id="@+id/translate_id"
+           android:title="@string/menu_translate"
+           android:orderInCategory="2"/>
 +        <item android:id="@+id/enable_javascript_row_menu_id"
 +            android:title="@null"
 +            android:orderInCategory="2">
@@ -38,14 +38,13 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 +                  android:checkable="true" />
 +          </menu>
 +        </item>
-+
          <!-- Title is intentionally left blank in xml and will be set in java. -->
          <item android:id="@+id/open_in_browser_id"
              android:title=""
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -59,6 +59,7 @@
+@@ -61,6 +61,7 @@
              android:title="@string/menu_add_to_homescreen" />
          <item android:id="@+id/open_webapk_id"
              android:title="@string/menu_open_webapk" />
@@ -53,7 +52,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/request_desktop_site_row_menu_id"
              android:title="@null">
            <menu>
-@@ -69,6 +70,18 @@
+@@ -71,6 +72,18 @@
                  android:checkable="true" />
            </menu>
          </item>
@@ -75,9 +74,9 @@ 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
-@@ -2114,6 +2114,14 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             final boolean usingDesktopUserAgent = currentTab.getUseDesktopUserAgent();
-             currentTab.setUseDesktopUserAgent(!usingDesktopUserAgent, reloadOnChange);
+@@ -2149,6 +2149,14 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             currentTab.getWebContents().getNavigationController().setUseDesktopUserAgent(
+                     !usingDesktopUserAgent, reloadOnChange);
              RecordUserAction.record("MobileMenuRequestDesktopSite");
 +        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
 +            final boolean reloadOnChange = !currentTab.isNativePage();
@@ -93,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
-@@ -1707,6 +1707,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");
@@ -108,18 +107,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.open_recently_closed_tab) {
              TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
              if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
-@@ -24,6 +24,7 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeActivity;
- import org.chromium.chrome.browser.ChromeSwitches;
-+import org.chromium.chrome.browser.ContentSettingsType;
- import org.chromium.chrome.browser.ShortcutHelper;
- import org.chromium.chrome.browser.UrlConstants;
- import org.chromium.chrome.browser.banners.AppBannerManager;
-@@ -196,6 +197,8 @@ public class AppMenuPropertiesDelegate {
+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
+@@ -241,6 +241,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
  
              updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
  
@@ -128,10 +119,11 @@ 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()));
-@@ -418,6 +421,41 @@ public class AppMenuPropertiesDelegate {
+@@ -432,6 +434,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         }
      }
  
-     /**
++     /**
 +     * Updates the enable JavaScript item's state.
 +     *
 +     * @param menu {@link Menu} for enable javascript
@@ -162,18 +154,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +        // This title doesn't seem to be displayed by Android, but it is used to set up
 +        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
 +        enableMenuLabel.setTitleCondensed(jsEnabled
-+                        ? mActivity.getString(R.string.menu_enable_javascript_on)
-+                        : mActivity.getString(R.string.menu_enable_javascript_off));
++                        ? mContext.getString(R.string.menu_enable_javascript_on)
++                        : mContext.getString(R.string.menu_enable_javascript_off));
 +    }
 +
-+    /**
-      * A notification that the header view has finished inflating.
-      * @param view The view that was inflated.
-      * @param appMenu The menu the view is inside of.
++
++
+     /**
+      * Updates the request desktop site item's state.
+      *
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -165,6 +165,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -202,6 +202,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
              }
  
              updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
@@ -184,7 +177,7 @@ 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
-@@ -2822,6 +2822,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
+@@ -2938,6 +2938,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>
@@ -203,5 +196,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
          Desktop site
        </message>
 -- 
-2.7.4
+2.11.0
 

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

@@ -1,19 +1,19 @@
-From: samartnik <artem@brave.com>
-Date: Tue, 17 Apr 2018 17:14:00 +0300
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 7 Sep 2019 15:07:42 +0200
 Subject: Add option to not persist tabs across sessions
 
 ---
- chrome/android/java/res/values/values.xml                  |  3 +++
- chrome/android/java/res/xml/privacy_preferences.xml        |  5 +++++
- .../org/chromium/chrome/browser/ChromeTabbedActivity.java  |  4 +++-
- .../browser/preferences/privacy/PrivacyPreferences.java    | 14 ++++++++++++++
- chrome/android/java/strings/android_chrome_strings.grd     |  6 ++++++
- 5 files changed, 31 insertions(+), 1 deletion(-)
+ chrome/android/java/res/values/values.xml                    |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml          |  5 +++++
+ .../org/chromium/chrome/browser/ChromeTabbedActivity.java    |  4 +++-
+ .../browser/preferences/privacy/PrivacyPreferences.java      | 12 ++++++++++++
+ chrome/android/java/strings/android_chrome_strings.grd       |  6 ++++++
+ 5 files changed, 29 insertions(+), 1 deletion(-)
 
 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
-@@ -15,6 +15,11 @@
-         android:summary="@string/search_suggestions_summary"
-         android:defaultValue="true" />
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+@@ -39,6 +39,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="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
 +        android:summary="@string/close_tabs_on_exit_summary"
 +        android:defaultValue="false" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
-         android:key="safe_browsing_extended_reporting"
-         android:title="@string/safe_browsing_extended_reporting_title"
-         android:summary="@string/safe_browsing_extended_reporting_summary" />
+     <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/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
-@@ -1037,8 +1037,10 @@ public class ChromeTabbedActivity
+@@ -1166,8 +1166,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -62,55 +62,53 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
  
 +import android.content.SharedPreferences;
  import android.os.Bundle;
- import android.preference.CheckBoxPreference;
- import android.preference.Preference;
-@@ -15,6 +16,7 @@ import android.view.Menu;
+ import android.support.graphics.drawable.VectorDrawableCompat;
+ import android.support.v7.preference.CheckBoxPreference;
+@@ -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.metrics.RecordHistogram;
+ import org.chromium.base.BuildInfo;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -46,6 +48,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -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 = "network_predictions";
 +    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_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
      private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-@@ -145,6 +148,11 @@ public class PrivacyPreferences extends PreferenceFragment
-         safeBrowsingPref.setOnPreferenceChangeListener(this);
-         safeBrowsingPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
  
-+        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
-+        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
-+        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-+
-         updateSummaries();
-     }
- 
-@@ -171,6 +179,12 @@ public class PrivacyPreferences extends PreferenceFragment
-         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-             PrefServiceBridge.getInstance().setBoolean(
-                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+@@ -105,6 +108,10 @@ public class PrivacyPreferences
+             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+             sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
+             sharedPreferencesEditor.apply();
 +        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
-+//            PrefServiceBridge.getInstance().setBoolean(
-+//                    Pref.CLOSE_TABS_ON_EXIT_ENABLED, (boolean) newValue);
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
          }
  
          return true;
+@@ -155,6 +162,11 @@ public class PrivacyPreferences
+             boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
+             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
+         }
++
++        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
++                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
++        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
++        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+     }
+ 
+     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
-@@ -3655,6 +3655,12 @@ However, you aren’t invisible. Going incognito doesn’t hide your browsing fr
-       <message name="IDS_NEAR_OOM_INTERVENTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can resume what it was doing.">
-          Resume
+@@ -3770,6 +3770,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>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
 +        Close all open tabs on exit
@@ -118,9 +116,9 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
 +        Don't persist tabs between browsing sessions
 +      </message>
-     </messages>
-   </release>
- </grit>
+       <message name="IDS_CONTEXTMENU_LINK_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 link.">
+         LINK
+       </message>
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,205 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 18 Mar 2019 21:47:12 +0100
+Subject: Add option to use home page as NTP
+
+Use about:blank as default homepage
+---
+ .../android/java/res/xml/homepage_preferences.xml  |  5 +++++
+ .../partnercustomizations/HomepageManager.java     | 24 ++++++++++++++++++++--
+ .../browser/preferences/HomepagePreferences.java   | 10 +++++++++
+ .../chrome/browser/tabmodel/TabCreatorManager.java | 11 ++++++++--
+ .../java/strings/android_chrome_strings.grd        |  3 +++
+ chrome/browser/ui/browser_ui_prefs.cc              |  2 ++
+ chrome/common/pref_names.cc                        |  4 ++++
+ chrome/common/pref_names.h                         |  1 +
+ 8 files changed, 56 insertions(+), 4 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
+--- a/chrome/android/java/res/xml/homepage_preferences.xml
++++ b/chrome/android/java/res/xml/homepage_preferences.xml
+@@ -7,6 +7,11 @@
+     xmlns:android="http://schemas.android.com/apk/res/android">
+ 
+     <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
+         android:key="homepage_switch"
+         android:summaryOn="@string/text_on"
+         android:summaryOff="@string/text_off" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+@@ -32,6 +32,7 @@ public class HomepageManager {
+     }
+ 
+     private static final String PREF_HOMEPAGE_ENABLED = "homepage";
++    public static final String PREF_NTP_IS_HOMEPAGE = "newtabpage_is_homepage";
+     private static final String PREF_HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";
+     private static final String PREF_HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
+ 
+@@ -91,7 +92,8 @@ public class HomepageManager {
+      */
+     public static boolean shouldCloseAppWithZeroTabs() {
+         return HomepageManager.isHomepageEnabled()
+-                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri());
++                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri())
++                && (HomepageManager.getHomepageUri() != UrlConstants.CHROME_BLANK_URL);
+     }
+ 
+     /**
+@@ -111,7 +113,7 @@ public class HomepageManager {
+      * @return The default homepage URI.
+      */
+     public static String getDefaultHomepageUri() {
+-        return UrlConstants.NTP_NON_NATIVE_URL;
++        return UrlConstants.CHROME_BLANK_URL;
+     }
+ 
+     /**
+@@ -125,6 +127,14 @@ public class HomepageManager {
+     }
+ 
+     /**
++     * Returns the user preference for whether the New Tab Page is the homepage or not.
++     *
++     */
++    public boolean getPrefNTPIsHomepageEnabled() {
++        return mSharedPreferences.getBoolean(PREF_NTP_IS_HOMEPAGE, false);
++    }
++
++    /**
+      * Sets the user preference for whether the homepage is enabled.
+      */
+     public void setPrefHomepageEnabled(boolean enabled) {
+@@ -138,6 +148,16 @@ public class HomepageManager {
+     }
+ 
+     /**
++     * Sets the user preference for whether the new tab page is the homepage or not.
++     */
++    public void setPrefNTPIsHomepageEnabled(boolean enabled) {
++        SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
++        sharedPreferencesEditor.putBoolean(PREF_NTP_IS_HOMEPAGE, enabled);
++        sharedPreferencesEditor.apply();
++        notifyHomepageUpdated();
++    }
++
++    /**
+      * @return User specified homepage custom URI string.
+      */
+     public String getPrefHomepageCustomUri() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java
+@@ -20,6 +20,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
+     @VisibleForTesting
+     public static final String PREF_HOMEPAGE_SWITCH = "homepage_switch";
+     private static final String PREF_HOMEPAGE_EDIT = "homepage_edit";
++    private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch";
+ 
+     private HomepageManager mHomepageManager;
+     private Preference mHomepageEdit;
+@@ -42,6 +43,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
+             return true;
+         });
+ 
++        ChromeSwitchPreference mNTPIsHomepageSwitch =
++                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
++        boolean isHomepageNTPEnabled = mHomepageManager.getPrefNTPIsHomepageEnabled();
++        mNTPIsHomepageSwitch.setChecked(isHomepageNTPEnabled);
++        mNTPIsHomepageSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
++            mHomepageManager.setPrefNTPIsHomepageEnabled((boolean) newValue);
++            return true;
++        });
++
+         mHomepageEdit = findPreference(PREF_HOMEPAGE_EDIT);
+         updateCurrentHomepageUrl();
+     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
+@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.tab.TabState;
+ import org.chromium.chrome.browser.util.UrlConstants;
+ import org.chromium.content_public.browser.LoadUrlParams;
+ import org.chromium.content_public.browser.WebContents;
++import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
+ 
+ /**
+  * An interface to return a {@link TabCreator} either for regular or incognito tabs.
+@@ -85,12 +86,18 @@ public interface TabCreatorManager {
+         }
+ 
+         /**
+-         * Creates a new tab and loads the NTP.
++         * Creates a new tab and loads the NTP or the homepage, depending on user preferences.
+          */
+         public final void launchNTP() {
+             try {
++                String newTabURL;
++                if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
++                   newTabURL = HomepageManager.getHomepageUri();
++                } else {
++                   newTabURL = UrlConstants.NTP_URL;
++                }
+                 TraceEvent.begin("TabCreator.launchNTP");
+-                launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
++                launchUrl(newTabURL, TabLaunchType.FROM_CHROME_UI);
+             } finally {
+                 TraceEvent.end("TabCreator.launchNTP");
+             }
+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
+@@ -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>
++      <message name="IDS_OPTIONS_NTP_IS_HOMEPAGE_LABEL" desc="The label for switch that allows the user to toggle whether opening a new tab leads to the new tab page or the home page.">
++        Use for new tabs
++      </message>
+ 
+       <!-- Startup page preferences -->
+       <message name="IDS_OPTIONS_STARTUP_PAGE_TITLE" desc="The title of the setting that allows users to manage the page that opens when they start Chrome.">
+diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
+--- a/chrome/browser/ui/browser_ui_prefs.cc
++++ b/chrome/browser/ui/browser_ui_prefs.cc
+@@ -54,6 +54,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
+   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
+                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
++  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
++                                GetHomeButtonAndHomePageIsNewTabPageFlags());
+ 
+   registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
+   bool reset_check_default = false;
+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
+@@ -59,6 +59,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
+ // A boolean specifying whether the New Tab page is the home page or not.
+ const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
+ 
++// A boolean specifying whether opening a new tab should open the Home page
++// instead of the New Tab page.
++const char kNewTabPageIsHomePage[] = "newtabpage_is_homepage";
++
+ // This is the URL of the page to load when opening new tabs.
+ const char kHomePage[] = "homepage";
+ 
+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
+@@ -318,6 +318,7 @@ extern const char kSettingsShowBrowserBanner[];
+ extern const char kSettingsShowOSBanner[];
+ #endif  // defined(OS_CHROMEOS)
+ extern const char kShowHomeButton[];
++extern const char kNewTabPageIsHomePage[];
+ extern const char kSpeechRecognitionFilterProfanities[];
+ extern const char kAllowDeletingBrowserHistory[];
+ #if !defined(OS_ANDROID)
+-- 
+2.11.0
+

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

@@ -1,20 +1,20 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 28 Aug 2018 23:27:23 +0200
-Subject: Add privacy option to keep cookies until session exit
+Subject: Add site settings option for session-only cookies
 
 ---
  chrome/android/java/res/values/values.xml          |  3 +++
- .../android/java/res/xml/website_preferences.xml   |  7 +++++++
- .../browser/preferences/PrefServiceBridge.java     | 10 ++++++++++
- .../website/SingleCategoryPreferences.java         | 23 ++++++++++++++++++++++
+ .../android/java/res/xml/website_preferences.xml   |  7 ++++++
+ .../browser/preferences/PrefServiceBridge.java     | 10 +++++++++
+ .../website/SingleCategoryPreferences.java         | 21 +++++++++++++++++-
  .../java/strings/android_chrome_strings.grd        |  6 ++++++
- .../android/preferences/pref_service_bridge.cc     | 19 ++++++++++++++++++
- 6 files changed, 68 insertions(+)
+ .../android/preferences/pref_service_bridge.cc     | 25 ++++++++++++++++++++++
+ 6 files changed, 71 insertions(+), 1 deletion(-)
 
 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
-@@ -39,6 +39,9 @@
+@@ -32,6 +32,9 @@
      <integer name="reload_button_level_reload">0</integer>
      <integer name="reload_button_level_stop">1</integer>
  
@@ -27,8 +27,8 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/android/java/res/xml/website_preferences.xml
 --- a/chrome/android/java/res/xml/website_preferences.xml
 +++ b/chrome/android/java/res/xml/website_preferences.xml
-@@ -19,6 +19,13 @@
-         android:summary="@string/allow_third_party_cookies_summary"
+@@ -26,6 +26,13 @@
+         android:summary="@string/block_third_party_cookies_summary"
          android:defaultValue="true"
          android:persistent="false" />
 +    <!-- A toggle for cookies to be saved only until session exit, only shown for the Cookies category. -->
@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/res/xml/website_preferences.xml b/chrome/androi
 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
-@@ -245,6 +245,10 @@ public class PrefServiceBridge {
+@@ -242,6 +242,10 @@ public class PrefServiceBridge {
          return nativeGetBlockThirdPartyCookiesEnabled();
      }
  
@@ -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
       */
-@@ -630,6 +634,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);
      }
-@@ -1026,6 +1034,7 @@ public class PrefServiceBridge {
+@@ -1094,6 +1102,7 @@ public class PrefServiceBridge {
      private native boolean nativeGetAutoplayEnabled();
      private native boolean nativeGetBackgroundSyncEnabled();
      private native boolean nativeGetBlockThirdPartyCookiesEnabled();
@@ -74,60 +74,79 @@ 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();
-@@ -1073,6 +1082,7 @@ public class PrefServiceBridge {
-     private native void nativeSetAllowCookiesEnabled(boolean allow);
-     private native void nativeSetBackgroundSyncEnabled(boolean allow);
-     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
+@@ -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);
 +    private native void nativeSetCookiesSessionOnlyEnabled(boolean enabled);
-     private native void nativeSetClipboardEnabled(boolean allow);
+     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
+     private native void nativeSetClipboardEnabled(boolean enabled);
      private native void nativeSetDoNotTrackEnabled(boolean enabled);
-     private native void nativeSetRememberPasswordsEnabled(boolean allow);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java
-@@ -104,6 +104,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
-     // Keys for individual preferences.
-     public static final String READ_WRITE_TOGGLE_KEY = "read_write_toggle";
+@@ -127,6 +127,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+ 
+     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
      public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
 +    public static final String COOKIES_SESSION_ONLY_TOGGLE_KEY = "cookies_session_only";
      public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
      public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
      private static final String ADD_EXCEPTION_KEY = "add_exception";
-@@ -459,6 +460,7 @@ public class SingleCategoryPreferences extends PreferenceFragment
- 
-                 if (type == SiteSettingsCategory.Type.COOKIES) {
+@@ -484,6 +485,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+                 if (type == SiteSettingsCategory.Type.COOKIES
+                         && !FeatureUtilities.isNoTouchModeEnabled()) {
                      updateThirdPartyCookiesCheckBox();
 +                    updateCookiesSessionOnlyCheckBox();
                  } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
                      updateNotificationsVibrateCheckBox();
                  }
-@@ -491,6 +493,8 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -523,6 +525,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+             int setting = (int) newValue;
+             prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
              getInfoForOrigins();
-         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
-             PrefServiceBridge.getInstance().setBlockThirdPartyCookiesEnabled(!((boolean) newValue));
 +        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
-+            PrefServiceBridge.getInstance().setCookiesSessionOnlyEnabled(!((boolean) newValue));
++            prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue);
+         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
+             prefServiceBridge.setBlockThirdPartyCookiesEnabled(((boolean) newValue));
          } else if (NOTIFICATIONS_VIBRATE_TOGGLE_KEY.equals(preference.getKey())) {
-             PrefServiceBridge.getInstance().setNotificationsVibrateEnabled((boolean) newValue);
-         }
-@@ -734,6 +738,16 @@ public class SingleCategoryPreferences extends PreferenceFragment
-             getPreferenceScreen().removePreference(thirdPartyCookies);
-         }
- 
-+        // Configure/hide the keep cookies until session is over toggle, as needed.
+@@ -840,6 +844,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+         TriStateSiteSettingsPreference triStateToggle =
+                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
+         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
 +        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
 +                COOKIES_SESSION_ONLY_TOGGLE_KEY);
-+        if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
+         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
+         Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
+         PreferenceGroup allowedGroup = (PreferenceGroup) screen.findPreference(ALLOWED_GROUP);
+@@ -871,6 +877,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+ 
+         if (hideSecondaryToggles) {
+             screen.removePreference(thirdPartyCookies);
++            screen.removePreference(cookiesSessionOnly);
+             screen.removePreference(notificationsVibrate);
+             screen.removePreference(explainProtectedMediaKey);
+             screen.removePreference(allowedGroup);
+@@ -881,14 +888,17 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+             return;
+         }
+ 
+-        // Configure/hide the third-party cookies toggle, as needed.
++        // Configure/hide the third-party cookies toggle and session-only cookie toggle, as needed.
+         // We don't need this toggle in touchless. Refer to crbug/951850.
+         if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
+                 && !FeatureUtilities.isNoTouchModeEnabled()) {
+             thirdPartyCookies.setOnPreferenceChangeListener(this);
+             updateThirdPartyCookiesCheckBox();
 +            cookiesSessionOnly.setOnPreferenceChangeListener(this);
 +            updateCookiesSessionOnlyCheckBox();
-+        } else {
-+            getPreferenceScreen().removePreference(cookiesSessionOnly);
-+        }
-+
+         } else {
+             screen.removePreference(thirdPartyCookies);
++            screen.removePreference(cookiesSessionOnly);
+         }
+ 
          // Configure/hide the notifications vibrate toggle, as needed.
-         Preference notificationsVibrate =
-                 getPreferenceScreen().findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
-@@ -847,6 +861,15 @@ public class SingleCategoryPreferences extends PreferenceFragment
+@@ -1003,6 +1013,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
                  preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
      }
  
@@ -135,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 +        ChromeBaseCheckBoxPreference cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreference)
 +                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
 +        cookiesSessionOnlyPref.setChecked(
-+                !PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
++                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
 +        cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isCategoryEnabled(
 +                ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES));
 +    }
@@ -146,9 +165,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 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
-@@ -861,6 +861,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_ALLOW_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Allow Third Party Cookies preference">
-         Third-party websites can save and read cookie data
+@@ -901,6 +901,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>
 +      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_TITLE" desc="Title for Allow Cookies Session Only preference">
 +        Keep cookies only until you quit your browser
@@ -162,7 +181,7 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
 --- a/chrome/browser/android/preferences/pref_service_bridge.cc
 +++ b/chrome/browser/android/preferences/pref_service_bridge.cc
-@@ -282,6 +282,14 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
+@@ -314,6 +314,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
    return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
  }
  
@@ -171,13 +190,16 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
 +    const JavaParamRef<jobject>& obj) {
 +  HostContentSettingsMap* host_content_settings_map =
 +      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
-+  return CONTENT_SETTING_SESSION_ONLY == host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
++  auto value = host_content_settings_map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, nullptr);
++  auto enabled = CONTENT_SETTING_SESSION_ONLY == value;
++  LOG(INFO) << "GetCookiesSessionOnly := " << enabled << " (raw_value = " << value << ")";
++  return enabled;
 +}
 +
  static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesManaged(
      JNIEnv* env,
      const JavaParamRef<jobject>& obj) {
-@@ -741,6 +749,17 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
+@@ -785,6 +796,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
    GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
  }
  
@@ -187,14 +209,17 @@ diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/
 +    jboolean enabled) {
 +  HostContentSettingsMap* host_content_settings_map =
 +      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
++  LOG(INFO) << "SetCookiesSessionOnly -> " << (enabled ? "true" : "false") <<
++           "; false -> setting_allow: " << CONTENT_SETTING_ALLOW <<
++           "; true -> session_only: "   << CONTENT_SETTING_SESSION_ONLY;
 +  host_content_settings_map->SetDefaultContentSetting(
 +      CONTENT_SETTINGS_TYPE_COOKIES,
-+      enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_SESSION_ONLY);
++      enabled ? CONTENT_SETTING_SESSION_ONLY : CONTENT_SETTING_ALLOW);
 +}
 +
  static void JNI_PrefServiceBridge_SetRememberPasswordsEnabled(
      JNIEnv* env,
      const JavaParamRef<jobject>& obj,
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,68 @@
+From: AlexeyBarabash <alexey@brave.com>
+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(-)
+
+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[] = {
+      FEATURE_VALUE_TYPE(features::kAppNotificationStatusMessaging)},
+ #endif  // OS_ANDROID
+     {"enable-devtools-experiments", flag_descriptions::kDevtoolsExperimentsName,
++    {"resume-background-video",
++     flag_descriptions::kResumeBackgroundVideoName,
++     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
++     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
+      flag_descriptions::kDevtoolsExperimentsDescription, kOsDesktop,
+      SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)},
+     {"silent-debugger-extension-api",
+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
+@@ -976,6 +976,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+   return pipeline_metadata_.has_audio;
+ }
+ 
++bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
++  DCHECK(main_task_runner_->BelongsToCurrentThread());
++
++  return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
++}
++
+ void WebMediaPlayerImpl::EnabledAudioTracksChanged(
+     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
+   DCHECK(main_task_runner_->BelongsToCurrentThread());
+@@ -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.
+-  if (!HasVideo())
++
++  //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
++  //see media/base/pipeline_metadata.h. This is a workaround to allow audio
++  //streams be played in background.
++  if (!HasVideoNonEmptySize())
+     return false;
+ 
+   if (!is_background_video_playback_enabled_)
+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
+@@ -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;
++  // True is has video and it's frame size is not zero
++  bool HasVideoNonEmptySize() const;
+ 
+   void EnabledAudioTracksChanged(
+       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
+-- 
+2.11.0
+

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

@@ -0,0 +1,24 @@
+From: xsmile <xsmile@users.noreply.github.com>
+Date: Thu, 11 Oct 2018 21:29:35 +0200
+Subject: Allow website sign-in without account sign-in
+
+Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found in chrome://settings
+---
+ chrome/browser/signin/account_consistency_mode_manager.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -152,7 +152,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
+                                 false);
+ #endif
+-  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
++  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
+ }
+ 
+ // static
+-- 
+2.11.0
+

build/patches/Always-allow-partner-customisation.patch

@@ -11,7 +11,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 @@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
              @Override
-             protected Void doInBackground(Void... params) {
+             protected Void doInBackground() {
                  try {
 -                    boolean systemOrPreStable =
 -                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
@@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
                      if (isCancelled()) return null;
                      refreshIncognitoModeDisabled();
 -- 
-2.7.4
+2.11.0
 

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
-@@ -180,7 +180,7 @@ void OnAuthPrefsChanged(const std::string& pref_name) {
+@@ -244,7 +244,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;
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
 --- a/components/cronet/url_request_context_config.cc
 +++ b/components/cronet/url_request_context_config.cc
-@@ -390,7 +390,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -550,7 +550,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
          effective_experimental_options->Remove(it.key(), nullptr);
          continue;
        }
@@ -34,5 +34,5 @@ diff --git a/components/cronet/url_request_context_config.cc b/components/cronet
        const base::DictionaryValue* stale_dns_args = nullptr;
        if (!it.value().GetAsDictionary(&stale_dns_args)) {
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,234 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 17 Mar 2019 20:51:11 +0100
+Subject: Always show home page settings
+
+Remove the "Force Enable Home Page Button" flag, which was bugged, and always
+display home page settings.
+This allows removing the home page button and restoring it from settings.
+---
+ .../browser/init/ProcessInitializationHandler.java | 12 --------
+ .../partnercustomizations/HomepageManager.java     | 17 ++---------
+ .../preferences/ChromePreferenceManager.java       |  7 -----
+ .../browser/preferences/MainPreferences.java       | 12 +++-----
+ .../chrome/browser/util/FeatureUtilities.java      | 34 ----------------------
+ chrome/browser/about_flags.cc                      |  3 --
+ chrome/browser/android/chrome_feature_list.cc      |  4 ---
+ chrome/browser/android/chrome_feature_list.h       |  1 -
+ 8 files changed, 7 insertions(+), 83 deletions(-)
+
+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
+@@ -356,18 +356,6 @@ public class ProcessInitializationHandler {
+         deferredStartupHandler.addDeferredTask(new Runnable() {
+             @Override
+             public void run() {
+-                if (HomepageManager.shouldShowHomepageSetting()) {
+-                    RecordHistogram.recordBooleanHistogram("Settings.ShowHomeButtonPreferenceState",
+-                            HomepageManager.isHomepageEnabled());
+-                    RecordHistogram.recordBooleanHistogram("Settings.HomePageIsCustomized",
+-                            !HomepageManager.getInstance().getPrefHomepageUseDefaultUri());
+-                }
+-            }
+-        });
+-
+-        deferredStartupHandler.addDeferredTask(new Runnable() {
+-            @Override
+-            public void run() {
+                 // Starts syncing with GSA.
+                 AppHooks.get().createGsaHelper().startSync();
+             }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
+@@ -83,10 +83,7 @@ public class HomepageManager {
+      * @return Whether or not homepage is enabled.
+      */
+     public static boolean isHomepageEnabled() {
+-        if (FeatureUtilities.isHomePageButtonForceEnabled()) {
+-            return getInstance().getPrefHomepageEnabled();
+-        }
+-        return false;
++        return getInstance().getPrefHomepageEnabled();
+     }
+ 
+     /**
+@@ -98,13 +95,6 @@ public class HomepageManager {
+     }
+ 
+     /**
+-     * @return Whether or not homepage setting should be shown.
+-     */
+-    public static boolean shouldShowHomepageSetting() {
+-        return FeatureUtilities.isHomePageButtonForceEnabled();
+-    }
+-
+-    /**
+      * @return Homepage URI string, if it's enabled. Null otherwise or uninitialized.
+      */
+     public static String getHomepageUri() {
+@@ -118,8 +108,7 @@ public class HomepageManager {
+     }
+ 
+     /**
+-     * @return The default homepage URI if the homepage is partner provided or the new tab page
+-     *         if the homepage button is force enabled via flag.
++     * @return The default homepage URI.
+      */
+     public static String getDefaultHomepageUri() {
+         return UrlConstants.NTP_NON_NATIVE_URL;
+@@ -132,7 +121,7 @@ public class HomepageManager {
+      * @see #isHomepageEnabled
+      */
+     public boolean getPrefHomepageEnabled() {
+-        return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, true);
++        return mSharedPreferences.getBoolean(PREF_HOMEPAGE_ENABLED, false);
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java
+@@ -154,13 +154,6 @@ public class ChromePreferenceManager {
+     private static final String CHROME_MODERN_DESIGN_ENABLED_KEY = "chrome_modern_design_enabled";
+ 
+     /**
+-     * Whether or not the home page button is force enabled.
+-     * Default value is false.
+-     */
+-    public static final String HOME_PAGE_BUTTON_FORCE_ENABLED_KEY =
+-            "home_page_button_force_enabled";
+-
+-    /**
+      * Whether or not the homepage tile will be shown.
+      * Default value is false.
+      */
+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
+@@ -206,15 +206,11 @@ public class MainPreferences extends PreferenceFragmentCompat
+         updateSyncAndServicesPreference();
+         updateSearchEnginePreference();
+ 
+-        if (HomepageManager.shouldShowHomepageSetting()) {
+-            Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
+-            if (FeatureUtilities.isNewTabPageButtonEnabled()) {
+-                homepagePref.setTitle(R.string.options_startup_page_title);
+-            }
+-            setOnOffSummary(homepagePref, HomepageManager.getInstance().getPrefHomepageEnabled());
+-        } else {
+-            removePreferenceIfPresent(PREF_HOMEPAGE);
++        Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
++        if (FeatureUtilities.isNewTabPageButtonEnabled()) {
++            homepagePref.setTitle(R.string.options_startup_page_title);
+         }
++        setOnOffSummary(homepagePref, HomepageManager.getInstance().getPrefHomepageEnabled());
+ 
+         if (NightModeUtils.isNightModeSupported() && FeatureUtilities.isNightModeAvailable()) {
+             addPreferenceIfAbsent(PREF_UI_THEME);
+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
+@@ -73,7 +73,6 @@ public class FeatureUtilities {
+     private static Boolean sHasGoogleAccountAuthenticator;
+     private static Boolean sHasRecognitionIntentHandler;
+ 
+-    private static Boolean sIsHomePageButtonForceEnabled;
+     private static Boolean sIsHomepageTileEnabled;
+     private static Boolean sIsNewTabPageButtonEnabled;
+     private static Boolean sIsBottomToolbarEnabled;
+@@ -178,7 +177,6 @@ public class FeatureUtilities {
+     public static void cacheNativeFlags() {
+         cacheCommandLineOnNonRootedEnabled();
+         FirstRunUtils.cacheFirstRunPrefs();
+-        cacheHomePageButtonForceEnabled();
+         cacheHomepageTileEnabled();
+         cacheNewTabPageButtonEnabled();
+         cacheBottomToolbarEnabled();
+@@ -228,38 +226,6 @@ public class FeatureUtilities {
+         return Build.VERSION.SDK_INT > Build.VERSION_CODES.M;
+     }
+ 
+-    /**
+-     * Cache whether or not the home page button is force enabled so on next startup, the value can
+-     * be made available immediately.
+-     */
+-    public static void cacheHomePageButtonForceEnabled() {
+-        if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()) return;
+-        ChromePreferenceManager.getInstance().writeBoolean(
+-                ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY,
+-                ChromeFeatureList.isEnabled(ChromeFeatureList.HOME_PAGE_BUTTON_FORCE_ENABLED));
+-    }
+-
+-    /**
+-     * @return Whether or not the home page button is force enabled.
+-     */
+-    public static boolean isHomePageButtonForceEnabled() {
+-        if (sIsHomePageButtonForceEnabled == null) {
+-            ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
+-
+-            sIsHomePageButtonForceEnabled = prefManager.readBoolean(
+-                    ChromePreferenceManager.HOME_PAGE_BUTTON_FORCE_ENABLED_KEY, false);
+-        }
+-        return sIsHomePageButtonForceEnabled;
+-    }
+-
+-    /**
+-     * Resets whether the home page button is enabled for tests. After this is called, the next
+-     * call to #isHomePageButtonForceEnabled() will retrieve the value from shared preferences.
+-     */
+-    public static void resetHomePageButtonForceEnabledForTests() {
+-        sIsHomePageButtonForceEnabled = null;
+-    }
+-
+     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
+@@ -1932,9 +1932,6 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-chrome-duet-labels", flag_descriptions::kChromeDuetLabelsName,
+      flag_descriptions::kChromeDuetLabelsDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kChromeDuetLabeled)},
+-    {"force-enable-home-page-button", flag_descriptions::kHomePageButtonName,
+-     flag_descriptions::kHomePageButtonDescription, kOsAndroid,
+-     FEATURE_VALUE_TYPE(chrome::android::kHomePageButtonForceEnabled)},
+     {"enable-ntp-button", flag_descriptions::kNtpButtonName,
+      flag_descriptions::kNtpButtonDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kNTPButton)},
+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
+@@ -143,7 +143,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
+     &kEphemeralTab,
+     &kExploreSites,
+     &kHandleMediaIntents,
+-    &kHomePageButtonForceEnabled,
+     &kHomepageTile,
+     &kHorizontalTabSwitcherAndroid,
+     &kIdentityDisc,
+@@ -439,9 +438,6 @@ const base::Feature kForegroundNotificationManager{
+ const base::Feature kHandleMediaIntents{"HandleMediaIntents",
+                                         base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+-const base::Feature kHomePageButtonForceEnabled{
+-    "HomePageButtonForceEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
+-
+ const base::Feature kHomepageTile{"HomepageTile",
+                                   base::FEATURE_ENABLED_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
+@@ -77,7 +77,6 @@ extern const base::Feature kEphemeralTab;
+ extern const base::Feature kExploreSites;
+ extern const base::Feature kForegroundNotificationManager;
+ extern const base::Feature kHandleMediaIntents;
+-extern const base::Feature kHomePageButtonForceEnabled;
+ extern const base::Feature kHomepageTile;
+ extern const base::Feature kHorizontalTabSwitcherAndroid;
+ extern const base::Feature kIdentityDisc;
+-- 
+2.11.0
+

build/patches/Always-use-new-tab-page-for-default-home-page.patch

@@ -1,16 +1,26 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 27 Jun 2018 11:02:38 +0200
-Subject: Change default homepage to new tab page
+Subject: Always use new tab page for default home page
 
-Disable any partner-provided home page.
+Ignore any partner-provided home page.
 ---
- .../chrome/browser/partnercustomizations/HomepageManager.java      | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
+ .../chrome/browser/partnercustomizations/HomepageManager.java  | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -102,8 +102,7 @@ public class HomepageManager {
+@@ -83,8 +83,7 @@ public class HomepageManager {
+      * @return Whether or not homepage is enabled.
+      */
+     public static boolean isHomepageEnabled() {
+-        if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
+-                || FeatureUtilities.isHomePageButtonForceEnabled()) {
++        if (FeatureUtilities.isHomePageButtonForceEnabled()) {
+             return getInstance().getPrefHomepageEnabled();
+         }
+         return false;
+@@ -102,8 +101,7 @@ public class HomepageManager {
       * @return Whether or not homepage setting should be shown.
       */
      public static boolean shouldShowHomepageSetting() {
@@ -20,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
      }
  
      /**
-@@ -124,9 +123,7 @@ public class HomepageManager {
+@@ -124,9 +122,7 @@ public class HomepageManager {
       *         if the homepage button is force enabled via flag.
       */
      public static String getDefaultHomepageUri() {
@@ -32,5 +42,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
  
      /**
 -- 
-2.7.4
+2.11.0
 

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

@@ -12,45 +12,45 @@ Return fixed base latency
 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-@@ -42,10 +42,10 @@ interface AnalyserNode : AudioNode {
+@@ -43,10 +43,10 @@ interface AnalyserNode : AudioNode {
  
      // Copies the current frequency data into the passed array.
      // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
--    void getFloatFrequencyData(Float32Array array);
--    void getByteFrequencyData(Uint8Array array);
-+    //void getFloatFrequencyData(Float32Array array);
-+    //void getByteFrequencyData(Uint8Array array);
+-    [HighEntropy, Measure] void getFloatFrequencyData(Float32Array array);
+-    [HighEntropy, Measure] void getByteFrequencyData(Uint8Array array);
++    //[HighEntropy, Measure] void getFloatFrequencyData(Float32Array array);
++    //[HighEntropy, Measure] void getByteFrequencyData(Uint8Array array);
  
      // Real-time waveform data
--    void getFloatTimeDomainData(Float32Array array);
--    void getByteTimeDomainData(Uint8Array array);
-+    //void getFloatTimeDomainData(Float32Array array);
-+    //void getByteTimeDomainData(Uint8Array array);
+-    [HighEntropy, Measure] void getFloatTimeDomainData(Float32Array array);
+-    [HighEntropy, Measure] void getByteTimeDomainData(Uint8Array array);
++    //[HighEntropy, Measure] void getFloatTimeDomainData(Float32Array array);
++    //[HighEntropy, Measure] void getByteTimeDomainData(Uint8Array array);
  };
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
  
      // Channel access
      readonly attribute unsigned long numberOfChannels;
--    [RaisesException] Float32Array getChannelData(unsigned long channelIndex);
--    [RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
-+    //[RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-+    //[RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long startInChannel = 0);
-     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
+-    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
+-    [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 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
-@@ -314,6 +314,7 @@ void AudioContext::StopRendering() {
+@@ -343,6 +343,7 @@ void AudioContext::StopRendering() {
  double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());
 +  return 0.04;
  
    // TODO(hongchan): Due to the incompatible constructor between
-   // AudioDestinationNode and DefaultAudioDestinationNode, casting directly from
+   // AudioDestinationNode and RealtimeAudioDestinationNode, casting directly
 -- 
-2.7.4
+2.11.0
 

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

@@ -2,47 +2,35 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Thu, 22 Mar 2018 22:11:57 +0100
 Subject: Battery API: return nothing
 
+Include @thestinger's fix for correct charging/unknown values
 ---
- services/device/battery/battery_status_service.cc  |  2 +-
  .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
- 2 files changed, 5 insertions(+), 22 deletions(-)
+ 1 file changed, 4 insertions(+), 21 deletions(-)
 
-diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
---- a/services/device/battery/battery_status_service.cc
-+++ b/services/device/battery/battery_status_service.cc
-@@ -41,7 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
-   if (!battery_fetcher_)
-     battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
- 
--#if 0
-+#if !defined(OS_ANDROID)
-   if (callback_list_.empty()) {
-     bool success = battery_fetcher_->StartListeningBatteryChange();
-     // On failure pass the default values back.
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -42,45 +42,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+@@ -45,45 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
  }
  
  bool BatteryManager::charging() {
 -  return battery_status_.Charging();
-+  return false;
++  return true;
  }
  
  double BatteryManager::chargingTime() {
 -  return battery_status_.charging_time();
-+  return 0;
++  return 0.0;
  }
  
  double BatteryManager::dischargingTime() {
 -  return battery_status_.discharging_time();
-+  return 0;
++  return std::numeric_limits<double>::infinity();
  }
  
  double BatteryManager::level() {
 -  return battery_status_.Level();
-+  return 1;
++  return 1.0;
  }
  
  void BatteryManager::DidUpdateData() {
@@ -56,22 +44,22 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
      return;
    }
 -
--  Document* document = ToDocument(GetExecutionContext());
+-  Document* document = To<Document>(GetExecutionContext());
 -  DCHECK(document);
 -  if (document->IsContextPaused() || document->IsContextDestroyed())
 -    return;
 -
 -  if (battery_status_.Charging() != old_status.Charging())
--    DispatchEvent(Event::Create(EventTypeNames::chargingchange));
+-    DispatchEvent(*Event::Create(event_type_names::kChargingchange));
 -  if (battery_status_.charging_time() != old_status.charging_time())
--    DispatchEvent(Event::Create(EventTypeNames::chargingtimechange));
+-    DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
 -  if (battery_status_.discharging_time() != old_status.discharging_time())
--    DispatchEvent(Event::Create(EventTypeNames::dischargingtimechange));
+-    DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
 -  if (battery_status_.Level() != old_status.Level())
--    DispatchEvent(Event::Create(EventTypeNames::levelchange));
+-    DispatchEvent(*Event::Create(event_type_names::kLevelchange));
  }
  
  void BatteryManager::RegisterWithDispatcher() {
 -- 
-2.7.4
+2.11.0
 

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

@@ -4,18 +4,40 @@ Subject: Canvas: fingerprinting mitigations for image data and webGL
 
 Disable webGL renderer info and modify the color data returned by ToBlob,
 ToDataURL and getImageData so that it will contain randomly manipulated
-pixels (maximum 10) that slightly change the color of the R,G,B components
+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       | 154 +++++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.cc       | 156 +++++++++++++++++++++
  .../platform/graphics/static_bitmap_image.h        |   2 +
- 4 files changed, 163 insertions(+), 2 deletions(-)
+ 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 "base/rand_util.h"
+ #include "third_party/blink/public/common/features.h"
+@@ -817,7 +816,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+                                            GetState().GetTextAlign(), text);
+ 
+   // 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
@@ -23,7 +45,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
  
  WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
      WebGLRenderingContextBase* context) {
--  return new WebGLDebugRendererInfo(context);
+-  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
 +  return nullptr;
  }
  
@@ -33,6 +55,20 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.
  }
  
  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",
 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
@@ -44,15 +80,15 @@ diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b
 +#include "base/logging.h"
  #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
  #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
- #include "third_party/blink/renderer/platform/network/mime/mime_type_registry.h"
-@@ -129,6 +131,9 @@ bool ImageDataBuffer::EncodeImageInternal(const String& mime_type,
+ #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 == "image/jpeg") {
+   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
@@ -71,11 +107,11 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
  #include "third_party/skia/include/core/SkCanvas.h"
  #include "third_party/skia/include/core/SkImage.h"
  #include "third_party/skia/include/core/SkPaint.h"
-+#include "third_party/skia/src/core/SkColorData.h"
++#include "third_party/skia/include/private/SkColorData.h"
+ #include "third_party/skia/include/core/SkSurface.h"
  #include "third_party/skia/include/gpu/GrContext.h"
- 
- namespace blink {
-@@ -154,10 +157,161 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+ #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())));
@@ -104,8 +140,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +
 +  // cap maximum pixels to change
 +  auto pixels = (w + h) / 128;
-+  if (pixels > 10) {
-+    pixels = 10;
++  if (pixels > 20) {
++    pixels = 20;
 +  } else if (pixels < 2) {
 +    pixels = 2;
 +  }
@@ -124,7 +160,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +    int x = currentW * shuffleX, y = currentH * shuffleY;
 +
 +    // calculate randomisation amounts for each RGB component
-+    auto shuffleR = (uint8_t)base::RandInt(0, 4), shuffleG = (uint8_t)base::RandInt(0, 4), shuffleB = (uint8_t)base::RandInt(0, 4);
++    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) {
@@ -250,5 +288,5 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
  
    // Methods overridden by all sub-classes
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,32 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 12 Oct 2017 08:15:17 +0200
+Subject: Disable NTP remote suggestions by default
+
+---
+ components/ntp_snippets/features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
+--- a/components/ntp_snippets/features.cc
++++ b/components/ntp_snippets/features.cc
+@@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[] = {
+     &kOptionalImagesEnabledFeature};
+ 
+ const base::Feature kArticleSuggestionsFeature{
+-    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
++    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
+     "RemoteSuggestionsEmulateM58FetchingSchedule",
+@@ -69,7 +69,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
+ const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
+ 
+ const base::Feature kKeepPrefetchedContentSuggestions{
+-    "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
++    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kOptionalImagesEnabledFeature{
+     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
+-- 
+2.11.0
+

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

@@ -0,0 +1,50 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 23:11:56 +0100
+Subject: Disable Omaha update checks
+
+Do not consider Jelly Bean unsupported
+---
+ .../android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
+ .../java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java | 2 +-
+ chrome/browser/android/chrome_feature_list.cc                           | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+@@ -135,7 +135,7 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
++        return true;
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+@@ -42,7 +42,7 @@ public class VersionNumberGetter {
+     private static VersionNumberGetter sInstanceForTests;
+ 
+     /** If false, OmahaClient will never report that a newer version is available. */
+-    private static boolean sEnableUpdateDetection = true;
++    private static boolean sEnableUpdateDetection = false;
+ 
+     protected VersionNumberGetter() { }
+ 
+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
+@@ -465,7 +465,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
+     base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kJellyBeanSupported{"JellyBeanSupported",
+-                                        base::FEATURE_DISABLED_BY_DEFAULT};
++                                        base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kSearchEnginePromoExistingDevice{
+     "SearchEnginePromo.ExistingDevice", base::FEATURE_ENABLED_BY_DEFAULT};
+-- 
+2.11.0
+

build/patches/Disable-WebRTC-by-default.patch

@@ -9,7 +9,7 @@ Subject: Disable WebRTC by default
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -87,10 +87,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -82,10 +82,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                  false);
  #endif
    // TODO(guoweis): Remove next 2 options at M50.
@@ -21,8 +21,8 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 -                               content::kWebRTCIPHandlingDefault);
 +                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
    registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
+   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
  
-   // Dictionaries to keep track of default tasks in the file browser.
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,23 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Wed, 23 Nov 2016 09:26:51 -0500
+Subject: Disable contextual search by default
+
+---
+ chrome/browser/profiles/profile.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -145,7 +145,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+ #if defined(OS_ANDROID)
+   registry->RegisterStringPref(
+       prefs::kContextualSearchEnabled,
+-      std::string(),
++      "false",
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+ #endif  // defined(OS_ANDROID)
+   registry->RegisterBooleanPref(prefs::kSessionExitedCleanly, true);
+-- 
+2.11.0
+

build/patches/Disable-data-saver.patch

@@ -0,0 +1,59 @@
+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
+@@ -1321,9 +1321,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

@@ -0,0 +1,210 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 20 May 2019 23:14:36 +0200
+Subject: Disable dynamic module loading
+
+---
+ chrome/android/chrome_java_sources.gni             | 13 ----------
+ .../browser/customtabs/CustomTabActivity.java      | 18 -------------
+ .../customtabs/CustomTabIntentDataProvider.java    | 17 ++----------
+ .../browser/customtabs/CustomTabsConnection.java   | 30 ----------------------
+ .../CustomTabActivityComponent.java                |  4 ---
+ 5 files changed, 2 insertions(+), 80 deletions(-)
+
+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
+@@ -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",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegate.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegatePostMessageBackend.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityHostImpl.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleConstants.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleCoordinator.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleNavigationEventObserver.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModulePageLoadObserver.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleToolbarController.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleEntryPoint.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleHostImpl.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleLoader.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java",
+-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java",
+   "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
+   "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java",
+   "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarCoordinator.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
+@@ -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;
+-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
+ 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;
+@@ -136,9 +135,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+ 
+     private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
+ 
+-    @Nullable
+-    private DynamicModuleCoordinator mDynamicModuleCoordinator;
+-
+     private ActivityTabTaskDescriptionHelper mTaskDescriptionHelper;
+ 
+     private CustomTabNightModeStateController mNightModeStateController;
+@@ -308,12 +304,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+     public void finishNativeInitialization() {
+         if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
+ 
+-        // Try to initialize dynamic module early to enqueue navigation events
+-        // @see DynamicModuleNavigationEventObserver
+-        if (mIntentDataProvider.isDynamicModuleEnabled()) {
+-            mDynamicModuleCoordinator = getComponent().resolveDynamicModuleCoordinator();
+-        }
+-
+         mSessionHandler = new SessionHandler() {
+ 
+             @Override
+@@ -432,10 +422,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+         WebContents webContents = tab == null ? null : tab.getWebContents();
+         mConnection.resetPostMessageHandlerForSession(
+                 mIntentDataProvider.getSession(), webContents);
+-
+-        if (mDynamicModuleCoordinator != null) {
+-            mDynamicModuleCoordinator.resetPostMessageHandlersForCurrentSession(null);
+-        }
+     }
+ 
+     @Override
+@@ -794,10 +780,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+         if (mIntentDataProvider.isTrustedWebActivity()) {
+             component.resolveTrustedWebActivityCoordinator();
+         }
+-        if (mConnection.shouldHideTopBarOnModuleManagedUrlsForSession(
+-                    mIntentDataProvider.getSession())) {
+-            component.resolveDynamicModuleToolbarController();
+-        }
+ 
+         return component;
+     }
+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
+@@ -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.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;
+@@ -460,20 +459,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+         // even receive the extras for using the feature.
+         if (componentName == null) return false;
+ 
+-        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE)) {
+-            Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
+-            ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.FEATURE_DISABLED);
+-            return false;
+-        }
+-
+-        ExternalAuthUtils authUtils = ChromeApplication.getComponent().resolveExternalAuthUtils();
+-        if (!authUtils.isGoogleSigned(componentName.getPackageName())) {
+-            Log.w(TAG, "The %s package is not Google-signed.", componentName.getPackageName());
+-            ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.NOT_GOOGLE_SIGNED);
+-            return false;
+-        }
+-
+-        return true;
++        Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
++        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
+@@ -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;
+@@ -219,7 +217,6 @@ public class CustomTabsConnection {
+ 
+     private volatile ChainedTasks mWarmupTasks;
+ 
+-    private @Nullable ModuleLoader mModuleLoader;
+     /**
+      * <strong>DO NOT CALL</strong>
+      * Public to be instanciable from {@link ChromeApplication}. This is however
+@@ -1373,7 +1370,6 @@ public class CustomTabsConnection {
+         if (ChromeApplication.isSevereMemorySignal(level)) {
+             getInstance().mClientManager.cleanupUnusedSessions();
+         }
+-        if (getInstance().mModuleLoader != null) getInstance().mModuleLoader.onTrimMemory(level);
+     }
+ 
+     @VisibleForTesting
+@@ -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)) {
+-            assetName = null;
+-        }
+-
+-        if (mModuleLoader != null) {
+-            boolean isComponentNameChanged =
+-                    !componentName.equals(mModuleLoader.getComponentName());
+-            boolean isAssetNameChanged =
+-                    !TextUtils.equals(assetName, mModuleLoader.getDexAssetName());
+-            ModuleLoader.ModuleApkVersion newModuleApkVersion =
+-                    ModuleLoader.ModuleApkVersion.getModuleVersion(componentName.getPackageName());
+-            boolean isModuleVersionChanged =
+-                    !mModuleLoader.getModuleApkVersion().equals(newModuleApkVersion);
+-
+-            if (isComponentNameChanged || isAssetNameChanged || isModuleVersionChanged) {
+-                mModuleLoader.destroyModule(ModuleMetrics.DestructionReason.MODULE_LOADER_CHANGED);
+-                mModuleLoader = null;
+-            }
+-        }
+-
+-        if (mModuleLoader == null) mModuleLoader = new ModuleLoader(componentName, assetName);
+-
+-        return mModuleLoader;
+-    }
+-
+     @CalledByNative
+     public static void notifyClientOfDetachedRequestCompletion(
+             CustomTabsSessionToken session, String url, int status) {
+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
+@@ -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;
+-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
+-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
+ 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;
+@@ -32,8 +30,6 @@ import dagger.Subcomponent;
+ @ActivityScope
+ public interface CustomTabActivityComponent extends ChromeActivityComponent {
+     TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();
+-    DynamicModuleToolbarController resolveDynamicModuleToolbarController();
+-    DynamicModuleCoordinator resolveDynamicModuleCoordinator();
+ 
+     CustomTabBottomBarDelegate resolveBottomBarDelegate();
+     CustomTabActivityTabController resolveTabController();
+-- 
+2.11.0
+

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

@@ -4,13 +4,13 @@ Subject: Disable fetching of all field trials
 
 ---
  .../src/org/chromium/chrome/browser/ChromeFeatureList.java   | 12 +++---------
- components/variations/service/variations_service.cc          |  4 ++++
- 2 files changed, 7 insertions(+), 9 deletions(-)
+ components/variations/service/variations_service.cc          | 12 +-----------
+ 2 files changed, 4 insertions(+), 20 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
-@@ -103,9 +103,7 @@ public abstract class ChromeFeatureList {
+@@ -106,9 +106,7 @@ public abstract class ChromeFeatureList {
       */
      public static int getFieldTrialParamByFeatureAsInt(
              String featureName, String paramName, int defaultValue) {
@@ -21,7 +21,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
      }
  
      /**
-@@ -122,9 +120,7 @@ public abstract class ChromeFeatureList {
+@@ -125,9 +123,7 @@ public abstract class ChromeFeatureList {
       */
      public static double getFieldTrialParamByFeatureAsDouble(
              String featureName, String paramName, double defaultValue) {
@@ -32,7 +32,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureLi
      }
  
      /**
-@@ -141,9 +137,7 @@ public abstract class ChromeFeatureList {
+@@ -144,9 +140,7 @@ public abstract class ChromeFeatureList {
       */
      public static boolean getFieldTrialParamByFeatureAsBoolean(
              String featureName, String paramName, boolean defaultValue) {
@@ -46,24 +46,25 @@ 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
-@@ -225,6 +225,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 0
- #if !defined(GOOGLE_CHROME_BUILD)
-   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kVariationsServerURL) &&
-@@ -236,6 +237,9 @@ bool IsFetchingEnabled() {
-   }
- #endif
-   return true;
-+#else
+-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
+-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+-          switches::kVariationsServerURL) &&
+-      !g_should_fetch_for_testing) {
+-    DVLOG(1)
+-        << "Not performing repeated fetching in unofficial build without --"
+-        << switches::kVariationsServerURL << " specified.";
+-    return false;
+-  }
+-#endif
+-  return true;
 +  return false;
-+#endif
  }
  
  std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,66 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Thu, 4 Jul 2019 19:08:52 -0400
+Subject: Disable media router and remoting by default
+
+---
+ chrome/browser/media/router/media_router_feature.cc | 17 ++++++++---------
+ chrome/browser/profiles/profile.cc                  |  2 +-
+ chrome/browser/profiles/profile_impl.cc             |  2 +-
+ 3 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
+--- a/chrome/browser/media/router/media_router_feature.cc
++++ b/chrome/browser/media/router/media_router_feature.cc
+@@ -57,17 +57,16 @@ const PrefService::Preference* GetMediaRouterPref(
+ 
+ bool MediaRouterEnabled(content::BrowserContext* context) {
+ #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
+-  const PrefService::Preference* pref = GetMediaRouterPref(context);
+-  // Only use the pref value if it set from a mandatory policy.
+-  if (pref->IsManaged() && !pref->IsDefaultValue()) {
+-    bool allowed = false;
+-    CHECK(pref->GetValue()->GetAsBoolean(&allowed));
+-    return allowed;
+-  }
+-
+   // The component extension cannot be loaded in guest sessions.
+   // TODO(crbug.com/756243): Figure out why.
+-  return !Profile::FromBrowserContext(context)->IsGuestSession();
++  if (Profile::FromBrowserContext(context)->IsGuestSession()) {
++    return false;
++  }
++
++  const PrefService::Preference* pref = GetMediaRouterPref(context);
++  bool allowed = false;
++  pref->GetValue()->GetAsBoolean(&allowed);
++  return allowed;
+ #else   // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))
+   return false;
+ #endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
+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
+@@ -223,7 +223,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kMediaRouterFirstRunFlowAcknowledged,
+       false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+-  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, true);
++  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, false);
+   registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
+ 
+   registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
+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
+@@ -444,7 +444,7 @@ void ProfileImpl::RegisterProfilePrefs(
+   registry->RegisterStringPref(
+       prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
+   registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
+-  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true);
++  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, false);
+ #if defined(OS_CHROMEOS)
+   registry->RegisterBooleanPref(
+       prefs::kOobeMarketingOptInScreenFinished, false,
+-- 
+2.11.0
+

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

@@ -0,0 +1,91 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 20 Feb 2019 21:41:26 +0100
+Subject: Disable metrics collection for NTP tiles
+
+---
+ .../android/ntp/most_visited_sites_bridge.cc        | 21 ---------------------
+ components/ntp_tiles/BUILD.gn                       |  3 ---
+ 2 files changed, 24 deletions(-)
+
+diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
++++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+@@ -25,7 +25,6 @@
+ #include "chrome/browser/profiles/profile_android.h"
+ #include "components/favicon_base/favicon_types.h"
+ #include "components/history/core/browser/history_service.h"
+-#include "components/ntp_tiles/metrics.h"
+ #include "components/ntp_tiles/most_visited_sites.h"
+ #include "components/ntp_tiles/section_type.h"
+ #include "components/rappor/rappor_service_impl.h"
+@@ -45,7 +44,6 @@ using ntp_tiles::NTPTilesVector;
+ using ntp_tiles::SectionType;
+ using ntp_tiles::TileTitleSource;
+ using ntp_tiles::TileSource;
+-using ntp_tiles::TileVisualType;
+ 
+ namespace {
+ 
+@@ -236,7 +234,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj,
+     jint jtiles_count) {
+-  ntp_tiles::metrics::RecordPageImpression(jtiles_count);
+ }
+ 
+ void MostVisitedSitesBridge::RecordTileImpression(
+@@ -249,18 +246,6 @@ void MostVisitedSitesBridge::RecordTileImpression(
+     jint jsource,
+     jlong jdata_generation_time_ms,
+     const JavaParamRef<jstring>& jurl) {
+-  GURL url(ConvertJavaStringToUTF8(env, jurl));
+-  TileTitleSource title_source = static_cast<TileTitleSource>(jtitle_source);
+-  TileSource source = static_cast<TileSource>(jsource);
+-  TileVisualType visual_type = static_cast<TileVisualType>(jvisual_type);
+-  favicon_base::IconType icon_type =
+-      static_cast<favicon_base::IconType>(jicon_type);
+-
+-  ntp_tiles::metrics::RecordTileImpression(
+-      ntp_tiles::NTPTileImpression(
+-          jindex, source, title_source, visual_type, icon_type,
+-          base::Time::FromJavaTime(jdata_generation_time_ms), url),
+-      g_browser_process->rappor_service());
+ }
+ 
+ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+@@ -271,12 +256,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+     jint title_source,
+     jint source,
+     jlong jdata_generation_time_ms) {
+-  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
+-      index, static_cast<TileSource>(source),
+-      static_cast<TileTitleSource>(title_source),
+-      static_cast<TileVisualType>(tile_type), favicon_base::IconType::kInvalid,
+-      base::Time::FromJavaTime(jdata_generation_time_ms),
+-      /*url_for_rappor=*/GURL()));
+ }
+ 
+ static jlong JNI_MostVisitedSitesBridge_Init(
+diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
+--- a/components/ntp_tiles/BUILD.gn
++++ b/components/ntp_tiles/BUILD.gn
+@@ -22,8 +22,6 @@ static_library("ntp_tiles") {
+     "icon_cacher.h",
+     "icon_cacher_impl.cc",
+     "icon_cacher_impl.h",
+-    "metrics.cc",
+-    "metrics.h",
+     "most_visited_sites.cc",
+     "most_visited_sites.h",
+     "ntp_tile.cc",
+@@ -78,7 +76,6 @@ source_set("unit_tests") {
+     "custom_links_manager_impl_unittest.cc",
+     "custom_links_store_unittest.cc",
+     "icon_cacher_impl_unittest.cc",
+-    "metrics_unittest.cc",
+     "most_visited_sites_unittest.cc",
+     "popular_sites_impl_unittest.cc",
+   ]
+-- 
+2.11.0
+

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

@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 25 Apr 2018 10:23:51 +0200
+Subject: Disable metrics on all I/O threads
+
+---
+ chrome/browser/browser_process_impl.cc     | 2 +-
+ chrome/browser/profiles/profile_io_data.cc | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+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
+@@ -909,7 +909,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+ #endif  // defined(OS_CHROMEOS)
+ 
+   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
+-                                GoogleUpdateSettings::GetCollectStatsConsent());
++                                false);
+ 
+ #if defined(OS_ANDROID)
+   registry->RegisterBooleanPref(
+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
+@@ -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/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/signin/public/base/signin_pref_names.h"
+-- 
+2.11.0
+

build/patches/Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch

@@ -0,0 +1,24 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 30 May 2019 03:37:45 +0200
+Subject: Disable offline pages in the downloads home to be opened in CCT by
+ default
+
+---
+ components/offline_pages/core/offline_page_feature.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
+--- a/components/offline_pages/core/offline_page_feature.cc
++++ b/components/offline_pages/core/offline_page_feature.cc
+@@ -51,7 +51,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
+     "OfflinePagesDescriptivePendingStatus", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kOfflinePagesInDownloadHomeOpenInCctFeature{
+-    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_ENABLED_BY_DEFAULT};
++    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kOfflinePagesCTSuppressNotificationsFeature{
+     "OfflinePagesCTSuppressNotifications", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.11.0
+

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

@@ -1,16 +1,17 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 11 Oct 2017 23:24:58 +0200
-Subject: Disables omission of URL elements in Omnibox
+Subject: Disable omission of URL elements in Omnibox
 
-Disable all omissions (already shadowed by first flag)
+Disable all omissions because they are used throughout the code without
+a corresponding user option to individually disable their usage.
 ---
- components/url_formatter/url_formatter.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ components/url_formatter/url_formatter.cc | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -407,12 +407,12 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -433,13 +433,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -18,17 +19,19 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 -const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
 -const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
 -const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
--const FormatUrlType kFormatUrlExperimentalElideAfterHost = 1 << 4;
 -const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
+-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
+-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
 +const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
 +const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
 +const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
 +const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
-+const FormatUrlType kFormatUrlExperimentalElideAfterHost = 0 << 4;
 +const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
- const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
++const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
++const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
+ const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
  
  const FormatUrlType kFormatUrlOmitDefaults =
 -- 
-2.7.4
+2.11.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
-@@ -1262,10 +1262,8 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() {
+@@ -1234,10 +1234,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {
@@ -23,5 +23,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  
  void LocalFrame::SetAdTrackerForTesting(AdTracker* ad_tracker) {
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-previews-by-default.patch

@@ -0,0 +1,28 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 8 Jan 2019 08:54:50 +0100
+Subject: Disable previews by default
+
+---
+ components/previews/core/previews_features.cc | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/components/previews/core/previews_features.cc b/components/previews/core/previews_features.cc
+--- a/components/previews/core/previews_features.cc
++++ b/components/previews/core/previews_features.cc
+@@ -14,12 +14,7 @@ namespace features {
+ // are enabled are controlled by other features.
+ const base::Feature kPreviews {
+   "Previews",
+-#if defined(OS_ANDROID) || defined(OS_LINUX)
+-      // Previews allowed for Android (but also allow on Linux for dev/debug).
+-      base::FEATURE_ENABLED_BY_DEFAULT
+-#else   // !defined(OS_ANDROID) || defined(OS_LINUX)
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
++   base::FEATURE_DISABLED_BY_DEFAULT
+ };
+ 
+ // Enables the Offline previews on android slow connections.
+-- 
+2.11.0
+

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

@@ -0,0 +1,306 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 17:20:21 +0100
+Subject: Disable promos displayed in bookmarks manager
+
+Remove personalized signin promo view from
+bookmarks, never reach signin thresholds.
+---
+ .../personalized_signin_promo_view_bookmarks.xml   | 30 ------------
+ .../browser/bookmarks/BookmarkItemsAdapter.java    | 23 +--------
+ .../browser/bookmarks/BookmarkPromoHeader.java     | 54 +---------------------
+ .../bookmarks/ReorderBookmarkItemsAdapter.java     | 19 +-------
+ .../browser/signin/SigninPromoController.java      | 19 +-------
+ 5 files changed, 7 insertions(+), 138 deletions(-)
+ delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
+
+diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
+deleted file mode 100644
+--- a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
++++ /dev/null
+@@ -1,30 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<!-- Copyright 2017 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. -->
+-
+-<org.chromium.chrome.browser.signin.PersonalizedSigninPromoView
+-    xmlns:android="http://schemas.android.com/apk/res/android"
+-    android:id="@+id/signin_promo_view_container"
+-    android:layout_width="match_parent"
+-    android:layout_height="wrap_content"
+-    android:layout_margin="16dp"
+-    android:background="@drawable/hairline_border_card_background"
+-    android:gravity="center_horizontal"
+-    android:orientation="vertical"
+-    android:paddingBottom="12dp"
+-    android:paddingTop="14dp">
+-
+-    <FrameLayout
+-        android:layout_width="match_parent"
+-        android:layout_height="wrap_content"
+-        android:layout_marginBottom="12dp"
+-        android:layout_marginEnd="12dp"
+-        android:layout_marginStart="12dp">
+-
+-        <include layout="@layout/personalized_signin_promo_view_header"/>
+-    </FrameLayout>
+-
+-    <include layout="@layout/personalized_signin_promo_view_body"/>
+-
+-</org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
+\ No newline at end of file
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+@@ -59,7 +59,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+ 
+     private BookmarkDelegate mDelegate;
+     private Context mContext;
+-    private BookmarkPromoHeader mPromoHeaderManager;
+     private String mSearchText;
+     private BookmarkId mCurrentFolder;
+ 
+@@ -217,9 +216,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+ 
+         switch (viewType) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                return mPromoHeaderManager.createPersonalizedSigninPromoHolder(parent);
++                return null;
+             case ViewType.SYNC_PROMO:
+-                return mPromoHeaderManager.createSyncPromoHolder(parent);
++                return null;
+             case ViewType.FOLDER:
+                 BookmarkFolderRow folder = (BookmarkFolderRow) LayoutInflater.from(
+                         parent.getContext()).inflate(R.layout.bookmark_folder_row, parent, false);
+@@ -240,8 +239,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+     public void onBindViewHolder(ViewHolder holder, int position) {
+         switch (holder.getItemViewType()) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                PersonalizedSigninPromoView view = (PersonalizedSigninPromoView) holder.itemView;
+-                mPromoHeaderManager.setupPersonalizedSigninPromo(view);
+                 break;
+             case ViewType.SYNC_PROMO:
+                 break;
+@@ -260,7 +257,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+     public void onViewRecycled(ViewHolder holder) {
+         switch (holder.getItemViewType()) {
+             case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                mPromoHeaderManager.detachPersonalizePromoView();
+                 break;
+             default:
+                 // Other view holders don't have special recycling code.
+@@ -296,7 +292,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+             }
+         };
+ 
+-        mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
+         populateTopLevelFoldersList();
+         notifyDataSetChanged();
+     }
+@@ -307,7 +302,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+         mDelegate.removeUIObserver(this);
+         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
+         mDelegate = null;
+-        mPromoHeaderManager.destroy();
+     }
+ 
+     @Override
+@@ -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";
+-
+-        switch (mPromoHeaderManager.getPromoState()) {
+-            case BookmarkPromoHeader.PromoState.PROMO_NONE:
+-                return;
+-            case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
+-                mPromoHeaderSection.add(ViewType.PERSONALIZED_SIGNIN_PROMO);
+-                return;
+-            case BookmarkPromoHeader.PromoState.PROMO_SYNC:
+-                mPromoHeaderSection.add(ViewType.SYNC_PROMO);
+-                return;
+-            default:
+-                assert false : "Unexpected value for promo state!";
+-        }
+     }
+ 
+     private void populateTopLevelFoldersList() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+@@ -18,7 +18,6 @@ import org.chromium.base.ContextUtils;
+ import org.chromium.base.VisibleForTesting;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.signin.IdentityServicesProvider;
+-import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
+ import org.chromium.chrome.browser.signin.ProfileDataCache;
+ import org.chromium.chrome.browser.signin.SigninAccessPoint;
+ import org.chromium.chrome.browser.signin.SigninManager;
+@@ -132,19 +131,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+     }
+ 
+     /**
+-     * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
+-     *         {@link RecyclerView}.
+-     */
+-    // TODO(crbug.com/160194): Clean up after bookmark reordering launches.
+-    ViewHolder createPersonalizedSigninPromoHolder(ViewGroup parent) {
+-        View view = LayoutInflater.from(mContext).inflate(
+-                R.layout.personalized_signin_promo_view_bookmarks, parent, false);
+-
+-        // ViewHolder is abstract and it cannot be instantiated directly.
+-        return new ViewHolder(view) {};
+-    }
+-
+-    /**
+      * @return Sync promo header {@link ViewHolder} instance that can be used with
+      *         {@link RecyclerView}.
+      */
+@@ -156,42 +142,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         return new ViewHolder(view) {};
+     }
+ 
+-    /**
+-     * Configures the personalized signin promo and records promo impressions.
+-     * @param view The view to be configured.
+-     */
+-    void setupPersonalizedSigninPromo(PersonalizedSigninPromoView view) {
+-        SigninPromoUtil.setupPromoViewFromCache(mSigninPromoController, mProfileDataCache, view,
+-                this::setPersonalizedSigninPromoDeclined);
+-    }
+-
+-    /**
+-     * Detaches the previously configured {@link PersonalizedSigninPromoView}.
+-     */
+-    void detachPersonalizePromoView() {
+-        if (mSigninPromoController != null) mSigninPromoController.detach();
+-    }
+-
+-    /**
+-     * Saves that the personalized signin promo was declined and updates the UI.
+-     */
+-    private void setPersonalizedSigninPromoDeclined() {
+-        SharedPreferences.Editor sharedPreferencesEditor =
+-                ContextUtils.getAppSharedPreferences().edit();
+-        sharedPreferencesEditor.putBoolean(PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, true);
+-        sharedPreferencesEditor.apply();
+-        mPromoState = calculatePromoState();
+-        triggerPromoUpdate();
+-    }
+-
+-    /**
+-     * @return Whether the user declined the personalized signin promo.
+-     */
+-    private boolean wasPersonalizedSigninPromoDeclined() {
+-        return ContextUtils.getAppSharedPreferences().getBoolean(
+-                PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, false);
+-    }
+-
+     private @PromoState int calculatePromoState() {
+         if (sPromoStateForTests != null) {
+             return sPromoStateForTests;
+@@ -204,8 +154,7 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         if (!ChromeSigninController.get().isSignedIn()) {
+             boolean impressionLimitReached = !SigninPromoController.hasNotReachedImpressionLimit(
+                     SigninAccessPoint.BOOKMARK_MANAGER);
+-            if (!mSignInManager.isSignInAllowed() || impressionLimitReached
+-                    || wasPersonalizedSigninPromoDeclined()) {
++            if (!mSignInManager.isSignInAllowed() || impressionLimitReached) {
+                 return PromoState.PROMO_NONE;
+             }
+             return PromoState.PROMO_SIGNIN_PERSONALIZED;
+@@ -253,7 +202,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+     }
+ 
+     private void triggerPromoUpdate() {
+-        detachPersonalizePromoView();
+         mPromoHeaderChangeAction.run();
+     }
+ 
+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
+@@ -186,8 +186,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+         assert mDelegate != null;
+ 
+         switch (viewType) {
+-            case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                return mPromoHeaderManager.createPersonalizedSigninPromoHolder(parent);
+             case ViewType.SYNC_PROMO:
+                 return mPromoHeaderManager.createSyncPromoHolder(parent);
+             case ViewType.FOLDER:
+@@ -202,10 +200,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+ 
+     @Override
+     public void onBindViewHolder(ViewHolder holder, int position) {
+-        if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO) {
+-            PersonalizedSigninPromoView view = (PersonalizedSigninPromoView) holder.itemView;
+-            mPromoHeaderManager.setupPersonalizedSigninPromo(view);
+-        } else if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
++        if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
+             BookmarkRow row = ((BookmarkRow) holder.itemView);
+             BookmarkId id = getIdByPosition(position);
+             row.setBookmarkId(id, getLocationFromPosition(position));
+@@ -229,13 +224,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+ 
+     @Override
+     public void onViewRecycled(ViewHolder holder) {
+-        switch (holder.getItemViewType()) {
+-            case ViewType.PERSONALIZED_SIGNIN_PROMO:
+-                mPromoHeaderManager.detachPersonalizePromoView();
+-                break;
+-            default:
+-                // Other view holders don't have special recycling code.
+-        }
+     }
+ 
+     /**
+@@ -404,9 +392,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+                 case BookmarkPromoHeader.PromoState.PROMO_NONE:
+                     mPromoHeaderType = ViewType.INVALID_PROMO;
+                     break;
+-                case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
+-                    mPromoHeaderType = ViewType.PERSONALIZED_SIGNIN_PROMO;
+-                    break;
+                 case BookmarkPromoHeader.PromoState.PROMO_SYNC:
+                     mPromoHeaderType = ViewType.SYNC_PROMO;
+                     break;
+@@ -571,4 +556,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+     private void clearHighlight() {
+         mHighlightedBookmark = null;
+     }
+-}
+\ No newline at end of file
++}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
+@@ -73,23 +73,8 @@ public class SigninPromoController {
+      */
+     public static boolean hasNotReachedImpressionLimit(@AccessPoint int accessPoint) {
+         SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
+-        switch (accessPoint) {
+-            case SigninAccessPoint.BOOKMARK_MANAGER:
+-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_BOOKMARKS, 0)
+-                        < MAX_IMPRESSIONS_BOOKMARKS;
+-            case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
+-                // There is no impression limit for NTP content suggestions.
+-                return true;
+-            case SigninAccessPoint.RECENT_TABS:
+-                // There is no impression limit for Recent Tabs.
+-                return true;
+-            case SigninAccessPoint.SETTINGS:
+-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_SETTINGS, 0)
+-                        < MAX_IMPRESSIONS_SETTINGS;
+-            default:
+-                assert false : "Unexpected value for access point: " + accessPoint;
+-                return false;
+-        }
++        // never show anything
++        return true;
+     }
+ 
+     /**
+-- 
+2.11.0
+

build/patches/Disable-references-to-fonts.googleapis.com.patch

@@ -12,15 +12,15 @@ Subject: Disable references to fonts.googleapis.com
 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -310,7 +310,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -308,7 +308,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+ }
  
- std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc()
-     const {
+ std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
 -  return "style-src 'self' https://fonts.googleapis.com;";
 +  return "style-src 'self';";
  }
  
- std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() const {
+ std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() {
 diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
 --- a/components/dom_distiller/core/html/preview.html
 +++ b/components/dom_distiller/core/html/preview.html
@@ -36,8 +36,8 @@ diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_di
 diff --git a/components/dom_distiller/core/javascript/dom_distiller_viewer.js b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
 --- a/components/dom_distiller/core/javascript/dom_distiller_viewer.js
 +++ b/components/dom_distiller/core/javascript/dom_distiller_viewer.js
-@@ -120,7 +120,7 @@ function maybeSetWebFont() {
-   if (distiller_on_ios) return;
+@@ -130,7 +130,7 @@ function maybeSetWebFont() {
+     return;
  
    var e = document.createElement('link');
 -  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
@@ -59,5 +59,5 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
  body,
  table,
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Aug 2019 08:47:04 +0200
+Subject: Disable search-ready omnibox by default
+
+---
+ chrome/browser/android/chrome_feature_list.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -518,7 +518,7 @@ const base::Feature kRevampedContextMenu{"RevampedContextMenu",
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kSearchReadyOmniboxFeature{
+-    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
++    "SearchReadyOmnibox", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kServiceManagerForBackgroundPrefetch{
+     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.11.0
+

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

@@ -0,0 +1,25 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Tue, 25 Dec 2018 16:19:51 -0500
+Subject: Disable seed-based field trials
+
+---
+ components/variations/service/variations_field_trial_creator.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+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
+@@ -535,8 +535,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+ #endif  // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
+   bool used_seed = false;
+   if (!used_testing_config) {
++#if defined(FIELDTRIAL_SEED_ENABLED)
+     used_seed = CreateTrialsFromSeed(std::move(low_entropy_provider),
+                                      feature_list.get(), safe_seed_manager);
++#endif
+   }
+ 
+   platform_field_trials->SetupFeatureControllingFieldTrials(used_seed,
+-- 
+2.11.0
+

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

@@ -0,0 +1,336 @@
+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   |  7 --
+ .../browser/preferences/MainPreferences.java       | 86 +---------------------
+ .../preferences/privacy/PrivacyPreferences.java    | 15 ----
+ .../java/strings/android_chrome_strings.grd        |  6 --
+ 5 files changed, 1 insertion(+), 133 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">
+ 
+     <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.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"
+         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.ChromeBasePreference
+-        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.ChromeBasePreference
+         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
+@@ -59,12 +59,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>
+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 ManagedPreferenceDelegate 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) {
+@@ -197,13 +166,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);
+@@ -223,10 +185,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+         } else {
+             removePreferenceIfPresent(PREF_DEVELOPER);
+         }
+-
+-        ChromeBasePreference dataReduction =
+-                (ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);
+-        dataReduction.setSummary(DataReductionPreferenceFragment.generateSummary(getResources()));
+     }
+ 
+     private Preference addPreferenceIfAbsent(String key) {
+@@ -240,13 +198,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+         if (preference != null) getPreferenceScreen().removePreference(preference);
+     }
+ 
+-    private void updateSyncAndServicesPreference() {
+-        ChromeBasePreference syncAndServices =
+-                (ChromeBasePreference) findPreference(PREF_SYNC_AND_SERVICES);
+-        syncAndServices.setIcon(SyncPreferenceUtils.getSyncStatusIcon(getActivity()));
+-        syncAndServices.setSummary(SyncPreferenceUtils.getSyncStatusSummary(getActivity()));
+-    }
+-
+     private void updateSearchEnginePreference() {
+         if (!TemplateUrlServiceFactory.get().isLoaded()) {
+             ChromeBasePreference searchEnginePref =
+@@ -278,28 +229,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() {
+@@ -307,11 +236,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+         updateSearchEnginePreference();
+     }
+ 
+-    @Override
+-    public void syncStateChanged() {
+-        updateSyncAndServicesPreference();
+-    }
+-
+     @VisibleForTesting
+     ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
+         return mManagedPreferenceDelegate;
+@@ -321,9 +245,6 @@ public class MainPreferences extends PreferenceFragmentCompat
+         return new ManagedPreferenceDelegate() {
+             @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();
+                 }
+@@ -332,11 +253,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
+@@ -25,7 +25,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;
+@@ -47,9 +46,6 @@ public class PrivacyPreferences
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+-    private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
+-            "sync_and_services_link_divider";
+-    private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
+     private static final String PREF_USAGE_STATS = "usage_stats_reporting";
+ 
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+@@ -97,20 +93,9 @@ public class PrivacyPreferences
+             networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
+             preferenceScreen.addPreference(networkPredictionPref);
+ 
+-            Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
+-            NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getResources(), view -> {
+-                PreferencesLauncher.launchSettingsPage(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();
+             return;
+         }
+-        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
+-        preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
+ 
+         ChromeBaseCheckBoxPreference navigationErrorPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);
+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
+@@ -345,9 +345,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>
+@@ -418,9 +415,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-signin-data-reduction-promos.patch

@@ -0,0 +1,51 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 12 Jun 2018 15:09:26 +0200
+Subject: Disable signin/data reduction promos
+
+---
+ .../chrome/browser/ChromeTabbedActivity.java       | 30 +---------------------
+ 1 file changed, 1 insertion(+), 29 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+@@ -799,35 +799,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+         try (TraceEvent e = TraceEvent.scoped(
+                      "ChromeTabbedActivity.createToolbarButtonInProductHelpController")) {
+             ChromePreferenceManager preferenceManager = ChromePreferenceManager.getInstance();
+-            // Promos can only be shown when we start with ACTION_MAIN intent and
+-            // after FRE is complete. Native initialization can finish before the FRE flow is
+-            // complete, and this will only show promos on the second opportunity. This is
+-            // because the FRE is shown on the first opportunity, and we don't want to show such
+-            // content back to back.
+-            //
+-            // TODO(tedchoc): Unify promo dialog logic as the search engine promo dialog checks
+-            //                might not have completed at this point and we could show multiple
+-            //                promos.
+-            boolean isShowingPromo = mLocaleManager.hasShownSearchEnginePromoThisSession();
+-            // Promo dialogs in multiwindow mode are broken on some devices:
+-            // http://crbug.com/354696
+-            boolean isLegacyMultiWindow = MultiWindowUtils.getInstance().isLegacyMultiWindow(this);
+-            if (!isShowingPromo && !mIntentWithEffect && FirstRunStatus.getFirstRunFlowComplete()
+-                    && preferenceManager.readBoolean(
+-                            ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, false)
+-                    && !VrModuleProvider.getDelegate().isInVr()
+-                    // VrModuleProvider.getDelegate().isInVr may not return true at this point
+-                    // even though Chrome is about to enter VR, so we need to also check whether
+-                    // we're launching into VR.
+-                    && !VrModuleProvider.getIntentDelegate().isLaunchingIntoVr(this, getIntent())
+-                    && !isLegacyMultiWindow) {
+-                isShowingPromo = maybeShowPromo();
+-            } else {
+-                preferenceManager.writeBoolean(
+-                        ChromePreferenceManager.PROMOS_SKIPPED_ON_FIRST_START, true);
+-            }
+-
+-            ToolbarButtonInProductHelpController.create(this, isShowingPromo);
++            ToolbarButtonInProductHelpController.create(this, false);
+         }
+     }
+ 
+-- 
+2.11.0
+

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

@@ -10,15 +10,15 @@ author: Chad Miller <chad.miller@canonical.com>
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings(
+@@ -57,7 +57,7 @@ void CookieSettings::GetCookieSettings(
  void CookieSettings::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
 -      prefs::kBlockThirdPartyCookies, false,
 +      prefs::kBlockThirdPartyCookies, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- }
- 
+   registry->RegisterIntegerPref(
+       prefs::kCookieControlsMode,
 -- 
-2.7.4
+2.11.0
 

build/patches/Disable-unified-consent-on-Android.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 12 Aug 2019 08:45:43 +0200
+Subject: Disable unified consent on Android
+
+---
+ components/unified_consent/feature.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/unified_consent/feature.cc b/components/unified_consent/feature.cc
+--- a/components/unified_consent/feature.cc
++++ b/components/unified_consent/feature.cc
+@@ -11,7 +11,7 @@ namespace unified_consent {
+ // base::Feature definition.
+ const base::Feature kUnifiedConsent {
+   "UnifiedConsent",
+-#if defined(OS_CHROMEOS)
++#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
+       base::FEATURE_DISABLED_BY_DEFAULT
+ #else
+       base::FEATURE_ENABLED_BY_DEFAULT
+-- 
+2.11.0
+

build/patches/Disable-unused-permissions.patch

@@ -0,0 +1,507 @@
+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
+@@ -1158,8 +1158,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" ]
+@@ -1170,7 +1169,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 %}
+ 
+@@ -1009,16 +1001,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>
+@@ -1126,15 +1108,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

@@ -0,0 +1,33 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 27 Oct 2018 17:54:01 +0200
+Subject: Disable update scheduler
+
+---
+ .../chromium/chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+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
+@@ -36,10 +36,7 @@ public class UpdateScheduler {
+ 
+     @CalledByNative
+     /* package */ static boolean isAvailable() {
+-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+-                || GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
+-                           ContextUtils.getApplicationContext())
+-                == ConnectionResult.SUCCESS;
++        return false;
+     }
+ 
+     /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
+@@ -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
++}
+-- 
+2.11.0
+

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

@@ -0,0 +1,77 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 10 Nov 2018 19:47:39 +0100
+Subject: Do not grant notifications to default search engine
+
+Block gelocation by default instead of granting it for non-enterprise use cases (almost the totality of users)
+---
+ .../search_permissions/search_permissions_service.cc | 20 ++++++--------------
+ chrome/common/chrome_features.cc                     |  2 +-
+ 2 files changed, 7 insertions(+), 15 deletions(-)
+
+diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc
+--- a/chrome/browser/android/search_permissions/search_permissions_service.cc
++++ b/chrome/browser/android/search_permissions/search_permissions_service.cc
+@@ -190,7 +190,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) {
+   DCHECK(dse_url.is_empty() || IsPermissionControlledByDSE(type, dse_origin));
+ 
+   if (!dse_url.is_empty())
+-    SetContentSetting(dse_url, type, CONTENT_SETTING_ALLOW);
++    SetContentSetting(dse_url, type, CONTENT_SETTING_BLOCK);
+ }
+ 
+ void SearchPermissionsService::ResetDSEPermissions() {
+@@ -333,11 +333,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+     return;
+   }
+ 
+-  // If we get to here, the DSE is not disabled by enterprise policy. If it was
+-  // previously enterprise controlled, we initialize the setting to BLOCK since
+-  // we don't know what the user's setting was previously.
+-  bool was_enterprise_controlled =
+-      pref_service_->GetBoolean(prefs::kDSEWasDisabledByPolicy);
++  // If this line is reached then DSE is not disabled by enterprise policy.
+   pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy);
+ 
+   // Initialize the pref for geolocation if it hasn't been initialized yet.
+@@ -370,10 +366,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+       pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated);
+     } else if (dse_geolocation_setting == CONTENT_SETTING_ASK) {
+       // If the user hasn't explicitly allowed or blocked geolocation for the
+-      // DSE, initialize it to allowed.
+-      dse_geolocation_setting = was_enterprise_controlled
+-                                    ? CONTENT_SETTING_BLOCK
+-                                    : CONTENT_SETTING_ALLOW;
++      // DSE, initialize it to blocked.
++      dse_geolocation_setting = CONTENT_SETTING_BLOCK;
+     }
+ 
+     // Update the content setting with the auto-grants for the DSE.
+@@ -398,11 +392,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+         GetContentSetting(dse_origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+     ContentSetting dse_notifications_setting = notifications_setting_to_restore;
+     // If the user hasn't explicitly allowed or blocked notifications for the
+-    // DSE, initialize it to allowed.
++    // DSE, initialize it to blocked.
+     if (dse_notifications_setting == CONTENT_SETTING_ASK) {
+-      dse_notifications_setting = was_enterprise_controlled
+-                                      ? CONTENT_SETTING_BLOCK
+-                                      : CONTENT_SETTING_ALLOW;
++      dse_notifications_setting = CONTENT_SETTING_BLOCK;
+     }
+ 
+     // Update the content setting with the auto-grants for the DSE.
+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
+@@ -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",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
++                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
+ 
+ // If enabled, Drive will use FCM for its invalidations.
+-- 
+2.11.0
+

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

@@ -0,0 +1,112 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 20 Jan 2019 06:20:10 +0100
+Subject: Do not ignore download location prompt setting
+
+Upstream has decided that it works as intended (https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
+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     | 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
+@@ -32,9 +32,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+     private PropertyModel mDialogModel;
+     private DownloadLocationCustomView mCustomView;
+     private ModalDialogManager mModalDialogManager;
+-    private long mTotalBytes;
+-    private @DownloadLocationDialogType int mDialogType;
+-    private String mSuggestedPath;
+     private Context mContext;
+ 
+     private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) {
+@@ -67,12 +64,28 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+ 
+         mModalDialogManager = activity.getModalDialogManager();
+         mContext = activity;
+-        mTotalBytes = totalBytes;
+-        mDialogType = dialogType;
+-        mSuggestedPath = suggestedPath;
+ 
+-        DownloadDirectoryProvider.getInstance().getAllDirectoriesOptions(
+-                (ArrayList<DirectoryOption> dirs) -> { onDirectoryOptionsRetrieved(dirs); });
++        // Already showing the dialog.
++        if (mDialogModel != null) return;
++
++        // Actually show the dialog.
++        mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate(
++                R.layout.download_location_dialog, null);
++        mCustomView.initialize(dialogType, new File(suggestedPath));
++
++        Resources resources = mContext.getResources();
++        mDialogModel =
++                new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
++                        .with(ModalDialogProperties.CONTROLLER, this)
++                        .with(ModalDialogProperties.TITLE, getTitle(totalBytes, dialogType))
++                        .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView)
++                        .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources,
++                                R.string.duplicate_download_infobar_download_button)
++                        .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources,
++                                R.string.cancel)
++                        .build();
++
++        mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP);
+     }
+ 
+     @Override
+@@ -105,50 +118,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+         mCustomView = null;
+     }
+ 
+-    /**
+-     * Called after retrieved the download directory options.
+-     * @param dirs An list of available download directories.
+-     */
+-    private void onDirectoryOptionsRetrieved(ArrayList<DirectoryOption> dirs) {
+-        // If there is only one directory available, don't show the default dialog, and set the
+-        // download directory to default. Dialog will still show for other types of dialogs, like
+-        // name conflict or disk error.
+-        if (dirs.size() == 1 && mDialogType == DownloadLocationDialogType.DEFAULT) {
+-            final DirectoryOption dir = dirs.get(0);
+-            if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) {
+-                assert(!TextUtils.isEmpty(dir.location));
+-                PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory(
+-                        dir.location);
+-                DownloadLocationDialogBridgeJni.get().onComplete(
+-                        mNativeDownloadLocationDialogBridge, DownloadLocationDialogBridge.this,
+-                        mSuggestedPath);
+-            }
+-            return;
+-        }
+-
+-        // Already showing the dialog.
+-        if (mDialogModel != null) return;
+-
+-        // Actually show the dialog.
+-        mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate(
+-                R.layout.download_location_dialog, null);
+-        mCustomView.initialize(mDialogType, new File(mSuggestedPath));
+-
+-        Resources resources = mContext.getResources();
+-        mDialogModel =
+-                new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
+-                        .with(ModalDialogProperties.CONTROLLER, this)
+-                        .with(ModalDialogProperties.TITLE, getTitle(mTotalBytes, mDialogType))
+-                        .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView)
+-                        .with(ModalDialogProperties.POSITIVE_BUTTON_TEXT, resources,
+-                                R.string.duplicate_download_infobar_download_button)
+-                        .with(ModalDialogProperties.NEGATIVE_BUTTON_TEXT, resources,
+-                                R.string.cancel)
+-                        .build();
+-
+-        mModalDialogManager.showDialog(mDialogModel, ModalDialogManager.ModalDialogType.APP);
+-    }
+-
+     private String getTitle(long totalBytes, @DownloadLocationDialogType int dialogType) {
+         switch (dialogType) {
+             case DownloadLocationDialogType.LOCATION_FULL:
+-- 
+2.11.0
+

build/patches/Do-not-record-UMA-for-network-errors.patch

@@ -0,0 +1,38 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 27 Jul 2019 11:19:53 +0200
+Subject: Do not record UMA for network errors
+
+---
+ services/network/network_context.cc | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/services/network/network_context.cc b/services/network/network_context.cc
+--- a/services/network/network_context.cc
++++ b/services/network/network_context.cc
+@@ -393,23 +393,6 @@ class NetworkContext::ContextNetworkDelegate
+                                                                  started);
+     }
+ 
+-    // Record network errors that HTTP requests complete with, including OK and
+-    // ABORTED.
+-    // TODO(mmenke): Seems like this really should be looking at HTTPS requests,
+-    // too.
+-    // TODO(mmenke): We should remove the main frame case from here, and move it
+-    // into the consumer - the network service shouldn't know what a main frame
+-    // is.
+-    if (request->url().SchemeIs("http")) {
+-      base::UmaHistogramSparse("Net.HttpRequestCompletionErrorCodes",
+-                               -net_error);
+-
+-      if (request->load_flags() & net::LOAD_MAIN_FRAME_DEPRECATED) {
+-        base::UmaHistogramSparse(
+-            "Net.HttpRequestCompletionErrorCodes.MainFrame", -net_error);
+-      }
+-    }
+-
+     ForwardProxyErrors(net_error);
+   }
+ 
+-- 
+2.11.0
+

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

@@ -9,9 +9,9 @@ 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
-@@ -278,10 +278,10 @@ bool ShouldPromptUserToSavePassword(const PasswordFormManager& manager) {
- void PasswordManager::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
+@@ -202,10 +202,10 @@ void PasswordManager::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
+                                 false);
    registry->RegisterBooleanPref(
 -      prefs::kCredentialsEnableService, true,
 +      prefs::kCredentialsEnableService, false,
@@ -23,5 +23,5 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
    registry->RegisterStringPref(prefs::kSyncPasswordHash, std::string(),
                                 PrefRegistry::NO_REGISTRATION_FLAGS);
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 30 May 2019 03:42:06 +0200
+Subject: Enable changing default downloads storage location by default
+
+---
+ chrome/common/chrome_features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
++++ b/chrome/common/chrome_features.cc
+@@ -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",
+-                                             base::FEATURE_DISABLED_BY_DEFAULT};
++                                             base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif
+ 
+ // If enabled, Drive will use FCM for its invalidations.
+-- 
+2.11.0
+

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

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 30 May 2019 03:44:07 +0200
+Subject: Enable download rename option by default
+
+---
+ chrome/browser/android/chrome_feature_list.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -421,7 +421,7 @@ const base::Feature kDownloadNotificationBadge{
+     "DownloadNotificationBadge", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kDownloadRename{"DownloadRename",
+-                                    base::FEATURE_DISABLED_BY_DEFAULT};
++                                    base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kDownloadTabManagementModule{
+     "DownloadTabManagementModule", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.11.0
+

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

@@ -0,0 +1,58 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Thu, 22 Dec 2016 07:15:34 -0500
+Subject: Enable -fwrapv in Clang for non-UBSan builds
+
+Using -fwrapv (notably only when not using signed integer overflow checking -
+since it will override it and result in not performing checks) is just common
+sense since it eliminates the chance of security vulnerabilities being
+introduced by optimizations based on signed overflow being undefined.
+That has happened before, and those optimizations don't even add up to a 0.1%
+performance increase for this kind of software. It's not worth having.
+The Linux kernel passes -fwrapv and also -fno-strict-aliasing to disable those
+dangerous optimizations (since there is so much incorrect code they can break).
+In fact, it is easy to point to dozens of known examples of invalid code that
+could potentially be broken by those optimizations.
+
+It is not acceptable for projects to be using optimizations that are known to
+be broken with a bunch of code in their tree.
+They put barely any effort into even fixing the known cases.
+Chromium has blacklists for UBSan for 'false positives' (none of which are
+actually false positives, but rather "undefined, but not a bug beyond
+potentially being broken by optimizations or even code generation without
+them") and also for components too full of these bugs for them to currently
+want to bother with it. That includes a bunch of signed overflow issues
+(there is sadly no detection for aliasing violations, which are fairly common,
+but not that common).
+
+Ideally, -fwrapv could be always passed, but unfortunately the way it is
+implemented has silly interactions with other switches.
+The reason it would still make sense to pass it is because due to their UBSan
+blacklists, they get far from full coverage with it, so -fwrapv would still
+be better than nothing where it's not being used.
+
+Since -fwrapv makes signed integer overflow well-defined, Clang will disable
+the UBSan checks for signed integer overflow, including in the
+production-oriented trapping mode used for hardening.
+
+Excerpt from https://github.com/bromite/bromite/issues/226
+---
+ build/config/compiler/BUILD.gn | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+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
+@@ -282,6 +282,10 @@ config("compiler") {
+       }
+     }
+ 
++    if (is_clang && !is_ubsan && !is_ubsan_security) {
++      cflags += [ "-fwrapv" ]
++    }
++
+     # Linker warnings.
+     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
+         !is_mac && !is_ios && current_os != "aix") {
+-- 
+2.11.0
+

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

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 14 Apr 2019 12:02:57 +0200
+Subject: Enable night mode menu entry by default
+
+---
+ chrome/browser/android/chrome_feature_list.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -246,7 +246,7 @@ const base::Feature kAdjustWebApkInstallationSpace = {
+     "AdjustWebApkInstallationSpace", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kAndroidNightMode{"AndroidNightMode",
+-                                      base::FEATURE_DISABLED_BY_DEFAULT};
++                                      base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kAndroidNightModeCCT{"AndroidNightModeCCT",
+                                          base::FEATURE_ENABLED_BY_DEFAULT};
+-- 
+2.11.0
+

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

@@ -0,0 +1,35 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 17 Mar 2019 19:09:00 +0100
+Subject: Enable site per process isolation for devices with enough memory
+
+---
+ chrome/common/chrome_features.cc | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+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
+@@ -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",
+-#if defined(OS_ANDROID)
+-      base::FEATURE_DISABLED_BY_DEFAULT
+-#else
+       base::FEATURE_ENABLED_BY_DEFAULT
+-#endif
+ };
+ 
+ // Controls a mode for dynamically process-isolating sites where the user has
+@@ -643,7 +639,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+ // base::SysInfo::AmountOfPhysicalMemoryMB().
+ const base::Feature kSitePerProcessOnlyForHighMemoryClients{
+     "site-per-process-only-for-high-memory-clients",
+-    base::FEATURE_DISABLED_BY_DEFAULT};
++    base::FEATURE_ENABLED_BY_DEFAULT};
+ const char kSitePerProcessOnlyForHighMemoryClientsParamName[] =
+     "site-per-process-low-memory-cutoff-mb";
+ 
+-- 
+2.11.0
+

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

@@ -9,9 +9,9 @@ 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
-@@ -633,6 +633,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-   GURL canonical_requesting_origin =
-       GetCanonicalOrigin(requesting_origin, embedding_origin);
+@@ -761,6 +761,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
+   if (status != CONTENT_SETTING_DEFAULT)
+     return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
    PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
 +      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/p
        render_frame_host, canonical_requesting_origin.GetOrigin(),
        embedding_origin.GetOrigin());
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,32 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 13 Aug 2017 19:33:04 -0400
+Subject: Hide passwords manager link
+
+---
+ .../chrome/browser/preferences/password/SavePasswordsPreferences.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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
+@@ -251,7 +251,7 @@ public class SavePasswordsPreferences
+             return;
+         }
+ 
+-        displayManageAccountLink();
++        //displayManageAccountLink();
+ 
+         PreferenceGroup passwordParent;
+         if (mSearchQuery == null) {
+@@ -326,7 +326,7 @@ public class SavePasswordsPreferences
+             return;
+         }
+ 
+-        displayManageAccountLink();
++        //displayManageAccountLink();
+ 
+         PreferenceCategory profileCategory = new PreferenceCategory(getStyledContext());
+         profileCategory.setKey(PREF_KEY_CATEGORY_EXCEPTIONS);
+-- 
+2.11.0
+

build/patches/Hide-send-reports-checkbox.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 12 Jun 2018 15:03:29 +0200
-Subject: Hide "Send reports to Google"
+Subject: Hide send reports checkbox
 
 ---
  chrome/android/java/res/layout/fre_tosanduma.xml | 2 +-
@@ -9,15 +9,15 @@ Subject: Hide "Send reports to Google"
 diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
 --- a/chrome/android/java/res/layout/fre_tosanduma.xml
 +++ b/chrome/android/java/res/layout/fre_tosanduma.xml
-@@ -71,7 +71,7 @@
+@@ -70,7 +70,7 @@
                          android:layout_height="wrap_content"
                          android:lineSpacingMultiplier="1.4"
                          android:text="@string/fre_send_report_check"
--                        android:textAppearance="@style/BlackBodyDefault" />
-+                        android:textAppearance="@style/BlackBodyDefault" android:visibility = "gone" />
+-                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" />
++                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" android:visibility="gone" />
                      </LinearLayout>
              </LinearLayout>
          </LinearLayout>
 -- 
-2.7.4
+2.11.0
 

build/patches/Modify-default-preferences.patch

@@ -2,28 +2,29 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Thu, 12 Oct 2017 08:09:24 +0200
 Subject: Modify default preferences
 
+Do not hide component extensions
 ---
- chrome/browser/background/background_mode_manager.cc              | 2 +-
- chrome/browser/chrome_content_browser_client.cc                   | 2 +-
- chrome/browser/net/prediction_options.cc                          | 2 +-
- chrome/browser/net/prediction_options.h                           | 2 +-
- chrome/browser/profiles/profile.cc                                | 2 +-
- .../resources/settings/reset_page/reset_profile_dialog.html       | 2 +-
- chrome/browser/signin/signin_promo.cc                             | 4 ++--
- chrome/browser/ui/browser_ui_prefs.cc                             | 4 ++--
- chrome/browser/ui/navigation_correction_tab_observer.cc           | 2 +-
- chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc     | 4 ----
- chrome/service/cloud_print/connector_settings.cc                  | 2 +-
- components/autofill/core/browser/autofill_manager.cc              | 2 +-
- components/bookmarks/browser/bookmark_utils.cc                    | 4 ++--
- components/safe_browsing/common/safe_browsing_prefs.cc            | 4 ++--
- extensions/common/extension.cc                                    | 8 --------
- 15 files changed, 17 insertions(+), 29 deletions(-)
+ chrome/browser/background/background_mode_manager.cc       |  2 +-
+ chrome/browser/chrome_content_browser_client.cc            |  2 +-
+ chrome/browser/net/prediction_options.cc                   |  2 +-
+ chrome/browser/net/prediction_options.h                    |  2 +-
+ chrome/browser/profiles/profile.cc                         |  2 +-
+ .../settings/reset_page/reset_profile_dialog.html          |  2 +-
+ chrome/browser/ui/browser_ui_prefs.cc                      |  4 ++--
+ chrome/browser/ui/navigation_correction_tab_observer.cc    |  2 +-
+ .../browser/ui/webui/local_discovery/local_discovery_ui.cc |  4 ----
+ chrome/service/cloud_print/connector_settings.cc           |  2 +-
+ components/autofill/core/browser/autofill_manager.cc       | 14 ++++----------
+ components/autofill/core/common/autofill_prefs.cc          |  2 +-
+ components/bookmarks/browser/bookmark_utils.cc             |  4 ++--
+ components/safe_browsing/common/safe_browsing_prefs.cc     |  4 ++--
+ extensions/common/extension.cc                             |  8 --------
+ 15 files changed, 19 insertions(+), 37 deletions(-)
 
 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -351,7 +351,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -301,7 +301,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
    registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
  #endif
@@ -35,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
-@@ -1053,7 +1053,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1149,7 +1149,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -47,9 +48,9 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/prediction_options.cc
 --- a/chrome/browser/net/prediction_options.cc
 +++ b/chrome/browser/net/prediction_options.cc
-@@ -30,7 +30,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
-         return NetworkPredictionStatus::ENABLED;
+@@ -31,7 +31,7 @@ NetworkPredictionStatus CanPrefetchAndPrerender(
        }
+       return NetworkPredictionStatus::DISABLED_DUE_TO_NETWORK;
      default:
 -      DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
 +      //DCHECK_EQ(NETWORK_PREDICTION_NEVER, network_prediction_options);
@@ -59,7 +60,7 @@ diff --git a/chrome/browser/net/prediction_options.cc b/chrome/browser/net/predi
 diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/prediction_options.h
 --- a/chrome/browser/net/prediction_options.h
 +++ b/chrome/browser/net/prediction_options.h
-@@ -23,7 +23,7 @@ enum NetworkPredictionOptions {
+@@ -22,7 +22,7 @@ enum NetworkPredictionOptions {
    NETWORK_PREDICTION_ALWAYS,
    NETWORK_PREDICTION_WIFI_ONLY,
    NETWORK_PREDICTION_NEVER,
@@ -71,7 +72,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -138,7 +138,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -83,8 +84,8 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-@@ -45,7 +45,7 @@
-         </paper-button>
+@@ -50,7 +50,7 @@
+         </cr-button>
        </div>
        <div slot="footer">
 -        <cr-checkbox id="sendSettings" checked>
@@ -92,24 +93,10 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
            $i18nRaw{resetPageFeedback}</cr-checkbox>
        </div>
      </cr-dialog>
-diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
---- a/chrome/browser/signin/signin_promo.cc
-+++ b/chrome/browser/signin/signin_promo.cc
-@@ -385,8 +385,8 @@ void ForceWebBasedSigninFlowForTesting(bool force) {
- void RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterIntegerPref(prefs::kSignInPromoStartupCount, 0);
--  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, false);
--  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoUserSkipped, true);
-+  registry->RegisterBooleanPref(prefs::kSignInPromoShowOnFirstRunAllowed, false);
-   registry->RegisterBooleanPref(prefs::kSignInPromoShowNTPBubble, false);
-   registry->RegisterIntegerPref(prefs::kDiceSigninUserMenuPromoCount, 0);
- }
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
    registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
    registry->RegisterBooleanPref(
@@ -126,19 +113,19 @@ 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
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {
+@@ -42,7 +42,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
+ // static
  void NavigationCorrectionTabObserver::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* prefs) {
-   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
--                             true,
-+                             false,
+-  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
++  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
                               user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
  }
  
 diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
 +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui.cc
-@@ -143,10 +143,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+@@ -107,10 +107,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kLocalDiscoveryNotificationsEnabled,
@@ -164,19 +151,57 @@ 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
-@@ -189,7 +189,7 @@ void AutofillManager::RegisterProfilePrefs(
-   registry->RegisterIntegerPref(
-       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
-   registry->RegisterBooleanPref(
--      prefs::kAutofillEnabled, true,
-+      prefs::kAutofillEnabled, false,
+@@ -516,10 +516,7 @@ bool AutofillManager::ShouldParseForms(const std::vector<FormData>& forms,
+   bool enabled = IsAutofillEnabled();
+   sync_state_ = personal_data_ ? personal_data_->GetSyncSigninState()
+                                : AutofillSyncSigninState::kNumSyncStates;
+-  if (!has_logged_autofill_enabled_) {
+-    AutofillMetrics::LogIsAutofillEnabledAtPageLoad(enabled, sync_state_);
+-    has_logged_autofill_enabled_ = true;
+-  }
++  has_logged_autofill_enabled_ = true;
+ 
+   return enabled;
+ }
+@@ -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.
+-      if (!has_logged_address_suggestions_count_) {
+-        AutofillMetrics::LogAddressSuggestionsCount(suggestions.size());
+-        has_logged_address_suggestions_count_ = true;
+-      }
++      has_logged_address_suggestions_count_ = true;
+     }
+   }
+ 
+@@ -1427,8 +1421,8 @@ void AutofillManager::Reset() {
+ #if defined(OS_ANDROID) || defined(OS_IOS)
+   autofill_assistant_.Reset();
+ #endif
+-  has_logged_autofill_enabled_ = false;
+-  has_logged_address_suggestions_count_ = false;
++  has_logged_autofill_enabled_ = true;
++  has_logged_address_suggestions_count_ = true;
+   did_show_suggestions_ = false;
+   user_did_type_ = false;
+   user_did_autofill_ = false;
+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
+@@ -150,7 +150,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
    registry->RegisterBooleanPref(
-       prefs::kAutofillProfileEnabled, true,
+-      prefs::kAutofillCreditCardEnabled, true,
++      prefs::kAutofillCreditCardEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterStringPref(
+       prefs::kAutofillProfileValidity, "",
 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
-@@ -443,12 +443,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,
@@ -194,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
-@@ -278,9 +278,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -167,9 +167,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(
@@ -209,7 +234,7 @@ diff --git a/components/safe_browsing/common/safe_browsing_prefs.cc b/components
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -366,14 +366,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
+@@ -365,14 +365,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
    if (is_theme())
      return false;
  
@@ -225,5 +250,5 @@ diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
    // show packaged apps and platform apps because there are some pieces of
    // functionality that are only available in chrome://extensions/ but which
 -- 
-2.7.4
+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
-@@ -291,6 +291,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+@@ -283,6 +283,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
    DCHECK(!callback_);
    callback_ = callback;
  
@@ -23,5 +23,5 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
        prefs_->GetInt64(prefs::kPopularSitesLastDownloadPref));
    const base::TimeDelta time_since_last_download =
 -- 
-2.7.4
+2.11.0
 

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
-@@ -122,6 +122,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) {
@@ -20,5 +20,5 @@ diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/t
  
    progress_callback_ = progress_callback;
 -- 
-2.7.4
+2.11.0
 

build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 28 Oct 2018 14:11:50 +0100
+Subject: Offer builtin autocomplete for chrome://flags
+
+---
+ chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+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
+@@ -255,6 +255,8 @@ std::vector<base::string16>
+ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+   std::vector<base::string16> builtins_to_provide;
+   builtins_to_provide.push_back(
++      base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
++  builtins_to_provide.push_back(
+       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
+ #if !defined(OS_ANDROID)
+   builtins_to_provide.push_back(
+-- 
+2.11.0
+

build/patches/Open-YouTube-links-in-Bromite.patch

@@ -9,10 +9,10 @@ Subject: Open YouTube links in Bromite
 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
-@@ -384,6 +384,13 @@ public class ExternalNavigationHandler {
-             return OverrideUrlLoadingResult.NO_OVERRIDE;
+@@ -402,6 +402,13 @@ public class ExternalNavigationHandler {
          }
  
+         // TODO(changwan): check if we need to handle URL even when external intent is off.
 +        // Force to open YouTube urls in Bromite
 +        String intentPackageName = intent.getPackage();
 +        if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
@@ -20,9 +20,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
 +            return OverrideUrlLoadingResult.NO_OVERRIDE;
 +        }
 +
-         // Sanitize the Intent, ensuring web pages can not bypass browser
-         // security (only access to BROWSABLE activities).
-         intent.addCategory(Intent.CATEGORY_BROWSABLE);
+         if (CommandLine.getInstance().hasSwitch(
+                 ChromeSwitches.DISABLE_EXTERNAL_INTENT_REQUESTS)) {
+             Log.w(TAG, "External intent handling is disabled by a command-line flag.");
 -- 
-2.7.4
+2.11.0
 

build/patches/Punt-the-Widevine-version-string.patch

@@ -10,7 +10,7 @@ Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromi
 diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
 --- a/chrome/common/chrome_content_client.cc
 +++ b/chrome/common/chrome_content_client.cc
-@@ -532,7 +532,7 @@ void ChromeContentClient::AddContentDecryptionModules(
+@@ -517,7 +517,7 @@ void ChromeContentClient::AddContentDecryptionModules(
      base::FilePath cdm_path;
      content::CdmCapability capability;
      if (IsWidevineAvailable(&cdm_path, &capability)) {
@@ -20,5 +20,5 @@ diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_conte
  
        cdms->push_back(
 -- 
-2.7.4
+2.11.0
 

build/patches/Remove-EV-certificates.patch

@@ -0,0 +1,101 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 2 Apr 2015 12:44:23 +0200
+Subject: Remove EV certificates
+
+The team chose to let EV certificates appear just like normal
+certificates. The web of trust is considered a failure in itself, so
+do not give users a false sense of extra security with EV certs.
+Instead, let them appear just like regular ones.
+---
+ net/cert/ev_root_ca_metadata.cc | 13 +++++++++----
+ net/cert/ev_root_ca_metadata.h  |  6 ++----
+ 2 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/net/cert/ev_root_ca_metadata.cc b/net/cert/ev_root_ca_metadata.cc
+--- a/net/cert/ev_root_ca_metadata.cc
++++ b/net/cert/ev_root_ca_metadata.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "net/cert/ev_root_ca_metadata.h"
+ 
+-#if defined(USE_NSS_CERTS)
++#if defined(USE_NSS_CERTS) && defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+ #include <cert.h>
+ #include <pkcs11n.h>
+ #include <secerr.h>
+@@ -19,7 +19,7 @@
+ #include "base/logging.h"
+ #include "base/strings/string_piece.h"
+ #include "net/der/input.h"
+-#if defined(USE_NSS_CERTS)
++#if defined(USE_NSS_CERTS) && defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+ #include "crypto/nss_util.h"
+ #elif defined(PLATFORM_USES_CHROMIUM_EV_METADATA) || defined(OS_WIN)
+ #include "third_party/boringssl/src/include/openssl/bytestring.h"
+@@ -763,7 +763,7 @@ EVRootCAMetadata* EVRootCAMetadata::GetInstance() {
+   return g_ev_root_ca_metadata.Pointer();
+ }
+ 
+-#if defined(USE_NSS_CERTS)
++#if defined(USE_NSS_CERTS) && defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+ 
+ namespace {
+ // Converts a DER-encoded OID (without leading tag and length) to a SECOidTag.
+@@ -1045,6 +1045,11 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
+ // metadata.
+ //
+ 
++bool EVRootCAMetadata::IsCaBrowserForumEvOid(PolicyOID policy_oid) {
++  LOG(WARNING) << "Not implemented";
++  return false;
++}
++
+ bool EVRootCAMetadata::IsEVPolicyOID(PolicyOID policy_oid) const {
+   LOG(WARNING) << "Not implemented";
+   return false;
+@@ -1084,7 +1089,7 @@ bool EVRootCAMetadata::RemoveEVCA(const SHA256HashValue& fingerprint) {
+ 
+ EVRootCAMetadata::EVRootCAMetadata() {
+ // Constructs the object from the raw metadata in kEvRootCaMetadata.
+-#if defined(USE_NSS_CERTS)
++#if defined(USE_NSS_CERTS) && defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+   crypto::EnsureNSSInit();
+ 
+   for (const auto& ev_root : kEvRootCaMetadata) {
+diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
+--- a/net/cert/ev_root_ca_metadata.h
++++ b/net/cert/ev_root_ca_metadata.h
+@@ -24,7 +24,7 @@
+     defined(OS_FUCHSIA)
+ // When not defined, the EVRootCAMetadata singleton is a dumb placeholder
+ // implementation that will fail all EV lookup operations.
+-#define PLATFORM_USES_CHROMIUM_EV_METADATA
++//#define PLATFORM_USES_CHROMIUM_EV_METADATA
+ #endif
+ 
+ namespace base {
+@@ -68,12 +68,10 @@ class NET_EXPORT_PRIVATE EVRootCAMetadata {
+   bool HasEVPolicyOIDGivenBytes(const SHA256HashValue& fingerprint,
+                                 const der::Input& policy_oid) const;
+ 
+-#if defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+   // Returns true if |policy_oid| is for 2.23.140.1.1 (CA/Browser Forum's
+   // Extended Validation Policy). This is used as a hack by the
+   // platform-specific CertVerifyProcs when doing EV verification.
+   static bool IsCaBrowserForumEvOid(PolicyOID policy_oid);
+-#endif
+ 
+   // AddEVCA adds an EV CA to the list of known EV CAs with the given policy.
+   // |policy| is expressed as a string of dotted numbers. It returns true on
+@@ -90,7 +88,7 @@ class NET_EXPORT_PRIVATE EVRootCAMetadata {
+   EVRootCAMetadata();
+   ~EVRootCAMetadata();
+ 
+-#if defined(USE_NSS_CERTS)
++#if defined(USE_NSS_CERTS) && defined(PLATFORM_USES_CHROMIUM_EV_METADATA)
+   using PolicyOIDMap = std::map<SHA256HashValue, std::vector<PolicyOID>>;
+ 
+   // RegisterOID registers |policy|, a policy OID in dotted string form, and
+-- 
+2.11.0
+

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

@@ -0,0 +1,46 @@
+From: Serg <serg.zhukovsky@gmail.com>
+Date: Wed, 22 Mar 2017 19:10:30 -0400
+Subject: Remove background sync and translate menu options
+
+---
+ chrome/android/java/res/xml/site_settings_preferences.xml             | 4 ----
+ .../chrome/browser/preferences/website/SiteSettingsPreferences.java   | 3 +--
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/site_settings_preferences.xml b/chrome/android/java/res/xml/site_settings_preferences.xml
+--- a/chrome/android/java/res/xml/site_settings_preferences.xml
++++ b/chrome/android/java/res/xml/site_settings_preferences.xml
+@@ -49,10 +49,6 @@
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+         android:key="ads" />
+-    <!-- Background sync -->
+-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+-        android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+-        android:key="background_sync" />
+     <!-- Automatic Downloads -->
+     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
+         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
+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
+@@ -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++) {
+-                if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA) continue;
++                if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA || i == Type.BACKGROUND_SYNC) continue;
+                 getPreferenceScreen().removePreference(findPreference(i));
+             }
+             getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
+@@ -111,7 +111,6 @@ public class SiteSettingsPreferences
+                 websitePrefs.add(Type.ADS);
+             }
+             websitePrefs.add(Type.AUTOMATIC_DOWNLOADS);
+-            websitePrefs.add(Type.BACKGROUND_SYNC);
+             CommandLine commandLine = CommandLine.getInstance();
+             if (commandLine.hasSwitch(ContentSwitches.ENABLE_WEB_BLUETOOTH_SCANNING)) {
+                 websitePrefs.add(Type.BLUETOOTH_SCANNING);
+-- 
+2.11.0
+

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

@@ -7,12 +7,13 @@ Subject: Remove help menu item
  .../java/src/org/chromium/chrome/browser/ChromeActivity.java     | 9 ---------
  .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 3 ---
  .../chromium/chrome/browser/customtabs/CustomTabActivity.java    | 2 +-
- 4 files changed, 1 insertion(+), 15 deletions(-)
+ .../chrome/browser/directactions/MenuDirectActionHandler.java    | 2 --
+ 5 files changed, 1 insertion(+), 17 deletions(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -74,8 +74,6 @@
+@@ -76,8 +76,6 @@
              android:icon="@drawable/reader_mode_prefs_icon" />
          <item android:id="@+id/preferences_id"
              android:title="@string/menu_preferences" />
@@ -24,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
-@@ -2046,15 +2046,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2076,15 +2076,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
          final Tab currentTab = getActivityTab();
  
@@ -56,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
-@@ -1219,7 +1219,7 @@ public class CustomTabActivity extends ChromeActivity {
+@@ -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
@@ -65,6 +66,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
                  || id == R.id.new_incognito_tab_menu_id || id == R.id.new_tab_menu_id
                  || id == R.id.open_history_menu_id) {
              return true;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/directactions/MenuDirectActionHandler.java
+@@ -35,7 +35,6 @@ class MenuDirectActionHandler implements DirectActionHandler {
+         map.put(ChromeDirectActionIds.RELOAD, R.id.reload_menu_id);
+         map.put(ChromeDirectActionIds.BOOKMARK_THIS_PAGE, R.id.bookmark_this_page_id);
+         map.put(ChromeDirectActionIds.DOWNLOADS, R.id.downloads_menu_id);
+-        map.put(ChromeDirectActionIds.HELP, R.id.help_id);
+         map.put(ChromeDirectActionIds.NEW_TAB, R.id.new_tab_menu_id);
+         map.put(ChromeDirectActionIds.OPEN_HISTORY, R.id.open_history_menu_id);
+         map.put(ChromeDirectActionIds.PREFERENCES, R.id.preferences_id);
+@@ -91,7 +90,6 @@ class MenuDirectActionHandler implements DirectActionHandler {
+         }
+ 
+         availableItemIds.add(R.id.downloads_menu_id);
+-        availableItemIds.add(R.id.help_id);
+         availableItemIds.add(R.id.new_tab_menu_id);
+         availableItemIds.add(R.id.preferences_id);
+ 
 -- 
-2.7.4
+2.11.0
 

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

@@ -0,0 +1,196 @@
+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       | 73 ++--------------------
+ .../android/signin/signin_manager_android.cc       |  3 +-
+ 2 files changed, 7 insertions(+), 69 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.metrics.RecordUserAction;
+ import org.chromium.base.task.PostTask;
+ import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+ import org.chromium.chrome.browser.externalauth.UserRecoverableErrorHandler;
+-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.components.sync.AndroidSyncSettings;
+ import org.chromium.content_public.browser.UiThreadTaskTraits;
+ 
+@@ -47,7 +44,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";
+ 
+     /**
+@@ -183,7 +180,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+      */
+     private long mNativeSigninManagerAndroid;
+     private final Context mContext;
+-    private final AccountTrackerService mAccountTrackerService;
+     private final AndroidSyncSettings mAndroidSyncSettings;
+     private final ObserverList<SignInStateObserver> mSignInStateObservers = new ObserverList<>();
+     private final ObserverList<SignInAllowedObserver> mSignInAllowedObservers =
+@@ -219,28 +215,24 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+      */
+     @CalledByNative
+     private static SigninManager create(
+-            long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
++            long nativeSigninManagerAndroid) {
+         assert nativeSigninManagerAndroid != 0;
+-        assert accountTrackerService != null;
+         return new SigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
+-                accountTrackerService, AndroidSyncSettings.get());
++                AndroidSyncSettings.get());
+     }
+ 
+     @VisibleForTesting
+     SigninManager(Context context, long nativeSigninManagerAndroid,
+-            AccountTrackerService accountTrackerService, AndroidSyncSettings androidSyncSettings) {
++            AndroidSyncSettings androidSyncSettings) {
+         ThreadUtils.assertOnUiThread();
+         assert context != null;
+         assert androidSyncSettings != null;
+         mContext = context;
+         mNativeSigninManagerAndroid = nativeSigninManagerAndroid;
+-        mAccountTrackerService = accountTrackerService;
+         mAndroidSyncSettings = androidSyncSettings;
+ 
+         mSigninAllowedByPolicy =
+                 SigninManagerJni.get().isSigninAllowedByPolicy(mNativeSigninManagerAndroid);
+-
+-        mAccountTrackerService.addSystemAccountsSeededListener(this);
+     }
+ 
+     /**
+@@ -249,7 +241,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+      */
+     @CalledByNative
+     public void destroy() {
+-        mAccountTrackerService.removeSystemAccountsSeededListener(this);
+         mNativeSigninManagerAndroid = 0;
+     }
+ 
+@@ -286,8 +277,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;
+     }
+ 
+     /**
+@@ -344,27 +334,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
+@@ -419,16 +388,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;
+-            handleGooglePlayServicesUnavailability(activity, !isForceSigninEnabled());
+-            Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
+-            abortSignIn();
+-        }
++        mSignInState.mBlockedOnAccountSeeding = true;
+     }
+ 
+     /**
+@@ -462,18 +422,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+         // This method should be called at most once per sign-in flow.
+         assert mSignInState != null;
+ 
+-        if (!SigninManagerJni.get().setPrimaryAccount(
+-                    mNativeSigninManagerAndroid, mSignInState.mAccount.name)) {
+-            Log.w(TAG, "Failed to set the PrimaryAccount in IdentityManager, aborting signin");
+-            abortSignIn();
+-            return;
+-        }
+-
+-        // 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);
+-        enableSync(mSignInState.mAccount);
+-
+         if (mSignInState.mCallback != null) {
+             mSignInState.mCallback.onSignInComplete();
+         }
+@@ -640,10 +588,8 @@ 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();
+         disableSyncAndWipeData(mSignOutState.mShouldWipeUserData, this::onProfileDataWiped);
+-        mAccountTrackerService.invalidateAccountSeedStatus(true);
+     }
+ 
+     @VisibleForTesting
+@@ -719,13 +665,6 @@ public class SigninManager implements AccountTrackerService.OnSystemAccountsSeed
+         SigninManagerJni.get().stopApplyingCloudPolicy(mNativeSigninManagerAndroid);
+     }
+ 
+-    private void enableSync(Account account) {
+-        // Cache the signed-in account name. This must be done after the native call, otherwise
+-        // sync tries to start without being signed in the native code and crashes.
+-        mAndroidSyncSettings.updateAccount(account);
+-        mAndroidSyncSettings.enableChromeSync();
+-    }
+-
+     private void disableSyncAndWipeData(
+             boolean shouldWipeUserData, final Runnable wipeDataCallback) {
+         mAndroidSyncSettings.updateAccount(null);
+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
+@@ -145,8 +145,7 @@ SigninManagerAndroid::SigninManagerAndroid(
+                              g_browser_process->local_state());
+ 
+   java_signin_manager_ = Java_SigninManager_create(
+-      base::android::AttachCurrentThread(), reinterpret_cast<intptr_t>(this),
+-      identity_manager_->LegacyGetAccountTrackerServiceJavaObject());
++      base::android::AttachCurrentThread(), reinterpret_cast<intptr_t>(this));
+ }
+ 
+ base::android::ScopedJavaLocalRef<jobject>
+-- 
+2.11.0
+

build/patches/Restore-classic-new-tab-page.patch

@@ -0,0 +1,38 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 11:40:05 +0100
+Subject: Restore classic new tab page
+
+---
+ chrome/browser/search/search.cc | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
+--- a/chrome/browser/search/search.cc
++++ b/chrome/browser/search/search.cc
+@@ -156,13 +156,6 @@ bool IsURLAllowedForSupervisedUser(const GURL& url, Profile* profile) {
+   return true;
+ }
+ 
+-bool ShouldShowLocalNewTab(Profile* profile) {
+-#if !defined(OS_ANDROID)
+-  return DefaultSearchProviderIsGoogle(profile);
+-#endif
+-  return false;
+-}
+-
+ // Used to look up the URL to use for the New Tab page. Also tracks how we
+ // arrived at that URL so it can be logged with UMA.
+ struct NewTabURLDetails {
+@@ -176,8 +169,7 @@ struct NewTabURLDetails {
+ 
+     const GURL local_url(chrome::kChromeSearchLocalNtpUrl);
+ 
+-    if (ShouldShowLocalNewTab(profile))
+-      return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
++    return NewTabURLDetails(local_url, NEW_TAB_URL_VALID);
+ 
+     const TemplateURL* template_url =
+         GetDefaultSearchProviderTemplateURL(profile);
+-- 
+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
+@@ -1961,6 +1961,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": 75
++  },
++  {
+     "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
+

build/patches/Skip-the-first-run-and-metrics.patch

@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-@@ -30,16 +30,12 @@ public class FirstRunUtils {
+@@ -28,16 +28,12 @@ public class FirstRunUtils {
          //   - checkAnyUserHasSeenToS() may be true which needs to sync its state to the prefs.
          boolean javaPrefValue = javaPrefs.getBoolean(CACHED_TOS_ACCEPTED_PREF, false);
          boolean nativePrefValue = prefsBridge.isFirstRunEulaAccepted();
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -74,7 +74,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+@@ -75,7 +75,7 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
              }
          });
  
@@ -65,7 +65,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
              int paddingStart = getResources().getDimensionPixelSize(
                      R.dimen.fre_tos_checkbox_padding);
              ViewCompat.setPaddingRelative(mSendReportCheckBox,
-@@ -86,8 +86,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+@@ -87,8 +87,10 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
              mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
          } else {
              mSendReportCheckBox.setVisibility(View.GONE);
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAnd
 +        mSendReportCheckBox.setVisibility(View.GONE);
          mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
  
-         NoUnderlineClickableSpan clickableTermsSpan = new NoUnderlineClickableSpan((view1) -> {
+         Resources resources = getResources();
 -- 
-2.7.4
+2.11.0
 

build/patches/Switch-to-fstack-protector-strong.patch

@@ -0,0 +1,39 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Wed, 26 Dec 2018 10:20:24 -0500
+Subject: Switch to -fstack-protector-strong
+
+This compiler option is already used for ChromeOS, but not yet on other
+platforms because there is push back against enabling an option resulting in
+~1-2% lower performance and ~2-3% larger binaries.
+
+The size increase on Android is something they care a lot about since some
+devices have very little storage space. That also means ever so slightly
+higher memory/cache usage but not by the full 2-3%.
+---
+ build/config/compiler/BUILD.gn | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+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
+@@ -273,16 +273,12 @@ config("compiler") {
+         cflags += [ "-fstack-protector" ]
+       }
+     } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
+-      # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it.
+-      # See also https://crbug.com/533294
+-      cflags += [ "--param=ssp-buffer-size=4" ]
+-
+       # The x86 toolchain currently has problems with stack-protector.
+       if (is_android && current_cpu == "x86") {
+         cflags += [ "-fno-stack-protector" ]
+       } else if (current_os != "aix") {
+         # Not available on aix.
+-        cflags += [ "-fstack-protector" ]
++        cflags += [ "-fstack-protector-strong" ]
+       }
+     }
+ 
+-- 
+2.11.0
+

build/patches/Use-4-tile-rows-never-show-logo.patch

@@ -0,0 +1,93 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 21 Feb 2018 00:32:09 +0100
+Subject: Use 4 tile rows, never show logo
+
+---
+ .../java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java  | 6 +++---
+ .../browser/suggestions/mostvisited/MostVisitedSitesBridge.java     | 2 +-
+ .../org/chromium/chrome/browser/suggestions/tile/SiteSection.java   | 2 +-
+ chrome/browser/engagement/important_sites_util.cc                   | 2 +-
+ components/history/core/browser/top_sites_impl.h                    | 2 +-
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+@@ -110,7 +110,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+     /** Observer for overview mode. */
+     private EmptyOverviewModeObserver mOverviewObserver;
+ 
+-    private boolean mSearchProviderHasLogo = true;
++    private boolean mSearchProviderHasLogo = false;
+     private boolean mSearchProviderIsGoogle;
+ 
+     private boolean mInitialized;
+@@ -538,7 +538,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+                 && mInitialized) {
+             return;
+         }
+-        mSearchProviderHasLogo = hasLogo;
++        mSearchProviderHasLogo = false;
+         mSearchProviderIsGoogle = isGoogle;
+ 
+         updateTileGridPadding();
+@@ -822,7 +822,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer
+     }
+ 
+     private static int getMaxTileRows() {
+-        return 2;
++        return 4;
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSitesBridge.java
+@@ -29,7 +29,7 @@ public class MostVisitedSitesBridge
+      * Maximum number of tiles that is explicitly supported. UMA relies on this value, so even if
+      * the UI supports it, getting more can raise unexpected issues.
+      */
+-    public static final int MAX_TILE_COUNT = 12;
++    public static final int MAX_TILE_COUNT = 12 * 2;
+ 
+     private long mNativeMostVisitedSitesBridge;
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/SiteSection.java
+@@ -115,7 +115,7 @@ public class SiteSection extends OptionalLeaf implements TileGroup.Observer {
+                         ExploreSitesBridge.getVariation())) {
+             return 1;
+         }
+-        return 2;
++        return 4;
+     }
+ 
+     @LayoutRes
+diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
+--- a/chrome/browser/engagement/important_sites_util.cc
++++ b/chrome/browser/engagement/important_sites_util.cc
+@@ -58,7 +58,7 @@ static const int kTimesIgnoredForBlacklist = 3;
+ // These are the maximum # of bookmarks we can use as signals. If the user has
+ // <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all
+ // bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks.
+-static const int kMaxBookmarks = 5;
++static const int kMaxBookmarks = 4 * 4 + 2;
+ 
+ // We need this to be a macro, as the histogram macros cache their pointers
+ // after the first call, so when we change the uma name we check fail if we're
+diff --git a/components/history/core/browser/top_sites_impl.h b/components/history/core/browser/top_sites_impl.h
+--- a/components/history/core/browser/top_sites_impl.h
++++ b/components/history/core/browser/top_sites_impl.h
+@@ -48,7 +48,7 @@ class TopSitesImpl : public TopSites, public HistoryServiceObserver {
+   using CanAddURLToHistoryFn = base::Callback<bool(const GURL&)>;
+ 
+   // How many top sites to store in the cache.
+-  static constexpr size_t kTopSitesNumber = 10;
++  static constexpr size_t kTopSitesNumber = 4 * 4 + 2;
+ 
+   TopSitesImpl(PrefService* pref_service,
+                HistoryService* history_service,
+-- 
+2.11.0
+

build/patches/Use-64-bit-WebView-processes.patch

@@ -0,0 +1,38 @@
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Thu, 26 Jan 2017 01:30:12 -0500
+Subject: Use 64-bit WebView processes
+
+64-bit processes introduce 10% or so higher memory consumption.
+The reason for preferring 64-bit processes is providing substantially better
+exploit mitigations at the expense of slightly more memory usage.
+
+In addition to the standard mitigations, it also enables usage of
+https://github.com/AndroidHardening/hardened_malloc (where available).
+
+It will provide high entropy ASLR (24-bit to 32-bit depending on whether the
+kernel uses 3 or 4 level page tables rather than 16-bit for 32-bit processes),
+high entropy stack canaries (56/64-bit instead of 24/32-bit depending on
+whether a zero byte is used) and also features like pointer authentication and
+memory tagging when those are made available in the future.
+
+The reason why upstream started preferring 32-bit processes is to save memory,
+particularly since saving memory makes it feasible to use finer-grained
+sandboxing.
+---
+ android_webview/apk/java/AndroidManifest.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml
+--- a/android_webview/apk/java/AndroidManifest.xml
++++ b/android_webview/apk/java/AndroidManifest.xml
+@@ -22,7 +22,6 @@
+                  android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
+                  android:name="{{ application_name|default('com.android.webview.chromium.WebViewApkApplication') }}"
+                  android:multiArch="true"
+-                 android:use32bitAbi="true"
+                  android:extractNativeLibs="{{ trichrome_library is not defined }}">
+         {# This part is shared between stand-alone WebView and Monochrome #}
+         {% macro common(manifest_package, webview_lib) %}
+-- 
+2.11.0
+

build/patches/User-Agent-anonymize.patch

@@ -0,0 +1,59 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 21 Mar 2018 14:15:28 +0100
+Subject: User Agent: anonymize
+
+Use a fixed device name and product version with the goal of not
+disclosing the specific build of Bromite.
+---
+ components/version_info/version_info.cc |  3 ++-
+ content/common/user_agent.cc            | 15 ++++-----------
+ 2 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/components/version_info/version_info.cc b/components/version_info/version_info.cc
+--- a/components/version_info/version_info.cc
++++ b/components/version_info/version_info.cc
+@@ -16,7 +16,8 @@
+ namespace version_info {
+ 
+ std::string GetProductNameAndVersionForUserAgent() {
+-  return "Chrome/" + GetVersionNumber();
++  // a common version for Android 8.0.0
++  return "Chrome/74.0.3729.157";
+ }
+ 
+ std::string GetProductName() {
+diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
+--- a/content/common/user_agent.cc
++++ b/content/common/user_agent.cc
+@@ -83,7 +83,7 @@ std::string BuildOSCpuInfo(bool include_android_build_number) {
+       architecture_token = "; Win64; IA64";
+   }
+ #elif defined(OS_ANDROID)
+-  std::string android_version_str = base::SysInfo::OperatingSystemVersion();
++  std::string android_version_str = "8.0.0";
+   std::string android_info_str = GetAndroidOSInfo(include_android_build_number);
+ #elif defined(OS_POSIX) && !defined(OS_MACOSX)
+   // Should work on any Posix system.
+@@ -155,16 +155,9 @@ std::string BuildUserAgentFromProductAndExtraOSInfo(
+ }
+ 
+ std::string GetAndroidOSInfo(bool include_android_build_number) {
+-  std::string android_info_str;
+-
+-  // Send information about the device.
+-  bool semicolon_inserted = false;
+-  std::string android_build_codename = base::SysInfo::GetAndroidBuildCodename();
+-  std::string android_device_name = base::SysInfo::HardwareModelName();
+-  if (!android_device_name.empty() && "REL" == android_build_codename) {
+-    android_info_str += "; " + android_device_name;
+-    semicolon_inserted = true;
+-  }
++  // Send spoofed information about the device.
++  std::string android_info_str = "; SM-G960F";
++  bool semicolon_inserted = true;
+ 
+   // Append the build ID.
+   if (base::FeatureList::IsEnabled(kAndroidUserAgentStringContainsBuildId) ||
+-- 
+2.11.0
+

build/patches/autofill-disable-autofill-download-manager.patch

@@ -0,0 +1,145 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 11 Sep 2014 16:37:32 +0200
+Subject: autofill: disable autofill download manager
+
+Disables the autofill download manager (trk:158).
+---
+ .../core/browser/autofill_download_manager.cc      | 60 +++-------------------
+ .../autofill/core/browser/autofill_manager.cc      | 18 -------
+ 2 files changed, 7 insertions(+), 71 deletions(-)
+
+diff --git a/components/autofill/core/browser/autofill_download_manager.cc b/components/autofill/core/browser/autofill_download_manager.cc
+--- a/components/autofill/core/browser/autofill_download_manager.cc
++++ b/components/autofill/core/browser/autofill_download_manager.cc
+@@ -63,7 +63,6 @@ constexpr std::pair<int, int> kAutofillExperimentRanges[] = {
+     {3314445, 3314448}, {3314854, 3314883},
+ };
+ 
+-const size_t kMaxQueryGetSize = 1400;  // 1.25 KiB
+ const size_t kAutofillDownloadManagerMaxFormCacheSize = 16;
+ const size_t kMaxFieldsPerQueryRequest = 100;
+ 
+@@ -519,35 +518,6 @@ bool GetUploadPayloadForApi(const AutofillUploadContents& upload,
+   return upload_request.SerializeToString(payload);
+ }
+ 
+-// Gets an API method URL given its type (query or upload), an optional
+-// resource ID, and the HTTP method to be used.
+-// Example usage:
+-// * GetAPIMethodUrl(REQUEST_QUERY, "1234", "GET") will return "/v1/pages/1234".
+-// * GetAPIMethodUrl(REQUEST_QUERY, "1234", "POST") will return "/v1/pages:get".
+-// * GetAPIMethodUrl(REQUEST_UPLOAD, "", "POST") will return "/v1/forms:vote".
+-std::string GetAPIMethodUrl(AutofillDownloadManager::RequestType type,
+-                            base::StringPiece resource_id,
+-                            base::StringPiece method) {
+-  const char* api_method_url;
+-  if (type == AutofillDownloadManager::REQUEST_QUERY) {
+-    if (method == "POST") {
+-      api_method_url = "/v1/pages:get";
+-    } else {
+-      api_method_url = "/v1/pages";
+-    }
+-  } else if (type == AutofillDownloadManager::REQUEST_UPLOAD) {
+-    api_method_url = "/v1/forms:vote";
+-  } else {
+-    // This should not be reached, but we never know.
+-    NOTREACHED() << "Request of type " << type << " is invalid";
+-    return "";
+-  }
+-  if (resource_id.empty()) {
+-    return std::string(api_method_url);
+-  }
+-  return base::StrCat({api_method_url, "/", resource_id});
+-}
+-
+ // Gets HTTP body payload for API POST request.
+ bool GetAPIBodyPayload(const std::string& payload,
+                        AutofillDownloadManager::RequestType type,
+@@ -771,6 +741,7 @@ size_t AutofillDownloadManager::GetPayloadLength(
+ 
+ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+     const FormRequestData& request_data) const {
++#if 0
+   std::string method("POST");
+   std::string query_str;
+ 
+@@ -793,35 +764,18 @@ std::tuple<GURL, std::string> AutofillDownloadManager::GetRequestURLAndMethod(
+   GURL url = autofill_server_url_
+                  .Resolve(RequestTypeToString(request_data.request_type))
+                  .ReplaceComponents(replacements);
++#else
++  std::string method("GET");
++  GURL url = GURL("about:blank");
++#endif
+   return std::make_tuple(std::move(url), std::move(method));
+ }
+ 
+ std::tuple<GURL, std::string>
+ AutofillDownloadManager::GetRequestURLAndMethodForApi(
+     const FormRequestData& request_data) const {
+-  // ID of the resource to add to the API request URL. Nothing will be added if
+-  // |resource_id| is empty.
+-  std::string resource_id;
+-  std::string method = "POST";
+-
+-  if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY) {
+-    if (GetPayloadLength(request_data.payload) <= kMaxAPIQueryGetSize) {
+-      resource_id = request_data.payload;
+-      method = "GET";
+-      UMA_HISTOGRAM_BOOLEAN("Autofill.Query.ApiUrlIsTooLong", false);
+-    } else {
+-      UMA_HISTOGRAM_BOOLEAN("Autofill.Query.ApiUrlIsTooLong", true);
+-    }
+-    UMA_HISTOGRAM_BOOLEAN("Autofill.Query.Method", (method == "GET") ? 0 : 1);
+-  }
+-
+-  // Make the canonical URL to query the API, e.g.,
+-  // https://autofill.googleapis.com/v1/forms/1234?alt=proto.
+-  GURL url = autofill_server_url_.Resolve(
+-      GetAPIMethodUrl(request_data.request_type, resource_id, method));
+-
+-  // Add the query parameter to set the response format to a serialized proto.
+-  url = net::AppendQueryParameter(url, "alt", "proto");
++  std::string method("GET");
++  GURL url = GURL("about:blank");
+ 
+   return std::make_tuple(std::move(url), std::move(method));
+ }
+diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
+--- a/components/autofill/core/browser/autofill_manager.cc
++++ b/components/autofill/core/browser/autofill_manager.cc
+@@ -180,19 +180,6 @@ void LogDeveloperEngagementUkm(ukm::UkmRecorder* ukm_recorder,
+   }
+ }
+ 
+-std::string GetAPIKeyForUrl(version_info::Channel channel) {
+-  // First look if we can get API key from command line flag.
+-  const base::CommandLine& command_line =
+-      *base::CommandLine::ForCurrentProcess();
+-  if (command_line.HasSwitch(switches::kAutofillAPIKey))
+-    return command_line.GetSwitchValueASCII(switches::kAutofillAPIKey);
+-
+-  // Get the API key from Chrome baked keys.
+-  if (channel == version_info::Channel::STABLE)
+-    return google_apis::GetAPIKey();
+-  return google_apis::GetNonStableAPIKey();
+-}
+-
+ ValuePatternsMetric GetValuePattern(const base::string16& value) {
+   if (IsUPIVirtualPaymentAddress(value))
+     return ValuePatternsMetric::kUpiVpa;
+@@ -1478,11 +1465,6 @@ AutofillManager::AutofillManager(
+                                     : std::make_unique<CreditCardAccessManager>(
+                                           driver, client_, personal_data_,
+                                           credit_card_form_event_logger_.get());
+-  if (enable_download_manager == ENABLE_AUTOFILL_DOWNLOAD_MANAGER) {
+-    version_info::Channel channel = client_->GetChannel();
+-    download_manager_.reset(new AutofillDownloadManager(
+-        driver, this, GetAPIKeyForUrl(channel), client_->GetLogManager()));
+-  }
+   CountryNames::SetLocaleString(app_locale_);
+ }
+ 
+-- 
+2.11.0
+

build/patches/battery_status_service-disable-more-privacy-nightmares.patch

@@ -24,7 +24,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/40
 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
-@@ -41,6 +41,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -70,6 +70,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
    if (!battery_fetcher_)
      battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
  
@@ -32,7 +32,7 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
    if (callback_list_.empty()) {
      bool success = battery_fetcher_->StartListeningBatteryChange();
      // On failure pass the default values back.
-@@ -52,6 +53,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -81,6 +82,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
      // Send recent status to the new callback if already available.
      callback.Run(status_);
    }
@@ -41,5 +41,5 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
    return callback_list_.Add(callback);
  }
 -- 
-2.7.4
+2.11.0
 

build/patches/browser-ui-disable-warning-about-missing-API-keys.patch

@@ -19,5 +19,5 @@ diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.cc b/chr
        std::unique_ptr<ConfirmInfoBarDelegate>(
            new GoogleApiKeysInfoBarDelegate())));
 -- 
-2.7.4
+2.11.0
 

build/patches/build-remove-calling-untrusted-hooks.patch

@@ -0,0 +1,179 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Thu, 20 Apr 2017 16:25:49 +0200
+Subject: build: remove calling untrusted hooks
+
+Avoid downloading untrusted executables and wasting time with a
+sysroot.
+---
+ DEPS | 121 ++-----------------------------------------------------------------
+ 1 file changed, 3 insertions(+), 118 deletions(-)
+
+diff --git a/DEPS b/DEPS
+--- a/DEPS
++++ b/DEPS
+@@ -75,7 +75,7 @@ vars = {
+ 
+   # Check out and download nacl by default. This can be disabled e.g. with
+   # custom_vars.
+-  'checkout_nacl': True,
++  'checkout_nacl': False,
+ 
+   # By default, do not check out src-internal. This can be overridden e.g. with
+   # custom_vars.
+@@ -99,8 +99,8 @@ vars = {
+   # support for other platforms may be added in the future.
+   'checkout_openxr' : 'checkout_win',
+ 
+-  'checkout_traffic_annotation_tools': 'checkout_configuration != "small"',
+-  'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration != "small"',
++  'checkout_traffic_annotation_tools': False,
++  'checkout_instrumented_libraries': False,
+ 
+   # By default, do not check out WebKit for iOS, as it is not needed unless
+   # running against ToT WebKit rather than system WebKit. This can be overridden
+@@ -3055,49 +3055,6 @@ hooks = [
+     ],
+   },
+   {
+-    'name': 'sysroot_arm',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and checkout_arm',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=arm'],
+-  },
+-  {
+-    'name': 'sysroot_arm64',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and checkout_arm64',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=arm64'],
+-  },
+-  {
+-    'name': 'sysroot_x86',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and (checkout_x86 or checkout_x64)',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=x86'],
+-  },
+-  {
+-    'name': 'sysroot_mips',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and checkout_mips',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=mips'],
+-  },
+-  {
+-    'name': 'sysroot_mips64',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and checkout_mips64',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=mips64el'],
+-  },
+-
+-  {
+-    'name': 'sysroot_x64',
+-    'pattern': '.',
+-    'condition': 'checkout_linux and checkout_x64',
+-    'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
+-               '--arch=x64'],
+-  },
+-  {
+     # Case-insensitivity for the Win SDK. Must run before win_toolchain below.
+     'name': 'ciopfs_linux',
+     'pattern': '.',
+@@ -3124,43 +3081,6 @@ hooks = [
+     'condition': 'checkout_mac',
+     'action': ['python', 'src/build/mac_toolchain.py'],
+   },
+-  # Pull binutils for linux, enabled debug fission for faster linking /
+-  # debugging when used with clang on Ubuntu Precise.
+-  # https://code.google.com/p/chromium/issues/detail?id=352046
+-  {
+-    'name': 'binutils',
+-    'pattern': 'src/third_party/binutils',
+-    'condition': 'host_os == "linux" and host_cpu != "mips64"',
+-    'action': [
+-        'python',
+-        'src/third_party/binutils/download.py',
+-    ],
+-  },
+-  {
+-    # Update the prebuilt clang toolchain.
+-    # Note: On Win, this should run after win_toolchain, as it may use it.
+-    'name': 'clang',
+-    'pattern': '.',
+-    'condition': 'not llvm_force_head_revision',
+-    'action': ['python', 'src/tools/clang/scripts/update.py'],
+-  },
+-  {
+-    # Build the clang toolchain from tip-of-tree.
+-    # Note: On Win, this should run after win_toolchain, as it may use it.
+-    'name': 'clang_tot',
+-    'pattern': '.',
+-    'condition': 'llvm_force_head_revision',
+-    'action': ['python', 'src/tools/clang/scripts/build.py',
+-               '--llvm-force-head-revision',
+-               '--with-android={checkout_android}'],
+-  },
+-  {
+-    # This is supposed to support the same set of platforms as 'clang' above.
+-    'name': 'clang_coverage',
+-    'pattern': '.',
+-    'condition': 'checkout_clang_coverage_tools',
+-    'action': ['python', 'src/tools/code_coverage/update_clang_coverage_tools.py'],
+-  },
+   {
+     # Mac doesn't use lld so it's not included in the default clang bundle
+     # there.  lld is however needed in win and Fuchsia cross builds, so
+@@ -3220,18 +3140,6 @@ hooks = [
+                 '-s', 'src/buildtools/mac/clang-format.sha1',
+     ],
+   },
+-  {
+-    'name': 'clang_format_linux',
+-    'pattern': '.',
+-    'condition': 'host_os == "linux"',
+-    'action': [ 'python',
+-                'src/third_party/depot_tools/download_from_google_storage.py',
+-                '--no_resume',
+-                '--no_auth',
+-                '--bucket', 'chromium-clang-format',
+-                '-s', 'src/buildtools/linux64/clang-format.sha1',
+-    ],
+-  },
+   # Pull rc binaries using checked-in hashes.
+   {
+     'name': 'rc_win',
+@@ -3257,29 +3165,6 @@ hooks = [
+                 '-s', 'src/build/toolchain/win/rc/mac/rc.sha1',
+     ],
+   },
+-  {
+-    'name': 'rc_linux',
+-    'pattern': '.',
+-    'condition': 'checkout_win and host_os == "linux"',
+-    'action': [ 'python',
+-                'src/third_party/depot_tools/download_from_google_storage.py',
+-                '--no_resume',
+-                '--no_auth',
+-                '--bucket', 'chromium-browser-clang/rc',
+-                '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1',
+-    ]
+-  },
+- {
+-    'name': 'test_fonts',
+-    'pattern': '.',
+-    'action': [ 'download_from_google_storage',
+-                '--no_resume',
+-                '--extract',
+-                '--no_auth',
+-                '--bucket', 'chromium-fonts',
+-                '-s', 'src/third_party/test_fonts/test_fonts.tar.gz.sha1',
+-    ],
+-  },
+   # Pull order files for the win/clang build.
+   {
+     'name': 'orderfiles_win',
+-- 
+2.11.0
+

build/patches/disable-AdsBlockedInfoBar.patch

@@ -0,0 +1,26 @@
+From: Zoraver Kang <zkang@wpi.edu>
+Date: Mon, 26 Aug 2019 17:54:28 -0400
+Subject: disable AdsBlockedInfoBar
+
+---
+ .../browser/subresource_filter/chrome_subresource_filter_client.cc   | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+--- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
++++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
+@@ -148,11 +148,6 @@ void ChromeSubresourceFilterClient::LogAction(SubresourceFilterAction action) {
+ }
+ 
+ void ChromeSubresourceFilterClient::ShowUI(const GURL& url) {
+-#if defined(OS_ANDROID)
+-  InfoBarService* infobar_service =
+-      InfoBarService::FromWebContents(web_contents());
+-  AdsBlockedInfobarDelegate::Create(infobar_service);
+-#endif
+   TabSpecificContentSettings* content_settings =
+       TabSpecificContentSettings::FromWebContents(web_contents());
+   content_settings->OnContentBlocked(CONTENT_SETTINGS_TYPE_ADS);
+-- 
+2.11.0
+