Release 81.0.4044.63

Mention when AdGuard filters were removed
Add question about PWAs WebAPK support
2020-03-13 18:52:40 +01:00 · 2020-03-09 18:42:38 +01:00 · 2020-03-07 08:47:32 +01:00 · 2020-02-27 23:34:45 +01:00 · 2020-02-22 14:33:41 +01:00 · 2020-02-18 07:50:35 +01:00
168 changed files with 275873 additions and 9845 deletions
@@ -1,9 +1,68 @@
+# 81.0.4044.63
+* use upstream fix for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485)
+* do not compile QR code sharing
+* remove obsolete patch for GCM experiment status
+* drop 2 patches for AImageReader crash fix (upstream has the same revert patches)
+
+# 80.0.3987.118
+* disable AImageReader for all ARM64 devices (fixes https://github.com/bromite/bromite/issues/497)
+* use upstream possible workaround for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485)
+
+# 80.0.3987.109
+* restored GPU workaround for the ARM/ARM64 AImageReader crash (https://github.com/bromite/bromite/issues/445)
+
+# 80.0.3987.95
+* enable user-agent freeze (fixes https://github.com/bromite/bromite/issues/483)
+* fix issue with AMP (fixes https://github.com/bromite/bromite/issues/488)
+* fix crash on home page (fixes https://github.com/bromite/bromite/issues/484)
+
+# 80.0.3987.78
+* removed ungoogled-chromium patch for non-remote developer tools resources
+* removed patch for 64-bit webview (it is now a default from upstream)
+* removed patch for enabling dark mode menu entry by default (it is now a default from upstream)
+* removed patch for enabling download rename by default (it is now a default from upstream)
+* removed some redundant Iridium safe browsing patches
+
+# 79.0.3945.139
+* remove patch to automatically disable video decoding acceleration on Android 10+ and arm64
+* fix referral headers bug in non-DoH requests (fixes https://github.com/bromite/bromite/issues/470)
+* disable smart selection by default, enable web search in incognito mode
+* disable DRM media pre-provisioning (fixes https://github.com/bromite/bromite/issues/471)
+
+# 79.0.3945.123
+* updated User-agent version
+* increase minimum DoH timeout to 400ms (fixes https://github.com/bromite/bromite/issues/437)
+
+# 79.0.3945.111
+* automatically disable video decoding acceleration on Android 10+ and arm64
+* restore enable-horizontal-tab-switcher flag
+* remove non-working contextual search settings
+* disable QUIC by default
+* remove logging for DoH timeouts
+
+# 79.0.3945.107
+* always show cookies, javascript and ads site settings (fixes https://github.com/bromite/bromite/issues/133)
+* remove global ads and javascript menu options
+
+# 79.0.3945.100
+* log timeout values for DoH
+* enable DFM (fixes https://github.com/bromite/bromite/issues/441)
+* updated User-agent version
+
+# 79.0.3945.94
+* removed patches which do not apply anymore (Widevine version punting, always show homepage settings, network errors UMA recording)
+* removed split APKs support (Play integration)
+* disabled password reuse functionality (Play integration)
+* re-introduced minimal headers for DoH
+* removed Startpage
+* disable feed support
+* updated User-agent version
+
 # 78.0.3904.130
 * support user-specified subresources filter URL (fixes https://github.com/bromite/bromite/issues/2)
 * revert removal of flag for disabling pull-to-refresh effect
 * fix crash when entering no DoH URL (fixes https://github.com/bromite/bromite/issues/430)
 * added Peter Lowe's Ad and tracking server list (fixes https://github.com/bromite/bromite/issues/423)
-* removed Startpage
 * enabled dav1d_decoder

 # 78.0.3904.119
@@ -173,6 +232,7 @@
 * use adblock engine also in SystemWebView
 * add back uBlock Origin and EasyList filters
 * added Fanboy's Annoyance List
+* remove AdGuard filters

 # 72.0.3626.119
 * use AdGuard filters
@@ -0,0 +1,73 @@
+# Frequently Asked Questions
+
+## Does Google Sync/Translate/Data saver work?
+No.
+This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
+
+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.
+Bromite uses [ungoogled-chromium's python script](https://github.com/Eloston/ungoogled-chromium/blob/master/utils/domain_substitution.py) to disable URLs in the codebase since version `78.0.3904.93`.
+
+Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).
+
+## Does Bromite support DRM media?
+
+Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium).
+This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization
+To disable this functionality you should disable protected content playback from Site settings -> Multimedia.
+
+## 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.
+
+Ad-blocking was present and always enabled in the SystemWebView from version `72.0.3626.120` till version `77.0.3865.104`, when it stopped working due to [upstream NetworkService changes](https://docs.google.com/document/d/1TZEuPvr2KAbP4_TZpuuwtEEArQsyAkc2HDu68l66YwU/edit?ts=598244df#heading=h.ougoi5i6508y).
+
+## How to enable DNS-over-HTTPS?
+
+See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
+
+## Can you add HTTPS everywhere?
+No.
+We cannot add add-ons to Bromite (merely some features).
+
+## Is Bromite on Play Store?
+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.
+
+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?
+Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
+
+The WebRTC functionality has always been using safe defaults to prevent leaks (disabled multiple routes and non-proxied UDP).
+
+## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite?
+In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design.
+
+For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/).
+
+## Does Bromite support extensions?
+No; Bromite will support extensions only if upstream (Chromium) does, or similarly another project maintains the patch and functionality.
+
+## Why do push notifications not work on this website?
+
+The [Chromium Blink engine](https://www.chromium.org/blink) uses [GCM](https://en.wikipedia.org/wiki/Google_Cloud_Messaging) to deliver messages
+when websites use the [Push API](https://w3c.github.io/push-api/); this will not work in Bromite because cloud integrations are disabled (GCM in this case).
+
+[ServiceWorker notifications](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration/showNotification) do work instead since they use
+[android.app.Notification](https://developer.android.com/guide/topics/ui/notifiers/notifications).
+
+## Can PWAs be installed?
+
+PWAs are only supported as home shortcuts; WebAPKs will not work because they are generated server-side on googleapis.com (which is not allowed in Bromite).
@@ -10,6 +10,10 @@ 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" />

+For the Frequently Asked Questions see [F.A.Q.](./FAQ.md).
+
+For documentation see the [wiki](https://github.com/bromite/bromite/wiki).
+
 # Goals

 Bromite aims at providing a no-clutter browsing experience without privacy-invasive features and with the addition of a fast ad-blocking engine.
@@ -21,64 +25,31 @@ Please donate to support development of Bromite and the costs for the build syst

 [&rarr; Support development with a donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2): [![paypal](https://www.bromite.org/assets/img/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)

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

 ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

-# F.A.Q.
-
-## Does Google Sync/Translate/Data saver work?
-No.
-This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
-
-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 HTTPS everywhere?
-No.
-We cannot add add-ons to Bromite (merely some features).
-
-## Is Bromite on Play Store?
-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.
-
-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?
-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

-* native adblock engine
+* customizable adblock filters via user-provided URL
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support via Google, Cloudflare, Quad9 and AdGuard servers
-* [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support
-* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
-* chrome flags to disable custom intents and clear session on exit
+* DNS-over-HTTPS support with any valid IETF DoH endpoint
 * 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
+* disable all field trials permanently
+* disable [QUIC](https://en.wikipedia.org/wiki/QUIC) by default
+* disable smart search by default, allow web search from incognito mode
+* always-visible cookies, javascript and ads site settings
+* remove Play integration binary blobs
+* use [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) on all architectures except x86
+* disable media router and remoting by default
+* disable dynamic module loading
+* enable site-per-process isolation for all devices with memory > 1GB
+* completely remove safe browsing and other privacy-unfriendly features
+* [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 available by default
+* flags to disable custom intents and clear session on exit
+* flags to toggle anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs
+* use frozen 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
 * security enhancement patches from [GrapheneOS](https://github.com/GrapheneOS) project

@@ -87,17 +58,30 @@ Yes, since version 69. While the desktop version of Chromium has an option to di
 * 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)
+* [dav1d](https://code.videolan.org/videolan/dav1d) decoder enabled by default
 * built with official speed optimizations
+* increase number of autocomplete matches from 5 to 10
+* allow changing default download storage location
+* do not ignore save prompt for users without SD cards
+* disable articles and increase number of icons on new tab page

-You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/build/patches
+You can inspect all functionality/privacy changes by reading the [patches](https://github.com/bromite/bromite/tree/master/build/patches) and/or the [CHANGELOG](./CHANGELOG.md).
+
+### Flags
+
+Flags which have been retired from upstream Chromium but are still available in Bromite.
+
+* `#enable-horizontal-tab-switcher`
+* `#pull-to-refresh`
+* `#enable-search-ready-omnibox`

 # 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.
+Bromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) 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 (or none otherwise).
+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 highlight the one apt for your device (or none otherwise).

 Each tag corresponds to a Chromium Stable release tag.

@@ -116,8 +100,6 @@ arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
 ```

-If you prefer an UI-based tool, you might want to look into [GtkHash](https://github.com/tristanheaven/gtkhash).
-
 You can verify authenticity, e.g. that the author ([csagan5](https://github.com/csagan5)) released the file, by using gpg2:
 ```
 $ gpg2 --quiet --verify brm_68.0.3440.54.sha256.txt.asc
@@ -128,8 +110,6 @@ gpg: Good signature from "csagan5 <32685696+csagan5@users.noreply.github.com>"

 You can download csagan5's public GnuPG key from here: [csagan5.asc](./csagan5.asc).

-**NOTE:** releases before v68 did not have published signed hashes files.
-
 # How to build

 The [Bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).
@@ -154,7 +134,6 @@ Bromite uses an unindexed filter file, which is periodically published at https:
 * [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, currently used only in the SystemWebView
 * [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo

 # Filters credits
@@ -162,6 +141,7 @@ Bromite uses an unindexed filter file, which is periodically published at https:
 * [EasyPrivacy](https://easylist.to/#easyprivacy)
 * [uBlock Origin](https://github.com/uBlockOrigin)
 * [Peter Lowe's Ad and tracking server list](https://pgl.yoyo.org/adservers/)
+
 # License

 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
@@ -2,12 +2,16 @@ android_channel="stable"
 blink_symbol_level=1
 dcheck_always_on=false
 debuggable_apks=false
+dfmify_dev_ui=false
 disable_android_lint=true
-enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+disable_autofill_assistant_dfm=true
+disable_tab_ui_dfm=true
 enable_av1_decoder=true
 enable_dav1d_decoder=true
+enable_feed_in_chrome=false
 enable_gvr_services=false
 enable_hangout_services_extension=false
+enable_iterator_debugging=false
 enable_mdns=false
 enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
 enable_nacl=false
@@ -16,18 +20,14 @@ enable_remoting=false
 enable_reporting=false
 enable_resource_whitelist_generation=false
 enable_vr=false
-exclude_unwind_tables = true
 fieldtrial_testing_like_official_build=true
-is_cfi=true
+icu_use_data_file=true
+is_cfi=false
 is_component_build=false
 is_debug=false
 is_official_build=true
-remove_webcore_debug_symbols=true
 rtc_build_examples=false
 safe_browsing_mode=0
-strip_absolute_paths_from_debug_symbols=true
-strip_debug_info=true
-symbol_level=0
 symbol_level=1
 target_os="android"
 use_debug_fission=true
@@ -1,20 +1,16 @@
 Disable-third-party-cookies-by-default.patch
 Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
-Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
 Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
 Always-allow-partner-customisation.patch
-Always-show-home-page-settings.patch
 battery_status_service-disable-more-privacy-nightmares.patch
 Battery-API-return-nothing.patch
-google-cloud-messaging-disable-experiment-status-check.patch
 updater-disable-updater-pings.patch
 prefs-only-keep-cookies-until-exit.patch
 Remove-EV-certificates.patch
 promo-disable-Google-promotion-fetching.patch
 Disable-omission-of-URL-elements-in-Omnibox.patch
 Modify-default-preferences.patch
-Disable-contextual-search-by-default.patch
 Do-not-store-passwords-by-default.patch
 Disable-NTP-remote-suggestions-by-default.patch
 Disable-references-to-fonts.googleapis.com.patch
@@ -32,20 +28,14 @@ ungoogled-chromium-Disable-GCM.patch
 ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-domain-reliability.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
-ungoogled-chromium-Always-use-local-DevTools-files-instead-of-remote-files-from-Google.patch
-safe_browsing-disable-incident-reporting.patch
-safe_browsing-disable-reporting-of-safebrowsing-override.patch
-safe_browsing-disable-cookie-transmission.patch
 Disable-safe-browsing.patch
 Skip-the-first-run-and-metrics.patch
 Disable-all-promo-dialogs.patch
 Disable-sync-services-menu-entry.patch
 Remove-signin-and-data-saver-integrations.patch
-Remove-background-sync-and-translate-menu-options.patch
 Hide-passwords-manager-link.patch
 Disable-Omaha-update-checks.patch
 Disable-update-scheduler.patch
-Add-StartPage-search-engine.patch
 Add-English-only-search-engine.patch
 Add-DuckDuckGo-Lite-search-engine.patch
 Add-Qwant-search-engine.patch
@@ -61,13 +51,9 @@ Add-flag-to-control-video-playback-resume-feature.patch
 Open-YouTube-links-in-Bromite.patch
 Add-exit-menu-item.patch
 Remove-help-menu-item.patch
-Add-menu-option-to-toggle-global-Javascript-preference.patch
-Add-menu-option-to-toggle-ad-blocker.patch
-User-Agent-anonymize.patch
 AudioBuffer-AnalyserNode-fingerprinting-mitigations-via-IDL.patch
 Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
 Add-flags-to-disable-device-motion-and-orientation-APIs.patch
-Punt-the-Widevine-version-string.patch
 Disable-metrics-on-all-I-O-threads.patch
 Always-respect-async-dns-flag-regardless-of-SDK-version.patch
 Add-flag-to-configure-maximum-connections-per-host.patch
@@ -102,8 +88,8 @@ Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.locatio
 Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
 Remove-dependency-on-com.google.android.gms.cast.patch
 Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
-Remove-play-dependency-for-module-installer.patch
 Remove-SMS-integration.patch
+Do-not-compile-QR-code-sharing.patch
 Allow-website-sign-in-without-account-sign-in.patch
 Offer-builtin-autocomplete-for-chrome-flags.patch
 Do-not-grant-notifications-to-default-search-engine.patch
@@ -114,26 +100,21 @@ Disable-previews-by-default.patch
 Use-4-tile-rows-never-show-logo.patch
 Disable-metrics-collection-for-NTP-tiles.patch
 Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
-Use-64-bit-WebView-processes.patch
 Add-option-to-use-home-page-as-NTP.patch
-Enable-night-mode-menu-entry-by-default.patch
 Disable-dynamic-module-loading.patch
 prefs-disable-signinallowed-by-default.patch
 prefs-always-prompt-for-download-directory-by-default.patch
 Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
 Enable-changing-default-downloads-storage-location-by-default.patch
-Enable-download-rename-option-by-default.patch
 disable-payment-support-by-default.patch
 disable-background-sync-by-default.patch
 disable-sensors-access-site-setting-by-default.patch
 Disable-media-router-and-remoting-by-default.patch
-Do-not-record-UMA-for-network-errors.patch
-Disable-unified-consent-on-Android.patch
 Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
 Disable-search-ready-omnibox-by-default.patch
 disable-AdsBlockedInfoBar.patch
 Bromite-AdBlockUpdaterService.patch
-Revert-Merge-to-M78-Enable-AImageReader-by-default.patch
+Add-option-to-configure-the-ad-blocker-filters-URL.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
 Increase-number-of-autocomplete-matches-from-5-to-10.patch
 Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
@@ -141,5 +122,20 @@ Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-schem
 Disable-some-signed-exchange-features.patch
 Add-flag-to-disable-WebGL.patch
 Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
+Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
 Revert-flags-remove-disable-pull-to-refresh-effect.patch
-Add-option-to-configure-the-ad-blocker-filters-URL.patch
+Use-dummy-DFM-installer.patch
+Disable-password-reuse-detection-on-android.patch
+Allow-building-without-feed-support.patch
+Disable-autofill-assistant-by-default.patch
+Always-show-site-settings-for-cookies-javascript-and-ads.patch
+Do-not-enable-QUIC-by-default.patch
+Restore-enable-horizontal-tab-switcher-flag.patch
+Use-a-minimum-DoH-timeout-of-400ms.patch
+Disable-DRM-media-origin-IDs-preprovisioning.patch
+Disable-smart-selection-by-default.patch
+Enable-user-agent-freeze-by-default.patch
+Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch
+Upstream-internal-DownloadCollectionBridge-code.patch
+Automated-domain-substitution.patch
+Add-missing-android_provider.patch
@@ -1,7 +1,6 @@
 Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
-Revert-Remove-UnifiedConsent-from-ChromeFeatureList.patch
 AV1-codec-support.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
-Disable-safe-browsing.patch
-Disable-sync-services-menu-entry.patch
+Disable-password-reuse-detection-on-android.patch
+Allow-building-without-feed-support.patch
@@ -5,27 +5,27 @@ 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 +-
+ media/base/mime_util_internal.cc                            | 6 +++++-
+ third_party/libaom/BUILD.gn                                 | 6 ++++--
+ third_party/libaom/libaom_srcs.gni                          | 5 +++++
+ .../config/linux/arm-neon-cpu-detect/config/aom_config.asm  | 2 +-
+ .../config/linux/arm-neon-cpu-detect/config/aom_config.h    | 2 +-
+ .../source/config/linux/arm-neon/config/aom_config.asm      | 2 +-
+ .../libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +-
+ .../libaom/source/config/linux/arm/config/aom_config.asm    | 2 +-
+ .../libaom/source/config/linux/arm/config/aom_config.h      | 2 +-
+ .../libaom/source/config/linux/arm64/config/aom_config.asm  | 2 +-
+ .../libaom/source/config/linux/arm64/config/aom_config.h    | 2 +-
+ .../source/config/linux/generic/config/aom_config.asm       | 2 +-
+ .../libaom/source/config/linux/generic/config/aom_config.h  | 2 +-
+ .../libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-
+ .../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(
+@@ -562,9 +562,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
     case THEORA:
       return false;
 
@@ -61,7 +61,7 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
       }
       configs += [ ":libaom_config" ]
 
-@@ -203,6 +203,8 @@ if (enable_libaom_decoder) {
+@@ -202,6 +202,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" ]
@@ -83,8 +83,8 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs
 + ]
 +
 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",
+   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl",
 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
@@ -230,5 +230,5 @@ diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/th
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_SHARED 0
 -- 
-2.11.0
+2.17.1

@@ -7,26 +7,26 @@ Allows to use a PAC script URL, automatic configuration and explicit proxy
 settings.
 Offer auto-complete for the proxy page URL.
 ---
- chrome/android/java/res/values/values.xml          |   3 +
- .../android/java/res/xml/privacy_preferences.xml   |   4 +
- .../chrome_autocomplete_provider_client.cc         |   2 +
- chrome/browser/browser_resources.grd               |   6 +
- .../prefs/chrome_command_line_pref_store.cc        |   2 +-
- chrome/browser/resources/proxy_config.css          |  61 ++++
- chrome/browser/resources/proxy_config.html         |  78 ++++
- chrome/browser/resources/proxy_config.js           | 252 +++++++++++++
- chrome/browser/ui/BUILD.gn                         |   2 +
- .../ui/webui/chrome_web_ui_controller_factory.cc   |   3 +
- chrome/browser/ui/webui/proxy_config_ui.cc         | 397 +++++++++++++++++++++
- chrome/browser/ui/webui/proxy_config_ui.h          |  33 ++
- chrome/common/webui_url_constants.cc               |   4 +
- chrome/common/webui_url_constants.h                |   2 +
- .../policy/core/browser/proxy_policy_handler.cc    |   2 +-
- components/proxy_config/proxy_config_dictionary.cc |  22 +-
- components/proxy_config/proxy_config_dictionary.h  |   6 +-
- net/proxy_resolution/proxy_config.cc               |  45 +++
- net/proxy_resolution/proxy_config.h                |   3 +
- 19 files changed, 915 insertions(+), 12 deletions(-)
+ chrome/android/java/res/values/values.xml     |   3 +
+ .../java/res/xml/privacy_preferences.xml      |   4 +
+ .../chrome_autocomplete_provider_client.cc    |   2 +
+ chrome/browser/browser_resources.grd          |   6 +
+ .../prefs/chrome_command_line_pref_store.cc   |   2 +-
+ chrome/browser/resources/proxy_config.css     |  61 +++
+ chrome/browser/resources/proxy_config.html    |  78 ++++
+ chrome/browser/resources/proxy_config.js      | 252 +++++++++++
+ chrome/browser/ui/BUILD.gn                    |   2 +
+ .../webui/chrome_web_ui_controller_factory.cc |   3 +
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 395 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.h     |  33 ++
+ chrome/common/webui_url_constants.cc          |   4 +
+ chrome/common/webui_url_constants.h           |   2 +
+ .../core/browser/proxy_policy_handler.cc      |   2 +-
+ .../proxy_config/proxy_config_dictionary.cc   |  22 +-
+ .../proxy_config/proxy_config_dictionary.h    |   6 +-
+ net/proxy_resolution/proxy_config.cc          |  45 ++
+ net/proxy_resolution/proxy_config.h           |   3 +
+ 19 files changed, 913 insertions(+), 12 deletions(-)
 create mode 100644 chrome/browser/resources/proxy_config.css
 create mode 100644 chrome/browser/resources/proxy_config.html
 create mode 100644 chrome/browser/resources/proxy_config.js
@@ -36,9 +36,9 @@ Offer auto-complete for the proxy page URL.
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -76,6 +76,9 @@
-     <integer name="list_item_level_selected">1</integer>
-     <integer name="list_item_level_incognito">2</integer>
+@@ -72,6 +72,9 @@
+     <!-- Value for scaleX to mirror drawables correctly for LTR / RTL layouts. -->
+     <integer name="automirror_scale_x_reverse">-1</integer>
 
 +    <string name="proxy_title">Proxy configuration</string>
 +    <string name="proxy_url">chrome://proxy</string>
@@ -53,29 +53,29 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-+    <org.chromium.chrome.browser.preferences.HyperlinkPreference
+    <org.chromium.chrome.browser.settings.HyperlinkPreference
 +        android:key="proxy"
 +        android:title="@string/proxy_title"
 +        app:url="@string/proxy_url" />
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+     <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
         android:key="search_suggestions"
         android:title="@string/search_suggestions_title"
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -257,6 +257,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -231,6 +231,8 @@ 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::kChromeUIProxyConfigURL));
 +  builtins_to_provide.push_back(
+      base::ASCIIToUTF16(chrome::kChromeUIProxyConfigURL));
+   builtins_to_provide.push_back(
       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
 #if !defined(OS_ANDROID)
-   builtins_to_provide.push_back(
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -202,6 +202,12 @@
+@@ -117,6 +117,12 @@
         <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
       </if>
 
@@ -86,12 +86,12 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 +      </if>
 +
       <!-- App Management. -->
-       <if expr="not is_android">
-         <include name="IDR_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js" use_base_dir="false" type="BINDATA" />
+       <if expr="chromeos">
+         <include name="IDR_APP_MANAGEMENT_BITMAP_MOJO_LITE_JS" file="${root_gen_dir}\skia\public\mojom\bitmap.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" />
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -153,7 +153,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -152,7 +152,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
     SetValue(
         proxy_config::prefs::kProxy,
         std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
@@ -509,7 +509,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -275,6 +275,8 @@ jumbo_split_static_library("ui") {
+@@ -267,6 +267,8 @@ jumbo_static_library("ui") {
     "webui/metrics_handler.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -521,7 +521,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -55,6 +55,7 @@
+@@ -58,6 +58,7 @@
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
 #include "chrome/browser/ui/webui/policy_ui.h"
 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
@@ -529,7 +529,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
 #include "chrome/browser/ui/webui/settings/settings_ui.h"
 #include "chrome/browser/ui/webui/settings_utils.h"
-@@ -413,6 +414,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -409,6 +410,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<MemoryInternalsUI>;
   if (url.host_piece() == chrome::kChromeUINetExportHost)
     return &NewWebUI<NetExportUI>;
@@ -542,7 +542,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webu
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,397 @@
+@@ -0,0 +1,395 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -811,9 +811,7 @@ new file mode 100644
 +void ProxyConfigMessageHandler::OnApply(const base::ListValue* list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  const base::Value::ListStorage& params = list->GetList();
-+
-+  if ((params.size() != 1) || !params[0].is_dict()) {
+  if ((list->GetList().size() != 1) || !list->GetList()[0].is_dict()) {
 +    return;
 +  }
 +
@@ -990,7 +988,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 const char kChromeUISnippetsInternalsHost[] = "snippets-internals";
 const char kChromeUIWebApksHost[] = "webapks";
 #endif
-@@ -456,6 +458,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
+@@ -472,6 +474,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
       kResetSubPage,
       kSmartLockSettingsSubPage,
       kSmbSharesSubPage,
@@ -998,7 +996,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
       kStorageSubPage,
       kStylusSubPage,
       kSwitchAccessSubPage,
-@@ -556,6 +559,7 @@ const char* const kChromeHostURLs[] = {
+@@ -577,6 +580,7 @@ const char* const kChromeHostURLs[] = {
 #if !defined(OS_ANDROID)
 #if !defined(OS_CHROMEOS)
     kChromeUIAppLauncherPageHost,
@@ -1009,7 +1007,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -110,6 +110,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -106,6 +106,8 @@ extern const char kChromeUIMemoryInternalsHost[];
 extern const char kChromeUINTPTilesInternalsHost[];
 extern const char kChromeUINaClHost[];
 extern const char kChromeUINetExportHost[];
@@ -1201,5 +1199,5 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
     // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
     // &fallback_proxies}, or NULL if there is no proxy to use.
 -- 
-2.11.0
+2.17.1

@@ -4,16 +4,18 @@ Subject: Add an always-incognito mode

 More specifically, add a preference that causes all new tabs and all
 clicked links to launch as incognito.
+Make sure initial incognito status is correctly recognized.
 ---
- chrome/android/chrome_java_sources.gni             |  1 +
- .../android/java/res/xml/privacy_preferences.xml   |  5 ++
- .../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(-)
+ chrome/android/chrome_java_sources.gni        |  1 +
+ .../java/res/xml/privacy_preferences.xml      |  5 ++
+ .../AlwaysIncognitoLinkInterceptor.java       | 74 +++++++++++++++++++
+ .../chrome/browser/ChromeActivity.java        |  4 +
+ .../chrome/browser/ChromeTabbedActivity.java  |  6 +-
+ .../AppMenuPropertiesDelegateImpl.java        |  6 ++
+ .../ChromeContextMenuPopulator.java           |  9 ++-
+ .../browser/tabmodel/ChromeTabCreator.java    | 20 ++++-
+ .../strings/android_chrome_strings.grd        |  7 ++
+ 9 files changed, 128 insertions(+), 4 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
@@ -26,7 +28,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 +  "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",
+   "java/src/org/chromium/chrome/browser/AfterStartupTaskUtils.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
@@ -34,19 +36,19 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
         android:title="@string/preload_pages_title"
         android:summary="@string/preload_pages_summary"
         android:persistent="false" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
 +        android:key="always_incognito"
 +        android:title="@string/always_incognito_title"
 +        android:summary="@string/always_incognito_summary"
 +        android:defaultValue="false" />
     <Preference
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings"
         android:key="do_not_track"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,74 @@
 +/* 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/. */
@@ -57,8 +59,9 @@ new file mode 100644
 +
 +import org.chromium.chrome.browser.tab.EmptyTabObserver;
 +import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabImpl;
 +import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
-+import org.chromium.chrome.browser.tabmodel.TabLaunchType;
+import org.chromium.chrome.browser.tab.TabLaunchType;
 +import org.chromium.chrome.browser.tabmodel.TabModel;
 +import org.chromium.content_public.browser.LoadUrlParams;
 +
@@ -72,7 +75,7 @@ new file mode 100644
 + */
 +public class AlwaysIncognitoLinkInterceptor extends EmptyTabObserver {
 +
-+    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
+    public static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
 +
 +    private final SharedPreferences alwaysIncognitoContainer;
 +    private final Map<Tab, String> lastUrls;
@@ -110,7 +113,7 @@ new file mode 100644
 +            return;
 +        }
 +
-+        tab.getActivity().getTabCreator(true).createNewTab(new LoadUrlParams(url), TabLaunchType.FROM_LINK, tab);
+        ((TabImpl) 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
@@ -123,159 +126,153 @@ 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
-@@ -225,6 +225,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- 
-     private static final int RECORD_MULTI_WINDOW_SCREEN_WIDTH_DELAY_MS = 5000;
- 
-+    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-+
-     /**
-      * Timeout in ms for reading PartnerBrowserCustomizations provider.
-      */
-@@ -1650,6 +1652,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -54,6 +54,7 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.base.supplier.ObservableSupplier;
+ import org.chromium.base.supplier.ObservableSupplierImpl;
+ import org.chromium.chrome.R;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
+ import org.chromium.chrome.browser.IntentHandler.TabOpenType;
+ import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl;
+@@ -1545,6 +1546,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
             throw new IllegalStateException(
                     "Attempting to access TabCreator before initialization");
         }
-+        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)) {
+        if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)) {
 +            return mIncognitoTabCreator;
 +        }
         return incognito ? mIncognitoTabCreator : mRegularTabCreator;
     }
 
-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;
+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
+@@ -49,6 +49,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
+ import org.chromium.base.supplier.Supplier;
+ import org.chromium.base.task.PostTask;
+ import org.chromium.chrome.R;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
+ import org.chromium.chrome.browser.IntentHandler.TabOpenType;
+ import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
+@@ -1570,8 +1571,9 @@ public class ChromeTabbedActivity extends ChromeActivity {
+         Bundle savedInstanceState = getSavedInstanceState();
 
- import org.chromium.base.Callback;
-+import org.chromium.base.ContextUtils;
- 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;
+         // We determine the model as soon as possible so every systems get initialized coherently.
+-        boolean startIncognito = savedInstanceState != null
+-                && savedInstanceState.getBoolean("is_incognito_selected", false);
+        boolean startIncognito = ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)
+                || (savedInstanceState != null
+                && savedInstanceState.getBoolean("is_incognito_selected", false));
+         int index = savedInstanceState != null ? savedInstanceState.getInt(WINDOW_INDEX, 0) : 0;
 
-+    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
-+
-     /**
-      * The resource id of the menu item to highlight when the menu next opens. A value of
-      * {@code null} means no item will be highlighted.  This value will be cleared after the menu is
-@@ -267,6 +270,14 @@ class AppMenuHandlerImpl
-         if (mDelegate.shouldShowHeader(appRect.height())) {
-             headerResourceId = mDelegate.getHeaderResourceId();
+         mTabModelSelectorImpl = (TabModelSelectorImpl)
+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
+@@ -293,6 +293,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                             ChromeSwitches.ENABLE_VR_SHELL_DEV));
         }
-+
-+        if (ContextUtils.getAppSharedPreferences().getBoolean(PREF_ALWAYS_INCOGNITO, false)) {
-+            final MenuItem newTabOption = mAppMenu.getMenu().findItem(R.id.new_tab_menu_id);
-+            if (newTabOption != null) {
+ 
+        if (ContextUtils.getAppSharedPreferences().getBoolean("always_incognito", false)) {
+            final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id);
+            if (newTabOption != null)
 +                newTabOption.setVisible(false);
-+            }
 +        }
 +
-         mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y,
-                 footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight,
-                 showFromBottom);
+         // We have to iterate all menu items since same menu item ID may be associated with more
+         // than one menu items.
+         boolean isMenuGroupTabsVisible = FeatureUtilities.isTabGroupsAndroidUiImprovementsEnabled()
 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
-@@ -15,6 +15,7 @@ import android.webkit.URLUtil;
- 
+@@ -19,7 +19,9 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.base.supplier.Supplier;
 +import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 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";
- 
-     /**
-      * Defines the Groups of each Context Menu Item
-@@ -298,7 +300,12 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+ import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
+ import org.chromium.chrome.browser.contextmenu.ContextMenuParams.PerformanceClass;
+@@ -329,7 +331,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)
+                if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)
 +                       && !mDelegate.isIncognito()) {
 +                    // disallow open in new tab
-+                } else {
+                } 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
-@@ -8,8 +8,10 @@ import android.content.Intent;
- import android.support.annotation.Nullable;
- import android.text.TextUtils;
+@@ -9,8 +9,10 @@ import android.text.TextUtils;
+ 
+ import androidx.annotation.Nullable;
 
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.SysUtils;
 import org.chromium.base.TraceEvent;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.ServiceTabLauncher;
-@@ -17,6 +19,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
+@@ -20,6 +22,7 @@ import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabAssociatedApp;
 import org.chromium.chrome.browser.tab.TabBuilder;
 +import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tab.TabDelegateFactory;
+ import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tab.TabParentIntent;
- import org.chromium.chrome.browser.tab.TabRedirectHandler;
-@@ -37,6 +40,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
- 
+@@ -43,6 +46,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
     private final ChromeActivity mActivity;
+     private final StartupTabPreloader mStartupTabPreloader;
     private final boolean mIncognito;
 +    private final TabObserver mExtraLogic;
 
     private WindowAndroid mNativeWindow;
     private TabModel mTabModel;
-@@ -47,6 +51,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-         mActivity = activity;
+@@ -57,6 +61,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
         mNativeWindow = nativeWindow;
+         mTabDelegateFactorySupplier = tabDelegateFactory;
         mIncognito = incognito;
-+        if (!mIncognito) {
+        if (!mIncognito)
 +            mExtraLogic = new AlwaysIncognitoLinkInterceptor(ContextUtils.getAppSharedPreferences());
-+        } else {
+        else
 +            mExtraLogic = null;
-+        }
     }
 
     @Override
-@@ -171,6 +180,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -195,6 +203,9 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
                         tab.getWebContents());
             }
 
-+            if (mExtraLogic != null) {
+            if (mExtraLogic != null)
 +                tab.addObserver(mExtraLogic);
-+            }
 +
             mTabModel.addTab(tab, position, type);
             return tab;
         } finally {
-@@ -199,6 +212,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-                           .setWindow(mNativeWindow)
-                           .setLaunchType(type)
+@@ -226,6 +237,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+                           .setDelegateFactory(delegateFactory)
+                           .setInitiallyHidden(!openInForeground)
                           .build();
 +
-+        if (mExtraLogic != null) {
+        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 {
+     }
+@@ -268,7 +283,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
      */
     public Tab launchUrlFromExternalApp(String url, String referer, String headers,
             String appId, boolean forceNewTab, Intent intent, long intentTimestamp) {
@@ -283,25 +280,24 @@ 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
-@@ -307,6 +324,11 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-                 state.isIncognito());
-         tab.initialize(null, createDefaultTabDelegateFactory(), !selectTab, state, false);
+@@ -335,6 +349,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+                           .setTabState(state)
+                           .build();
         assert state.isIncognito() == mIncognito;
 +
-+        if (mExtraLogic != null) {
+        if (mExtraLogic != null)
 +            tab.addObserver(mExtraLogic);
-+        }
 +
         mTabModel.addTab(tab, index, TabLaunchType.FROM_RESTORE);
         return tab;
     }
-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
-@@ -689,6 +689,14 @@ CHAR-LIMIT guidelines:
-         Search and site suggestions disabled
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -698,6 +698,13 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY" desc="A text for the basic tab explaining browsing history.">
+         Clears history and autocompletions in the address bar.
       </message>
- 
 +      <!-- always incognito -->
 +      <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
 +        Open links in incognito tabs always
@@ -309,10 +305,9 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
 +      <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>
-+
-       <!-- Themes preferences -->
-       <message name="IDS_PREFS_THEMES" desc="Title for the Themes preferences. [CHAR-LIMIT=32]">
-         Themes
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
+         Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
+       </message>
 -- 
-2.11.0
+2.17.1

@@ -6,29 +6,29 @@ 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 |  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   | 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 +
- .../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(-)
+ chrome/android/java/AndroidManifest.xml       |   1 -
+ .../res/menu/bookmark_action_bar_menu.xml     |  14 ++
+ .../browser/bookmarks/BookmarkActionBar.java  |  12 +
+ .../browser/bookmarks/BookmarkActivity.java   |  15 ++
+ .../browser/bookmarks/BookmarkBridge.java     |  47 ++++
+ .../browser/bookmarks/BookmarkDelegate.java   |  10 +
+ .../browser/bookmarks/BookmarkManager.java    |  20 ++
+ .../browser/bookmarks/BookmarkPage.java       |   1 +
+ chrome/browser/BUILD.gn                       |   8 +-
+ .../android/bookmarks/bookmark_bridge.cc      | 217 ++++++++++++++++++
+ .../android/bookmarks/bookmark_bridge.h       |  20 +-
+ chrome/browser/importer/profile_writer.cc     |  12 +
+ chrome/browser/importer/profile_writer.h      |   6 +
+ .../strings/android_chrome_strings.grd        |   6 +
+ chrome/common/BUILD.gn                        |   3 +
+ chrome/utility/BUILD.gn                       |   7 +-
+ .../utility/importer/bookmark_html_reader.cc  |  27 ++-
+ .../utility/importer/bookmark_html_reader.h   |   8 +
+ .../chromium/ui/base/SelectFileDialog.java    |  18 +-
+ ui/shell_dialogs/select_file_dialog.h         |   2 +
+ .../select_file_dialog_android.cc             |   6 +
+ ui/shell_dialogs/select_file_dialog_android.h |   2 +
+ 22 files changed, 448 insertions(+), 14 deletions(-)

 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
@@ -39,15 +39,16 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
     <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) %}
+     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+ 
 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 @@
+@@ -21,6 +21,20 @@
+             android:visible="false"
             app:showAsAction="ifRoom"
             app:iconTint="@color/standard_mode_tint" />
-         <item
+        <item
 +            android:id="@+id/import_menu_id"
 +            android:icon="@drawable/ic_folder_blue_24dp"
 +            android:title="@string/import_bookmarks"
@@ -61,14 +62,13 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
 +            android:visible="true"
 +            app:showAsAction="ifRoom"
 +            app:iconTint="@color/standard_mode_tint" />
-+        <item
+         <item
             android:id="@+id/close_menu_id"
             android:icon="@drawable/btn_close"
-             android:title="@string/bookmark_action_bar_close"
 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
-@@ -90,6 +90,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -82,6 +82,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
             return true;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         }
 
         SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
-@@ -141,6 +147,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -133,6 +139,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
     void showLoadingUi() {
         setTitle(null);
         setNavigationButton(NAVIGATION_BUTTON_NONE);
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         getMenu().findItem(R.id.search_menu_id).setVisible(false);
         getMenu().findItem(R.id.edit_menu_id).setVisible(false);
     }
-@@ -150,6 +158,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -142,6 +150,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
         super.showNormalView();
 
         if (mDelegate == null) {
@@ -99,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
             getMenu().findItem(R.id.search_menu_id).setVisible(false);
             getMenu().findItem(R.id.edit_menu_id).setVisible(false);
         }
-@@ -182,6 +192,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -172,6 +182,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
     public void onFolderStateSet(BookmarkId folder) {
         mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
 
@@ -111,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActivity.java
-@@ -12,6 +12,7 @@ import org.chromium.base.VisibleForTesting;
+@@ -13,6 +13,7 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.chrome.browser.SnackbarActivity;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.components.bookmarks.BookmarkId;
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 
 /**
  * The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager}
-@@ -21,6 +22,7 @@ import org.chromium.components.bookmarks.BookmarkId;
+@@ -22,6 +23,7 @@ import org.chromium.components.bookmarks.BookmarkId;
 public class BookmarkActivity extends SnackbarActivity {
 
     private BookmarkManager mBookmarkManager;
@@ -127,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,18 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -33,6 +35,18 @@ public class BookmarkActivity extends SnackbarActivity {
         if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;
         mBookmarkManager.updateForUrl(url);
         setContentView(mBookmarkManager.getView());
@@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     }
 
     @Override
-@@ -48,6 +62,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -49,6 +63,7 @@ public class BookmarkActivity extends SnackbarActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -166,29 +166,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +import android.net.Uri;
 import android.os.SystemClock;
 +import android.provider.Browser;
+ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
+@@ -26,6 +30,11 @@ import org.chromium.components.url_formatter.SchemeDisplay;
+ import org.chromium.components.url_formatter.UrlFormatter;
+ import org.chromium.content_public.browser.WebContents;
 
-@@ -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;
-@@ -525,6 +533,24 @@ public class BookmarkBridge {
+ 
+@@ -574,6 +583,24 @@ public class BookmarkBridge {
+                 mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
     }
 
-     /**
+    /**
 +     * Import bookmarks from a selected file.
 +     * @param window The current window of the bookmarks activity or page.
 +     */
@@ -206,11 +203,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        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.
-@@ -877,6 +903,24 @@ public class BookmarkBridge {
+@@ -954,6 +981,24 @@ public class BookmarkBridge {
         depthList.add(depth);
     }
 
@@ -235,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
         List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
         for (int i = 0; i < left.length; i++) {
-@@ -943,6 +987,8 @@ public class BookmarkBridge {
+@@ -1022,6 +1067,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);
@@ -247,10 +243,11 @@ 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/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
-@@ -70,6 +70,16 @@ interface BookmarkDelegate {
+@@ -67,6 +67,16 @@ interface BookmarkDelegate {
+      */
     void openSearchUI();
 
-     /**
+    /**
 +     * Imports bookmarks from user-selected file.
 +     */
 +    void importBookmarks();
@@ -260,30 +257,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +     */
 +    void exportBookmarks();
 +
-+    /**
+     /**
      * Dismisses the search UI.
      */
-     void closeSearchUI();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 --- 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.ChromeFeatureList;
+@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.chrome.R;
 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.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;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
+@@ -35,6 +36,7 @@ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;
 +import org.chromium.ui.base.ActivityWindowAndroid;
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
 
 import java.util.Stack;
- 
-@@ -58,6 +60,7 @@ public class BookmarkManager
+@@ -54,6 +56,7 @@ public class BookmarkManager
     private Activity mActivity;
     private ViewGroup mMainView;
     private BookmarkModel mBookmarkModel;
@@ -291,24 +287,25 @@ 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;
-@@ -362,6 +365,13 @@ public class BookmarkManager
+@@ -357,6 +360,13 @@ public class BookmarkManager
+         mNativePage = nativePage;
     }
 
-     /**
+    /**
 +     * Sets the Android window that is used by further intents created by the bookmark activity.
 +     */
 +    public void setWindow(ActivityWindowAndroid window) {
 +        mWindowAndroid = window;
 +    }
 +
-+    /**
+     /**
      * @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)}.
-@@ -523,6 +533,16 @@ public class BookmarkManager
+@@ -529,6 +539,16 @@ public class BookmarkManager
+         }
     }
 
-     @Override
+    @Override
 +    public void importBookmarks() {
 +        mBookmarkModel.importBookmarks(mWindowAndroid);
 +    }
@@ -318,41 +315,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mBookmarkModel.exportBookmarks();
 +    }
 +
-+    @Override
+     @Override
     public void openSearchUI() {
         setState(BookmarkUIState.createSearchState());
-         mSelectableListLayout.onStartSearch();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
-@@ -35,6 +35,7 @@ public class BookmarkPage extends BasicNativePage {
-         mManager = new BookmarkManager(
-                 activity, false, ((SnackbarManageable) activity).getSnackbarManager());
+@@ -29,6 +29,7 @@ public class BookmarkPage extends BasicNativePage {
+ 
+         mManager = new BookmarkManager(activity, false, activity.getSnackbarManager());
         mManager.setBasicNativePage(this);
-+	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
-@@ -236,6 +236,12 @@ CHAR-LIMIT guidelines:
-       <message name="IDS_SEARCH" desc="The label for a search button.">
-         Search
-       </message>
-+      <message name="IDS_IMPORT_BOOKMARKS" desc="The label for the import bookmarks button.">
-+        Import
-+      </message>
-+      <message name="IDS_EXPORT_BOOKMARKS" desc="The label for an export bookmarks button.">
-+        Export
-+      </message>
-       <message name="IDS_SHOW_INFO" desc="The label for a info button to show info.">
-         Show Info
-       </message>
+        mManager.setWindow(activity.getWindowAndroid());
+         mTitle = host.getContext().getResources().getString(R.string.bookmarks);
+ 
+         initWithView(mManager.getView());
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -174,6 +174,10 @@ jumbo_split_static_library("browser") {
+@@ -170,6 +170,10 @@ jumbo_static_library("browser") {
     "bitmap_fetcher/bitmap_fetcher_service.h",
     "bitmap_fetcher/bitmap_fetcher_service_factory.cc",
     "bitmap_fetcher/bitmap_fetcher_service_factory.h",
@@ -360,10 +340,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 +    "importer/profile_writer.h",
 +    "bookmarks/bookmark_html_writer.cc",
 +    "bookmarks/bookmark_html_writer.h",
-     "bookmarks/bookmark_model_factory.cc",
-     "bookmarks/bookmark_model_factory.h",
-     "bookmarks/chrome_bookmark_client.cc",
-@@ -3007,8 +3011,6 @@ jumbo_split_static_library("browser") {
+     "bluetooth/bluetooth_chooser_context.cc",
+     "bluetooth/bluetooth_chooser_context.h",
+     "bluetooth/bluetooth_chooser_context_factory.cc",
+@@ -3071,8 +3075,6 @@ jumbo_static_library("browser") {
       "badging/badge_manager_factory.h",
       "banners/app_banner_manager_desktop.cc",
       "banners/app_banner_manager_desktop.h",
@@ -372,7 +352,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",
-@@ -3115,8 +3117,6 @@ jumbo_split_static_library("browser") {
+@@ -3186,8 +3188,6 @@ jumbo_static_library("browser") {
       "importer/importer_uma.h",
       "importer/in_process_importer_bridge.cc",
       "importer/in_process_importer_bridge.h",
@@ -384,9 +364,17 @@ 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
-@@ -41,6 +41,21 @@
- #include "components/undo/undo_manager.h"
+@@ -34,6 +34,7 @@
+ #include "components/bookmarks/common/android/bookmark_type.h"
+ #include "components/bookmarks/common/bookmark_pref_names.h"
+ #include "components/bookmarks/managed/managed_bookmark_service.h"
+#include "components/favicon_base/favicon_usage_data.h"
+ #include "components/dom_distiller/core/url_utils.h"
+ #include "components/prefs/pref_service.h"
+ #include "components/query_parser/query_parser.h"
+@@ -43,6 +44,21 @@
 #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/web_contents.h"
 
 +#include "base/android/content_uri_utils.h"
 +#include "base/android/path_utils.h"
@@ -406,7 +394,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
-@@ -58,6 +73,56 @@ using bookmarks::BookmarkPermanentNode;
+@@ -60,6 +76,56 @@ using bookmarks::BookmarkPermanentNode;
 using bookmarks::BookmarkType;
 using content::BrowserThread;
 
@@ -462,8 +450,8 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +
 namespace {
 
- class BookmarkTitleComparer {
-@@ -134,6 +199,10 @@ BookmarkBridge::~BookmarkBridge() {
+ const int kInvalidId = -1;
+@@ -138,6 +204,10 @@ BookmarkBridge::~BookmarkBridge() {
   bookmark_model_->RemoveObserver(this);
   if (partner_bookmarks_shim_)
     partner_bookmarks_shim_->RemoveObserver(this);
@@ -474,7 +462,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 }
 
 void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -475,6 +544,152 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -543,6 +613,153 @@ jint BookmarkBridge::GetTotalBookmarkCount(
   return count;
 }
 
@@ -589,14 +577,15 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browse
 +  // the following import logic comes from BookmarksFileImporter class
 +  std::vector<ImportedBookmarkEntry> bookmarks;
 +  std::vector<importer::SearchEngineInfo> search_engines;
+  favicon_base::FaviconUsageDataList favicons;
 +
 +  bookmark_html_reader::ImportBookmarksFile(
 +      base::Callback<bool(void)>(),
-+      base::Bind(internal::CanImportURL),
+      base::BindRepeating(internal::CanImportURL),
 +      contents,
 +      &bookmarks,
 +      &search_engines,
-+      nullptr);
+      &favicons);
 +
 +  auto *writer = new ProfileWriter(profile_);
 +
@@ -662,7 +651,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
   jboolean IsEditBookmarksEnabled(JNIEnv* env);
 
   void LoadEmptyPartnerBookmarkShimForTesting(
-@@ -129,6 +138,13 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -133,6 +142,13 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
                              jlong id,
                              jint type);
 
@@ -676,7 +665,7 @@ diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser
   void SetBookmarkTitle(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
                         jlong id,
-@@ -274,12 +290,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -278,12 +294,14 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
   void ShimBeingDeleted(PartnerBookmarksShim* shim) override;
 
   Profile* profile_;
@@ -749,10 +738,26 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
   virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);
 
   // Adds the TemplateURLs in |template_urls| to the local store.
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -256,6 +256,12 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR-LIMIT=32]">
+         Sites
+       </message>
+      <message name="IDS_IMPORT_BOOKMARKS" desc="The label for the import bookmarks button.">
+        Import
+      </message>
+      <message name="IDS_EXPORT_BOOKMARKS" desc="The label for an export bookmarks button.">
+        Export
+      </message>
+       <message name="IDS_NOTIFICATION_CATEGORY_VR" desc="Label for notifications in VR, within a list of notification categories. [CHAR-LIMIT=32]">
+         Virtual Reality
+       </message>
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -440,6 +440,9 @@ static_library("common") {
+@@ -420,6 +420,9 @@ static_library("common") {
     sources += [
       "media/chrome_media_drm_bridge_client.cc",
       "media/chrome_media_drm_bridge_client.h",
@@ -765,7 +770,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
-@@ -66,8 +66,6 @@ static_library("utility") {
+@@ -70,8 +70,6 @@ static_library("utility") {
 
   if (!is_android) {
     sources += [
@@ -774,7 +779,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
       "importer/bookmarks_file_importer.cc",
       "importer/bookmarks_file_importer.h",
       "importer/edge_database_reader_win.cc",
-@@ -160,6 +158,11 @@ static_library("utility") {
+@@ -169,6 +167,11 @@ static_library("utility") {
     }
   }
 
@@ -815,21 +820,39 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
 
 }  // namespace
 
-@@ -108,12 +112,10 @@ static std::string stripDt(const std::string& lineDt) {
+@@ -106,14 +110,28 @@ static std::string stripDt(const std::string& lineDt) {
+ }
+ 
 void ImportBookmarksFile(
-     const base::Callback<bool(void)>& cancellation_callback,
-     const base::Callback<bool(const GURL&)>& valid_url_callback,
-    const base::FilePath& file_path,
-+    const std::string& content,
+-    base::RepeatingCallback<bool(void)> cancellation_callback,
+-    base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
+    const base::RepeatingCallback<bool(void)> cancellation_callback,
+    const base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
+     const base::FilePath& file_path,
     std::vector<ImportedBookmarkEntry>* bookmarks,
     std::vector<importer::SearchEngineInfo>* search_engines,
     favicon_base::FaviconUsageDataList* favicons) {
-  std::string content;
+   std::string content;
 -  base::ReadFileToString(file_path, &content);
+  if (!base::ReadFileToString(file_path, &content)) {
+     LOG(ERROR) << "Could not directly read bookmarks import file";
+     return;
+  }
+
+  ImportBookmarksFile(cancellation_callback, valid_url_callback, content, bookmarks, search_engines, favicons);
+}
+
+void ImportBookmarksFile(
+    base::RepeatingCallback<bool(void)> cancellation_callback,
+    base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
+    const std::string& content,
+    std::vector<ImportedBookmarkEntry>* bookmarks,
+    std::vector<importer::SearchEngineInfo>* search_engines,
+    favicon_base::FaviconUsageDataList* favicons) {
   std::vector<std::string> lines = base::SplitString(
       content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
-@@ -126,6 +128,7 @@ void ImportBookmarksFile(
+@@ -126,6 +144,7 @@ void ImportBookmarksFile(
   std::vector<base::string16> path;
   size_t toolbar_folder_index = 0;
   std::string charset = "UTF-8";  // If no charset is specified, assume utf-8.
@@ -837,7 +860,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
   for (size_t i = 0;
        i < lines.size() &&
            (cancellation_callback.is_null() || !cancellation_callback.Run());
-@@ -218,10 +221,12 @@ void ImportBookmarksFile(
+@@ -218,10 +237,12 @@ void ImportBookmarksFile(
       }
       bookmarks->push_back(entry);
 
@@ -850,44 +873,20 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
 
       continue;
     }
-@@ -278,6 +283,22 @@ void ImportBookmarksFile(
-   }
- }
- 
-+void ImportBookmarksFile(
-+    const base::Callback<bool(void)>& cancellation_callback,
-+    const base::Callback<bool(const GURL&)>& valid_url_callback,
-+    const base::FilePath& file_path,
-+    std::vector<ImportedBookmarkEntry>* bookmarks,
-+    std::vector<importer::SearchEngineInfo>* search_engines,
-+    favicon_base::FaviconUsageDataList* favicons) {
-+  std::string content;
-+  if (!base::ReadFileToString(file_path, &content)) {
-+     LOG(ERROR) << "Could not directly read bookmarks import file";
-+     return;
-+  }
-+
-+  ImportBookmarksFile(cancellation_callback, valid_url_callback, content, bookmarks, search_engines, favicons);
-+}
-+
- bool CanImportURLAsSearchEngine(const GURL& url,
-                                 std::string* search_engine_url) {
-   std::string url_spec = url.possibly_invalid_spec();
 diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
 --- a/chrome/utility/importer/bookmark_html_reader.h
 +++ b/chrome/utility/importer/bookmark_html_reader.h
-@@ -51,6 +51,15 @@ void ImportBookmarksFile(
+@@ -51,6 +51,14 @@ void ImportBookmarksFile(
     std::vector<importer::SearchEngineInfo>* search_engines,
     favicon_base::FaviconUsageDataList* favicons);
 
 +void ImportBookmarksFile(
-+    const base::Callback<bool(void)>& cancellation_callback,
-+    const base::Callback<bool(const GURL&)>& valid_url_callback,
+    const base::RepeatingCallback<bool(void)> cancellation_callback,
+    const base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
 +    const std::string& content,
 +    std::vector<ImportedBookmarkEntry>* bookmarks,
 +    std::vector<importer::SearchEngineInfo>* search_engines,
 +    favicon_base::FaviconUsageDataList* favicons);
-+
 +
 // 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
@@ -895,7 +894,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
-@@ -33,6 +33,7 @@ import org.chromium.base.task.PostTask;
+@@ -35,6 +35,7 @@ import org.chromium.base.task.PostTask;
 import org.chromium.base.task.TaskTraits;
 import org.chromium.ui.PhotoPickerListener;
 import org.chromium.ui.R;
@@ -903,7 +902,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
 import org.chromium.ui.UiUtils;
 
 import java.io.File;
-@@ -52,6 +53,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -54,6 +55,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/";
@@ -911,7 +910,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
     private static final String ALL_IMAGE_TYPES = IMAGE_TYPE + "*";
     private static final String ALL_VIDEO_TYPES = VIDEO_TYPE + "*";
     private static final String ALL_AUDIO_TYPES = AUDIO_TYPE + "*";
-@@ -130,6 +132,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -132,6 +134,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         mFileTypes = fileTypes;
     }
 
@@ -923,7 +922,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
     /**
      * Creates and starts an intent based on the passed fileTypes and capture value.
      * @param fileTypes MIME types requested (i.e. "image/*")
-@@ -157,7 +164,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -159,7 +166,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         List<String> missingPermissions = new ArrayList<>();
         String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
         boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -932,7 +931,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
             if (!window.hasPermission(storagePermission)) missingPermissions.add(storagePermission);
         } else {
             if (((mSupportsImageCapture && shouldShowImageTypes())
-@@ -185,7 +192,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -187,7 +194,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                         }
 
                         // TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
@@ -941,7 +940,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                             if (permissions.length != requestPermissions.length) {
                                 throw new RuntimeException(
                                         String.format("Permissions arrays misaligned: %d != %d",
-@@ -199,7 +206,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -201,7 +208,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                             }
                         }
 
@@ -950,7 +949,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                             onFileNotSelected();
                             return;
                         }
-@@ -348,6 +355,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -350,6 +357,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
             }
             if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
         }
@@ -958,7 +957,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
         return mimeTypes;
     }
 
-@@ -625,6 +633,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -627,6 +635,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         return countAcceptTypesFor(specificType) > 0;
     }
 
@@ -972,7 +971,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
 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
+@@ -191,6 +191,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
                   void* params);
   bool HasMultipleFileTypeChoices();
 
@@ -1010,5 +1009,5 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/se
   ~SelectFileDialogImpl() override;
 
 -- 
-2.11.0
+2.17.1

@@ -3,12 +3,12 @@ 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 ++
- .../browser/preferences/privacy/PrivacyPreferences.java       | 11 +++++++++++
- chrome/android/java/strings/android_chrome_strings.grd        |  7 +++++++
- 5 files changed, 28 insertions(+)
+ chrome/android/java/res/values/values.xml           |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml |  5 +++++
+ .../chrome/browser/LaunchIntentDispatcher.java      |  3 +++
+ .../browser/settings/privacy/PrivacySettings.java   | 13 ++++++++++++-
+ .../ui/android/strings/android_chrome_strings.grd   |  7 +++++++
+ 5 files changed, 30 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
@@ -27,40 +27,50 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -29,6 +29,11 @@
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.DoNotTrackPreference"
+         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackSettings"
         android:key="do_not_track"
         android:title="@string/do_not_track_title" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+    <org.chromium.chrome.browser.settings.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" />
-     <android.support.v7.preference.Preference
-         android:key="contextual_search"
-         android:title="@string/contextual_search_title"
+     <Preference
+         android:key="clear_browsing_data"
+         android:title="@string/clear_browsing_data_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
- import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
+@@ -43,6 +43,7 @@ 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.util.FeatureUtilities;
-@@ -273,6 +274,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+import org.chromium.chrome.browser.settings.privacy.PrivacySettings;
+ import org.chromium.chrome.browser.util.IntentUtils;
+ import org.chromium.chrome.browser.util.UrlConstants;
+ import org.chromium.chrome.browser.vr.VrModuleProvider;
+@@ -251,6 +252,8 @@ 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;
-         // 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
-@@ -43,6 +43,8 @@ public class PrivacyPreferences
+        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
+            return false;
+         if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
+                 || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
+             return false;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
+@@ -15,7 +15,7 @@ import android.view.MenuItem;
+ 
+ import org.chromium.base.BuildInfo;
+ import org.chromium.chrome.R;
+-import org.chromium.chrome.browser.ChromeFeatureList;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.help.HelpAndFeedback;
+ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+@@ -41,6 +41,8 @@ public class PrivacySettings
 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
@@ -68,19 +78,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 +
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
-@@ -101,6 +103,10 @@ public class PrivacyPreferences
-             PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
+         SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+@@ -76,6 +78,10 @@ public class PrivacySettings
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 +        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-         } else if (PREF_CONTEXTUAL_SEARCH.equals(key)) {
-             PrefServiceBridge.getInstance().setContextualSearchPreference(((boolean) newValue) ? "true" : "false");
-         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-@@ -141,6 +147,11 @@ public class PrivacyPreferences
+         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
+         }
+@@ -111,6 +117,11 @@ public class PrivacySettings
                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -91,13 +101,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
 +
         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
-@@ -4020,6 +4020,13 @@ The site does NOT gain access to the camera. The camera images are only visible
-       <message name="IDS_INCOGNITO_DISCLOSURE_CHECKBOX_TEXT" desc="Text for checkbox inviting to close incognito tabs in incognito disclosure dialog." translateable="false">
-          Close other incognito tabs
+             doNotTrackPref.setSummary(prefServiceBridge.getBoolean(Pref.ENABLE_DO_NOT_TRACK)
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -3863,6 +3863,13 @@ Only you can see what your camera is looking at. The site can't see your camera'
+       <message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded.">
+          Show original
       </message>
 +      <!-- Allow custom tab intents -->
 +      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
@@ -110,5 +120,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
       <!-- Autofill Assistant preferences -->
       <message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR-LIMIT=32]">
 -- 
-2.11.0
+2.17.1

@@ -4,16 +4,16 @@ Subject: Add exit menu item

 Corrected Exit functionality
 ---
- chrome/android/java/res/menu/main_menu.xml                          | 2 ++
- .../java/src/org/chromium/chrome/browser/ChromeActivity.java        | 2 ++
- .../org/chromium/chrome/browser/init/ChromeLifetimeController.java  | 6 +++++-
- chrome/android/java/strings/android_chrome_strings.grd              | 3 +++
+ chrome/android/java/res/menu/main_menu.xml                  | 2 ++
+ .../src/org/chromium/chrome/browser/ChromeActivity.java     | 2 ++
+ .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
+ .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

 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
-@@ -80,6 +80,8 @@
+@@ -87,6 +87,8 @@
             android:title="@string/menu_help" />
         <item android:id="@+id/enter_vr_id"
             android:title="@string/enter_vr" />
@@ -25,9 +25,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
-@@ -2137,6 +2137,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-                     new AddToHomescreenManager(this, currentTab);
-             addToHomescreenManager.start();
+@@ -2044,6 +2044,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             AddToHomescreenCoordinator.showForAppMenu(
+                     this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents());
             RecordUserAction.record("MobileMenuAddToHomescreen");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
@@ -50,11 +50,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
     }
 
     @Override
-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
-@@ -2947,6 +2947,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -2818,6 +2818,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
         Settings
       </message>
 +      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
@@ -64,5 +64,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
         Close all tabs
       </message>
 -- 
-2.11.0
+2.17.1

@@ -6,20 +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 ++++
- .../url_formatter/spoof_checks/top_domains/BUILD.gn     |  1 +
- net/socket/client_socket_pool_manager.cc                | 17 +++++++++++++++++
+ 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 ++++
+ .../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
-@@ -669,6 +669,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -736,6 +736,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
      net::kEffectiveConnectionType4G},
 };
 
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // Ensure that all effective connection types returned by Network Quality
 // Estimator (NQE) are also exposed via flags.
 static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2538,6 +2543,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2695,6 +2700,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kPassiveDocumentEventListenersName,
      flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
@@ -44,9 +44,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -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";
+@@ -1181,6 +1181,10 @@ const char kMediaInspectorLoggingDescription[] =
+     "project; #enable-devtools-experiments must also be enabled as well on "
+     "desktop platforms";
 
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -58,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
-@@ -761,6 +761,9 @@ extern const char kMarkHttpAsWarning[];
- extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
- extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
+@@ -703,6 +703,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
+ extern const char kMediaInspectorLoggingName[];
+ extern const char kMediaInspectorLoggingDescription[];
 
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -110,7 +110,7 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 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") {
+@@ -73,6 +73,7 @@ executable("make_top_domain_list_variables") {
     "//base",
     "//base:i18n",
     "//third_party/icu",
@@ -132,7 +132,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 
 namespace net {
 
-@@ -185,6 +189,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -187,6 +191,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);
@@ -153,5 +153,5 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 }
 
 -- 
-2.11.0
+2.17.1

@@ -13,21 +13,21 @@ Disable it by default on Android as it is everywhere else
 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)},
+@@ -1697,6 +1697,10 @@ const FeatureEntry kFeatureEntries[] = {
+ #if defined(USE_AURA)
+     {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName,
+      flag_descriptions::kOverlayScrollbarsDescription,
 +    {"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)},
+      // Uses the system preference on Mac (a different implementation).
+      // On Android, this is always enabled.
+      kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)},
 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";
+@@ -800,6 +800,11 @@ const char kMemlogStackModeNative[] = "Native";
 const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
 const char kMemlogStackModePseudo[] = "Trace events";
 
@@ -42,9 +42,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
-@@ -520,6 +520,9 @@ extern const char kEnablePortalsDescription[];
- extern const char kEnablePictureInPictureName[];
- extern const char kEnablePictureInPictureDescription[];
+@@ -462,6 +462,9 @@ extern const char kEnablePortalsDescription[];
+ extern const char kEnablePortalsCrossOriginName[];
+ extern const char kEnablePortalsCrossOriginDescription[];
 
 +extern const char kResumeBackgroundVideoName[];
 +extern const char kResumeBackgroundVideoDescription[];
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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",
+@@ -229,11 +229,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
 // when in background.
 const base::Feature kResumeBackgroundVideo {
   "resume-background-video",
@@ -69,5 +69,5 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 
 // Enable Media Capabilities with finch-parameters.
 -- 
-2.11.0
+2.17.1

@@ -3,20 +3,20 @@ Date: Sun, 18 Nov 2018 13:06:49 +0100
 Subject: Add flag to disable IPv6 probes

 ---
- chrome/browser/about_flags.cc                              |  5 +++++
- chrome/browser/flag_descriptions.cc                        |  4 ++++
- chrome/browser/flag_descriptions.h                         |  3 +++
- components/subresource_filter/tools/BUILD.gn               |  6 ++++++
- components/url_formatter/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(-)
+ 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 ++++++
+ .../url_formatter/spoof_checks/top_domains/BUILD.gn      | 3 ++-
+ net/dns/host_resolver_manager.cc                         | 9 ++++++++-
+ services/network/public/cpp/features.cc                  | 4 ++++
+ services/network/public/cpp/features.h                   | 2 ++
+ 8 files changed, 34 insertions(+), 2 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
-@@ -3198,6 +3198,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3327,6 +3327,11 @@ const FeatureEntry kFeatureEntries[] = {
          kMarkHttpAsFeatureVariations,
          "HTTPReallyBadFinal")},
 
@@ -31,34 +31,34 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -2512,6 +2512,10 @@ const char kForegroundNotificationManagerDescription[] =
- const char kHomePageButtonName[] = "Force Enable Home Page Button";
- const char kHomePageButtonDescription[] = "Displays a home button if enabled.";
+@@ -2370,6 +2370,10 @@ const char kContextualSearchRankerQueryDescription[] =
 
+ const char kContextualSearchSecondTapName[] =
+     "Contextual Search second tap triggering";
 +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[] =
+ const char kContextualSearchSecondTapDescription[] =
+     "Enables triggering on a second tap gesture even when Ranker would "
+     "normally suppress that tap.";
 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[];
+@@ -528,6 +528,9 @@ extern const char kEnableWasmThreadsName[];
+ extern const char kEnableWasmThreadsDescription[];
 
+ extern const char kEnableWasmTieringName[];
 +extern const char kIPv6ProbingName[];
 +extern const char kIPv6ProbingDescription[];
 +
- extern const char kEnablePictureInPictureName[];
- extern const char kEnablePictureInPictureDescription[];
+ extern const char kEnableWasmTieringDescription[];
 
+ extern const char kEvDetailsInPageInfoName[];
 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) {
+@@ -50,6 +50,8 @@ if (!is_ios) {
     deps = [
       ":tools_lib",
       "//base",
@@ -67,7 +67,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour
     ]
   }
 
-@@ -65,6 +67,8 @@ if (!is_ios) {
+@@ -61,6 +63,8 @@ if (!is_ios) {
       ":tools_lib",
       "../core/common",
       "//base",
@@ -76,7 +76,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour
     ]
   }
 
-@@ -76,6 +80,8 @@ if (!is_ios) {
+@@ -70,6 +74,8 @@ if (!is_ios) {
       "ruleset_converter:support",
       "//base",
       "//third_party/protobuf:protobuf_lite",
@@ -88,7 +88,7 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour
 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") {
+@@ -73,7 +73,8 @@ executable("make_top_domain_list_variables") {
     "//base",
     "//base:i18n",
     "//third_party/icu",
@@ -101,7 +101,7 @@ diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/compon
 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 @@
+@@ -92,6 +92,7 @@
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/datagram_client_socket.h"
 #include "net/url_request/url_request_context.h"
@@ -109,26 +109,26 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "url/url_canon_ip.h"
 
 #if BUILDFLAG(ENABLE_MDNS)
-@@ -3209,8 +3210,13 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -3593,8 +3594,14 @@ 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);
+-    SetLastIPv6ProbeResult(
+
 +    if (!base::FeatureList::IsEnabled(network::features::kIPv6Probing)) {
 +      // pretend IPv6 connectivy probe is successful when probing is disabled
-+      last_ipv6_probe_result_ = true;
+      SetLastIPv6ProbeResult(true);
 +    } else {
-+      last_ipv6_probe_result_ =
-+          IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log);
+      SetLastIPv6ProbeResult(
+         IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log));
 +    }
-     last_ipv6_probe_time_ = tick_clock_->NowTicks();
     cached = false;
   }
+   net_log.AddEvent(
 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};
+@@ -52,6 +52,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kThrottleDelayable{"ThrottleDelayable",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -142,7 +142,7 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging;
+@@ -21,6 +21,8 @@ extern const base::Feature kNetworkErrorLogging;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kNetworkService;
 COMPONENT_EXPORT(NETWORK_CPP)
@@ -152,5 +152,5 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kReporting;
 -- 
-2.11.0
+2.17.1

@@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1364,6 +1364,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1544,6 +1544,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAccelerated2dCanvasName,
      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
@@ -24,9 +24,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -385,6 +385,10 @@ const char kDisableAudioForDesktopShareDescription[] =
-     "With this flag on, desktop share picker window will not let the user "
-     "choose whether to share audio.";
+@@ -414,6 +414,10 @@ const char kDevtoolsExperimentsDescription[] =
+     "Enables Developer Tools experiments. Use Settings panel in Developer "
+     "Tools to toggle individual experiments.";
 
 +const char kDisableWebGLName[] = "Disable all versions of WebGL";
 +
@@ -38,9 +38,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
-@@ -256,6 +256,9 @@ extern const char kDevtoolsExperimentsDescription[];
- extern const char kDisableAudioForDesktopShareName[];
- extern const char kDisableAudioForDesktopShareDescription[];
+@@ -264,6 +264,9 @@ extern const char kDeviceDiscoveryNotificationsDescription[];
+ extern const char kDevtoolsExperimentsName[];
+ extern const char kDevtoolsExperimentsDescription[];
 
 +extern const char kDisableWebGLName[];
 +extern const char kDisableWebGLDescription[];
@@ -49,5 +49,5 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 extern const char kDisableBestEffortTasksDescription[];
 
 -- 
-2.11.0
+2.17.1

@@ -5,22 +5,22 @@ 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 ++++++++
+ 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 ++
+ .../blink/public/platform/web_runtime_features.h       |  2 ++
+ .../blink/renderer/modules/modules_initializer.cc      |  9 ++++++---
+ .../renderer/platform/exported/web_runtime_features.cc |  8 ++++++++
+ .../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
-@@ -1606,6 +1606,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1771,6 +1771,12 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
      flag_descriptions::kGpuRasterizationDescription, kOsAll,
      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -644,6 +644,14 @@ const char kWinrtSensorsImplementationDescription[] =
+@@ -594,6 +594,14 @@ const char kWinrtSensorsImplementationDescription[] =
     "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for "
     "sensors";
 
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -398,6 +398,12 @@ extern const char kEnableTLS13EarlyDataDescription[];
+@@ -362,6 +362,12 @@ extern const char kWinrtGeolocationImplementationDescription[];
 extern const char kWinrtSensorsImplementationName[];
 extern const char kWinrtSensorsImplementationDescription[];
 
@@ -70,20 +70,20 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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
-@@ -85,6 +85,9 @@ void SetIndividualRuntimeFeatures(
-       base::FeatureList::IsEnabled(features::kSharedArrayBuffer) ||
-       base::FeatureList::IsEnabled(features::kWebAssemblyThreads));
- 
+@@ -87,6 +87,9 @@ void SetRuntimeFeatureDefaultsForPlatform(
+       command_line.HasSwitch(
+           switches::kEnableGpuMemoryBufferCompositorResources) &&
+       !command_line.HasSwitch(switches::kDisableWebGLImageChromium) &&
 +  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
 +  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
 +
-   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
-     WebRuntimeFeatures::EnableSharedWorker(false);
- 
+       !command_line.HasSwitch(switches::kDisableGpu) &&
+       base::FeatureList::IsEnabled(features::kWebGLImageChromium);
+ #else
 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
-@@ -689,6 +689,16 @@ const base::Feature kExperimentalProductivityFeatures{
+@@ -756,6 +756,16 @@ const base::Feature kExperimentalProductivityFeatures{
 // TODO(rouslan): Remove this.
 const base::Feature kWebPayments{"WebPayments",
                                  base::FEATURE_ENABLED_BY_DEFAULT};
@@ -103,9 +103,9 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -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;
+@@ -165,6 +165,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
+ CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
+ CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi;
 
 +CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
 +
@@ -115,7 +115,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co
 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 {
+@@ -100,6 +100,8 @@ class WebRuntimeFeatures {
   BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
   BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
@@ -127,7 +127,7 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa
 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(
+@@ -245,9 +245,12 @@ void ModulesInitializer::InitInspectorAgentSession(
 void ModulesInitializer::OnClearWindowObjectInMainWorld(
     Document& document,
     const Settings& settings) const {
@@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_p
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -160,6 +160,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
+@@ -183,6 +183,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
 }
 
@@ -164,10 +164,11 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1128,6 +1128,14 @@
+@@ -1171,6 +1171,14 @@
+       name: "OffscreenCanvasCommit",
       status: "experimental",
     },
-     {
+    {
 +      name: "DeviceMotion",
 +      status: "stable",
 +    },
@@ -175,10 +176,9 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      name: "DeviceOrientation",
 +      status: "stable",
 +    },
-+    {
+     {
       name: "OnDeviceChange",
       // Android does not yet support SystemMonitor.
-       status: {"Android": "", "default": "stable"},
 -- 
-2.11.0
+2.17.1

@@ -1,193 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 14 Sep 2019 10:19:07 +0200
-Subject: Add menu option to toggle ad blocker
-
---
- 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 ad blocker item's state.
-+     *
-+     * @param menu {@link Menu} to enable ad blocker
-+     * @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 Block ads on all chrome:// pages except for the NTP.
-+        String url = currentTab.getUrl();
-+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
-+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-+        // 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 ad blocker is globally activated.
-+        enableMenuCheck.setChecked(adBlockEnabled);
-+
-+        // This title doesn't seem to be displayed by Android, but it is used to set up
-+        // 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
-@@ -2952,6 +2952,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_REQUEST_DESKTOP_SITE_OFF" desc="Accessibility description for when Request Desktop Site is disabled.">
-         Turn on Request desktop site
-       </message>
-+
-+      <message name="IDS_MENU_ENABLE_ADBLOCK" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable ad blocker engine for the page. [CHAR-LIMIT=27]">
-+        Block ads
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_ON" desc="Accessibility description for when Block ads is selected.">
-+        Turn off ad blocking
-+      </message>
-+      <message name="IDS_MENU_ENABLE_ADBLOCK_OFF" desc="Accessibility description for when Block ads is unselected.">
-+        Turn on ad blocking
-+      </message>
-+
-       <message name="IDS_MENU_READER_MODE_PREFS" desc="Menu item to show reader mode preferences pane, which allows users to change the appearance (font size, theme, etc.) of the page. [CHAR-LIMIT=27]">
-         Appearance
-       </message>
-- 
-2.11.0
-
@@ -1,200 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 21:26:53 +0200
-Subject: Add menu option to toggle global Javascript preference
-
---
- chrome/android/java/res/menu/custom_tabs_menu.xml  | 12 +++++++
- chrome/android/java/res/menu/main_menu.xml         | 13 ++++++++
- .../chromium/chrome/browser/ChromeActivity.java    |  8 +++++
- .../chrome/browser/ChromeTabbedActivity.java       |  8 +++++
- .../appmenu/AppMenuPropertiesDelegateImpl.java     | 39 ++++++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../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
-@@ -49,6 +49,7 @@
-         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk"
-             android:orderInCategory="2" />
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null"
-             android:orderInCategory="2">
-@@ -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">
-+          <menu>
-+              <item android:id="@+id/enable_javascript_id"
-+                  android:title="@string/menu_enable_javascript" />
-+              <item android:id="@+id/enable_javascript_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-         <!-- Title is intentionally left blank in xml and will be set in java. -->
-         <item android:id="@+id/open_in_browser_id"
-             android:title=""
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
--- a/chrome/android/java/res/menu/main_menu.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -61,6 +61,7 @@
-             android:title="@string/menu_add_to_homescreen" />
-         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk" />
-+
-         <item android:id="@+id/request_desktop_site_row_menu_id"
-             android:title="@null">
-           <menu>
-@@ -71,6 +72,18 @@
-                 android:checkable="true" />
-           </menu>
-         </item>
-+
-+        <item android:id="@+id/enable_javascript_row_menu_id"
-+            android:title="@null">
-+          <menu>
-+              <item android:id="@+id/enable_javascript_id"
-+                  android:title="@string/menu_enable_javascript" />
-+              <item android:id="@+id/enable_javascript_check_id"
-+                  android:title="@null"
-+                  android:checkable="true" />
-+          </menu>
-+        </item>
-+
-         <item android:id="@+id/reader_mode_prefs_id"
-             android:title="@string/menu_reader_mode_prefs"
-             android:icon="@drawable/reader_mode_prefs_icon" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -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();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
-+            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled);
-+            if (reloadOnChange) {
-+                currentTab.reload();
-+            }
-+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
-         } else if (id == R.id.reader_mode_prefs_id) {
-             DomDistillerUIUtils.openSettings(currentTab.getWebContents());
-         } else {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1802,6 +1802,14 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
-                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
-             }
-             RecordUserAction.record("MobileMenuDownloadManager");
-+        } else if (id == R.id.enable_javascript_id || id == R.id.enable_javascript_check_id) {
-+            final boolean reloadOnChange = !currentTab.isNativePage();
-+            final boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
-+            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT, !jsEnabled);
-+            if (reloadOnChange) {
-+                currentTab.reload();
-+            }
-+            RecordUserAction.record("MobileMenuRequestEnableJavascript");
-         } else if (id == R.id.open_recently_closed_tab) {
-             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
-             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/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 */);
- 
-+            updateEnableJavascriptMenuItem(menu, currentTab);
-+
-             // Only display reader mode settings menu option if the current page is in reader mode.
-             menu.findItem(R.id.reader_mode_prefs_id)
-                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
-@@ -432,6 +434,43 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         }
-     }
- 
-+     /**
-+     * Updates the enable JavaScript item's state.
-+     *
-+     * @param menu {@link Menu} for enable javascript
-+     * @param currentTab      Current tab being displayed.
-+     */
-+    protected void updateEnableJavascriptMenuItem(
-+            Menu menu, Tab currentTab) {
-+        MenuItem enableMenuRow = menu.findItem(R.id.enable_javascript_row_menu_id);
-+        MenuItem enableMenuLabel = menu.findItem(R.id.enable_javascript_id);
-+        MenuItem enableMenuCheck = menu.findItem(R.id.enable_javascript_check_id);
-+
-+        // Hide enable javascript on all chrome:// pages except for the NTP.
-+        String url = currentTab.getUrl();
-+        boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
-+                || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
-+        // Also hide enable javascsript on Reader Mode.
-+        boolean isDistilledPage = DomDistillerUrlUtils.isDistilledPage(url);
-+
-+        boolean itemVisible = (!isChromeScheme || currentTab.isNativePage()) && !isDistilledPage;
-+        enableMenuRow.setVisible(itemVisible);
-+        if (!itemVisible) return;
-+
-+        boolean jsEnabled = PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
-+
-+        // Mark the checkbox if Javascript is activated on this tab.
-+        enableMenuCheck.setChecked(jsEnabled);
-+
-+        // This title doesn't seem to be displayed by Android, but it is used to set up
-+        // accessibility text in {@link AppMenuAdapter#setupMenuButton}.
-+        enableMenuLabel.setTitleCondensed(jsEnabled
-+                        ? mContext.getString(R.string.menu_enable_javascript_on)
-+                        : mContext.getString(R.string.menu_enable_javascript_off));
-+    }
-+
-+
-+
-     /**
-      * 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
-@@ -202,6 +202,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-             }
- 
-             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
-+            updateEnableJavascriptMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
-         }
-     }
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -2932,6 +2932,17 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_FIND_IN_PAGE" desc="Menu item allowing users to find text within the current page. [CHAR-LIMIT=27]">
-         Find in page
-       </message>
-+
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT" desc="Menu item in Chrome's overflow/options menu. If this menu item is unselected, Bromite will disable JavaScript support for the page. [CHAR-LIMIT=27]">
-+        JavaScript
-+      </message>
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_ON" desc="Accessibility description for when Enable JavaScript is selected.">
-+        Turn off JavaScript
-+      </message>
-+      <message name="IDS_MENU_ENABLE_JAVASCRIPT_OFF" desc="Accessibility description for when Enable JavaScript is unselected.">
-+        Turn on JavaScript
-+      </message>
-+
-       <message name="IDS_MENU_REQUEST_DESKTOP_SITE" desc="Menu item in Chrome's overflow/options menu. By default, when a user navigates to a web page, Chrome shows the mobile site, that is, the version of the site designed for mobile phones. If this menu item is selected, however, Chrome will try to load the 'desktop' site instead, i.e. the site designed for desktop computers or laptop computers, which have larger screens. [CHAR-LIMIT=24]">
-         Desktop site
-       </message>
-- 
-2.11.0
-
@@ -0,0 +1,266 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 11 Mar 2020 19:56:49 +0100
+Subject: Add missing android_provider
+
+---
+ third_party/android_provider/BUILD.gn         |  14 ++
+ .../android/provider/MediaStoreUtils.java     | 228 ++++++++++++++++++
+ 2 files changed, 242 insertions(+)
+ create mode 100644 third_party/android_provider/BUILD.gn
+ create mode 100644 third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
+
+diff --git a/third_party/android_provider/BUILD.gn b/third_party/android_provider/BUILD.gn
+new file mode 100644
+--- /dev/null
+++ b/third_party/android_provider/BUILD.gn
+@@ -0,0 +1,14 @@
+# Copyright 2020 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.
+
+import("//build/config/android/rules.gni")
+
+assert(is_android)
+
+android_library("android_provider_java") {
+  sources = [
+    "java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java",
+  ]
+  deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
+}
+diff --git a/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
+new file mode 100644
+--- /dev/null
+++ b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
+@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package org.chromium.third_party.android.provider;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.provider.MediaStore;
+import android.provider.MediaStore.DownloadColumns;
+import android.provider.MediaStore.MediaColumns;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.FileNotFoundException;
+import java.io.OutputStream;
+import java.util.Objects;
+
+/**
+ * Utility class to contribute download to the public download collection using
+ * MediaStore API from Q.
+ */
+public class MediaStoreUtils {
+    private static final String TAG = "MediaStoreUtils";
+
+    /**
+     * Creates a new pending media item using the given parameters. Pending items
+     * are expected to have a short lifetime, and owners should either
+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a
+     * pending item within a few hours after first creating it.
+     *
+     * @param context Application context.
+     * @param params Parameters used to configure the item.
+     * @return token which can be passed to {@link #openPending(Context, Uri)}
+     *         to work with this pending item.
+     */
+    public static @NonNull Uri createPending(
+            @NonNull Context context, @NonNull PendingParams params) {
+        return context.getContentResolver().insert(params.mInsertUri, params.mInsertValues);
+    }
+
+    /**
+     * Opens a pending media item to make progress on it. You can open a pending
+     * item multiple times before finally calling either
+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()}.
+     *
+     * @param uri token which was previously returned from
+     *            {@link #createPending(Context, PendingParams)}.
+     * @return pending session that was opened.
+     */
+    public static @NonNull PendingSession openPending(@NonNull Context context, @NonNull Uri uri) {
+        return new PendingSession(context, uri);
+    }
+
+    /**
+     * Parameters that describe a pending media item.
+     */
+    public static class PendingParams {
+        final Uri mInsertUri;
+        final ContentValues mInsertValues;
+
+        /**
+         * Creates parameters that describe a pending media item.
+         *
+         * @param insertUri the {@code content://} Uri where this pending item
+         *            should be inserted when finally published. For example, to
+         *            publish an image, use
+         *            {@link MediaStore.Images.Media#getContentUri(String)}.
+         * @param displayName Display name of the item.
+         * @param mimeType MIME type of the item.
+         */
+        public PendingParams(
+                @NonNull Uri insertUri, @NonNull String displayName, @NonNull String mimeType) {
+            mInsertUri = Objects.requireNonNull(insertUri);
+            final long now = System.currentTimeMillis() / 1000;
+            mInsertValues = new ContentValues();
+            mInsertValues.put(MediaColumns.DISPLAY_NAME, Objects.requireNonNull(displayName));
+            mInsertValues.put(MediaColumns.MIME_TYPE, Objects.requireNonNull(mimeType));
+            mInsertValues.put(MediaColumns.DATE_ADDED, now);
+            mInsertValues.put(MediaColumns.DATE_MODIFIED, now);
+            try {
+                setPendingContentValues(this.mInsertValues, true);
+            } catch (Exception e) {
+                Log.e(TAG, "Unable to set pending content values.", e);
+            }
+        }
+
+        /**
+         * Optionally sets the Uri from where the file has been downloaded. This is used
+         * for files being added to {@link Downloads} table.
+         *
+         * @see DownloadColumns#DOWNLOAD_URI
+         */
+        public void setDownloadUri(@Nullable Uri downloadUri) {
+            if (downloadUri == null) {
+                mInsertValues.remove(DownloadColumns.DOWNLOAD_URI);
+            } else {
+                mInsertValues.put(DownloadColumns.DOWNLOAD_URI, downloadUri.toString());
+            }
+        }
+
+        /**
+         * Optionally set the Uri indicating HTTP referer of the file. This is used for
+         * files being added to {@link Downloads} table.
+         *
+         * @see DownloadColumns#REFERER_URI
+         */
+        public void setRefererUri(@Nullable Uri refererUri) {
+            if (refererUri == null) {
+                mInsertValues.remove(DownloadColumns.REFERER_URI);
+            } else {
+                mInsertValues.put(DownloadColumns.REFERER_URI, refererUri.toString());
+            }
+        }
+
+        /**
+         * Sets the expiration time of the download.
+         *
+         * @time Epoch time in seconds.
+         */
+        public void setExpirationTime(long time) {
+            mInsertValues.put("date_expires", time);
+        }
+    }
+
+    /**
+     * Session actively working on a pending media item. Pending items are
+     * expected to have a short lifetime, and owners should either
+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a
+     * pending item within a few hours after first creating it.
+     */
+    public static class PendingSession implements AutoCloseable {
+        private final Context mContext;
+        private final Uri mUri;
+
+        /**
+         * Create a new pending session item to be published.
+         * @param context Contexxt of the application.
+         * @param uri Token which was previously returned from
+         *            {@link #createPending(Context, PendingParams)}.
+         */
+        PendingSession(Context context, Uri uri) {
+            mContext = Objects.requireNonNull(context);
+            mUri = Objects.requireNonNull(uri);
+        }
+
+        /**
+         * Open the underlying file representing this media item. When a media
+         * item is successfully completed, you should
+         * {@link ParcelFileDescriptor#close()} and then {@link #publish()} it.
+         *
+         * @return ParcelFileDescriptor to be written into.
+         */
+        public @NonNull ParcelFileDescriptor open() throws FileNotFoundException {
+            return mContext.getContentResolver().openFileDescriptor(mUri, "rw");
+        }
+
+        /**
+         * Open the underlying file representing this media item. When a media
+         * item is successfully completed, you should
+         * {@link OutputStream#close()} and then {@link #publish()} it.
+         *
+         * @return OutputStream to be written into.
+         */
+        public @NonNull OutputStream openOutputStream() throws FileNotFoundException {
+            return mContext.getContentResolver().openOutputStream(mUri);
+        }
+
+        /**
+         * When this media item is successfully completed, call this method to
+         * publish and make the final item visible to the user.
+         *
+         * @return the final {@code content://} Uri representing the newly
+         *         published media.
+         */
+        public @NonNull Uri publish() {
+            try {
+                final ContentValues values = new ContentValues();
+                setPendingContentValues(values, false);
+                values.putNull("date_expires");
+                mContext.getContentResolver().update(mUri, values, null, null);
+            } catch (Exception e) {
+                Log.e(TAG, "Unable to publish pending session.", e);
+            }
+            return mUri;
+        }
+
+        /**
+         * When this media item has failed to be completed, call this method to
+         * destroy the pending item record and any data related to it.
+         */
+        public void abandon() {
+            mContext.getContentResolver().delete(mUri, null, null);
+        }
+
+        @Override
+        public void close() {
+            // No resources to close, but at least we can inform people that no
+            // progress is being actively made.
+        }
+    }
+
+    /**
+     * Helper method to set the ContentValues to pending or non-pending.
+     * @param values ContentValues to be set.
+     * @param isPending Whether the item is pending.
+     */
+    private static void setPendingContentValues(ContentValues values, boolean isPending)
+            throws Exception {
+        values.put(MediaColumns.IS_PENDING, isPending ? 1 : 0);
+    }
+}
+-- 
+2.17.1
+
@@ -3,41 +3,41 @@ Date: Thu, 5 Dec 2019 22:41:25 +0100
 Subject: Add option to configure the ad blocker filters URL

 ---
- chrome/android/chrome_java_sources.gni             |  2 +
- chrome/android/java/res/layout/adblock_editor.xml  | 65 ++++++++++++++++
- chrome/android/java/res/values/values.xml          |  2 +
- .../android/java/res/xml/adblock_preferences.xml   | 25 ++++++
- chrome/android/java/res/xml/main_preferences.xml   | 11 ++-
- .../chrome/browser/preferences/AdBlockEditor.java  | 91 ++++++++++++++++++++++
- .../browser/preferences/AdBlockPreferences.java    | 53 +++++++++++++
- .../chrome/browser/util/FeatureUtilities.java      | 10 +++
- .../java/strings/android_chrome_strings.grd        | 14 ++++
- chrome/app/generated_resources.grd                 | 10 +++
- chrome/browser/android/feature_utilities.cc        |  8 ++
- chrome/browser/browser_process_impl.cc             |  3 +-
- .../browser/net/system_network_context_manager.cc  |  3 +
- chrome/common/pref_names.cc                        |  3 +
- chrome/common/pref_names.h                         |  1 +
- .../component_updater/adblock_updater_service.cc   |  6 +-
- .../component_updater/adblock_updater_service.h    |  3 +-
- 17 files changed, 302 insertions(+), 8 deletions(-)
+ chrome/android/chrome_java_sources.gni        |  2 +
+ .../java/res/layout/adblock_editor.xml        | 65 +++++++++++++
+ chrome/android/java/res/values/values.xml     |  2 +
+ .../java/res/xml/adblock_preferences.xml      | 25 +++++
+ .../android/java/res/xml/main_preferences.xml |  5 +
+ .../browser/flags/FeatureUtilities.java       | 10 ++
+ .../browser/settings/AdBlockEditor.java       | 92 +++++++++++++++++++
+ .../browser/settings/AdBlockPreferences.java  | 56 +++++++++++
+ chrome/app/generated_resources.grd            | 10 ++
+ chrome/browser/android/feature_utilities.cc   |  8 ++
+ chrome/browser/browser_process_impl.cc        |  3 +-
+ .../net/system_network_context_manager.cc     |  3 +
+ .../strings/android_chrome_strings.grd        | 14 +++
+ chrome/common/pref_names.cc                   |  3 +
+ chrome/common/pref_names.h                    |  1 +
+ .../adblock_updater_service.cc                |  6 +-
+ .../adblock_updater_service.h                 |  3 +-
+ 17 files changed, 303 insertions(+), 5 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java

 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1266,6 +1266,8 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/preferences/PreferenceUtils.java",
-   "java/src/org/chromium/chrome/browser/preferences/Preferences.java",
-   "java/src/org/chromium/chrome/browser/preferences/PreferencesLauncher.java",
-+  "java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java",
-+  "java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java",
-   "java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java",
-   "java/src/org/chromium/chrome/browser/preferences/SearchEnginePreference.java",
-   "java/src/org/chromium/chrome/browser/preferences/SearchUtils.java",
+@@ -1296,6 +1296,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java",
+  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/FileEnumWorkerTask.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java",
 diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/java/res/layout/adblock_editor.xml
 new file mode 100644
 --- /dev/null
@@ -67,7 +67,7 @@ new file mode 100644
 +            android:orientation="vertical"
 +            android:focusableInTouchMode="true" >
 +
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
+            <org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
 +                android:id="@+id/adblock_url"
 +                style="@style/PreferenceScreenLayout"
 +                android:layout_width="match_parent"
@@ -81,7 +81,7 @@ new file mode 100644
 +                    android:inputType="textUri"
 +                    android:singleLine="true"
 +                    android:hint="@string/options_adblock_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
+            </org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
 +
 +            <Space style="@style/ButtonBarTopSpacer" />
 +            <View style="@style/ButtonBarTopDivider" />
@@ -105,13 +105,13 @@ new file mode 100644
 +        </LinearLayout>
 +    </ScrollView>
 +
-+    <include layout="@layout/preferences_action_bar_shadow"/>
+    <include layout="@layout/settings_action_bar_shadow"/>
 +
 +</FrameLayout>
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -68,6 +68,8 @@
+@@ -69,6 +69,8 @@
     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
     <string name="manage_space_activity"></string>
 
@@ -134,12 +134,12 @@ new file mode 100644
 +    xmlns:android="http://schemas.android.com/apk/res/android"
 +    xmlns:app="http://schemas.android.com/apk/res-auto">
 +
-+    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
+    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
 +        android:key="adblock_switch"
 +        android:summaryOn="@string/text_on"
 +        android:summaryOff="@string/text_off" />
 +
-+    <org.chromium.chrome.browser.preferences.HyperlinkPreference
+    <org.chromium.chrome.browser.settings.HyperlinkPreference
 +        android:key="adblock_help"
 +        android:title="@string/adblock_help"
 +        app:url="@string/adblock_help_url" />
@@ -147,50 +147,60 @@ new file mode 100644
 +    <Preference
 +        android:key="adblock_edit"
 +        android:title="@string/options_adblock_edit_label"
-+        android:fragment="org.chromium.chrome.browser.preferences.AdBlockEditor" />
+        android:fragment="org.chromium.chrome.browser.settings.AdBlockEditor" />
 +
 +</PreferenceScreen>
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -61,19 +61,24 @@
-         android:order="13"
+@@ -55,6 +55,11 @@
+         android:key="privacy"
+         android:order="12"
         android:title="@string/prefs_privacy"/>
-     <Preference
-+        android:fragment="org.chromium.chrome.browser.preferences.AdBlockPreferences"
-+        android:key="adblock"
-+        android:order="14"
-+        android:title="@string/prefs_adblock"/>
 +    <Preference
-         android:fragment="org.chromium.chrome.browser.preferences.AccessibilityPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
+        android:key="adblock"
+        android:order="13"
+        android:title="@string/prefs_adblock"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.settings.accessibility.AccessibilitySettings"
         android:key="accessibility"
-        android:order="14"
-+        android:order="15"
-         android:title="@string/prefs_accessibility"/>
-     <Preference
-         android:fragment="org.chromium.chrome.browser.preferences.website.SiteSettingsPreferences"
-         android:key="content_settings"
-        android:order="15"
-+        android:order="16"
-         android:title="@string/prefs_site_settings"/>
-     <Preference
-         android:fragment="org.chromium.chrome.browser.preferences.languages.LanguagesPreferences"
-         android:key="languages"
-        android:order="16"
-+        android:order="17"
-         android:title="@string/prefs_languages"/>
-     <org.chromium.chrome.browser.preferences.ChromeBasePreference
-         android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+@@ -238,6 +238,14 @@ public class FeatureUtilities {
+                 ChromeFeatureList.isEnabled(ChromeFeatureList.REACHED_CODE_PROFILER));
+     }
+ 
+     public static void setAdBlockFiltersURL(String url) {
+         FeatureUtilitiesJni.get().setAdBlockFiltersURL(url);
+     }
+
+     public static String getAdBlockFiltersURL() {
+         return FeatureUtilitiesJni.get().getAdBlockFiltersURL();
+     }
+
+     /**
+      * @return True if tab model merging for Android N+ is enabled.
+      */
+@@ -785,5 +793,7 @@ public class FeatureUtilities {
+     @NativeMethods
+     interface Natives {
+         boolean isNetworkServiceWarmUpEnabled();
+        void setAdBlockFiltersURL(String url);
+        String getAdBlockFiltersURL();
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
 new file mode 100644
 --- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockEditor.java
-@@ -0,0 +1,91 @@
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
+@@ -0,0 +1,92 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
-+package org.chromium.chrome.browser.preferences;
+package org.chromium.chrome.browser.settings;
 +
 +import android.os.Bundle;
 +import android.support.v4.app.Fragment;
@@ -202,12 +212,13 @@ new file mode 100644
 +import android.widget.Button;
 +import android.widget.EditText;
 +
-+import org.chromium.chrome.browser.util.FeatureUtilities;
+import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.FeatureUtilities;
 +import org.chromium.chrome.R;
 +import org.chromium.components.url_formatter.UrlFormatter;
 +
 +/**
-+ * Provides the Java-UI for editing the DNS-over-HTTPS (AdBlock) preference.
+ * Provides the Java-UI for editing AdBlock preferences.
 + */
 +public class AdBlockEditor extends Fragment implements TextWatcher {
 +    private EditText mAdBlockFiltersUrlEdit;
@@ -223,7 +234,7 @@ new file mode 100644
 +        View v = inflater.inflate(R.layout.adblock_editor, container, false);
 +        View scrollView = v.findViewById(R.id.scroll_view);
 +        scrollView.getViewTreeObserver().addOnScrollChangedListener(
-+                PreferenceUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
 +        mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);
 +        mAdBlockFiltersUrlEdit.setText(FeatureUtilities.getAdBlockFiltersURL());
 +        mAdBlockFiltersUrlEdit.addTextChangedListener(this);
@@ -277,24 +288,27 @@ new file mode 100644
 +        });
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
 new file mode 100644
 --- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/AdBlockPreferences.java
-@@ -0,0 +1,53 @@
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
+@@ -0,0 +1,56 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
-+package org.chromium.chrome.browser.preferences;
+package org.chromium.chrome.browser.settings;
 +
 +import android.os.Bundle;
 +import android.support.v7.preference.Preference;
 +import android.support.v7.preference.PreferenceFragmentCompat;
+import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 +
-+import org.chromium.chrome.browser.ContentSettingsType;
-+import org.chromium.chrome.browser.util.FeatureUtilities;
-+import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.settings.website.WebsitePreferenceBridge;
+import org.chromium.components.content_settings.ContentSettingsType;
+import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.FeatureUtilities;
+import androidx.annotation.VisibleForTesting;
 +import org.chromium.chrome.R;
 +
 +/**
@@ -310,14 +324,14 @@ new file mode 100644
 +    @Override
 +    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 +        getActivity().setTitle(R.string.options_adblock_title);
-+        PreferenceUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
 +
 +        ChromeSwitchPreference mAdBlockSwitch =
 +                (ChromeSwitchPreference) findPreference(PREF_ADBLOCK_SWITCH);
-+        boolean isAdBlockEnabled = !PrefServiceBridge.getInstance().isCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS);
+        boolean isAdBlockEnabled = !WebsitePreferenceBridge.isCategoryEnabled(ContentSettingsType.ADS);
 +        mAdBlockSwitch.setChecked(isAdBlockEnabled);
 +        mAdBlockSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
-+            PrefServiceBridge.getInstance().setCategoryEnabled(ContentSettingsType.CONTENT_SETTINGS_TYPE_ADS, !(boolean) newValue);
+            WebsitePreferenceBridge.setCategoryEnabled(ContentSettingsType.ADS, !(boolean) newValue);
 +            return true;
 +        });
 +
@@ -335,35 +349,81 @@ new file mode 100644
 +        updateCurrentAdBlockUrl();
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -237,6 +237,14 @@ public class FeatureUtilities {
-         cacheServiceManagerForBackgroundPrefetch();
-     }
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
+@@ -9937,6 +9937,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+       Never show this again.
+     </message>
 
-+     public static void setAdBlockFiltersURL(String url) {
-+         nativeSetAdBlockFiltersURL(url);
-+     }
+    <!-- Ad Blocking preferences -->
+    <if expr="is_android">
+      <message name="IDS_OPTIONS_ADBLOCK_TITLE" desc="The title of the Ad Blocking option on Android" formatter_data="android_java">
+        Ad Blocking
+      </message>
+      <message name="IDS_OPTIONS_ADBLOCK_SUMMARY" desc="The title of the Ad Blocking summary on Android" formatter_data="android_java">
+        Configure Ad Blocking and filters URL
+      </message>
+    </if>
 +
-+     public static String getAdBlockFiltersURL() {
-+         return nativeGetAdBlockFiltersURL();
-+     }
+     <!-- Ad Blocking UI strings. -->
+     <message name="IDS_ALWAYS_ALLOW_ADS" desc="Explanation associated with a toggle to allow ads after ads have been blocked on the page. To be used on pages where the ad blocking UI is governed by a persistent permissions-based whitelist.">
+       Always allow ads on this site
+diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
+--- a/chrome/browser/android/feature_utilities.cc
+++ b/chrome/browser/android/feature_utilities.cc
+@@ -32,6 +32,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
+ } // namespace android
+ } // namespace chrome
+ 
+static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetAdBlockFiltersURL(JNIEnv* env) {
+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
+}
 +
-     /**
-      * @return True if tab model merging for Android N+ is enabled.
-      */
-@@ -924,4 +932,6 @@ public class FeatureUtilities {
-     private static native String nativeGetDoHTemplates();
-     private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
-     private static native boolean nativeIsNetworkServiceWarmUpEnabled();
-+    private static native void nativeSetAdBlockFiltersURL(String url);
-+    private static native String nativeGetAdBlockFiltersURL();
+static void JNI_FeatureUtilities_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
+  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
+}
+
+ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
+     JNIEnv* env) {
+   return content::IsOutOfProcessNetworkService() &&
+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
+@@ -1035,7 +1035,8 @@ BrowserProcessImpl::adblock_updater() {
+   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
+           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
+           std::move(scheduler),
+-          g_browser_process->subresource_filter_ruleset_service());
+          g_browser_process->subresource_filter_ruleset_service(),
+          local_state()->GetString(prefs::kAdBlockFiltersURL));
+ 
+   return adblock_updater_.get();
 }
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -898,6 +898,20 @@ Your Google account may have other forms of browsing history like searches and a
+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
+@@ -358,6 +358,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+       ssl_config_service_manager_(
+           SSLConfigServiceManager::CreateDefaultManager(local_state_)),
+       proxy_config_monitor_(local_state_) {
+  local_state_->SetDefaultPrefValue(prefs::kAdBlockFiltersURL,
+                                    base::Value("https://www.bromite.org/filters/filters.dat"));
+ #if !defined(OS_ANDROID)
+   // QuicAllowed was not part of Android policy.
+   const base::Value* value =
+@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+ 
+ // static
+ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string());
+   // Register the DnsClient and DoH preferences. The feature list has not been
+   // initialized yet, so setting the preference defaults here to reflect the
+   // corresponding features will only cause the preference defaults to reflect
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -804,6 +804,20 @@ Your Google account may have other forms of browsing history like searches and a
         Captions
       </message>
 
@@ -384,81 +444,10 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
       <!-- Site settings -->
       <message name="IDS_PREFS_SITE_SETTINGS" desc="Title of the Website Settings screen. [CHAR-LIMIT=32]">
         Site settings
-diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
-+++ b/chrome/app/generated_resources.grd
-@@ -9505,6 +9505,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
-       Never show this again.
-     </message>
- 
-+    <!-- Ad Blocking preferences -->
-+    <if expr="is_android">
-+      <message name="IDS_OPTIONS_ADBLOCK_TITLE" desc="The title of the Ad Blocking option on Android" formatter_data="android_java">
-+        Ad Blocking
-+      </message>
-+      <message name="IDS_OPTIONS_ADBLOCK_SUMMARY" desc="The title of the Ad Blocking summary on Android" formatter_data="android_java">
-+        Configure Ad Blocking and filters URL
-+      </message>
-+    </if>
-+
-     <!-- Ad Blocking UI strings. -->
-     <message name="IDS_ALWAYS_ALLOW_ADS" desc="Explanation associated with a toggle to allow ads after ads have been blocked on the page. To be used on pages where the ad blocking UI is governed by a persistent permissions-based whitelist.">
-       Always allow ads on this site
-diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
--- a/chrome/browser/android/feature_utilities.cc
-+++ b/chrome/browser/android/feature_utilities.cc
-@@ -58,6 +58,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
- } // namespace android
- } // namespace chrome
- 
-+static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetAdBlockFiltersURL(JNIEnv* env) {
-+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
-+}
-+
-+static void JNI_FeatureUtilities_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
-+  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
-+}
-+
- static void JNI_FeatureUtilities_SetCustomTabVisible(
-     JNIEnv* env,
-     jboolean visible) {
-diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
-+++ b/chrome/browser/browser_process_impl.cc
-@@ -1032,7 +1032,8 @@ BrowserProcessImpl::adblock_updater() {
-   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
-           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
-           std::move(scheduler),
-          g_browser_process->subresource_filter_ruleset_service());
-+          g_browser_process->subresource_filter_ruleset_service(),
-+          local_state()->GetString(prefs::kAdBlockFiltersURL));
- 
-   return adblock_updater_.get();
- }
-diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
-+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -391,6 +391,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-       ssl_config_service_manager_(
-           SSLConfigServiceManager::CreateDefaultManager(local_state_)),
-       proxy_config_monitor_(local_state_) {
-+  local_state_->SetDefaultPrefValue(prefs::kAdBlockFiltersURL,
-+                                    base::Value("https://www.bromite.org/filters/filters.dat"));
- #if !defined(OS_ANDROID)
-   // QuicAllowed was not part of Android policy.
-   const base::Value* value =
-@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
- }
- 
- void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
-+  registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string());
-   // Register the DnsClient and DoH preferences. The feature list has not been
-   // initialized yet, so setting the preference defaults here to reflect the
-   // corresponding features will only cause the preference defaults to reflect
 diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 --- a/chrome/common/pref_names.cc
 +++ b/chrome/common/pref_names.cc
-@@ -1871,6 +1871,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2002,6 +2002,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 // capture devices without prompt.
 const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
 
@@ -512,5 +501,5 @@ diff --git a/components/component_updater/adblock_updater_service.h b/components
 
   // Adds an observer for this class. An observer should not be added more
 -- 
-2.11.0
+2.17.1

@@ -3,17 +3,17 @@ 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      | 12 ++++++++++++
- chrome/android/java/strings/android_chrome_strings.grd       |  6 ++++++
+ chrome/android/java/res/values/values.xml            |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml  |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java         |  4 +++-
+ .../browser/settings/privacy/PrivacySettings.java    | 12 ++++++++++++
+ .../ui/android/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
-@@ -62,6 +62,9 @@
+@@ -63,6 +63,9 @@
     <!-- TODO(peconn): Add help section. -->
     <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
 
@@ -26,11 +26,11 @@ 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
-@@ -38,6 +38,11 @@
-         android:key="contextual_search"
-         android:title="@string/contextual_search_title"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ContextualSearchPreferenceFragment" />
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+@@ -34,6 +34,11 @@
+         android:title="@string/allow_custom_tab_intents_title"
+         android:summary="@string/allow_custom_tab_intents_summary"
+         android:defaultValue="false" />
+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
 +        android:summary="@string/close_tabs_on_exit_summary"
@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 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
-@@ -1166,8 +1166,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1104,8 +1104,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -53,37 +53,37 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
             if (noRestoreState) {
                 // Clear the state files because they are inconsistent and useless from now on.
                 mTabModelSelectorImpl.clearState();
-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
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
@@ -4,6 +4,7 @@
 
- package org.chromium.chrome.browser.preferences.privacy;
+ package org.chromium.chrome.browser.settings.privacy;
 
 +import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.graphics.drawable.VectorDrawableCompat;
 import android.support.v7.preference.CheckBoxPreference;
-@@ -14,6 +15,7 @@ import android.view.Menu;
+@@ -13,6 +14,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -38,6 +40,7 @@ public class PrivacyPreferences
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -36,6 +38,7 @@ public class PrivacySettings
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-     private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
     private static final String PREF_DO_NOT_TRACK = "do_not_track";
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
 
-@@ -112,6 +115,10 @@ public class PrivacyPreferences
-         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
-             PrefServiceBridge.getInstance().setBoolean(
-                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+@@ -84,6 +87,10 @@ public class PrivacySettings
+             sharedPreferencesEditor.apply();
+         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
 +        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
@@ -91,9 +91,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
         }
 
         return true;
-@@ -162,6 +169,11 @@ public class PrivacyPreferences
-             boolean isContextualSearchEnabled = !prefServiceBridge.isContextualSearchDisabled();
-             contextualPref.setSummary(isContextualSearchEnabled ? textOn : textOff);
+@@ -128,6 +135,11 @@ public class PrivacySettings
+                             ? R.string.text_on
+                             : R.string.text_off);
         }
 +
 +        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
@@ -103,10 +103,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
     }
 
     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
-@@ -3764,6 +3764,12 @@ The site does NOT gain access to the camera. The camera images are only visible
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -3618,6 +3618,12 @@ Only you can see what your camera is looking at. The site can't see your camera'
       <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>
@@ -120,5 +120,5 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
         LINK
       </message>
 -- 
-2.11.0
+2.17.1

@@ -4,43 +4,43 @@ 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(-)
+ .../java/res/xml/homepage_preferences.xml     |  5 +++++
+ .../HomepageManager.java                      | 22 +++++++++++++++++--
+ .../settings/homepage/HomepageSettings.java   | 11 ++++++++++
+ .../browser/tabmodel/TabCreatorManager.java   | 11 ++++++++--
+ .../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, 55 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 @@
+@@ -6,6 +6,11 @@
+ <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-     <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
+    <org.chromium.chrome.browser.settings.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.ChromeSwitchPreference
+     <org.chromium.chrome.browser.settings.ChromeSwitchPreference
         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";
+@@ -28,6 +28,7 @@ import java.lang.annotation.RetentionPolicy;
+  * This class serves as a single homepage logic gateway.
+  */
+ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStateListener {
 +    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 {
+     /**
+      * Possible states for HomeButton. Used for Histogram
+      * Settings.ShowHomeButtonPreferenceStateManaged. Currently {@link
+@@ -123,7 +124,8 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
      */
     public static boolean shouldCloseAppWithZeroTabs() {
         return HomepageManager.isHomepageEnabled()
@@ -50,61 +50,60 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
     }
 
     /**
-@@ -111,7 +113,7 @@ public class HomepageManager {
-      * @return The default homepage URI.
+@@ -141,7 +143,7 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+      *         if the homepage button is force enabled via flag.
      */
-     public static String getDefaultHomepageUri() {
+     private static String getDefaultHomepageUri() {
 -        return UrlConstants.NTP_NON_NATIVE_URL;
 +        return UrlConstants.CHROME_BLANK_URL;
     }
 
     /**
-@@ -125,6 +127,14 @@ public class HomepageManager {
+@@ -170,6 +172,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+         return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_ENABLED, true);
     }
 
-     /**
+    /**
 +     * 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);
+        return mSharedPreferencesManager.readBoolean(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 {
+@@ -181,6 +191,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+         notifyHomepageUpdated();
     }
 
-     /**
+    /**
 +     * 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();
+        mSharedPreferencesManager.writeBoolean(PREF_NTP_IS_HOMEPAGE, enabled);
 +        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 {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
+@@ -27,6 +27,8 @@ public class HomepageSettings 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";
+     public static final String PREF_HOMEPAGE_EDIT = "homepage_edit";
 
-     private HomepageManager mHomepageManager;
-     private Preference mHomepageEdit;
-@@ -42,6 +43,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
-             return true;
-         });
+    private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch";
+
+     /**
+      * Delegate used to mark that the homepage is being managed.
+      * Created for {@link org.chromium.chrome.browser.settings.HomepagePreferences}
+@@ -63,6 +65,15 @@ public class HomepageSettings extends PreferenceFragmentCompat {
+             });
+         }
 
 +        ChromeSwitchPreference mNTPIsHomepageSwitch =
 +                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
@@ -121,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Hom
 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;
+@@ -13,6 +13,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;
@@ -129,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
 
 /**
  * An interface to return a {@link TabCreator} either for regular or incognito tabs.
-@@ -85,12 +86,18 @@ public interface TabCreatorManager {
+@@ -86,12 +87,18 @@ public interface TabCreatorManager {
         }
 
         /**
@@ -150,23 +149,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
             } 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
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -732,6 +732,9 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
+         Last hour
       </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.">
+       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_24_HOURS" desc="The option to delete browsing data from the last 24 hours.">
+         Last 24 hours
+       </message>
 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) {
+@@ -55,6 +55,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
@@ -192,8 +191,8 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -318,6 +318,7 @@ extern const char kSettingsShowBrowserBanner[];
- extern const char kSettingsShowOSBanner[];
+@@ -326,6 +326,7 @@ extern const char kSettingsShowOSBanner[];
+ extern const char kDeviceLoginScreenWebUsbAllowDevicesForUrls[];
 #endif  // defined(OS_CHROMEOS)
 extern const char kShowHomeButton[];
 +extern const char kNewTabPageIsHomePage[];
@@ -201,5 +200,5 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 extern const char kAllowDeletingBrowserHistory[];
 #if !defined(OS_ANDROID)
 -- 
-2.11.0
+2.17.1

@@ -3,13 +3,13 @@ Date: Tue, 28 Aug 2018 23:27:23 +0200
 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         | 21 +++++++++++++++++-
- .../java/strings/android_chrome_strings.grd        |  6 ++++++
- .../android/preferences/pref_service_bridge.cc     | 25 ++++++++++++++++++++++
- 6 files changed, 71 insertions(+), 1 deletion(-)
+ chrome/android/java/res/values/values.xml     |  3 ++
+ .../java/res/xml/website_preferences.xml      |  7 +++++
+ .../website/SingleCategorySettings.java       | 21 ++++++++++++-
+ .../preferences/pref_service_bridge.cc        | 31 +++++++++++++++++++
+ .../preferences/PrefServiceBridge.java        | 10 ++++++
+ .../strings/android_chrome_strings.grd        |  6 ++++
+ 6 files changed, 77 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
@@ -27,115 +27,72 @@ 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
-@@ -26,6 +26,13 @@
-         android:summary="@string/block_third_party_cookies_summary"
-         android:defaultValue="true"
+@@ -32,6 +32,13 @@
+         android:title="@string/website_settings_category_notifications_quiet"
+         android:defaultValue="false"
         android:persistent="false" />
 +    <!-- A toggle for cookies to be saved only until session exit, only shown for the Cookies category. -->
-+    <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
 +        android:key="cookies_session_only"
 +        android:title="@string/allow_cookies_session_only_title"
 +        android:summary="@string/allow_cookies_session_only_summary"
 +        android:defaultValue="true"
 +        android:persistent="false" />
     <!-- A toggle for enabling vibration in notifications. -->
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+     <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
         android:key="notifications_vibrate"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-@@ -242,6 +242,10 @@ public class PrefServiceBridge {
-         return nativeGetBlockThirdPartyCookiesEnabled();
-     }
- 
-+    public boolean isCookiesSessionOnlyEnabled() {
-+        return nativeGetCookiesSessionOnlyEnabled();
-+    }
-+
-     /**
-      * @return Whether third-party cookie blocking is configured by policy
-      */
-@@ -631,6 +635,10 @@ public class PrefServiceBridge {
-         nativeSetBlockThirdPartyCookiesEnabled(enabled);
-     }
- 
-+    public void setCookiesSessionOnlyEnabled(boolean enabled) {
-+        nativeSetCookiesSessionOnlyEnabled(enabled);
-+    }
-+
-     public void setDoNotTrackEnabled(boolean enabled) {
-         nativeSetDoNotTrackEnabled(enabled);
-     }
-@@ -1094,6 +1102,7 @@ public class PrefServiceBridge {
-     private native boolean nativeGetAutoplayEnabled();
-     private native boolean nativeGetBackgroundSyncEnabled();
-     private native boolean nativeGetBlockThirdPartyCookiesEnabled();
-+    private native boolean nativeGetCookiesSessionOnlyEnabled();
-     private native boolean nativeGetBlockThirdPartyCookiesManaged();
-     private native boolean nativeGetRememberPasswordsEnabled();
-     private native boolean nativeGetPasswordManagerAutoSigninEnabled();
-@@ -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 nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
-     private native void nativeSetClipboardEnabled(boolean enabled);
-     private native void nativeSetDoNotTrackEnabled(boolean enabled);
-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
-@@ -127,6 +127,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
+@@ -130,6 +130,7 @@ public class SingleCategorySettings 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 NOTIFICATIONS_QUIET_UI_TOGGLE_KEY = "notifications_quiet_ui";
     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
-     private static final String ADD_EXCEPTION_KEY = "add_exception";
-@@ -484,6 +485,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-                 if (type == SiteSettingsCategory.Type.COOKIES
-                         && !FeatureUtilities.isNoTouchModeEnabled()) {
+@@ -478,6 +479,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
+ 
+                 if (type == SiteSettingsCategory.Type.COOKIES) {
                     updateThirdPartyCookiesCheckBox();
 +                    updateCookiesSessionOnlyCheckBox();
                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
-                     updateNotificationsVibrateCheckBox();
+                     updateNotificationsSecondaryControls();
                 }
-@@ -523,6 +525,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -516,6 +518,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
             int setting = (int) newValue;
-             prefServiceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
+             WebsitePreferenceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
             getInfoForOrigins();
 +        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
-+            prefServiceBridge.setCookiesSessionOnlyEnabled((boolean) newValue);
+            PrefServiceBridge.getInstance().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())) {
-@@ -840,6 +844,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+             PrefServiceBridge.getInstance().setBoolean(
+                     Pref.BLOCK_THIRD_PARTY_COOKIES, ((boolean) newValue));
+@@ -829,6 +833,8 @@ public class SingleCategorySettings 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);
         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
+         Preference notificationsQuietUi = screen.findPreference(NOTIFICATIONS_QUIET_UI_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
+@@ -861,6 +867,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
 
         if (hideSecondaryToggles) {
             screen.removePreference(thirdPartyCookies);
 +            screen.removePreference(cookiesSessionOnly);
             screen.removePreference(notificationsVibrate);
+             screen.removePreference(notificationsQuietUi);
             screen.removePreference(explainProtectedMediaKey);
-             screen.removePreference(allowedGroup);
-@@ -881,14 +888,17 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
+@@ -872,12 +879,15 @@ public class SingleCategorySettings 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()) {
+         if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
             thirdPartyCookies.setOnPreferenceChangeListener(this);
             updateThirdPartyCookiesCheckBox();
 +            cookiesSessionOnly.setOnPreferenceChangeListener(this);
@@ -145,9 +102,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 +            screen.removePreference(cookiesSessionOnly);
         }
 
-         // Configure/hide the notifications vibrate toggle, as needed.
-@@ -1003,6 +1013,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-                 preference -> PrefServiceBridge.getInstance().isBlockThirdPartyCookiesManaged());
+         // Configure/hide the notifications secondary controls, as needed.
+@@ -992,6 +1002,15 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
+         }
     }
 
 +    private void updateCookiesSessionOnlyCheckBox() {
@@ -155,17 +112,97 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
 +                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
 +        cookiesSessionOnlyPref.setChecked(
 +                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
-+        cookiesSessionOnlyPref.setEnabled(PrefServiceBridge.getInstance().isCategoryEnabled(
-+                ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES));
+        cookiesSessionOnlyPref.setEnabled(WebsitePreferenceBridge.isCategoryEnabled(
+                ContentSettingsType.COOKIES));
 +    }
 +
-     private void updateNotificationsVibrateCheckBox() {
-         ChromeBaseCheckBoxPreference preference =
+     private void updateThirdPartyCookiesCheckBox() {
+         ChromeBaseCheckBoxPreference thirdPartyCookiesPref =
                 (ChromeBaseCheckBoxPreference) getPreferenceScreen().findPreference(
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -895,6 +895,12 @@ Your Google account may have other forms of browsing history like searches and a
+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
+@@ -13,10 +13,17 @@
+ #include "chrome/browser/android/preferences/prefs.h"
+ #include "chrome/browser/preferences/jni_headers/PrefServiceBridge_jni.h"
+ #include "chrome/browser/profiles/profile_manager.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+//#include "components/content_settings/core/common/content_settings_types.h"
+ #include "components/prefs/pref_service.h"
+ 
+ namespace {
+ 
+Profile* GetOriginalProfile() {
+  return ProfileManager::GetActiveUserProfile()->GetOriginalProfile();
+}
+
+ PrefService* GetPrefService() {
+   return ProfileManager::GetActiveUserProfile()
+       ->GetOriginalProfile()
+@@ -84,3 +91,27 @@ static jboolean JNI_PrefServiceBridge_IsManagedPreference(
+   return GetPrefService()->IsManagedPreference(
+       PrefServiceBridge::GetPrefNameExposedToJava(j_pref_index));
+ }
+static jboolean JNI_PrefServiceBridge_GetCookiesSessionOnlyEnabled(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj) {
+  HostContentSettingsMap* host_content_settings_map =
+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
+  auto value = host_content_settings_map->GetDefaultContentSetting(ContentSettingsType::COOKIES, nullptr);
+  auto enabled = CONTENT_SETTING_SESSION_ONLY == value;
+  LOG(INFO) << "GetCookiesSessionOnly := " << enabled << " (raw_value = " << value << ")";
+  return enabled;
+}
+
+static void JNI_PrefServiceBridge_SetCookiesSessionOnlyEnabled(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,
+    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(
+      ContentSettingsType::COOKIES,
+      enabled ? CONTENT_SETTING_SESSION_ONLY : CONTENT_SETTING_ALLOW);
+}
+diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+@@ -82,6 +82,13 @@ public class PrefServiceBridge {
+         PrefServiceBridgeJni.get().setString(preference, value);
+     }
+ 
+    public boolean isCookiesSessionOnlyEnabled() {
+        return PrefServiceBridgeJni.get().getCookiesSessionOnlyEnabled(PrefServiceBridge.this);
+    }
+    public void setCookiesSessionOnlyEnabled(boolean enabled) {
+        PrefServiceBridgeJni.get().setCookiesSessionOnlyEnabled(PrefServiceBridge.this, enabled);
+    }
+
+     /**
+      * @param preference The name of the preference.
+      * @return Whether the specified preference is managed.
+@@ -97,6 +104,8 @@ public class PrefServiceBridge {
+ 
+     @NativeMethods
+     interface Natives {
+        boolean getCookiesSessionOnlyEnabled(PrefServiceBridge caller);
+        void setCookiesSessionOnlyEnabled(PrefServiceBridge caller, boolean enabled);
+         boolean getBoolean(int preference);
+         void setBoolean(int preference, boolean value);
+         int getInteger(int preference);
+@@ -106,3 +115,4 @@ public class PrefServiceBridge {
+         boolean isManagedPreference(int preference);
+     }
+ }
+
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -814,6 +814,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>
@@ -178,48 +215,6 @@ diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/and
       <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR-LIMIT=32]">
         JavaScript
       </message>
-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
-@@ -314,6 +314,17 @@ static jboolean JNI_PrefServiceBridge_GetBlockThirdPartyCookiesEnabled(
-   return GetPrefService()->GetBoolean(prefs::kBlockThirdPartyCookies);
- }
- 
-+static jboolean JNI_PrefServiceBridge_GetCookiesSessionOnlyEnabled(
-+    JNIEnv* env,
-+    const JavaParamRef<jobject>& obj) {
-+  HostContentSettingsMap* host_content_settings_map =
-+      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
-+  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) {
-@@ -785,6 +796,20 @@ static void JNI_PrefServiceBridge_SetBlockThirdPartyCookiesEnabled(
-   GetPrefService()->SetBoolean(prefs::kBlockThirdPartyCookies, enabled);
- }
- 
-+static void JNI_PrefServiceBridge_SetCookiesSessionOnlyEnabled(
-+    JNIEnv* env,
-+    const JavaParamRef<jobject>& obj,
-+    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_SESSION_ONLY : CONTENT_SETTING_ALLOW);
-+}
-+
- static void JNI_PrefServiceBridge_SetRememberPasswordsEnabled(
-     JNIEnv* env,
-     const JavaParamRef<jobject>& obj,
 -- 
-2.11.0
+2.17.1

@@ -3,38 +3,37 @@ Date: Sat, 23 Nov 2019 10:55:16 +0100
 Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL

 ---
- chrome/android/chrome_java_sources.gni             |  2 +
- chrome/android/java/res/layout/doh_editor.xml      | 65 ++++++++++++++++
- chrome/android/java/res/values/values.xml          |  2 +
- chrome/android/java/res/xml/doh_preferences.xml    | 25 ++++++
- .../android/java/res/xml/privacy_preferences.xml   |  5 ++
- .../chrome/browser/preferences/DoHEditor.java      | 91 ++++++++++++++++++++++
- .../chrome/browser/preferences/DoHPreferences.java | 52 +++++++++++++
- .../chrome/browser/util/FeatureUtilities.java      | 25 ++++++
- .../java/strings/android_chrome_strings.grd        | 11 +++
- chrome/app/generated_resources.grd                 |  6 ++
- chrome/browser/android/feature_utilities.cc        | 23 ++++++
- .../browser/net/system_network_context_manager.cc  | 46 +++--------
- chrome/common/chrome_features.cc                   |  4 +-
- 13 files changed, 320 insertions(+), 37 deletions(-)
+ chrome/android/chrome_java_sources.gni        |  2 +
+ chrome/android/java/res/layout/doh_editor.xml | 65 +++++++++++++
+ chrome/android/java/res/values/values.xml     |  2 +
+ .../android/java/res/xml/doh_preferences.xml  | 25 +++++
+ .../java/res/xml/privacy_preferences.xml      |  5 +
+ .../browser/flags/FeatureUtilities.java       | 24 +++++
+ .../chrome/browser/settings/DoHEditor.java    | 92 +++++++++++++++++++
+ .../browser/settings/DoHPreferences.java      | 54 +++++++++++
+ chrome/app/generated_resources.grd            |  6 ++
+ chrome/browser/android/feature_utilities.cc   | 23 +++++
+ .../net/system_network_context_manager.cc     | 41 ++-------
+ .../strings/android_chrome_strings.grd        | 11 +++
+ chrome/common/chrome_features.cc              |  4 +-
+ 13 files changed, 320 insertions(+), 34 deletions(-)
 create mode 100644 chrome/android/java/res/layout/doh_editor.xml
 create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java

 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1251,7 +1251,9 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java",
-   "java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java",
-   "java/src/org/chromium/chrome/browser/preferences/HomepageEditor.java",
-+  "java/src/org/chromium/chrome/browser/preferences/DoHEditor.java",
-   "java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java",
-+  "java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java",
-   "java/src/org/chromium/chrome/browser/preferences/HyperlinkPreference.java",
-   "java/src/org/chromium/chrome/browser/preferences/LearnMorePreference.java",
-   "java/src/org/chromium/chrome/browser/preferences/LegalInformationPreferences.java",
+@@ -1335,6 +1335,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java",
+  "java/src/org/chromium/chrome/browser/settings/DoHEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/DoHPreferences.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationManager.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationSharedPrefManager.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridge.java",
 diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml
 new file mode 100644
 --- /dev/null
@@ -64,7 +63,7 @@ new file mode 100644
 +            android:orientation="vertical"
 +            android:focusableInTouchMode="true" >
 +
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
+            <org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
 +                android:id="@+id/doh_url"
 +                style="@style/PreferenceScreenLayout"
 +                android:layout_width="match_parent"
@@ -78,7 +77,7 @@ new file mode 100644
 +                    android:inputType="textUri"
 +                    android:singleLine="true"
 +                    android:hint="@string/options_doh_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
+            </org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
 +
 +            <Space style="@style/ButtonBarTopSpacer" />
 +            <View style="@style/ButtonBarTopDivider" />
@@ -102,13 +101,13 @@ new file mode 100644
 +        </LinearLayout>
 +    </ScrollView>
 +
-+    <include layout="@layout/preferences_action_bar_shadow"/>
+    <include layout="@layout/settings_action_bar_shadow"/>
 +
 +</FrameLayout>
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -88,6 +88,8 @@
+@@ -86,6 +86,8 @@
     <integer name="download_infobar_bar_fill_in_delay">400</integer>
     <integer name="download_infobar_bar_fill_out_delay">200</integer>
 
@@ -131,12 +130,12 @@ new file mode 100644
 +    xmlns:android="http://schemas.android.com/apk/res/android"
 +    xmlns:app="http://schemas.android.com/apk/res-auto">
 +
-+    <org.chromium.chrome.browser.preferences.ChromeSwitchPreference
+    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
 +        android:key="doh_switch"
 +        android:summaryOn="@string/text_on"
 +        android:summaryOff="@string/text_off" />
 +
-+    <org.chromium.chrome.browser.preferences.HyperlinkPreference
+    <org.chromium.chrome.browser.settings.HyperlinkPreference
 +        android:key="doh_help"
 +        android:title="@string/doh_help"
 +        app:url="@string/doh_help_url" />
@@ -144,7 +143,7 @@ new file mode 100644
 +    <Preference
 +        android:key="doh_edit"
 +        android:title="@string/options_doh_edit_label"
-+        android:fragment="org.chromium.chrome.browser.preferences.DoHEditor" />
+        android:fragment="org.chromium.chrome.browser.settings.DoHEditor" />
 +
 +</PreferenceScreen>
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -155,23 +154,64 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
         android:title="@string/can_make_payment_title"
         android:summary="@string/settings_can_make_payment_toggle_label" />
 +    <Preference
-+        android:fragment="org.chromium.chrome.browser.preferences.DoHPreferences"
+        android:fragment="org.chromium.chrome.browser.settings.DoHPreferences"
 +        android:key="doh"
 +        android:title="@string/options_doh_title"
 +        android:summary="@string/options_doh_summary" />
-     <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
+     <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
         android:key="preload_pages"
         android:title="@string/preload_pages_title"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
+@@ -120,6 +120,26 @@ public class FeatureUtilities {
+     private static Boolean sEnabledTabThumbnailApsectRatioForTesting;
+     private static final String ALLOW_TO_REFETCH = "allow_to_refetch";
+ 
+     /**
+     * Records whether custom URL for DoH is enabled with native-side feature utilities.
+     * @param url Whether custom URL is enabled or not.
+     */
+     public static void setDoHEnabled(boolean enabled) {
+         FeatureUtilitiesJni.get().setDoHEnabled(enabled);
+     }
+
+     public static boolean getDoHEnabled() {
+         return FeatureUtilitiesJni.get().getDoHEnabled();
+     }
+
+     public static void setDoHTemplates(String t) {
+         FeatureUtilitiesJni.get().setDoHTemplates(t);
+     }
+
+     public static String getDoHTemplates() {
+         return FeatureUtilitiesJni.get().getDoHTemplates();
+     }
+
+     /**
+      * Checks if a cached feature flag is enabled.
+      *
+@@ -792,6 +812,10 @@ public class FeatureUtilities {
+ 
+     @NativeMethods
+     interface Natives {
+        void setDoHEnabled(boolean enabled);
+        boolean getDoHEnabled();
+        void setDoHTemplates(String templates);
+        String getDoHTemplates();
+         boolean isNetworkServiceWarmUpEnabled();
+         void setAdBlockFiltersURL(String url);
+         String getAdBlockFiltersURL();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
 new file mode 100644
 --- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHEditor.java
-@@ -0,0 +1,91 @@
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
+@@ -0,0 +1,92 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
-+package org.chromium.chrome.browser.preferences;
+package org.chromium.chrome.browser.settings;
 +
 +import android.os.Bundle;
 +import android.support.v4.app.Fragment;
@@ -183,7 +223,8 @@ new file mode 100644
 +import android.widget.Button;
 +import android.widget.EditText;
 +
-+import org.chromium.chrome.browser.util.FeatureUtilities;
+import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.FeatureUtilities;
 +import org.chromium.chrome.R;
 +import org.chromium.components.url_formatter.UrlFormatter;
 +
@@ -204,7 +245,7 @@ new file mode 100644
 +        View v = inflater.inflate(R.layout.doh_editor, container, false);
 +        View scrollView = v.findViewById(R.id.scroll_view);
 +        scrollView.getViewTreeObserver().addOnScrollChangedListener(
-+                PreferenceUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
 +        mDoHUrlEdit = (EditText) v.findViewById(R.id.doh_url_edit);
 +        mDoHUrlEdit.setText(FeatureUtilities.getDoHTemplates());
 +        mDoHUrlEdit.addTextChangedListener(this);
@@ -258,23 +299,25 @@ new file mode 100644
 +        });
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java
 new file mode 100644
 --- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/DoHPreferences.java
-@@ -0,0 +1,52 @@
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java
+@@ -0,0 +1,54 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
-+package org.chromium.chrome.browser.preferences;
+package org.chromium.chrome.browser.settings;
 +
 +import android.os.Bundle;
 +import android.support.v7.preference.Preference;
 +import android.support.v7.preference.PreferenceFragmentCompat;
+import org.chromium.chrome.browser.settings.ChromeSwitchPreference;
 +
-+import org.chromium.chrome.browser.util.FeatureUtilities;
-+import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.FeatureUtilities;
+import androidx.annotation.VisibleForTesting;
 +import org.chromium.chrome.R;
 +
 +/**
@@ -290,7 +333,7 @@ new file mode 100644
 +    @Override
 +    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 +        getActivity().setTitle(R.string.options_doh_title);
-+        PreferenceUtils.addPreferencesFromResource(this, R.xml.doh_preferences);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.doh_preferences);
 +
 +        ChromeSwitchPreference mDoHSwitch =
 +                (ChromeSwitchPreference) findPreference(PREF_DOH_SWITCH);
@@ -315,73 +358,10 @@ new file mode 100644
 +        updateCurrentDoHUrl();
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java
-@@ -163,6 +163,27 @@ public class FeatureUtilities {
-         nativeSetCustomTabVisible(visible);
-     }
- 
-+     /**
-+     * Records whether custom URL for DoH is enabled with native-side feature utilities.
-+     * @param url Whether custom URL is enabled or not.
-+     */
-+     public static void setDoHEnabled(boolean enabled) {
-+         nativeSetDoHEnabled(enabled);
-+     }
-+
-+     public static boolean getDoHEnabled() {
-+         return nativeGetDoHEnabled();
-+     }
-+
-+     public static void setDoHTemplates(String t) {
-+         nativeSetDoHTemplates(t);
-+     }
-+
-+     public static String getDoHTemplates() {
-+         return nativeGetDoHTemplates();
-+     }
-+
-+
-     /**
-      * Records whether the activity is in multi-window mode with native-side feature utilities.
-      * @param isInMultiWindowMode Whether the activity is in Android N multi-window mode.
-@@ -897,6 +918,10 @@ public class FeatureUtilities {
-     }
- 
-     private static native void nativeSetCustomTabVisible(boolean visible);
-+    private static native void nativeSetDoHEnabled(boolean enabled);
-+    private static native boolean nativeGetDoHEnabled();
-+    private static native void nativeSetDoHTemplates(String templates);
-+    private static native String nativeGetDoHTemplates();
-     private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
-     private static native boolean nativeIsNetworkServiceWarmUpEnabled();
- }
-diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
-+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -656,6 +656,17 @@ CHAR-LIMIT guidelines:
-         Chrome Passwords
-       </message>
- 
-+      <!-- DoH preferences -->
-+      <message name="IDS_OPTIONS_DOH_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used for DNS-over-HTTPS queries.">
-+        Edit DoH template URLs
-+      </message>
-+      <message name="IDS_OPTIONS_DOH_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used for DNS-over-HTTPS queries.">
-+        DoH template URLs
-+      </message>
-+      <message name="IDS_DOH_HELP" desc="The title of the hyperlink that allows users to visit the wiki page with instructions for DNS-over-HTTPS configuration.">
-+        Visit help page
-+      </message>
-+
-       <!-- Homepage preferences -->
-       <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the home page button in the omnibox.">
-         Edit home page
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -6507,6 +6507,12 @@ the Bookmarks menu.">
+@@ -6848,6 +6848,12 @@ the Bookmarks menu.">
         <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
           Home page
         </message>
@@ -404,10 +384,10 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi
 +#include "chrome/browser/browser_process.h"
 +#include "components/prefs/pref_service.h"
 +#include "chrome/common/pref_names.h"
- #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
- #include "chrome/browser/profiles/profile_manager.h"
- #include "components/ntp_snippets/content_suggestions_service.h"
-@@ -73,3 +76,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
+ #include "content/public/common/content_features.h"
+ #include "content/public/common/network_service_util.h"
+ 
+@@ -45,3 +48,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
   return content::IsOutOfProcessNetworkService() &&
          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
 }
@@ -434,29 +414,10 @@ diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/androi
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -134,9 +134,14 @@ void GetStubResolverConfig(
- 
-   std::string doh_templates =
-       local_state->GetString(prefs::kDnsOverHttpsTemplates);
-  std::string server_method;
-  if (!doh_templates.empty() &&
-      *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
-+  if (doh_templates.empty()) {
-+    *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
-+    doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
-+  }
-+
-+  LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode;
-+  if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
-+    std::string server_method;
-     for (const std::string& server_template :
-          SplitString(doh_templates, " ", base::TRIM_WHITESPACE,
-                      base::SPLIT_WANT_NONEMPTY)) {
-@@ -404,40 +409,11 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-   // features before registering change callbacks for these preferences.
+@@ -379,40 +379,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
   local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
                                     base::Value(ShouldEnableAsyncDns()));
-  std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
+   std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
 -  std::string default_doh_templates = "";
 -  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
 -    if (features::kDnsOverHttpsFallbackParam.Get()) {
@@ -466,13 +427,12 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 -    }
 -    default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
 -  }
-+  //NOTE: DoH fallback feature to insecure mode is not evaluated
+  std::string default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
-                                    base::Value(default_doh_mode));
-+                                    base::Value(chrome_browser_net::kDnsOverHttpsModeOff));
+                                     base::Value(default_doh_mode));
   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates,
-                                    base::Value(default_doh_templates));
-
+                                     base::Value(default_doh_templates));
+ 
 -  // If the user has explicitly enabled or disabled the DoH experiment in
 -  // chrome://flags, store that choice in the user prefs so that it can be
 -  // persisted after the experiment ends. Also make sure to remove the stored
@@ -492,14 +452,53 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 -    // The user has "Default" selected.
 -    local_state_->ClearPref(prefs::kDnsOverHttpsMode);
 -  }
-+                                    base::Value(features::kDnsOverHttpsTemplatesParam.Get()));
- 
+-
   PrefChangeRegistrar::NamedChangeCallback dns_pref_callback =
       base::BindRepeating(&OnStubResolverConfigChanged,
+                           base::Unretained(local_state_));
+@@ -548,9 +520,14 @@ void SystemNetworkContextManager::GetStubResolverConfig(
+ 
+   std::string doh_templates =
+       local_state->GetString(prefs::kDnsOverHttpsTemplates);
+-  std::string server_method;
+-  if (!doh_templates.empty() &&
+-      *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
+  if (doh_templates.empty()) {
+    *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
+    doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
+  }
+
+  LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode;
+  if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
+    std::string server_method;
+     for (const std::string& server_template :
+          SplitString(doh_templates, " ", base::TRIM_WHITESPACE,
+                      base::SPLIT_WANT_NONEMPTY)) {
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -578,6 +578,17 @@ CHAR-LIMIT guidelines:
+         Chrome Passwords
+       </message>
+ 
+      <!-- DoH preferences -->
+      <message name="IDS_OPTIONS_DOH_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used for DNS-over-HTTPS queries.">
+        Edit DoH template URLs
+      </message>
+      <message name="IDS_OPTIONS_DOH_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used for DNS-over-HTTPS queries.">
+        DoH template URLs
+      </message>
+      <message name="IDS_DOH_HELP" desc="The title of the hyperlink that allows users to visit the wiki page with instructions for DNS-over-HTTPS configuration.">
+        Visit help page
+      </message>
+
+       <!-- Homepage preferences -->
+       <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the home page button in the omnibox.">
+         Edit home page
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -271,12 +271,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
+@@ -293,12 +293,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
 
 // Enable DNS over HTTPS (DoH).
 const base::Feature kDnsOverHttps{"DnsOverHttps",
@@ -515,5 +514,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 // Supply one or more space-separated DoH server URI templates to use when this
 // feature is enabled. If no templates are specified, then a hardcoded mapping
 -- 
-2.11.0
+2.17.1

@@ -0,0 +1,119 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 22:52:53 +0100
+Subject: Allow building without feed support
+
+---
+ .../start_surface/StartSurfaceCoordinator.java  |  5 -----
+ .../start_surface/StartSurfaceMediator.java     | 17 -----------------
+ chrome/android/feed/feed_java_sources.gni       |  2 --
+ .../browser/native_page/NativePageFactory.java  |  7 -------
+ components/feed/feed_feature_list.cc            |  2 +-
+ 5 files changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
+--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
+@@ -214,11 +214,6 @@ public class StartSurfaceCoordinator implements StartSurface {
+             mBottomBarCoordinator = new BottomBarCoordinator(
+                     mActivity, mActivity.getCompositorViewHolder(), mPropertyModel);
+         }
+-
+-        mExploreSurfaceCoordinator = new ExploreSurfaceCoordinator(mActivity,
+-                mSurfaceMode == SurfaceMode.SINGLE_PANE ? mTasksSurface.getBodyViewContainer()
+-                                                        : mActivity.getCompositorViewHolder(),
+-                mPropertyModel, mSurfaceMode == SurfaceMode.SINGLE_PANE);
+     }
+ 
+     private TabSwitcher.Controller initializeSecondaryTasksSurface() {
+diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+@@ -415,15 +415,6 @@ class StartSurfaceMediator
+             assert (isShownState(shownState));
+             setOverviewState(shownState);
+ 
+-            // Make sure FeedSurfaceCoordinator is built before the explore surface is showing by
+-            // default.
+-            if (mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)
+-                    && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
+-                    && !mActivityStateChecker.isFinishingOrDestroyed()) {
+-                mPropertyModel.set(FEED_SURFACE_COORDINATOR,
+-                        mFeedSurfaceCreator.createFeedSurfaceCoordinator(
+-                                mNightModeStateProvider.isInNightMode()));
+-            }
+             mTabModelSelector.addObserver(mTabModelSelectorObserver);
+ 
+             if (mFullScreenListener != null) {
+@@ -536,14 +527,6 @@ class StartSurfaceMediator
+     private void setExploreSurfaceVisibility(boolean isVisible) {
+         if (isVisible == mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)) return;
+ 
+-        if (isVisible && mPropertyModel.get(IS_SHOWING_OVERVIEW)
+-                && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
+-                && !mActivityStateChecker.isFinishingOrDestroyed()) {
+-            mPropertyModel.set(FEED_SURFACE_COORDINATOR,
+-                    mFeedSurfaceCreator.createFeedSurfaceCoordinator(
+-                            mNightModeStateProvider.isInNightMode()));
+-        }
+-
+         mPropertyModel.set(IS_EXPLORE_SURFACE_VISIBLE, isVisible);
+ 
+         if (mOverviewModeState == OverviewModeState.SHOWN_TABSWITCHER_TWO_PANES) {
+diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni
+--- a/chrome/android/feed/feed_java_sources.gni
+++ b/chrome/android/feed/feed_java_sources.gni
+@@ -35,7 +35,6 @@ if (enable_feed_in_chrome) {
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLifecycleBridge.java",
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java",
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java",
+-    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineBridge.java",
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineIndicator.java",
+     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
+@@ -736,7 +735,6 @@ if (enable_feed_in_chrome) {
+   feed_deps = []
+   feed_java_sources = [
+     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedAppLifecycle.java",
+-    "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
+     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
+     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedRefreshTask.java",
+     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java",
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.ChromeActivity;
+ import org.chromium.chrome.browser.bookmarks.BookmarkPage;
+ import org.chromium.chrome.browser.download.DownloadPage;
+ import org.chromium.chrome.browser.explore_sites.ExploreSitesPage;
+-import org.chromium.chrome.browser.feed.FeedNewTabPage;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
+ import org.chromium.chrome.browser.history.HistoryPage;
+@@ -57,12 +56,6 @@ public class NativePageFactory {
+                         activity, new TabShim(tab, activity.getFullscreenManager()));
+             }
+ 
+-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)) {
+-                return new FeedNewTabPage(activity,
+-                        new TabShim(tab, activity.getFullscreenManager()), tabModelSelector,
+-                        activityTabProvider, activityLifecycleDispatcher, (TabImpl) tab);
+-            }
+-
+             return new NewTabPage(activity, new TabShim(tab, activity.getFullscreenManager()),
+                     tabModelSelector, activityTabProvider, activityLifecycleDispatcher,
+                     (TabImpl) tab);
+diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
+--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
+@@ -7,7 +7,7 @@
+ namespace feed {
+ 
+ const base::Feature kInterestFeedContentSuggestions{
+-    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
+    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::FeatureParam<std::string> kDisableTriggerTypes{
+     &kInterestFeedContentSuggestions, "disable_trigger_types", ""};
+-- 
+2.17.1
+
@@ -10,7 +10,7 @@ Subject: Allow playing audio in background
 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 {
+@@ -977,6 +977,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -23,7 +23,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3278,7 +3284,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3351,7 +3357,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.
@@ -39,7 +39,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
 --- a/media/blink/webmediaplayer_impl.h
 +++ b/media/blink/webmediaplayer_impl.h
-@@ -142,6 +142,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+@@ -149,6 +149,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;
@@ -49,5 +49,5 @@ diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl
   void EnabledAudioTracksChanged(
       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
 -- 
-2.11.0
+2.17.1

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

@@ -3,13 +3,13 @@ Date: Thu, 14 Dec 2017 16:19:50 +0200
 Subject: Always allow partner customisation

 ---
- .../PartnerBrowserCustomizations.java                    | 16 ++++++++--------
+ .../PartnerBrowserCustomizations.java            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -243,14 +243,14 @@ public class PartnerBrowserCustomizations {
+@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations {
             @Override
             protected Void doInBackground() {
                 try {
@@ -33,5 +33,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
                     if (isCancelled()) return null;
                     refreshIncognitoModeDisabled();
 -- 
-2.11.0
+2.17.1

@@ -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
-@@ -242,7 +242,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
+@@ -196,7 +196,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
-@@ -550,7 +550,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+@@ -540,7 +540,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.11.0
+2.17.1

@@ -1,234 +0,0 @@
-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
-
@@ -0,0 +1,131 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Dec 2019 10:23:04 +0100
+Subject: Always show site settings for cookies, javascript and ads
+
+Avoid displaying info about intrusive ads
+---
+ .../website/SingleWebsiteSettings.java        | 46 +++++++++----------
+ .../browser/settings/website/Website.java     | 20 ++++++++
+ 2 files changed, 42 insertions(+), 24 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
+@@ -72,6 +72,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
+     // Buttons:
+     public static final String PREF_RESET_SITE = "reset_site_button";
+ 
+    public static final String TAG = "SingleWebsitePreferences";
+     // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below)
+     // All permissions from the permissions preference category must be listed here.
+     private static final String[] PERMISSION_PREFERENCE_KEYS = {
+@@ -349,7 +350,24 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
+                 } else if (i == ContentSettingException.Type.SOUND) {
+                     setUpSoundPreference(preference);
+                 } else {
+-                    setUpListPreference(preference, mSite.getContentSettingPermission(i));
+                    // some Bromite-specific overrides for the defaults
+                    @ContentSettingValues
+                    @Nullable
+                    Integer permission = mSite.getContentSettingPermission(i);
+                    // initialize cookie and javascript with the category global defaults
+                    if (permission == null) {
+                       if (i == ContentSettingException.Type.COOKIE)
+                          permission = WebsitePreferenceBridge.isCategoryEnabled(
+                                 ContentSettingsType.COOKIES)
+                                 ? ContentSettingValues.ALLOW
+                                 : ContentSettingValues.BLOCK;
+                       else if (i == ContentSettingException.Type.JAVASCRIPT)
+                          permission = WebsitePreferenceBridge.isCategoryEnabled(
+                                 ContentSettingsType.JAVASCRIPT)
+                                 ? ContentSettingValues.ALLOW
+                                 : ContentSettingValues.BLOCK;
+                    }
+                    setUpListPreference(preference, permission);
+                 }
+                 return;
+             }
+@@ -646,17 +664,8 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
+     }
+ 
+     private void setUpAdsInformationalBanner() {
+-        // Add the informational banner which shows at the top of the UI if ad blocking is
+-        // activated on this site.
+-        boolean adBlockingActivated = SiteSettingsCategory.adsCategoryEnabled()
+-                && WebsitePreferenceBridge.getAdBlockingActivated(mSite.getAddress().getOrigin())
+-                && findPreference(PERMISSION_PREFERENCE_KEYS[ContentSettingException.Type.ADS])
+-                        != null;
+-
+-        if (!adBlockingActivated) {
+-            removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO);
+-            removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO_DIVIDER);
+-        }
+        removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO);
+        removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO_DIVIDER);
+     }
+ 
+     private SiteSettingsCategory getWarningCategory() {
+@@ -733,6 +742,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
+         // TODO(crbug.com/735110): Figure out if this is the correct thing to do - here we are
+         // effectively treating non-ALLOW values as BLOCK.
+         int index = (value == ContentSettingValues.ALLOW ? 0 : 1);
+
+         listPreference.setValueIndex(index);
+         listPreference.setOnPreferenceChangeListener(this);
+         listPreference.setSummary("%s");
+@@ -802,22 +812,10 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
+             setUpListPreference(preference, null);
+             return;
+         }
+-        // If the ad blocker is activated, then this site will have ads blocked unless there is an
+-        // explicit permission disallowing the blocking.
+-        boolean activated =
+-                WebsitePreferenceBridge.getAdBlockingActivated(mSite.getAddress().getOrigin());
+         @ContentSettingValues
+         @Nullable
+         Integer permission = mSite.getContentSettingPermission(ContentSettingException.Type.ADS);
+ 
+-        // If |permission| is null, there is no explicit (non-default) permission set for this site.
+-        // If the site is not considered a candidate for blocking, do the standard thing and remove
+-        // the preference.
+-        if (permission == null && !activated) {
+-            setUpListPreference(preference, null);
+-            return;
+-        }
+-
+         // However, if the blocking is activated, we still want to show the permission, even if it
+         // is in the default state.
+         if (permission == null) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
+@@ -197,6 +197,26 @@ public class Website implements Serializable {
+                         new ContentSettingException(ContentSettingsType.ADS,
+                                 getAddress().getOrigin(), ContentSettingValues.BLOCK, "");
+             }
+        } else if (type == ContentSettingException.Type.COOKIE) {
+            // It is possible to set the permission without having an existing exception,
+            // because we can show the ALLOW state even when this permission is set to the
+            // default. In that case, just set an exception now to ALLOW to enable changing the
+            // permission.
+            if (mContentSettingException[type] == null) {
+                mContentSettingException[type] =
+                        new ContentSettingException(ContentSettingsType.COOKIES,
+                                getAddress().getOrigin(), ContentSettingValues.ALLOW, "");
+            }
+        } else if (type == ContentSettingException.Type.JAVASCRIPT) {
+            // It is possible to set the permission without having an existing exception,
+            // because we can show the ALLOW state even when this permission is set to the
+            // default. In that case, just set an exception now to ALLOW to enable changing the
+            // permission.
+            if (mContentSettingException[type] == null) {
+                mContentSettingException[type] =
+                        new ContentSettingException(ContentSettingsType.JAVASCRIPT,
+                                getAddress().getOrigin(), ContentSettingValues.ALLOW, "");
+            }
+         } else if (type == ContentSettingException.Type.SOUND) {
+             // It is possible to set the permission without having an existing exception,
+             // because we always show the sound permission in Site Settings.
+-- 
+2.17.1
+
@@ -4,43 +4,22 @@ Subject: Always use new tab page for default home page

 Ignore any partner-provided home page.
 ---
- .../chrome/browser/partnercustomizations/HomepageManager.java  | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
+ .../chrome/browser/partnercustomizations/HomepageManager.java  | 3 ---
+ 1 file changed, 3 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
-@@ -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() {
-        return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
-                || FeatureUtilities.isHomePageButtonForceEnabled();
-+        return FeatureUtilities.isHomePageButtonForceEnabled();
-     }
- 
-     /**
-@@ -124,9 +122,7 @@ public class HomepageManager {
+@@ -141,9 +141,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
      *         if the homepage button is force enabled via flag.
      */
-     public static String getDefaultHomepageUri() {
-        return PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()
-                ? PartnerBrowserCustomizations.getHomePageUrl()
-                : UrlConstants.NTP_NON_NATIVE_URL;
-+        return UrlConstants.NTP_NON_NATIVE_URL;
+     private static String getDefaultHomepageUri() {
+-        if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()) {
+-            return PartnerBrowserCustomizations.getHomePageUrl();
+-        }
+         return UrlConstants.NTP_NON_NATIVE_URL;
     }
 
-     /**
 -- 
-2.11.0
+2.17.1

@@ -2,17 +2,17 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sun, 25 Mar 2018 21:49:37 +0200
 Subject: AudioBuffer, AnalyserNode: fingerprinting mitigations via IDL

-Return fixed base latency
+Truncate base latency precision to two digits
 ---
- third_party/blink/renderer/modules/webaudio/analyser_node.idl | 8 ++++----
- third_party/blink/renderer/modules/webaudio/audio_buffer.idl  | 4 ++--
- third_party/blink/renderer/modules/webaudio/audio_context.cc  | 1 +
- 3 files changed, 7 insertions(+), 6 deletions(-)
+ .../blink/renderer/modules/webaudio/analyser_node.idl     | 8 ++++----
+ .../blink/renderer/modules/webaudio/audio_buffer.idl      | 4 ++--
+ .../blink/renderer/modules/webaudio/audio_context.cc      | 4 +++-
+ 3 files changed, 9 insertions(+), 7 deletions(-)

 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-@@ -43,10 +43,10 @@ interface AnalyserNode : AudioNode {
+@@ -40,10 +40,10 @@
 
     // Copies the current frequency data into the passed array.
     // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
@@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/thi
 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
-@@ -39,7 +39,7 @@
+@@ -37,7 +37,7 @@
 
     // Channel access
     readonly attribute unsigned long numberOfChannels;
@@ -43,14 +43,17 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 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
-@@ -358,6 +358,7 @@ void AudioContext::StopRendering() {
- double AudioContext::baseLatency() const {
+@@ -399,7 +399,9 @@ double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
-+  return 0.04;
 
-   // TODO(hongchan): Due to the incompatible constructor between
-   // AudioDestinationNode and RealtimeAudioDestinationNode, casting directly
+-  return base_latency_;
+  // remove precision past two decimal digits
+  int l = base_latency_ * 100;
+  return double(l)/100;
+ }
+ 
+ MediaElementAudioSourceNode* AudioContext::createMediaElementSource(
 -- 
-2.11.0
+2.17.1

@@ -4,7 +4,7 @@ Subject: Battery API: return nothing

 Include @thestinger's fix for correct charging/unknown values
 ---
- .../renderer/modules/battery/battery_manager.cc    | 25 ++++------------------
+ .../modules/battery/battery_manager.cc        | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 -  BatteryStatus old_status = battery_status_;
 -  battery_status_ = *BatteryDispatcher::Instance().LatestData();
 -
-   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
+   if (battery_property_->GetState() == BatteryProperty::kPending) {
     battery_property_->Resolve(this);
     return;
   }
@@ -61,5 +61,5 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 
 void BatteryManager::RegisterWithDispatcher() {
 -- 
-2.11.0
+2.17.1

@@ -6,22 +6,21 @@ Subject: Block all connection requests with 'qjz9zk' in the domain name or
 An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
 This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
 ---
- .../chrome_autocomplete_scheme_classifier.cc       |  1 +
- chrome/browser/history/history_utils.cc            |  1 +
- chrome/browser/ui/singleton_tabs.cc                |  3 +-
- chromecast/browser/url_request_context_factory.cc  |  7 ++++-
- components/omnibox/browser/autocomplete_input.cc   |  7 +++--
- components/url_formatter/url_fixer.cc              |  4 +++
- .../browser/child_process_security_policy_impl.cc  |  1 +
- net/BUILD.gn                                       |  2 ++
- net/url_request/trk_protocol_handler.cc            | 26 +++++++++++++++++
- net/url_request/trk_protocol_handler.h             | 33 ++++++++++++++++++++++
- net/url_request/url_request.cc                     |  8 ++++++
- net/url_request/url_request_context_builder.cc     |  4 +++
- url/url_constants.cc                               |  1 +
- url/url_constants.h                                |  1 +
- url/url_util.cc                                    |  2 ++
- 15 files changed, 97 insertions(+), 4 deletions(-)
+ .../chrome_autocomplete_scheme_classifier.cc  |  1 +
+ chrome/browser/history/history_utils.cc       |  1 +
+ chrome/browser/ui/singleton_tabs.cc           |  3 +-
+ .../omnibox/browser/autocomplete_input.cc     |  7 ++--
+ components/url_formatter/url_fixer.cc         |  4 +++
+ .../child_process_security_policy_impl.cc     |  1 +
+ net/BUILD.gn                                  |  2 ++
+ net/url_request/trk_protocol_handler.cc       | 26 +++++++++++++++
+ net/url_request/trk_protocol_handler.h        | 33 +++++++++++++++++++
+ net/url_request/url_request.cc                |  8 +++++
+ .../url_request_context_builder.cc            |  4 +++
+ url/url_constants.cc                          |  1 +
+ url/url_constants.h                           |  1 +
+ url/url_util.cc                               |  2 ++
+ 14 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 net/url_request/trk_protocol_handler.cc
 create mode 100644 net/url_request/trk_protocol_handler.h

@@ -60,36 +59,6 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
       continue;
 
     GURL rewritten_tab_url = tab_url;
-diff --git a/chromecast/browser/url_request_context_factory.cc b/chromecast/browser/url_request_context_factory.cc
--- a/chromecast/browser/url_request_context_factory.cc
-+++ b/chromecast/browser/url_request_context_factory.cc
-@@ -39,6 +39,7 @@
- #include "net/http/http_stream_factory.h"
- #include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/ssl/ssl_config_service_defaults.h"
-+#include "net/url_request/trk_protocol_handler.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_builder.h"
- #include "net/url_request/url_request_context_getter.h"
-@@ -245,13 +246,17 @@ void URLRequestContextFactory::InitializeMainContextDependencies(
-       new net::URLRequestJobFactoryImpl());
-   // Keep ProtocolHandlers added in sync with
-   // CastContentBrowserClient::IsHandledURL().
-+  bool set_protocol = false;
-   for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
-        it != protocol_handlers->end();
-        ++it) {
-    bool set_protocol =
-+    set_protocol =
-         job_factory->SetProtocolHandler(it->first, std::move(it->second));
-     DCHECK(set_protocol);
-   }
-+  set_protocol = job_factory->SetProtocolHandler(
-+      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
-+  DCHECK(set_protocol);
- 
-   // Set up interceptors in the reverse order.
-   std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
@@ -117,7 +86,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -552,6 +552,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -566,6 +566,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
     }
   }
 
@@ -131,8 +100,8 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -507,6 +507,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
-   RegisterWebSafeScheme(url::kHttpsScheme);
+@@ -620,6 +620,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+ #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
   RegisterWebSafeScheme(url::kFtpScheme);
   RegisterWebSafeScheme(url::kDataScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
@@ -142,7 +111,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1787,6 +1787,8 @@ component("net") {
+@@ -1075,6 +1075,8 @@ component("net") {
       "url_request/report_sender.h",
       "url_request/static_http_user_agent_settings.cc",
       "url_request/static_http_user_agent_settings.h",
@@ -223,7 +192,7 @@ new file mode 100644
 diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 --- a/net/url_request/url_request.cc
 +++ b/net/url_request/url_request.cc
-@@ -15,6 +15,7 @@
+@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
@@ -231,7 +200,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
-@@ -42,6 +43,7 @@
+@@ -40,6 +41,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -239,7 +208,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 using base::Time;
 using std::string;
-@@ -612,6 +614,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -579,6 +581,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -256,29 +225,29 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
@@ -40,6 +40,7 @@
+ #include "net/quic/quic_stream_factory.h"
 #include "net/ssl/ssl_config_service_defaults.h"
- #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 #include "net/url_request/url_request_intercepting_job_factory.h"
-@@ -641,6 +642,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
-     job_factory->SetProtocolHandler(url::kDataScheme,
-                                     std::make_unique<DataProtocolHandler>());
- 
+@@ -648,6 +649,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+     }
+     url_request_interceptors_.clear();
+   }
 +  job_factory->SetProtocolHandler(url::kTraceScheme,
 +                                  std::make_unique<TrkProtocolHandler>());
 +
- #if !BUILDFLAG(DISABLE_FILE_SUPPORT)
-   if (file_enabled_) {
-     job_factory->SetProtocolHandler(
+   if (create_intercepting_job_factory_) {
+     top_job_factory = std::move(create_intercepting_job_factory_)
+                           .Run(std::move(top_job_factory));
 diff --git a/url/url_constants.cc b/url/url_constants.cc
 --- a/url/url_constants.cc
 +++ b/url/url_constants.cc
-@@ -26,6 +26,7 @@ const char kHttpsScheme[] = "https";
- const char kJavaScriptScheme[] = "javascript";
- const char kMailToScheme[] = "mailto";
+@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
+ // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+ const char kQuicTransportScheme[] = "quic-transport";
 const char kTelScheme[] = "tel";
 +const char kTraceScheme[] = "trk";
 const char kWsScheme[] = "ws";
@@ -287,9 +256,9 @@ diff --git a/url/url_constants.cc b/url/url_constants.cc
 diff --git a/url/url_constants.h b/url/url_constants.h
 --- a/url/url_constants.h
 +++ b/url/url_constants.h
-@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char kHttpsScheme[];
- COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
 COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
 COMPONENT_EXPORT(URL) extern const char kTelScheme[];
 +COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
 COMPONENT_EXPORT(URL) extern const char kWsScheme[];
@@ -298,15 +267,15 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -52,6 +52,7 @@ struct SchemeRegistry {
-       kHttpsScheme,
-       kAboutScheme,
-       kDataScheme,
-+      kTraceScheme,
-       kWssScheme,
-   };
- 
-@@ -67,6 +68,7 @@ struct SchemeRegistry {
+@@ -32,6 +32,7 @@ struct SchemeRegistry {
+   std::vector<SchemeWithType> standard_schemes = {
+       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
+       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
+      {kTraceScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
+       // Yes, file URLs can have a hostname, so file URLs should be handled as
+       // "standard". File URLs never have a port as specified by the SchemeType
+       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
+@@ -69,6 +70,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -315,5 +284,5 @@ diff --git a/url/url_util.cc b/url/url_util.cc
 
   // Schemes that can be sent CORS requests.
 -- 
-2.11.0
+2.17.1

@@ -7,27 +7,27 @@ Do not use experiments to enable/disable presets
 Always enable ad filtering
 Download filters by checking Last-Modified header first
 ---
- chrome/browser/after_startup_task_utils.cc         |   5 +
- chrome/browser/browser_process.h                   |   7 +
- chrome/browser/browser_process_impl.cc             |  28 +++
- chrome/browser/browser_process_impl.h              |   3 +
- chrome/browser/chrome_browser_main.cc              |   5 +-
- chrome/browser/chrome_content_browser_client.cc    |  18 --
- components/component_updater/BUILD.gn              |   6 +
- .../component_updater/adblock_updater_service.cc   | 249 +++++++++++++++++++++
- .../component_updater/adblock_updater_service.h    |  99 ++++++++
- .../component_updater/download_filters_task.cc     | 228 +++++++++++++++++++
- .../component_updater/download_filters_task.h      | 131 +++++++++++
- .../content_subresource_filter_throttle_manager.cc |  11 +
- .../content/browser/ruleset_service.cc             |  33 ++-
- .../content/browser/ruleset_service.h              |   7 +-
- .../content/browser/ruleset_version.cc             |   1 +
- .../content/browser/ruleset_version.h              |   5 +
- .../content/browser/verified_ruleset_dealer.cc     |   2 +
- .../core/browser/subresource_filter_features.cc    | 113 +---------
- .../core/common/common_features.cc                 |   2 +-
- .../frame_host/navigation_throttle_runner.cc       |  10 -
- 20 files changed, 817 insertions(+), 146 deletions(-)
+ chrome/browser/after_startup_task_utils.cc    |   5 +
+ chrome/browser/browser_process.h              |   7 +
+ chrome/browser/browser_process_impl.cc        |  28 ++
+ chrome/browser/browser_process_impl.h         |   3 +
+ chrome/browser/chrome_browser_main.cc         |   5 +-
+ .../browser/chrome_content_browser_client.cc  |  16 --
+ components/component_updater/BUILD.gn         |   6 +
+ .../adblock_updater_service.cc                | 249 ++++++++++++++++++
+ .../adblock_updater_service.h                 |  99 +++++++
+ .../download_filters_task.cc                  | 221 ++++++++++++++++
+ .../component_updater/download_filters_task.h | 129 +++++++++
+ ...ent_subresource_filter_throttle_manager.cc |  11 +
+ .../content/browser/ruleset_service.cc        |  33 ++-
+ .../content/browser/ruleset_service.h         |   7 +-
+ .../content/browser/ruleset_version.cc        |   1 +
+ .../content/browser/ruleset_version.h         |   5 +
+ .../browser/verified_ruleset_dealer.cc        |   2 +
+ .../browser/subresource_filter_features.cc    | 113 +-------
+ .../core/common/common_features.cc            |   2 +-
+ .../frame_host/navigation_throttle_runner.cc  |  10 -
+ 20 files changed, 808 insertions(+), 144 deletions(-)
 create mode 100644 components/component_updater/adblock_updater_service.cc
 create mode 100644 components/component_updater/adblock_updater_service.h
 create mode 100644 components/component_updater/download_filters_task.cc
@@ -36,7 +36,7 @@ Download filters by checking Last-Modified header first
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
-@@ -36,6 +36,8 @@
+@@ -37,6 +37,8 @@
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 using content::BrowserThread;
 using content::WebContents;
 using content::WebContentsObserver;
-@@ -135,6 +137,9 @@ void SetBrowserStartupIsComplete() {
+@@ -137,6 +139,9 @@ void SetBrowserStartupIsComplete() {
   g_after_startup_tasks.Get().clear();
   g_after_startup_tasks.Get().shrink_to_fit();
 
@@ -58,14 +58,14 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -22,6 +22,7 @@
- #include "chrome/browser/shell_integration.h"
+@@ -21,6 +21,7 @@
+ #include "build/build_config.h"
 #include "chrome/common/buildflags.h"
 #include "media/media_buildflags.h"
 +#include "components/component_updater/adblock_updater_service.h"
 
 class BackgroundModeManager;
- class DownloadRequestLimiter;
+ class BrowserProcessPlatformPart;
@@ -58,6 +59,10 @@ class ComponentUpdateService;
 class SupervisedUserWhitelistInstaller;
 }
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1009,6 +1009,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1012,6 +1012,34 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -135,7 +135,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   component_updater::SupervisedUserWhitelistInstaller*
   supervised_user_whitelist_installer() override;
-@@ -361,6 +362,8 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -357,6 +358,8 @@ class BrowserProcessImpl : public BrowserProcess,
   // but some users of component updater only install per-user.
   std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
 
@@ -147,13 +147,14 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1722,8 +1722,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
+@@ -1723,9 +1723,12 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 
   PreBrowserStart();
 
 -  if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate))
 +  if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) {
-     RegisterComponentsForUpdate(profile_->GetPrefs());
+     RegisterComponentsForUpdate(profile_->IsOffTheRecord(),
+                                 profile_->GetPrefs());
 +    // force initialisation
 +    g_browser_process->adblock_updater();
 +  }
@@ -165,21 +166,21 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -65,7 +65,6 @@
 #include "chrome/browser/hid/chrome_hid_delegate.h"
- #include "chrome/browser/language/translate_frame_binder.h"
+ #include "chrome/browser/interstitials/enterprise_util.h"
 #include "chrome/browser/lifetime/browser_shutdown.h"
 -#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/media/router/presentation/presentation_service_delegate_impl.h"
 #include "chrome/browser/media/router/presentation/receiver_presentation_service_delegate_impl.h"
-@@ -81,7 +80,6 @@
- #include "chrome/browser/net_benchmarking.h"
- #include "chrome/browser/notifications/platform_notification_service_factory.h"
- #include "chrome/browser/notifications/platform_notification_service_impl.h"
-#include "chrome/browser/page_load_metrics/metrics_navigation_throttle.h"
- #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
- #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
- #include "chrome/browser/password_manager/chrome_password_manager_client.h"
-@@ -4044,16 +4042,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -216,7 +215,6 @@
+ #include "components/language/core/browser/pref_names.h"
+ #include "components/metrics/client_info.h"
+ #include "components/net_log/chrome_net_log.h"
+-#include "components/page_load_metrics/browser/metrics_navigation_throttle.h"
+ #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
+ #include "components/page_load_metrics/browser/page_load_metrics_util.h"
+ #include "components/payments/content/payment_request_display_manager.h"
+@@ -3815,16 +3813,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
     content::NavigationHandle* handle) {
   std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
 
@@ -194,21 +195,19 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 -  }
 -
 #if BUILDFLAG(ENABLE_PLUGINS)
-   std::unique_ptr<content::NavigationThrottle> flash_url_throttle =
-       FlashDownloadInterception::MaybeCreateThrottleFor(handle);
-@@ -4163,12 +4151,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-   }
+   MaybeAddThrottle(&throttles,
+                    FlashDownloadInterception::MaybeCreateThrottleFor(handle));
+@@ -3939,10 +3927,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+                    safe_browsing::MaybeCreateNavigationThrottle(handle));
 #endif
 
-  std::unique_ptr<content::NavigationThrottle>
-      lookalike_url_navigation_throttle = lookalikes::
-          LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle);
-  if (lookalike_url_navigation_throttle)
-    throttles.push_back(std::move(lookalike_url_navigation_throttle));
+-  MaybeAddThrottle(
+-      &throttles,
+-      LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle));
 -
-   std::unique_ptr<content::NavigationThrottle> pdf_iframe_throttle =
-       PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle);
-   if (pdf_iframe_throttle)
+   MaybeAddThrottle(&throttles,
+                    PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle));
+ 
 diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
 --- a/components/component_updater/BUILD.gn
 +++ b/components/component_updater/BUILD.gn
@@ -269,7 +268,7 @@ new file mode 100644
 +#include "url/gurl.h"
 +#include "base/strings/safe_sprintf.h"
 +#include "base/strings/string_number_conversions.h"
-+
+#include "base/strings/string_split.h"
 +namespace adblock_updater {
 +
 +// all constants express seconds
@@ -587,7 +586,7 @@ diff --git a/components/component_updater/download_filters_task.cc b/components/
 new file mode 100644
 --- /dev/null
 +++ b/components/component_updater/download_filters_task.cc
-@@ -0,0 +1,228 @@
+@@ -0,0 +1,221 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -706,23 +705,14 @@ new file mode 100644
 +void DownloadFiltersTask::internalDownload() {
 +  simple_url_loader_->DownloadToTempFile(
 +      shared_url_network_factory_.get(),
-+      base::BindOnce(
-+          [](const network::SimpleURLLoader* simple_url_loader,
-+             update_client::NetworkFetcher::DownloadToFileCompleteCallback download_to_file_complete_callback,
-+             base::FilePath file_path) {
-+            std::move(download_to_file_complete_callback)
-+                .Run(file_path, simple_url_loader->NetError(),
-+                     simple_url_loader->GetContentSize());
-+          },
-+          simple_url_loader_.get(),
-+          base::BindOnce(&DownloadFiltersTask::OnDownloadComplete, base::Unretained(this))
-+      ), kMaxBodySize);
+      base::BindOnce(&DownloadFiltersTask::OnDownloadComplete, base::Unretained(this)),
+      kMaxBodySize);
 +}
 +
 +void DownloadFiltersTask::OnHeadersDownloadComplete(scoped_refptr<net::HttpResponseHeaders> headers) {
 +  // something went wrong
 +  if (headers == nullptr) {
-+    OnDownloadComplete(base::FilePath(), simple_url_loader_->NetError(), simple_url_loader_->GetContentSize() /* 0 */);
+    OnDownloadComplete(base::FilePath());
 +    return;
 +  }
 +
@@ -743,7 +733,7 @@ new file mode 100644
 +
 +void DownloadFiltersTask::OnResponseStarted(
 +    const GURL& final_url,
-+    const network::ResourceResponseHead& response_head) {
+    const network::mojom::URLResponseHead& response_head) {
 +
 +  final_url_ = final_url;
 +  response_code_ = response_head.headers ? response_head.headers->response_code() : -1;
@@ -754,8 +744,10 @@ new file mode 100644
 +    LOG(INFO) << "DownloadFiltersTask: fetching URL '" << final_url.spec() << "' with method " << (min_last_modified_.is_null() ? "GET" : "HEAD");
 +}
 +
-+void DownloadFiltersTask::OnDownloadComplete(base::FilePath file_path, int net_error, int64_t content_size) {
+void DownloadFiltersTask::OnDownloadComplete(base::FilePath file_path) {
 +  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  int net_error = simple_url_loader_->NetError();
+  int64_t content_size = simple_url_loader_->GetContentSize();
 +
 +  const base::TimeTicks download_end_time(base::TimeTicks::Now());
 +  const base::TimeDelta download_time =
@@ -820,7 +812,7 @@ diff --git a/components/component_updater/download_filters_task.h b/components/c
 new file mode 100644
 --- /dev/null
 +++ b/components/component_updater/download_filters_task.h
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,129 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -920,10 +912,8 @@ new file mode 100644
 +
 +  void OnDownloadProgress(uint64_t current);
 +  void OnResponseStarted(const GURL& final_url,
-+                         const network::ResourceResponseHead& response_head);
-+  void OnDownloadComplete(base::FilePath file_path,
-+                                                    int net_error,
-+                                                    int64_t content_size);
+                         const network::mojom::URLResponseHead& response_head);
+  void OnDownloadComplete(base::FilePath file_path);
 +  void OnHeadersDownloadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
 +  void createSimpleURLLoader(bool);
 +  void internalDownload();
@@ -955,7 +945,7 @@ new file mode 100644
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -308,6 +308,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -310,6 +310,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
@@ -1325,16 +1315,16 @@ diff --git a/content/browser/frame_host/navigation_throttle_runner.cc b/content/
 #include "content/browser/frame_host/form_submission_throttle.h"
 -#include "content/browser/frame_host/history_navigation_ablation_study_navigation_throttle.h"
 #include "content/browser/frame_host/mixed_content_navigation_throttle.h"
- #include "content/browser/frame_host/navigation_handle_impl.h"
+ #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator_delegate.h"
-@@ -120,15 +119,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
-        devtools_instrumentation::CreateNavigationThrottles(handle)) {
+@@ -128,15 +127,6 @@ void NavigationThrottleRunner::RegisterNavigationThrottles() {
+        devtools_instrumentation::CreateNavigationThrottles(request)) {
     AddThrottle(std::move(throttle));
   }
 -
 -  // Delay navigation for an ablation study (if needed).
 -  AddThrottle(HistoryNavigationAblationStudyNavigationThrottle::
-                  MaybeCreateForNavigation(handle));
+-                  MaybeCreateForNavigation(request));
 -
 -  // Insert all testing NavigationThrottles last.
 -  throttles_.insert(throttles_.end(),
@@ -1344,5 +1334,5 @@ diff --git a/content/browser/frame_host/navigation_throttle_runner.cc b/content/
 
 NavigationThrottle* NavigationThrottleRunner::GetDeferringThrottle() const {
 -- 
-2.11.0
+2.17.1

@@ -0,0 +1,76 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 20 Feb 2020 22:44:06 +0100
+Subject: Disable AImageReader for ARM64/P and ARM64/Q
+
+---
+ chrome/browser/android/chrome_startup_flags.cc | 9 +++++++++
+ gpu/config/gpu_finch_features.cc               | 4 ++++
+ media/base/media_switches.cc                   | 4 ++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
+--- a/chrome/browser/android/chrome_startup_flags.cc
+++ b/chrome/browser/android/chrome_startup_flags.cc
+@@ -6,6 +6,7 @@
+ 
+ #include "chrome/browser/android/chrome_startup_flags.h"
+ 
+#include "base/android/build_info.h"
+ #include "base/android/jni_android.h"
+ #include "base/android/jni_string.h"
+ #include "base/android/scoped_java_ref.h"
+@@ -16,6 +17,7 @@
+ #include "chrome/common/chrome_switches.h"
+ #include "components/browser_sync/browser_sync_switches.h"
+ #include "components/dom_distiller/core/dom_distiller_switches.h"
+#include "content/public/common/content_switches.h"
+ #include "media/base/media_switches.h"
+ 
+ namespace {
+@@ -40,6 +42,13 @@ void SetChromeSpecificCommandLineFlags() {
+   if (base::SysInfo::IsLowEndDevice())
+     SetCommandLineSwitchASCII(switches::kDisableSyncTypes, "Favicon Images");
+ 
+#ifdef ARCH_CPU_ARM64
+  // workaround for Android 9/10 crashes on ARM64 CPUs
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >= base::android::SDK_VERSION_P) {
+    SetCommandLineSwitchASCII("disable_aimagereader", "1");
+  }
+#endif
+
+   // Enable DOM Distiller backend.
+   SetCommandLineSwitch(switches::kEnableDomDistiller);
+ }
+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
+@@ -15,7 +15,11 @@ namespace features {
+ #if defined(OS_ANDROID)
+ // Use android AImageReader when playing videos with MediaPlayer.
+ const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
+#ifdef ARCH_CPU_ARM64
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+#else
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+#endif
+ 
+ // Used only by webview to disable SurfaceControl.
+ const base::Feature kDisableSurfaceControlForWebview{
+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
+@@ -500,7 +500,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
+ 
+ // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+ const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
+#ifdef ARCH_CPU_ARM64
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+#else
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+#endif
+ 
+ // Prevents using SurfaceLayer for videos. This is meant to be used by embedders
+ // that cannot support SurfaceLayer at the moment.
+-- 
+2.17.1
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 24 Jan 2020 09:46:48 +0100
+Subject: Disable DRM media origin IDs preprovisioning
+
+---
+ media/base/media_switches.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -489,7 +489,7 @@ const base::Feature kMediaDrmPersistentLicense{
+ // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
+ // which will trigger provisioning process after MediaDrmBridge is created.
+ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
+-                                             base::FEATURE_ENABLED_BY_DEFAULT};
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
+ // IDs at startup (whenever a profile is loaded). Also used by tests that
+-- 
+2.17.1
+
@@ -4,14 +4,14 @@ Subject: Disable HEAD requests for single-word Omnibar searches

 Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
 ---
- chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc | 8 ++++----
- chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h  | 2 +-
+ .../ui/omnibox/chrome_omnibox_navigation_observer.cc      | 8 ++++----
+ .../ui/omnibox/chrome_omnibox_navigation_observer.h       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

 diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
 --- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
 +++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
-@@ -85,8 +85,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
+@@ -86,8 +86,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
       shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
       load_state_(LOAD_NOT_SEEN),
       fetch_state_(FETCH_NOT_COMPLETE) {
@@ -22,7 +22,7 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
 
   // We need to start by listening to AllSources, since we don't know which tab
   // the navigation might occur in.
-@@ -286,7 +286,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
+@@ -287,7 +287,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
   delete this;
 }
 
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
     const GURL& destination_url) {
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
-@@ -327,4 +327,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
+@@ -328,4 +328,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
   loader_->SetAllowHttpErrorResults(true);
   loader_->SetOnRedirectCallback(base::BindRepeating(
       &ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
@@ -50,5 +50,5 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/ch
   const base::string16 text_;
   const AutocompleteMatch match_;
 -- 
-2.11.0
+2.17.1

@@ -3,8 +3,9 @@ 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(-)
+ components/ntp_snippets/features.cc                           | 4 ++--
+ .../remote/remote_suggestions_status_service_impl.cc          | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)

 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
 --- a/components/ntp_snippets/features.cc
@@ -27,6 +28,20 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 
 const base::Feature kOptionalImagesEnabledFeature{
     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
+diff --git a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
+--- a/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
+++ b/components/ntp_snippets/remote/remote_suggestions_status_service_impl.cc
+@@ -36,8 +36,8 @@ RemoteSuggestionsStatusServiceImpl::~RemoteSuggestionsStatusServiceImpl() =
+ // static
+ void RemoteSuggestionsStatusServiceImpl::RegisterProfilePrefs(
+     PrefRegistrySimple* registry) {
+-  registry->RegisterBooleanPref(prefs::kEnableSnippets, true);
+-  registry->RegisterBooleanPref(prefs::kArticlesListVisible, true);
+  registry->RegisterBooleanPref(prefs::kEnableSnippets, false);
+  registry->RegisterBooleanPref(prefs::kArticlesListVisible, false);
+ }
+ 
+ void RemoteSuggestionsStatusServiceImpl::Init(
 -- 
-2.11.0
+2.17.1

@@ -4,15 +4,14 @@ 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(-)
+ .../java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
+ .../org/chromium/chrome/browser/omaha/VersionNumberGetter.java  | 2 +-
+ 2 files changed, 2 insertions(+), 2 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 {
+@@ -136,7 +136,7 @@ public class OmahaBase {
 
     /** See {@link #sIsDisabled}. */
     static boolean isDisabled() {
@@ -24,7 +23,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
 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 {
+@@ -43,7 +43,7 @@ public class VersionNumberGetter {
     private static VersionNumberGetter sInstanceForTests;
 
     /** If false, OmahaClient will never report that a newer version is available. */
@@ -33,18 +32,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
 
     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
+2.17.1

@@ -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
-@@ -82,10 +82,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -83,10 +83,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                 false);
 #endif
   // TODO(guoweis): Remove next 2 options at M50.
@@ -18,11 +18,11 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 +  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, false);
 +  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, false);
   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
-                               content::kWebRTCIPHandlingDefault);
-+                               content::kWebRTCIPHandlingDisableNonProxiedUdp);
+-                               blink::kWebRTCIPHandlingDefault);
+                               blink::kWebRTCIPHandlingDisableNonProxiedUdp);
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
- 
+   registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
 -- 
-2.11.0
+2.17.1

@@ -3,49 +3,32 @@ Date: Tue, 12 Jun 2018 15:09:26 +0200
 Subject: Disable all promo dialogs

 ---
- .../chrome/browser/ChromeTabbedActivity.java       | 30 +---------------------
- 1 file changed, 1 insertion(+), 29 deletions(-)
+ .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 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);
-         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+@@ -213,7 +213,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+      * displayed.
+      */
+     private boolean triggerPromo() {
+-        try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
+        /*try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
+             SharedPreferencesManager preferenceManager = SharedPreferencesManager.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
+@@ -244,8 +244,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+                 preferenceManager.writeBoolean(
+                         ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
+             }
+-            return isShowingPromo;
+-        }
+            return isShowingPromo;        } */
+            return false;
     }
 
+     private boolean maybeShowPromo() {
 -- 
-2.11.0
+2.17.1

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 21:46:10 +0100
+Subject: Disable autofill assistant by default
+
+---
+ .../autofill_assistant/AutofillAssistantPreferencesUtil.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+@@ -15,7 +15,7 @@ class AutofillAssistantPreferencesUtil {
+     /** Checks whether the Autofill Assistant switch preference in settings is on. */
+     static boolean isAutofillAssistantSwitchOn() {
+         return SharedPreferencesManager.getInstance().readBoolean(
+-                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, true);
+                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, false);
+     }
+ 
+     /** Checks whether the Autofill Assistant onboarding has been accepted. */
+-- 
+2.17.1
+
@@ -1,37 +0,0 @@
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Wed, 23 Nov 2016 09:26:51 -0500
-Subject: Disable contextual search by default
-
-Disable contextual search in preference by default
---
- .../src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java  | 2 +-
- chrome/browser/profiles/profile.cc                                      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
-@@ -423,7 +423,7 @@ public class PrefServiceBridge {
-      * @return Whether the Contextual Search feature was disabled by the user explicitly.
-      */
-     public boolean isContextualSearchDisabled() {
-        return getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_DISABLED);
-+        return !getContextualSearchPreference().equals(CONTEXTUAL_SEARCH_ENABLED);
-     }
- 
-     /**
-diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
--- a/chrome/browser/profiles/profile.cc
-+++ b/chrome/browser/profiles/profile.cc
-@@ -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
-
@@ -3,18 +3,18 @@ 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 ---
+ chrome/android/chrome_java_sources.gni        | 13 --------
+ .../browser/customtabs/CustomTabActivity.java | 18 -----------
+ .../CustomTabIntentDataProvider.java          | 17 ++---------
+ .../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",
+@@ -443,19 +443,6 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/customtabs/dependency_injection/BaseCustomTabActivityComponent.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",
@@ -31,30 +31,30 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_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/ImmersiveModeController.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;
+@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler;
+ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.IntentIgnoringCriterion;
 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
+ import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
+@@ -73,9 +72,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
 
     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
+ 
+     private CustomTabActivityTabProvider.Observer mTabChangeObserver =
+@@ -190,12 +186,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
     public void finishNativeInitialization() {
         if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
 
@@ -64,10 +64,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 -            mDynamicModuleCoordinator = getComponent().resolveDynamicModuleCoordinator();
 -        }
 -
-         mSessionHandler = new SessionHandler() {
+         mConnection.showSignInToastIfNecessary(mSession, getIntent());
 
-             @Override
-@@ -432,10 +422,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+         if (isTaskRoot() && UsageStatsService.isEnabled()) {
+@@ -232,10 +222,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
         WebContents webContents = tab == null ? null : tab.getWebContents();
         mConnection.resetPostMessageHandlerForSession(
                 mIntentDataProvider.getSession(), webContents);
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
     }
 
     @Override
-@@ -794,10 +780,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -406,10 +392,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
         if (mIntentDataProvider.isTrustedWebActivity()) {
             component.resolveTrustedWebActivityCoordinator();
         }
@@ -92,15 +92,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.ChromeSwitches;
+@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.ChromeApplication;
 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.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.util.ColorUtils;
-@@ -460,20 +459,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -820,20 +819,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
         // even receive the extras for using the feature.
         if (componentName == null) return false;
 
@@ -122,20 +122,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 +        return false;
     }
 
-     @NonNull
+     @Override
 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;
+@@ -57,8 +57,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.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.init.ChainedTasks;
- import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-@@ -219,7 +217,6 @@ public class CustomTabsConnection {
+@@ -218,7 +216,6 @@ public class CustomTabsConnection {
 
     private volatile ChainedTasks mWarmupTasks;
 
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
     /**
      * <strong>DO NOT CALL</strong>
      * Public to be instanciable from {@link ChromeApplication}. This is however
-@@ -1373,7 +1370,6 @@ public class CustomTabsConnection {
+@@ -1401,7 +1398,6 @@ public class CustomTabsConnection {
         if (ChromeApplication.isSevereMemorySignal(level)) {
             getInstance().mClientManager.cleanupUnusedSessions();
         }
@@ -151,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
     }
 
     @VisibleForTesting
-@@ -1510,32 +1506,6 @@ public class CustomTabsConnection {
+@@ -1537,32 +1533,6 @@ public class CustomTabsConnection {
         recordSpeculationStatusOnSwap(SPECULATION_STATUS_ON_SWAP_BACKGROUND_TAB_NOT_MATCHED);
     }
 
@@ -187,18 +187,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigatio
+@@ -15,8 +15,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabUmaRecorder;
+ import org.chromium.chrome.browser.customtabs.ReparentingTaskProvider;
 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.content.CustomTabIntentHandler;
 -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.customtabs.features.ImmersiveModeController;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
-@@ -32,8 +30,6 @@ import dagger.Subcomponent;
+@@ -31,8 +29,6 @@ import dagger.Subcomponent;
 @ActivityScope
- public interface CustomTabActivityComponent extends ChromeActivityComponent {
+ public interface CustomTabActivityComponent extends BaseCustomTabActivityComponent {
     TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();
 -    DynamicModuleToolbarController resolveDynamicModuleToolbarController();
 -    DynamicModuleCoordinator resolveDynamicModuleCoordinator();
@@ -206,5 +206,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/depe
     CustomTabBottomBarDelegate resolveBottomBarDelegate();
     CustomTabActivityTabController resolveTabController();
 -- 
-2.11.0
+2.17.1

@@ -3,42 +3,45 @@ Date: Sun, 8 Jul 2018 18:16:34 +0200
 Subject: Disable fetching of all field trials

 ---
- .../src/org/chromium/chrome/browser/ChromeFeatureList.java   | 12 +++---------
- components/variations/service/variations_service.cc          | 12 +-----------
- 2 files changed, 4 insertions(+), 20 deletions(-)
+ .../chrome/browser/flags/ChromeFeatureList.java   | 15 +++------------
+ .../variations/service/variations_service.cc      | 12 +-----------
+ 2 files changed, 4 insertions(+), 23 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
-@@ -106,9 +106,7 @@ public abstract class ChromeFeatureList {
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+@@ -108,10 +108,7 @@ public abstract class ChromeFeatureList {
      */
     public static int getFieldTrialParamByFeatureAsInt(
             String featureName, String paramName, int defaultValue) {
 -        if (sTestFeatures != null) return defaultValue;
 -        assert isInitialized();
-        return nativeGetFieldTrialParamByFeatureAsInt(featureName, paramName, defaultValue);
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
+-                featureName, paramName, defaultValue);
 +        return defaultValue;
     }
 
     /**
-@@ -125,9 +123,7 @@ public abstract class ChromeFeatureList {
+@@ -128,10 +125,7 @@ public abstract class ChromeFeatureList {
      */
     public static double getFieldTrialParamByFeatureAsDouble(
             String featureName, String paramName, double defaultValue) {
 -        if (sTestFeatures != null) return defaultValue;
 -        assert isInitialized();
-        return nativeGetFieldTrialParamByFeatureAsDouble(featureName, paramName, defaultValue);
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
+-                featureName, paramName, defaultValue);
 +        return defaultValue;
     }
 
     /**
-@@ -144,9 +140,7 @@ public abstract class ChromeFeatureList {
+@@ -148,10 +142,7 @@ public abstract class ChromeFeatureList {
      */
     public static boolean getFieldTrialParamByFeatureAsBoolean(
             String featureName, String paramName, boolean defaultValue) {
 -        if (sTestFeatures != null) return defaultValue;
 -        assert isInitialized();
-        return nativeGetFieldTrialParamByFeatureAsBoolean(featureName, paramName, defaultValue);
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
+-                featureName, paramName, defaultValue);
 +        return defaultValue;
     }
 
@@ -46,7 +49,7 @@ 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
-@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -242,17 +242,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() {
@@ -66,5 +69,5 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 
 std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
 -- 
-2.11.0
+2.17.1

@@ -3,15 +3,15 @@ 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 +-
+ .../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(
+@@ -51,17 +51,16 @@ const PrefService::Preference* GetMediaRouterPref(
 
 bool MediaRouterEnabled(content::BrowserContext* context) {
 #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 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) {
+@@ -234,7 +234,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kMediaRouterFirstRunFlowAcknowledged,
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profil
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -444,7 +444,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -403,7 +403,7 @@ void ProfileImpl::RegisterProfilePrefs(
   registry->RegisterStringPref(
       prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
   registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -62,5 +62,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
   registry->RegisterBooleanPref(
       prefs::kOobeMarketingOptInScreenFinished, false,
 -- 
-2.11.0
+2.17.1

@@ -3,9 +3,9 @@ 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(-)
+ .../browser/android/ntp/most_visited_sites_bridge.cc  | 11 ++---------
+ components/ntp_tiles/BUILD.gn                         |  3 ---
+ 2 files changed, 2 insertions(+), 12 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
@@ -17,8 +17,8 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 -#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;
+ #include "ui/gfx/android/java_bitmap.h"
+@@ -44,7 +43,6 @@ using ntp_tiles::NTPTilesVector;
 using ntp_tiles::SectionType;
 using ntp_tiles::TileTitleSource;
 using ntp_tiles::TileSource;
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 
 namespace {
 
-@@ -236,7 +234,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
+@@ -235,7 +233,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint jtiles_count) {
@@ -34,26 +34,23 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 }
 
 void MostVisitedSitesBridge::RecordTileImpression(
-@@ -249,18 +246,6 @@ void MostVisitedSitesBridge::RecordTileImpression(
+@@ -248,6 +245,7 @@ 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());
+#if 0
+   GURL url(ConvertJavaStringToUTF8(env, jurl));
+   TileTitleSource title_source = static_cast<TileTitleSource>(jtitle_source);
+   TileSource source = static_cast<TileSource>(jsource);
+@@ -258,6 +256,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+   ntp_tiles::metrics::RecordTileImpression(ntp_tiles::NTPTileImpression(
+       jindex, source, title_source, visual_type, icon_type,
+       base::Time::FromJavaTime(jdata_generation_time_ms), url));
+#endif
 }
 
 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
-@@ -271,12 +256,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+@@ -268,12 +267,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
     jint title_source,
     jint source,
     jlong jdata_generation_time_ms) {
@@ -78,7 +75,7 @@ diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
     "most_visited_sites.cc",
     "most_visited_sites.h",
     "ntp_tile.cc",
-@@ -78,7 +76,6 @@ source_set("unit_tests") {
+@@ -79,7 +77,6 @@ source_set("unit_tests") {
     "custom_links_manager_impl_unittest.cc",
     "custom_links_store_unittest.cc",
     "icon_cacher_impl_unittest.cc",
@@ -87,5 +84,5 @@ diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
     "popular_sites_impl_unittest.cc",
   ]
 -- 
-2.11.0
+2.17.1

@@ -10,7 +10,7 @@ Subject: Disable metrics on all I/O threads
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -909,7 +909,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -912,7 +912,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 #endif  // defined(OS_CHROMEOS)
 
   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -22,7 +22,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
 --- a/chrome/browser/profiles/profile_io_data.cc
 +++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -47,8 +47,6 @@
+@@ -46,8 +46,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"
@@ -32,5 +32,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profile
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/signin/public/base/signin_pref_names.h"
 -- 
-2.11.0
+2.17.1

@@ -20,5 +20,5 @@ diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/
 const base::Feature kOfflinePagesCTSuppressNotificationsFeature{
     "OfflinePagesCTSuppressNotifications", base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
-2.11.0
+2.17.1

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

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 15 Dec 2019 22:39:56 +0100
+Subject: Disable password reuse detection on android
+
+---
+ components/password_manager/core/browser/BUILD.gn | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
+--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
+@@ -12,9 +12,9 @@ if (is_android) {
+ 
+ # TODO(crbug.com/1006430): Fix password reuse detection not fully functional on
+ # Android.
+-password_reuse_detection_support = !is_ios
+-password_reuse_warning_support = !is_ios
+-password_on_focus_ping_support = !is_ios
+password_reuse_detection_support = !is_ios && !is_android
+password_reuse_warning_support = !is_ios && !is_android
+password_on_focus_ping_support = !is_ios && !is_android
+ 
+ config("password_reuse_detection_config") {
+   defines = []
+-- 
+2.17.1
+
@@ -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
-@@ -1234,10 +1234,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1198,10 +1198,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.11.0
+2.17.1

@@ -24,5 +24,5 @@ diff --git a/components/previews/core/previews_features.cc b/components/previews
 
 // Enables the Offline previews on android slow connections.
 -- 
-2.11.0
+2.17.1

@@ -5,12 +5,12 @@ 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(-)
+ ...rsonalized_signin_promo_view_bookmarks.xml |  30 -----
+ .../bookmarks/BookmarkItemsAdapter.java       |  23 +---
+ .../bookmarks/BookmarkPromoHeader.java        | 111 +-----------------
+ .../ReorderBookmarkItemsAdapter.java          |  19 +--
+ .../browser/signin/SigninPromoController.java |  19 +--
+ 5 files changed, 7 insertions(+), 195 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
@@ -52,7 +52,7 @@ deleted file mode 100644
 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>
+@@ -60,7 +60,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
     private BookmarkDelegate mDelegate;
     private Context mContext;
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     private String mSearchText;
     private BookmarkId mCurrentFolder;
 
-@@ -217,9 +216,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -219,9 +218,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
         switch (viewType) {
             case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
             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>
+@@ -242,8 +241,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     public void onBindViewHolder(ViewHolder holder, int position) {
         switch (holder.getItemViewType()) {
             case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
                 break;
             case ViewType.SYNC_PROMO:
                 break;
-@@ -260,7 +257,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -262,7 +259,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
     public void onViewRecycled(ViewHolder holder) {
         switch (holder.getItemViewType()) {
             case ViewType.PERSONALIZED_SIGNIN_PROMO:
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
                 break;
             default:
                 // Other view holders don't have special recycling code.
-@@ -296,7 +292,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -298,7 +294,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
             }
         };
 
@@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         populateTopLevelFoldersList();
         notifyDataSetChanged();
     }
-@@ -307,7 +302,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -309,7 +304,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         mDelegate.removeUIObserver(this);
         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
         mDelegate = null;
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     }
 
     @Override
-@@ -387,19 +381,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+@@ -389,19 +383,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
         if (currentUIState == BookmarkUIState.STATE_SEARCHING) return;
 
         assert currentUIState == BookmarkUIState.STATE_FOLDER : "Unexpected UI state";
@@ -128,18 +128,83 @@ 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/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;
+@@ -20,19 +20,13 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
 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
+-import org.chromium.chrome.browser.signin.SigninManager;
+-import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
+ import org.chromium.chrome.browser.signin.SigninPromoController;
+-import org.chromium.chrome.browser.signin.SigninPromoUtil;
+ import org.chromium.chrome.browser.signin.SyncPromoView;
+ import org.chromium.components.signin.AccountManagerFacade;
+ import org.chromium.components.signin.AccountsChangeObserver;
+ import org.chromium.components.signin.ChromeSigninController;
+ import org.chromium.components.signin.metrics.SigninAccessPoint;
+-import org.chromium.components.sync.AndroidSyncSettings;
+-import org.chromium.components.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
+ import org.chromium.content_public.browser.UiThreadTaskTraits;
+ 
+ import java.lang.annotation.Retention;
+@@ -42,7 +36,7 @@ import java.lang.annotation.RetentionPolicy;
+  * Class that manages all the logic and UI behind the signin promo header in the bookmark
+  * content UI. The header is shown only on certain situations, (e.g., not signed in).
+  */
+-class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObserver,
+class BookmarkPromoHeader implements
+                                      ProfileDataCache.Observer, AccountsChangeObserver {
+     /**
+      * Specifies the various states in which the Bookmarks promo can be.
+@@ -61,7 +55,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+     private static @Nullable @PromoState Integer sPromoStateForTests;
+ 
+     private final Context mContext;
+-    private final SigninManager mSignInManager;
+     private final Runnable mPromoHeaderChangeAction;
+ 
+     private final @Nullable ProfileDataCache mProfileDataCache;
+@@ -76,8 +69,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         mContext = context;
+         mPromoHeaderChangeAction = promoHeaderChangeAction;
+ 
+-        AndroidSyncSettings.get().registerObserver(this);
+-
+         if (SigninPromoController.hasNotReachedImpressionLimit(
+                     SigninAccessPoint.BOOKMARK_MANAGER)) {
+             int imageSize =
+@@ -91,9 +82,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+             mSigninPromoController = null;
+         }
+ 
+-        mSignInManager = IdentityServicesProvider.get().getSigninManager();
+-        mSignInManager.addSignInStateObserver(this);
+-
+         mPromoState = calculatePromoState();
+         if (mPromoState == PromoState.PROMO_SYNC) {
+             SharedPreferencesManager.getInstance().incrementInt(
+@@ -105,15 +93,11 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+      * Clean ups the class. Must be called once done using this class.
+      */
+     void destroy() {
+-        AndroidSyncSettings.get().unregisterObserver(this);
+-
+         if (mSigninPromoController != null) {
+             AccountManagerFacade.get().removeObserver(this);
+             mProfileDataCache.removeObserver(this);
+             mSigninPromoController.onPromoDestroyed();
+         }
+-
+-        mSignInManager.removeSignInStateObserver(this);
     }
 
     /**
+@@ -124,19 +108,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
+         return mPromoState;
+     }
+ 
+-    /**
 -     * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
 -     *         {@link RecyclerView}.
 -     */
@@ -152,11 +217,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -        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
+@@ -149,49 +120,11 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
         return new ViewHolder(view) {};
     }
 
@@ -180,10 +244,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -     * 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();
+-        SharedPreferencesManager.getInstance().writeBoolean(
+-                ChromePreferenceKeys.SIGNIN_PROMO_PERSONALIZED_DECLINED, true);
 -        mPromoState = calculatePromoState();
 -        triggerPromoUpdate();
 -    }
@@ -191,25 +253,74 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 -    /**
 -     * @return Whether the user declined the personalized signin promo.
 -     */
-    private boolean wasPersonalizedSigninPromoDeclined() {
-        return ContextUtils.getAppSharedPreferences().getBoolean(
-                PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, false);
+-    @VisibleForTesting
+-    static boolean wasPersonalizedSigninPromoDeclined() {
+-        return SharedPreferencesManager.getInstance().readBoolean(
+-                ChromePreferenceKeys.SIGNIN_PROMO_PERSONALIZED_DECLINED, false);
 -    }
 -
+     /**
+      * @return Whether the personalized signin promo should be shown to user.
+      */
+     private boolean shouldShowBookmarkSigninPromo() {
+-        return mSignInManager.isSignInAllowed()
+-                && SigninPromoController.hasNotReachedImpressionLimit(
+-                        SigninAccessPoint.BOOKMARK_MANAGER)
+-                && !wasPersonalizedSigninPromoDeclined();
+        return false;
+     }
+ 
     private @PromoState int calculatePromoState() {
-         if (sPromoStateForTests != null) {
+@@ -199,48 +132,9 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
             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
+         }
+ 
+-        if (!AndroidSyncSettings.get().isMasterSyncEnabled()) {
+-            return PromoState.PROMO_NONE;
+-        }
+-
+-        if (!ChromeSigninController.get().isSignedIn()) {
+-            return shouldShowBookmarkSigninPromo() ? PromoState.PROMO_SIGNIN_PERSONALIZED
+-                                                   : PromoState.PROMO_NONE;
+-        }
+-
+-        boolean impressionLimitNotReached =
+-                SharedPreferencesManager.getInstance().readInt(
+-                        ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
+-                < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
+-        if (!AndroidSyncSettings.get().isChromeSyncEnabled() && impressionLimitNotReached) {
+-            return PromoState.PROMO_SYNC;
+-        }
+         return PromoState.PROMO_NONE;
+     }
+ 
+-    // AndroidSyncSettingsObserver implementation.
+-    @Override
+-    public void androidSyncSettingsChanged() {
+-        // AndroidSyncSettings calls this method from non-UI threads.
+-        PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
+-            mPromoState = calculatePromoState();
+-            triggerPromoUpdate();
+-        });
+-    }
+-
+-    // SignInStateObserver implementation.
+-    @Override
+-    public void onSignedIn() {
+-        mPromoState = calculatePromoState();
+-        triggerPromoUpdate();
+-    }
+-
+-    @Override
+-    public void onSignedOut() {
+-        mPromoState = calculatePromoState();
+-        triggerPromoUpdate();
+-    }
+-
+     // ProfileDataCache.Observer implementation.
+     @Override
+     public void onProfileDataUpdated(String accountId) {
+@@ -254,7 +148,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
     }
 
     private void triggerPromoUpdate() {
@@ -220,7 +331,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
-@@ -186,8 +186,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -188,8 +188,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
         assert mDelegate != null;
 
         switch (viewType) {
@@ -229,7 +340,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
             case ViewType.SYNC_PROMO:
                 return mPromoHeaderManager.createSyncPromoHolder(parent);
             case ViewType.FOLDER:
-@@ -202,10 +200,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -204,10 +202,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
 
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
@@ -241,7 +352,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
             BookmarkRow row = ((BookmarkRow) holder.itemView);
             BookmarkId id = getIdByPosition(position);
             row.setBookmarkId(id, getLocationFromPosition(position));
-@@ -229,13 +224,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -231,13 +226,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
 
     @Override
     public void onViewRecycled(ViewHolder holder) {
@@ -255,7 +366,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
     }
 
     /**
-@@ -404,9 +392,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -406,9 +394,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
                 case BookmarkPromoHeader.PromoState.PROMO_NONE:
                     mPromoHeaderType = ViewType.INVALID_PROMO;
                     break;
@@ -265,7 +376,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
                 case BookmarkPromoHeader.PromoState.PROMO_SYNC:
                     mPromoHeaderType = ViewType.SYNC_PROMO;
                     break;
-@@ -571,4 +556,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
+@@ -573,4 +558,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
     private void clearHighlight() {
         mHighlightedBookmark = null;
     }
@@ -275,14 +386,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Reord
 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 {
+@@ -69,24 +69,7 @@ public class SigninPromoController {
+      * @param accessPoint The access point for which the impression limit is being checked.
      */
     public static boolean hasNotReachedImpressionLimit(@AccessPoint int accessPoint) {
-         SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
+-        SharedPreferencesManager preferencesManager = SharedPreferencesManager.getInstance();
 -        switch (accessPoint) {
 -            case SigninAccessPoint.BOOKMARK_MANAGER:
-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_BOOKMARKS, 0)
-                        < MAX_IMPRESSIONS_BOOKMARKS;
+-                return getSigninPromoImpressionsCountBookmarks() < MAX_IMPRESSIONS_BOOKMARKS;
 -            case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
 -                // There is no impression limit for NTP content suggestions.
 -                return true;
@@ -290,17 +401,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPr
 -                // There is no impression limit for Recent Tabs.
 -                return true;
 -            case SigninAccessPoint.SETTINGS:
-                return sharedPreferences.getInt(SIGNIN_PROMO_IMPRESSIONS_COUNT_SETTINGS, 0)
+-                return preferencesManager.readInt(
+-                               ChromePreferenceKeys.SIGNIN_PROMO_IMPRESSIONS_COUNT_SETTINGS)
 -                        < MAX_IMPRESSIONS_SETTINGS;
 -            default:
 -                assert false : "Unexpected value for access point: " + accessPoint;
 -                return false;
 -        }
-+        // never show anything
-+        return true;
+         return false;
     }
 
     /**
 -- 
-2.11.0
+2.17.1

@@ -3,16 +3,16 @@ Date: Sun, 15 Oct 2017 21:45:46 +0200
 Subject: Disable references to fonts.googleapis.com

 ---
- .../dom_distiller/content/browser/dom_distiller_viewer_source.cc       | 2 +-
- components/dom_distiller/core/html/preview.html                        | 2 +-
- components/dom_distiller/core/javascript/dom_distiller_viewer.js       | 2 +-
- third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css         | 3 +--
+ .../content/browser/dom_distiller_viewer_source.cc             | 2 +-
+ components/dom_distiller/core/html/preview.html                | 2 +-
+ .../dom_distiller/core/javascript/dom_distiller_viewer.js      | 2 +-
+ third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -308,7 +308,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -294,7 +294,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
@@ -36,10 +36,10 @@ 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
-@@ -130,7 +130,7 @@ function maybeSetWebFont() {
-     return;
+@@ -116,7 +116,7 @@ function maybeSetWebFont() {
+   }
 
-   var e = document.createElement('link');
+   const e = document.createElement('link');
 -  e.href = 'https://fonts.googleapis.com/css?family=Roboto';
 +  e.href = 'chrome://resources/css/roboto.css';
   e.rel = 'stylesheet';
@@ -59,5 +59,5 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
 body,
 table,
 -- 
-2.11.0
+2.17.1

@@ -3,14 +3,14 @@ Date: Mon, 12 Aug 2019 08:47:04 +0200
 Subject: Disable search-ready omnibox by default

 ---
- chrome/browser/android/chrome_feature_list.cc | 2 +-
+ chrome/browser/flags/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};
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -552,7 +552,7 @@ const base::Feature kScrollToExpandPaymentHandler{
+     "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSearchReadyOmniboxFeature{
 -    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -19,5 +19,5 @@ diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/andr
 const base::Feature kServiceManagerForBackgroundPrefetch{
     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
-2.11.0
+2.17.1

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

@@ -0,0 +1,41 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 24 Jan 2020 19:17:22 +0100
+Subject: Disable smart selection by default
+
+Allow web search in incognito mode (reverts
+commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69)
+
+Notice that re-enabling smart selection would make incognito mode potentially
+leak information through the TextClassifier set by OEM, if any
+---
+ chrome/browser/flags/android/chrome_feature_list.cc             | 2 +-
+ .../content/browser/selection/SelectionPopupControllerImpl.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -393,7 +393,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
+                                       base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
+-                                          base::FEATURE_ENABLED_BY_DEFAULT};
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kCommandLineOnNonRooted{"CommandLineOnNonRooted",
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+@@ -799,7 +799,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+             menu.removeItem(R.id.select_action_menu_share);
+         }
+ 
+-        if (isFocusedNodeEditable() || isIncognito()
+        if (isFocusedNodeEditable()
+                 || !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
+             menu.removeItem(R.id.select_action_menu_web_search);
+         }
+-- 
+2.17.1
+
@@ -9,7 +9,7 @@ Subject: Disable some signed exchange features
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -508,7 +508,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -549,7 +549,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
 // Signed Exchange Reporting for distributors
 // https://www.chromestatus.com/features/5687904902840320
 const base::Feature kSignedExchangeReportingForDistributors{
@@ -18,7 +18,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 
 // Subresource prefetching+loading via Signed HTTP Exchange
 // https://www.chromestatus.com/features/5126805474246656
-@@ -518,7 +518,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+@@ -559,7 +559,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
 // Origin-Signed HTTP Exchanges (for WebPackage Loading)
 // https://www.chromestatus.com/features/5745285984681984
 const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
@@ -28,5 +28,5 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 // Whether to send a ping to the inner URL upon navigation or not.
 const base::Feature kSignedHTTPExchangePingValidity{
 -- 
-2.11.0
+2.17.1

@@ -4,8 +4,8 @@ Subject: Disable sync services menu entry

 ---
 chrome/android/java/res/xml/main_preferences.xml    | 6 ------
- chrome/android/java/res/xml/privacy_preferences.xml | 7 -------
- 2 files changed, 13 deletions(-)
+ chrome/android/java/res/xml/privacy_preferences.xml | 8 --------
+ 2 files changed, 14 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
@@ -14,31 +14,31 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
         android:key="sign_in"
         android:order="1"
         android:title="@string/sign_in_to_chrome"/>
-    <org.chromium.chrome.browser.preferences.ChromeBasePreference
+-    <org.chromium.chrome.browser.settings.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"/>
+-        android:fragment="org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings"/>
 
     <PreferenceCategory
         android:key="basics_section"
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -33,12 +33,5 @@
+@@ -29,12 +29,4 @@
         android:title="@string/clear_browsing_data_title"
         android:summary="@string/clear_browsing_data_summary"
-         android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
+         android:fragment="org.chromium.chrome.browser.settings.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
+-    <org.chromium.chrome.browser.settings.TextMessagePreference
 -        android:key="sync_and_services_link"
 -        android:summary="@string/privacy_sync_and_services_link"
-         app:allowDividerBelow="false" />
+-        app:allowDividerBelow="false" />
 </PreferenceScreen>
 -- 
-2.11.0
+2.17.1

@@ -10,7 +10,7 @@ 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
-@@ -57,7 +57,7 @@ void CookieSettings::GetCookieSettings(
+@@ -59,7 +59,7 @@ void CookieSettings::GetCookieSettings(
 void CookieSettings::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -20,5 +20,5 @@ diff --git a/components/content_settings/core/browser/cookie_settings.cc b/compo
   registry->RegisterIntegerPref(
       prefs::kCookieControlsMode,
 -- 
-2.11.0
+2.17.1

@@ -1,23 +0,0 @@
-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
-
@@ -3,7 +3,7 @@ Date: Sat, 27 Oct 2018 17:54:01 +0200
 Subject: Disable update scheduler

 ---
- .../chromium/chrome/browser/component_updater/UpdateScheduler.java | 7 ++-----
+ .../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
@@ -29,5 +29,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updat
 \ No newline at end of file
 +}
 -- 
-2.11.0
+2.17.1

@@ -0,0 +1,115 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 27 Feb 2020 23:23:59 +0100
+Subject: Do not compile QR code sharing
+
+---
+ chrome/android/java/AndroidManifest.xml          | 16 ----------------
+ .../chrome/browser/share/ShareDelegateImpl.java  |  5 -----
+ .../browser/share/ShareSheetCoordinator.java     | 14 --------------
+ chrome/browser/share/android/java_sources.gni    | 12 ------------
+ 4 files changed, 47 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
+@@ -824,22 +824,6 @@ by a child template that "extends" this file.
+             </intent-filter>
+           </activity>
+ 
+-          <activity
+-            android:name="org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity"
+-            android:icon="@drawable/ic_launcher"
+-            android:label="@string/qr_code_share_icon_label"
+-            android:enabled="false"
+-            android:excludeFromRecents="true"
+-            android:exported="true"
+-            android:noHistory="true"
+-            android:theme="@android:style/Theme.NoDisplay"
+-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
+-            <intent-filter>
+-                <action android:name="android.intent.action.SEND" />
+-                <category android:name="android.intent.category.DEFAULT" />
+-                <data android:mimeType="text/plain" />
+-            </intent-filter>
+-          </activity>
+ 
+         <activity
+             android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareDelegateImpl.java
+@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
+ import org.chromium.chrome.browser.printing.PrintShareActivity;
+ import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeShareActivity;
+ import org.chromium.chrome.browser.tab.SadTab;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabImpl;
+@@ -98,10 +97,6 @@ public class ShareDelegateImpl implements ShareDelegate {
+             classesToEnable.add(SendTabToSelfShareActivity.class);
+         }
+ 
+-        if (QrCodeShareActivity.featureIsAvailable()) {
+-            classesToEnable.add(QrCodeShareActivity.class);
+-        }
+-
+         if (!classesToEnable.isEmpty()) {
+             OptionalShareTargetsManager.getInstance().enableOptionalShareActivities(activity,
+                     classesToEnable, () -> triggerShare(currentTab, shareDirectly, isIncognito));
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/ShareSheetCoordinator.java
+@@ -16,7 +16,6 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ActivityTabProvider;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.send_tab_to_self.SendTabToSelfShareActivity;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
+ import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
+ import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.chrome.browser.tab.TabLaunchType;
+@@ -73,19 +72,6 @@ public class ShareSheetCoordinator {
+     ArrayList<PropertyModel> createTopRowPropertyModels(
+             ShareSheetBottomSheetContent bottomSheet, Activity activity) {
+         ArrayList<PropertyModel> models = new ArrayList<>();
+-        // QR Codes
+-        PropertyModel qrcodePropertyModel = mPropertyModelBuilder.createPropertyModel(
+-                AppCompatResources.getDrawable(activity, R.drawable.qr_code),
+-                activity.getResources().getString(R.string.qr_code_share_icon_label),
+-                (currentActivity)
+-                        -> {
+-                    mBottomSheetController.hideContent(bottomSheet, true);
+-                    QrCodeCoordinator qrCodeCoordinator =
+-                            new QrCodeCoordinator(activity, this::createNewTab);
+-                    qrCodeCoordinator.show();
+-                },
+-                /*isFirstParty=*/true);
+-        models.add(qrcodePropertyModel);
+ 
+         // Send Tab To Self
+         PropertyModel sttsPropertyModel =
+diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
+--- a/chrome/browser/share/android/java_sources.gni
+++ b/chrome/browser/share/android/java_sources.gni
+@@ -4,18 +4,6 @@
+ 
+ # TODO(gayane): This should be a separate build target when circular dependencies are removed.
+ share_java_sources = [
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
+ ]
+-- 
+2.17.1
+
@@ -0,0 +1,43 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 4 Jan 2020 14:46:12 +0100
+Subject: Do not enable QUIC by default
+
+For reference:
+* https://brave.com/quic-in-the-wild/
+* https://petsymposium.org/2019/files/papers/issue3/popets-2019-0046.pdf
+---
+ .../browser/network_session_configurator.cc                  | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
+--- a/components/network_session_configurator/browser/network_session_configurator.cc
+++ b/components/network_session_configurator/browser/network_session_configurator.cc
+@@ -186,7 +186,7 @@ bool ShouldEnableQuic(base::StringPiece quic_trial_group,
+   return quic_trial_group.starts_with(kQuicFieldTrialEnabledGroupName) ||
+          quic_trial_group.starts_with(kQuicFieldTrialHttpsEnabledGroupName) ||
+          base::LowerCaseEqualsASCII(
+-             GetVariationParam(quic_trial_params, "enable_quic"), "true");
+             GetVariationParam(quic_trial_params, "enable_quic"), "false");
+ }
+ 
+ bool ShouldEnableQuicProxiesForHttpsUrls(
+@@ -194,7 +194,7 @@ bool ShouldEnableQuicProxiesForHttpsUrls(
+   return base::LowerCaseEqualsASCII(
+       GetVariationParam(quic_trial_params,
+                         "enable_quic_proxies_for_https_urls"),
+-      "true");
+      "false");
+ }
+ 
+ bool ShouldRetryWithoutAltSvcOnQuicErrors(
+@@ -475,7 +475,6 @@ void ConfigureQuicParams(base::StringPiece quic_trial_group,
+   params->enable_quic =
+       ShouldEnableQuic(quic_trial_group, quic_trial_params,
+                        is_quic_force_disabled, is_quic_force_enabled);
+-
+   params->enable_server_push_cancellation =
+       ShouldEnableServerPushCancelation(quic_trial_params);
+ 
+-- 
+2.17.1
+
@@ -4,14 +4,14 @@ 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 +-
+ .../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) {
+@@ -191,7 +191,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) {
   DCHECK(dse_url.is_empty() || IsPermissionControlledByDSE(type, dse_origin));
 
   if (!dse_url.is_empty())
@@ -20,7 +20,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
 }
 
 void SearchPermissionsService::ResetDSEPermissions() {
-@@ -333,11 +333,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+@@ -334,11 +334,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
     return;
   }
 
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
   pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy);
 
   // Initialize the pref for geolocation if it hasn't been initialized yet.
-@@ -370,10 +366,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+@@ -371,10 +367,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
@@ -46,8 +46,8 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
     }
 
     // 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);
+@@ -399,11 +393,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
+         GetContentSetting(dse_origin, ContentSettingsType::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.
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -288,7 +288,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
+@@ -310,7 +310,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
 #if defined(OS_ANDROID)
 // Enable changing default downloads storage location on Android.
 const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -71,7 +71,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 +                                             base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
- // If enabled, Drive will use FCM for its invalidations.
+ // If enabled, policies will use FCM (Firebase Cloud Messaging) for its
 -- 
-2.11.0
+2.17.1

@@ -6,13 +6,13 @@ Upstream has decided that it works as intended (https://bugs.chromium.org/p/chro
 but users would like to decide where to save a file even when there is no SD card available;
 do not skip the prompt in such cases.
 ---
- .../download/DownloadLocationDialogBridge.java     | 73 +++++++---------------
- 1 file changed, 21 insertions(+), 52 deletions(-)
+ .../DownloadLocationDialogBridge.java         | 72 ++++++-------------
+ 1 file changed, 21 insertions(+), 51 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
+@@ -31,9 +31,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
     private PropertyModel mDialogModel;
     private DownloadLocationCustomView mCustomView;
     private ModalDialogManager mModalDialogManager;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
     private Context mContext;
 
     private DownloadLocationDialogBridge(long nativeDownloadLocationDialogBridge) {
-@@ -67,12 +64,28 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+@@ -66,12 +63,28 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
 
         mModalDialogManager = activity.getModalDialogManager();
         mContext = activity;
@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
     }
 
     @Override
-@@ -105,50 +118,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
+@@ -104,49 +117,6 @@ public class DownloadLocationDialogBridge implements ModalDialogProperties.Contr
         mCustomView = null;
     }
 
@@ -72,8 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 -            final DirectoryOption dir = dirs.get(0);
 -            if (dir.type == DirectoryOption.DownloadLocationDirectoryType.DEFAULT) {
 -                assert(!TextUtils.isEmpty(dir.location));
-                PrefServiceBridge.getInstance().setDownloadAndSaveFileDefaultDirectory(
-                        dir.location);
+-                setDownloadAndSaveFileDefaultDirectory(dir.location);
 -                DownloadLocationDialogBridgeJni.get().onComplete(
 -                        mNativeDownloadLocationDialogBridge, DownloadLocationDialogBridge.this,
 -                        mSuggestedPath);
@@ -108,5 +107,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
         switch (dialogType) {
             case DownloadLocationDialogType.LOCATION_FULL:
 -- 
-2.11.0
+2.17.1

@@ -1,38 +0,0 @@
-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
-
@@ -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
-@@ -202,10 +202,10 @@ void PasswordManager::RegisterProfilePrefs(
-   registry->RegisterBooleanPref(prefs::kBlacklistedCredentialsNormalized,
-                                 false);
+@@ -185,10 +185,10 @@ void AddLocallySavedPredictions(FieldInfoManager* field_info_manager,
+ void PasswordManager::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
   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.11.0
+2.17.1

@@ -9,7 +9,7 @@ Subject: Enable changing default downloads storage location by default
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -288,7 +288,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
+@@ -310,7 +310,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
 #if defined(OS_ANDROID)
 // Enable changing default downloads storage location on Android.
 const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
@@ -17,7 +17,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 +                                             base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
- // If enabled, Drive will use FCM for its invalidations.
+ // If enabled, policies will use FCM (Firebase Cloud Messaging) for its
 -- 
-2.11.0
+2.17.1

@@ -1,23 +0,0 @@
-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
-
@@ -42,7 +42,7 @@ Excerpt from https://github.com/bromite/bromite/issues/226
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -282,6 +282,10 @@ config("compiler") {
+@@ -292,6 +292,10 @@ config("compiler") {
       }
     }
 
@@ -54,5 +54,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
         !is_mac && !is_ios && current_os != "aix") {
 -- 
-2.11.0
+2.17.1

@@ -1,23 +0,0 @@
-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
-
@@ -9,7 +9,7 @@ Subject: Enable site per process isolation for devices with enough memory
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -617,11 +617,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
+@@ -655,11 +655,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
 // browser_features, as they are only used on the browser side.
 const base::Feature kSitePerProcess {
   "site-per-process",
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 };
 
 // Controls a mode for dynamically process-isolating sites where the user has
-@@ -643,7 +639,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+@@ -689,7 +685,7 @@ const base::Feature kSiteIsolationForPasswordSites {
 // base::SysInfo::AmountOfPhysicalMemoryMB().
 const base::Feature kSitePerProcessOnlyForHighMemoryClients{
     "site-per-process-only-for-high-memory-clients",
@@ -31,5 +31,5 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
     "site-per-process-low-memory-cutoff-mb";
 
 -- 
-2.11.0
+2.17.1

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 10 Feb 2020 23:13:13 +0100
+Subject: Enable user-agent freeze by default
+
+---
+ third_party/blink/common/features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
+--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
+@@ -46,7 +46,7 @@ const base::Feature kFreezePurgeMemoryAllPagesFrozen{
+ 
+ // Freezes the user-agent as part of https://github.com/WICG/ua-client-hints.
+ const base::Feature kFreezeUserAgent{"FreezeUserAgent",
+-                                     base::FEATURE_DISABLED_BY_DEFAULT};
+                                     base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ // When enabled, enter assumed-overlap mode in compositing overlap testing
+ // anytime a fixed or sticky position element is encountered.
+-- 
+2.17.1
+
@@ -9,16 +9,16 @@ 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
-@@ -761,6 +761,9 @@ PermissionResult PermissionManager::GetPermissionStatusHelper(
-   if (status != CONTENT_SETTING_DEFAULT)
-     return PermissionResult(status, PermissionStatusSource::UNSPECIFIED);
+@@ -784,6 +784,9 @@ permissions::PermissionResult PermissionManager::GetPermissionStatusHelper(
+     return permissions::PermissionResult(
+         status, permissions::PermissionStatusSource::UNSPECIFIED);
   PermissionContextBase* context = GetPermissionContext(permission);
 +  if (context == nullptr) {
-+      return PermissionResult(CONTENT_SETTING_BLOCK, PermissionStatusSource::UNSPECIFIED);
+      return permissions::PermissionResult(CONTENT_SETTING_BLOCK, permissions::PermissionStatusSource::UNSPECIFIED);
 +  }
-   PermissionResult result = context->GetPermissionStatus(
+   permissions::PermissionResult result = context->GetPermissionStatus(
       render_frame_host, canonical_requesting_origin.GetOrigin(),
       embedding_origin.GetOrigin());
 -- 
-2.11.0
+2.17.1

@@ -3,13 +3,13 @@ Date: Sun, 13 Aug 2017 19:33:04 -0400
 Subject: Hide passwords manager link

 ---
- .../chrome/browser/preferences/password/SavePasswordsPreferences.java | 4 ++--
+ .../chrome/browser/settings/password/PasswordSettings.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
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/password/PasswordSettings.java
+@@ -254,7 +254,7 @@ public class PasswordSettings
             return;
         }
 
@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas
 
         PreferenceGroup passwordParent;
         if (mSearchQuery == null) {
-@@ -326,7 +326,7 @@ public class SavePasswordsPreferences
+@@ -329,7 +329,7 @@ public class PasswordSettings
             return;
         }
 
@@ -28,5 +28,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pas
         PreferenceCategory profileCategory = new PreferenceCategory(getStyledContext());
         profileCategory.setKey(PREF_KEY_CATEGORY_EXCEPTIONS);
 -- 
-2.11.0
+2.17.1

@@ -13,11 +13,11 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
                         android:layout_height="wrap_content"
                         android:lineSpacingMultiplier="1.4"
                         android:text="@string/fre_send_report_check"
-                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" />
-+                        android:textAppearance="@style/TextAppearance.BlackBodyDefault" android:visibility="gone" />
+-                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
+                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
                     </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 -- 
-2.11.0
+2.17.1

@@ -4,37 +4,27 @@ Subject: Increase number of autocomplete matches from 5 to 10

 Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526874703
 ---
- components/omnibox/browser/autocomplete_result.cc | 7 ++-----
+ components/omnibox/browser/autocomplete_result.cc | 3 ++-
 components/omnibox/browser/omnibox_field_trial.cc | 3 ++-
- 2 files changed, 4 insertions(+), 6 deletions(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)

 diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
 --- a/components/omnibox/browser/autocomplete_result.cc
 +++ b/components/omnibox/browser/autocomplete_result.cc
-@@ -48,17 +48,14 @@ struct MatchGURLHash {
+@@ -75,7 +75,8 @@ struct MatchGURLHash {
 // static
 size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
 #if (defined(OS_ANDROID))
 -  constexpr size_t kDefaultMaxAutocompleteMatches = 5;
-+  constexpr size_t kDefaultMaxAutocompleteMatches = 10; // was 6, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
+  // changed from 6, this needs to be double the value of default_max_matches_per_provider from components/omnibox/browser/omnibox_field_trial.cc
+  constexpr size_t kDefaultMaxAutocompleteMatches = 10;
   if (is_zero_suggest)
     return kDefaultMaxAutocompleteMatches;
- #else
-   constexpr size_t kDefaultMaxAutocompleteMatches = 6;
- #endif  // defined(OS_ANDROID)
- 
-  return base::GetFieldTrialParamByFeatureAsInt(
-      omnibox::kUIExperimentMaxAutocompleteMatches,
-      OmniboxFieldTrial::kUIMaxAutocompleteMatchesParam,
-      kDefaultMaxAutocompleteMatches);
-+  return kDefaultMaxAutocompleteMatches;
- }
- 
- AutocompleteResult::AutocompleteResult() {
+ #elif defined(OS_IOS)  // !defined(OS_ANDROID)
 diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc
 --- a/components/omnibox/browser/omnibox_field_trial.cc
 +++ b/components/omnibox/browser/omnibox_field_trial.cc
-@@ -321,7 +321,8 @@ void OmniboxFieldTrial::GetDemotionsByType(
+@@ -338,7 +338,8 @@ void OmniboxFieldTrial::GetDemotionsByType(
 
 size_t OmniboxFieldTrial::GetProviderMaxMatches(
     AutocompleteProvider::Type provider) {
@@ -45,5 +35,5 @@ diff --git a/components/omnibox/browser/omnibox_field_trial.cc b/components/omni
   std::string param_value = base::GetFieldTrialParamValueByFeature(
       omnibox::kUIExperimentMaxAutocompleteMatches,
 -- 
-2.11.0
+2.17.1

@@ -4,27 +4,27 @@ 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 +-
- .../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(-)
+ 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 +-
+ .../ui/webui/local_discovery/local_discovery_ui.cc       | 4 ----
+ chrome/service/cloud_print/connector_settings.cc         | 2 +-
+ components/autofill/core/browser/autofill_manager.cc     | 9 +++------
+ components/autofill/core/common/autofill_prefs.cc        | 2 +-
+ components/bookmarks/browser/bookmark_utils.cc           | 4 ++--
+ .../safe_browsing/core/common/safe_browsing_prefs.cc     | 4 ++--
+ extensions/common/extension.cc                           | 8 --------
+ 15 files changed, 18 insertions(+), 33 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
-@@ -301,7 +301,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -310,7 +310,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
   registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
 #endif
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1150,7 +1150,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1217,7 +1217,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -72,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
-@@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -149,7 +149,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
 void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSearchSuggestEnabled,
@@ -96,7 +96,7 @@ diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.h
 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
-@@ -66,11 +66,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -67,11 +67,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -113,20 +113,20 @@ 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
-@@ -42,7 +42,7 @@ NavigationCorrectionTabObserver::~NavigationCorrectionTabObserver() {}
- // static
+@@ -59,7 +59,7 @@ void NavigationCorrectionTabObserver::SetAllowEnableCorrectionsForTesting(
 void NavigationCorrectionTabObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
-  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
-+  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, false,
+   prefs->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
+-                             true,
+                             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
-@@ -107,10 +107,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
+@@ -109,10 +109,6 @@ void LocalDiscoveryUI::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kLocalDiscoveryEnabled, true);
   registry->RegisterBooleanPref(
       prefs::kLocalDiscoveryNotificationsEnabled,
 -#if defined(OS_WIN)
@@ -151,19 +151,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -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(
+@@ -883,10 +883,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
       // suggestions available.
       // TODO(mathp): Differentiate between number of suggestions available
       // (current metric) and number shown to the user.
@@ -175,7 +163,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
     }
   }
 
-@@ -1427,8 +1421,8 @@ void AutofillManager::Reset() {
+@@ -1524,8 +1521,8 @@ void AutofillManager::Reset() {
 #if defined(OS_ANDROID) || defined(OS_IOS)
   autofill_assistant_.Reset();
 #endif
@@ -189,7 +177,7 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
 diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
 --- a/components/autofill/core/common/autofill_prefs.cc
 +++ b/components/autofill/core/common/autofill_prefs.cc
-@@ -150,7 +150,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -147,7 +147,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
@@ -201,7 +189,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
-@@ -443,12 +443,12 @@ bool DoesBookmarkContainWords(const base::string16& title,
+@@ -439,12 +439,12 @@ bool DoesBookmarkContainWords(const base::string16& title,
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kShowBookmarkBar,
@@ -216,10 +204,10 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kShowManagedBookmarksInBookmarkBar,
-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
-@@ -167,9 +167,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
+--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
+@@ -175,9 +175,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -234,13 +222,13 @@ 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
-@@ -365,14 +365,6 @@ bool Extension::ShouldDisplayInExtensionSettings() const {
-   if (is_theme())
+@@ -333,14 +333,6 @@ bool Extension::ShouldDisplayInExtensionSettings(Manifest::Type type,
+   if (type == Manifest::TYPE_THEME)
     return false;
 
 -  // Hide component extensions because they are only extensions as an
 -  // implementation detail of Chrome.
-  if (extensions::Manifest::IsComponentLocation(location()) &&
+-  if (Manifest::IsComponentLocation(location) &&
 -      !base::CommandLine::ForCurrentProcess()->HasSwitch(
 -          switches::kShowComponentExtensionOptions)) {
 -    return false;
@@ -250,5 +238,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.11.0
+2.17.1

@@ -25,31 +25,30 @@ approach to change color components.

 Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data fingerprinting deception
 ---
- chrome/browser/BUILD.gn                            |   1 +
- chrome/browser/about_flags.cc                      |  13 ++
- content/browser/BUILD.gn                           |   1 +
- .../renderer_host/render_process_host_impl.cc      |   4 +
- content/child/BUILD.gn                             |   1 +
- content/child/runtime_features.cc                  |   8 ++
- .../blink/public/platform/web_runtime_features.h   |   3 +
- third_party/blink/renderer/core/dom/document.cc    |  18 +++
- third_party/blink/renderer/core/dom/document.h     |   7 +
- third_party/blink/renderer/core/dom/element.cc     |   8 ++
- third_party/blink/renderer/core/dom/range.cc       |  12 +-
- .../renderer/core/html/canvas/text_metrics.cc      |  18 +++
- .../blink/renderer/core/html/canvas/text_metrics.h |   2 +
- .../canvas/canvas2d/canvas_rendering_context_2d.cc |   8 +-
- .../modules/webgl/webgl_debug_renderer_info.cc     |   4 +-
- third_party/blink/renderer/platform/BUILD.gn       |   5 +-
- .../platform/exported/web_runtime_features.cc      |  12 ++
- .../platform/graphics/image_data_buffer.cc         |   7 +
- .../platform/graphics/static_bitmap_image.cc       | 159 +++++++++++++++++++++
- .../platform/graphics/static_bitmap_image.h        |   2 +
- .../platform/runtime_enabled_features.json5        |   9 ++
- third_party/ungoogled/BUILD.gn                     |  10 ++
- third_party/ungoogled/ungoogled_switches.cc        |  18 +++
- third_party/ungoogled/ungoogled_switches.h         |  18 +++
- 24 files changed, 343 insertions(+), 5 deletions(-)
+ chrome/browser/BUILD.gn                       |   1 +
+ chrome/browser/about_flags.cc                 |  13 ++
+ content/browser/BUILD.gn                      |   1 +
+ .../renderer_host/render_process_host_impl.cc |   4 +
+ content/child/BUILD.gn                        |   1 +
+ content/child/runtime_features.cc             |   8 +
+ .../public/platform/web_runtime_features.h    |   3 +
+ .../blink/renderer/core/dom/document.cc       |  18 ++
+ .../blink/renderer/core/dom/document.h        |   7 +
+ .../blink/renderer/core/dom/element.cc        |   8 +
+ third_party/blink/renderer/core/dom/range.cc  |  12 +-
+ .../renderer/core/html/canvas/text_metrics.cc |  18 ++
+ .../renderer/core/html/canvas/text_metrics.h  |   2 +
+ .../canvas2d/canvas_rendering_context_2d.cc   |   8 +-
+ third_party/blink/renderer/platform/BUILD.gn  |   5 +-
+ .../platform/exported/web_runtime_features.cc |  12 ++
+ .../platform/graphics/image_data_buffer.cc    |   7 +
+ .../platform/graphics/static_bitmap_image.cc  | 159 ++++++++++++++++++
+ .../platform/graphics/static_bitmap_image.h   |   2 +
+ .../platform/runtime_enabled_features.json5   |   9 +
+ third_party/ungoogled/BUILD.gn                |  10 ++
+ third_party/ungoogled/ungoogled_switches.cc   |  18 ++
+ third_party/ungoogled/ungoogled_switches.h    |  18 ++
+ 23 files changed, 341 insertions(+), 3 deletions(-)
 create mode 100644 third_party/ungoogled/BUILD.gn
 create mode 100644 third_party/ungoogled/ungoogled_switches.cc
 create mode 100644 third_party/ungoogled/ungoogled_switches.h
@@ -57,26 +56,26 @@ Added flag --fingerprinting-canvas-image-data-noise to disable Canvas image data
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2200,6 +2200,7 @@ jumbo_split_static_library("browser") {
+@@ -2233,6 +2233,7 @@ jumbo_static_library("browser") {
     "//third_party/metrics_proto",
     "//third_party/re2",
     "//third_party/smhasher:cityhash",
 +    "//third_party/ungoogled:switches",
-     "//third_party/webrtc_overrides",
-     "//third_party/webrtc_overrides:init_webrtc",
+     "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/widevine/cdm:buildflags",
+     "//third_party/zlib",
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -147,6 +147,7 @@
+@@ -153,6 +153,7 @@
+ #include "third_party/blink/public/common/experiments/memory_ablation_experiment.h"
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/forcedark/forcedark_switches.h"
- #include "third_party/leveldatabase/leveldb_features.h"
 +#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "third_party/leveldatabase/leveldb_features.h"
+ #include "ui/accessibility/accessibility_features.h"
 #include "ui/accessibility/accessibility_switches.h"
- #include "ui/base/ui_base_features.h"
- #include "ui/base/ui_base_switches.h"
-@@ -1405,12 +1406,24 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1584,12 +1585,24 @@ const FeatureEntry kFeatureEntries[] = {
     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)},
@@ -104,18 +103,18 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -206,6 +206,7 @@ jumbo_source_set("browser") {
+@@ -205,6 +205,7 @@ jumbo_source_set("browser") {
     "//third_party/libyuv",
     "//third_party/re2",
     "//third_party/sqlite",
 +    "//third_party/ungoogled:switches",
-     "//third_party/webrtc/modules/desktop_capture:primitives",
-     "//third_party/webrtc/rtc_base:rtc_base",
+     "//third_party/webrtc_overrides:webrtc_component",
     "//third_party/zlib",
+     "//third_party/zlib/google:zip",
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -213,6 +213,7 @@
+@@ -223,6 +223,7 @@
 #include "third_party/blink/public/common/page/launching_process_state.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
 #include "third_party/blink/public/public_buildflags.h"
@@ -123,22 +122,22 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/accessibility/accessibility_switches.h"
 #include "ui/base/ui_base_switches.h"
-@@ -2970,6 +2971,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
-     switches::kEnableWebGLSwapChain,
-     switches::kEnableWebVR,
-     switches::kFileUrlPathAlias,
+@@ -3091,6 +3092,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+     switches::kDisablePreferCompositingToLCDText,
+     switches::kDisableDatabases,
+     switches::kDisableFileSystem,
 +    switches::kFingerprintingClientRectsNoise,
 +    switches::kFingerprintingCanvasMeasureTextNoise,
 +    switches::kFingerprintingCanvasImageDataNoise,
-     switches::kForceDisplayColorProfile,
-     switches::kForceDeviceScaleFactor,
-     switches::kForceGpuMemAvailableMb,
+     switches::kDisableFrameRateLimit,
+     switches::kDisableGpuMemoryBufferVideoFrames,
+     switches::kDisableImageAnimationResync,
 diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -120,6 +120,7 @@ target(link_target_type, "child") {
-     "//third_party/blink/public:scaled_resources",
+@@ -124,6 +124,7 @@ target(link_target_type, "child") {
     "//third_party/blink/public/common",
+     "//third_party/blink/public/strings",
     "//third_party/ced",
 +    "//third_party/ungoogled:switches",
     "//third_party/zlib/google:compression_utils",
@@ -147,17 +146,17 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -23,6 +23,7 @@
+@@ -25,6 +25,7 @@
 #include "services/network/public/cpp/features.h"
+ #include "services/network/public/cpp/network_switches.h"
 #include "third_party/blink/public/common/features.h"
- #include "third_party/blink/public/platform/web_runtime_features.h"
 +#include "third_party/ungoogled/ungoogled_switches.h"
+ #include "third_party/blink/public/platform/web_runtime_features.h"
+ #include "ui/accessibility/accessibility_features.h"
 #include "ui/base/ui_base_features.h"
- #include "ui/events/blink/blink_features.h"
- #include "ui/gfx/switches.h"
-@@ -461,6 +462,13 @@ void SetIndividualRuntimeFeatures(
-     WebRuntimeFeatures::EnableAllowSyncXHRInPageDismissal(true);
-   }
+@@ -518,6 +519,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+   // They're moved here to distinguish them from actual base checks
+   WebRuntimeFeatures::EnableOverlayScrollbars(ui::IsOverlayScrollbarEnabled());
 
 +  WebRuntimeFeatures::EnableFingerprintingClientRectsNoise(
 +      !command_line.HasSwitch(switches::kFingerprintingClientRectsNoise));
@@ -166,14 +165,14 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +  WebRuntimeFeatures::EnableFingerprintingCanvasImageDataNoise(
 +      !command_line.HasSwitch(switches::kFingerprintingCanvasImageDataNoise));
 +
-   WebRuntimeFeatures::EnableAutoplayIgnoresWebAudio(
-       base::FeatureList::IsEnabled(media::kAutoplayIgnoreWebAudio));
- 
+   if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
+           blink::features::kNativeFileSystemAPI.name,
+           base::FeatureList::OVERRIDE_ENABLE_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
-@@ -228,6 +228,9 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableMergeBlockingNonBlockingPools(bool);
+@@ -226,6 +226,9 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableTranslateService(bool);
   BLINK_PLATFORM_EXPORT static void EnableGetDisplayMedia(bool);
   BLINK_PLATFORM_EXPORT static void EnableAllowSyncXHRInPageDismissal(bool);
 +  BLINK_PLATFORM_EXPORT static void EnableFingerprintingClientRectsNoise(bool);
@@ -193,9 +192,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 #include "base/time/time.h"
 #include "cc/input/overscroll_behavior.h"
 #include "cc/input/scroll_snap_data.h"
-@@ -1199,6 +1200,15 @@ Document::Document(const DocumentInit& initializer,
- #ifndef NDEBUG
-   liveDocumentSet().insert(this);
+@@ -2439,6 +2440,23 @@ void Document::UpdateStyleAndLayoutTree() {
+ #if DCHECK_IS_ON()
+   AssertLayoutTreeUpdated(*this);
 #endif
 +
 +  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
@@ -206,28 +205,21 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 +    noise_factor_x_ = 1;
 +    noise_factor_y_ = 1;
 +  }
- }
- 
- Document::~Document() {
-@@ -1227,6 +1237,14 @@ Range* Document::CreateRangeAdjustedToTreeScope(const TreeScope& tree_scope,
-                                      Position::BeforeNode(*shadow_host));
- }
- 
+}
+
 +double Document::GetNoiseFactorX() {
 +  return noise_factor_x_;
 +}
 +
 +double Document::GetNoiseFactorY() {
 +  return noise_factor_y_;
-+}
-+
- SelectorQueryCache& Document::GetSelectorQueryCache() {
-   if (!selector_query_cache_)
-     selector_query_cache_ = std::make_unique<SelectorQueryCache>();
+ }
+ 
+ void Document::UpdateActiveStyle() {
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -408,6 +408,10 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -417,6 +417,10 @@ class CORE_EXPORT Document : public ContainerNode,
     has_xml_declaration_ = has_xml_declaration ? 1 : 0;
   }
 
@@ -238,7 +230,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
   String visibilityState() const;
   bool IsPageVisible() const;
   bool hidden() const;
-@@ -1905,6 +1909,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1959,6 +1963,9 @@ class CORE_EXPORT Document : public ContainerNode,
 
   base::ElapsedTimer start_time_;
 
@@ -251,7 +243,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -1630,6 +1630,11 @@ DOMRectList* Element::getClientRects() {
+@@ -1948,6 +1948,11 @@ DOMRectList* Element::getClientRects() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatQuadsForScrollAndAbsoluteZoom(
       quads, *element_layout_object);
@@ -260,10 +252,10 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 +      quad.Scale(GetDocument().GetNoiseFactorX(), GetDocument().GetNoiseFactorY());
 +    }
 +  }
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
-@@ -1647,6 +1652,9 @@ DOMRect* Element::getBoundingClientRect() {
+@@ -1965,6 +1970,9 @@ DOMRect* Element::getBoundingClientRect() {
   DCHECK(element_layout_object);
   GetDocument().AdjustFloatRectForScrollAndAbsoluteZoom(result,
                                                         *element_layout_object);
@@ -276,7 +268,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/renderer/core/dom/range.cc
 --- a/third_party/blink/renderer/core/dom/range.cc
 +++ b/third_party/blink/renderer/core/dom/range.cc
-@@ -1631,11 +1631,21 @@ DOMRectList* Range::getClientRects() const {
+@@ -1631,6 +1631,12 @@ DOMRectList* Range::getClientRects() const {
   Vector<FloatQuad> quads;
   GetBorderAndTextQuads(quads);
 
@@ -286,19 +278,22 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 +    }
 +  }
 +
-   return DOMRectList::Create(quads);
+   return MakeGarbageCollected<DOMRectList>(quads);
 }
 
- DOMRect* Range::getBoundingClientRect() const {
-  return DOMRect::FromFloatRect(BoundingRect());
-+  auto rect = BoundingRect();
-+  if (RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
-+    rect.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
+@@ -1758,7 +1764,11 @@ FloatRect Range::BoundingRect() const {
+ 
+   // If all rects are empty, return the first rect.
+   if (result.IsEmpty() && !quads.IsEmpty())
+-    return quads.front().BoundingBox();
+    result = quads.front().BoundingBox();
+
+  if (!result.IsEmpty() && RuntimeEnabledFeatures::FingerprintingClientRectsNoiseEnabled()) {
+    result.Scale(owner_document_->GetNoiseFactorX(), owner_document_->GetNoiseFactorY());
 +  }
-+  return DOMRect::FromFloatRect(rect);
- }
 
- // TODO(editing-dev): We should make
+   return result;
+ }
 diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.cc b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 --- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
 +++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -342,7 +337,7 @@ diff --git a/third_party/blink/renderer/core/html/canvas/text_metrics.h b/third_
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
-@@ -811,9 +811,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
+@@ -822,9 +822,15 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) {
   else
     direction = ToTextDirection(GetState().GetDirection(), canvas());
 
@@ -359,27 +354,10 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering
 }
 
 void CanvasRenderingContext2D::DrawTextInternal(
-diff --git a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
--- a/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-+++ b/third_party/blink/renderer/modules/webgl/webgl_debug_renderer_info.cc
-@@ -37,11 +37,11 @@ WebGLExtensionName WebGLDebugRendererInfo::GetName() const {
- 
- WebGLDebugRendererInfo* WebGLDebugRendererInfo::Create(
-     WebGLRenderingContextBase* context) {
-  return MakeGarbageCollected<WebGLDebugRendererInfo>(context);
-+  return nullptr;
- }
- 
- bool WebGLDebugRendererInfo::Supported(WebGLRenderingContextBase*) {
-  return true;
-+  return false;
- }
- 
- const char* WebGLDebugRendererInfo::ExtensionName() {
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -1417,7 +1417,9 @@ jumbo_component("platform") {
+@@ -1482,7 +1482,9 @@ jumbo_component("platform") {
     "//third_party/blink/renderer:non_test_config",
   ]
 
@@ -390,18 +368,18 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
 
   public_deps = [
     ":blink_platform_public_deps",
-@@ -1450,6 +1452,7 @@ jumbo_component("platform") {
+@@ -1521,6 +1523,7 @@ jumbo_component("platform") {
+     "//third_party/blink/public/mojom:embedded_frame_sink_mojo_bindings_blink",
+     "//third_party/blink/public/strings",
     "//third_party/ced",
+    "//third_party/ungoogled:switches",
     "//third_party/emoji-segmenter",
     "//third_party/icu",
-+    "//third_party/ungoogled:switches",
-     "//third_party/webrtc/api:libjingle_logging_api",
-     "//third_party/webrtc/api/audio_codecs/L16:audio_decoder_L16",
-     "//third_party/webrtc/api/audio_codecs/L16:audio_encoder_L16",
+     "//third_party/libyuv",
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -722,4 +722,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
+@@ -690,4 +690,16 @@ void WebRuntimeFeatures::EnableAcceleratedSmallCanvases(bool enable) {
   RuntimeEnabledFeatures::SetAcceleratedSmallCanvasesEnabled(enable);
 }
 
@@ -421,16 +399,16 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 --- a/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
 +++ b/third_party/blink/renderer/platform/graphics/image_data_buffer.cc
-@@ -35,6 +35,8 @@
- #include <memory>
+@@ -36,6 +36,8 @@
 
+ #include "base/compiler_specific.h"
 #include "base/memory/ptr_util.h"
 +#include "base/rand_util.h"
 +#include "base/logging.h"
 #include "third_party/blink/renderer/platform/graphics/static_bitmap_image.h"
 #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -127,6 +129,11 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
+@@ -130,6 +132,11 @@ bool ImageDataBuffer::EncodeImageInternal(const ImageEncodingMimeType mime_type,
                                           const SkPixmap& pixmap) const {
   DCHECK(is_valid_);
 
@@ -454,12 +432,11 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 #include "base/numerics/checked_math.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h"
-@@ -11,12 +13,14 @@
+@@ -11,11 +13,13 @@
 #include "third_party/blink/renderer/platform/graphics/image_observer.h"
 #include "third_party/blink/renderer/platform/graphics/paint/paint_image.h"
 #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
 +#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- #include "third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ -469,16 +446,15 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 #include "v8/include/v8.h"
 
 namespace blink {
-@@ -154,10 +158,165 @@ bool StaticBitmapImage::ConvertToArrayBufferContents(
+@@ -128,7 +132,162 @@ bool StaticBitmapImage::CopyToByteArray(
   DCHECK(read_pixels_successful ||
          !sk_image->bounds().intersect(SkIRect::MakeXYWH(
              rect.X(), rect.Y(), info.width(), info.height())));
 +
-+  if (RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
-+    ShuffleSubchannelColorData(result.Data(), info, rect.X(), rect.Y());
+  if (read_pixels_successful && RuntimeEnabledFeatures::FingerprintingCanvasImageDataNoiseEnabled()) {
+    ShuffleSubchannelColorData(dst.data(), info, rect.X(), rect.Y());
 +  }
 +
-   result.Transfer(dest_contents);
   return true;
 }
 
@@ -632,15 +608,13 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc
 +#undef writable_addr
 +#undef shuffleComponent
 +
- const gpu::SyncToken& StaticBitmapImage::GetSyncToken() const {
-   static const gpu::SyncToken sync_token;
-   return sync_token;
+ }  // namespace blink
 diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
-@@ -46,6 +46,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
-   static scoped_refptr<StaticBitmapImage> Create(WTF::ArrayBufferContents&,
-                                                  const SkImageInfo&);
+@@ -34,6 +34,8 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image {
+ 
+   StaticBitmapImage(ImageOrientation orientation) : orientation_(orientation) {}
 
 +  static void ShuffleSubchannelColorData(const void *addr, const SkImageInfo& info, int srcX, int srcY);
 +
@@ -650,9 +624,9 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -677,6 +677,15 @@
-       name: "FileSystem",
-       status: "stable",
+@@ -728,6 +728,15 @@
+       name: "FetchMetadataDestination",
+       status: "experimental"
     },
 +    {
 +      name: "FingerprintingClientRectsNoise",
@@ -663,9 +637,9 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +    {
 +      name: "FingerprintingCanvasImageDataNoise",
 +    },
-     // FirstContentfulPaintPlusPlus enables the Largest Text Paint metric, Last
-     // Text Paint metric, Largest Image Paint metric and Last Image Paint
-     // metric. See also: http://bit.ly/fcp_plus_plus
+     {
+       name: "FileHandling",
+       // NativeFileSystem is in Origin Trial, which doesn't support having
 diff --git a/third_party/ungoogled/BUILD.gn b/third_party/ungoogled/BUILD.gn
 new file mode 100644
 --- /dev/null
@@ -728,5 +702,5 @@ new file mode 100644
 +
 +#endif  // THIRD_PARTY_UNGOOGLED_FINGERPRINTING_SWITCHES_H_
 -- 
-2.11.0
+2.17.1

@@ -9,12 +9,12 @@ 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
-@@ -283,6 +283,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
+@@ -275,6 +275,12 @@ bool PopularSitesImpl::MaybeStartFetch(bool force_download,
   DCHECK(!callback_);
-   callback_ = callback;
+   callback_ = std::move(callback);
 
 +  if (force_download) {
-+    callback_.Run(true);
+    std::move(callback_).Run(true);
 +    return true;
 +  }
 +  return false;
@@ -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.11.0
+2.17.1

@@ -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
-@@ -125,6 +125,9 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -124,6 +124,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.11.0
+2.17.1

@@ -3,21 +3,21 @@ 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 ++
+ .../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>
+@@ -229,6 +229,8 @@ std::vector<base::string16> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
+ 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::kChromeUIFlagsURL));
+   builtins_to_provide.push_back(
       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
 #if !defined(OS_ANDROID)
-   builtins_to_provide.push_back(
 -- 
-2.11.0
+2.17.1

@@ -3,26 +3,34 @@ Date: Thu, 11 Jan 2018 13:27:34 +0200
 Subject: Open YouTube links in Bromite

 ---
- .../chrome/browser/externalnav/ExternalNavigationHandler.java      | 7 +++++++
- 1 file changed, 7 insertions(+)
+ .../browser/externalnav/ExternalNavigationHandler.java    | 8 ++++++++
+ 1 file changed, 8 insertions(+)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
-@@ -402,6 +402,13 @@ public class ExternalNavigationHandler {
+@@ -440,6 +440,7 @@ public class ExternalNavigationHandler {
+                         Uri.parse(WebView.SCHEME_TEL
+                                 + params.getUrl().substring(WTAI_MC_URL_PREFIX.length()))),
+                 false);
+
+         if (DEBUG) Log.i(TAG, "wtai:// link handled");
+         RecordUserAction.record("Android.PhoneIntent");
+         return true;
+@@ -804,6 +805,13 @@ public class ExternalNavigationHandler {
+             return OverrideUrlLoadingResult.OVERRIDE_WITH_ASYNC_ACTION;
         }
 
-         // 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();
+        // force to open YouTube urls in Bromite
+        String intentPackageName = targetIntent.getPackage();
 +        if (intentPackageName != null && intentPackageName.equals("com.google.android.youtube")) {
 +            if (DEBUG) Log.i(TAG, "NO_OVERRIDE: YouTube URL for YouTube app");
 +            return OverrideUrlLoadingResult.NO_OVERRIDE;
 +        }
 +
-         if (CommandLine.getInstance().hasSwitch(
-                 ChromeSwitches.DISABLE_EXTERNAL_INTENT_REQUESTS)) {
-             Log.w(TAG, "External intent handling is disabled by a command-line flag.");
+         // This should come after file intents, but before any returns of
+         // OVERRIDE_WITH_EXTERNAL_INTENT.
+         if (externalIntentRequestsDisabled()) return OverrideUrlLoadingResult.NO_OVERRIDE;
 -- 
-2.11.0
+2.17.1

@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 2 Apr 2018 11:36:02 +0200
-Subject: Punt the Widevine version string
-
-Originally from http://bazaar.launchpad.net/~saiarcot895/chromium-browser/chromium-browser.wily.beta/view/head:/debian/patches/fix_building_widevinecdm_with_chromium.patch
---
- chrome/common/chrome_content_client.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
--- a/chrome/common/chrome_content_client.cc
-+++ b/chrome/common/chrome_content_client.cc
-@@ -517,7 +517,7 @@ void ChromeContentClient::AddContentDecryptionModules(
-     base::FilePath cdm_path;
-     content::CdmCapability capability;
-     if (IsWidevineAvailable(&cdm_path, &capability)) {
-      const base::Version version(WIDEVINE_CDM_VERSION_STRING);
-+      const base::Version version("1.0.123.456");
-       DCHECK(version.IsValid());
- 
-       cdms->push_back(
-- 
-2.11.0
-
@@ -0,0 +1,92 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 28 Apr 2018 08:30:26 +0200
+Subject: Reduce HTTP headers in DoH requests to bare minimum
+
+---
+ net/base/load_flags_list.h              |  9 +++++++++
+ net/dns/dns_transaction.cc              |  1 +
+ net/url_request/url_request_http_job.cc | 16 +++++++++++-----
+ 3 files changed, 21 insertions(+), 5 deletions(-)
+
+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
+@@ -112,3 +112,12 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17)
+ // is considered privileged, and therefore this flag must only be set from a
+ // trusted process.
+ LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 18)
+
+
+
+
+// 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 << 19)
+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
+@@ -405,6 +405,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_IGNORE_LIMITS | LOAD_MINIMAL_HEADERS |
+                            LOAD_DISABLE_CERT_NETWORK_FETCHES);
+     request_->set_allow_credentials(false);
+   }
+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
+@@ -278,6 +278,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()) {
+@@ -293,11 +294,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();
+@@ -510,10 +514,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;
+          }
+         }
+       }
+ 
+@@ -531,7 +537,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.17.1
+
@@ -97,5 +97,5 @@ diff --git a/net/cert/ev_root_ca_metadata.h b/net/cert/ev_root_ca_metadata.h
 
   // RegisterOID registers |policy|, a policy OID in dotted string form, and
 -- 
-2.11.0
+2.17.1

@@ -3,102 +3,124 @@ Date: Sun, 3 Nov 2019 08:22:29 +0100
 Subject: Remove SMS integration

 ---
- content/public/android/BUILD.gn                    |  2 -
- .../org/chromium/content/browser/sms/Wrappers.java | 74 ----------------------
- 2 files changed, 76 deletions(-)
- delete mode 100644 content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
+ .../content/browser/sms/SmsReceiver.java      | 30 +++----------------
+ .../content/browser/sms/Wrappers.java         | 11 +------
+ 2 files changed, 5 insertions(+), 36 deletions(-)

-diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
--- a/content/public/android/BUILD.gn
-+++ b/content/public/android/BUILD.gn
-@@ -231,8 +231,6 @@ android_library("content_java") {
-     "java/src/org/chromium/content/browser/selection/SmartSelectionClient.java",
-     "java/src/org/chromium/content/browser/selection/SmartSelectionMetricsLogger.java",
-     "java/src/org/chromium/content/browser/selection/SmartSelectionProvider.java",
-    "java/src/org/chromium/content/browser/sms/SmsReceiver.java",
-    "java/src/org/chromium/content/browser/sms/Wrappers.java",
-     "java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java",
-     "java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java",
-     "java/src/org/chromium/content/common/ContentSwitchUtils.java",
+diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java b/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
+--- a/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
+++ b/content/public/android/java/src/org/chromium/content/browser/sms/SmsReceiver.java
+@@ -11,11 +11,6 @@ import android.content.IntentFilter;
+ 
+ import androidx.annotation.VisibleForTesting;
+ 
+-import com.google.android.gms.auth.api.phone.SmsRetriever;
+-import com.google.android.gms.common.api.CommonStatusCodes;
+-import com.google.android.gms.common.api.Status;
+-import com.google.android.gms.tasks.Task;
+-
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.annotations.CalledByNative;
+@@ -42,18 +37,6 @@ public class SmsReceiver extends BroadcastReceiver {
+         mSmsProviderAndroid = smsProviderAndroid;
+ 
+         mContext = new Wrappers.SmsReceiverContext(ContextUtils.getApplicationContext());
+-
+-        // A broadcast receiver is registered upon the creation of this class
+-        // which happens when the SMS Retriever API is used for the first time
+-        // since chrome last restarted (which, on android, happens frequently).
+-        // The broadcast receiver is fairly lightweight (e.g. it responds
+-        // quickly without much computation).
+-        // If this broadcast receiver becomes more heavyweight, we should make
+-        // this registration expire after the SMS message is received.
+-        if (DEBUG) Log.d(TAG, "Registering intent filters.");
+-        IntentFilter filter = new IntentFilter();
+-        filter.addAction(SmsRetriever.SMS_RETRIEVED_ACTION);
+-        mContext.registerReceiver(this, filter);
+     }
+ 
+     @CalledByNative
+@@ -66,7 +49,6 @@ public class SmsReceiver extends BroadcastReceiver {
+     private void destroy() {
+         if (DEBUG) Log.d(TAG, "Destroying SmsReceiver.");
+         mDestroyed = true;
+-        mContext.unregisterReceiver(this);
+     }
+ 
+     @Override
+@@ -77,7 +59,7 @@ public class SmsReceiver extends BroadcastReceiver {
+             return;
+         }
+ 
+-        if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
+/*        if (!SmsRetriever.SMS_RETRIEVED_ACTION.equals(intent.getAction())) {
+             return;
+         }
+ 
+@@ -104,22 +86,18 @@ public class SmsReceiver extends BroadcastReceiver {
+                 if (DEBUG) Log.d(TAG, "Timeout");
+                 SmsReceiverJni.get().onTimeout(mSmsProviderAndroid);
+                 break;
+-        }
+        } */
+     }
+ 
+     @CalledByNative
+     private void listen() {
+-        Wrappers.SmsRetrieverClientWrapper client = getClient();
+-        Task<Void> task = client.startSmsRetriever();
+-
+-        if (DEBUG) Log.d(TAG, "Installed task");
+     }
+ 
+     private Wrappers.SmsRetrieverClientWrapper getClient() {
+-        if (mClient != null) {
+/*        if (mClient != null) {
+             return mClient;
+         }
+-        mClient = new Wrappers.SmsRetrieverClientWrapper(SmsRetriever.getClient(mContext));
+        mClient = new Wrappers.SmsRetrieverClientWrapper(SmsRetriever.getClient(mContext)); */
+         return mClient;
+     }
+ 
 diff --git a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
-deleted file mode 100644
 --- a/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
-+++ /dev/null
-@@ -1,74 +0,0 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.content.browser.sms;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-
+++ b/content/public/android/java/src/org/chromium/content/browser/sms/Wrappers.java
+@@ -10,9 +10,6 @@ import android.content.ContextWrapper;
+ import android.content.Intent;
+ import android.content.IntentFilter;
+ 
 -import com.google.android.gms.auth.api.phone.SmsRetrieverClient;
 -import com.google.android.gms.tasks.Task;
 -
-class Wrappers {
-    // Prevent instantiation.
-    private Wrappers() {}
-
-    /**
-     * Wraps com.google.android.gms.auth.api.phone.SmsRetrieverClient.
-     */
-    static class SmsRetrieverClientWrapper {
+ class Wrappers {
+     // Prevent instantiation.
+     private Wrappers() {}
+@@ -21,11 +18,9 @@ class Wrappers {
+      * Wraps com.google.android.gms.auth.api.phone.SmsRetrieverClient.
+      */
+     static class SmsRetrieverClientWrapper {
 -        private final SmsRetrieverClient mSmsRetrieverClient;
-        private SmsReceiverContext mContext;
-
+         private SmsReceiverContext mContext;
+ 
 -        public SmsRetrieverClientWrapper(SmsRetrieverClient smsRetrieverClient) {
 -            mSmsRetrieverClient = smsRetrieverClient;
-        }
-
-        public void setContext(SmsReceiverContext context) {
-            mContext = context;
-        }
-
-        public SmsReceiverContext getContext() {
-            return mContext;
-        }
+        public SmsRetrieverClientWrapper() {
+         }
+ 
+         public void setContext(SmsReceiverContext context) {
+@@ -35,10 +30,6 @@ class Wrappers {
+         public SmsReceiverContext getContext() {
+             return mContext;
+         }
 -
 -        public Task<Void> startSmsRetriever() {
 -            return mSmsRetrieverClient.startSmsRetriever();
 -        }
-    }
-
-    /**
-     * Extends android.content.ContextWrapper to store and retrieve the
-     * registered BroadcastReceiver.
-     */
-    static class SmsReceiverContext extends ContextWrapper {
-        private BroadcastReceiver mReceiver;
-
-        public SmsReceiverContext(Context context) {
-            super(context);
-        }
-
-        public BroadcastReceiver getRegisteredReceiver() {
-            return mReceiver;
-        }
-
-        // ---------------------------------------------------------------------
-        // Context overrides:
-
-        @Override
-        public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
-            mReceiver = receiver;
-            return super.registerReceiver(receiver, filter);
-        }
-
-        @Override
-        public void unregisterReceiver(BroadcastReceiver receiver) {
-            mReceiver = null;
-            super.unregisterReceiver(receiver);
-        }
-    }
-}
+     }
+ 
+     /**
 -- 
-2.11.0
+2.17.1

@@ -1,46 +0,0 @@
-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
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
csagan5	a6ca6a5cee	Release 81.0.4044.63	2020-03-13 18:52:40 +01:00
csagan5	7c25daa521	Mention when AdGuard filters were removed	2020-03-09 18:42:38 +01:00
csagan5	f5275180b4	Add question about PWAs WebAPK support	2020-03-07 08:47:32 +01:00
csagan5	e7d8daac10	Update donation address	2020-02-27 23:34:45 +01:00
csagan5	7c6ba84acd	Release 80.0.3987.118	2020-02-22 14:33:41 +01:00
csagan5	8d85bfa7d0	Release 80.0.3987.109	2020-02-18 07:50:35 +01:00
csagan5	152903d847	Mention wiki	2020-02-16 18:25:58 +01:00
csagan5	4fad3bf5bc	Update patch description	2020-02-15 09:27:21 +01:00
CarlandGitHub	1cc0dfb1ff	Merge pull request #491 from bromite/v80/AImageReader-bugfix Bugfix for AImageReader crash on Android10/arm64	2020-02-15 09:20:28 +01:00
csagan5	0d00af6e73	Bugfix for AImageReader crash on Android10/arm64 #445	2020-02-15 08:55:35 +01:00
csagan5	b902ec74ad	Release 80.0.3987.95	2020-02-14 07:46:11 +01:00
csagan5	e9ba098f8e	Update README regarding frozen user agent	2020-02-14 00:00:42 +01:00
CarlandGitHub	410fc50a21	Updated patches for v80 (#482 ) * Updated patches for v80 * Fix arm64 build of openH264 * Fix linking error * Update other patches too * Fix remaining crashes	2020-02-07 07:52:41 +01:00
csagan5	24320da307	Split FAQ into own file	2020-01-31 11:20:13 +01:00
csagan5	8d85b59eac	Mention that Push API does not work due to GCM Thanks to @randomshell for looking into it. Fixes #474	2020-01-29 09:51:35 +01:00
csagan5	00411eb209	Release 79.0.3945.139	2020-01-26 18:15:04 +01:00
csagan5	a56884e75e	Explain how DRM works in Bromite	2020-01-24 10:02:21 +01:00
CarlandGitHub	1f363eba23	Mention enable-search-ready-omnibox flag Fixes #469	2020-01-18 21:22:39 +07:00
csagan5	6f5d36bc5c	Various improvements after proofreading	2020-01-17 22:22:16 +01:00
csagan5	a500255598	Release 79.0.3945.123	2020-01-11 17:11:14 +01:00
csagan5	af8378b675	Updated FAQs and features list	2020-01-08 03:02:57 +01:00
csagan5	3c916480b2	Document patch about video decode acceleration	2020-01-08 02:18:38 +01:00
csagan5	dbf32840c6	Release 79.0.3945.111	2020-01-08 02:14:39 +01:00
csagan5	4b8e47060b	Update features list	2020-01-06 09:44:32 +01:00
csagan5	43bf98a956	Remove entry about bug not yet fixed	2019-12-31 18:15:28 +01:00
csagan5	b94b80e096	Release 79.0.3945.107	2019-12-31 18:07:47 +01:00
csagan5	52202a3ffb	Release 79.0.3945.100	2019-12-27 16:08:41 +01:00
CarlandGitHub	4e5c7c36a1	Merge pull request #447 from bromite/v79/bugfixes Bugfixes to build vanilla Chromium	2019-12-27 16:05:39 +01:00
csagan5	d1fb4d4974	Updated patches for next v79 release	2019-12-27 16:05:14 +01:00
csagan5	edaf4c0f17	Fixes for unified consent and feed build issues	2019-12-23 02:28:56 +01:00
csagan5	4a9cbe673d	Bugfixes to build vanilla Chromium	2019-12-21 10:03:09 +01:00
csagan5	6340bb4398	Remove duplicate symbols in GN_ARGS	2019-12-20 08:43:56 +01:00
csagan5	ba0e1dc920	Release 79.0.3945.94	2019-12-20 07:58:59 +01:00
CarlandGitHub	c8e8919714	Updated patches for v79 (#440 ) * Updated patches for v79 Remaining issue: * blank tabs when running on x86 emulators Waiting on upstream to fix that. The other upstream storage bug (https://bugs.chromium.org/p/chromium/issues/detail?id=1033655) is fixed in this version.	2019-12-19 23:55:40 +01:00
csagan5	4902cfb5d5	Remove mention of original nochromo patch, no more used	2019-12-15 11:18:30 +01:00