[wip] enable android backup

Add missing issue fixed in CHANGELOG
Release 94.0.4606.102
2021-10-21 09:09:56 +02:00 · 2021-10-21 00:03:46 +02:00 · 2021-10-20 23:58:39 +02:00 · 2021-10-20 21:59:24 +02:00 · 2021-10-20 21:56:34 +02:00 · 2021-10-20 01:34:25 +02:00
215 changed files with 51410 additions and 260759 deletions
@@ -4,47 +4,86 @@ about: Create a Bromite bug report

 ---

+<!-- Welcome! Thanks for taking time to submit a bug report.
+Have you read the README? https://github.com/bromite/bromite/blob/master/README.md
+Have you searched the issue tracker? https://github.com/bromite/bromite/issues
+Are you sure this is not a Chromium bug? You have to test with Chromium before submitting a bug.
+Are you using the latest version of Bromite?
+
+If instead of a bug report you want to ask a question then please use the GitHub Discussions: https://github.com/bromite/bromite/discussions
+-->
+
 ### Bromite version

-Version: `76.0...`
+Version: `89.0...`
 Arch: `arm` or `arm64` or `x86`
 Android version: (example: `9.0`)
 Device model: (example: `SM-G960UZKABST`)

-### Is this bug about the SystemWebView?
-Yes/No
+### Flags

-No support for SystemWebView installations is provided.
+These are the flags changed under `chrome://flags`:
+
+<!-- Report all the blue-highlighted flags here, those are the flags with non-default configuration -->
+
+### Is this bug about the SystemWebView?
+
+<!-- No support for SystemWebView installations is provided. -->
+
+Yes/No

 ### Is the bug reproducible with latest version?

-Do not report bugs which are not reproducible with latest version
+<!-- Do not report bugs which are not reproducible with latest version. -->
+
+Yes/No

 ### Can the bug be reproduced with corresponding Chromium version?

+<!--
 Please pick the same version of Chromium as Bromite from here: https://github.com/bromite/chromium/releases
 If the bug is reproducible then it might be a configuration issue or an upstream bug. Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.

+If the bug is related to functionality that does not exist in Chromium then answer "No".
+-->
+
+Yes/No
+
+### Is this bug happening in an incognito tab?
+Yes/No
+
+### Allow ads for the site; is the bug caused by the adblocker?
+Yes/No
+
 ### Is the bug a crash?

-If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
+No
+
+-- or --
+
+Yes, this is the crash dump:
+```
+<paste here logcat dump individuated with 'adb logcat | grep chromium'>
+```

 ### Describe the bug

-Write here a clear and concise description of the bug.
+<!-- Write here a clear and concise description of the bug. -->

 ### Steps to reproduce the bug

-Steps to reproduce the behavior:
+Steps to reproduce the bug:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error

+Do not write "any website", specify which URLs can be used to reproduce the issue.
+
 ### Expected behavior

-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->

 ### Screenshots

-If applicable, add screenshots to help explain your problem. Otherwise remove this section.
+<!-- If applicable, add screenshots to help explain your problem. Otherwise remove this section. -->
@@ -4,20 +4,32 @@ about: Suggest a privacy-related idea for this project

 ---

+<!-- Welcome! Thanks for taking time to submit a feature request.
+Have you searched the issue tracker? https://github.com/bromite/bromite/issues
+Have you read the F.A.Q.s? https://github.com/bromite/bromite/blob/master/FAQ.md
+Have you read the README? https://github.com/bromite/bromite/blob/master/README.md
+Have you read the Wiki? https://github.com/bromite/bromite/wiki
+
+If instead of a feature request you want to ask a question then please use the GitHub Discussions: https://github.com/bromite/bromite/discussions
+
+-->
+
+<!-- Do not submit feature requests for extensions support or adding a search engine. -->
+
 ### Is your feature request related to privacy?

-Features that are not related to privacy are unlikely to be considered.
+<!-- Features that are not related to privacy are not considered. -->

 ### Is there a patch available for this feature somewhere?

-If yes then provide URL and license information.
+<!-- If yes then provide URL and license information. -->

 ### Describe the solution you would like

-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen.

-Do not ask "I would like feature X which is available in browser Y"; such issues are closed immediately.
+Do not ask "I would like feature X which is available in browser Y"; such issues are closed immediately. -->

 ### Describe alternatives you have considered

-A clear and concise description of any alternative solutions or features you have considered.
+<!-- A clear and concise description of any alternative solutions or features you have considered. -->
@@ -1,3 +1,354 @@
+# 94.0.4606.102
+* add flag to disable pull-to-refresh effect
+* add recents, offlinepage and send to home screen for always incognito (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1182 and https://github.com/bromite/bromite/issues/1362)
+* prompt to restart when always-incognito is enabled (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1474)
+* merge patches for custom tab intents
+
+# 94.0.4606.94
+* Bromite auto-update feature, disabled by default (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/706)
+* add site setting for images (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1339)
+* use SM-G960U as model provided via client hints and Javascript
+* drop patches already merged upstream
+
+# 93.0.4577.110
+
+* set enable_reporting to false (thanks to @nikolowry)
+* backported patches for security issues https://crbug.com/1245578 and https://crbug.com/1251787
+* disable AGSA by default
+* disable UA client hint for model
+* disable lock icon in address bar by default
+* enable share intent (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1062)
+* allow forcing external links to open in incognito (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/728)
+* avoid double restart for default tab groups flags status
+
+# 93.0.4577.83
+* dropped patch for FLoC (already disabled by upstream)
+* dropped patch for build with system sysroots
+* disable tab groups by default (needs restart)
+* added 'services/network/public/mojom' to ad blocker patch to avoid a build error
+
+# 92.0.4515.176
+* use upstream feature to prevent default search engine permissions grants
+* slightly improve error message for gateway attacks prevention error
+
+# 92.0.4515.134
+
+# 92.0.4515.125
+* replace patch for missing API keys warning
+* fix subresource filter not working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1299)
+
+# 92.0.4515.103
+* disable User Agent client hints
+* fix builds with system sysroots
+* force text/x-suse-ymp to be downloaded
+
+# 91.0.4472.158
+* added x64 releases
+
+# 91.0.4472.146
+* removed flags for device motion/orientation (fixes https://github.com/bromite/bromite/issues/1204)
+* prevent crash on download on API level 21 (fixes https://github.com/bromite/bromite/issues/1184)
+* fix crash reporting garbled UI for small screens (thanks to @uazo, https://github.com/bromite/bromite/pull/1236)
+* add flag to enable/disable vibration API (fixes https://github.com/bromite/bromite/issues/1045)
+
+# 91.0.4472.143
+* add support for ISupportHelpAndFeedback
+* JIT-less toggle (fixes https://github.com/bromite/bromite/issues/1235)
+* enable crash reporting UI (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/944)
+
+# 91.0.4472.102
+* fix opening new tabs from links in always-incognito mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1154)
+
+# 91.0.4472.97
+* add flag for omnibox autocomplete filtering (fixes https://github.com/bromite/bromite/issues/1152)
+* enable IntentBlockExternalFormRedirectsNoGesture by default
+* add flag to disable external intent requests
+* fix for tab collection temporary/non-exportable (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1138)
+
+# 91.0.4472.50
+* unexpire tab group flags `#enable-tab-groups` and `#enable-tab-groups-ui-improvements`
+* replace known good hostname used for DoH test (fixes https://github.com/bromite/bromite/issues/1148)
+* drop patch to disable preview fetching
+* drop patch to restore horizontal tab switcher
+
+# 90.0.4430.204
+* fix for custom tab intent tab crashes when in always incognito mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1116)
+
+# 90.0.4430.101
+* disable RTCGetCurrentBrowsingContextMedia by default
+* disable FLoC by default
+
+# 90.0.4430.92
+* restore horizontal tab switcher feature (fixes https://github.com/bromite/bromite/issues/1077)
+* fix a couple of bugs in proxy saving UI (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1072)
+* disable feeds V2 toggle (fixes https://github.com/bromite/bromite/issues/1070)
+* allow fetching field trials from flags (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1021)
+* add AllowUserCertificates flag (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/921)
+* add IsCleartextPermitted flag (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1068)
+
+# 90.0.4430.74
+* re-added patch for User agent customization (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1049)
+* fix always-incognito custom tab intents issues (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1047 and https://github.com/bromite/bromite/issues/1051)
+* prevent Omnibox URL elisions by default
+
+# 90.0.4430.59
+* fix menu items not properly displayed with tab overflow menu regroup (fixes https://github.com/bromite/bromite/issues/963)
+* fix text displayed for menu entry to bookmark all tabs
+* bookmarks import/export: disable SAF by default (fixes https://github.com/bromite/bromite/issues/1039)
+* disable offline measurement background task
+* dropped patch to show warnings for TSLv1.0/v1.1 connections (upstream now disallows them)
+* disable AImageReader by default on Android 9 and below for Qualcomm (fixes https://github.com/bromite/bromite/issues/1005)
+
+# 89.0.4389.117
+* disable AImageReader by default on Android 9 and below for ARM (fixes https://github.com/bromite/bromite/issues/1005)
+* log checksum of AdBlock filters
+
+# 89.0.4389.100
+* enable AImageReader by default (fixes https://github.com/bromite/bromite/issues/1005)
+* fix missing flag for AImageReader
+* move incognito snapshots flag to proper section (fixes https://github.com/bromite/bromite/issues/1006)
+* add missing icon for exit menu
+* implement SAF for bookmarks export functionality (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/831)
+
+# 89.0.4389.92
+* updated zh_CN translations (thanks to @zhmars, https://github.com/bromite/bromite/pull/1000)
+* introduce Alt+D hotkey to focus address bar (fixes https://github.com/bromite/bromite/issues/979)
+* use 64-bit ABI for webview processes (fixes https://github.com/bromite/bromite/issues/997)
+* use dedicated folder for bookmark all tabs
+* fix Javascript and cookies permissions missing (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/990)
+* fix missing enable save data header flag (fixes https://github.com/bromite/bromite/issues/989)
+* fix menu items not properly displayed with tab overflow menu regroup (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/963)
+
+# 89.0.4389.78
+* make all favicon requests on-demand
+* restored older icon for view source menu item
+* prevent adblock filters update check on app start (fixes https://github.com/bromite/bromite/issues/967)
+* removed UI for adblock filters (fixes https://github.com/bromite/bromite/issues/941)
+* dropped patch for swapped favicons bug
+* dropped patch to enable reduced-referrer-granularity by default (already present upstream)
+* dropped password reuse detection patch
+* dropped UA customization patch
+* enabled PartitionExpectCTStateByNetworkIsolationKey and PartitionDomainReliabilityByNetworkIsolationKey (fixes https://github.com/bromite/bromite/issues/985)
+
+# 88.0.4324.207
+* add flag for save-data-header
+* add option to force tablet UI
+* fix bug with adblock filters not being downloaded correctly (fixes https://github.com/bromite/bromite/issues/960)
+* move up bookmark all tabs menu item (fixes https://github.com/bromite/bromite/issues/943)
+* fix icons for exit and view source menu items
+
+# 88.0.4324.187
+* fix exit menu item not working in tablet mode
+* add menu item to bookmark all tabs (fixes https://github.com/bromite/bromite/issues/570)
+* enable app overflow menu icons by default
+* UI for adblock filters (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/811)
+* dropped patch to not permit user-installed certificates
+* ignore enterprise policies for secure DNS (fixes https://github.com/bromite/bromite/issues/832)
+
+# 88.0.4324.185
+* fix favicons fallback search (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/788)
+* fix potential DIAL crash when network state changes (thanks to @Ahrotahn)
+* fix crash when opening links in incognito-only mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/899)
+* disallow empty custom user agent (thanks to @uazo)
+
+# 88.0.4324.149
+* fix proxy PAC URL option not working (fixes https://github.com/bromite/bromite/issues/908)
+* store proxy configuration in LocalState instead of Profile (thanks to @uazo)
+* fix toggle for reversing the meaning of bypass rules (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/884)
+* do not permit user-installed certificates
+
+# 88.0.4324.141
+* fix bookmarks not opening (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/891)
+* fix proxy page not loading (fixes https://github.com/bromite/bromite/issues/890)
+
+# 88.0.4324.95
+* fix broken recent tabs behaviour (fixes https://github.com/bromite/bromite/issues/886)
+* re-introduce flags for number of raster threads (fixes https://github.com/bromite/bromite/issues/875)
+* avoid initializing histogram data for the WebView (https://github.com/bromite/bromite/issues/873)
+* dropped patch for manifest changes for Q/R (already present upstream)
+* fix check for HTML extension in bookmark import dialog
+
+# 87.0.4280.131
+* enable all network isolation features (fixes https://github.com/bromite/bromite/issues/836)
+* disable unified autoplay feature (fixes https://github.com/bromite/bromite/issues/804)
+
+# 87.0.4280.106
+* enable SplitCacheByNetworkIsolationKey (fixes https://github.com/bromite/bromite/issues/836)
+* fix random timezone option (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/828)
+* disable autofill server communication by default
+* ask permission to play protected media by default
+* disable SystemWebView variations support
+
+# 87.0.4280.81
+* fix text fragment not disabled by default, unexpire flag (fixes https://github.com/bromite/bromite/issues/803)
+* turn AImageReader off by default on ARM64 (fixes https://github.com/bromite/bromite/issues/814)
+* fix issue with global autoplay settings (thanks to @uazo, https://github.com/bromite/bromite/pull/825)
+* fix issues with user agent customization (thanks to @uazo, https://github.com/bromite/bromite/pull/823)
+* updated zh_CN translations (thanks to @zhmars, https://github.com/bromite/bromite/pull/821)
+
+# 87.0.4280.68
+* user agent customization (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/798)
+* fix for intent handling for local apps on Android 11 (https://github.com/bromite/bromite/pull/816)
+
+# 87.0.4280.67
+
+# 86.0.4240.194
+* fix native pages displaying incorrectly with the sticky desktop mode (thanks to @uazo)
+* re-introduce simplified NTP (fixes https://github.com/bromite/bromite/issues/701)
+* re-introduce site settings to block autoplay (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/791)
+* fix Omnibox flag not working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/789)
+
+# 86.0.4240.181
+* allow sticky desktop mode for all tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/780)
+
+# 86.0.4240.112
+* fix crash in new overflow menu (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/771)
+
+# 86.0.4240.99
+
+# 86.0.4240.92
+* upstream fix for video playback audio issue (fixes https://github.com/bromite/bromite/issues/755)
+* fix order of entries in privacy settings (fixes https://github.com/bromite/bromite/issues/758)
+ 
+# 86.0.4240.73
+* re-introduce ARM64 AImageReader mitigations (fixes https://github.com/bromite/bromite/issues/766)
+* re-introduce menu items for autocomplete, autofill assistant and contextual search (fixes https://github.com/bromite/bromite/issues/763)
+
+# 86.0.4240.70
+* fixed crash on unused menu item tap (fixes https://github.com/bromite/bromite/issues/760)
+* fixed issue on new installations without DoH configuration (fixes https://github.com/bromite/bromite/issues/761)
+
+# 86.0.4240.66
+* switch to upstream UI for DoH URL customization
+* remove weblayer dependency on Play Services
+* build fixes for password service
+* removed obsolete patch to kill Translate
+* removed patch to revert unified consent code
+* removed patch for dav1d library
+* removed patch for improved cookie controls defaults
+* removed patches for ARM64 AImageReader issues
+
+# 85.0.4183.114
+
+# 85.0.4183.110
+* hardening against incognito mode detection
+* fix background playback issue (fixes https://github.com/bromite/bromite/issues/734)
+
+# 85.0.4183.94
+* disable the DIAL repeating discovery
+* removed patch for session-only cookies support
+* add timezone customization patch (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/331)
+* fixed bug happening when configuring proxies in incognito mode (thanks to @uazo)
+
+# 85.0.4183.86
+* fix LocationBarPhone app crash at startup (fixes https://github.com/bromite/bromite/issues/565)
+
+# 85.0.4183.84
+* fix crash in About page (fixes https://github.com/bromite/bromite/issues/710)
+* fix adding more than one proxy (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/679)
+* fix system proxy configuration (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/377)
+
+# 85.0.4183.82
+* fixes bookmark button not working with always-incognito (fixes https://github.com/bromite/bromite/issues/654)
+* disable scroll-to-text-fragment
+* remove NTP blocklisted URLs when adding an URL as bookmark
+* removed duet flags
+* unexpire `#darken-websites-checkbox-in-themes-setting` flag
+* rollback dav1d upgrade which breaks x86
+
+# 84.0.4147.132
+* fix exit menu item not always working (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/673)
+* session-only cookies site settings option (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/142)
+* add setting to enable history on incognito mode (thanks to @uazo)
+* removed old non-working site settings patches
+
+# 84.0.4147.121
+* removed Qwant search engine
+* fixed zh_CN translations
+* added patch to not embed non-free unrar library (fixes https://github.com/bromite/bromite/issues/674)
+* enable improved cookie controls by default
+
+# 84.0.4147.119
+* update zh_CN translations
+* disable CORS RFC1918 (fixes https://github.com/bromite/bromite/issues/664)
+* restore duet flags (fixes https://github.com/bromite/bromite/issues/667)
+
+# 84.0.4147.113
+* block gateway attacks via websockets (fixes https://github.com/bromite/bromite/issues/590)
+* enable prefetch-privacy-changes by default (fixes https://github.com/bromite/bromite/issues/659)
+* enable reduced-referrer-granularity by default (fixes https://github.com/bromite/bromite/issues/659)
+
+# 84.0.4147.106
+* fixed bug with Javascript site settings not showing
+* add exit menu item to overview menu (fixes https://github.com/bromite/bromite/issues/619)
+
+# 84.0.4147.95
+* show warnings for TLSv1.0/TLSv1.1 connections (fixes https://github.com/bromite/bromite/issues/645)
+* fix bug with unconfigured DoH (fixes https://github.com/bromite/bromite/issues/646)
+
+# 84.0.4147.90
+* added menu item to view source of current page
+* fixed dialog for SSL/TLS errors (fixes https://github.com/bromite/bromite/issues/638)
+* build with feeds support due to upstream build flags combination bugs
+
+# 83.0.4103.119
+* restored non-CFI builds for x86
+
+# 83.0.4103.101
+* enable HEVC and Dolby Vision
+
+# 83.0.4103.93
+* fix undesired replacement for search engines (fixes https://github.com/bromite/bromite/issues/595)
+* fix resume flag not visible
+
+# 83.0.4103.76
+* fixed inverted Omnibox flag
+* fixed LocationBarPhone/LocationBarTablet crash (fixes https://github.com/bromite/bromite/issues/565)
+
+# 83.0.4103.53
+* updated zh_CN translations
+* mitigation for LocationBarPhone crash (https://github.com/bromite/bromite/issues/565)
+
+# 83.0.4103.46
+* add zh_CN missing translations (fixes https://github.com/bromite/bromite/issues/546)
+* change default mode for WebRTC (fixes https://github.com/bromite/bromite/issues/553)
+* add flag to allow screenshots of incognito tabs (fixes https://github.com/bromite/bromite/issues/551)
+* reintroduced patches for disabling AImageReader
+* fixed DevTools issue with domain substitution (fixes https://github.com/bromite/bromite/issues/526)
+* drop patch to disable QUIC by default
+* drop patch for DoH minimum timeout (upstream also implemented it)
+* dropped patch for removal of support of CCT dynamic modules (upstream also removed it)
+* removed upstream patch for SD card not found issue (upstream merged it)
+* enable reporting because of COEP
+
+# 81.0.4044.127
+* fix always-incognito crashes (https://github.com/bromite/bromite/issues/135 and https://github.com/bromite/bromite/pull/529)
+* improved crash uploader mock by calling done callback
+
+# 81.0.4044.106
+* remove option to add NTP as homepage (fixes https://github.com/bromite/bromite/issues/517)
+
+# 81.0.4044.97
+* disable browser auto-login by default
+* show download prompt again
+
+# 81.0.4044.83
+
+# 81.0.4044.76
+
+# 81.0.4044.70
+* backport surface control fix (fixes https://github.com/bromite/bromite/issues/445)
+
+# 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)

@@ -222,6 +573,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
@@ -67,3 +67,16 @@ when websites use the [Push API](https://w3c.github.io/push-api/); this will not

 [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).
+
+## Does Bromite support the Android autofill framework?
+
+No; the only autofill available in Chromium browsers requires integration with the Play Store binary blobs.
+Some apps use accessibility services as a workaround.
+
+## Does Bromite support casting media content?
+
+No; this would require Play Store binary blobs.
@@ -4,11 +4,11 @@

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

-Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.
+Bromite is a [Chromium](https://www.chromium.org/Home) fork with support for ad blocking and enhanced privacy.

-Bromite is only available for Android v4.4 and above.
+Bromite is only available for Android Lollipop (v5.0, API level 21) and above.

-<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />
+<img src="https://fdroid.bromite.org/fdroid/bromite_bromite_gh_downloads.svg" alt="Downloads on Github" title="Downloads on Github" />

 For the Frequently Asked Questions see [F.A.Q.](./FAQ.md).

@@ -25,36 +25,55 @@ 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`

 # Features

-* customizable adblock filters via user-provided URL
+* customizable adblock filters via user-provided URL (see https://www.bromite.org/custom-filters)
 * remove click-tracking and AMP from search results
 * DNS-over-HTTPS support with any valid IETF DoH endpoint
 * always-incognito mode
 * 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
+* show warnings for TLSv1.0/TLSv1.1 pages
 * 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
+* settings to disable custom intents and clear session on exit
+* flags to toggle anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs (see full list below for all the new flags)
 * 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
+* disable scroll-to-text-fragment
+* reduced referer granularity
+* block gateway attacks via websockets
+* use 64-bit ABI for webview processes
+* make all favicon requests on-demand ([supercookie](https://supercookie.me/) mitigation)
+* enable all network isolation features (`PartitionConnectionsByNetworkIsolationKey`, `PartitionHttpServerPropertiesByNetworkIsolationKey`, `SplitHostCacheByNetworkIsolationKey`, `AppendFrameOriginToNetworkIsolationKey`, `SplitCacheByNetworkIsolationKey`, `UseRegistrableDomainInNetworkIsolationKey`, `PartitionSSLSessionsByNetworkIsolationKey`, `PartitionExpectCTStateByNetworkIsolationKey`, `PartitionDomainReliabilityByNetworkIsolationKey`)
+* ignore enterprise policies that disallow secure DNS
+* ask permission to play protected media
+* disable the DIAL repeating discovery
+* disable RTCGetCurrentBrowsingContextMedia by default
+* disable FLoC by default
+* disable feeds
+* disable reporting of certificate errors
+* use pre-defined phone model for client hints and Javascript
+* site settings to disable images
+* allow forcing external links to open in incognito
+* disable AGSA by default
+* allow disabling JIT

 ## Features not related to privacy
 * import/export bookmarks
+* bookmark all tabs from tabs regroup menu
+* flag to allow screenshots of incognito tabs
 * 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)
@@ -64,6 +83,18 @@ ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
 * 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
+* adding an URL as bookmark will clear its blocked status for the NTP tiles
+* history support in incognito mode
+* view source of pages
+* timezone customization
+* sticky desktop mode setting
+* disable video autoplay by default, reintroduce site settings
+* mobile/desktop user agent customization
+* accessibility preference to force tablet UI
+* use Alt+D to focus address bar
+* allow sharing to Bromite
+* browser automatic updates
+* UI for crash information collection

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

@@ -71,9 +102,31 @@ You can inspect all functionality/privacy changes by reading the [patches](https

 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`
+* `#darken-websites-checkbox-in-themes-setting`
+* `#simplified-ntp`, enabled by default
+* `#enable-text-fragment-anchor`, disabled by default
+* `#num-raster-threads`
+* `#enable-image-reader`, enabled by default
+* `#enable-tab-groups` and `#enable-tab-groups-ui-improvements`
+
+New flags:
+
+* `#fingerprinting-canvas-image-data-noise`, `#fingerprinting-client-rects-noise` and `#fingerprinting-canvas-measuretext-noise`, enabled by default
+* `#enable-incognito-snapshots-in-android-recents`, disabled by default
+* `#max-connections-per-host`
+* `#resume-background-video`
+* `#ipv6-probing`
+* `#disable-webgl`
+* `#enable-device-motion` and `#enable-device-orientation`
+* `#show-legacy-tls-warnings`
+* `#save-data-header`, disabled by default
+* `#export-bookmarks-use-saf`, disabled by default
+* `#allow-user-certificates`, disabled by default
+* `#cleartext-permitted`, enabled by default, can be used to disable all cleartext-HTTP traffic
+* `#omnibox-autocomplete-filtering`, can be used to restrict omnibox autocomplete results
+* `#disable-external-intent-requests`

 # Privacy limitations

@@ -88,6 +141,8 @@ Each tag corresponds to a Chromium Stable release tag.
 Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK versions 19 and 21; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK21+).
 For every Bromite build you can always find a matching [vanilla Chromium](https://www.bromite.org/chromium) build which is used for example to verify which issues are specific to Bromite or not.

+You can automatically receive notifications about new updates (and install them) by enabling the auto updater functionality, see [related wiki page](https://github.com/bromite/bromite/wiki/AutomaticUpdates).
+
 All official releases are also available through the [official third-party F-Droid repository](https://www.bromite.org/fdroid).

 ## Integrity and authenticity
@@ -116,6 +171,7 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags

 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.

+The Chromium version tag used as base for the patches is available here: [RELEASE](./build/RELEASE); this is always corresponding to the git tag for every release.
 The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).
 The patches are to be applied second the order specified in the `bromite_patches_list.txt` file (you can use `git am`).

@@ -125,6 +181,14 @@ See upstream documentation: https://github.com/chromium/chromium/blob/master/com

 Bromite uses an unindexed filter file, which is periodically published at https://github.com/bromite/filters

+# Contributing
+
+Please submit issues following the issue template; beware that GitHub does not display the templates from mobile.
+
+Patches are welcome and accepted if they match the project goals.
+
+For any usage or development discussion please use GitHub Discussions: https://github.com/bromite/bromite/discussions
+
 # Credits

 * [Chromium project](https://www.chromium.org/Home) and developers
@@ -133,7 +197,7 @@ Bromite uses an unindexed filter file, which is periodically published at https:
 * [ungoogled-chromium-android](https://github.com/ungoogled-software/ungoogled-chromium-android) for some patches
 * [GrapheneOS](https://github.com/GrapheneOS) for some security patches
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (via ungoogled-chromium)
-* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
+* [Brave Browser](https://github.com/brave/brave-core) for some patches
 * [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo

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

+The URLs of the lists used are available at: https://github.com/bromite/filters/blob/master/lists.txt
+
 # License

 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
@@ -1,38 +1,42 @@
 android_channel="stable"
 blink_symbol_level=1
+chrome_pgo_phase=0
 dcheck_always_on=false
 debuggable_apks=false
 dfmify_dev_ui=false
 disable_android_lint=true
 disable_autofill_assistant_dfm=true
+disable_fieldtrial_testing_config=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_mse_mpeg2ts_stream_parser=true
 enable_nacl=false
 enable_nacl_nonsfi=false
+enable_platform_dolby_vision=true
+enable_platform_hevc=true
 enable_remoting=false
 enable_reporting=false
-enable_resource_whitelist_generation=false
 enable_vr=false
-fieldtrial_testing_like_official_build=true
+exclude_unwind_tables=false
+ffmpeg_branding="Chrome"
 icu_use_data_file=true
-is_cfi=true
 is_component_build=false
 is_debug=false
 is_official_build=true
+proprietary_codecs=true
 rtc_build_examples=false
 safe_browsing_mode=0
 symbol_level=1
 target_os="android"
 use_debug_fission=true
 use_errorprone_java_compiler=false
-use_jumbo_build=false
+use_gnome_keyring=false
 use_official_google_api_keys=false
-use_openh264=true chrome_pgo_phase=0 full_wpo_on_official=true
+use_rtti=false
 use_sysroot=false
+webview_includes_weblayer=false
@@ -0,0 +1 @@
+94.0.4606.102
@@ -1,68 +1,58 @@
 Disable-third-party-cookies-by-default.patch
-Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+AV1-codec-support.patch
+Switch-to-fstack-protector-strong.patch
+Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
 Always-allow-partner-customisation.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
+Do-not-hide-component-extensions.patch
 Do-not-store-passwords-by-default.patch
 Disable-NTP-remote-suggestions-by-default.patch
 Disable-references-to-fonts.googleapis.com.patch
-Disable-WebRTC-by-default.patch
+Change-default-webRTC-policy-to-not-use-any-address.patch
 Never-send-any-crash-upload-data.patch
 Hide-send-reports-checkbox.patch
 Never-fetch-popular-sites.patch
 ungoogled-chromium-Disable-webRTC-log-uploader.patch
 ungoogled-chromium-Disable-untraceable-URLs.patch
 ungoogled-chromium-Disable-translate-integration.patch
-ungoogled-chromium-Disable-profile-avatar-downloading.patch
+ungoogled-chromium-Disable-profile-avatar.patch
 ungoogled-chromium-Disable-intranet-redirect-detector.patch
 ungoogled-chromium-Disable-Google-host-detection.patch
-ungoogled-chromium-Disable-GCM.patch
 ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-domain-reliability.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
 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
 Hide-passwords-manager-link.patch
-Disable-Omaha-update-checks.patch
 Disable-update-scheduler.patch
 Add-English-only-search-engine.patch
 Add-DuckDuckGo-Lite-search-engine.patch
-Add-Qwant-search-engine.patch
-Fix-crash-when-accessing-page-info-site-settings.patch
 openH264-enable-ARM-ARM64-optimizations.patch
-Switch-to-fstack-protector-strong.patch
-Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 build-remove-calling-untrusted-hooks.patch
-AV1-codec-support.patch
-Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
+Inject-scripts-for-AMP-tracking-ads-and-video.patch
 Allow-playing-audio-in-background.patch
 Add-flag-to-control-video-playback-resume-feature.patch
 Open-YouTube-links-in-Bromite.patch
 Add-exit-menu-item.patch
 Remove-help-menu-item.patch
-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
+AudioBuffer-AnalyserNode-fp-mitigations.patch
+Multiple-fingerprinting-mitigations.patch
 Disable-metrics-on-all-I-O-threads.patch
 Always-respect-async-dns-flag-regardless-of-SDK-version.patch
 Add-flag-to-configure-maximum-connections-per-host.patch
-Add-site-settings-option-for-session-only-cookies.patch
+Do-not-ignore-download-location-prompt-setting.patch
 Add-bookmark-import-export-actions.patch
-Disable-promos-displayed-in-bookmarks-manager.patch
 Add-an-always-incognito-mode.patch
-Add-custom-tab-intents-privacy-option.patch
 Add-option-to-not-persist-tabs-across-sessions.patch
 Disable-fetching-of-all-field-trials.patch
 Disable-seed-based-field-trials.patch
@@ -70,70 +60,105 @@ Disable-plugins-enumeration.patch
 net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
 dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
 profile-resetter-do-not-tick-send-settings-by-default.patch
-browser-ui-disable-warning-about-missing-API-keys.patch
+Do-not-build-API-keys-infobar.patch
 autofill-disable-autofill-download-manager.patch
 first_run-deactivate-autoupdate-globally.patch
 translate-disable-fetching-of-translate-languages-from-server.patch
 kill-TOS-and-metrics-opt-out.patch
-kill-Translate.patch
 kill-Vision.patch
 kill-Location-fall-back-to-system.patch
 kill-Auth.patch
-Remove-dependency-on-com.google.android.gms.auth.patch
-kill-GCM.patch
-Remove-dependency-on-com.google.android.gcm.patch
-Remove-dependency-on-com.google.android.gms.gcm.patch
-Remove-dependency-on-com.google.android.play.patch
-Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
-Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
-Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
-Remove-dependency-on-com.google.android.gms.cast.patch
-Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
+Remove-binary-blob-integrations.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
+Disable-search-engine-DSE-automatic-permission.patch
 Add-flag-to-disable-IPv6-probes.patch
 Add-a-proxy-configuration-page.patch
-Do-not-ignore-download-location-prompt-setting.patch
-Disable-previews-by-default.patch
 Use-4-tile-rows-never-show-logo.patch
 Disable-metrics-collection-for-NTP-tiles.patch
-Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
-Add-option-to-use-home-page-as-NTP.patch
-Disable-dynamic-module-loading.patch
+Enable-SPPI-for-devices-with-enough-memory.patch
+Use-64-bit-WebView-processes.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
 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
-Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch
-Disable-search-ready-omnibox-by-default.patch
+Restore-Search-Ready-Omnibox-flag.patch
 disable-AdsBlockedInfoBar.patch
 Bromite-AdBlockUpdaterService.patch
-Add-option-to-configure-the-ad-blocker-filters-URL.patch
-Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
 Increase-number-of-autocomplete-matches-from-5-to-10.patch
 Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
-Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
 Disable-some-signed-exchange-features.patch
 Add-flag-to-disable-WebGL.patch
-Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
+DoH-secure-mode-by-default.patch
 Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
 Revert-flags-remove-disable-pull-to-refresh-effect.patch
 Use-dummy-DFM-installer.patch
-Disable-password-reuse-detection-on-android.patch
-Allow-building-without-feed-support.patch
-Disable-addresses-autofill-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-feeds-support-by-default.patch
+Disable-autofill-assistant-by-default.patch
+Show-site-settings-for-cookies-javascript-and-ads.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
 Enable-user-agent-freeze-by-default.patch
+disable-browser-autologin-by-default.patch
+AImageReader-CFI-crash-mitigations.patch
+Update-i18n-zh_CN-support.patch
+Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
+Add-menu-item-to-view-source.patch
+Block-gateway-attacks-via-websockets.patch
+Enable-prefetch-privacy-changes-by-default.patch
+Disable-support-for-RAR-files-inspection.patch
+Add-history-support-in-incognito-mode.patch
+Enable-darken-websites-checkbox-in-themes.patch
+Remove-blocklisted-URLs-upon-bookmark-creation.patch
+Disable-the-DIAL-repeating-discovery.patch
+Block-qjz9zk-or-trk-requests.patch
+Hardening-against-incognito-mode-detection.patch
+Remove-weblayer-dependency-on-Play-Services.patch
+Timezone-customization.patch
+Move-some-account-settings-back-to-privacy-settings.patch
+Restore-Simplified-NTP-launch.patch
+Revert-the-removal-of-an-option-to-block-autoplay.patch
+Disable-text-fragments-by-default.patch
+disable-WebView-variations-support.patch
+disable-autofill-server-communication-by-default.patch
+ask-permission-to-play-protected-media-by-default.patch
+Enable-network-isolation-features.patch
+Disable-unified-autoplay-feature.patch
+Revert-flags-remove-num-raster-threads.patch
+webview-Hard-no-to-persistent-histograms.patch
+Ignore-enterprise-policies-for-secure-DNS.patch
+Add-menu-item-to-bookmark-all-tabs.patch
+Add-flag-for-save-data-header.patch
+Add-option-to-force-tablet-UI.patch
+Make-all-favicon-requests-on-demand.patch
+Add-Alt-D-hotkey-to-focus-address-bar.patch
+Remove-offline-measurement-background-task.patch
+User-agent-customization.patch
+Add-AllowUserCertificates-flag.patch
+Add-IsCleartextPermitted-flag.patch
+Unexpire-tab-groups-flags.patch
+Add-flag-for-omnibox-autocomplete-filtering.patch
+Enable-IntentBlockExternalFormRedirectsNoGesture-by-default.patch
+Add-flag-to-disable-external-intent-requests.patch
+Logcat-crash-reports-UI.patch
+Add-support-for-ISupportHelpAndFeedback.patch
+JIT-less-toggle.patch
+API-level-21-prevent-crash-on-download.patch
+Add-flag-to-disable-vibration.patch
+mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
+Override-UA-client-hint-for-model.patch
+Disable-AGSA-by-default.patch
+Allow-building-without-enable_reporting.patch
+Disable-lock-icon-in-address-bar-by-default.patch
+Add-custom-tab-intents-privacy-option.patch
+Enable-share-intent.patch
+Site-setting-for-images.patch
+Bromite-auto-updater.patch
+Add-flag-to-disable-pull-to-refresh-effect.patch
 Automated-domain-substitution.patch
@@ -1,6 +1,4 @@
-Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
 AV1-codec-support.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
-Disable-password-reuse-detection-on-android.patch
-Allow-building-without-feed-support.patch
+Disable-feeds-support-by-default.patch
@@ -0,0 +1,252 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 5 May 2020 07:22:20 +0200
+Subject: AImageReader CFI crash mitigations
+
+Revert "gpu/android: Remove setup for disabling AImageReader."
+This reverts commit dcd5a39518246eb999f1cc63bf1ec95d93fd5b2f.
+
+Revert "Remove flags to enable/disable AImageReader."
+This reverts commit 463fa0f2e3b9e418bc26e2c8954463f0b0f76634.
+
+Restore GPU bug blacklist for AImageReader on ARM and Qualcomm CPUs
+
+Restore the AImageReader blacklist for ARM/Qualcomm chipsets which causes
+crashes on Android 9 and 10 (at different code locations).
+
+See discussions at:
+* https://github.com/bromite/bromite/issues/445
+* https://github.com/bromite/bromite/issues/814
+* https://github.com/bromite/bromite/issues/1005
+---
+ base/android/android_image_reader_compat.cc |  8 +++++++-
+ base/android/android_image_reader_compat.h  |  4 ++++
+ chrome/browser/flag-metadata.json           |  2 +-
+ gpu/config/gpu_driver_bug_list.json         | 16 ++++++++++++++++
+ gpu/config/gpu_finch_features.cc            |  5 +++++
+ gpu/config/gpu_finch_features.h             |  1 +
+ gpu/config/gpu_util.cc                      |  8 ++++++++
+ gpu/config/gpu_workaround_list.txt          |  1 +
+ gpu/ipc/service/gpu_init.cc                 |  5 +++++
+ gpu/ipc/service/stream_texture_android.cc   | 11 ++++++++++-
+ media/base/media_switches.cc                |  4 ++++
+ media/base/media_switches.h                 |  1 +
+ 12 files changed, 63 insertions(+), 3 deletions(-)
+
+diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
+--- a/base/android/android_image_reader_compat.cc
+++ b/base/android/android_image_reader_compat.cc
+@@ -23,6 +23,8 @@
+ namespace base {
+ namespace android {
+ 
+bool AndroidImageReader::disable_support_ = false;
+
+ AndroidImageReader& AndroidImageReader::GetInstance() {
+   // C++11 static local variable initialization is
+   // thread-safe.
+@@ -30,8 +32,12 @@ AndroidImageReader& AndroidImageReader::GetInstance() {
+   return instance;
+ }
+ 
+void AndroidImageReader::DisableSupport() {
+  disable_support_ = true;
+}
+
+ bool AndroidImageReader::IsSupported() {
+-  return is_supported_;
+  return !disable_support_ && is_supported_;
+ }
+ 
+ AndroidImageReader::AndroidImageReader() : is_supported_(LoadFunctions()) {}
+diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h
+--- a/base/android/android_image_reader_compat.h
+++ b/base/android/android_image_reader_compat.h
+@@ -22,6 +22,9 @@ class BASE_EXPORT AndroidImageReader {
+   // Thread safe GetInstance.
+   static AndroidImageReader& GetInstance();
+ 
+  // Disable image reader support.
+  static void DisableSupport();
+
+   // Check if the image reader usage is supported. This function returns TRUE
+   // if android version is >=OREO, image reader support is not disabled and all
+   // the required functions are loaded.
+@@ -59,6 +62,7 @@ class BASE_EXPORT AndroidImageReader {
+   jobject ANativeWindow_toSurface(JNIEnv* env, ANativeWindow* window);
+ 
+  private:
+  static bool disable_support_;
+   friend class base::NoDestructor<AndroidImageReader>;
+ 
+   AndroidImageReader();
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
+@@ -2017,7 +2017,7 @@
+   {
+     "name": "enable-image-reader",
+     "owners": [ "vikassoni", "liberato" ],
+-    "expiry_milestone": 95
+    "expiry_milestone": -1
+   },
+   {
+     "name": "enable-immersive-fullscreen-toolbar",
+diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
+--- a/gpu/config/gpu_driver_bug_list.json
+++ b/gpu/config/gpu_driver_bug_list.json
+@@ -3191,6 +3191,22 @@
+         "dont_delete_source_texture_for_egl_image"
+       ]
+     },
+    {
+      "id":335,
+      "cr_bugs": [1051705],
+      "description": "Disable AImageReader on ARM GPUs",
+      "os": {
+        "type": "android",
+        "version": {
+          "op": "<",
+          "value": "10"
+        }
+      },
+      "gl_vendor": "ARM.*|Qualcomm.*",
+      "features": [
+        "disable_aimagereader"
+      ]
+    },
+     {
+       "id": 336,
+       "cr_bugs": [625785],
+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
+@@ -51,6 +51,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) {
+ }  // namespace
+ 
+ #if defined(OS_ANDROID)
+
+// Use android AImageReader when playing videos with MediaPlayer.
+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+
+ // Used to limit GL version to 2.0 for skia raster on Android.
+ const base::Feature kUseGles2ForOopR{"UseGles2ForOopR",
+                                      base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
+--- a/gpu/config/gpu_finch_features.h
+++ b/gpu/config/gpu_finch_features.h
+@@ -17,6 +17,7 @@ namespace features {
+ // All features in alphabetical order. The features should be documented
+ // alongside the definition of their values in the .cc file.
+ #if defined(OS_ANDROID)
+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
+ GPU_EXPORT extern const base::Feature kUseGles2ForOopR;
+ GPU_EXPORT extern const base::Feature kAndroidSurfaceControl;
+ GPU_EXPORT extern const base::Feature kWebViewSurfaceControl;
+diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
+--- a/gpu/config/gpu_util.cc
+++ b/gpu/config/gpu_util.cc
+@@ -114,6 +114,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+ #if !defined(OS_ANDROID)
+   return kGpuFeatureStatusDisabled;
+ #else
+  if (blocklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
+    return kGpuFeatureStatusBlocklisted;
+
+   if (!gpu_preferences.enable_android_surface_control)
+     return kGpuFeatureStatusDisabled;
+ 
+@@ -319,6 +322,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+     gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
+         kGpuFeatureStatusBlocklisted;
+   }
+
+  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
+    gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
+        kGpuFeatureStatusBlocklisted;
+  }
+ }
+ 
+ // Estimates roughly user total disk space by counting in the drives where
+diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
+--- a/gpu/config/gpu_workaround_list.txt
+++ b/gpu/config/gpu_workaround_list.txt
+@@ -13,6 +13,7 @@ decode_encode_srgb_for_generatemipmap
+ depth_stencil_renderbuffer_resize_emulation
+ disable_2d_canvas_auto_flush
+ disable_accelerated_av1_decode
+disable_aimagereader
+ disable_accelerated_av1_decode_d3d11
+ disable_accelerated_h264_encode
+ disable_accelerated_vp8_decode
+diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
+--- a/gpu/ipc/service/gpu_init.cc
+++ b/gpu/ipc/service/gpu_init.cc
+@@ -517,6 +517,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+     }
+   }
+ 
+  // Disable AImageReader if the workaround is enabled.
+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
+    base::android::AndroidImageReader::DisableSupport();
+  }
+
+   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
+           kGpuFeatureStatusEnabled ||
+       !InitializeVulkan()) {
+diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
+--- a/gpu/ipc/service/stream_texture_android.cc
+++ b/gpu/ipc/service/stream_texture_android.cc
+@@ -6,6 +6,7 @@
+ 
+ #include <string.h>
+ 
+#include "base/android/android_image_reader_compat.h"
+ #include "base/android/scoped_hardware_buffer_fence_sync.h"
+ #include "base/bind.h"
+ #include "base/feature_list.h"
+@@ -50,7 +51,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
+ }
+ 
+ TextureOwner::Mode GetTextureOwnerMode() {
+-  return features::IsAImageReaderEnabled()
+  const bool a_image_reader_supported =
+      base::android::AndroidImageReader::GetInstance().IsSupported();
+
+  // TODO(vikassoni) : Currently we have 2 different flags to enable/disable
+  // AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2
+  // flags into a single flag. Keeping the 2 flags separate for now since finch
+  // experiment using this flag is in progress.
+  return a_image_reader_supported && features::IsAImageReaderEnabled() &&
+             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer)
+              ? TextureOwner::Mode::kAImageReaderInsecure
+              : TextureOwner::Mode::kSurfaceTextureInsecure;
+ }
+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
+@@ -668,6 +668,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
+ // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled.
+ const base::Feature kMediaDrmPreprovisioningAtStartup{
+     "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
+
+ 
+ // Enable picture in picture web api for android.
+ const base::Feature kPictureInPictureAPI{"PictureInPictureAPI",
+diff --git a/media/base/media_switches.h b/media/base/media_switches.h
+--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
+@@ -219,6 +219,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders;
+ MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays;
+ MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;
+ MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;
+MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput;
+ MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning;
+ MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup;
+ MEDIA_EXPORT extern const base::Feature kCanPlayHls;
+-- 
+2.17.1
+
@@ -0,0 +1,38 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Jun 2021 16:53:48 +0200
+Subject: API level 21: prevent crash on download
+
+On Lollipop 5.0.x it is not possible to use the system persistent bundle.
+This patch ignores boolean settings for them and prevents the crash.
+
+See also: https://github.com/bromite/bromite/issues/1184
+---
+ .../internal/BundleToPersistableBundleConverter.java | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
+--- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
+++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
+@@ -85,9 +85,17 @@ class BundleToPersistableBundleConverter {
+             if (obj == null) {
+                 persistableBundle.putString(key, null);
+             } else if (obj instanceof Boolean) {
+-                persistableBundle.putBoolean(key, (Boolean) obj);
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+                    failedKeys.add(key);
+                } else {
+                    persistableBundle.putBoolean(key, (Boolean) obj);
+                }
+             } else if (obj instanceof boolean[]) {
+-                persistableBundle.putBooleanArray(key, (boolean[]) obj);
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+                    failedKeys.add(key);
+                } else {
+                    persistableBundle.putBooleanArray(key, (boolean[]) obj);
+                }
+             } else if (obj instanceof Double) {
+                 persistableBundle.putDouble(key, (Double) obj);
+             } else if (obj instanceof double[]) {
+-- 
+2.17.1
+
@@ -5,7 +5,6 @@ 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 +++++
 .../config/linux/arm-neon-cpu-detect/config/aom_config.asm  | 2 +-
@@ -20,39 +19,21 @@ Report AV1 as playable on Android
 .../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(-)
+ 14 files changed, 21 insertions(+), 14 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
-@@ -560,9 +560,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
-     case THEORA:
-       return false;
- 
-    // AV1 is not supported on Android yet.
-+    // AV1 is supported on Android.
-     case AV1:
-+#if BUILDFLAG(ENABLE_AV1_DECODER)
-+      return true;
-+#else
-       return false;
-+#endif
- 
-     // ----------------------------------------------------------------------
-     // The remaining codecs may be supported depending on platform abilities.
 diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 --- a/third_party/libaom/BUILD.gn
 +++ b/third_party/libaom/BUILD.gn
-@@ -74,7 +74,7 @@ if (enable_libaom_decoder) {
-       sources = aom_dsp_common_asm_sse2
-       sources += aom_dsp_common_asm_ssse3
-       sources += aom_ports_asm_x86
+@@ -82,7 +82,7 @@ if (enable_libaom) {
+         sources += aom_dsp_encoder_asm_sse2_x86_64
+         sources += aom_dsp_encoder_asm_ssse3_x86_64
+       }
 -      defines = [ "CHROMIUM" ]
 +      defines = [ "CHROMIUM", "PIC" ]
       include_dirs = libaom_include_dirs
     }
 
-@@ -158,7 +158,7 @@ if (enable_libaom_decoder) {
+@@ -193,7 +193,7 @@ if (enable_libaom) {
       configs += [ "//build/config/compiler:no_chromium_code" ]
       if (current_cpu == "arm") {
         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
@@ -61,7 +42,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) {
+@@ -256,6 +256,8 @@ if (enable_libaom) {
     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
         cpu_arch_full == "arm-neon-cpu-detect") {
       deps += [ ":libaom_intrinsics_neon" ]
@@ -73,9 +54,9 @@ diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
 --- a/third_party/libaom/libaom_srcs.gni
 +++ b/third_party/libaom/libaom_srcs.gni
-@@ -488,6 +488,11 @@ aom_mem_sources = [
+@@ -634,6 +634,11 @@ aom_mem_sources = [
 
- aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
+ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/float.asm" ]
 
 +aom_ports_arm_sources = [
 +  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
@@ -83,152 +64,152 @@ 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_scale/aom_scale_rtcd.c",
 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
+@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+ CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
+ CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 1
- CONFIG_SHARED equ 0
+ CONFIG_REALTIME_ONLY equ 1
 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
+@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+ CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
+ CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
+ CONFIG_REALTIME_ONLY equ 1
 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
+@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+ CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
+ CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
+ CONFIG_REALTIME_ONLY equ 1
 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
+@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+ CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
+ CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
+ CONFIG_REALTIME_ONLY equ 1
 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
+@@ -48,7 +48,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
+ CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+ CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
+ CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 1
- CONFIG_SHARED equ 0
+ CONFIG_REALTIME_ONLY equ 1
 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
-@@ -35,7 +35,7 @@
- %define CONFIG_NORMAL_TILE_MODE 1
- %define CONFIG_ONE_PASS_SVM 0
+@@ -38,7 +38,7 @@
+ %define CONFIG_OPTICAL_FLOW_API 0
 %define CONFIG_OS_SUPPORT 1
+ %define CONFIG_PARTITION_SEARCH_ORDER 0
 -%define CONFIG_PIC 0
 +%define CONFIG_PIC 1
+ %define CONFIG_RD_COMMAND 0
 %define CONFIG_RD_DEBUG 0
- %define CONFIG_RUNTIME_CPU_DETECT 1
- %define CONFIG_SHARED 0
+ %define CONFIG_REALTIME_ONLY 1
 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
+@@ -50,7 +50,7 @@
+ #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+ #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
+ #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
+ #define CONFIG_REALTIME_ONLY 1
 -- 
 2.17.1

@@ -0,0 +1,169 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 26 Apr 2021 13:28:24 +0000
+Subject: Add AllowUserCertificates flag
+
+---
+ .../src/org/chromium/chrome/browser/app/ChromeActivity.java  | 3 +++
+ .../chromium/chrome/browser/app/flags/ChromeCachedFlags.java | 1 +
+ chrome/browser/about_flags.cc                                | 4 ++++
+ chrome/browser/flag_descriptions.cc                          | 5 +++++
+ chrome/browser/flag_descriptions.h                           | 3 +++
+ chrome/browser/flags/android/chrome_feature_list.cc          | 4 ++++
+ chrome/browser/flags/android/chrome_feature_list.h           | 1 +
+ .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 1 +
+ net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++
+ 10 files changed, 28 insertions(+)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+ import org.chromium.content_public.browser.SelectionPopupController;
+ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.content_public.common.ContentSwitches;
+import org.chromium.net.X509Util;
+ import org.chromium.printing.PrintManagerDelegateImpl;
+ import org.chromium.printing.PrintingController;
+ import org.chromium.printing.PrintingControllerImpl;
+@@ -976,6 +977,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+         UpdateMenuItemHelper.getInstance().onStart();
+         ChromeActivitySessionTracker.getInstance().onStartWithNative();
+         ChromeCachedFlags.getInstance().cacheNativeFlags();
+        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
+                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);
+         OfflineIndicatorController.initialize();
+ 
+         // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+@@ -88,6 +88,7 @@ public class ChromeCachedFlags {
+                 add(ChromeFeatureList.EARLY_LIBRARY_LOAD);
+                 add(ChromeFeatureList.ELASTIC_OVERSCROLL);
+                 add(ChromeFeatureList.IMMERSIVE_UI_MODE);
+                add(ChromeFeatureList.ALLOW_USER_CERTIFICATES);
+                 add(ChromeFeatureList.INSTANT_START);
+                 add(ChromeFeatureList.INSTANCE_SWITCHER);
+                 add(ChromeFeatureList.INTEREST_FEED_V2);
+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
+@@ -2781,6 +2781,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kCSSContainerQueriesDescription, kOsAll,
+      FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)},
+ #if defined(OS_ANDROID)
+    {"allow-user-certificates",
+     flag_descriptions::kAllowUserCertificatesName,
+     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},
+     {"contextual-search-debug", flag_descriptions::kContextualSearchDebugName,
+      flag_descriptions::kContextualSearchDebugDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kContextualSearchDebug)},
+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
+@@ -11,6 +11,11 @@
+ 
+ namespace flag_descriptions {
+ 
+const char kAllowUserCertificatesName[] = "Allow user certificates";
+const char kAllowUserCertificatesDescription[] =
+    "Allow user CA certificates during "
+    "validation of the certificate chain";
+
+ const char kAccelerated2dCanvasName[] = "Accelerated 2D canvas";
+ const char kAccelerated2dCanvasDescription[] =
+     "Enables the use of the GPU to perform 2d canvas rendering instead of "
+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
+@@ -46,6 +46,9 @@ namespace flag_descriptions {
+ 
+ // Cross-platform -------------------------------------------------------------
+ 
+extern const char kAllowUserCertificatesName[];
+extern const char kAllowUserCertificatesDescription[];
+
+ extern const char kAccelerated2dCanvasName[];
+ extern const char kAccelerated2dCanvasDescription[];
+ 
+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
+@@ -139,6 +139,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &feed::kFeedInteractiveRefresh,
+     &feed::kInterestFeedContentSuggestions,
+     &feed::kInterestFeedSpinnerAlwaysAnimate,
+    &kAllowUserCertificates,
+     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
+     &feed::kInterestFeedV2,
+     &feed::kInterestFeedV2Autoplay,
+@@ -373,6 +374,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
+     "AdaptiveButtonInTopToolbarCustomizationV2",
+     base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+const base::Feature kAllowUserCertificates = {
+    "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT};
+
+ const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH",
+                                         base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
+--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
+@@ -12,6 +12,7 @@
+ namespace chrome {
+ namespace android {
+ 
+extern const base::Feature kAllowUserCertificates;
+ // Alphabetical:
+ extern const base::Feature kAdaptiveButtonInTopToolbar;
+ extern const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2;
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+@@ -48,6 +48,7 @@ public class CachedFeatureFlags {
+      */
+     private static Map<String, Boolean> sDefaults =
+             ImmutableMap.<String, Boolean>builder()
+                    .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)
+                     .put(ChromeFeatureList.ANDROID_PARTNER_CUSTOMIZATION_PHENOTYPE, true)
+                     .put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false)
+                     .put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false)
+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
+@@ -211,6 +211,7 @@ public abstract class ChromeFeatureList {
+     }
+ 
+     /* Alphabetical: */
+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
+             "AdaptiveButtonInTopToolbarCustomizationV2";
+diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
+--- a/net/android/java/src/org/chromium/net/X509Util.java
+++ b/net/android/java/src/org/chromium/net/X509Util.java
+@@ -488,6 +488,8 @@ public class X509Util {
+         return false;
+     }
+ 
+    public static boolean AllowUserCertificates = false;
+
+     public static AndroidCertVerifyResult verifyServerCertificates(byte[][] certChain,
+                                                                    String authType,
+                                                                    String host)
+@@ -568,6 +570,9 @@ public class X509Util {
+                 isIssuedByKnownRoot = isKnownRoot(root);
+             }
+ 
+            if (AllowUserCertificates == false && isIssuedByKnownRoot == false)
+                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT);
+
+             return new AndroidCertVerifyResult(CertVerifyStatusAndroid.OK,
+                                                isIssuedByKnownRoot, verifiedChain);
+         }
+-- 
+2.17.1
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 9 Mar 2021 19:43:00 +0100
+Subject: Add Alt+D hotkey to focus address bar
+
+---
+ .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+@@ -156,6 +156,8 @@ public class KeyboardShortcuts {
+                 KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON);
+         addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,
+                 KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON);
+        addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,
+                KeyEvent.KEYCODE_D, KeyEvent.META_ALT_ON);
+         shortcutGroups.add(chromeFeatureShortcutGroup);
+ 
+         KeyboardShortcutGroup webpageShortcutGroup = new KeyboardShortcutGroup(
+-- 
+2.17.1
+
@@ -0,0 +1,97 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 26 Apr 2021 15:04:11 +0000
+Subject: Add IsCleartextPermitted flag
+
+---
+ chrome/browser/about_flags.cc           | 5 +++++
+ chrome/browser/flag_descriptions.cc     | 4 ++++
+ chrome/browser/flag_descriptions.h      | 3 +++
+ net/base/features.cc                    | 3 +++
+ net/base/features.h                     | 2 ++
+ net/url_request/url_request_http_job.cc | 4 ++++
+ 6 files changed, 21 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
+@@ -7617,6 +7617,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(
+          chrome::android::kBookmarksExportUseSaf)},
+ 
+    {"cleartext-permitted",
+     flag_descriptions::kIsCleartextPermittedName,
+     flag_descriptions::kIsCleartextPermittedDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
+
+     // NOTE: Adding a new flag requires adding a corresponding entry to enum
+     // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
+     // Histograms" in tools/metrics/histograms/README.md (run the
+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
+@@ -1407,6 +1407,10 @@ const char kHttpsOnlyModeDescription[] =
+     "Adds a setting under chrome://settings/security to opt-in to HTTPS-First "
+     "Mode.";
+ 
+const char kIsCleartextPermittedName[] = "Allow cleartext traffic";
+const char kIsCleartextPermittedDescription[] =
+    "Allow insecure connections over HTTP";
+
+ const char kIgnoreGpuBlocklistName[] = "Override software rendering list";
+ const char kIgnoreGpuBlocklistDescription[] =
+     "Overrides the built-in software rendering list and enables "
+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
+@@ -814,6 +814,9 @@ extern const char kHostedAppShimCreationDescription[];
+ extern const char kHttpsOnlyModeName[];
+ extern const char kHttpsOnlyModeDescription[];
+ 
+extern const char kIsCleartextPermittedName[];
+extern const char kIsCleartextPermittedDescription[];
+
+ extern const char kIgnoreGpuBlocklistName[];
+ extern const char kIgnoreGpuBlocklistDescription[];
+ 
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
+++ b/net/base/features.cc
+@@ -89,6 +89,9 @@ const base::FeatureParam<int> kUseDnsHttpsSvcbExtraTimePercent{
+ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
+                                           base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+const base::Feature kIsCleartextPermitted{"IsCleartextPermitted",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
+
+ const base::Feature kNetworkQualityEstimator{"NetworkQualityEstimator",
+                                              base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/net/base/features.h b/net/base/features.h
+--- a/net/base/features.h
+++ b/net/base/features.h
+@@ -37,6 +37,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin;
+ // Enables TLS 1.3 early data.
+ NET_EXPORT extern const base::Feature kEnableTLS13EarlyData;
+ 
+NET_EXPORT extern const base::Feature kIsCleartextPermitted;
+
+ // Support for altering the parameters used for DNS transaction timeout. See
+ // ResolveContext::SecureTransactionTimeout().
+ NET_EXPORT extern const base::Feature kDnsTransactionDynamicTimeouts;
+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
+@@ -214,6 +214,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+     }
+ 
+ #if defined(OS_ANDROID)
+    if (base::FeatureList::IsEnabled(net::features::kIsCleartextPermitted) == false) {
+      return std::make_unique<URLRequestErrorJob>(request,
+                                                  ERR_CLEARTEXT_NOT_PERMITTED);
+    }
+     // Check whether the app allows cleartext traffic to this host, and return
+     // ERR_CLEARTEXT_NOT_PERMITTED if not.
+     if (request->context()->check_cleartext_permitted() &&
+-- 
+2.17.1
+
@@ -1,992 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Mar 2018 20:31:44 +0100
-Subject: Add Qwant search engine
-
-Specify image URL in upstream engine definition
-Make search engine selectable in default list
---
- .../search_engines/prepopulated_engines.json  |   1 +
- .../template_url_prepopulate_data.cc          | 216 +++++++++---------
- 2 files changed, 109 insertions(+), 108 deletions(-)
-
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -183,6 +183,7 @@
-       "favicon_url": "https://www.qwant.com/favicon.ico",
-       "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch",
-       "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch",
-+      "image_url": "https://www.qwant.com/?t=images&q={searchTerms}",
-       "type": "SEARCH_ENGINE_QWANT",
-       "id": 94
-     },
-diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
--- a/components/search_engines/template_url_prepopulate_data.cc
-+++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -32,7 +32,7 @@ namespace {
- 
- // Default (for countries with no better engine set)
- const PrepopulatedEngine* const engines_default[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_default[] = {
- // Engine selection by country ------------------------------------------------
- // United Arab Emirates
- const PrepopulatedEngine* const engines_AE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AE[] = {
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &ask,
-@@ -58,7 +58,7 @@ const PrepopulatedEngine* const engines_AL[] = {
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_ar,
-     &duckduckgo, &duckduckgo_light,
-@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = {
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_at,
-     &duckduckgo, &duckduckgo_light,
-@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = {
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_au,
-     &duckduckgo, &duckduckgo_light,
-@@ -82,7 +82,7 @@ const PrepopulatedEngine* const engines_AU[] = {
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &ask,
-@@ -90,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = {
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -98,7 +98,7 @@ const PrepopulatedEngine* const engines_BE[] = {
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -106,7 +106,7 @@ const PrepopulatedEngine* const engines_BG[] = {
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ask,
-@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = {
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -130,7 +130,7 @@ const PrepopulatedEngine* const engines_BN[] = {
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BO[] = {
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_br,
-     &duckduckgo, &duckduckgo_light,
-@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BR[] = {
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_by,
-     &mail_ru,
-     &bing,
-@@ -154,7 +154,7 @@ const PrepopulatedEngine* const engines_BY[] = {
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo,
-@@ -163,12 +163,12 @@ const PrepopulatedEngine* const engines_BZ[] = {
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
-+    &googleen, &google, &qwant, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light,
- };
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo,
-     &duckduckgo_light,
-@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CH[] = {
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_cl,
-     &duckduckgo, &duckduckgo_light,
-@@ -185,12 +185,12 @@ const PrepopulatedEngine* const engines_CL[] = {
- 
- // China
- const PrepopulatedEngine* const engines_CN[] = {
-    &baidu, &so_360, &googleen, &google, &sogou, &bing,
-+    &baidu, &so_360, &googleen, &google, &qwant, &sogou, &bing,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_co,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -198,7 +198,7 @@ const PrepopulatedEngine* const engines_CO[] = {
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -206,7 +206,7 @@ const PrepopulatedEngine* const engines_CR[] = {
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &seznam_cz,
-     &bing,
-     &yahoo,
-@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_de,
-     &duckduckgo, &duckduckgo_light,
-@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_DE[] = {
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_dk,
-     &duckduckgo, &duckduckgo_light,
-@@ -230,7 +230,7 @@ const PrepopulatedEngine* const engines_DK[] = {
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -238,7 +238,7 @@ const PrepopulatedEngine* const engines_DO[] = {
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -254,7 +254,7 @@ const PrepopulatedEngine* const engines_EC[] = {
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yandex_ru,
-     &neti,
-@@ -262,7 +262,7 @@ const PrepopulatedEngine* const engines_EE[] = {
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -270,7 +270,7 @@ const PrepopulatedEngine* const engines_EG[] = {
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_es,
-     &duckduckgo, &duckduckgo_light,
-@@ -278,7 +278,7 @@ const PrepopulatedEngine* const engines_ES[] = {
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_fi,
-     &duckduckgo, &duckduckgo_light,
-@@ -286,7 +286,7 @@ const PrepopulatedEngine* const engines_FI[] = {
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_FO[] = {
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_fr,
-     &qwant,
-@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_FR[] = {
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_uk,
-     &duckduckgo, &duckduckgo_light,
-@@ -310,7 +310,7 @@ const PrepopulatedEngine* const engines_GB[] = {
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_GR[] = {
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -326,7 +326,7 @@ const PrepopulatedEngine* const engines_GT[] = {
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_hk,
-     &bing,
-     &baidu,
-@@ -334,7 +334,7 @@ const PrepopulatedEngine* const engines_HK[] = {
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -342,7 +342,7 @@ const PrepopulatedEngine* const engines_HN[] = {
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -350,7 +350,7 @@ const PrepopulatedEngine* const engines_HR[] = {
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -358,7 +358,7 @@ const PrepopulatedEngine* const engines_HU[] = {
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_id,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_ID[] = {
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_IE[] = {
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -382,7 +382,7 @@ const PrepopulatedEngine* const engines_IL[] = {
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_in,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_IN[] = {
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -398,14 +398,14 @@ const PrepopulatedEngine* const engines_IQ[] = {
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -413,7 +413,7 @@ const PrepopulatedEngine* const engines_IS[] = {
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IT[] = {
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_JM[] = {
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -437,7 +437,7 @@ const PrepopulatedEngine* const engines_JO[] = {
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_jp,
-     &bing,
-     &baidu,
-@@ -445,7 +445,7 @@ const PrepopulatedEngine* const engines_JP[] = {
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_KE[] = {
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &naver,
-     &daum,
-     &bing,
-@@ -461,7 +461,7 @@ const PrepopulatedEngine* const engines_KR[] = {
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ask,
-@@ -469,7 +469,7 @@ const PrepopulatedEngine* const engines_KW[] = {
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_kz,
-     &mail_ru,
-     &bing,
-@@ -477,7 +477,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo,
-@@ -486,7 +486,7 @@ const PrepopulatedEngine* const engines_LB[] = {
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo,
-     &duckduckgo_light,
-@@ -495,7 +495,7 @@ const PrepopulatedEngine* const engines_LI[] = {
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -503,7 +503,7 @@ const PrepopulatedEngine* const engines_LT[] = {
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -511,7 +511,7 @@ const PrepopulatedEngine* const engines_LU[] = {
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yandex_ru,
-     &yahoo,
-@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_LV[] = {
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_com,
-@@ -527,7 +527,7 @@ const PrepopulatedEngine* const engines_LY[] = {
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -535,7 +535,7 @@ const PrepopulatedEngine* const engines_MA[] = {
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_MC[] = {
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ru,
-     &mail_ru,
-     &duckduckgo, &duckduckgo_light,
-@@ -551,7 +551,7 @@ const PrepopulatedEngine* const engines_MD[] = {
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -559,7 +559,7 @@ const PrepopulatedEngine* const engines_ME[] = {
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -567,7 +567,7 @@ const PrepopulatedEngine* const engines_MK[] = {
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_mx,
-     &duckduckgo, &duckduckgo_light,
-@@ -575,7 +575,7 @@ const PrepopulatedEngine* const engines_MX[] = {
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_my,
-     &bing,
-     &baidu,
-@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_MY[] = {
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -591,7 +591,7 @@ const PrepopulatedEngine* const engines_NI[] = {
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_nl,
-     &duckduckgo, &duckduckgo_light,
-@@ -599,7 +599,7 @@ const PrepopulatedEngine* const engines_NL[] = {
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo,
-@@ -608,7 +608,7 @@ const PrepopulatedEngine* const engines_NO[] = {
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo_nz,
-@@ -616,7 +616,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ask,
-@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_OM[] = {
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -632,7 +632,7 @@ const PrepopulatedEngine* const engines_PA[] = {
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_pe,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -640,7 +640,7 @@ const PrepopulatedEngine* const engines_PE[] = {
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_ph,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -648,7 +648,7 @@ const PrepopulatedEngine* const engines_PH[] = {
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &baidu,
-@@ -656,7 +656,7 @@ const PrepopulatedEngine* const engines_PK[] = {
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_PL[] = {
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_PR[] = {
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_PT[] = {
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -688,7 +688,7 @@ const PrepopulatedEngine* const engines_PY[] = {
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ask,
-@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_QA[] = {
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -704,7 +704,7 @@ const PrepopulatedEngine* const engines_RO[] = {
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -713,14 +713,14 @@ const PrepopulatedEngine* const engines_RS[] = {
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-     &yandex_ru,
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &mail_ru,
-     &bing,
- };
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -728,7 +728,7 @@ const PrepopulatedEngine* const engines_RW[] = {
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_com,
-@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_SA[] = {
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_se,
-     &duckduckgo, &duckduckgo_light,
-@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_SE[] = {
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_sg,
-     &yandex_com,
-@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_SG[] = {
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -760,7 +760,7 @@ const PrepopulatedEngine* const engines_SI[] = {
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_SK[] = {
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -776,7 +776,7 @@ const PrepopulatedEngine* const engines_SV[] = {
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -784,7 +784,7 @@ const PrepopulatedEngine* const engines_SY[] = {
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_th,
-     &bing,
-     &ask,
-@@ -792,7 +792,7 @@ const PrepopulatedEngine* const engines_TH[] = {
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -800,7 +800,7 @@ const PrepopulatedEngine* const engines_TN[] = {
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_tr,
-     &yahoo_tr,
-     &bing,
-@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_TR[] = {
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -816,7 +816,7 @@ const PrepopulatedEngine* const engines_TT[] = {
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_tw,
-     &bing,
-     &baidu,
-@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_TW[] = {
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -832,7 +832,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ua,
-     &mail_ru,
-     &bing,
-@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_UA[] = {
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -848,7 +848,7 @@ const PrepopulatedEngine* const engines_US[] = {
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -856,7 +856,7 @@ const PrepopulatedEngine* const engines_UY[] = {
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_ve,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -864,7 +864,7 @@ const PrepopulatedEngine* const engines_VE[] = {
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &coccoc,
-     &bing,
-     &yahoo_vn,
-@@ -872,7 +872,7 @@ const PrepopulatedEngine* const engines_VN[] = {
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &baidu,
-@@ -880,7 +880,7 @@ const PrepopulatedEngine* const engines_YE[] = {
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &baidu,
-- 
-2.17.1
-
@@ -0,0 +1,101 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 May 2020 08:33:15 +0200
+Subject: Add a flag to allow screenshots in Incognito mode
+
+See also:
+* https://github.com/bromite/bromite/issues/551
+* https://bugs.chromium.org/p/chromium/issues/detail?id=920762
+---
+ chrome/browser/about_flags.cc                               | 6 ++++++
+ chrome/browser/flag_descriptions.cc                         | 5 +++++
+ chrome/browser/flag_descriptions.h                          | 3 +++
+ .../flags/android/java_templates/ChromeSwitches.java.tmpl   | 4 ----
+ chrome/common/chrome_switches.cc                            | 3 +++
+ chrome/common/chrome_switches.h                             | 1 +
+ 6 files changed, 18 insertions(+), 4 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
+@@ -7518,6 +7518,12 @@ const FeatureEntry kFeatureEntries[] = {
+                                     "AndroidDynamicColor")},
+ #endif  //   defined(OS_ANDROID)
+ 
+#if defined(OS_ANDROID)
+    {switches::kEnableIncognitoSnapshotsInAndroidRecents, flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsName,
+     flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsDescription, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kEnableIncognitoSnapshotsInAndroidRecents)},
+#endif
+
+ #if defined(OS_WIN)
+     {"win-10-tab-search-caption-button",
+      flag_descriptions::kWin10TabSearchCaptionButtonName,
+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
+@@ -635,6 +635,11 @@ const char kEnableAutofillCreditCardAuthenticationDescription[] =
+     "authenticator (if available) to verify card ownership when retrieving "
+     "credit cards from Google Payments.";
+ 
+const char kEnableIncognitoSnapshotsInAndroidRecentsName[] =
+    "Enable Incognito snapshots in Android Recents";
+const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[] =
+    "Enable the secure flag for Incognito tabs which prevent taking screenshots and seeing snapshots in Android Recents.";
+
+ const char
+     kEnableAutofillInfoBarAccountIndicationFooterForSingleAccountUsersName[] =
+         "Display InfoBar footers with account indication information for "
+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
+@@ -404,6 +404,9 @@ extern const char kEnableAutofillSaveCardInfoBarAccountIndicationFooterName[];
+ extern const char
+     kEnableAutofillSaveCardInfoBarAccountIndicationFooterDescription[];
+ 
+extern const char kEnableIncognitoSnapshotsInAndroidRecentsName[];
+extern const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[];
+
+ extern const char kEnableExperimentalCookieFeaturesName[];
+ extern const char kEnableExperimentalCookieFeaturesDescription[];
+ 
+diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+--- a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+++ b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+@@ -129,10 +129,6 @@ public abstract class ChromeSwitches {{
+     /** Switch for enabling the Chrome Survey. Only works when UMA is accepted. */
+     public static final String CHROME_FORCE_ENABLE_SURVEY = "force-enable-chrome-survey";
+ 
+-    /** Switch to enable incognito tabs to be seen in Android Recents. */
+-    public static final String ENABLE_INCOGNITO_SNAPSHOTS_IN_ANDROID_RECENTS =
+-            "enable-incognito-snapshots-in-android-recents";
+-
+     /** Open all custom tabs in a new task. Used only for experimental purposes. */
+     public static final String OPEN_CUSTOM_TABS_IN_NEW_TASK = "open-custom-tabs-in-new-task";
+ 
+diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
+--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
+@@ -344,6 +344,9 @@ const char kHomePage[]                      = "homepage";
+ // Causes the browser to launch directly in incognito mode.
+ const char kIncognito[]                     = "incognito";
+ 
+// Allows incognito tabs to be seen in Android Recents and thus user screenshots.
+const char kEnableIncognitoSnapshotsInAndroidRecents[] = "enable-incognito-snapshots-in-android-recents";
+
+ // Installs an autogenerated theme based on the given RGB value.
+ // The format is "r,g,b", where r, g, b are a numeric values from 0 to 255.
+ const char kInstallAutogeneratedTheme[] = "install-autogenerated-theme";
+diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
+--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
+@@ -114,6 +114,7 @@ extern const char kForceStackedTabStripLayout[];
+ extern const char kHideCrashRestoreBubble[];
+ extern const char kHomePage[];
+ extern const char kIncognito[];
+extern const char kEnableIncognitoSnapshotsInAndroidRecents[];
+ extern const char kInstallAutogeneratedTheme[];
+ extern const char kInstallChromeApp[];
+ extern const char kInstantProcess[];
+-- 
+2.17.1
+
@@ -6,27 +6,34 @@ Accessible from proxy settings and chrome://proxy
 Allows to use a PAC script URL, automatic configuration and explicit proxy
 settings.
 Offer auto-complete for the proxy page URL.
+Store proxy settings in LocalState instead of Profile, so that proxy is used
+for SimpleURLLoaders as well.
 ---
 chrome/android/java/res/values/values.xml     |   3 +
 .../java/res/xml/privacy_preferences.xml      |   4 +
+ .../privacy/settings/PrivacySettings.java     |   1 +
 .../chrome_autocomplete_provider_client.cc    |   2 +
 chrome/browser/browser_resources.grd          |   6 +
+ chrome/browser/net/proxy_service_factory.cc   |  23 +-
+ chrome/browser/net/proxy_service_factory.h    |   3 +
+ chrome/browser/prefs/browser_prefs.cc         |   4 +
 .../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/resources/proxy_config.html    |  79 ++++
+ chrome/browser/resources/proxy_config.js      | 266 +++++++++++
 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.cc    | 416 ++++++++++++++++++
 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 ++
+ .../pref_proxy_config_tracker_impl.cc         |   1 +
+ .../proxy_config/proxy_config_dictionary.cc   |  30 +-
+ .../proxy_config/proxy_config_dictionary.h    |   7 +-
+ net/proxy_resolution/proxy_config.cc          |  52 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 19 files changed, 913 insertions(+), 12 deletions(-)
+ 24 files changed, 995 insertions(+), 14 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 +43,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
-@@ -77,6 +77,9 @@
-     <integer name="list_item_level_selected">1</integer>
-     <integer name="list_item_level_incognito">2</integer>
+@@ -25,6 +25,9 @@
+     <!-- Compositor Tab Title Text -->
+     <bool name="compositor_tab_title_fake_bold_text">true</bool>
 
 +    <string name="proxy_title">Proxy configuration</string>
 +    <string name="proxy_url">chrome://proxy</string>
@@ -53,45 +60,141 @@ 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.settings.HyperlinkPreference
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
 +        android:key="proxy"
 +        android:title="@string/proxy_title"
 +        app:url="@string/proxy_url" />
-     <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
-         android:key="search_suggestions"
-         android:title="@string/search_suggestions_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/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -50,6 +50,7 @@ import org.chromium.ui.text.SpanApplier;
+ public class PrivacySettings
+         extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener,
+                                                     INeedSnackbarManager {
+    private static final String PREF_PROXY_OPTIONS = "proxy";
+     private SnackbarManager mSnackbarManager;
+     private Snackbar mSnackbar;
+ 
 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() {
-   std::vector<base::string16> builtins_to_provide;
+@@ -365,6 +365,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
+       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
+ #endif
 +  builtins_to_provide.push_back(
 +      base::ASCIIToUTF16(chrome::kChromeUIProxyConfigURL));
   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
- #if !defined(OS_ANDROID)
+       base::ASCIIToUTF16(chrome::kChromeUIVersionURL));
+   return builtins_to_provide;
 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
-@@ -148,6 +148,12 @@
+@@ -88,6 +88,12 @@
         <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
       </if>
 
-+      <!-- Bromite Proxy Configuration UI. -->
+      <!-- Bromite Proxy Configuration UI -->
 +      <if expr="is_android">
 +        <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
 +        <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
 +      </if>
 +
-       <!-- App Management. -->
-       <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" />
+       <if expr="not is_android">
+         <!-- Page not available for guest. -->
+         <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />
+diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
+--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
+@@ -15,6 +15,9 @@
+ #include "content/public/browser/browser_thread.h"
+ #include "net/proxy_resolution/configured_proxy_resolution_service.h"
+ #include "net/proxy_resolution/proxy_config_service.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/pref_registry_simple.h"
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #include "chromeos/network/proxy/proxy_config_service_impl.h"
+@@ -59,7 +62,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
+   return std::make_unique<chromeos::ProxyConfigServiceImpl>(
+       profile_prefs, local_state_prefs, nullptr);
+ #else
+-  return std::make_unique<PrefProxyConfigTrackerImpl>(profile_prefs, nullptr);
+  // Migrate from profile_prefs to local_state_prefs
+  if (local_state_prefs->GetBoolean("proxy_migrated") == false) {
+    const base::DictionaryValue* dict =
+        profile_prefs->GetDictionary(proxy_config::prefs::kProxy);
+
+    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";
+
+    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict->Clone());
+    local_state_prefs->Set(proxy_config::prefs::kProxy, proxy_dict);
+
+    local_state_prefs->SetBoolean("proxy_migrated", true);
+    local_state_prefs->CommitPendingWrite();
+  }
+  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ }
+ 
+@@ -75,3 +91,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+                                                       nullptr);
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ }
+
+// static
+void ProxyServiceFactory::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref("proxy_migrated", false);
+}
+diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/proxy_service_factory.h
+--- a/chrome/browser/net/proxy_service_factory.h
+++ b/chrome/browser/net/proxy_service_factory.h
+@@ -8,6 +8,7 @@
+ #include <memory>
+ 
+ #include "base/macros.h"
+#include "components/prefs/pref_registry_simple.h"
+ 
+ class PrefProxyConfigTracker;
+ class PrefService;
+@@ -37,6 +38,8 @@ class ProxyServiceFactory {
+   static std::unique_ptr<PrefProxyConfigTracker>
+   CreatePrefProxyConfigTrackerOfLocalState(PrefService* local_state_prefs);
+ 
+  static void RegisterPrefs(PrefRegistrySimple* registry);
+
+  private:
+   DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);
+ };
+diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
+--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
+@@ -160,6 +160,8 @@
+ #include "printing/buildflags/buildflags.h"
+ #include "rlz/buildflags/buildflags.h"
+ 
+#include "chrome/browser/net/proxy_service_factory.h"
+
+ #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
+ #include "chrome/browser/background/background_mode_manager.h"
+ #endif
+@@ -914,6 +916,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+   PluginsResourceService::RegisterPrefs(registry);
+ #endif
+ 
+  ProxyServiceFactory::RegisterPrefs(registry);
+
+ #if defined(OS_ANDROID)
+   ::android::RegisterPrefs(registry);
+ 
 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
-@@ -152,7 +152,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
     SetValue(
         proxy_config::prefs::kProxy,
         std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
@@ -170,7 +273,7 @@ diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resourc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/resources/proxy_config.html
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,79 @@
 +<!doctype html>
 +<html>
 +<head>
@@ -184,9 +287,9 @@ new file mode 100644
 +<script src="chrome://resources/js/ios/web_ui.js"></script>
 +</if>
 +
+<script src="chrome://resources/js/assert.js"></script>
 +<script src="chrome://resources/js/util.js"></script>
-+<script src="chrome://resources/js/cr.js"></script>
-+<script src="chrome://proxy/proxy_config.js"></script>
+<script type="module" src="chrome://proxy/proxy_config.js"></script>
 +<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 +<link rel="stylesheet" href="proxy_config.css">
 +<title>Proxy configuration</title>
@@ -217,7 +320,8 @@ new file mode 100644
 +        Reset will update the displayed configuration to match the one currently in use.
 +      </div>
 +      <div class="section-container">
-+          <input type="radio" id="empty" name="mode" value="empty" checked><label for="empty">None</label><br/>
+          <input type="radio" id="empty" name="mode" value="empty"><label for="empty">System Default</label><br/>
+          <input type="radio" id="direct" name="mode" value="direct"><label for="direct">Direct</label><br/>
 +          <input type="radio" id="auto-detect" name="mode" value="auto-detect"><label for="auto-detect">Auto-detect (WPAD DHCP/DNS)</label><br/>
 +          <input type="radio" id="use-pac-url" name="mode" value="use-pac-url"><label for="use-pac-url">Use PAC URL: <input id='pac-url' value="" size="40" /></label>
 +          <p><input type="checkbox" id="pac-mandatory" name="pac-mandatory"><label for="pac-mandatory">Do not allow fallback to direct connection in case PAC script fails</label></p>
@@ -253,7 +357,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/resources/proxy_config.js
-@@ -0,0 +1,252 @@
+@@ -0,0 +1,266 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -271,6 +375,8 @@ new file mode 100644
 +    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
 +*/
 +
+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+
 +/**
 + * Main entry point called once the page has loaded.
 + */
@@ -296,6 +402,7 @@ new file mode 100644
 +  var kIdClearButton = 'clear';
 +
 +  var kIdModeEmpty = 'empty';
+  var kIdModeDirect = 'direct';
 +  var kIdModeAutoDetect = 'auto-detect';
 +  var kIdModeUsePacURL = 'use-pac-url';
 +
@@ -327,7 +434,8 @@ new file mode 100644
 +    chrome.send('enableNotifyUIWithState');
 +  }
 +
-+  cr.addSingletonGetter(ProxyConfigView);
+  addSingletonGetter(ProxyConfigView);
+  window.ProxyConfigView = ProxyConfigView;
 +
 +  ProxyConfigView.prototype = {
 +    /**
@@ -381,7 +489,7 @@ new file mode 100644
 +          "rules": {
 +            "bypass_rules": "",
 +            "reverse_bypass": false,
-+            "type": "empty"
+            "type": "none"
 +          }
 +        };
 +    },
@@ -394,7 +502,14 @@ new file mode 100644
 +        return {
 +          "auto_detect": false,
 +          "rules": {
-+            "type": "empty"
+            "type": "none"
+          }
+        };
+      } else if ($(kIdModeDirect).checked) {
+        return {
+          "auto_detect": false,
+          "rules": {
+            "type": "direct"
 +          }
 +        };
 +      } else if ($(kIdModeAutoDetect).checked) {
@@ -405,7 +520,8 @@ new file mode 100644
 +        return {
 +          "auto_detect": false,
 +          "pac_url": $(kIdPacURL).value.trim(),
-+          "pac_mandatory": $(kIdPacMandatory).checked
+          "pac_mandatory": $(kIdPacMandatory).checked,
+          "rules": {}
 +        };
 +      } else if ($(kIdModeUseListPerScheme).checked || $(kIdModeUseSingleList).checked) {
 +        var config = {
@@ -438,15 +554,17 @@ new file mode 100644
 +     * Updates the UI to display the current proxy configuration.
 +     */
 +    renderConfig_: function() {
-+      if (this.currentConfig.auto_detect)
+      if (this.currentConfig.auto_detect) {
 +        $(kIdModeAutoDetect).checked = true;
-+      else if (this.currentConfig.hasOwnProperty('pac_url')) {
+      } else if (this.currentConfig.hasOwnProperty('pac_url')) {
 +        $(kIdPacURL).value = this.currentConfig.pac_url;
 +        $(kIdPacMandatory).checked = this.currentConfig.pac_mandatory;
 +        $(kIdModeUsePacURL).checked = true;
-+      } else if (this.currentConfig.rules.type == "empty")
+      } else if (this.currentConfig.rules.type == "none") {
 +        $(kIdModeEmpty).checked = true;
-+      else {
+      } else if (this.currentConfig.rules.type == "direct") {
+        $(kIdModeDirect).checked = true;
+      } else {
 +        $(kIdBypassRules).value = this.currentConfig.rules.bypass_rules;
 +        $(kIdReverseBypass).checked = this.currentConfig.rules.reverse_bypass;
 +
@@ -509,7 +627,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
-@@ -260,6 +260,8 @@ jumbo_static_library("ui") {
+@@ -265,6 +265,8 @@ static_library("ui") {
     "webui/metrics_handler.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -517,19 +635,19 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 +    "webui/proxy_config_ui.h",
     "webui/net_internals/net_internals_ui.cc",
     "webui/net_internals/net_internals_ui.h",
-     "webui/notifications_internals/notifications_internals_ui.cc",
+     "webui/ntp_tiles_internals_ui.cc",
 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 @@
+@@ -53,6 +53,7 @@
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
- #include "chrome/browser/ui/webui/policy_ui.h"
+ #include "chrome/browser/ui/webui/policy/policy_ui.h"
 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
 #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
- #include "chrome/browser/ui/webui/settings/settings_ui.h"
- #include "chrome/browser/ui/webui/settings_utils.h"
-@@ -400,6 +401,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+ #include "chrome/browser/ui/webui/signin_internals_ui.h"
+ #include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
+@@ -619,6 +620,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<MemoryInternalsUI>;
   if (url.host_piece() == chrome::kChromeUINetExportHost)
     return &NewWebUI<NetExportUI>;
@@ -537,12 +655,12 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 +    return &NewWebUI<ProxyConfigUI>;
   if (url.host_piece() == chrome::kChromeUINetInternalsHost)
     return &NewWebUI<NetInternalsUI>;
-   if (url.host_piece() == chrome::kChromeUINotificationsInternalsHost)
+   if (url.host_piece() == chrome::kChromeUINTPTilesInternalsHost)
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,395 @@
+@@ -0,0 +1,416 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -573,7 +691,6 @@ new file mode 100644
 +#include "base/lazy_instance.h"
 +#include "base/macros.h"
 +#include "base/memory/ref_counted.h"
-+#include "base/scoped_observer.h"
 +#include "base/strings/string_util.h"
 +#include "base/strings/utf_string_conversions.h"
 +#include "base/values.h"
@@ -643,7 +760,7 @@ new file mode 100644
 +
 + private:
 +  // Not owned.
-+  Profile *profile_;
+  PrefService *pref_service_;
 +  std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
 +  // Monitors global and Profile prefs related to proxy configuration.
 +  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
@@ -663,7 +780,7 @@ new file mode 100644
 +      weak_ptr_factory_(this) {
 +
 +  // used to set new configuration preferences
-+  profile_ = profile;
+  pref_service_ = g_browser_process->local_state();
 +  // observer is explicitly added only later in enableNotifyUIWithState
 +  is_observing_ = false;
 +
@@ -700,7 +817,7 @@ new file mode 100644
 +      encodeConfig(config.value(), state);
 +      break;
 +    case net::ProxyConfigService::CONFIG_UNSET:
-+      // nothing will be populated
+      state.SetPath({"config", "rules", "type"}, base::Value("none"));
 +      break;
 +    case net::ProxyConfigService::CONFIG_PENDING:
 +      //NOTE: this can only happen when triggered manually first time
@@ -727,16 +844,20 @@ new file mode 100644
 +
 +  state.SetPath({"config", "auto_detect"}, base::Value(config.auto_detect()));
 +
+  auto rules = config.proxy_rules();
 +  if (config.has_pac_url()) {
 +    state.SetPath({"config", "pac_url"}, base::Value(config.pac_url().spec()));
 +    state.SetPath({"config", "pac_mandatory"}, base::Value(config.pac_mandatory()));
+    state.SetPath({"config", "rules", "type"}, base::Value("none"));
+    state.SetPath({"config", "rules", "bypass_rules"}, base::Value(rules.bypass_rules.ToString()));
+    state.SetPath({"config", "rules", "reverse_bypass"}, base::Value(rules.reverse_bypass));
+    return;
 +  }
 +
-+  auto rules = config.proxy_rules();
 +  const char *type;
 +  switch (rules.type) {
 +    case net::ProxyConfig::ProxyRules::Type::EMPTY:
-+      type = "empty";
+      type = "direct";
 +      break;
 +    case net::ProxyConfig::ProxyRules::Type::PROXY_LIST:
 +      type = "list";
@@ -799,13 +920,25 @@ new file mode 100644
 +
 +  net::ProxyConfigWithAnnotation config;
 +  auto availability = proxy_config_service_->GetLatestProxyConfig(&config);
+
+  const base::DictionaryValue* dict =
+      pref_service_->GetDictionary(proxy_config::prefs::kProxy);
+  ProxyConfigDictionary proxy_dict(dict->Clone());
+  ProxyPrefs::ProxyMode mode;
+  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {
+    availability = net::ProxyConfigService::CONFIG_UNSET;
+  }
+
 +  OnProxyConfigChanged(config, availability);
 +}
 +
 +void ProxyConfigMessageHandler::OnClear(const base::ListValue* list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  profile_->GetPrefs()->ClearPref(proxy_config::prefs::kProxy);
+  const base::Value cfg = ProxyConfigDictionary::CreateSystem();
+  pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+  pref_service_->CommitPendingWrite();
+  OnEnableNotifyUIWithState(nullptr);
 +}
 +
 +void ProxyConfigMessageHandler::OnApply(const base::ListValue* list) {
@@ -883,8 +1016,11 @@ new file mode 100644
 +      proxyConfig.proxy_rules().proxies_for_ftp.SetFromPacString(ftp->GetString());
 +      proxyConfig.proxy_rules().fallback_proxies.SetFromPacString(fallback->GetString());
 +      readBypass = true;
-+  } else if (t == "empty") {
+  } else if (t == "direct") {
 +      proxyConfig.proxy_rules().type = net::ProxyConfig::ProxyRules::Type::EMPTY;
+  } else if (t == "none") {
+      OnClear(nullptr);
+      return;
 +  } else {
 +     // invalid type
 +     LOG(WARNING) << "invalid proxy configuration type";
@@ -911,21 +1047,24 @@ new file mode 100644
 +void ProxyConfigMessageHandler::apply(const net::ProxyConfig& proxyConfig) {
 +  if (proxyConfig.auto_detect()) {
 +    const base::Value cfg = ProxyConfigDictionary::CreateAutoDetect();
-+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
-+    return;
+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
 +  } else if (proxyConfig.has_pac_url()) {
 +    const base::Value cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
-+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
-+    return;
+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {
+    const base::Value cfg = ProxyConfigDictionary::CreateDirect();
+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+  } else {
+    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
+    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
+
+    // fixed servers
+    const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
+                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
 +  }
-+
-+  auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
-+  auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
-+
-+  // fixed servers
-+  const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
-+                          bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
-+  profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
+  pref_service_->CommitPendingWrite();
+  OnEnableNotifyUIWithState(nullptr);
 +}
 +
 +}  // namespace
@@ -979,26 +1118,26 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -184,6 +184,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
- const char kChromeUINativeScheme[] = "chrome-native";
- const char kChromeUIOfflineInternalsHost[] = "offline-internals";
- const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics";
+@@ -34,6 +34,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+ const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
+ const char kChromeUIChromeSigninHost[] = "chrome-signin";
+ const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
 +const char kChromeUIProxyConfigHost[] = "proxy";
 +const char kChromeUIProxyConfigURL[] = "chrome://proxy/";
- const char kChromeUISnippetsInternalsHost[] = "snippets-internals";
- const char kChromeUIWebApksHost[] = "webapks";
- #endif
-@@ -467,6 +469,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
-       kResetSubPage,
-       kSmartLockSettingsSubPage,
-       kSmbSharesSubPage,
-+      kChromeUIProxyConfigHost,
-       kStorageSubPage,
-       kStylusSubPage,
-       kSwitchAccessSubPage,
+ const char kChromeUIChromeURLsHost[] = "chrome-urls";
+ const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
+ const char kChromeUIComponentsHost[] = "components";
+@@ -346,6 +348,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+     kChromeUIMobileSetupHost,
+     kChromeUIMultiDeviceSetupHost,
+     kChromeUINetworkHost,
+    kChromeUIProxyConfigHost,
+     kChromeUIOobeHost,
+     kChromeUIOSCreditsHost,
+     kChromeUIOSSettingsHost,
@@ -568,6 +571,7 @@ const char* const kChromeHostURLs[] = {
 #if !defined(OS_ANDROID)
- #if !defined(OS_CHROMEOS)
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
     kChromeUIAppLauncherPageHost,
 +    kChromeUIProxyConfigHost,
 #endif
@@ -1007,7 +1146,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
-@@ -105,6 +105,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -125,6 +125,8 @@ extern const char kChromeUIMemoryInternalsHost[];
 extern const char kChromeUINTPTilesInternalsHost[];
 extern const char kChromeUINaClHost[];
 extern const char kChromeUINetExportHost[];
@@ -1019,15 +1158,26 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
 diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc
 --- a/components/policy/core/browser/proxy_policy_handler.cc
 +++ b/components/policy/core/browser/proxy_policy_handler.cc
-@@ -199,7 +199,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
-           bypass_list->GetAsString(&bypass_list_string);
-         prefs->SetValue(proxy_config::prefs::kProxy,
-                         ProxyConfigDictionary::CreateFixedServers(
-                            proxy_server, bypass_list_string));
-+                            proxy_server, bypass_list_string, false));
+@@ -207,7 +207,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+             ProxyConfigDictionary::CreateFixedServers(
+                 server->GetString(), bypass_list && bypass_list->is_string()
+                                          ? bypass_list->GetString()
+-                                         : std::string()));
+                                         : std::string(), false));
       }
       break;
     }
+diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
+--- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
+@@ -380,6 +380,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+       if (proxy_dict.GetBypassList(&proxy_bypass)) {
+         proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
+       }
+      proxy_config.proxy_rules().reverse_bypass = proxy_dict.HasReverseBypass();
+       *config = net::ProxyConfigWithAnnotation(
+           proxy_config, kSettingsProxyConfigTrafficAnnotation);
+       return true;
 diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/proxy_config/proxy_config_dictionary.cc
 --- a/components/proxy_config/proxy_config_dictionary.cc
 +++ b/components/proxy_config/proxy_config_dictionary.cc
@@ -1040,7 +1190,22 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 
 }  // namespace
 
-@@ -79,29 +81,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
+@@ -72,6 +74,14 @@ bool ProxyConfigDictionary::HasBypassList() const {
+   return dict_.FindKey(kProxyBypassList);
+ }
+ 
+bool ProxyConfigDictionary::HasReverseBypass() const {
+  const base::Value* value = dict_.FindKey(kProxyReverseBypass);
+  if (!value || !value->is_bool()) {
+    return false;
+  }
+  return value->GetBool();
+}
+
+ const base::Value& ProxyConfigDictionary::GetDictionary() const {
+   return dict_;
+ }
+@@ -79,29 +89,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
 // static
 base::Value ProxyConfigDictionary::CreateDirect() {
   return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
@@ -1076,7 +1241,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   } else {
     return CreateDirect();
   }
-@@ -110,7 +113,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
+@@ -110,7 +121,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
 // static
 base::Value ProxyConfigDictionary::CreateSystem() {
   return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
@@ -1085,7 +1250,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 }
 
 // static
-@@ -119,7 +122,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -119,7 +130,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
     const std::string& pac_url,
     bool pac_mandatory,
     const std::string& proxy_server,
@@ -1095,7 +1260,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   base::Value dict(base::Value::Type::DICTIONARY);
   dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode)));
   if (!pac_url.empty()) {
-@@ -128,8 +132,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -128,8 +140,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
   }
   if (!proxy_server.empty())
     dict.SetKey(kProxyServer, base::Value(proxy_server));
@@ -1110,7 +1275,15 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/proxy_config/proxy_config_dictionary.h
 --- a/components/proxy_config/proxy_config_dictionary.h
 +++ b/components/proxy_config/proxy_config_dictionary.h
-@@ -46,7 +46,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+@@ -38,6 +38,7 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+   bool GetProxyServer(std::string* out) const;
+   bool GetBypassList(std::string* out) const;
+   bool HasBypassList() const;
+  bool HasReverseBypass() const;
+ 
+   const base::Value& GetDictionary() const;
+ 
+@@ -46,7 +47,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
   static base::Value CreatePacScript(const std::string& pac_url,
                                      bool pac_mandatory);
   static base::Value CreateFixedServers(const std::string& proxy_server,
@@ -1120,7 +1293,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
   static base::Value CreateSystem();
 
   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
-@@ -62,7 +63,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+@@ -62,7 +64,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
                                       const std::string& pac_url,
                                       bool pac_mandatory,
                                       const std::string& proxy_server,
@@ -1133,7 +1306,16 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -140,6 +140,51 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -110,7 +110,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+                                    &single_proxies,
+                                    ProxyServer::SCHEME_HTTP);
+         type = Type::PROXY_LIST;
+-        return;
+        continue;
+       }
+ 
+       // Trim whitespace off the url scheme.
+@@ -141,6 +141,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
   }
 }
 
@@ -1142,13 +1324,18 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +    return "";
 +  }
 +
-+  // special case: a single proxy server specified
+  // special case: a single proxy servers list specified
 +  if (type == Type::PROXY_LIST) {
-+    if (single_proxies.size() == 1) {
-+      return single_proxies.Get().ToURI();
+    std::string proxy_list;
+    for (const ProxyServer& proxy_server :
+         single_proxies.GetAll()) {
+      proxy_list += proxy_server.ToURI() + ";";
 +    }
-+    // more than 1 proxies or 0 proxies is unexpected
-+    return "";
+    // remove last semicolon
+    if (proxy_list.length() != 0 ) {
+      proxy_list.pop_back();
+    }
+    return proxy_list;
 +  }
 +
 +  if (type != Type::PROXY_LIST_PER_SCHEME) {
@@ -5,19 +5,30 @@ 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.
+Enable incognito custom tabs and fix crashes for incognito/custom tab intents (credits to @uazo)
 ---
 chrome/android/chrome_java_sources.gni        |  1 +
 .../java/res/xml/privacy_preferences.xml      |  5 ++
- .../AlwaysIncognitoLinkInterceptor.java       | 74 +++++++++++++++++++
- .../chrome/browser/ChromeActivity.java        |  4 +
+ .../AlwaysIncognitoLinkInterceptor.java       | 80 +++++++++++++++++++
 .../chrome/browser/ChromeTabbedActivity.java  |  6 +-
+ .../chrome/browser/app/ChromeActivity.java    |  4 +
 .../AppMenuPropertiesDelegateImpl.java        |  6 ++
- .../ChromeContextMenuPopulator.java           |  9 ++-
- .../browser/tabmodel/ChromeTabCreator.java    | 20 ++++-
- .../ui/appmenu/AppMenuHandlerImpl.java        |  1 +
- .../strings/android_chrome_strings.grd        |  8 ++
- 10 files changed, 130 insertions(+), 4 deletions(-)
+ .../ChromeContextMenuPopulator.java           |  8 +-
+ .../CustomTabActivityLifecycleUmaTracker.java | 25 ------
+ .../CustomTabIntentDataProvider.java          |  5 +-
+ .../browser/init/StartupTabPreloader.java     | 14 +++-
+ .../privacy/settings/PrivacySettings.java     | 37 ++++++++-
+ .../browser/settings/SettingsActivity.java    |  4 +
+ .../browser/tabmodel/ChromeTabCreator.java    | 16 +++-
+ .../browser/tabmodel/TabPersistentStore.java  | 10 +++
+ .../webapps/WebappIntentDataProvider.java     | 14 ++++
+ .../flags/android/chrome_feature_list.cc      |  2 +-
+ .../strings/android_chrome_strings.grd        | 13 +++
+ chrome/browser/ui/messages/android/BUILD.gn   |  1 +
+ .../snackbar/INeedSnackbarManager.java        | 27 +++++++
+ 19 files changed, 243 insertions(+), 35 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
+ create mode 100644 chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java

 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
@@ -29,27 +40,27 @@ 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/AfterStartupTaskUtils.java",
+   "java/src/org/chromium/chrome/browser/ActivityUtils.java",
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -20,6 +20,11 @@
-         android:title="@string/preload_pages_title"
-         android:summary="@string/preload_pages_summary"
-         android:persistent="false" />
-+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+@@ -28,6 +28,11 @@
+         android:key="secure_dns"
+         android:title="@string/settings_secure_dns_title"
+         android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        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.settings.privacy.DoNotTrackPreference"
+         android:fragment="org.chromium.chrome.browser.privacy.settings.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,74 @@
+@@ -0,0 +1,80 @@
 +/* 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/. */
@@ -62,9 +73,10 @@ new file mode 100644
 +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;
+import org.chromium.url.GURL;
 +
 +import java.util.HashMap;
 +import java.util.HashSet;
@@ -99,14 +111,17 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public void onUpdateUrl(final Tab tab, final String url) {
+    public void onUpdateUrl(Tab tab, GURL gurl) {
 +
 +        if (tab == null) return;
-+        if (url == null) return;
+        if (gurl == null) return;
 +        if (tab.isIncognito()) return;
 +        if (alwaysIncognitoContainer == null) return;
 +
-+        final String lastUrl = lastUrls.put(tab, url);
+        String spec = gurl.getValidSpecOrEmpty();
+        if (spec == null) return;
+
+        final String lastUrl = lastUrls.put(tab, spec);
 +
 +        if (!alwaysIncognitoContainer.getBoolean(PREF_ALWAYS_INCOGNITO, false)) return;
 +        if (revertingTabs.contains(tab)) {
@@ -114,9 +129,11 @@ new file mode 100644
 +            return;
 +        }
 +
-+        ((TabImpl) tab).getActivity().getTabCreator(true).createNewTab(new LoadUrlParams(url), TabLaunchType.FROM_LINK, tab);
+        ((ChromeTabbedActivity)tab.getWindowAndroid().getActivity().get())
+            .getTabCreator(true)
+            .createNewTab(new LoadUrlParams(spec), TabLaunchType.FROM_LINK, tab);
 +
-+        if ((url.equals(lastUrl)) || (!tab.canGoBack())) {
+        if ((spec.equals(lastUrl)) || (!tab.canGoBack())) {
 +            // this call was triggered by a reload
 +        } else {
 +            revertingTabs.add(tab);
@@ -124,57 +141,57 @@ 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
-@@ -54,6 +54,7 @@ import org.chromium.base.annotations.UsedByReflection;
- import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
- 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;
-@@ -1680,6 +1681,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             throw new IllegalStateException(
-                     "Attempting to access TabCreator before initialization");
-         }
-+        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/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
-@@ -50,6 +50,7 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
+@@ -56,6 +56,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
 import org.chromium.base.task.PostTask;
+ import org.chromium.cc.input.BrowserControlsState;
 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;
-@@ -1609,8 +1610,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1756,8 +1757,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
         Bundle savedInstanceState = getSavedInstanceState();
 
         // We determine the model as soon as possible so every systems get initialized coherently.
 -        boolean startIncognito = savedInstanceState != null
-                && savedInstanceState.getBoolean("is_incognito_selected", false);
+-                && 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;
+                && savedInstanceState.getBoolean(IS_INCOGNITO_SELECTED, false));
 
-         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
-@@ -289,6 +289,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-                             ChromeSwitches.ENABLE_VR_SHELL_DEV));
+         mNextTabPolicySupplier = new ChromeNextTabPolicySupplier(mOverviewModeBehaviorSupplier);
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+@@ -101,6 +101,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
+ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate;
+ import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
+ import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
+ import org.chromium.chrome.browser.device.DeviceClassManager;
+@@ -1872,6 +1873,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             throw new IllegalStateException(
+                     "Attempting to access TabCreator before initialization");
         }
+        if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)) {
+            incognito = true;
+        }
+         return mTabCreatorManagerSupplier.get().getTabCreator(incognito);
+     }
 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+@@ -378,6 +378,12 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+     }
+ 
+     private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
 +        if (ContextUtils.getAppSharedPreferences().getBoolean("always_incognito", false)) {
 +            final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id);
 +            if (newTabOption != null)
@@ -183,65 +200,259 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu
 +
         // 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()
+         boolean isMenuGroupTabsVisible = TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext)
 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
-@@ -17,7 +17,9 @@ import androidx.annotation.IntDef;
- import org.chromium.base.Supplier;
- import org.chromium.base.library_loader.LibraryProcessType;
+@@ -31,6 +31,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.metrics.RecordHistogram;
-+import org.chromium.base.ContextUtils;
+ import org.chromium.base.supplier.Supplier;
 import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
- import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabPanel;
+ import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
-@@ -308,7 +310,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(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)
-+                       && !mDelegate.isIncognito()) {
-+                    // disallow open in new tab
-+                } else
-+                    linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_NEW_TAB));
+ import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
+@@ -409,6 +410,10 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+         boolean hasSaveImage = false;
+         mShowEphemeralTabNewLabel = null;
+ 
+        boolean always_incognito =
+            ContextUtils.getAppSharedPreferences().getBoolean(
+                AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false);
 +
-                 if (!mDelegate.isIncognito() && mDelegate.isIncognitoSupported()) {
-                     linkTab.add(new ChromeContextMenuItem(Item.OPEN_IN_INCOGNITO_TAB));
+         List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
+ 
+         if (mParams.isAnchor()) {
+@@ -427,6 +432,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+                             linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
+                         }
+                     }
+
+                     if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
+                         linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
+                     }
+@@ -451,7 +457,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                 }
+             }
+             if (FirstRunStatus.getFirstRunFlowComplete()) {
+-                if (!mItemDelegate.isIncognito()
+                if ((always_incognito || !mItemDelegate.isIncognito())
+                         && UrlUtilities.isDownloadableScheme(mParams.getLinkUrl())) {
+                     linkGroup.add(createListItem(Item.SAVE_LINK_AS));
+                 }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
+@@ -39,31 +39,6 @@ public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNati
+     private boolean mIsInitialResume = true;
+ 
+     private void recordIncognitoLaunchReason() {
+-        IncognitoCustomTabIntentDataProvider incognitoProvider =
+-                (IncognitoCustomTabIntentDataProvider) mIntentDataProvider;
+-
+-        @IntentHandler.IncognitoCCTCallerId
+-        int incognitoCCTCallerId = incognitoProvider.getFeatureIdForMetricsCollection();
+-        RecordHistogram.recordEnumeratedHistogram("CustomTabs.IncognitoCCTCallerId",
+-                incognitoCCTCallerId, IntentHandler.IncognitoCCTCallerId.NUM_ENTRIES);
+-
+-        // Record which 1P app launched Incognito CCT.
+-        if (incognitoCCTCallerId == IntentHandler.IncognitoCCTCallerId.GOOGLE_APPS) {
+-            String sendersPackageName = incognitoProvider.getSendersPackageName();
+-            @IntentHandler.ExternalAppId
+-            int externalId = IntentHandler.mapPackageToExternalAppId(sendersPackageName);
+-            if (externalId != IntentHandler.ExternalAppId.OTHER) {
+-                RecordHistogram.recordEnumeratedHistogram("CustomTabs.ClientAppId.Incognito",
+-                        externalId, IntentHandler.ExternalAppId.NUM_ENTRIES);
+-            } else {
+-                // Using package name didn't give any meaningful insight on who launched the
+-                // Incognito CCT, falling back to check if they provided EXTRA_APPLICATION_ID.
+-                externalId =
+-                        IntentHandler.determineExternalIntentSource(incognitoProvider.getIntent());
+-                RecordHistogram.recordEnumeratedHistogram("CustomTabs.ClientAppId.Incognito",
+-                        externalId, IntentHandler.ExternalAppId.NUM_ENTRIES);
+-            }
+-        }
+     }
+ 
+     private void recordUserAction() {
+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
+@@ -50,6 +50,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+ import org.chromium.components.embedder_support.util.UrlConstants;
+ import org.chromium.device.mojom.ScreenOrientationLockType;
+ 
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ import java.util.ArrayList;
+@@ -727,7 +730,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+ 
+     @Override
+     public boolean isIncognito() {
+-        return false;
+        return ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false);
+     }
+ 
+     @Nullable
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+@@ -34,6 +34,9 @@ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.url.GURL;
+ 
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+
+ /**
+  * This class attempts to preload the tab if the url is known from the intent when the profile
+  * is created. This is done to improve startup latency.
+@@ -185,17 +188,22 @@ public class StartupTabPreloader implements ProfileManager.Observer, DestroyObse
+         Intent intent = mIntentSupplier.get();
+         GURL url = UrlFormatter.fixupUrl(getUrlFromIntent(intent));
+ 
+        boolean isIncognito = ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false);
+
+        Profile profile = Profile.getLastUsedRegularProfile();
+         ChromeTabCreator chromeTabCreator =
+-                (ChromeTabCreator) mTabCreatorManager.getTabCreator(false);
+                (ChromeTabCreator) mTabCreatorManager.getTabCreator(isIncognito);
+         WebContents webContents =
+-                WebContentsFactory.createWebContents(Profile.getLastUsedRegularProfile(), false);
+                WebContentsFactory.createWebContents(
+                    isIncognito ? profile.getPrimaryOTRProfile(true /* createIfNeeded */) : profile,
+                    false);
+ 
+         mLoadUrlParams = mIntentHandler.createLoadUrlParamsForIntent(url.getSpec(), intent);
+ 
+         // Create a detached tab, but don't add it to the tab model yet. We'll do that
+         // later if the loadUrlParams etc... match.
+         mTab = TabBuilder.createLiveTab(false)
+-                       .setIncognito(false)
+                       .setIncognito(isIncognito)
+                        .setLaunchType(TabLaunchType.FROM_EXTERNAL_APP)
+                        .setWindow(mWindowAndroid)
+                        .setWebContents(webContents)
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -27,6 +27,10 @@ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
+ import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
+ import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+import org.chromium.chrome.browser.ApplicationLifetime;
+ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+ import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
+ import org.chromium.components.browser_ui.settings.SettingsLauncher;
+@@ -41,7 +45,12 @@ import org.chromium.ui.text.SpanApplier;
+  * Fragment to keep track of the all the privacy related preferences.
+  */
+ public class PrivacySettings
+-        extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
+        extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener,
+                                                    INeedSnackbarManager {
+    private SnackbarManager mSnackbarManager;
+    private Snackbar mSnackbar;
+
+    private static final String PREF_ALWAYS_INCOGNITO = "always_incognito";
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
+     private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
+@@ -84,6 +93,25 @@ public class PrivacySettings
+                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
+         canMakePaymentPref.setOnPreferenceChangeListener(this);
+ 
+        ChromeSwitchPreference alwaysIncognitoPref =
+                (ChromeSwitchPreference) findPreference(PREF_ALWAYS_INCOGNITO);
+        alwaysIncognitoPref.setOnPreferenceChangeListener(this);
+
+        mSnackbar = Snackbar.make(getActivity().getString(R.string.ui_relaunch_notice),
+                new SnackbarManager.SnackbarController() {
+                        @Override
+                        public void onDismissNoAction(Object actionData) { }
+
+                        @Override
+                        public void onAction(Object actionData) {
+                                ApplicationLifetime.terminate(true);
+                        }
+                }, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_UNKNOWN)
+                .setSingleLine(false)
+                .setAction(getActivity().getString(R.string.relaunch),
+                        /*actionData*/null)
+                .setDuration(/*durationMs*/70000);
+
+         ChromeSwitchPreference networkPredictionPref =
+                 (ChromeSwitchPreference) findPreference(PREF_NETWORK_PREDICTIONS);
+         networkPredictionPref.setChecked(
+@@ -115,6 +143,9 @@ public class PrivacySettings
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrivacyPreferencesManagerImpl.getInstance().setNetworkPredictionEnabled(
+                     (boolean) newValue);
+        } else if (PREF_ALWAYS_INCOGNITO.equals(key)) {
+            if (!mSnackbarManager.isShowing())
+                mSnackbarManager.showSnackbar(mSnackbar);
+         } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);
+@@ -192,4 +223,8 @@ public class PrivacySettings
+         }
+         return false;
+     }
+
+    public void setSnackbarManager(SnackbarManager manager) {
+        mSnackbarManager = manager;
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+@@ -51,6 +51,7 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
+ import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl;
+ import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
+ import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
+import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
+ import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
+@@ -171,6 +172,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+                                                           .getSiteSettingsDelegate());
+             delegate.setSnackbarManager(mSnackbarManager);
+         }
+        if (fragment instanceof INeedSnackbarManager) {
+            ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
+        }
+     }
+ 
+     @Override
 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
-@@ -10,8 +10,10 @@ import android.text.TextUtils;
- import androidx.annotation.Nullable;
+@@ -44,6 +44,10 @@ import org.chromium.url.GURL;
+ 
+ import java.nio.ByteBuffer;
 
- import org.chromium.base.Supplier;
 +import org.chromium.base.ContextUtils;
- import org.chromium.base.SysUtils;
- import org.chromium.base.TraceEvent;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
- import org.chromium.chrome.browser.ChromeActivity;
- import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.ServiceTabLauncher;
-@@ -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.TabParentIntent;
- import org.chromium.chrome.browser.tab.TabRedirectHandler;
-@@ -41,6 +44,7 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-     private final ChromeActivity mActivity;
+
+ /**
+  * This class creates various kinds of new tabs and adds them to the right {@link TabModel}.
+  */
+@@ -74,6 +78,7 @@ public class ChromeTabCreator extends TabCreator {
+     private final Activity mActivity;
     private final StartupTabPreloader mStartupTabPreloader;
     private final boolean mIncognito;
 +    private final TabObserver mExtraLogic;
 
     private WindowAndroid mNativeWindow;
     private TabModel mTabModel;
-@@ -55,6 +59,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
+@@ -96,6 +101,10 @@ public class ChromeTabCreator extends TabCreator {
         mNativeWindow = nativeWindow;
         mTabDelegateFactorySupplier = tabDelegateFactory;
         mIncognito = incognito;
@@ -249,67 +460,142 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 +            mExtraLogic = new AlwaysIncognitoLinkInterceptor(ContextUtils.getAppSharedPreferences());
 +        else
 +            mExtraLogic = null;
+         mOverviewNTPCreator = overviewNTPCreator;
+         mAsyncTabParamsManager = asyncTabParamsManager;
+         mTabModelSelectorSupplier = tabModelSelectorSupplier;
+@@ -259,6 +268,8 @@ public class ChromeTabCreator extends TabCreator {
+             if (creationState == TabCreationState.LIVE_IN_FOREGROUND && !openInForeground) {
+                 creationState = TabCreationState.LIVE_IN_BACKGROUND;
+             }
+            if (mExtraLogic != null)
+                tab.addObserver(mExtraLogic);
+             mTabModel.addTab(tab, position, type, creationState);
+             return tab;
+         } finally {
+@@ -293,6 +304,8 @@ public class ChromeTabCreator extends TabCreator {
+         @TabCreationState
+         int creationState = openInForeground ? TabCreationState.LIVE_IN_FOREGROUND
+                                              : TabCreationState.LIVE_IN_BACKGROUND;
+        if (mExtraLogic != null)
+            tab.addObserver(mExtraLogic);
+         mTabModel.addTab(tab, position, type, creationState);
+         return true;
+     }
+@@ -333,7 +346,6 @@ public class ChromeTabCreator extends TabCreator {
+     // TODO(crbug.com/1081924): Clean up the launches from SearchActivity/Chrome.
+     public Tab launchUrlFromExternalApp(
+             LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
+-        assert !mIncognito;
+         // Don't re-use tabs for intents from Chrome. Note that this can be spoofed so shouldn't be
+         // relied on for anything security sensitive.
+         boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName());
+@@ -428,6 +440,8 @@ public class ChromeTabCreator extends TabCreator {
+                           .setSerializedCriticalPersistedTabData(serializedCriticalPersistedTabData)
+                           .build();
+         }
+        if (mExtraLogic != null)
+            tab.addObserver(mExtraLogic);
+ 
+         if (isIncognito != mIncognito) {
+             throw new IllegalStateException("Incognito state mismatch. TabState: "
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+@@ -18,6 +18,7 @@ import androidx.core.util.AtomicFile;
+ 
+ import org.chromium.base.Callback;
+ import org.chromium.base.CallbackController;
+import org.chromium.base.ContextUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.StreamUtil;
+@@ -56,6 +57,8 @@ import org.chromium.content_public.browser.LoadUrlParams;
+ import org.chromium.content_public.browser.UiThreadTaskTraits;
+ import org.chromium.url.GURL;
+ 
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+
+ import java.io.BufferedInputStream;
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+@@ -687,6 +690,13 @@ public class TabPersistentStore {
+                 }
+             }
+         }
+        if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)) {
+            if (!isIncognito) {
+                Log.w(TAG, "Failed to restore tab: not in incognito mode.");
+                return;
+            }
+        }
+
+         TabModel model = mTabModelSelector.getModel(isIncognito);
+ 
+         if (model.isIncognito() != isIncognito) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
+@@ -28,6 +28,9 @@ import org.chromium.chrome.browser.browserservices.intents.WebappExtras;
+ import org.chromium.chrome.browser.flags.ActivityType;
+ import org.chromium.components.browser_ui.widget.TintedDrawable;
+ 
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+
+ /**
+  * Stores info about a web app.
+  */
+@@ -41,6 +44,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+     private final Intent mIntent;
+     private final ColorProviderImpl mColorProvider;
+ 
+    private boolean mIsIncognito = false;
+
+     /**
+      * Returns the toolbar color to use if a custom color is not specified by the webapp.
+      */
+@@ -62,6 +67,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+         mWebappExtras = webappExtras;
+         mWebApkExtras = webApkExtras;
+         mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP;
+
+        if (ContextUtils.getAppSharedPreferences().getBoolean(AlwaysIncognitoLinkInterceptor.PREF_ALWAYS_INCOGNITO, false)) {
+            mIsIncognito = true;
+        }
     }
 
     @Override
-@@ -190,6 +198,9 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-                         tab.getWebContents());
-             }
- 
-+            if (mExtraLogic != null)
-+                tab.addObserver(mExtraLogic);
-+
-             mTabModel.addTab(tab, position, type);
-             return tab;
-         } finally {
-@@ -221,6 +232,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-                           .setDelegateFactory(delegateFactory)
-                           .setInitiallyHidden(!openInForeground)
-                           .build();
-+
-+        if (mExtraLogic != null)
-+            tab.addObserver(mExtraLogic);
-+
-         mTabModel.addTab(tab, position, type);
-         return true;
+@@ -150,6 +159,11 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+         return mWebApkExtras;
     }
-@@ -263,7 +278,6 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-      */
-     public Tab launchUrlFromExternalApp(String url, String referer, String headers,
-             String appId, boolean forceNewTab, Intent intent, long intentTimestamp) {
-        assert !mIncognito;
-         boolean isLaunchedFromChrome = TextUtils.equals(appId, mActivity.getPackageName());
 
-         // If an external app sends an intent for a Weblite URL and the Data Reduction Proxy is
-@@ -330,6 +344,10 @@ public class ChromeTabCreator extends TabCreatorManager.TabCreator {
-                           .setTabState(state)
-                           .build();
-         assert state.isIncognito() == mIncognito;
+    @Override
+    public boolean isIncognito() {
+        return mIsIncognito;
+    }
 +
-+        if (mExtraLogic != null)
-+            tab.addObserver(mExtraLogic);
-+
-         mTabModel.addTab(tab, index, TabLaunchType.FROM_RESTORE);
-         return tab;
-     }
-diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java
-+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java
-@@ -212,6 +212,7 @@ class AppMenuHandlerImpl
-         if (mDelegate.shouldShowHeader(appRect.height())) {
-             headerResourceId = mDelegate.getHeaderResourceId();
-         }
-+
-         mAppMenu.show(wrapper, anchorView, isByPermanentButton, rotation, appRect, pt.y,
-                 footerResourceId, headerResourceId, mHighlightMenuId, mCircleHighlight,
-                 showFromBottom, mDelegate.getCustomViewBinders());
+     @Override
+     public int getDefaultOrientation() {
+         return mWebappExtras.orientation;
+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
+@@ -447,7 +447,7 @@ const base::Feature kCCTIncognito{"CCTIncognito",
+                                   base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kCCTIncognitoAvailableToThirdParty{
+-    "CCTIncognitoAvailableToThirdParty", base::FEATURE_DISABLED_BY_DEFAULT};
+    "CCTIncognitoAvailableToThirdParty", base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kCCTPostMessageAPI{"CCTPostMessageAPI",
+                                        base::FEATURE_ENABLED_BY_DEFAULT};
 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
-@@ -699,6 +699,14 @@ CHAR-LIMIT guidelines:
-         Search and site suggestions disabled
+@@ -907,6 +907,19 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
+         Clears history from all synced devices.
       </message>
- 
 +      <!-- always incognito -->
 +      <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
 +        Open links in incognito tabs always
@@ -317,10 +603,58 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
 +        Opens links in incognito tabs when you click on new tab or on a link
 +      </message>
+      <message name="IDS_RELAUNCH" desc="Summary for always incognito mode">
+        Relaunch
+      </message>
+      <message name="IDS_UI_RELAUNCH_NOTICE" desc="Summary for always incognito mode">
+        Your changes will take effect the next time you relaunch Bromite.
+      </message>
+       <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>
+diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn
+--- a/chrome/browser/ui/messages/android/BUILD.gn
+++ b/chrome/browser/ui/messages/android/BUILD.gn
+@@ -22,6 +22,7 @@ android_resources("java_resources") {
+ android_library("java") {
+   sources = [
+     "java/src/org/chromium/chrome/browser/ui/messages/infobar/SimpleConfirmInfoBarBuilder.java",
+    "java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java",
+     "java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java",
+     "java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarCollection.java",
+     "java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java",
+diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/INeedSnackbarManager.java
+@@ -0,0 +1,27 @@
+/*
+    This file is part of Bromite.
 +
-       <!-- Themes preferences -->
-       <message name="IDS_PREFS_THEMES" desc="Title for the Themes preferences. [CHAR-LIMIT=32]">
-         Themes
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.chrome.browser.ui.messages.snackbar;
+
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+
+/**
+ * An interface that allows using snackbars in the settings
+ */
+public interface INeedSnackbarManager {
+    void setSnackbarManager(SnackbarManager manager);
+}
 -- 
 2.17.1

@@ -2,101 +2,153 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 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 +++++
- .../chrome/browser/LaunchIntentDispatcher.java        |  3 +++
- .../browser/settings/privacy/PrivacyPreferences.java  | 11 +++++++++++
- .../ui/android/strings/android_chrome_strings.grd     |  7 +++++++
- 5 files changed, 29 insertions(+)
+Add custom tab intents privacy option and force
+open external links in incognito flag.
+
+Flags are mutually exclusive.
+
+See also: https://github.com/bromite/bromite/issues/1474
+---
+ .../java/res/xml/privacy_preferences.xml      | 10 ++++++
+ .../browser/LaunchIntentDispatcher.java       | 19 ++++++++++
+ .../privacy/settings/PrivacySettings.java     | 36 +++++++++++++++++++
+ .../strings/android_chrome_strings.grd        | 15 ++++++++
+ 4 files changed, 80 insertions(+)

-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ b/chrome/android/java/res/values/values.xml
-@@ -14,6 +14,9 @@
-     <item name="top_controls_show_threshold" format="float" type="dimen">0.5</item>
-     <item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item>
- 
-+    <string name="allow_custom_tab_intents_title">Allow custom tab intents from applications</string>
-+    <string name="allow_custom_tab_intents_summary">When disabled, all custom tab intents will be processed as regular navigation instead</string>
-+
-     <!-- The number of thumbnails that the thumbnail cache can hold. -->
-     <integer name="default_thumbnail_cache_size">5</integer>
-     <!-- The number of approximation thumbnails that the approximation cache can hold. -->
 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
-@@ -29,6 +29,11 @@
-         android:fragment="org.chromium.chrome.browser.settings.privacy.DoNotTrackPreference"
+@@ -56,6 +56,16 @@
+         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
         android:key="do_not_track"
-         android:title="@string/do_not_track_title" />
-+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+         android:title="@string/do_not_track_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="allow_custom_tab_intents"
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
+        android:defaultValue="false" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="open_external_links_incognito"
+        android:title="@string/open_external_links_incognito_title"
+        android:summary="@string/open_external_links_incognito_summary"
 +        android:defaultValue="false" />
     <Preference
-         android:key="clear_browsing_data"
-         android:title="@string/clear_browsing_data_title"
+         android:key="privacy_sandbox"
+         android:title="@string/prefs_privacy_sandbox"
 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.notifications.NotificationPlatformBridge;
- import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
- import org.chromium.chrome.browser.searchwidget.SearchActivity;
- import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.settings.privacy.PrivacyPreferences;
- 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
+@@ -59,6 +59,8 @@ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ import java.util.Set;
+ 
+import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
+
+ /**
+  * Dispatches incoming intents to the appropriate activity based on the current configuration and
+  * Intent fired.
+@@ -279,6 +281,12 @@ 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))
+        if (ContextUtils.getAppSharedPreferences()
+                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
+            return false;
+        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/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
-@@ -41,6 +41,8 @@ public class PrivacyPreferences
+@@ -417,6 +425,17 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+ 
+         if (Intent.ACTION_VIEW.equals(newIntent.getAction())
+                 && !IntentHandler.wasIntentSenderChrome(newIntent)) {
+
+            if (ContextUtils.getAppSharedPreferences().getBoolean(
+                    PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
+                Context applicationContext = ContextUtils.getApplicationContext();
+                newIntent = IntentHandler.createTrustedOpenNewTabIntent(applicationContext,
+                    /*incognito*/true);
+                newIntent.setData(mIntent.getData());
+                newIntent.setPackage(applicationContext.getPackageName());
+                newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+
+             long time = SystemClock.elapsedRealtime();
+             if (!chromeTabbedTaskExists()) {
+                 newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -90,6 +90,9 @@ public class PrivacySettings
 
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
-+    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+    private ChromeSwitchPreference allowCustomTabIntentsPref;
+    private ChromeSwitchPreference openExternalLinksPref;
 +
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
-@@ -76,6 +78,10 @@ public class PrivacyPreferences
-                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
-         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+         PrivacyPreferencesManagerImpl privacyPrefManager =
+@@ -191,6 +194,9 @@ public class PrivacySettings
+         updateSummaries();
+     }
+ 
+    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+    public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
+
+     @Override
+     public boolean onPreferenceChange(Preference preference, Object newValue) {
+         String key = preference.getKey();
+@@ -222,6 +228,26 @@ public class PrivacySettings
+         } else if (PREF_INCOGNITO_TAB_HISTORY_ENABLED.equals(key)) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED, (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_SEARCH_SUGGESTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
-         }
-@@ -111,6 +117,11 @@ public class PrivacyPreferences
-                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
+
+            // PREF_ALLOW_CUSTOM_TAB_INTENTS and PREF_OPEN_EXTERNAL_LINKS_INCOGNITO
+            // are mutually exclusive
+            if((boolean)newValue && ContextUtils.getAppSharedPreferences()
+                    .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
+                openExternalLinksPref.setChecked(!(boolean)newValue);
+        } else if (PREF_OPEN_EXTERNAL_LINKS_INCOGNITO.equals(key)) {
+            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+            sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
+            sharedPreferencesEditor.apply();
+
+            // PREF_ALLOW_CUSTOM_TAB_INTENTS and PREF_OPEN_EXTERNAL_LINKS_INCOGNITO
+            // are mutually exclusive
+            if((boolean)newValue && ContextUtils.getAppSharedPreferences()
+                    .getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
+                allowCustomTabIntentsPref.setChecked(false);
         }
 
-+        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
+         return true;
+@@ -257,6 +283,16 @@ public class PrivacySettings
+             canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
+         }
+ 
+        allowCustomTabIntentsPref =
+                (ChromeSwitchPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
 +        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
 +        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
+        openExternalLinksPref =
+                (ChromeSwitchPreference) findPreference(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO);
+        openExternalLinksPref.setOnPreferenceChangeListener(this);
+        openExternalLinksPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 +
         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
         if (doNotTrackPref != null) {
-             doNotTrackPref.setSummary(prefServiceBridge.getBoolean(Pref.ENABLE_DO_NOT_TRACK)
+             doNotTrackPref.setSummary(prefService.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
-@@ -3975,6 +3975,13 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -4496,6 +4496,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <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>
@@ -106,10 +158,18 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      </message>
 +      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
 +        Allow applications to open custom tab intents, similar to webview.
+      </message>
+
+      <!-- Open External Links in Incognito -->
+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
+        Open external links in incognito
+      </message>
+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
+        Force the opening of all external links in incognito mode
 +      </message>
 
       <!-- Autofill Assistant preferences -->
-       <message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR-LIMIT=32]">
+       <!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
 -- 
 2.17.1

@@ -4,36 +4,80 @@ Subject: Add exit menu item

 Corrected Exit functionality
 ---
- chrome/android/java/res/menu/main_menu.xml                  | 2 ++
- .../src/org/chromium/chrome/browser/ChromeActivity.java     | 2 ++
+ chrome/android/java/res/menu/main_menu.xml                  | 6 ++++++
+ .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
+ .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
 .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
 .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 4 files changed, 12 insertions(+), 1 deletion(-)
+ 5 files changed, 24 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
-@@ -85,6 +85,8 @@
-             android:title="@string/menu_help" />
-         <item android:id="@+id/enter_vr_id"
-             android:title="@string/enter_vr" />
+@@ -124,6 +124,9 @@
+             android:icon="@drawable/gm_filled_cardboard_24" />
+         <item android:id="@+id/managed_by_menu_id"
+             android:title="@string/managed" />
 +        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit" />
+            android:title="@string/menu_exit"
+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
     </group>
 
     <!-- Items shown only in the tab switcher -->
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
-@@ -2177,6 +2177,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             AddToHomescreenCoordinator.showForAppMenu(
-                     this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents());
-             RecordUserAction.record("MobileMenuAddToHomescreen");
+@@ -150,6 +153,9 @@
+         <item android:id="@id/preferences_id"
+             android:title="@string/menu_settings"
+             android:icon="@drawable/settings_cog" />
+        <item android:id="@+id/exit_id"
+            android:title="@string/menu_exit"
+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
+     </group>
+ 
+     <!-- Items shown only in the tab switcher when start surface is enabled -->
+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
+@@ -206,6 +206,8 @@ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Locale;
+ 
+import org.chromium.chrome.browser.ApplicationLifetime;
+
+ /**
+  * This is the main activity for ChromeMobile when not running in document mode.  All the tabs
+  * are accessible via a chrome specific tab switching UI.
+@@ -2008,6 +2010,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+         } else if (id == R.id.close_tab) {
+             getCurrentTabModel().closeTab(currentTab, true, false, true);
+             RecordUserAction.record("MobileTabClosed");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
-         } else if (id == R.id.open_webapk_id) {
-             Context context = ContextUtils.getApplicationContext();
-             String packageName =
+         } else if (id == R.id.close_all_tabs_menu_id) {
+             // Close both incognito and normal tabs
+             getTabModelSelector().closeAllTabs();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+@@ -66,6 +66,7 @@ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ActivityTabProvider;
+ import org.chromium.chrome.browser.ActivityUtils;
+ import org.chromium.chrome.browser.AppHooks;
+import org.chromium.chrome.browser.ApplicationLifetime;
+ import org.chromium.chrome.browser.ChromeActivitySessionTracker;
+ import org.chromium.chrome.browser.ChromeApplicationImpl;
+ import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
+@@ -2303,6 +2304,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             return true;
+         }
+ 
+        if (id == R.id.exit_id) {
+            ApplicationLifetime.terminate(false);
+            return true;
+        }
+
+         if (id == R.id.update_menu_id) {
+             UpdateMenuItemHelper.getInstance().onMenuItemClicked(this);
+             return true;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
@@ -53,15 +97,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 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
-@@ -2903,6 +2903,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_PREFERENCES" desc="Menu item for opening browser preferences. [CHAR-LIMIT=27]">
-         Settings
+@@ -3144,6 +3144,9 @@ 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_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
 +        Exit
 +      </message>
-       <message name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
-         Close all tabs
+       <message 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.17.1
@@ -0,0 +1,138 @@
+From: Blaise <BlaiseD@GMail.com>
+Date: Sat, 22 Aug 2020 08:52:40 -0500
+Subject: Add flag for omnibox autocomplete filtering
+
+Adds a flag that restricts whether search history, clipboard, bookmarks
+and internal chrome:// pages will be used for the autocomplete results.
+---
+ chrome/browser/about_flags.cc                 | 21 +++++++++++++++++++
+ .../browser/autocomplete_controller.cc        | 11 ++++++++++
+ .../omnibox/browser/history_url_provider.cc   |  3 +++
+ components/omnibox/browser/search_provider.cc |  4 ++++
+ components/url_formatter/url_fixer.cc         |  4 ++++
+ 5 files changed, 43 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
+@@ -449,6 +449,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
+      base::size(kReaderModeOfferInSettings), nullptr}};
+ #endif  // OS_ANDROID
+ 
+const FeatureEntry::Choice kOmniboxAutocompleteFiltering[] = {
+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+    {"Search suggestions only",
+     "omnibox-autocomplete-filtering",
+     "search"},
+    {"Search suggestions and bookmarks",
+     "omnibox-autocomplete-filtering",
+     "search-bookmarks"},
+    {"Search suggestions and internal chrome pages",
+     "omnibox-autocomplete-filtering",
+     "search-chrome"},
+    {"Search suggestions, bookmarks, and internal chrome pages",
+     "omnibox-autocomplete-filtering",
+     "search-bookmarks-chrome"},
+};
+
+ #if defined(OS_ANDROID)
+ const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
+     {"mode", "always-none"}};
+@@ -4766,6 +4782,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
+ #endif  // !defined(OS_ANDROID)
+ 
+    {"omnibox-autocomplete-filtering",
+     "Omnibox Autocomplete Filtering",
+     "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.  ungoogled-chromium flag.",
+     kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)},
+
+ #if defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) || \
+     defined(OS_CHROMEOS)
+     {"webui-feedback", flag_descriptions::kWebuiFeedbackName,
+diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
+--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
+@@ -15,6 +15,8 @@
+ 
+ #include "base/bind.h"
+ #include "base/check_op.h"
+#include "base/containers/contains.h"
+#include "base/command_line.h"
+ #include "base/feature_list.h"
+ #include "base/format_macros.h"
+ #include "base/metrics/histogram.h"
+@@ -276,6 +278,15 @@ AutocompleteController::AutocompleteController(
+       search_service_worker_signal_sent_(false),
+       template_url_service_(provider_client_->GetTemplateURLService()) {
+   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {
+    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
+    provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
+        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
+    if (!base::Contains(flag_value, "bookmarks"))
+      provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
+    if (!base::Contains(flag_value, "chrome"))
+      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
+  }
+   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
+     providers_.push_back(new BookmarkProvider(provider_client_.get()));
+   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
+diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
+--- a/components/omnibox/browser/history_url_provider.cc
+++ b/components/omnibox/browser/history_url_provider.cc
+@@ -553,6 +553,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
+     matches_.push_back(what_you_typed_match);
+ 
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering"))
+    return;
+
+   // We'll need the history service to run both passes, so try to obtain it.
+   history::HistoryService* const history_service =
+       client()->GetHistoryService();
+diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
+--- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc
+@@ -12,6 +12,7 @@
+ #include "base/base64.h"
+ #include "base/bind.h"
+ #include "base/callback.h"
+#include "base/command_line.h"
+ #include "base/feature_list.h"
+ #include "base/i18n/break_iterator.h"
+ #include "base/i18n/case_conversion.h"
+@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
+ }
+ 
+ void SearchProvider::DoHistoryQuery(bool minimal_changes) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering"))
+    return;
+
+   // The history query results are synchronous, so if minimal_changes is true,
+   // we still have the last results and don't need to do anything.
+   if (minimal_changes)
+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
+@@ -9,6 +9,8 @@
+ #include <algorithm>
+ 
+ #include "base/check_op.h"
+#include "base/containers/contains.h"
+#include "base/command_line.h"
+ #include "base/files/file_path.h"
+ #include "base/files/file_util.h"
+ #include "base/ranges/algorithm.h"
+@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+ 
+     FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
+     if (chrome_url && !parts.host.is_valid())
+     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
+         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
+       url.append(kChromeUIDefaultHost);
+     FixupPort(trimmed, parts.port, &url);
+     FixupPath(trimmed, parts.path, &url);
+-- 
+2.17.1
+
@@ -0,0 +1,98 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Mon, 1 Feb 2021 19:18:55 +0200
+Subject: Add flag for save-data-header
+
+---
+ chrome/browser/about_flags.cc                                | 3 +++
+ chrome/browser/flag_descriptions.cc                          | 4 ++++
+ chrome/browser/flag_descriptions.h                           | 3 +++
+ content/browser/loader/browser_initiated_resource_request.cc | 5 +++--
+ services/network/public/cpp/features.cc                      | 4 ++++
+ services/network/public/cpp/features.h                       | 2 ++
+ 6 files changed, 19 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
+@@ -4500,6 +4500,9 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+ #if defined(OS_ANDROID)
+    {"enable-save-data-header", flag_descriptions::kEnableSaveDataHeaderName,
+     flag_descriptions::kEnableSaveDataHeaderDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)},
+     {"enable-command-line-on-non-rooted-devices",
+      flag_descriptions::kEnableCommandLineOnNonRootedName,
+      flag_descriptions::kEnableCommandLineOnNoRootedDescription, kOsAndroid,
+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
+@@ -1035,6 +1035,10 @@ const char kDisableKeepaliveFetchDescription[] =
+     "Disable fetch with keepalive set "
+     "(https://fetch.spec.whatwg.org/#request-keepalive-flag).";
+ 
+const char kEnableSaveDataHeaderName[] = "Enable save-data header";
+const char kEnableSaveDataHeaderDescription[] =
+    "Enable save-data header without enabling Data Saver.";
+
+ const char kExperimentalAccessibilityLanguageDetectionName[] =
+     "Experimental accessibility language detection";
+ const char kExperimentalAccessibilityLanguageDetectionDescription[] =
+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
+@@ -564,6 +564,9 @@ extern const char kDiagnosticsAppNavigationDescription[];
+ extern const char kDisableKeepaliveFetchName[];
+ extern const char kDisableKeepaliveFetchDescription[];
+ 
+extern const char kEnableSaveDataHeaderName[];
+extern const char kEnableSaveDataHeaderDescription[];
+
+ extern const char kMemlogName[];
+ extern const char kMemlogDescription[];
+ extern const char kMemlogModeMinimal[];
+diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc
+--- a/content/browser/loader/browser_initiated_resource_request.cc
+++ b/content/browser/loader/browser_initiated_resource_request.cc
+@@ -40,9 +40,10 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest(
+ 
+   // Set the Save-Data header if appropriate.
+   // https://tools.ietf.org/html/draft-grigorik-http-client-hints-03#section-7
+-  if (GetContentClient()->browser()->IsDataSaverEnabled(browser_context) &&
+  if ((GetContentClient()->browser()->IsDataSaverEnabled(browser_context) &&
+       !base::GetFieldTrialParamByFeatureAsBool(features::kDataSaverHoldback,
+-                                               "holdback_web", false)) {
+                                               "holdback_web", false)) ||
+      base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader)) {
+     if (should_update_existing_headers) {
+       headers->RemoveHeader("Save-Data");
+     }
+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
+@@ -156,6 +156,10 @@ const base::FeatureParam<std::string>
+                                                "DisabledProviders", ""};
+ 
+ // Disable special treatment on requests with keepalive set (see
+// Enable save-data header seprately, without enabled data reduction service
+const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader",
+                                           base::FEATURE_DISABLED_BY_DEFAULT};
+
+ // https://fetch.spec.whatwg.org/#request-keepalive-flag). This is introduced
+ // for investigation on the memory usage, and should not be enabled widely.
+ const base::Feature kDisableKeepaliveFetch{"DisableKeepaliveFetch",
+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
+@@ -60,6 +60,8 @@ extern const base::FeatureParam<std::string>
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kDisableKeepaliveFetch;
+ 
+extern const base::Feature kEnableSaveDataHeader;
+COMPONENT_EXPORT(NETWORK_CPP)
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kTrustTokens;
+ 
+-- 
+2.17.1
+
@@ -19,7 +19,7 @@ with limited CPU/memory resources and it is disabled by default.
 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
-@@ -706,6 +706,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+@@ -837,6 +837,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
      net::kEffectiveConnectionType4G},
 };
 
@@ -31,22 +31,22 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 // Ensure that all effective connection types returned by Network Quality
 // Estimator (NQE) are also exposed via flags.
 static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
-@@ -2663,6 +2668,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kPassiveDocumentEventListenersName,
-      flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
+@@ -3792,6 +3797,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kAndroidPictureInPictureAPIName,
+      flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)},
 +    {"max-connections-per-host", flag_descriptions::kMaxConnectionsPerHostName,
 +     flag_descriptions::kMaxConnectionsPerHostDescription, kOsAll,
 +     MULTI_VALUE_TYPE(kMaxConnectionsPerHostChoices)},
-     {"document-passive-wheel-event-listeners",
-      flag_descriptions::kPassiveDocumentWheelEventListenersName,
-      flag_descriptions::kPassiveDocumentWheelEventListenersDescription, kOsAll,
+     {"reengagement-notification",
+      flag_descriptions::kReengagementNotificationName,
+      flag_descriptions::kReengagementNotificationDescription, kOsAndroid,
 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
-@@ -1279,6 +1279,10 @@ extern const char kMediaInspectorLoggingDescription[] =
-     "project; #enable-devtools-experiments must also be enabled as well on "
-     "desktop platforms";
+@@ -1524,6 +1524,10 @@ const char kMediaHistoryDescription[] =
+     "Enables Media History which records data around media playbacks on "
+     "websites.";
 
 +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
-@@ -775,6 +775,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnPasswordsAndCreditCards[];
- extern const char kMediaInspectorLoggingName[];
- extern const char kMediaInspectorLoggingDescription[];
+@@ -877,6 +877,9 @@ extern const char kLogJsConsoleMessagesDescription[];
+ extern const char kMediaHistoryName[];
+ extern const char kMediaHistoryDescription[];
 
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -96,7 +96,7 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
-@@ -22,6 +22,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
+@@ -19,6 +19,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
 // Enables the QUIC protocol.  This is a temporary testing flag.
 NETWORK_SWITCH(kEnableQuic, "enable-quic")
 
@@ -110,29 +110,29 @@ 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_variables") {
-     "//base",
+@@ -73,6 +73,7 @@ executable("make_top_domain_list_variables") {
     "//base:i18n",
+     "//components/url_formatter/spoof_checks/common_words:common",
     "//third_party/icu",
 +    "//components/network_session_configurator/common"
   ]
   if (is_ios) {
-     libs = [ "UIKit.framework" ]
+     frameworks = [ "UIKit.framework" ]
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
@@ -20,6 +20,10 @@
+ #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/connect_job.h"
- #include "net/ssl/ssl_config.h"
 +#include "components/network_session_configurator/common/network_switches.h"
 +
 +#include "base/command_line.h"
 +#include "base/strings/string_number_conversions.h"
- 
- namespace net {
- 
-@@ -187,6 +191,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+ #include "net/ssl/ssl_config.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "url/gurl.h"
+@@ -173,6 +177,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);
@@ -13,23 +13,23 @@ 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
-@@ -1688,6 +1688,10 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-webassembly-threads", flag_descriptions::kEnableWasmThreadsName,
-      flag_descriptions::kEnableWasmThreadsDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kWebAssemblyThreads)},
+@@ -2708,6 +2708,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebRtcRemoteEventLogName,
+      flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)},
 +    {"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)},
+ #endif
+     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
+      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -894,6 +894,11 @@ const char kMemlogStackModeNative[] = "Native";
- const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
- const char kMemlogStackModePseudo[] = "Trace events";
+@@ -1120,6 +1120,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
+     "Enables image options to be surfaced in the context menu for nodes "
+     "covered by transparent overlays.";
 
 +const char kResumeBackgroundVideoName[] = "Resume background video.";
 +const char kResumeBackgroundVideoDescription[] =
@@ -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
-@@ -525,6 +525,9 @@ extern const char kEnablePortalsDescription[];
- extern const char kEnablePictureInPictureName[];
- extern const char kEnablePictureInPictureDescription[];
+@@ -632,6 +632,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
-@@ -231,11 +231,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -276,11 +276,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
 // when in background.
 const base::Feature kResumeBackgroundVideo {
   "resume-background-video",
@@ -67,7 +67,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 +   base::FEATURE_DISABLED_BY_DEFAULT
 };
 
- // Enable Media Capabilities with finch-parameters.
+ // When enabled, MediaCapabilities will check with GPU Video Accelerator
 -- 
 2.17.1

@@ -16,9 +16,9 @@ Subject: Add flag to disable IPv6 probes
 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
-@@ -3303,6 +3303,11 @@ const FeatureEntry kFeatureEntries[] = {
-          kMarkHttpAsFeatureVariations,
-          "HTTPReallyBadFinal")},
+@@ -4742,6 +4742,11 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) ||
+         // defined(OS_CHROMEOS)
 
 +    {"ipv6-probing",
 +     flag_descriptions::kIPv6ProbingName,
@@ -26,12 +26,12 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 +     FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
 +
 #if !defined(OS_ANDROID)
-     {"enable-web-authentication-testing-api",
-      flag_descriptions::kEnableWebAuthenticationTestingAPIName,
+     {"ntp-cache-one-google-bar", flag_descriptions::kNtpCacheOneGoogleBarName,
+      flag_descriptions::kNtpCacheOneGoogleBarDescription, kOsDesktop,
 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
-@@ -2520,6 +2520,10 @@ const char kContextualSearchSimplifiedServerDescription[] =
+@@ -3015,6 +3015,10 @@ const char kContextualSearchRankerQueryDescription[] =
 
 const char kContextualSearchSecondTapName[] =
     "Contextual Search second tap triggering";
@@ -45,20 +45,20 @@ 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
-@@ -528,6 +528,9 @@ extern const char kEnableNewDownloadBackendDescription[];
- extern const char kEnablePortalsName[];
- extern const char kEnablePortalsDescription[];
+@@ -689,6 +689,9 @@ extern const char kEnableWasmLazyCompilationName[];
+ extern const char kEnableWasmLazyCompilationDescription[];
 
+ 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,31 +88,31 @@ 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_variables") {
-     "//base",
+@@ -73,7 +73,8 @@ executable("make_top_domain_list_variables") {
     "//base:i18n",
+     "//components/url_formatter/spoof_checks/common_words:common",
     "//third_party/icu",
 -    "//components/network_session_configurator/common"
 +    "//components/network_session_configurator/common",
 +    "//services/network/public/cpp",
   ]
   if (is_ios) {
-     libs = [ "UIKit.framework" ]
+     frameworks = [ "UIKit.framework" ]
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -92,6 +92,7 @@
+@@ -86,6 +86,7 @@
+ #include "net/log/net_log_event_type.h"
+ #include "net/log/net_log_source.h"
+ #include "net/log/net_log_source_type.h"
+#include "services/network/public/cpp/features.h"
+ #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/datagram_client_socket.h"
- #include "net/url_request/url_request_context.h"
-+#include "services/network/public/cpp/features.h"
- #include "url/url_canon_ip.h"
- 
- #if BUILDFLAG(ENABLE_MDNS)
-@@ -3564,8 +3565,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
-   bool cached = true;
-   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
-       kIPv6ProbePeriodMs) {
+@@ -3512,8 +3513,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+   if (last_ipv6_probe_time_.is_null() ||
+       (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
+           kIPv6ProbePeriodMs) {
 -    SetLastIPv6ProbeResult(
 +
 +    if (!base::FeatureList::IsEnabled(network::features::kIPv6Probing)) {
@@ -128,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -51,6 +51,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -42,6 +42,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kThrottleDelayable{"ThrottleDelayable",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -142,15 +142,15 @@ 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
-@@ -21,6 +21,8 @@ extern const base::Feature kNetworkErrorLogging;
+@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging;
 COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kNetworkService;
 COMPONENT_EXPORT(NETWORK_CPP)
 +extern const base::Feature kIPv6Probing;
 +COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kOutOfBlinkCors;
- COMPONENT_EXPORT(NETWORK_CPP)
 extern const base::Feature kReporting;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::Feature kThrottleDelayable;
 -- 
 2.17.1

@@ -11,43 +11,43 @@ 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
-@@ -1476,6 +1476,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kAccelerated2dCanvasName,
-      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
+@@ -2643,6 +2643,9 @@ const FeatureEntry::FeatureVariation kReadLaterVariations[] = {
+ // When adding a new choice, add it to the end of the list.
+ const FeatureEntry kFeatureEntries[] = {
+ // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 +    {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName,
 +     flag_descriptions::kDisableWebGLDescription, kOsAll,
 +     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)},
-     {"composited-layer-borders", flag_descriptions::kCompositedLayerBordersName,
-      flag_descriptions::kCompositedLayerBordersDescription, kOsAll,
-      SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
+ // //tools/flags/generate_unexpire_flags.py.
+ #include "build/chromeos_buildflags.h"
+ #include "chrome/browser/unexpire_flags_gen.inc"
 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
-@@ -446,6 +446,10 @@ const char kDisableAudioForDesktopShareDescription[] =
-     "With this flag on, desktop share picker window will not let the user "
-     "choose whether to share audio.";
+@@ -613,6 +613,10 @@ const char kEnableAudioFocusEnforcementName[] = "Audio Focus Enforcement";
+ const char kEnableAudioFocusEnforcementDescription[] =
+     "Enables enforcement of a single media session having audio focus at "
+     "any one time. Requires #enable-media-session-service to be enabled too.";
+const char kDisableWebGLName[] = "WebGL";
+
+const char kDisableWebGLDescription[] = "Enable or disable all versions of WebGL";
+
 
-+const char kDisableWebGLName[] = "Disable all versions of WebGL";
-+
-+const char kDisableWebGLDescription[] = "Disable all versions of WebGL";
-+
- const char kDisableBestEffortTasksName[] = "Skip best effort tasks";
- const char kDisableBestEffortTasksDescription[] =
-     "With this flag on, tasks of the lowest priority will not be executed "
+ const char kEnableAutofillAccountWalletStorageName[] =
+     "Enable the account data storage for autofill";
 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
-@@ -287,6 +287,9 @@ extern const char kDevtoolsExperimentsDescription[];
- extern const char kDisableAudioForDesktopShareName[];
- extern const char kDisableAudioForDesktopShareDescription[];
- 
+@@ -341,6 +341,9 @@ extern const char kForceColorProfileSRGB[];
+ extern const char kForceColorProfileP3[];
+ extern const char kForceColorProfileColorSpin[];
+ extern const char kForceColorProfileSCRGBLinear[];
 +extern const char kDisableWebGLName[];
 +extern const char kDisableWebGLDescription[];
 +
- extern const char kDisableBestEffortTasksName[];
- extern const char kDisableBestEffortTasksDescription[];
+ extern const char kForceColorProfileHDR10[];
 
+ extern const char kForceColorProfileName[];
 -- 
 2.17.1

@@ -0,0 +1,55 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 25 May 2021 19:46:14 +0200
+Subject: Add flag to disable external intent requests
+
+---
+ chrome/browser/about_flags.cc       | 3 +++
+ chrome/browser/flag_descriptions.cc | 6 ++++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ 3 files changed, 12 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
+@@ -2697,6 +2697,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebrtcCaptureMultiChannelApmName,
+      flag_descriptions::kWebrtcCaptureMultiChannelApmDescription, kOsAll,
+      FEATURE_VALUE_TYPE(features::kWebRtcEnableCaptureMultiChannelApm)},
+    {"disable-external-intent-requests", flag_descriptions::kDisableExternalIntentRequestsName,
+     flag_descriptions::kDisableExternalIntentRequestsDescription, kOsAll,
+     SINGLE_DISABLE_VALUE_TYPE("disable-external-intent-requests")},
+     {"disable-webrtc-hw-decoding", flag_descriptions::kWebrtcHwDecodingName,
+      flag_descriptions::kWebrtcHwDecodingDescription, kOsAndroid | kOsCrOS,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
+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
+@@ -3272,6 +3272,12 @@ const char kProcessSharingWithStrictSiteInstancesDescription[] =
+     "separated like strict site isolation, but process selection puts multiple "
+     "site instances in a single process.";
+ 
+const char kDisableExternalIntentRequestsName[] =
+    "Never forward URL requests to external intents";
+const char kDisableExternalIntentRequestsDescription[] =
+    "URL requests will never"
+    "allow for redirecting to an external intent.";
+
+ const char kQueryTilesName[] = "Show query tiles";
+ const char kQueryTilesDescription[] = "Shows query tiles in Chrome";
+ const char kQueryTilesNTPName[] = "Show query tiles in NTP";
+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
+@@ -1883,6 +1883,9 @@ extern const char kQueryTilesNTPDescription[];
+ extern const char kQueryTilesOmniboxName[];
+ extern const char kQueryTilesOmniboxDescription[];
+ extern const char kQueryTilesSingleTierName[];
+extern const char kDisableExternalIntentRequestsName[];
+extern const char kDisableExternalIntentRequestsDescription[];
+
+ extern const char kQueryTilesSingleTierDescription[];
+ extern const char kQueryTilesEnableQueryEditingName[];
+ extern const char kQueryTilesEnableQueryEditingDescription[];
+-- 
+2.17.1
+
@@ -0,0 +1,58 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 18 Oct 2021 20:50:48 +0200
+Subject: Add flag to disable pull to refresh effect
+
+---
+ chrome/browser/about_flags.cc       | 6 ++++++
+ chrome/browser/flag_descriptions.cc | 6 ++++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ 3 files changed, 15 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
+@@ -7477,6 +7477,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kPrivacyReviewDescription, kOsDesktop | kOsAndroid,
+      FEATURE_VALUE_TYPE(features::kPrivacyReview)},
+ 
+#if defined(OS_ANDROID)
+    {switches::kDisablePullToRefreshEffect, flag_descriptions::kDisablePullToRefreshEffectName,
+     flag_descriptions::kDisablePullToRefreshEffectDescription, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)},
+#endif
+
+ #if defined(OS_ANDROID)
+     {"google-mobile-services-passwords",
+      flag_descriptions::kUnifiedPasswordManagerAndroidName,
+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
+@@ -1451,6 +1451,12 @@ const char kIncognitoClearBrowsingDataDialogForDesktopDescription[] =
+     "When enabled, clear browsing data option would be enabled in Incognito "
+     "which upon clicking would show a dialog to close all Incognito windows.";
+ 
+const char kDisablePullToRefreshEffectName[] =
+    "Disable the pull-to-refresh effect when vertically overscrolling content.";
+const char kDisablePullToRefreshEffectDescription[] =
+    "Disable the pull-to-refresh effect with the elastic overscroll feature "
+    "used to indicate that the user is scrolling beyond the range of the scrollable area.";
+
+ const char kUpdateHistoryEntryPointsInIncognitoName[] =
+     "Update history entry points in Incognito.";
+ const char kUpdateHistoryEntryPointsInIncognitoDescription[] =
+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
+@@ -564,6 +564,9 @@ extern const char kDiagnosticsAppDescription[];
+ extern const char kDiagnosticsAppNavigationName[];
+ extern const char kDiagnosticsAppNavigationDescription[];
+ 
+extern const char kDisablePullToRefreshEffectName[];
+extern const char kDisablePullToRefreshEffectDescription[];
+
+ extern const char kDisableKeepaliveFetchName[];
+ extern const char kDisableKeepaliveFetchDescription[];
+ 
+-- 
+2.17.1
+
@@ -0,0 +1,155 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Jun 2021 17:35:39 +0200
+Subject: Add flag to disable vibration
+
+---
+ chrome/browser/about_flags.cc                                 | 4 ++++
+ chrome/browser/flag_descriptions.cc                           | 3 +++
+ chrome/browser/flag_descriptions.h                            | 3 +++
+ content/child/runtime_features.cc                             | 1 +
+ content/public/common/content_features.cc                     | 3 +++
+ content/public/common/content_features.h                      | 2 ++
+ third_party/blink/public/platform/web_runtime_features.h      | 1 +
+ .../blink/renderer/modules/vibration/vibration_controller.cc  | 3 +++
+ .../blink/renderer/platform/exported/web_runtime_features.cc  | 4 ++++
+ .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++++
+ 10 files changed, 28 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
+@@ -6207,6 +6207,10 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
+ #endif
+ 
+    {"enable-vibration", flag_descriptions::kEnableVibrationName,
+     flag_descriptions::kEnableVibrationDescription, kOsAll,
+     FEATURE_VALUE_TYPE(features::kVibration)},
+
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+     {"exo-gamepad-vibration", flag_descriptions::kExoGamepadVibrationName,
+      flag_descriptions::kExoGamepadVibrationDescription, kOsCrOS,
+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
+@@ -5127,6 +5127,9 @@ const char kDefaultMeetWebAppDescription[] =
+     "Enables the Meet web app to be installed by default.";
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+const char kEnableVibrationName[] = "Vibration";
+const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed.";
+
+ #if defined(OS_CHROMEOS)
+ const char kDeprecateLowUsageCodecsName[] = "Deprecates low usage media codecs";
+ const char kDeprecateLowUsageCodecsDescription[] =
+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
+@@ -2968,6 +2968,9 @@ extern const char kDefaultMeetWebAppName[];
+ extern const char kDefaultMeetWebAppDescription[];
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+extern const char kEnableVibrationName[];
+extern const char kEnableVibrationDescription[];
+
+ #if defined(OS_CHROMEOS)
+ extern const char kDeprecateLowUsageCodecsName[];
+ extern const char kDeprecateLowUsageCodecsDescription[];
+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
+@@ -102,6 +102,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+ #if defined(OS_ANDROID)
+   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
+     WebRuntimeFeatures::EnableMediaSession(false);
+  WebRuntimeFeatures::EnableVibration(base::FeatureList::IsEnabled(features::kVibration));
+ #endif
+ 
+ #if defined(OS_ANDROID)
+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
+@@ -103,6 +103,9 @@ const base::Feature kBackForwardCacheSameSiteForBots{
+ // BackForwardCacheMemoryControls is enabled only on Android to disable
+ // BackForwardCache for lower memory devices due to memory limiations.
+ #if defined(OS_ANDROID)
+// Enables vibration; an user gesture will still be required if enabled.
+const base::Feature kVibration{"Vibration",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kBackForwardCacheMemoryControls{
+     "BackForwardCacheMemoryControls", base::FEATURE_ENABLED_BY_DEFAULT};
+ #else
+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
+@@ -266,6 +266,8 @@ CONTENT_EXPORT extern const base::Feature kWarmUpNetworkProcess;
+ CONTENT_EXPORT extern const base::Feature kWebNfc;
+ #endif  // defined(OS_ANDROID)
+ 
+CONTENT_EXPORT extern const base::Feature kVibration;
+
+ #if defined(OS_MAC)
+ CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac;
+ CONTENT_EXPORT extern const base::Feature kIOSurfaceCapturer;
+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
+@@ -90,6 +90,7 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation(
+       bool);
+   BLINK_PLATFORM_EXPORT static void EnableCacheInlineScriptCode(bool);
+  BLINK_PLATFORM_EXPORT static void EnableVibration(bool);
+   BLINK_PLATFORM_EXPORT static void EnableCapabilityDelegationPaymentRequest(
+       bool enable);
+   BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable);
+diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
+--- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
+++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
+@@ -30,6 +30,7 @@
+ #include "third_party/blink/renderer/core/frame/navigator.h"
+ #include "third_party/blink/renderer/core/page/page.h"
+ #include "third_party/blink/renderer/platform/mojo/mojo_helper.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+ 
+ // Maximum number of entries in a vibration pattern.
+ const unsigned kVibrationPatternLengthMax = 99;
+@@ -149,6 +150,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+   // reference to |window| or |navigator| was retained in another window.
+   if (!navigator.DomWindow())
+     return false;
+  if (!RuntimeEnabledFeatures::VibrationEnabled())
+    return false;
+   return From(navigator).Vibrate(pattern);
+ }
+ 
+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
+@@ -182,6 +182,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
+   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
+ }
+ 
+void WebRuntimeFeatures::EnableVibration(bool enable) {
+  RuntimeEnabledFeatures::SetVibrationEnabled(enable);
+}
+
+ void WebRuntimeFeatures::EnableKeyboardAccessibleTooltip(bool enable) {
+   RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable);
+ }
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -1537,6 +1537,10 @@
+       name: "OrientationEvent",
+       status: {"Android": "stable"},
+     },
+    {
+      name: "Vibration",
+      status: "stable",
+    },
+     {
+       name: "OriginIsolationHeader",
+       status: "stable",
+-- 
+2.17.1
+
@@ -1,184 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 22 Oct 2018 21:29:53 +0200
-Subject: Add flags to disable device motion and orientation APIs
-
-Both flags will be disabled by default and prevent usage of gyroscope and
-legacy acceleration events.
---
- chrome/browser/about_flags.cc                          |  6 ++++++
- chrome/browser/flag_descriptions.cc                    |  8 ++++++++
- chrome/browser/flag_descriptions.h                     |  6 ++++++
- content/child/runtime_features.cc                      |  3 +++
- content/public/common/content_features.cc              | 10 ++++++++++
- content/public/common/content_features.h               |  2 ++
- .../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
-@@ -1714,6 +1714,12 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
-      flag_descriptions::kGpuRasterizationDescription, kOsAll,
-      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
-+    {"enable-device-motion", flag_descriptions::kEnableDeviceMotionName,
-+     flag_descriptions::kEnableDeviceMotionDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(features::kDeviceMotion)},
-+    {"enable-device-orientation", flag_descriptions::kEnableDeviceOrientationName,
-+     flag_descriptions::kEnableDeviceOrientationDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(features::kDeviceOrientation)},
-     {"enable-oop-rasterization", flag_descriptions::kOopRasterizationName,
-      flag_descriptions::kOopRasterizationDescription, kOsAll,
-      MULTI_VALUE_TYPE(kEnableOopRasterizationChoices)},
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -667,6 +667,14 @@ const char kWinrtSensorsImplementationDescription[] =
-     "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for "
-     "sensors";
- 
-+const char kEnableDeviceMotionName[] = "Enable device motion";
-+const char kEnableDeviceMotionDescription[] =
-+    "Enable device motion API which is used to detect changes in acceleration";
-+
-+const char kEnableDeviceOrientationName[] = "Enable device orientation";
-+const char kEnableDeviceOrientationDescription[] =
-+    "Enable device orientation API which is used to detect changes in orientation";
-+
- const char kEnableGenericSensorExtraClassesName[] =
-     "Generic Sensor Extra Classes";
- const char kEnableGenericSensorExtraClassesDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -409,6 +409,12 @@ extern const char kWinrtGeolocationImplementationDescription[];
- extern const char kWinrtSensorsImplementationName[];
- extern const char kWinrtSensorsImplementationDescription[];
- 
-+extern const char kEnableDeviceMotionName[];
-+extern const char kEnableDeviceMotionDescription[];
-+
-+extern const char kEnableDeviceOrientationName[];
-+extern const char kEnableDeviceOrientationDescription[];
-+
- extern const char kEnableGenericSensorExtraClassesName[];
- extern const char kEnableGenericSensorExtraClassesDescription[];
- 
-diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc
-+++ b/content/child/runtime_features.cc
-@@ -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));
-+
-       !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
-@@ -690,6 +690,16 @@ const base::Feature kExperimentalProductivityFeatures{
- // TODO(rouslan): Remove this.
- const base::Feature kWebPayments{"WebPayments",
-                                  base::FEATURE_ENABLED_BY_DEFAULT};
-+// Enables the device motion API used to track device acceleration;
-+// no user authorization or notifications happens when in use.
-+const base::Feature kDeviceMotion{"DeviceMotion",
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};
-+
-+// Enables the device orientation API used to track device orientation;
-+// no user authorization or notifications happens when in use.
-+const base::Feature kDeviceOrientation{"DeviceOrientation",
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};
-+
- 
- // Makes WebRTC use ECDSA certs by default (i.e., when no cert type was
- // specified in JS).
-diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
--- a/content/public/common/content_features.h
-+++ b/content/public/common/content_features.h
-@@ -157,6 +157,8 @@ CONTENT_EXPORT extern const base::Feature kBrowserUseDisplayThreadPriority;
- CONTENT_EXPORT extern const base::Feature kFeaturePolicyForClientHints;
- CONTENT_EXPORT extern const base::Feature kVideoPlaybackQuality;
- 
-+CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
-+
- #if defined(OS_ANDROID)
- CONTENT_EXPORT extern const base::Feature kAndroidAutofillAccessibility;
- CONTENT_EXPORT extern const base::Feature
-diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
--- a/third_party/blink/public/platform/web_runtime_features.h
-+++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -96,6 +96,8 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
-   BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
-   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
-   BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool);
-   BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
-   BLINK_PLATFORM_EXPORT static void EnableDecodeJpeg420ImagesToYUV(bool);
-diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
--- a/third_party/blink/renderer/modules/modules_initializer.cc
-+++ b/third_party/blink/renderer/modules/modules_initializer.cc
-@@ -235,9 +235,12 @@ void ModulesInitializer::InitInspectorAgentSession(
- void ModulesInitializer::OnClearWindowObjectInMainWorld(
-     Document& document,
-     const Settings& settings) const {
-  DeviceMotionController::From(document);
-  DeviceOrientationController::From(document);
-  DeviceOrientationAbsoluteController::From(document);
-+  if (RuntimeEnabledFeatures::DeviceMotionEnabled())
-+    DeviceMotionController::From(document);
-+  if (RuntimeEnabledFeatures::DeviceOrientationEnabled()) {
-+    DeviceOrientationController::From(document);
-+    DeviceOrientationAbsoluteController::From(document);
-+  }
-   NavigatorGamepad::From(document);
-   NavigatorServiceWorker::From(document);
-   DOMWindowStorageController::From(document);
-diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -173,6 +173,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
-   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
- }
- 
-+void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
-+  RuntimeEnabledFeatures::SetDeviceMotionEnabled(enable);
-+}
-+
-+void WebRuntimeFeatures::EnableDeviceOrientation(bool enable) {
-+  RuntimeEnabledFeatures::SetDeviceOrientationEnabled(enable);
-+}
-+
- void WebRuntimeFeatures::EnableKeyboardFocusableScrollers(bool enable) {
-   RuntimeEnabledFeatures::SetKeyboardFocusableScrollersEnabled(enable);
- }
-diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1162,6 +1162,14 @@
-       name: "OffscreenCanvasCommit",
-       status: "experimental",
-     },
-+    {
-+      name: "DeviceMotion",
-+      status: "stable",
-+    },
-+    {
-+      name: "DeviceOrientation",
-+      status: "stable",
-+    },
-     {
-       name: "OnDeviceChange",
-       // Android does not yet support SystemMonitor.
-- 
-2.17.1
-
@@ -0,0 +1,728 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 18 Feb 2021 21:22:52 +0100
+Subject: Add menu item to bookmark all tabs
+
+---
+ chrome/android/java/res/menu/main_menu.xml    |  7 ++
+ .../chrome/browser/ChromeTabbedActivity.java  | 26 +++++++
+ .../browser/bookmarks/BookmarkBridge.java     | 71 +++++++++++++++++--
+ .../browser/bookmarks/BookmarkUtils.java      |  4 ++
+ .../android/bookmarks/bookmark_bridge.cc      | 17 +++++
+ .../android/bookmarks/bookmark_bridge.h       |  4 ++
+ .../browser/bookmarks/bookmark_html_writer.cc |  8 ++-
+ .../bookmarks/chrome_bookmark_client.cc       |  2 +
+ .../dialogs/DownloadLocationCustomView.java   |  4 +-
+ .../strings/android_chrome_strings.grd        |  3 +
+ components/bookmark_bar_strings.grdp          |  6 ++
+ .../bookmarks/browser/bookmark_codec.cc       | 24 +++++--
+ components/bookmarks/browser/bookmark_codec.h |  7 +-
+ .../browser/bookmark_load_details.cc          |  4 ++
+ .../bookmarks/browser/bookmark_load_details.h |  2 +
+ .../bookmarks/browser/bookmark_model.cc       |  3 +-
+ components/bookmarks/browser/bookmark_model.h |  7 ++
+ components/bookmarks/browser/bookmark_node.cc | 15 ++++
+ components/bookmarks/browser/bookmark_node.h  |  5 ++
+ components/bookmarks/browser/model_loader.cc  |  3 +-
+ .../bookmark_specifics_conversions.cc         |  1 +
+ 21 files changed, 208 insertions(+), 15 deletions(-)
+
+diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
+@@ -64,6 +64,10 @@
+         <item android:id="@+id/all_bookmarks_menu_id"
+             android:title="@string/menu_bookmarks"
+             android:icon="@drawable/btn_star_filled" />
+        <item android:id="@+id/bookmark_all_tabs_menu_id"
+            android:title="@string/menu_bookmark_all_tabs"
+            android:titleCondensed="@string/menu_bookmark_all_tabs"
+            android:icon="@drawable/ic_folder_blue_24dp" />
+         <item android:id="@+id/recent_tabs_menu_id"
+             android:title="@string/menu_recent_tabs"
+             android:icon="@drawable/devices_black_24dp" />
+@@ -147,6 +151,9 @@
+         <item android:id="@+id/menu_group_tabs"
+             android:title="@string/menu_group_tabs"
+             android:icon="@drawable/ic_widgets" />
+        <item android:id="@+id/bookmark_all_tabs_menu_id"
+            android:title="@string/menu_bookmark_all_tabs"
+            android:icon="@drawable/ic_folder_blue_24dp" />
+         <item android:id="@+id/track_prices_row_menu_id"
+             android:title="@string/menu_track_prices"
+             android:icon="@drawable/ic_trending_down_black" />
+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
+@@ -68,6 +68,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier;
+ import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator;
+ import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
+ import org.chromium.chrome.browser.app.tabmodel.TabbedModeTabModelOrchestrator;
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+ import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
+ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
+ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+@@ -2020,6 +2022,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+             // Close both incognito and normal tabs
+             getTabModelSelector().closeAllTabs();
+             RecordUserAction.record("MobileMenuCloseAllTabs");
+        } else if (id == R.id.bookmark_all_tabs_menu_id) {
+            bookmarkAllTabs();
+         } else if (id == R.id.close_all_incognito_tabs_menu_id) {
+             // Close only incognito tabs
+             getTabModelSelector().getModel(true).closeAllTabs();
+@@ -2069,6 +2073,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+         mTabModalHandler.onOmniboxFocusChanged(hasFocus);
+     }
+ 
+    private void bookmarkAllTabs() {
+        TabModel tabModel = getTabModelSelector().getCurrentModel();
+        int count = tabModel.getCount();
+        Log.i(TAG, "bookmarkAllTabs(): %d tabs to bookmark", count);
+        if (count == 0) {
+            return;
+        }
+
+        final BookmarkBridge bridge = mBookmarkBridgeSupplier.get();
+        final BookmarkModel bookmarkModel = new BookmarkModel();
+        bookmarkModel.finishLoadingBookmarkModel(() -> {
+            for (int i = 0; i < tabModel.getCount(); i++) {
+                Tab tab = tabModel.getTabAt(i);
+                if (tab.isNativePage()) {
+                    continue;
+                }
+                bridge.addToTabsCollection(this, tab);
+            }
+            bridge.finishedAddingToTabsCollection(this, getSnackbarManager());
+        });
+    }
+
+     private void recordLauncherShortcutAction(boolean isIncognito) {
+         if (isIncognito) {
+             RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab");
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+@@ -4,6 +4,7 @@
+ 
+ package org.chromium.chrome.browser.bookmarks;
+ 
+import android.app.Activity;
+ import android.content.Intent;
+ import android.content.Context;
+ import android.content.pm.PackageManager;
+@@ -24,6 +25,7 @@ import androidx.annotation.Nullable;
+ import androidx.annotation.VisibleForTesting;
+ 
+ import org.chromium.base.ContextUtils;
+import org.chromium.base.Log;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.annotations.CalledByNative;
+@@ -32,6 +34,10 @@ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
+import org.chromium.chrome.R;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkType;
+ import org.chromium.components.url_formatter.SchemeDisplay;
+@@ -72,6 +78,7 @@ import java.io.File;
+  * bookmark model stored in native.
+  */
+ public class BookmarkBridge {
+    private static final String TAG = "BookmarkBridge";
+     private final Profile mProfile;
+     private boolean mIsDoingExtensiveChanges;
+     private long mNativeBookmarkBridge;
+@@ -553,6 +560,16 @@ public class BookmarkBridge {
+                 mNativeBookmarkBridge, BookmarkBridge.this);
+     }
+ 
+    /**
+     * @return The BookmarkId for the Tabs collecction folder node
+     */
+    public BookmarkId getTabsCollectionFolderId() {
+        ThreadUtils.assertOnUiThread();
+        assert mIsNativeBookmarkModelLoaded;
+        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
+                mNativeBookmarkBridge, BookmarkBridge.this);
+    }
+
+     /**
+      * @return Id representing the special "other" folder from bookmark model.
+      */
+@@ -770,14 +787,14 @@ public class BookmarkBridge {
+                 if (mDialogModel != null) return;
+ 
+                 // Actually show the dialog.
+-                mCustomView = (DownloadLocationCustomView) LayoutInflater.from(mContext).inflate(
+                mCustomView = (DownloadLocationCustomView) LayoutInflater.from(context).inflate(
+                         R.layout.download_location_dialog, null);
+-                mCustomView.initialize(
+-                        DownloadLocationDialogType.DEFAULT, new File(standardBoorkmarkName), 
+-                        /*totalBytes*/ 0, context.getString(R.string.export_bookmarks_alert_title));
+                mCustomView.initialize(DownloadLocationDialogType.DEFAULT, /*totalBytes*/ 0);
+                mCustomView.setTitle(context.getString(R.string.export_bookmarks_alert_title));
+                mCustomView.setFileName(standardBoorkmarkName);
+                 mCustomView.mDontShowAgain.setVisibility(View.GONE);
+ 
+-                Resources resources = mContext.getResources();
+                Resources resources = context.getResources();
+                 mDialogModel = new PropertyModel.Builder(ModalDialogProperties.ALL_KEYS)
+                                     .with(ModalDialogProperties.CONTROLLER, this)
+                                     .with(ModalDialogProperties.CUSTOM_VIEW, mCustomView)
+@@ -1099,6 +1116,49 @@ public class BookmarkBridge {
+                 mNativeBookmarkBridge, BookmarkBridge.this, title, url);
+     }
+ 
+    // Used to bookmark all tabs in a specific folder, created if not existing
+    public BookmarkId addToTabsCollection(Context context, Tab tab) {
+        BookmarkId parent = getTabsCollectionFolderId();
+        long existingId = getUserBookmarkIdForTab(tab);
+        if (existingId != BookmarkId.INVALID_ID) {
+            BookmarkId existingBookmarkId = new BookmarkId(existingId, BookmarkType.NORMAL);
+            BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
+            if (parent.equals(existingBookmark.getParentId())) {
+                // bookmark already exists in the tabs collection folder
+                return existingBookmarkId;
+            }
+        }
+        BookmarkId bookmarkId =
+                addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl().getSpec());
+
+        if (bookmarkId == null) {
+            Log.e(TAG,
+                    "Failed to add bookmarks: parentTypeAndId %s", parent);
+        }
+        return bookmarkId;
+     }
+
+     public void finishedAddingToTabsCollection(Activity activity, SnackbarManager snackbarManager) {
+        BookmarkId parent = getTabsCollectionFolderId();
+
+        BookmarkItem bookmarkItem = getBookmarkById(parent);
+        String folderName;
+        if (bookmarkItem != null) {
+            folderName = bookmarkItem.getTitle();
+        } else {
+            folderName = "";
+        }
+        SnackbarController snackbarController = new SnackbarController() {
+            @Override
+            public void onAction(Object actionData) {
+            }
+        };
+        Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
+                        Snackbar.UMA_BOOKMARK_ADDED)
+                        .setTemplateText(activity.getString(R.string.bookmark_page_saved_folder));
+        snackbarManager.showSnackbar(snackbar);
+    }
+
+     /**
+      * @param url The URL of the reading list item.
+      * @return The reading list item with the URL, or null if no such reading list item.
+@@ -1355,6 +1415,7 @@ public class BookmarkBridge {
+         void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
+                 List<BookmarkId> folderList, List<Integer> depthList);
+         BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+         BookmarkId getMobileFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+         BookmarkId getOtherFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+         BookmarkId getDesktopFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
+@@ -516,6 +516,7 @@ public class BookmarkUtils {
+         List<BookmarkId> topLevelFolders = new ArrayList<>();
+         BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId();
+         BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId();
+        BookmarkId tabsCollectionNodeId = bookmarkModel.getTabsCollectionFolderId();
+         BookmarkId othersNodeId = bookmarkModel.getOtherFolderId();
+ 
+         List<BookmarkId> specialFoldersIds =
+@@ -541,6 +542,9 @@ public class BookmarkUtils {
+         if (bookmarkModel.isFolderVisible(mobileNodeId)) {
+             topLevelFolders.add(mobileNodeId);
+         }
+        if (bookmarkModel.isFolderVisible(tabsCollectionNodeId)) {
+            topLevelFolders.add(tabsCollectionNodeId);
+        }
+         if (bookmarkModel.isFolderVisible(desktopNodeId)) {
+             topLevelFolders.add(desktopNodeId);
+         }
+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
+@@ -424,6 +424,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
+         top_level_folders.push_back(node.get());
+     }
+ 
+    for (const auto& node : bookmark_model_->tabs_collection_node()->children()) {
+      if (node->is_folder())
+        top_level_folders.push_back(node.get());
+    }
+
+     for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) {
+       if (node->is_folder())
+         top_level_folders.push_back(node.get());
+@@ -462,6 +467,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+   // Vector to temporarily contain all child bookmarks at same level for sorting
+   std::vector<const BookmarkNode*> bookmarks = {
+       bookmark_model_->mobile_node(),
+      bookmark_model_->tabs_collection_node(),
+       bookmark_model_->bookmark_bar_node(),
+       bookmark_model_->other_node(),
+   };
+@@ -516,6 +522,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
+   return folder_id_obj;
+ }
+ 
+ScopedJavaLocalRef<jobject> BookmarkBridge::GetTabsCollectionFolderId(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  const BookmarkNode* tabs_collection_node = bookmark_model_->tabs_collection_node();
+  ScopedJavaLocalRef<jobject> folder_id_obj =
+      JavaBookmarkIdCreateBookmarkId(
+          env, tabs_collection_node->id(), GetBookmarkType(tabs_collection_node));
+  return folder_id_obj;
+}
+
+ ScopedJavaLocalRef<jobject> BookmarkBridge::GetOtherFolderId(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj) {
+diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h
+--- a/chrome/browser/android/bookmarks/bookmark_bridge.h
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
+@@ -110,6 +110,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+       JNIEnv* env,
+       const base::android::JavaParamRef<jobject>& obj);
+ 
+  base::android::ScopedJavaLocalRef<jobject> GetTabsCollectionFolderId(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj);
+
+   base::android::ScopedJavaLocalRef<jobject> GetOtherFolderId(
+       JNIEnv* env,
+       const base::android::JavaParamRef<jobject>& obj);
+diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
+--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
+@@ -186,6 +186,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+         roots->FindDictKey(BookmarkCodec::kOtherBookmarkFolderNameKey);
+     base::Value* mobile_folder_value =
+         roots->FindDictKey(BookmarkCodec::kMobileBookmarkFolderNameKey);
+    base::Value* tabs_collection_value =
+        roots->FindDictKey(BookmarkCodec::kTabsBookmarkFolderNameKey);
+     DCHECK(root_folder_value);
+     DCHECK(other_folder_value);
+     DCHECK(mobile_folder_value);
+@@ -197,7 +199,9 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+         !WriteNode(*static_cast<base::DictionaryValue*>(other_folder_value),
+                    BookmarkNode::OTHER_NODE) ||
+         !WriteNode(*static_cast<base::DictionaryValue*>(mobile_folder_value),
+-                   BookmarkNode::MOBILE)) {
+                   BookmarkNode::MOBILE) ||
+        !WriteNode(*static_cast<base::DictionaryValue*>(tabs_collection_value),
+                   BookmarkNode::TABS_COLLECTION)) {
+       NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes);
+       return;
+     }
+@@ -464,6 +468,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
+       BookmarkModelFactory::GetForBrowserContext(profile_)->other_node());
+   ExtractUrls(
+       BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node());
+  ExtractUrls(
+      BookmarkModelFactory::GetForBrowserContext(profile_)->tabs_collection_node());
+   if (!bookmark_urls_.empty())
+     FetchNextFavicon();
+   else
+diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
+--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
+@@ -105,6 +105,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty(
+       return !is_mobile;
+     case bookmarks::BookmarkNode::MOBILE:
+       return is_mobile;
+    case bookmarks::BookmarkNode::TABS_COLLECTION:
+      return is_mobile;
+   }
+ 
+   return false;
+diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
+--- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
+++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
+@@ -75,7 +75,7 @@ public class DownloadLocationCustomView
+         mDirectoryAdapter.update();
+     }
+ 
+-    void setTitle(CharSequence title) {
+    public void setTitle(CharSequence title) {
+         mTitle.setText(title);
+     }
+ 
+@@ -83,7 +83,7 @@ public class DownloadLocationCustomView
+         mSubtitleView.setText(subtitle);
+     }
+ 
+-    void setFileName(CharSequence fileName) {
+    public void setFileName(CharSequence fileName) {
+         mFileName.setText(fileName);
+     }
+ 
+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
+@@ -3224,6 +3224,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]">
+         Track prices
+       </message>
+      <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item to bookmark all tabs. [CHAR-LIMIT=27]">
+        Bookmark all tabs
+      </message>
+       <message name="IDS_MENU_GET_IMAGE_DESCRIPTIONS" desc="Menu item to start getting alt text accessibility image labels/descriptions [CHAR_LIMIT=27]">
+         Get image descriptions
+       </message>
+diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_strings.grdp
+--- a/components/bookmark_bar_strings.grdp
+++ b/components/bookmark_bar_strings.grdp
+@@ -20,6 +20,9 @@
+     <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="Name shown in the tree for the mobile bookmarks folder">
+       Mobile bookmarks
+     </message>
+    <message name="IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME" desc="Name shown in the tree for the tabs collection bookmarks folder">
+      Tabs collection
+    </message>
+     <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder">
+       Other bookmarks
+     </message>
+@@ -34,6 +37,9 @@
+     <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the mobile bookmarks folder">
+       Mobile Bookmarks
+     </message>
+    <message name="IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME" desc="Name shown in the tree for the tabs collection bookmarks folder">
+      Tabs Collection
+    </message>
+     <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder">
+       Other Bookmarks
+     </message>
+diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
+--- a/components/bookmarks/browser/bookmark_codec.cc
+++ b/components/bookmarks/browser/bookmark_codec.cc
+@@ -33,6 +33,7 @@ const char BookmarkCodec::kRootFolderNameKey[] = "bookmark_bar";
+ const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
+ // The value is left as 'synced' for historical reasons.
+ const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
+const char BookmarkCodec::kTabsBookmarkFolderNameKey[] = "tabs";
+ const char BookmarkCodec::kVersionKey[] = "version";
+ const char BookmarkCodec::kChecksumKey[] = "checksum";
+ const char BookmarkCodec::kIdKey[] = "id";
+@@ -62,7 +63,8 @@ BookmarkCodec::~BookmarkCodec() = default;
+ base::Value BookmarkCodec::Encode(BookmarkModel* model,
+                                   const std::string& sync_metadata_str) {
+   return Encode(model->bookmark_bar_node(), model->other_node(),
+-                model->mobile_node(), model->root_node()->GetMetaInfoMap(),
+                model->mobile_node(), model->tabs_collection_node(),
+                model->root_node()->GetMetaInfoMap(),
+                 sync_metadata_str);
+ }
+ 
+@@ -70,6 +72,7 @@ base::Value BookmarkCodec::Encode(
+     const BookmarkNode* bookmark_bar_node,
+     const BookmarkNode* other_folder_node,
+     const BookmarkNode* mobile_folder_node,
+    const BookmarkNode* tabs_folder_node,
+     const BookmarkNode::MetaInfoMap* model_meta_info_map,
+     const std::string& sync_metadata_str) {
+   ids_reassigned_ = false;
+@@ -79,6 +82,7 @@ base::Value BookmarkCodec::Encode(
+   roots.SetKey(kRootFolderNameKey, EncodeNode(bookmark_bar_node));
+   roots.SetKey(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
+   roots.SetKey(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
+  roots.SetKey(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
+   if (model_meta_info_map)
+     roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map));
+   base::Value main(base::Value::Type::DICTIONARY);
+@@ -102,6 +106,7 @@ bool BookmarkCodec::Decode(const base::Value& value,
+                            BookmarkNode* bb_node,
+                            BookmarkNode* other_folder_node,
+                            BookmarkNode* mobile_folder_node,
+                           BookmarkNode* tabs_folder_node,
+                            int64_t* max_id,
+                            std::string* sync_metadata_str) {
+   ids_.clear();
+@@ -109,7 +114,8 @@ bool BookmarkCodec::Decode(const base::Value& value,
+             base::GUID::ParseLowercase(BookmarkNode::kBookmarkBarNodeGuid),
+             base::GUID::ParseLowercase(BookmarkNode::kOtherBookmarksNodeGuid),
+             base::GUID::ParseLowercase(BookmarkNode::kMobileBookmarksNodeGuid),
+-            base::GUID::ParseLowercase(BookmarkNode::kManagedNodeGuid)};
+            base::GUID::ParseLowercase(BookmarkNode::kManagedNodeGuid),
+            base::GUID::ParseLowercase(BookmarkNode::kTabsCollectionBookmarksNodeGuid)};
+   ids_reassigned_ = false;
+   guids_reassigned_ = false;
+   ids_valid_ = true;
+@@ -117,12 +123,13 @@ bool BookmarkCodec::Decode(const base::Value& value,
+   stored_checksum_.clear();
+   InitializeChecksum();
+   bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
+                              tabs_folder_node,
+                               value, sync_metadata_str);
+   FinalizeChecksum();
+   // If either the checksums differ or some IDs were missing/not unique,
+   // reassign IDs.
+   if (!ids_valid_ || computed_checksum() != stored_checksum())
+-    ReassignIDs(bb_node, other_folder_node, mobile_folder_node);
+    ReassignIDs(bb_node, other_folder_node, mobile_folder_node, tabs_folder_node);
+   *max_id = maximum_id_ + 1;
+   return success;
+ }
+@@ -172,6 +179,7 @@ base::Value BookmarkCodec::EncodeMetaInfo(
+ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+                                  BookmarkNode* other_folder_node,
+                                  BookmarkNode* mobile_folder_node,
+                                 BookmarkNode* tabs_folder_node,
+                                  const base::Value& value,
+                                  std::string* sync_metadata_str) {
+   if (!value.is_dict())
+@@ -203,6 +211,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+   DecodeNode(*root_folder_value, nullptr, bb_node);
+   DecodeNode(*other_folder_value, nullptr, other_folder_node);
+ 
+  const base::DictionaryValue* tabs_folder_d_value = nullptr;
+  const base::Value* tabs_folder_value =
+      roots->FindDictKey(kTabsBookmarkFolderNameKey);
+  if (tabs_folder_value && tabs_folder_value->GetAsDictionary(&tabs_folder_d_value))
+    DecodeNode(*tabs_folder_d_value, nullptr, tabs_folder_node);
+
+   // Fail silently if we can't deserialize mobile bookmarks. We can't require
+   // them to exist in order to be backwards-compatible with older versions of
+   // chrome.
+@@ -452,11 +466,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+ 
+ void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
+                                 BookmarkNode* other_node,
+-                                BookmarkNode* mobile_node) {
+                                BookmarkNode* mobile_node,
+                                BookmarkNode* tabs_folder_node) {
+   maximum_id_ = 0;
+   ReassignIDsHelper(bb_node);
+   ReassignIDsHelper(other_node);
+   ReassignIDsHelper(mobile_node);
+  ReassignIDsHelper(tabs_folder_node);
+   ids_reassigned_ = true;
+ }
+ 
+diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
+--- a/components/bookmarks/browser/bookmark_codec.h
+++ b/components/bookmarks/browser/bookmark_codec.h
+@@ -46,6 +46,7 @@ class BookmarkCodec {
+   base::Value Encode(const BookmarkNode* bookmark_bar_node,
+                      const BookmarkNode* other_folder_node,
+                      const BookmarkNode* mobile_folder_node,
+                     const BookmarkNode* tabs_folder_node,
+                      const BookmarkNode::MetaInfoMap* model_meta_info_map,
+                      const std::string& sync_metadata_str);
+ 
+@@ -58,6 +59,7 @@ class BookmarkCodec {
+               BookmarkNode* bb_node,
+               BookmarkNode* other_folder_node,
+               BookmarkNode* mobile_folder_node,
+              BookmarkNode* tabs_folder_node,
+               int64_t* max_node_id,
+               std::string* sync_metadata_str);
+ 
+@@ -103,6 +105,7 @@ class BookmarkCodec {
+   // Allows the BookmarkClient to read and a write a string blob from the JSON
+   // file. That string captures the bookmarks sync metadata.
+   static const char kSyncMetadata[];
+  static const char kTabsBookmarkFolderNameKey[];
+ 
+   // Possible values for kTypeKey.
+   static const char kTypeURL[];
+@@ -119,6 +122,7 @@ class BookmarkCodec {
+   bool DecodeHelper(BookmarkNode* bb_node,
+                     BookmarkNode* other_folder_node,
+                     BookmarkNode* mobile_folder_node,
+                    BookmarkNode* tabs_folder_node,
+                     const base::Value& value,
+                     std::string* sync_metadata_str);
+ 
+@@ -130,7 +134,8 @@ class BookmarkCodec {
+   // Reassigns bookmark IDs for all nodes.
+   void ReassignIDs(BookmarkNode* bb_node,
+                    BookmarkNode* other_node,
+-                   BookmarkNode* mobile_node);
+                   BookmarkNode* mobile_node,
+                   BookmarkNode* tabs_folder_node);
+ 
+   // Helper to recursively reassign IDs.
+   void ReassignIDsHelper(BookmarkNode* node);
+diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
+--- a/components/bookmarks/browser/bookmark_load_details.cc
+++ b/components/bookmarks/browser/bookmark_load_details.cc
+@@ -36,6 +36,10 @@ BookmarkLoadDetails::BookmarkLoadDetails(BookmarkClient* client)
+       root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks(
+           max_id_++,
+           client->IsPermanentNodeVisibleWhenEmpty(BookmarkNode::MOBILE))));
+  tabs_collection_folder_node_ = static_cast<BookmarkPermanentNode*>(
+      root_node_->Add(BookmarkPermanentNode::CreateTabsCollectionBookmarks(
+          max_id_++,
+          client->IsPermanentNodeVisibleWhenEmpty(BookmarkNode::TABS_COLLECTION))));
+ }
+ 
+ BookmarkLoadDetails::~BookmarkLoadDetails() = default;
+diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h
+--- a/components/bookmarks/browser/bookmark_load_details.h
+++ b/components/bookmarks/browser/bookmark_load_details.h
+@@ -42,6 +42,7 @@ class BookmarkLoadDetails {
+   BookmarkPermanentNode* bb_node() { return bb_node_; }
+   BookmarkPermanentNode* mobile_folder_node() { return mobile_folder_node_; }
+   BookmarkPermanentNode* other_folder_node() { return other_folder_node_; }
+  BookmarkPermanentNode* tabs_collection_folder_node() { return tabs_collection_folder_node_; }
+ 
+   TitledUrlIndex* index() { return index_.get(); }
+   std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); }
+@@ -96,6 +97,7 @@ class BookmarkLoadDetails {
+   BookmarkPermanentNode* bb_node_ = nullptr;
+   BookmarkPermanentNode* other_folder_node_ = nullptr;
+   BookmarkPermanentNode* mobile_folder_node_ = nullptr;
+  BookmarkPermanentNode* tabs_collection_folder_node_ = nullptr;
+   LoadManagedNodeCallback load_managed_node_callback_;
+   std::unique_ptr<TitledUrlIndex> index_;
+   BookmarkNode::MetaInfoMap model_meta_info_map_;
+diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
+--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
+@@ -562,7 +562,7 @@ bool BookmarkModel::HasBookmarks() {
+ bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   return bookmark_bar_node_->children().empty() &&
+-         other_node_->children().empty() && mobile_node_->children().empty();
+         other_node_->children().empty() && mobile_node_->children().empty() && tabs_collection_node_->children().empty();
+ }
+ 
+ bool BookmarkModel::IsBookmarked(const GURL& url) {
+@@ -804,6 +804,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+   bookmark_bar_node_ = details->bb_node();
+   other_node_ = details->other_folder_node();
+   mobile_node_ = details->mobile_folder_node();
+  tabs_collection_node_ = details->tabs_collection_folder_node();
+ 
+   titled_url_index_->SetNodeSorter(
+       std::make_unique<TypedCountSorter>(client_.get()));
+diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
+--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
+@@ -116,6 +116,12 @@ class BookmarkModel : public BookmarkUndoProvider,
+     return mobile_node_;
+   }
+ 
+  // Returns the 'mobile' node. This is NULL until loaded.
+  const BookmarkNode* tabs_collection_node() const {
+    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+    return tabs_collection_node_;
+  }
+
+   bool is_root_node(const BookmarkNode* node) const {
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+     return node == root_;
+@@ -391,6 +397,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+   BookmarkPermanentNode* bookmark_bar_node_ = nullptr;
+   BookmarkPermanentNode* other_node_ = nullptr;
+   BookmarkPermanentNode* mobile_node_ = nullptr;
+  BookmarkPermanentNode* tabs_collection_node_ = nullptr;
+ 
+   // The maximum ID assigned to the bookmark nodes in the model.
+   int64_t next_node_id_ = 1;
+diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
+--- a/components/bookmarks/browser/bookmark_node.cc
+++ b/components/bookmarks/browser/bookmark_node.cc
+@@ -60,6 +60,10 @@ const char BookmarkNode::kOtherBookmarksNodeGuid[] =
+ const char BookmarkNode::kMobileBookmarksNodeGuid[] =
+     "4cf2e351-0e85-532b-bb37-df045d8f8d0f";
+ 
+// static
+const char BookmarkNode::kTabsCollectionBookmarksNodeGuid[] =
+    "00000000-0000-4000-a000-000000000006";
+
+ // static
+ const char BookmarkNode::kManagedNodeGuid[] =
+     "323123f4-9381-5aee-80e6-ea5fca2f7672";
+@@ -225,6 +229,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
+       visible_when_empty));
+ }
+ 
+// static
+std::unique_ptr<BookmarkPermanentNode>
+BookmarkPermanentNode::CreateTabsCollectionBookmarks(int64_t id,
+                                             bool visible_when_empty) {
+  // base::WrapUnique() used because the constructor is private.
+  return base::WrapUnique(new BookmarkPermanentNode(
+      id, TABS_COLLECTION, base::GUID::ParseLowercase(kTabsCollectionBookmarksNodeGuid),
+      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME),
+      visible_when_empty));
+}
+
+ BookmarkPermanentNode::BookmarkPermanentNode(int64_t id,
+                                              Type type,
+                                              const base::GUID& guid,
+diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h
+--- a/components/bookmarks/browser/bookmark_node.h
+++ b/components/bookmarks/browser/bookmark_node.h
+@@ -36,6 +36,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode>, public TitledUrlNode {
+     FOLDER,
+     BOOKMARK_BAR,
+     OTHER_NODE,
+    TABS_COLLECTION,
+     MOBILE
+   };
+ 
+@@ -53,6 +54,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode>, public TitledUrlNode {
+   static const char kBookmarkBarNodeGuid[];
+   static const char kOtherBookmarksNodeGuid[];
+   static const char kMobileBookmarksNodeGuid[];
+  static const char kTabsCollectionBookmarksNodeGuid[];
+   static const char kManagedNodeGuid[];
+ 
+   // A bug in sync caused some problematic GUIDs to be produced.
+@@ -247,6 +249,9 @@ class BookmarkPermanentNode : public BookmarkNode {
+   static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
+       int64_t id,
+       bool visible_when_empty);
+  static std::unique_ptr<BookmarkPermanentNode> CreateTabsCollectionBookmarks(
+      int64_t id,
+      bool visible_when_empty);
+ 
+   // Constructor is private to disallow the construction of permanent nodes
+   // other than the well-known ones, see factory methods.
+diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc
+--- a/components/bookmarks/browser/model_loader.cc
+++ b/components/bookmarks/browser/model_loader.cc
+@@ -54,7 +54,8 @@ void LoadBookmarks(const base::FilePath& path,
+       std::string sync_metadata_str;
+       BookmarkCodec codec;
+       codec.Decode(*root, details->bb_node(), details->other_folder_node(),
+-                   details->mobile_folder_node(), &max_node_id,
+                   details->mobile_folder_node(),
+                   details->tabs_collection_folder_node(), &max_node_id,
+                    &sync_metadata_str);
+       details->set_sync_metadata_str(std::move(sync_metadata_str));
+       details->set_max_id(std::max(max_node_id, details->max_id()));
+diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
+--- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
+++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
+@@ -400,6 +400,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+     case bookmarks::BookmarkNode::BOOKMARK_BAR:
+     case bookmarks::BookmarkNode::OTHER_NODE:
+     case bookmarks::BookmarkNode::MOBILE:
+    case bookmarks::BookmarkNode::TABS_COLLECTION:
+       DCHECK(node->is_folder());
+       return sync_pb::BookmarkSpecifics::FOLDER;
+   }
+-- 
+2.17.1
+
@@ -0,0 +1,126 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 13 Jul 2020 00:37:06 +0200
+Subject: Add menu item to view source
+
+---
+ chrome/android/java/res/menu/custom_tabs_menu.xml  |  3 +++
+ chrome/android/java/res/menu/main_menu.xml         |  3 +++
+ .../chrome/browser/ChromeTabbedActivity.java       |  2 ++
+ .../chrome/browser/app/ChromeActivity.java         |  5 +++++
+ .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
+ .../ui/android/strings/android_chrome_strings.grd  |  4 ++++
+ 7 files changed, 32 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
+@@ -46,6 +46,9 @@
+         <item android:id="@+id/add_to_homescreen_id"
+             android:title="@string/menu_add_to_homescreen"
+             android:orderInCategory="2" />
+        <item android:id="@+id/view_source_id"
+            android:title="@string/view_source"
+            android:orderInCategory="2" />
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk"
+             android:orderInCategory="2" />
+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
+@@ -88,6 +88,9 @@
+         <item android:id="@+id/add_to_homescreen_id"
+             android:title="@string/menu_add_to_homescreen"
+             android:icon="@drawable/ic_add_to_home_screen" />
+        <item android:id="@+id/view_source_id"
+            android:title="@string/view_source"
+            android:icon="@drawable/ic_drive_document_24dp" />
+         <item android:id="@+id/open_webapk_id"
+             android:title="@string/menu_open_webapk"
+             android:icon="@drawable/ic_add_to_home_screen" />
+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
+@@ -2043,6 +2043,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
+             }
+             RecordUserAction.record("MobileMenuDownloadManager");
+        } else if (id == R.id.view_source_id) {
+            currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrl().getSpec()));
+         } else if (id == R.id.open_recently_closed_tab) {
+             TabModel currentModel = mTabModelSelector.getCurrentModel();
+             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+@@ -2429,6 +2429,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             return true;
+         }
+ 
+        if (id == R.id.view_source_id) {
+            currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrl().getSpec()));
+            return true;
+        }
+
+         if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) {
+             boolean usingDesktopUserAgent =
+                     currentTab.getWebContents().getNavigationController().getUseDesktopUserAgent();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+@@ -355,6 +355,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                         isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
+ 
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
+        updateViewSourceMenuItem(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(shouldShowReaderModePrefs(currentTab));
+@@ -845,6 +846,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         }
+     }
+ 
+    /**
+     * Updates the view source menu item's state.
+     *
+     * @param menu {@link Menu} for view source.
+     * @param currentTab      Current tab being displayed.
+     */
+    protected void updateViewSourceMenuItem(
+            Menu menu, Tab currentTab) {
+        MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
+        String url = currentTab.getUrl().getSpec();
+        viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:"));
+    }
+
+     /**
+      * 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
+@@ -214,6 +214,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             }
+ 
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
+            updateViewSourceMenuItem(menu, currentTab);
+             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+         }
+     }
+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
+@@ -299,6 +299,10 @@ CHAR_LIMIT guidelines:
+         Sign-in verifications
+       </message>
+ 
+      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">
+        View source
+      </message>
+
+       <message name="IDS_UNSUPPORTED" desc="Message displayed to the user when an attempted action is not supported.">
+         Unsupported
+       </message>
+-- 
+2.17.1
+
@@ -1,478 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 5 Dec 2019 22:41:25 +0100
-Subject: Add option to configure the ad blocker filters URL
-
---
- chrome/android/chrome_java_sources.gni        |  2 +
- .../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/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 +-
- 16 files changed, 293 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/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
-@@ -1277,6 +1277,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
-+++ b/chrome/android/java/res/layout/adblock_editor.xml
-@@ -0,0 +1,65 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
-+     Use of this source code is governed by a BSD-style license that can be
-+     found in the LICENSE file. -->
-+
-+<FrameLayout
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:app="http://schemas.android.com/apk/res-auto"
-+    xmlns:tools="http://schemas.android.com/tools"
-+    android:layout_width="match_parent"
-+    android:layout_height="match_parent" >
-+
-+    <ScrollView
-+        android:layout_width="match_parent"
-+        android:layout_height="match_parent"
-+        android:id="@+id/scroll_view"
-+        android:fillViewport="true" >
-+
-+        <LinearLayout
-+            android:layout_width="match_parent"
-+            android:layout_height="wrap_content"
-+            android:orientation="vertical"
-+            android:focusableInTouchMode="true" >
-+
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
-+                android:id="@+id/adblock_url"
-+                style="@style/PreferenceScreenLayout"
-+                android:layout_width="match_parent"
-+                android:layout_height="wrap_content" >
-+                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
-+                <EditText
-+                    tools:ignore="Autofill"
-+                    android:id="@+id/adblock_url_edit"
-+                    android:layout_width="match_parent"
-+                    android:layout_height="wrap_content"
-+                    android:inputType="textUri"
-+                    android:singleLine="true"
-+                    android:hint="@string/options_adblock_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
-+
-+            <Space style="@style/ButtonBarTopSpacer" />
-+            <View style="@style/ButtonBarTopDivider" />
-+
-+            <LinearLayout style="@style/ButtonBar" >
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/adblock_reset"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/reset" />
-+
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/adblock_cancel"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/cancel" />
-+
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/adblock_save"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/save" />
-+            </LinearLayout>
-+        </LinearLayout>
-+    </ScrollView>
-+
-+    <include layout="@layout/preferences_action_bar_shadow"/>
-+
-+</FrameLayout>
-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ b/chrome/android/java/res/values/values.xml
-@@ -69,6 +69,8 @@
-     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
-     <string name="manage_space_activity"></string>
- 
-+    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>
-+
-     <!-- Value for scaleX to mirror drawables correctly for LTR / RTL layouts. -->
-     <integer name="automirror_scale_x_reverse">-1</integer>
- 
-diff --git a/chrome/android/java/res/xml/adblock_preferences.xml b/chrome/android/java/res/xml/adblock_preferences.xml
-new file mode 100644
--- /dev/null
-+++ b/chrome/android/java/res/xml/adblock_preferences.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
-+     Use of this source code is governed by a BSD-style license that can be
-+     found in the LICENSE file. -->
-+
-+<PreferenceScreen
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:app="http://schemas.android.com/apk/res-auto">
-+
-+    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
-+        android:key="adblock_switch"
-+        android:summaryOn="@string/text_on"
-+        android:summaryOff="@string/text_off" />
-+
-+    <org.chromium.chrome.browser.settings.HyperlinkPreference
-+        android:key="adblock_help"
-+        android:title="@string/adblock_help"
-+        app:url="@string/adblock_help_url" />
-+
-+    <Preference
-+        android:key="adblock_edit"
-+        android:title="@string/options_adblock_edit_label"
-+        android:fragment="org.chromium.chrome.browser.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
-@@ -60,6 +60,11 @@
-         android:key="privacy"
-         android:order="13"
-         android:title="@string/prefs_privacy"/>
-+    <Preference
-+        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"
-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/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.settings;
-+
-+import android.os.Bundle;
-+import android.support.v4.app.Fragment;
-+import android.text.Editable;
-+import android.text.TextWatcher;
-+import android.view.LayoutInflater;
-+import android.view.View;
-+import android.view.ViewGroup;
-+import android.widget.Button;
-+import android.widget.EditText;
-+
-+import org.chromium.chrome.browser.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 AdBlock preferences.
-+ */
-+public class AdBlockEditor extends Fragment implements TextWatcher {
-+    private EditText mAdBlockFiltersUrlEdit;
-+    private Button mSaveButton;
-+    private Button mResetButton;
-+
-+    @Override
-+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-+            Bundle savedInstanceState) {
-+        super.onCreate(savedInstanceState);
-+        getActivity().setTitle(R.string.options_adblock_edit_title);
-+
-+        View v = inflater.inflate(R.layout.adblock_editor, container, false);
-+        View scrollView = v.findViewById(R.id.scroll_view);
-+        scrollView.getViewTreeObserver().addOnScrollChangedListener(
-+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
-+        mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);
-+        mAdBlockFiltersUrlEdit.setText(FeatureUtilities.getAdBlockFiltersURL());
-+        mAdBlockFiltersUrlEdit.addTextChangedListener(this);
-+        mAdBlockFiltersUrlEdit.requestFocus();
-+
-+        initializeSaveCancelResetButtons(v);
-+        return v;
-+    }
-+
-+    @Override
-+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-+    }
-+
-+    @Override
-+    public void onTextChanged(CharSequence s, int start, int before, int count) {
-+        mSaveButton.setEnabled(s.length() != 0);
-+        mResetButton.setEnabled(true);
-+    }
-+
-+    @Override
-+    public void afterTextChanged(Editable s) {
-+    }
-+
-+    private void initializeSaveCancelResetButtons(View v) {
-+        mResetButton = (Button) v.findViewById(R.id.adblock_reset);
-+        mResetButton.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                mAdBlockFiltersUrlEdit.setText(FeatureUtilities.getAdBlockFiltersURL());
-+                getActivity().finish();
-+            }
-+        });
-+
-+        mSaveButton = (Button) v.findViewById(R.id.adblock_save);
-+        mSaveButton.setEnabled(false);
-+        mSaveButton.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                FeatureUtilities.setAdBlockFiltersURL(
-+                        UrlFormatter.fixupUrl(mAdBlockFiltersUrlEdit.getText().toString()));
-+                getActivity().finish();
-+            }
-+        });
-+
-+        Button button = (Button) v.findViewById(R.id.adblock_cancel);
-+        button.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                getActivity().finish();
-+            }
-+        });
-+    }
-+}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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/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.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.settings.website.WebsitePreferenceBridge;
-+import org.chromium.chrome.browser.ContentSettingsType;
-+import org.chromium.chrome.browser.settings.SettingsUtils;
-+import org.chromium.chrome.browser.flags.FeatureUtilities;
-+import androidx.annotation.VisibleForTesting;
-+import org.chromium.chrome.R;
-+
-+/**
-+ * Fragment that allows the user to configure AdBlock related preferences.
-+ */
-+public class AdBlockPreferences extends PreferenceFragmentCompat {
-+    @VisibleForTesting
-+    public static final String PREF_ADBLOCK_SWITCH = "adblock_switch";
-+    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
-+
-+    private Preference mAdBlockEdit;
-+
-+    @Override
-+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+        getActivity().setTitle(R.string.options_adblock_title);
-+        SettingsUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
-+
-+        ChromeSwitchPreference mAdBlockSwitch =
-+                (ChromeSwitchPreference) findPreference(PREF_ADBLOCK_SWITCH);
-+        boolean isAdBlockEnabled = !WebsitePreferenceBridge.isCategoryEnabled(ContentSettingsType.ADS);
-+        mAdBlockSwitch.setChecked(isAdBlockEnabled);
-+        mAdBlockSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
-+            WebsitePreferenceBridge.setCategoryEnabled(ContentSettingsType.ADS, !(boolean) newValue);
-+            return true;
-+        });
-+
-+        mAdBlockEdit = findPreference(PREF_ADBLOCK_EDIT);
-+        updateCurrentAdBlockUrl();
-+    }
-+
-+    private void updateCurrentAdBlockUrl() {
-+        mAdBlockEdit.setSummary(FeatureUtilities.getAdBlockFiltersURL());
-+    }
-+
-+    @Override
-+    public void onResume() {
-+        super.onResume();
-+        updateCurrentAdBlockUrl();
-+    }
-+}
-diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
-+++ b/chrome/app/generated_resources.grd
-@@ -9734,6 +9734,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
-@@ -56,6 +56,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
-@@ -1030,7 +1030,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
-@@ -409,6 +409,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 =
-@@ -512,6 +514,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/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
-@@ -893,6 +893,20 @@ Your Google account may have other forms of browsing history like searches and a
-         Captions
-       </message>
- 
-+      <!-- AdBlock settings -->
-+      <message name="IDS_PREFS_ADBLOCK" desc="Title of the AdBlock Settings screen. [CHAR-LIMIT=32]">
-+        AdBlock settings
-+      </message>
-+      <message name="IDS_OPTIONS_ADBLOCK_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used to fetch the ad blocker filters.">
-+        Edit filters URL
-+      </message>
-+      <message name="IDS_OPTIONS_ADBLOCK_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used to fetch the ad blocker filters.">
-+        Filters URL
-+      </message>
-+      <message name="IDS_ADBLOCK_HELP" desc="The title of the hyperlink that allows users to visit the web page with instructions for custom ad blocker filters.">
-+        Visit help page
-+      </message>
-+
-       <!-- Site settings -->
-       <message name="IDS_PREFS_SITE_SETTINGS" desc="Title of the Website Settings screen. [CHAR-LIMIT=32]">
-         Site settings
-diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
-+++ b/chrome/common/pref_names.cc
-@@ -1974,6 +1974,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
- // capture devices without prompt.
- const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
- 
-+// Holds the URL to an indexed subresource filters file.
-+const char kAdBlockFiltersURL[] = "adblock.filters_url";
-+
- // A pref holding the value of the policy used to explicitly allow or deny
- // access to video capture devices.  When enabled or not set, the user is
- // prompted for device access.  When disabled, access to video capture devices
-diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
-+++ b/chrome/common/pref_names.h
-@@ -30,6 +30,7 @@ extern const char kDownloadRestrictions[];
- extern const char kForceEphemeralProfiles[];
- extern const char kHomePageIsNewTabPage[];
- extern const char kHomePage[];
-+extern const char kAdBlockFiltersURL[];
- extern const char kImportantSitesDialogHistory[];
- #if defined(OS_WIN)
- extern const char kLastProfileResetTimestamp[];
-diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
--- a/components/component_updater/adblock_updater_service.cc
-+++ b/components/component_updater/adblock_updater_service.cc
-@@ -46,12 +46,12 @@ const int initial_check_delay = 5,
-       next_check_delay = 60*60*24*7, // 1 week
-       on_demand_check_delay = 60; // minimum 1 minute between each on-demand check
- 
-AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service)
-+AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
-+   subresource_filter::RulesetService* ruleset_service, std::string filters_url)
-  : ruleset_service_(ruleset_service), shared_url_network_factory_(shared_url_network_factory), scheduler_(std::move(scheduler)) {
-   DCHECK(ruleset_service);
- 
-  //TODO: retrieve filters URL from config/prefs
-  filters_url_ = "https://www.bromite.org/filters/filters.dat";
-+  filters_url_ = filters_url;
- }
- 
- AdBlockUpdaterService::~AdBlockUpdaterService() {
-diff --git a/components/component_updater/adblock_updater_service.h b/components/component_updater/adblock_updater_service.h
--- a/components/component_updater/adblock_updater_service.h
-+++ b/components/component_updater/adblock_updater_service.h
-@@ -54,7 +54,8 @@ class Observer {
- // All methods are safe to call ONLY from the browser's main thread.
- class AdBlockUpdaterService {
-  public:
-  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service);
-+  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
-+                        subresource_filter::RulesetService* ruleset_service, std::string filters_url);
-   ~AdBlockUpdaterService();
- 
-   // Adds an observer for this class. An observer should not be added more
-- 
-2.17.1
-
@@ -0,0 +1,186 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Mon, 1 Feb 2021 19:18:55 +0200
+Subject: Add option to force tablet UI
+
+---
+ .../android/java/res/xml/accessibility_preferences.xml |  5 +++++
+ .../accessibility/settings/AccessibilitySettings.java  | 10 ++++++++++
+ .../browser/preferences/ChromePreferenceKeys.java      |  1 +
+ .../preferences/LegacyChromePreferenceKeys.java        |  1 +
+ .../chrome/browser/omnibox/LocationBarCoordinator.java |  2 +-
+ .../ui/android/strings/android_chrome_strings.grd      |  6 ++++++
+ .../browser/toolbar/top/ToolbarControlContainer.java   |  2 +-
+ components/BUILD.gn                                    |  4 ++--
+ ui/android/BUILD.gn                                    |  2 ++
+ .../src/org/chromium/ui/base/DeviceFormFactor.java     |  5 +++++
+ 10 files changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/chrome/android/java/res/xml/accessibility_preferences.xml b/chrome/android/java/res/xml/accessibility_preferences.xml
+--- a/chrome/android/java/res/xml/accessibility_preferences.xml
+++ b/chrome/android/java/res/xml/accessibility_preferences.xml
+@@ -29,6 +29,11 @@
+         android:key="captions"
+         android:title="@string/accessibility_captions_title"/>
+ 
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+        android:key="force_tablet_ui"
+        android:summary="@string/force_tablet_ui_summary"
+        android:title="@string/force_tablet_ui_title" />
+
+     <Preference
+         android:fragment="org.chromium.chrome.browser.image_descriptions.ImageDescriptionsSettings"
+         android:key="image_descriptions"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
+@@ -37,6 +37,7 @@ public class AccessibilitySettings
+     static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
+     static final String PREF_ACCESSIBILITY_PAGE_ZOOM = "accessibility_page_zoom";
+ 
+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
+     private TextScalePreference mTextScalePref;
+     private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
+     private boolean mRecordFontSizeChangeOnStop;
+@@ -82,6 +83,12 @@ public class AccessibilitySettings
+                                                       .getBoolean(Pref.READER_FOR_ACCESSIBILITY));
+         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
+ 
+        ChromeBaseCheckBoxPreference forceTabletUiPref =
+                (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI);
+        forceTabletUiPref.setChecked(SharedPreferencesManager.getInstance().readBoolean(
+                            ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false));
+        forceTabletUiPref.setOnPreferenceChangeListener(this);
+
+         ChromeBaseCheckBoxPreference mAccessibilityTabSwitcherPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(
+                         ChromePreferenceKeys.ACCESSIBILITY_TAB_SWITCHER);
+@@ -137,6 +144,9 @@ public class AccessibilitySettings
+             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
+         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
+             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
+            SharedPreferencesManager.getInstance().writeBoolean(
+                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, (Boolean) newValue);
+         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.READER_FOR_ACCESSIBILITY, (Boolean) newValue);
+diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+@@ -536,6 +536,7 @@ public final class ChromePreferenceKeys {
+     public static final String FONT_USER_SET_FORCE_ENABLE_ZOOM = "user_set_force_enable_zoom";
+ 
+     public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
+    public static final String FLAGS_FORCE_TABLET_UI_ENABLED = "force_tablet_ui_enabled";
+ 
+     /** Keys used to save settings related to homepage. */
+     public static final String HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";
+diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
+--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
+@@ -99,6 +99,7 @@ public class LegacyChromePreferenceKeys {
+                 ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,
+                 ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,
+                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
+                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,
+                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
+                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
+                 ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+@@ -348,7 +348,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse
+     // OmniboxSuggestionsDropdownEmbedder implementation
+     @Override
+     public boolean isTablet() {
+-        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid);
+        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout();
+     }
+ 
+     @Override
+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
+@@ -1200,6 +1200,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_SAFE_BROWSING_NO_PROTECTION_CONFIRMATION_DIALOG_CONFIRM" desc="Message for Safe Browsing no protection confirmation button.">
+         Turn off
+       </message>
+      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
+       Open chromium in Tablet Mode
+      </message>
+      <message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
+        Force Tablet Mode
+      </message>
+ 
+       <!-- Accessibility preferences -->
+       <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR_LIMIT=32]">
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+@@ -109,7 +109,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
+             // On tablet, draw a fake tab strip and toolbar until the compositor is
+             // ready to draw the real tab strip. (On phone, the toolbar is made entirely
+             // of Android views, which are already initialized.)
+-            setBackgroundResource(R.drawable.toolbar_background);
+//             setBackgroundResource(R.drawable.toolbar_background);
+         }
+     }
+ 
+diff --git a/components/BUILD.gn b/components/BUILD.gn
+--- a/components/BUILD.gn
+++ b/components/BUILD.gn
+@@ -542,7 +542,7 @@ test("components_unittests") {
+ 
+   # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency.
+   # On other platforms, no components should depend on Chrome.
+-  if (!is_chromeos_lacros) {
+  if (!is_chromeos_lacros  && !is_android) {
+     assert_no_deps = [ "//chrome/*" ]
+   }
+ 
+@@ -789,7 +789,7 @@ if (!is_ios) {
+ 
+     # On LaCrOS, tests use ash - chrome as a window manager, thus the dependency.
+     # On other platforms, no components should depend on Chrome.
+-    if (!is_chromeos_lacros) {
+    if (!is_chromeos_lacros  && !is_android) {
+       assert_no_deps = [ "//chrome/*" ]
+     }
+   }
+diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
+--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
+@@ -370,6 +370,8 @@ android_library("ui_no_recycler_view_java") {
+     ":ui_java_resources",
+     ":ui_utils_java",
+     "//base:base_java",
+    # dependency for ui_no_recycler_view_java
+    "//chrome/browser/preferences:java",
+     "//components/url_formatter/android:url_formatter_java",
+     "//third_party/androidx:androidx_annotation_annotation_java",
+     "//third_party/androidx:androidx_appcompat_appcompat_java",
+diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
+--- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
+++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
+@@ -11,6 +11,8 @@ import androidx.annotation.UiThread;
+ import org.chromium.base.ContextUtils;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+ import org.chromium.ui.R;
+ import org.chromium.ui.display.DisplayAndroid;
+ import org.chromium.ui.display.DisplayUtil;
+@@ -60,6 +62,9 @@ public class DeviceFormFactor {
+      *         E.g. http://developer.samsung.com/samsung-dex/testing
+      */
+     public static boolean isNonMultiDisplayContextOnTablet(Context context) {
+        if (SharedPreferencesManager.getInstance().readBoolean(
+                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false))
+            return true;
+         return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
+     }
+ 
+-- 
+2.17.1
+
@@ -3,45 +3,31 @@ 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 +++++
- .../chrome/browser/ChromeTabbedActivity.java         |  4 +++-
- .../browser/settings/privacy/PrivacyPreferences.java | 12 ++++++++++++
- .../ui/android/strings/android_chrome_strings.grd    |  6 ++++++
- 5 files changed, 29 insertions(+), 1 deletion(-)
+ .../android/java/res/xml/privacy_preferences.xml |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java     |  4 +++-
+ .../privacy/settings/PrivacySettings.java        | 16 +++++++++++++++-
+ .../android/strings/android_chrome_strings.grd   |  6 ++++++
+ 4 files changed, 29 insertions(+), 2 deletions(-)

-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
-@@ -63,6 +63,9 @@
-     <!-- TODO(peconn): Add help section. -->
-     <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
- 
-+    <string name="close_tabs_on_exit_title">Close tabs on exit</string>
-+    <string name="close_tabs_on_exit_summary">Don\'t persist tabs between browsing sessions</string>
-+
-     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
-     <string name="manage_space_activity"></string>
- 
 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,6 +34,11 @@
-         android:title="@string/allow_custom_tab_intents_title"
-         android:summary="@string/allow_custom_tab_intents_summary"
+@@ -33,6 +33,11 @@
+         android:title="@string/always_incognito_title"
+         android:summary="@string/always_incognito_summary"
         android:defaultValue="false" />
-+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
 +        android:summary="@string/close_tabs_on_exit_summary"
 +        android:defaultValue="false" />
     <Preference
-         android:key="clear_browsing_data"
-         android:title="@string/clear_browsing_data_title"
+         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
+         android:key="do_not_track"
 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
-@@ -1144,8 +1144,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
+@@ -1188,8 +1188,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -52,61 +38,65 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +                ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
             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/settings/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferences.java
-@@ -4,6 +4,7 @@
- 
- package org.chromium.chrome.browser.settings.privacy;
+                 mTabModelOrchestrator.clearState();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+@@ -5,6 +5,7 @@
+ package org.chromium.chrome.browser.privacy.settings;
 
+ import android.os.Build;
 +import android.content.SharedPreferences;
 import android.os.Bundle;
- import android.support.graphics.drawable.VectorDrawableCompat;
- import android.support.v7.preference.CheckBoxPreference;
-@@ -13,6 +14,7 @@ import android.view.Menu;
- import android.view.MenuInflater;
- import android.view.MenuItem;
+ import android.text.SpannableString;
+ import android.view.Menu;
+@@ -15,6 +16,8 @@ import androidx.preference.Preference;
+ import androidx.preference.PreferenceFragmentCompat;
+ import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 +import org.chromium.base.ContextUtils;
- import org.chromium.base.BuildInfo;
+import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeFeatureList;
-@@ -36,6 +38,7 @@ public class PrivacyPreferences
-     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_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";
+ import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -59,6 +62,8 @@ public class PrivacySettings
     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
 
-@@ -84,6 +87,10 @@ public class PrivacyPreferences
-             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)) {
+    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+ 
+     @Override
+@@ -137,7 +142,11 @@ public class PrivacySettings
+     @Override
+     public boolean onPreferenceChange(Preference preference, Object newValue) {
+         String key = preference.getKey();
+-        if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+        if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-         }
- 
-         return true;
-@@ -128,6 +135,11 @@ public class PrivacyPreferences
-                             ? R.string.text_on
-                             : R.string.text_off);
+        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+@@ -189,6 +198,11 @@ public class PrivacySettings
+             privacySandboxPreference.setSummary(
+                     PrivacySandboxSettingsFragment.getStatusString(getContext()));
         }
 +
-+        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+        ChromeSwitchPreference closeTabsOnExitPref =
+                (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
 +        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
 +        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
     }
 
-     private ManagedPreferenceDelegate createManagedPreferenceDelegate() {
+     private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
 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
-@@ -3733,6 +3733,12 @@ The site does NOT gain access to the camera. The camera images are only visible
+@@ -4032,6 +4032,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <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>
@@ -1,205 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 18 Mar 2019 21:47:12 +0100
-Subject: Add option to use home page as NTP
-
-Use about:blank as default homepage
---
- .../java/res/xml/homepage_preferences.xml     |  5 ++++
- .../HomepageManager.java                      | 24 +++++++++++++++++--
- .../browser/settings/HomepagePreferences.java | 10 ++++++++
- .../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, 56 insertions(+), 4 deletions(-)
-
-diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/android/java/res/xml/homepage_preferences.xml
--- a/chrome/android/java/res/xml/homepage_preferences.xml
-+++ b/chrome/android/java/res/xml/homepage_preferences.xml
-@@ -6,6 +6,11 @@
- <PreferenceScreen
-     xmlns:android="http://schemas.android.com/apk/res/android">
- 
-+    <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.settings.ChromeSwitchPreference
-         android:key="homepage_switch"
-         android:summaryOn="@string/text_on"
-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
-@@ -31,6 +31,7 @@ public class HomepageManager {
-     }
- 
-     private static final String PREF_HOMEPAGE_ENABLED = "homepage";
-+    public static final String PREF_NTP_IS_HOMEPAGE = "newtabpage_is_homepage";
-     private static final String PREF_HOMEPAGE_CUSTOM_URI = "homepage_custom_uri";
-     private static final String PREF_HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
- 
-@@ -90,7 +91,8 @@ public class HomepageManager {
-      */
-     public static boolean shouldCloseAppWithZeroTabs() {
-         return HomepageManager.isHomepageEnabled()
-                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri());
-+                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri())
-+                && (HomepageManager.getHomepageUri() != UrlConstants.CHROME_BLANK_URL);
-     }
- 
-     /**
-@@ -111,7 +113,7 @@ public class HomepageManager {
-      *         if the homepage button is force enabled via flag.
-      */
-     public static String getDefaultHomepageUri() {
-        return UrlConstants.NTP_NON_NATIVE_URL;
-+        return UrlConstants.CHROME_BLANK_URL;
-     }
- 
-     /**
-@@ -124,6 +126,14 @@ public class HomepageManager {
-         return mSharedPreferences.getBoolean(PREF_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);
-+    }
-+
-     /**
-      * Sets the user preference for whether the homepage is enabled.
-      */
-@@ -137,6 +147,16 @@ public class HomepageManager {
-         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();
-+        notifyHomepageUpdated();
-+    }
-+
-     /**
-      * @return User specified homepage custom URI string.
-      */
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java
-@@ -21,6 +21,7 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
-     @VisibleForTesting
-     public static final String PREF_HOMEPAGE_SWITCH = "homepage_switch";
-     private static final String PREF_HOMEPAGE_EDIT = "homepage_edit";
-+    private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch";
- 
-     private HomepageManager mHomepageManager;
-     private Preference mHomepageEdit;
-@@ -46,6 +47,15 @@ public class HomepagePreferences extends PreferenceFragmentCompat {
-             });
-         }
- 
-+        ChromeSwitchPreference mNTPIsHomepageSwitch =
-+                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
-+        boolean isHomepageNTPEnabled = mHomepageManager.getPrefNTPIsHomepageEnabled();
-+        mNTPIsHomepageSwitch.setChecked(isHomepageNTPEnabled);
-+        mNTPIsHomepageSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
-+            mHomepageManager.setPrefNTPIsHomepageEnabled((boolean) newValue);
-+            return true;
-+        });
-+
-         mHomepageEdit = findPreference(PREF_HOMEPAGE_EDIT);
-         updateCurrentHomepageUrl();
-     }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCreatorManager.java
-@@ -12,6 +12,7 @@ import org.chromium.chrome.browser.tab.TabState;
- import org.chromium.chrome.browser.util.UrlConstants;
- import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.content_public.browser.WebContents;
-+import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
- 
- /**
-  * An interface to return a {@link TabCreator} either for regular or incognito tabs.
-@@ -85,12 +86,18 @@ public interface TabCreatorManager {
-         }
- 
-         /**
-         * Creates a new tab and loads the NTP.
-+         * Creates a new tab and loads the NTP or the homepage, depending on user preferences.
-          */
-         public final void launchNTP() {
-             try {
-+                String newTabURL;
-+                if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
-+                   newTabURL = HomepageManager.getHomepageUri();
-+                } else {
-+                   newTabURL = UrlConstants.NTP_URL;
-+                }
-                 TraceEvent.begin("TabCreator.launchNTP");
-                launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
-+                launchUrl(newTabURL, TabLaunchType.FROM_CHROME_UI);
-             } finally {
-                 TraceEvent.end("TabCreator.launchNTP");
-             }
-diff --git a/chrome/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,9 @@ CHAR-LIMIT guidelines:
-       <message name="IDS_NOTIFICATIONS_CONTENT_SUGGESTIONS_SUMMARY_DISABLED" desc="Summary for the disabled preference to turn on/off content suggestions notifications when search and site suggestions are disabled.">
-         Search and site suggestions disabled
-       </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>
- 
-       <!-- always incognito -->
-       <message name="IDS_ALWAYS_INCOGNITO_TITLE" desc="Title for always incognito mode">
-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
-@@ -55,6 +55,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
-   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
-+  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
-+                                GetHomeButtonAndHomePageIsNewTabPageFlags());
- 
-   registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
-   bool reset_check_default = false;
-diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
-+++ b/chrome/common/pref_names.cc
-@@ -59,6 +59,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
- // A boolean specifying whether the New Tab page is the home page or not.
- const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
- 
-+// A boolean specifying whether opening a new tab should open the Home page
-+// instead of the New Tab page.
-+const char kNewTabPageIsHomePage[] = "newtabpage_is_homepage";
-+
- // This is the URL of the page to load when opening new tabs.
- const char kHomePage[] = "homepage";
- 
-diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
-+++ b/chrome/common/pref_names.h
-@@ -323,6 +323,7 @@ extern const char kSettingsShowOSBanner[];
- extern const char kDeviceLoginScreenWebUsbAllowDevicesForUrls[];
- #endif  // defined(OS_CHROMEOS)
- extern const char kShowHomeButton[];
-+extern const char kNewTabPageIsHomePage[];
- extern const char kSpeechRecognitionFilterProfanities[];
- extern const char kAllowDeletingBrowserHistory[];
- #if !defined(OS_ANDROID)
-- 
-2.17.1
-
@@ -1,220 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-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 ++
- .../java/res/xml/website_preferences.xml      |  7 +++++
- .../website/SingleCategoryPreferences.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
-+++ b/chrome/android/java/res/values/values.xml
-@@ -32,6 +32,9 @@
-     <integer name="reload_button_level_reload">0</integer>
-     <integer name="reload_button_level_stop">1</integer>
- 
-+    <string name="allow_cookies_session_only_title">Keep cookies only until you quit your browser</string>
-+    <string name="allow_cookies_session_only_summary">When enabled, all cookies will be erased when the browsing session is over</string>
-+
-     <!-- Help and Feedback
-          These constants should be in sync with the context names on go/mobilehelprecs.
-          If the context ID cannot be found, the default help page will be shown to the user.-->
-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
-@@ -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.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.settings.ChromeBaseCheckBoxPreference
-         android:key="notifications_vibrate"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategoryPreferences.java
-@@ -130,6 +130,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
- 
-     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
-     public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
-+    public static final String COOKIES_SESSION_ONLY_TOGGLE_KEY = "cookies_session_only";
-     public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
-     public static final String NOTIFICATIONS_QUIET_UI_TOGGLE_KEY = "notifications_quiet_ui";
-     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
-@@ -479,6 +480,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
- 
-                 if (type == SiteSettingsCategory.Type.COOKIES) {
-                     updateThirdPartyCookiesCheckBox();
-+                    updateCookiesSessionOnlyCheckBox();
-                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
-                     updateNotificationsSecondaryControls();
-                 }
-@@ -517,6 +519,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-             int setting = (int) newValue;
-             WebsitePreferenceBridge.setContentSetting(mCategory.getContentSettingsType(), setting);
-             getInfoForOrigins();
-+        } else if (COOKIES_SESSION_ONLY_TOGGLE_KEY.equals(preference.getKey())) {
-+            PrefServiceBridge.getInstance().setCookiesSessionOnlyEnabled((boolean) newValue);
-         } else if (THIRD_PARTY_COOKIES_TOGGLE_KEY.equals(preference.getKey())) {
-             PrefServiceBridge.getInstance().setBoolean(
-                     Pref.BLOCK_THIRD_PARTY_COOKIES, ((boolean) newValue));
-@@ -828,6 +832,8 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-         TriStateSiteSettingsPreference triStateToggle =
-                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
-         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
-+        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
-+                COOKIES_SESSION_ONLY_TOGGLE_KEY);
-         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);
-@@ -860,6 +866,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
- 
-         if (hideSecondaryToggles) {
-             screen.removePreference(thirdPartyCookies);
-+            screen.removePreference(cookiesSessionOnly);
-             screen.removePreference(notificationsVibrate);
-             screen.removePreference(notificationsQuietUi);
-             screen.removePreference(explainProtectedMediaKey);
-@@ -871,12 +878,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-             return;
-         }
- 
-        // Configure/hide the third-party cookies toggle, as needed.
-+        // Configure/hide the third-party cookies toggle and session-only cookie toggle, as needed.
-         if (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)) {
-             thirdPartyCookies.setOnPreferenceChangeListener(this);
-             updateThirdPartyCookiesCheckBox();
-+            cookiesSessionOnly.setOnPreferenceChangeListener(this);
-+            updateCookiesSessionOnlyCheckBox();
-         } else {
-             screen.removePreference(thirdPartyCookies);
-+            screen.removePreference(cookiesSessionOnly);
-         }
- 
-         // Configure/hide the notifications secondary controls, as needed.
-@@ -990,6 +1000,15 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
-         }
-     }
- 
-+    private void updateCookiesSessionOnlyCheckBox() {
-+        ChromeBaseCheckBoxPreference cookiesSessionOnlyPref = (ChromeBaseCheckBoxPreference)
-+                getPreferenceScreen().findPreference(COOKIES_SESSION_ONLY_TOGGLE_KEY);
-+        cookiesSessionOnlyPref.setChecked(
-+                PrefServiceBridge.getInstance().isCookiesSessionOnlyEnabled());
-+        cookiesSessionOnlyPref.setEnabled(WebsitePreferenceBridge.isCategoryEnabled(
-+                ContentSettingsType.COOKIES));
-+    }
-+
-     private void updateThirdPartyCookiesCheckBox() {
-         ChromeBaseCheckBoxPreference thirdPartyCookiesPref =
-                 (ChromeBaseCheckBoxPreference) getPreferenceScreen().findPreference(
-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
-@@ -898,6 +898,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
-         Prevent third-party websites from saving and reading cookie data
-       </message>
-+      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_TITLE" desc="Title for Allow Cookies Session Only preference">
-+        Keep cookies only until you quit your browser
-+      </message>
-+      <message name="IDS_ALLOW_COOKIES_SESSION_ONLY_SUMMARY" desc="Summary text for Allow Session Only Cookies preference">
-+        When enabled, all cookies will be erased when the browsing session is over
-+      </message>
-       <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR-LIMIT=32]">
-         JavaScript
-       </message>
-- 
-2.17.1
-
@@ -0,0 +1,52 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 17 May 2021 12:30:12 +0000
+Subject: Add support for ISupportHelpAndFeedback
+
+---
+ .../chrome/browser/settings/SettingsActivity.java     | 11 ++++++++---
+ .../components/browser_ui/settings/SettingsUtils.java |  4 ++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+@@ -56,6 +56,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
+ import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
+ import org.chromium.components.browser_ui.settings.SettingsLauncher;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+ import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
+ import org.chromium.ui.UiUtils;
+ 
+@@ -252,9 +253,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+             finish();
+             return true;
+         } else if (item.getItemId() == R.id.menu_id_general_help) {
+-            HelpAndFeedbackLauncherImpl.getInstance().show(this,
+-                    getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
+-                    null);
+            if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) {
+                ((SettingsUtils.ISupportHelpAndFeedback)mainFragment).onHelpAndFeebackPressed();
+            } else {
+                HelpAndFeedbackLauncherImpl.getInstance().show(this,
+                        getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
+                        null);
+            }
+             return true;
+         }
+         return super.onOptionsItemSelected(item);
+diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
+--- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
+++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
+@@ -126,4 +126,8 @@ public class SettingsUtils {
+         ImageView imageButton = (ImageView) button;
+         return imageButton.getDrawable() == parentMenu.getOverflowIcon();
+     }
+
+    public interface ISupportHelpAndFeedback {
+        void onHelpAndFeebackPressed();
+    }
+ }
+-- 
+2.17.1
+
@@ -1,520 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 23 Nov 2019 10:55:16 +0100
-Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
-
---
- chrome/android/chrome_java_sources.gni        |  2 +
- chrome/android/java/res/layout/doh_editor.xml | 65 +++++++++++++
- chrome/android/java/res/values/values.xml     |  2 +
- .../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     | 46 +++-------
- .../strings/android_chrome_strings.grd        | 11 +++
- chrome/common/chrome_features.cc              |  4 +-
- 13 files changed, 322 insertions(+), 37 deletions(-)
- create mode 100644 chrome/android/java/res/layout/doh_editor.xml
- create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -1335,6 +1335,8 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/settings/ChromeSwitchPreference.java",
-   "java/src/org/chromium/chrome/browser/settings/ClearBrowsingDataCheckBoxPreference.java",
-   "java/src/org/chromium/chrome/browser/settings/ExpandablePreferenceGroup.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/settings/HomepageEditor.java",
-   "java/src/org/chromium/chrome/browser/settings/HomepagePreferences.java",
-   "java/src/org/chromium/chrome/browser/settings/HyperlinkPreference.java",
-diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml
-new file mode 100644
--- /dev/null
-+++ b/chrome/android/java/res/layout/doh_editor.xml
-@@ -0,0 +1,65 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
-+     Use of this source code is governed by a BSD-style license that can be
-+     found in the LICENSE file. -->
-+
-+<FrameLayout
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:app="http://schemas.android.com/apk/res-auto"
-+    xmlns:tools="http://schemas.android.com/tools"
-+    android:layout_width="match_parent"
-+    android:layout_height="match_parent" >
-+
-+    <ScrollView
-+        android:layout_width="match_parent"
-+        android:layout_height="match_parent"
-+        android:id="@+id/scroll_view"
-+        android:fillViewport="true" >
-+
-+        <LinearLayout
-+            android:layout_width="match_parent"
-+            android:layout_height="wrap_content"
-+            android:orientation="vertical"
-+            android:focusableInTouchMode="true" >
-+
-+            <org.chromium.chrome.browser.widget.ChromeTextInputLayout
-+                android:id="@+id/doh_url"
-+                style="@style/PreferenceScreenLayout"
-+                android:layout_width="match_parent"
-+                android:layout_height="wrap_content" >
-+                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
-+                <EditText
-+                    tools:ignore="Autofill"
-+                    android:id="@+id/doh_url_edit"
-+                    android:layout_width="match_parent"
-+                    android:layout_height="wrap_content"
-+                    android:inputType="textUri"
-+                    android:singleLine="true"
-+                    android:hint="@string/options_doh_edit_label" />
-+            </org.chromium.chrome.browser.widget.ChromeTextInputLayout>
-+
-+            <Space style="@style/ButtonBarTopSpacer" />
-+            <View style="@style/ButtonBarTopDivider" />
-+
-+            <LinearLayout style="@style/ButtonBar" >
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/doh_reset"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/reset" />
-+
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/doh_cancel"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/cancel" />
-+
-+                <org.chromium.ui.widget.ButtonCompat
-+                    android:id="@+id/doh_save"
-+                    style="@style/ButtonBarButton"
-+                    android:text="@string/save" />
-+            </LinearLayout>
-+        </LinearLayout>
-+    </ScrollView>
-+
-+    <include layout="@layout/preferences_action_bar_shadow"/>
-+
-+</FrameLayout>
-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ b/chrome/android/java/res/values/values.xml
-@@ -91,6 +91,8 @@
-     <integer name="download_infobar_bar_fill_in_delay">400</integer>
-     <integer name="download_infobar_bar_fill_out_delay">200</integer>
- 
-+    <string name="doh_help_url">https://www.bromite.org/doh</string>
-+
-     <!-- Bottom navigation bar styling. -->
-     <bool name="window_light_navigation_bar">true</bool>
- 
-diff --git a/chrome/android/java/res/xml/doh_preferences.xml b/chrome/android/java/res/xml/doh_preferences.xml
-new file mode 100644
--- /dev/null
-+++ b/chrome/android/java/res/xml/doh_preferences.xml
-@@ -0,0 +1,25 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
-+     Use of this source code is governed by a BSD-style license that can be
-+     found in the LICENSE file. -->
-+
-+<PreferenceScreen
-+    xmlns:android="http://schemas.android.com/apk/res/android"
-+    xmlns:app="http://schemas.android.com/apk/res-auto">
-+
-+    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
-+        android:key="doh_switch"
-+        android:summaryOn="@string/text_on"
-+        android:summaryOff="@string/text_off" />
-+
-+    <org.chromium.chrome.browser.settings.HyperlinkPreference
-+        android:key="doh_help"
-+        android:title="@string/doh_help"
-+        app:url="@string/doh_help_url" />
-+
-+    <Preference
-+        android:key="doh_edit"
-+        android:title="@string/options_doh_edit_label"
-+        android:fragment="org.chromium.chrome.browser.settings.DoHEditor" />
-+
-+</PreferenceScreen>
-diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
-+++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -19,6 +19,11 @@
-         android:key="can_make_payment"
-         android:title="@string/can_make_payment_title"
-         android:summary="@string/settings_can_make_payment_toggle_label" />
-+    <Preference
-+        android:fragment="org.chromium.chrome.browser.settings.DoHPreferences"
-+        android:key="doh"
-+        android:title="@string/options_doh_title"
-+        android:summary="@string/options_doh_summary" />
-     <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/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
-@@ -95,6 +95,26 @@ public class FeatureUtilities {
-         FeatureUtilitiesJni.get().setCustomTabVisible(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) {
-+         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();
-+     }
-+
-     /**
-      * 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.
-@@ -736,6 +756,10 @@ public class FeatureUtilities {
-         void setCustomTabVisible(boolean visible);
-         void setActivityType(@ActivityType int type);
-         void setIsInMultiWindowMode(boolean isInMultiWindowMode);
-+        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/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.settings;
-+
-+import android.os.Bundle;
-+import android.support.v4.app.Fragment;
-+import android.text.Editable;
-+import android.text.TextWatcher;
-+import android.view.LayoutInflater;
-+import android.view.View;
-+import android.view.ViewGroup;
-+import android.widget.Button;
-+import android.widget.EditText;
-+
-+import org.chromium.chrome.browser.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 (DoH) preference.
-+ */
-+public class DoHEditor extends Fragment implements TextWatcher {
-+    private EditText mDoHUrlEdit;
-+    private Button mSaveButton;
-+    private Button mResetButton;
-+
-+    @Override
-+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-+            Bundle savedInstanceState) {
-+        super.onCreate(savedInstanceState);
-+        getActivity().setTitle(R.string.options_doh_edit_title);
-+
-+        View v = inflater.inflate(R.layout.doh_editor, container, false);
-+        View scrollView = v.findViewById(R.id.scroll_view);
-+        scrollView.getViewTreeObserver().addOnScrollChangedListener(
-+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
-+        mDoHUrlEdit = (EditText) v.findViewById(R.id.doh_url_edit);
-+        mDoHUrlEdit.setText(FeatureUtilities.getDoHTemplates());
-+        mDoHUrlEdit.addTextChangedListener(this);
-+        mDoHUrlEdit.requestFocus();
-+
-+        initializeSaveCancelResetButtons(v);
-+        return v;
-+    }
-+
-+    @Override
-+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-+    }
-+
-+    @Override
-+    public void onTextChanged(CharSequence s, int start, int before, int count) {
-+        mSaveButton.setEnabled(s.length() != 0);
-+        mResetButton.setEnabled(true);
-+    }
-+
-+    @Override
-+    public void afterTextChanged(Editable s) {
-+    }
-+
-+    private void initializeSaveCancelResetButtons(View v) {
-+        mResetButton = (Button) v.findViewById(R.id.doh_reset);
-+        mResetButton.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                mDoHUrlEdit.setText(FeatureUtilities.getDoHTemplates());
-+                getActivity().finish();
-+            }
-+        });
-+
-+        mSaveButton = (Button) v.findViewById(R.id.doh_save);
-+        mSaveButton.setEnabled(false);
-+        mSaveButton.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                FeatureUtilities.setDoHTemplates(
-+                        mDoHUrlEdit.getText().toString());
-+                getActivity().finish();
-+            }
-+        });
-+
-+        Button button = (Button) v.findViewById(R.id.doh_cancel);
-+        button.setOnClickListener(new View.OnClickListener() {
-+            @Override
-+            public void onClick(View v) {
-+                getActivity().finish();
-+            }
-+        });
-+    }
-+}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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/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.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.settings.SettingsUtils;
-+import org.chromium.chrome.browser.flags.FeatureUtilities;
-+import androidx.annotation.VisibleForTesting;
-+import org.chromium.chrome.R;
-+
-+/**
-+ * Fragment that allows the user to configure DoH related preferences.
-+ */
-+public class DoHPreferences extends PreferenceFragmentCompat {
-+    @VisibleForTesting
-+    public static final String PREF_DOH_SWITCH = "doh_switch";
-+    private static final String PREF_DOH_EDIT = "doh_edit";
-+
-+    private Preference mDoHEdit;
-+
-+    @Override
-+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+        getActivity().setTitle(R.string.options_doh_title);
-+        SettingsUtils.addPreferencesFromResource(this, R.xml.doh_preferences);
-+
-+        ChromeSwitchPreference mDoHSwitch =
-+                (ChromeSwitchPreference) findPreference(PREF_DOH_SWITCH);
-+        boolean isDoHEnabled = FeatureUtilities.getDoHEnabled();
-+        mDoHSwitch.setChecked(isDoHEnabled);
-+        mDoHSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
-+            FeatureUtilities.setDoHEnabled((boolean) newValue);
-+            return true;
-+        });
-+
-+        mDoHEdit = findPreference(PREF_DOH_EDIT);
-+        updateCurrentDoHUrl();
-+    }
-+
-+    private void updateCurrentDoHUrl() {
-+        mDoHEdit.setSummary(FeatureUtilities.getDoHTemplates());
-+    }
-+
-+    @Override
-+    public void onResume() {
-+        super.onResume();
-+        updateCurrentDoHUrl();
-+    }
-+}
-diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
-+++ b/chrome/app/generated_resources.grd
-@@ -6699,6 +6699,12 @@ the Bookmarks menu.">
-         <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
-           Home page
-         </message>
-+        <message name="IDS_OPTIONS_DOH_TITLE" desc="The title of the DNS-over-HTTPS option on Android" formatter_data="android_java">
-+          Secure DNS
-+        </message>
-+        <message name="IDS_OPTIONS_DOH_SUMMARY" desc="The title of the DNS-over-HTTPS summary on Android" formatter_data="android_java">
-+          Configure DNS-over-HTTPS (DoH) secure DNS
-+        </message>
-       </if>
- 
-       <!-- Autofill dialog: field labels. -->
-diff --git a/chrome/browser/android/feature_utilities.cc b/chrome/browser/android/feature_utilities.cc
--- a/chrome/browser/android/feature_utilities.cc
-+++ b/chrome/browser/android/feature_utilities.cc
-@@ -7,6 +7,9 @@
- #include "chrome/android/chrome_jni_headers/FeatureUtilities_jni.h"
- 
- #include "base/android/jni_string.h"
-+#include "chrome/browser/browser_process.h"
-+#include "components/prefs/pref_service.h"
-+#include "chrome/common/pref_names.h"
- #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
- #include "chrome/browser/profiles/profile_manager.h"
- #include "components/ntp_snippets/content_suggestions_service.h"
-@@ -87,3 +90,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
-   return content::IsOutOfProcessNetworkService() &&
-          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
- }
-+
-+static jboolean JNI_FeatureUtilities_GetDoHEnabled(JNIEnv* env) {
-+  std::string doh_mode = g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsMode);
-+  return ((doh_mode == "secure") || (doh_mode == "auto"));
-+}
-+
-+static void JNI_FeatureUtilities_SetDoHEnabled(JNIEnv* env, jboolean enabled) {
-+  if (enabled)
-+    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "secure");
-+  else
-+    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "off");
-+}
-+
-+static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetDoHTemplates(JNIEnv* env) {
-+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsTemplates));
-+}
-+
-+static void JNI_FeatureUtilities_SetDoHTemplates(JNIEnv* env, const JavaParamRef<jstring>& templates) {
-+  g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsTemplates, base::android::ConvertJavaStringToUTF8(env, templates));
-+}
-diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
-+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -139,9 +139,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)) {
-@@ -429,40 +434,11 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-   // features before registering change callbacks for these preferences.
-   local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
-                                     base::Value(ShouldEnableAsyncDns()));
-  std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
-  std::string default_doh_templates = "";
-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
-    if (features::kDnsOverHttpsFallbackParam.Get()) {
-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeAutomatic;
-    } else {
-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeSecure;
-    }
-    default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
-  }
-+  //NOTE: DoH fallback feature to insecure mode is not evaluated
-   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
-                                    base::Value(default_doh_mode));
-+                                    base::Value(chrome_browser_net::kDnsOverHttpsModeOff));
-   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates,
-                                    base::Value(default_doh_templates));
-
-  // If the user has explicitly enabled or disabled the DoH experiment in
-  // chrome://flags, store that choice in the user prefs so that it can be
-  // persisted after the experiment ends. Also make sure to remove the stored
-  // prefs value if the user has changed their chrome://flags selection to the
-  // default.
-  flags_ui::PrefServiceFlagsStorage flags_storage(local_state_);
-  std::set<std::string> entries = flags_storage.GetFlags();
-  if (entries.count("dns-over-https@1")) {
-    // The user has "Enabled" selected.
-    local_state_->SetString(prefs::kDnsOverHttpsMode,
-                            chrome_browser_net::kDnsOverHttpsModeAutomatic);
-  } else if (entries.count("dns-over-https@2")) {
-    // The user has "Disabled" selected.
-    local_state_->SetString(prefs::kDnsOverHttpsMode,
-                            chrome_browser_net::kDnsOverHttpsModeOff);
-  } else {
-    // The user has "Default" selected.
-    local_state_->ClearPref(prefs::kDnsOverHttpsMode);
-  }
-+                                    base::Value(features::kDnsOverHttpsTemplatesParam.Get()));
- 
-   PrefChangeRegistrar::NamedChangeCallback dns_pref_callback =
-       base::BindRepeating(&OnStubResolverConfigChanged,
-diff --git a/chrome/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
-@@ -674,6 +674,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
-@@ -303,12 +303,12 @@ const char kDisallowUnsafeHttpDownloadsParamName[] = "MimeTypeList";
- 
- // Enable DNS over HTTPS (DoH).
- const base::Feature kDnsOverHttps{"DnsOverHttps",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-+                                  base::FEATURE_ENABLED_BY_DEFAULT};
- 
- // Set whether fallback to insecure DNS is allowed by default. This setting may
- // be overridden for individual transactions.
- const base::FeatureParam<bool> kDnsOverHttpsFallbackParam{&kDnsOverHttps,
-                                                          "Fallback", true};
-+                                                          "Fallback", false};
- 
- // Supply one or more space-separated DoH server URI templates to use when this
- // feature is enabled. If no templates are specified, then a hardcoded mapping
-- 
-2.17.1
-
@@ -0,0 +1,211 @@
+From: Zoraver Kang <Zoraver@users.noreply.github.com>
+Date: Fri, 22 May 2020 22:43:27 -0400
+Subject: Allow building without enable_reporting
+
+---
+ content/browser/BUILD.gn                                 | 8 ++++----
+ .../common/content_switch_dependent_feature_overrides.cc | 3 +++
+ third_party/blink/renderer/core/frame/local_frame.cc     | 3 +++
+ third_party/blink/renderer/core/frame/local_frame.h      | 6 +++---
+ .../blink/renderer/core/frame/reporting_context.cc       | 9 +++++++++
+ .../blink/renderer/core/frame/reporting_context.h        | 7 +++++--
+ 6 files changed, 27 insertions(+), 9 deletions(-)
+
+diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
+--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
+@@ -1240,6 +1240,10 @@ source_set("browser") {
+     "net/browser_online_state_observer.cc",
+     "net/browser_online_state_observer.h",
+     "net/cookie_store_factory.cc",
+    "net/cross_origin_embedder_policy_reporter.cc",
+    "net/cross_origin_embedder_policy_reporter.h",
+    "net/cross_origin_opener_policy_reporter.cc",
+    "net/cross_origin_opener_policy_reporter.h",
+     "net/network_errors_listing_ui.cc",
+     "net/network_errors_listing_ui.h",
+     "net/network_quality_observer_impl.cc",
+@@ -2989,10 +2993,6 @@ source_set("browser") {
+ 
+   if (enable_reporting) {
+     sources += [
+-      "net/cross_origin_embedder_policy_reporter.cc",
+-      "net/cross_origin_embedder_policy_reporter.h",
+-      "net/cross_origin_opener_policy_reporter.cc",
+-      "net/cross_origin_opener_policy_reporter.h",
+       "net/reporting_service_proxy.cc",
+       "net/reporting_service_proxy.h",
+     ]
+diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc b/content/public/common/content_switch_dependent_feature_overrides.cc
+--- a/content/public/common/content_switch_dependent_feature_overrides.cc
+++ b/content/public/common/content_switch_dependent_feature_overrides.cc
+@@ -7,6 +7,7 @@
+ #include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+ #include "net/base/features.h"
+#include "net/net_buildflags.h"
+ #include "services/network/public/cpp/features.h"
+ #include "services/network/public/cpp/network_switches.h"
+ #include "third_party/blink/public/common/features.h"
+@@ -46,9 +47,11 @@ GetSwitchDependentFeatureOverrides(const base::CommandLine& command_line) {
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(features::kDocumentPolicyNegotiation),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
+#if BUILDFLAG(ENABLE_REPORTING)
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(net::features::kDocumentReporting),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
+#endif
+       {switches::kEnableExperimentalWebPlatformFeatures,
+        std::cref(features::kExperimentalContentSecurityPolicyFeatures),
+        base::FeatureList::OVERRIDE_ENABLE_FEATURE},
+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
+@@ -39,6 +39,7 @@
+ #include "base/values.h"
+ #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+ #include "mojo/public/cpp/system/message_pipe.h"
+#include "net/net_buildflags.h"
+ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
+ #include "services/network/public/cpp/features.h"
+ #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
+@@ -2282,9 +2283,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
+   return base::UnguessableToken::Null();
+ }
+ 
+#if BUILDFLAG(ENABLE_REPORTING)
+ mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
+   return mojo_handler_->ReportingService();
+ }
+#endif
+ 
+ // static
+ void LocalFrame::NotifyUserActivation(
+diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
+--- a/third_party/blink/renderer/core/frame/local_frame.h
+++ b/third_party/blink/renderer/core/frame/local_frame.h
+@@ -33,9 +33,9 @@
+ 
+ #include "base/time/default_tick_clock.h"
+ #include "base/unguessable_token.h"
+-#include "build/build_config.h"
+ #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "net/net_buildflags.h"
+ #include "services/device/public/mojom/device_posture_provider.mojom-blink-forward.h"
+ #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
+ #include "third_party/blink/public/common/frame/frame_ad_evidence.h"
+@@ -543,9 +543,9 @@ class CORE_EXPORT LocalFrame final : public Frame,
+   }
+ 
+   SmoothScrollSequencer& GetSmoothScrollSequencer();
+-
+#if BUILDFLAG(ENABLE_REPORTING)
+   mojom::blink::ReportingServiceProxy* GetReportingService();
+-
+#endif
+   // Returns the frame host ptr. The interface returned is backed by an
+   // associated interface with the legacy Chrome IPC channel.
+   mojom::blink::LocalFrameHost& GetLocalFrameHostRemote() const;
+diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_party/blink/renderer/core/frame/reporting_context.cc
+--- a/third_party/blink/renderer/core/frame/reporting_context.cc
+++ b/third_party/blink/renderer/core/frame/reporting_context.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/core/frame/reporting_context.h"
+ 
+#include "net/net_buildflags.h"
+ #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+@@ -54,7 +55,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
+ ReportingContext::ReportingContext(ExecutionContext& context)
+     : Supplement<ExecutionContext>(context),
+       execution_context_(context),
+#if BUILDFLAG(ENABLE_REPORTING)
+       reporting_service_(&context),
+#endif
+       receiver_(this, &context) {}
+ 
+ // static
+@@ -118,7 +121,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
+   visitor->Trace(observers_);
+   visitor->Trace(report_buffer_);
+   visitor->Trace(execution_context_);
+#if BUILDFLAG(ENABLE_REPORTING)
+   visitor->Trace(reporting_service_);
+#endif
+   visitor->Trace(receiver_);
+   Supplement<ExecutionContext>::Trace(visitor);
+ }
+@@ -140,6 +145,7 @@ void ReportingContext::CountReport(Report* report) {
+   UseCounter::Count(execution_context_, feature);
+ }
+ 
+#if BUILDFLAG(ENABLE_REPORTING)
+ const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+ ReportingContext::GetReportingService() const {
+   if (!reporting_service_.is_bound()) {
+@@ -149,6 +155,7 @@ ReportingContext::GetReportingService() const {
+   }
+   return reporting_service_;
+ }
+#endif
+ 
+ void ReportingContext::NotifyInternal(Report* report) {
+   // Buffer the report.
+@@ -171,6 +178,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+ 
+ void ReportingContext::SendToReportingAPI(Report* report,
+                                           const String& endpoint) const {
+#if BUILDFLAG(ENABLE_REPORTING)
+   const String& type = report->type();
+   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
+         type == ReportType::kPermissionsPolicyViolation ||
+@@ -226,6 +234,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+         url, endpoint, body->featureId(), body->disposition(), body->message(),
+         body->sourceFile(), line_number, column_number);
+   }
+#endif
+ }
+ 
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_party/blink/renderer/core/frame/reporting_context.h
+--- a/third_party/blink/renderer/core/frame/reporting_context.h
+++ b/third_party/blink/renderer/core/frame/reporting_context.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ 
+#include "net/net_buildflags.h"
+ #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
+ #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
+ #include "third_party/blink/renderer/core/core_export.h"
+@@ -53,10 +54,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+  private:
+   // Counts the use of a report type via UseCounter.
+   void CountReport(Report*);
+-
+#if BUILDFLAG(ENABLE_REPORTING)
+   const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+   GetReportingService() const;
+-
+#endif
+   void NotifyInternal(Report* report);
+   // Send |report| via the Reporting API to |endpoint|.
+   void SendToReportingAPI(Report* report, const String& endpoint) const;
+@@ -67,8 +68,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+ 
+   // This is declared mutable so that the service endpoint can be cached by
+   // const methods.
+#if BUILDFLAG(ENABLE_REPORTING)
+   mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy>
+       reporting_service_;
+#endif
+ 
+   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
+ };
+-- 
+2.17.1
+
@@ -1,61 +0,0 @@
-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 -----------------
- 2 files changed, 22 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) {
-- 
-2.17.1
-
@@ -3,14 +3,27 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200
 Subject: Allow playing audio in background

 ---
- media/blink/webmediaplayer_impl.cc | 12 +++++++++++-
- media/blink/webmediaplayer_impl.h  |  2 ++
- 2 files changed, 13 insertions(+), 1 deletion(-)
+ .../public/platform/media/web_media_player_impl.h    |  3 +++
+ .../renderer/platform/media/web_media_player_impl.cc | 12 +++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)

-diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
--- a/media/blink/webmediaplayer_impl.cc
-+++ b/media/blink/webmediaplayer_impl.cc
-@@ -962,6 +962,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+diff --git a/third_party/blink/public/platform/media/web_media_player_impl.h b/third_party/blink/public/platform/media/web_media_player_impl.h
+--- a/third_party/blink/public/platform/media/web_media_player_impl.h
+++ b/third_party/blink/public/platform/media/web_media_player_impl.h
+@@ -159,6 +159,9 @@ class BLINK_PLATFORM_EXPORT WebMediaPlayerImpl
+   bool HasVideo() const override;
+   bool HasAudio() const override;
+ 
+  // True is has video and it's frame size is not zero
+  bool HasVideoNonEmptySize() const;
+
+   void EnabledAudioTracksChanged(
+       const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
+   void SelectedVideoTrackChanged(
+diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
+@@ -1118,6 +1118,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -21,9 +34,9 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 +}
 +
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
+     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3283,7 +3289,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3490,7 +3496,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.
@@ -35,19 +48,7 @@ diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_imp
 +  if (!HasVideoNonEmptySize())
     return false;
 
-   if (!is_background_video_playback_enabled_)
-diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
--- a/media/blink/webmediaplayer_impl.h
-+++ b/media/blink/webmediaplayer_impl.h
-@@ -145,6 +145,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
-   // True if the loaded media has a playable video/audio track.
-   bool HasVideo() const override;
-   bool HasAudio() const override;
-+  // True is has video and it's frame size is not zero
-+  bool HasVideoNonEmptySize() const;
- 
-   void EnabledAudioTracksChanged(
-       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
+   if (using_media_player_renderer_ &&
 -- 
 2.17.1

@@ -10,9 +10,9 @@ 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
-@@ -120,7 +120,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
-   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
-                                 false);
+@@ -127,7 +127,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+ #if BUILDFLAG(ENABLE_DICE_SUPPORT)
+   registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
 #endif
 -  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
 +  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
@@ -9,7 +9,7 @@ Subject: Always allow partner customisation
 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
-@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations {
+@@ -324,14 +324,14 @@ public class PartnerBrowserCustomizations {
             @Override
             protected Void doInBackground() {
                 try {
@@ -31,7 +31,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
 +                    //}
 
                     if (isCancelled()) return null;
-                     refreshIncognitoModeDisabled();
+                     Provider provider = AppHooks.get().getCustomizationProvider();
 -- 
 2.17.1

@@ -11,20 +11,20 @@ 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
-@@ -247,7 +247,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;
+@@ -157,7 +157,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams(
+       local_state->GetBoolean(prefs::kNtlmV2Enabled);
+ #endif  // defined(OS_POSIX)
+ 
 -#if defined(OS_ANDROID)
 +#if 0
-   int min_sdk =
-       base::GetFieldTrialParamByFeatureAsInt(features::kAsyncDns, "min_sdk", 0);
-   if (base::android::BuildInfo::GetInstance()->sdk_int() < min_sdk)
+   auth_dynamic_params->android_negotiate_account_type =
+       local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
+ #endif  // defined(OS_ANDROID)
 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
-@@ -564,7 +564,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
-         effective_experimental_options->Remove(it.key(), nullptr);
+@@ -592,7 +592,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+         effective_experimental_options->RemoveKey(it.key());
         continue;
       }
 -      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
@@ -1,131 +0,0 @@
-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/SingleWebsitePreferences.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/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsitePreferences.java
-@@ -46,6 +46,7 @@ import java.util.Set;
-  */
- public class SingleWebsitePreferences extends PreferenceFragmentCompat
-         implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
-+    public static final String TAG = "SingleWebsitePreferences";
-     // SingleWebsitePreferences expects either EXTRA_SITE (a Website) or
-     // EXTRA_SITE_ADDRESS (a WebsiteAddress) to be present (but not both). If
-     // EXTRA_SITE is present, the fragment will display the permissions in that
-@@ -345,7 +346,24 @@ public class SingleWebsitePreferences 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;
-             }
-@@ -640,17 +658,8 @@ public class SingleWebsitePreferences 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() {
-@@ -725,6 +734,7 @@ public class SingleWebsitePreferences 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");
-@@ -794,22 +804,10 @@ public class SingleWebsitePreferences 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
-@@ -166,6 +166,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,23 +4,22 @@ Subject: Always use new tab page for default home page

 Ignore any partner-provided home page.
 ---
- .../chrome/browser/partnercustomizations/HomepageManager.java | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
+ .../org/chromium/chrome/browser/homepage/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
-@@ -111,9 +111,7 @@ public class HomepageManager {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
+@@ -146,9 +146,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;
+-        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
+-            return PartnerBrowserCustomizations.getInstance().getHomePageUrl();
+-        }
+         return UrlConstants.NTP_NON_NATIVE_URL;
     }
 
-     /**
 -- 
 2.17.1

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

 Truncate base latency precision to two digits
 ---
 .../blink/renderer/modules/webaudio/analyser_node.idl     | 8 ++++----
- .../blink/renderer/modules/webaudio/audio_buffer.idl      | 4 ++--
+ .../blink/renderer/modules/webaudio/audio_buffer.idl      | 6 ------
 .../blink/renderer/modules/webaudio/audio_context.cc      | 4 +++-
- 3 files changed, 9 insertions(+), 7 deletions(-)
+ 3 files changed, 7 insertions(+), 11 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,20 +30,23 @@ 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,12 +37,6 @@
 
     // Channel access
     readonly attribute unsigned long numberOfChannels;
-    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-    [HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
-+    //[HighEntropy, Measure, RaisesException] Float32Array getChannelData(unsigned long channelIndex);
-+    //[HighEntropy, Measure, RaisesException] void copyFromChannel(Float32Array destination, long channelNumber, optional unsigned long bufferOffset = 0);
-     [RaisesException] void copyToChannel(Float32Array source, long channelNumber, optional unsigned long bufferOffset = 0);
- };
+-    [HighEntropy=Direct, Measure, RaisesException] Float32Array getChannelData(
+-        unsigned long channelIndex);
+-    [HighEntropy, Measure, RaisesException] void copyFromChannel(
+-        Float32Array destination,
+-        unsigned long channelNumber,
+-        optional unsigned long bufferOffset = 0);
+     [RaisesException] void copyToChannel(
+         Float32Array source,
+         unsigned long channelNumber,
 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
-@@ -373,7 +373,9 @@ double AudioContext::baseLatency() const {
+@@ -458,7 +458,9 @@ double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
 
@@ -4,13 +4,13 @@ Subject: Battery API: return nothing

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

 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -45,45 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+@@ -70,46 +70,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
 }
 
 bool BatteryManager::charging() {
@@ -37,17 +37,18 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
   DCHECK(battery_property_);
 
 -  BatteryStatus old_status = battery_status_;
-  battery_status_ = *BatteryDispatcher::Instance().LatestData();
+-  battery_status_ = *battery_dispatcher_->LatestData();
 -
-   if (battery_property_->GetState() == ScriptPromisePropertyBase::kPending) {
+   if (battery_property_->GetState() == BatteryProperty::kPending) {
     battery_property_->Resolve(this);
     return;
   }
 -
-  Document* document = To<Document>(GetExecutionContext());
-  DCHECK(document);
-  if (document->IsContextPaused() || document->IsContextDestroyed())
+-  DCHECK(GetExecutionContext());
+-  if (GetExecutionContext()->IsContextPaused() ||
+-      GetExecutionContext()->IsContextDestroyed()) {
 -    return;
+-  }
 -
 -  if (battery_status_.Charging() != old_status.Charging())
 -    DispatchEvent(*Event::Create(event_type_names::kChargingchange));
@@ -0,0 +1,211 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 28 Jul 2020 12:28:58 +0200
+Subject: Block gateway attacks via websockets
+
+---
+ .../renderer/core/loader/base_fetch_context.h |  1 +
+ .../core/loader/frame_fetch_context.cc        | 18 +++++++++++++
+ .../core/loader/frame_fetch_context.h         |  1 +
+ .../core/loader/worker_fetch_context.cc       | 19 +++++++++++++
+ .../core/loader/worker_fetch_context.h        |  1 +
+ .../background_fetch_manager.cc               |  2 --
+ .../websockets/websocket_channel_impl.cc      |  5 ++++
+ .../modules/websockets/websocket_common.cc    | 27 +++++++++++++++++++
+ .../modules/websockets/websocket_common.h     |  4 +++
+ 9 files changed, 76 insertions(+), 2 deletions(-)
+
+diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h
+--- a/third_party/blink/renderer/core/loader/base_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/base_fetch_context.h
+@@ -82,6 +82,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
+ 
+   virtual SubresourceFilter* GetSubresourceFilter() const = 0;
+   virtual bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const = 0;
+  virtual bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL&) const = 0;
+   virtual std::unique_ptr<WebSocketHandshakeThrottle>
+   CreateWebSocketHandshakeThrottle() = 0;
+ 
+diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+--- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
+@@ -568,6 +568,24 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+   return should_block_request;
+ }
+ 
+bool FrameFetchContext::ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL& request_url) const {
+  // TODO(mkwst): This only checks explicit IP addresses. We'll have to move
+  // all this up to //net and //content in order to have any real impact on
+  // gateway attacks. That turns out to be a TON of work (crbug.com/378566).
+  network::mojom::IPAddressSpace target_space =
+      network::mojom::IPAddressSpace::kPublic;
+  if (network_utils::IsReservedIPAddress(request_url.Host()))
+    target_space = network::mojom::IPAddressSpace::kPrivate;
+  if (SecurityOrigin::Create(request_url)->IsLocalhost())
+    target_space = network::mojom::IPAddressSpace::kLocal;
+
+  bool is_external_request = requestor_space > target_space;
+  if (is_external_request)
+    return true;
+
+  return false;
+}
+
+ void FrameFetchContext::DispatchDidBlockRequest(
+     const ResourceRequest& resource_request,
+     const ResourceLoaderOptions& options,
+diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
+--- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
+@@ -165,6 +165,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
+   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
+       override;
+  bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL&) const override;
+   bool ShouldBlockFetchByMixedContentCheck(
+       mojom::blink::RequestContextType request_context,
+       const absl::optional<ResourceRequest::RedirectInfo>& redirect_info,
+diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/third_party/blink/renderer/core/loader/worker_fetch_context.cc
+--- a/third_party/blink/renderer/core/loader/worker_fetch_context.cc
+++ b/third_party/blink/renderer/core/loader/worker_fetch_context.cc
+@@ -24,6 +24,7 @@
+ #include "third_party/blink/renderer/platform/loader/fetch/resource_timing_info.h"
+ #include "third_party/blink/renderer/platform/loader/fetch/worker_resource_timing_notifier.h"
+ #include "third_party/blink/renderer/platform/network/network_state_notifier.h"
+#include "third_party/blink/renderer/platform/network/network_utils.h"
+ #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+ #include "third_party/blink/renderer/platform/supplementable.h"
+ #include "third_party/blink/renderer/platform/weborigin/security_policy.h"
+@@ -90,6 +91,24 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+   return should_block_request;
+ }
+ 
+bool WorkerFetchContext::ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL& request_url) const {
+  // TODO(mkwst): This only checks explicit IP addresses. We'll have to move
+  // all this up to //net and //content in order to have any real impact on
+  // gateway attacks. That turns out to be a TON of work (crbug.com/378566).
+  network::mojom::IPAddressSpace target_space =
+      network::mojom::IPAddressSpace::kPublic;
+  if (network_utils::IsReservedIPAddress(request_url.Host()))
+    target_space = network::mojom::IPAddressSpace::kPrivate;
+  if (SecurityOrigin::Create(request_url)->IsLocalhost())
+    target_space = network::mojom::IPAddressSpace::kLocal;
+
+  bool is_external_request = requestor_space > target_space;
+  if (is_external_request)
+    return true;
+
+  return false;
+}
+
+ void WorkerFetchContext::DispatchDidBlockRequest(
+     const ResourceRequest& resource_request,
+     const ResourceLoaderOptions& options,
+diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.h b/third_party/blink/renderer/core/loader/worker_fetch_context.h
+--- a/third_party/blink/renderer/core/loader/worker_fetch_context.h
+++ b/third_party/blink/renderer/core/loader/worker_fetch_context.h
+@@ -62,6 +62,7 @@ class WorkerFetchContext final : public BaseFetchContext {
+   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
+   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
+       override;
+  bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL&) const override;
+   bool ShouldBlockFetchByMixedContentCheck(
+       mojom::blink::RequestContextType request_context,
+       const absl::optional<ResourceRequest::RedirectInfo>& redirect_info,
+diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
+--- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
+++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
+@@ -103,7 +103,6 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+ 
+ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
+                                const KURL& request_url) {
+-  if (RuntimeEnabledFeatures::CorsRFC1918Enabled()) {
+     network::mojom::IPAddressSpace requestor_space =
+         execution_context->AddressSpace();
+ 
+@@ -120,7 +119,6 @@ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
+     bool is_external_request = requestor_space > target_space;
+     if (is_external_request)
+       return true;
+-  }
+ 
+   return false;
+ }
+diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+--- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
+@@ -274,6 +274,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+     return false;
+   }
+ 
+  if (GetBaseFetchContext()->ShouldBlockGateWayAttacks(execution_context_->AddressSpace(), url)) {
+    has_initiated_opening_handshake_ = false;
+    return false;
+  }
+
+   if (auto* scheduler = execution_context_->GetScheduler()) {
+     feature_handle_for_scheduler_ = scheduler->RegisterFeature(
+         SchedulingPolicy::Feature::kWebSocket,
+diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
+--- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
+++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
+@@ -124,9 +124,36 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+     return ConnectResult::kException;
+   }
+ 
+  network::mojom::IPAddressSpace requestor_space =
+      execution_context->AddressSpace();
+  if (ShouldBlockGateWayAttacks(requestor_space, url_)) {
+    state_ = kClosed;
+    exception_state.ThrowSecurityError(
+        "Access to address of '" + url_.Host() + "' is not allowed from '" + execution_context->addressSpaceForBindings() + "' address space.");
+    return ConnectResult::kException;
+  }
+
+   return ConnectResult::kSuccess;
+ }
+ 
+bool WebSocketCommon::ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL& request_url) const {
+  // TODO(mkwst): This only checks explicit IP addresses. We'll have to move
+  // all this up to //net and //content in order to have any real impact on
+  // gateway attacks. That turns out to be a TON of work (crbug.com/378566).
+  network::mojom::IPAddressSpace target_space =
+      network::mojom::IPAddressSpace::kPublic;
+  if (network_utils::IsReservedIPAddress(request_url.Host()))
+    target_space = network::mojom::IPAddressSpace::kPrivate;
+  if (SecurityOrigin::Create(request_url)->IsLocalhost())
+    target_space = network::mojom::IPAddressSpace::kLocal;
+
+  bool is_external_request = requestor_space > target_space;
+  if (is_external_request)
+    return true;
+
+  return false;
+}
+
+ void WebSocketCommon::CloseInternal(int code,
+                                     const String& reason,
+                                     WebSocketChannel* channel,
+diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.h b/third_party/blink/renderer/modules/websockets/websocket_common.h
+--- a/third_party/blink/renderer/modules/websockets/websocket_common.h
+++ b/third_party/blink/renderer/modules/websockets/websocket_common.h
+@@ -8,6 +8,8 @@
+ #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBSOCKETS_WEBSOCKET_COMMON_H_
+ 
+ #include "base/macros.h"
+#include "services/network/public/mojom/ip_address_space.mojom.h"
+#include "third_party/blink/renderer/platform/network/network_utils.h"
+ #include "third_party/blink/renderer/modules/modules_export.h"
+ #include "third_party/blink/renderer/platform/weborigin/kurl.h"
+ #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
+@@ -51,6 +53,8 @@ class MODULES_EXPORT WebSocketCommon {
+   void SetState(State state) { state_ = state; }
+   const KURL& Url() const { return url_; }
+ 
+  bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL& url) const;
+
+   // The following methods are public for testing.
+ 
+   // Returns true if |protocol| is a valid WebSocket subprotocol name.
+-- 
+2.17.1
+
@@ -1,7 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 30 Oct 2019 11:50:13 +0100
-Subject: Block all connection requests with 'qjz9zk' in the domain name or
- with a 'trk:' scheme.
+Subject: Block 'qjz9zk' or 'trk:' requests

 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'
@@ -9,26 +8,25 @@ This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs
 .../chrome_autocomplete_scheme_classifier.cc  |  1 +
 chrome/browser/history/history_utils.cc       |  1 +
 chrome/browser/ui/singleton_tabs.cc           |  3 +-
- .../browser/url_request_context_factory.cc    |  7 +++-
- .../omnibox/browser/autocomplete_input.cc     |  7 ++--
+ .../omnibox/browser/autocomplete_input.cc     |  8 ++++-
 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/trk_protocol_handler.cc       | 25 +++++++++++++++
+ net/url_request/trk_protocol_handler.h        | 31 +++++++++++++++++++
 net/url_request/url_request.cc                |  8 +++++
- .../url_request_context_builder.cc            |  4 +++
+ .../url_request_context_builder.cc            |  3 ++
 url/url_constants.cc                          |  1 +
 url/url_constants.h                           |  1 +
 url/url_util.cc                               |  2 ++
- 15 files changed, 97 insertions(+), 4 deletions(-)
+ 14 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 net/url_request/trk_protocol_handler.cc
 create mode 100644 net/url_request/trk_protocol_handler.h

 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -28,6 +28,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
   if (base::IsStringASCII(scheme) &&
       (ProfileIOData::IsHandledProtocol(scheme) ||
        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
@@ -39,18 +37,18 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.c
 diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
 --- a/chrome/browser/history/history_utils.cc
 +++ b/chrome/browser/history/history_utils.cc
-@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
+@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url) {
       url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kChromeUIScheme) ||
       url.SchemeIs(content::kViewSourceScheme) ||
 +      url.SchemeIs(url::kTraceScheme) ||
       url.SchemeIs(chrome::kChromeNativeScheme) ||
       url.SchemeIs(chrome::kChromeSearchScheme) ||
-       url.SchemeIs(dom_distiller::kDomDistillerScheme) ||
+       url.SchemeIs(dom_distiller::kDomDistillerScheme))
 diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -100,7 +100,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
 
     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
     // removes the "view-source:" scheme which leads to incorrect matching.
@@ -60,40 +58,26 @@ 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
-@@ -40,6 +40,7 @@
- #include "net/proxy_resolution/proxy_resolution_service.h"
- #include "net/quic/quic_context.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"
-@@ -248,13 +249,17 @@ void URLRequestContextFactory::InitializeMainContextDependencies(
-       new net::URLRequestJobFactoryImpl());
-   // Keep ProtocolHandlers added in sync with
-   // CastContentBrowserClient::IsHandledURL().
-+  bool set_protocol = false;
-   for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
-        it != protocol_handlers->end();
-        ++it) {
-    bool set_protocol =
-+    set_protocol =
-         job_factory->SetProtocolHandler(it->first, std::move(it->second));
-     DCHECK(set_protocol);
-   }
-+  set_protocol = job_factory->SetProtocolHandler(
-+      url::kTraceScheme, base::WrapUnique(new net::TrkProtocolHandler));
-+  DCHECK(set_protocol);
- 
-   // Set up interceptors in the reverse order.
-   std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -496,7 +496,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -81,10 +81,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
+ bool HasScheme(const std::u16string& input, const char* scheme) {
+   std::string utf8_input(base::UTF16ToUTF8(input));
+   url::Component view_source_scheme;
+
+  if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &view_source_scheme)) {
+    return false;
+  }
+   if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme,
+                                 &view_source_scheme)) {
+     utf8_input.erase(0, view_source_scheme.end() + 1);
+   }
+
+   return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
+ }
+ 
+@@ -532,7 +537,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
   // For the view-source and blob schemes, we should emphasize the host of the
   // URL qualified by the view-source or blob prefix.
   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -102,22 +86,11 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 +       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
     // Obtain the URL prefixed by view-source or blob and parse it.
-     base::string16 real_url(text.substr(after_scheme_and_colon));
-@@ -569,7 +570,9 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) {
- bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
-   std::string utf8_input(base::UTF16ToUTF8(input));
-   url::Component scheme;
-  if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
-+  if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &scheme)) {
-+    return false;
-+  } else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
-     utf8_input.erase(0, scheme.end() + 1);
-   }
-   return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
+     std::u16string real_url(text.substr(after_scheme_and_colon));
 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) {
+@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
     }
   }
 
@@ -131,7 +104,7 @@ 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
-@@ -617,6 +617,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+@@ -819,6 +819,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
 #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
   RegisterWebSafeScheme(url::kFtpScheme);
   RegisterWebSafeScheme(url::kDataScheme);
@@ -142,20 +115,20 @@ 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
-@@ -1662,6 +1662,8 @@ component("net") {
-       "url_request/report_sender.h",
-       "url_request/static_http_user_agent_settings.cc",
-       "url_request/static_http_user_agent_settings.h",
-+      "url_request/trk_protocol_handler.cc",
-+      "url_request/trk_protocol_handler.h",
-       "url_request/url_fetcher.cc",
-       "url_request/url_fetcher.h",
-       "url_request/url_fetcher_core.cc",
+@@ -1042,6 +1042,8 @@ component("net") {
+     "url_request/url_request_http_job.cc",
+     "url_request/url_request_http_job.h",
+     "url_request/url_request_interceptor.cc",
+    "url_request/trk_protocol_handler.cc",
+    "url_request/trk_protocol_handler.h",
+     "url_request/url_request_interceptor.h",
+     "url_request/url_request_job.cc",
+     "url_request/url_request_job.h",
 diff --git a/net/url_request/trk_protocol_handler.cc b/net/url_request/trk_protocol_handler.cc
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.cc
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,25 @@
 +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -170,11 +143,10 @@ new file mode 100644
 +
 +TrkProtocolHandler::TrkProtocolHandler() = default;
 +
-+URLRequestJob* TrkProtocolHandler::MaybeCreateJob(
-+    URLRequest* request, NetworkDelegate* network_delegate) const {
+std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
+    URLRequest* request) const {
 +  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
-+  return new URLRequestErrorJob(
-+      request, network_delegate, ERR_BLOCKED_BY_CLIENT);
+  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
 +}
 +
 +bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
@@ -186,7 +158,7 @@ diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protoc
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,31 @@
 +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -208,9 +180,7 @@ new file mode 100644
 +    : public URLRequestJobFactory::ProtocolHandler {
 + public:
 +  TrkProtocolHandler();
-+  URLRequestJob* MaybeCreateJob(
-+      URLRequest* request,
-+      NetworkDelegate* network_delegate) const override;
+  std::unique_ptr<URLRequestJob> CreateJob(URLRequest* request) const override;
 +  bool IsSafeRedirectTarget(const GURL& location) const override;
 +
 + private:
@@ -226,12 +196,12 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
- #include "base/stl_util.h"
-+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
-@@ -40,6 +41,7 @@
+ #include "base/values.h"
+@@ -44,6 +45,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -239,7 +209,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 using base::Time;
 using std::string;
-@@ -579,6 +581,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -580,6 +582,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -255,31 +225,30 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -40,6 +40,7 @@
+@@ -46,6 +46,7 @@
 #include "net/quic/quic_stream_factory.h"
 #include "net/ssl/ssl_config_service_defaults.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"
-@@ -649,6 +650,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
-     }
-     url_request_interceptors_.clear();
+ #include "net/url_request/url_request_job_factory.h"
+@@ -552,6 +553,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+     job_factory->SetProtocolHandler(scheme_handler.first,
+                                     std::move(scheme_handler.second));
   }
 +  job_factory->SetProtocolHandler(url::kTraceScheme,
 +                                  std::make_unique<TrkProtocolHandler>());
-+
-   if (create_intercepting_job_factory_) {
-     top_job_factory = std::move(create_intercepting_job_factory_)
-                           .Run(std::move(top_job_factory));
+   protocol_handlers_.clear();
+ 
+ #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
 diff --git a/url/url_constants.cc b/url/url_constants.cc
 --- a/url/url_constants.cc
 +++ b/url/url_constants.cc
-@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
- // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+@@ -29,6 +29,7 @@ const char kMailToScheme[] = "mailto";
 const char kQuicTransportScheme[] = "quic-transport";
 const char kTelScheme[] = "tel";
+ const char kUrnScheme[] = "urn";
 +const char kTraceScheme[] = "trk";
 const char kWsScheme[] = "ws";
 const char kWssScheme[] = "wss";
@@ -287,10 +256,10 @@ 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 kJavaScriptScheme[];
- COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+@@ -33,6 +33,7 @@ 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 kUrnScheme[];
 +COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
 COMPONENT_EXPORT(URL) extern const char kWsScheme[];
 COMPONENT_EXPORT(URL) extern const char kWssScheme[];
@@ -298,7 +267,7 @@ 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
-@@ -27,6 +27,7 @@ struct SchemeRegistry {
+@@ -35,6 +35,7 @@ struct SchemeRegistry {
   std::vector<SchemeWithType> standard_schemes = {
       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -306,7 +275,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
       // 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
-@@ -64,6 +65,7 @@ struct SchemeRegistry {
+@@ -78,6 +79,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -0,0 +1,929 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Thu, 7 Oct 2021 14:27:12 +0000
+Subject: Bromite auto updater
+
+Enable checking for new versions, with notifications and proxy support
+---
+ .../java/templates/BuildConfig.template       |   2 +
+ build/config/android/rules.gni                |   3 +
+ chrome/android/chrome_java_sources.gni        |   1 +
+ .../java/res/xml/about_chrome_preferences.xml |   5 +
+ .../about_settings/AboutChromeSettings.java   |  28 ++-
+ .../chrome/browser/omaha/OmahaBase.java       |  47 +++-
+ .../chrome/browser/omaha/UpdateConfigs.java   |   6 +-
+ .../browser/omaha/UpdateStatusProvider.java   |  33 ++-
+ .../browser/omaha/VersionNumberGetter.java    |   3 +-
+ .../inline/BromiteInlineUpdateController.java | 204 ++++++++++++++++++
+ .../inline/InlineUpdateControllerFactory.java |   8 +-
+ chrome/browser/endpoint_fetcher/BUILD.gn      |   2 +
+ .../endpoint_fetcher/endpoint_fetcher.cc      | 129 +++++++++++
+ .../endpoint_fetcher/endpoint_fetcher.h       |  23 +-
+ .../endpoint_fetcher/EndpointFetcher.java     |  11 +
+ .../EndpointHeaderResponse.java               |  31 +++
+ chrome/browser/flag-metadata.json             |   2 +-
+ chrome/browser/flag_descriptions.cc           |   5 +-
+ .../flags/android/chrome_feature_list.cc      |   2 +-
+ .../strings/android_chrome_strings.grd        |   8 +-
+ 20 files changed, 516 insertions(+), 37 deletions(-)
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
+ create mode 100644 chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java
+
+diff --git a/build/android/java/templates/BuildConfig.template b/build/android/java/templates/BuildConfig.template
+--- a/build/android/java/templates/BuildConfig.template
+++ b/build/android/java/templates/BuildConfig.template
+@@ -92,4 +92,6 @@ public class BuildConfig {
+ #else
+     public static MAYBE_FINAL boolean ISOLATED_SPLITS_ENABLED MAYBE_FALSE;
+ #endif
+
+    public static MAYBE_FINAL String BUILD_TARGET_CPU = _BUILD_TARGET_CPU;
+ }
+diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
+--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
+@@ -1967,6 +1967,9 @@ if (enable_java_templates) {
+           ]
+         }
+       }
+
+      # add arch to org.chromium.build.BuildConfig
+      defines += [ "_BUILD_TARGET_CPU=\"${target_cpu}\"" ]
+     }
+   }
+ 
+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
+@@ -887,6 +887,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java",
+   "java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java",
+   "java/src/org/chromium/chrome/browser/omaha/inline/NoopInlineUpdateController.java",
+  "java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java",
+   "java/src/org/chromium/chrome/browser/omaha/inline/PlayInlineUpdateController.java",
+   "java/src/org/chromium/chrome/browser/omaha/metrics/HistogramUtils.java",
+   "java/src/org/chromium/chrome/browser/omaha/metrics/TrackingProvider.java",
+diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml
+--- a/chrome/android/java/res/xml/about_chrome_preferences.xml
+++ b/chrome/android/java/res/xml/about_chrome_preferences.xml
+@@ -7,6 +7,11 @@
+     <Preference
+         android:key="application_version"
+         android:title="@string/application_version_title" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="allow_inline_update"
+        android:title="@string/allow_inline_update_title"
+        android:summary="@string/allow_inline_update_summary"
+        android:defaultValue="false" />
+     <org.chromium.chrome.browser.about_settings.AboutChromePreferenceOSVersion
+         android:key="os_version"
+         android:title="@string/os_version_title" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+@@ -21,14 +21,20 @@ import org.chromium.ui.widget.Toast;
+ 
+ import java.util.Calendar;
+ 
+import android.content.SharedPreferences;
+import org.chromium.chrome.browser.omaha.OmahaBase;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+
+ /**
+  * Settings fragment that displays information about Chrome.
+  */
+ public class AboutChromeSettings
+-        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
+        extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener,
+                                                    Preference.OnPreferenceChangeListener {
+     private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7;
+ 
+     private static final String PREF_APPLICATION_VERSION = "application_version";
+    private static final String PREF_ALLOW_INLINE_UPDATE = "allow_inline_update";
+     private static final String PREF_OS_VERSION = "os_version";
+     private static final String PREF_LEGAL_INFORMATION = "legal_information";
+ 
+@@ -59,6 +65,13 @@ public class AboutChromeSettings
+         p = findPreference(PREF_LEGAL_INFORMATION);
+         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
+         p.setSummary(getString(R.string.legal_information_summary, currentYear));
+
+        ChromeSwitchPreference allowInlineUpdate =
+                (ChromeSwitchPreference) findPreference(PREF_ALLOW_INLINE_UPDATE);
+        allowInlineUpdate.setChecked(
+            OmahaBase.getSharedPreferences()
+                    .getBoolean(OmahaBase.PREF_ALLOW_INLINE_UPDATE, false));
+        allowInlineUpdate.setOnPreferenceChangeListener(this);
+     }
+ 
+     /**
+@@ -122,4 +135,17 @@ public class AboutChromeSettings
+         }
+         return true;
+     }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (PREF_ALLOW_INLINE_UPDATE.equals(key)) {
+            SharedPreferences.Editor sharedPreferenceEditor = OmahaBase.getSharedPreferences().edit();
+            sharedPreferenceEditor.putBoolean(OmahaBase.PREF_ALLOW_INLINE_UPDATE, (boolean) newValue);
+            sharedPreferenceEditor.apply();
+
+            OmahaBase.resetUpdatePrefs();
+        }
+        return true;
+    }
+ }
+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
+@@ -31,6 +31,8 @@ import java.net.HttpURLConnection;
+ import java.net.URL;
+ import java.util.Date;
+ 
+import org.chromium.build.BuildConfig;
+
+ /**
+  * Keeps tabs on the current state of Chrome, tracking if and when a request should be sent to the
+  * Omaha Server.
+@@ -97,7 +99,9 @@ public class OmahaBase {
+     static final String PREF_TIMESTAMP_FOR_NEW_REQUEST = "timestampForNewRequest";
+     static final String PREF_TIMESTAMP_FOR_NEXT_POST_ATTEMPT = "timestampForNextPostAttempt";
+     static final String PREF_TIMESTAMP_OF_INSTALL = "timestampOfInstall";
+-    static final String PREF_TIMESTAMP_OF_REQUEST = "timestampOfRequest";
+    public static final String PREF_TIMESTAMP_OF_REQUEST = "timestampOfRequest";
+    public static final String PREF_LATEST_MODIFIED_VERSION = "latestModifiedVersion";
+    public static final String PREF_ALLOW_INLINE_UPDATE = "allowInlineUpdate";
+ 
+     static final int MIN_API_JOB_SCHEDULER = Build.VERSION_CODES.M;
+ 
+@@ -158,7 +162,8 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
+        // do not enable version control via Omaha Update Server
+        return true;
+     }
+ 
+     /**
+@@ -630,4 +635,42 @@ public class OmahaBase {
+                 // updateStatus is only used for the on-demand check.
+                 null);
+     }
+
+    public static boolean isNewVersionAvailableByVersion(String latestVersionString) {
+        VersionNumber mCurrentProductVersion = VersionNumber.fromString(ChromeVersionInfo.getProductVersion());
+        if (mCurrentProductVersion == null) {
+            Log.e(TAG, "BromiteUpdater: current product version is null");
+            return false;
+        }
+
+        VersionNumber latestVersion = VersionNumber.fromString(latestVersionString);
+        if (latestVersion == null) {
+            Log.e(TAG, "BromiteUpdater: invalid latest version '%s'", latestVersionString);
+            return false;
+        }
+
+        Log.i(TAG, "BromiteUpdater: currentProductVersion=%s, latestVersion=%s",
+                mCurrentProductVersion.toString(), latestVersion.toString());
+
+        return mCurrentProductVersion.isSmallerThan(latestVersion);
+    }
+
+    public static void updateLastPushedTimeStamp(long timeMillis) {
+        SharedPreferences preferences = OmahaBase.getSharedPreferences();
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putLong(OmahaBase.PREF_TIMESTAMP_OF_REQUEST, timeMillis);
+        editor.apply();
+    }
+
+    public static void setLastModifiedVersion(String version) {
+        SharedPreferences preferences = OmahaBase.getSharedPreferences();
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString(OmahaBase.PREF_LATEST_MODIFIED_VERSION, version);
+        editor.apply();
+    }
+
+    public static void resetUpdatePrefs() {
+        OmahaBase.setLastModifiedVersion("");
+        OmahaBase.updateLastPushedTimeStamp(0);
+    }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
+@@ -65,7 +65,7 @@ public class UpdateConfigs {
+     private static final String UPDATE_NOTIFICATION_EXPERIMENTAL_PARAM_NAME =
+             "update_notification_experimental_context";
+ 
+-    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 21 * DateUtils.DAY_IN_MILLIS;
+    private static final long DEFAULT_UPDATE_NOTIFICATION_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS;
+     private static final long DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS = 2 * DateUtils.DAY_IN_MILLIS;
+ 
+     /** Possible update flow configurations. */
+@@ -300,7 +300,7 @@ public class UpdateConfigs {
+      * @return the current inline update flow configuration.
+      */
+     @UpdateFlowConfiguration
+-    static int getConfiguration() {
+    public static int getConfiguration() {
+         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.INLINE_UPDATE_FLOW)) {
+             // Always use the the old flow if the inline update flow feature is not enabled.
+             return UpdateFlowConfiguration.INTENT_ONLY;
+@@ -328,4 +328,4 @@ public class UpdateConfigs {
+         if (configuration == null) return "";
+         return configuration.toLowerCase(Locale.US);
+     }
+-}
+\ No newline at end of file
+}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
+@@ -45,6 +45,12 @@ import java.io.File;
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+ 
+import org.chromium.base.Log;
+import android.content.SharedPreferences;
+import android.os.Build;
+import org.chromium.build.BuildConfig;
+import org.chromium.chrome.browser.version.ChromeVersionInfo;
+
+ /**
+  * Provides the current update state for Chrome.  This update state is asynchronously determined and
+  * can change as Chrome runs.
+@@ -339,8 +345,7 @@ public class UpdateStatusProvider implements ActivityStateListener {
+             case UpdateConfigs.UpdateFlowConfiguration.NEVER_SHOW:
+                 return UpdateState.NONE;
+             case UpdateConfigs.UpdateFlowConfiguration.INLINE_ONLY:
+-                if (omahaState != UpdateState.UPDATE_AVAILABLE) return omahaState;
+-                if (inlineState == UpdateState.NONE) return UpdateState.NONE;
+                if (inlineState == UpdateState.NONE) return omahaState;
+                 return inlineState;
+             case UpdateConfigs.UpdateFlowConfiguration.BEST_EFFORT:
+                 if (omahaState != UpdateState.UPDATE_AVAILABLE) return omahaState;
+@@ -415,24 +420,12 @@ public class UpdateStatusProvider implements ActivityStateListener {
+         private UpdateStatus getRealStatus(Context context) {
+             UpdateStatus status = new UpdateStatus();
+ 
+-            if (VersionNumberGetter.isNewerVersionAvailable(context)) {
+-                status.updateUrl = MarketURLGetter.getMarketUrl();
+-                status.latestVersion =
+-                        VersionNumberGetter.getInstance().getLatestKnownVersion(context);
+-
+-                boolean allowedToUpdate =
+-                        checkForSufficientStorage() && isGooglePlayStoreAvailable(context);
+-                status.updateState =
+-                        allowedToUpdate ? UpdateState.UPDATE_AVAILABLE : UpdateState.NONE;
+-
+-                SharedPreferencesManager.getInstance().removeKey(
+-                        ChromePreferenceKeys.LATEST_UNSUPPORTED_VERSION);
+-            } else if (!VersionNumberGetter.isCurrentOsVersionSupported()) {
+-                status.updateState = UpdateState.UNSUPPORTED_OS_VERSION;
+-                status.latestUnsupportedVersion = SharedPreferencesManager.getInstance().readString(
+-                        ChromePreferenceKeys.LATEST_UNSUPPORTED_VERSION, null);
+-            } else {
+-                status.updateState = UpdateState.NONE;
+            SharedPreferences preferences = OmahaBase.getSharedPreferences();
+            status.latestVersion = preferences.getString(OmahaBase.PREF_LATEST_MODIFIED_VERSION, "");
+
+            status.updateState = UpdateState.NONE;
+            if (status.latestVersion != null && status.latestVersion.length() != 0 && OmahaBase.isNewVersionAvailableByVersion(status.latestVersion)) {
+                status.updateState = UpdateState.INLINE_UPDATE_AVAILABLE;
+             }
+ 
+             return status;
+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
+@@ -43,7 +43,8 @@ public class VersionNumberGetter {
+     private static VersionNumberGetter sInstanceForTests;
+ 
+     /** If false, OmahaClient will never report that a newer version is available. */
+-    private static boolean sEnableUpdateDetection = true;
+    // it must be false to disable version control via Omaha server
+    private static boolean sEnableUpdateDetection = false;
+ 
+     protected VersionNumberGetter() { }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
+@@ -0,0 +1,204 @@
+// Copyright 2021 The Ungoogled Chromium Authors. All rights reserved.
+//
+// This file is part of Ungoogled Chromium Android.
+//
+// Ungoogled Chromium Android is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or any later version.
+//
+// Ungoogled Chromium Android is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Ungoogled Chromium Android.  If not,
+// see <https://www.gnu.org/licenses/>.
+
+package org.chromium.chrome.browser.omaha.inline;
+
+import static org.chromium.chrome.browser.omaha.UpdateConfigs.getUpdateNotificationInterval;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.text.format.DateUtils;
+import org.chromium.build.BuildConfig;
+
+import androidx.annotation.Nullable;
+
+import org.chromium.base.Callback;
+import org.chromium.base.Log;
+import org.chromium.base.task.AsyncTask;
+import org.chromium.base.task.PostTask;
+import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.omaha.OmahaBase;
+import org.chromium.chrome.browser.omaha.UpdateConfigs;
+import org.chromium.chrome.browser.omaha.UpdateStatusProvider;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.tab.TabLaunchType;
+import org.chromium.chrome.browser.tabmodel.TabCreator;
+import org.chromium.chrome.browser.version.ChromeVersionInfo;
+import org.chromium.content_public.browser.LoadUrlParams;
+import org.chromium.content_public.browser.UiThreadTaskTraits;
+import org.chromium.ui.base.PageTransition;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.util.regex.Pattern;
+
+import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher;
+import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse;
+import org.chromium.chrome.browser.omaha.VersionNumber;
+
+class BromiteInlineUpdateController implements InlineUpdateController {
+
+    private static final String TAG = "BromiteInlineUpdateController";
+    private final String REDIRECT_URL_PREFIX = "https://github.com/bromite/bromite/releases/download/";
+    private final String UPDATE_VERSION_URL = "https://github.com/bromite/bromite/releases/latest/download/";
+
+    private String getDownloadUrl() {
+        return UPDATE_VERSION_URL + BuildConfig.BUILD_TARGET_CPU + "_ChromePublic.apk";
+    }
+
+    private boolean mEnabled = true;
+    private Runnable mCallback;
+    private @Nullable @UpdateStatusProvider.UpdateState Integer mUpdateState =
+                                                    UpdateStatusProvider.UpdateState.NONE;
+
+    BromiteInlineUpdateController(Runnable callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (mEnabled == enabled) return;
+
+        mEnabled = enabled;
+        if (mEnabled) pullCurrentState();
+    }
+
+    @Override
+    public @Nullable @UpdateStatusProvider.UpdateState Integer getStatus() {
+        if (mEnabled) pullCurrentState();
+        return mUpdateState;
+    }
+
+    @Override
+    public void startUpdate(Activity activity) {
+        assert ChromeActivity.class.isInstance(activity);
+        ChromeActivity thisActivity = (ChromeActivity) activity;
+        String downloadUrl = getDownloadUrl();
+        // Always open in new incognito tab
+        TabCreator tabCreator = thisActivity.getTabCreator(true);
+        tabCreator.createNewTab(new LoadUrlParams(downloadUrl, PageTransition.AUTO_BOOKMARK),
+                TabLaunchType.FROM_LINK, thisActivity.getActivityTab());
+    }
+
+    @Override
+    public void completeUpdate() {
+    }
+
+    private void pullCurrentState() {
+        if (OmahaBase.getSharedPreferences()
+                .getBoolean(OmahaBase.PREF_ALLOW_INLINE_UPDATE, false) == false) {
+            Log.i(TAG, "BromiteUpdater: disabled by user");
+            return;
+        }
+
+        if (mUpdateState != UpdateStatusProvider.UpdateState.NONE)
+            return;
+
+        if (shallUpdate() == false)
+            return;
+
+        switch (mUpdateState) {
+            case UpdateStatusProvider.UpdateState.INLINE_UPDATE_AVAILABLE:
+                break;
+            case UpdateStatusProvider.UpdateState.NONE:
+                checkLatestVersion((ok) -> {
+                    if (ok == false) return;
+
+                    SharedPreferences preferences = OmahaBase.getSharedPreferences();
+                    String latestVersion = preferences.getString(OmahaBase.PREF_LATEST_MODIFIED_VERSION, "");
+
+                    if (OmahaBase.isNewVersionAvailableByVersion(latestVersion)) {
+                        postStatus(UpdateStatusProvider.UpdateState.INLINE_UPDATE_AVAILABLE);
+                    } else {
+                        if (mUpdateState != UpdateStatusProvider.UpdateState.NONE) {
+                            postStatus(UpdateStatusProvider.UpdateState.NONE);
+                        }
+                    }
+                });
+                break;
+            case UpdateStatusProvider.UpdateState.INLINE_UPDATE_READY:
+                // Intentional fall through.
+            case UpdateStatusProvider.UpdateState.INLINE_UPDATE_FAILED:
+                // Intentional fall through.
+            case UpdateStatusProvider.UpdateState.INLINE_UPDATE_DOWNLOADING:
+                // Intentional fall through.
+            case UpdateStatusProvider.UpdateState.UNSUPPORTED_OS_VERSION:
+                // Intentional fall through.
+            default:
+                return;
+        }
+    }
+
+    private boolean shallUpdate() {
+        long currentTime = System.currentTimeMillis();
+        SharedPreferences preferences = OmahaBase.getSharedPreferences();
+        long lastPushedTimeStamp = preferences.getLong(OmahaBase.PREF_TIMESTAMP_OF_REQUEST, 0);
+        return currentTime - lastPushedTimeStamp >= getUpdateNotificationInterval();
+    }
+
+    private void checkLatestVersion(final Callback<Boolean> callback) {
+        assert UPDATE_VERSION_URL != null;
+
+        OmahaBase.resetUpdatePrefs();
+
+        String urlToCheck = getDownloadUrl();
+        Log.i(TAG, "BromiteUpdater: fetching with HEAD '%s'", urlToCheck);
+
+        EndpointFetcher.nativeHeadWithNoAuth(
+                (endpointResponse) -> {
+                    OmahaBase.updateLastPushedTimeStamp(System.currentTimeMillis());
+                    String redirectURL = endpointResponse.getRedirectUrl();
+                    if (redirectURL != null) {
+                        Log.i(TAG, "BromiteUpdater: obtained response '%s' and redirect URL '%s'", endpointResponse.getResponseString(), redirectURL);
+                        if (redirectURL.indexOf(REDIRECT_URL_PREFIX) == 0) {
+                            redirectURL = redirectURL.substring(REDIRECT_URL_PREFIX.length());
+                            String[] parts = redirectURL.split(Pattern.quote("/"));
+                            if (parts.length > 0) {
+                                VersionNumber version = VersionNumber.fromString(parts[0]);
+                                if (version != null) {
+                                    OmahaBase.setLastModifiedVersion(parts[0]);
+                                    callback.onResult(true);
+                                    return;
+                                }
+                            }
+                        }
+                    } else {
+                        // retry after 1 hour
+                        OmahaBase.updateLastPushedTimeStamp(
+                            System.currentTimeMillis() - getUpdateNotificationInterval() -
+                            DateUtils.HOUR_IN_MILLIS);
+                        Log.i(TAG, "BromiteUpdater: failed, will retry in 1 hour");
+                    }
+
+                    callback.onResult(false);
+                },
+                Profile.getLastUsedRegularProfile(),
+                urlToCheck, /*timeout*/5000, /*follow_redirect*/false);
+    }
+
+    private void postStatus(@UpdateStatusProvider.UpdateState int status) {
+        mUpdateState = status;
+        PostTask.postTask(UiThreadTaskTraits.DEFAULT, mCallback);
+    }
+}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
+@@ -19,8 +19,10 @@ public class InlineUpdateControllerFactory {
+         @FakeAppUpdateManagerWrapper.Type
+         int mockInlineEndState = UpdateConfigs.getMockInlineScenarioEndState();
+ 
+-        // No test scenario was in place, and the inline flow has not been enabled, so use a
+-        // controller with no functionality.
+-        return new NoopInlineUpdateController(callback);
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.INLINE_UPDATE_FLOW)) {
+            return new BromiteInlineUpdateController(callback);
+        } else {
+            return new NoopInlineUpdateController(callback);
+        }
+     }
+ }
+diff --git a/chrome/browser/endpoint_fetcher/BUILD.gn b/chrome/browser/endpoint_fetcher/BUILD.gn
+--- a/chrome/browser/endpoint_fetcher/BUILD.gn
+++ b/chrome/browser/endpoint_fetcher/BUILD.gn
+@@ -14,6 +14,7 @@ android_library("java") {
+   sources = [
+     "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java",
+     "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointResponse.java",
+    "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java",
+   ]
+   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+ }
+@@ -22,5 +23,6 @@ generate_jni("jni_headers") {
+   sources = [
+     "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java",
+     "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointResponse.java",
+    "java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java",
+   ]
+ }
+diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
+--- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
+++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
+@@ -26,10 +26,15 @@
+ #include "base/android/jni_string.h"
+ #include "chrome/browser/endpoint_fetcher/jni_headers/EndpointFetcher_jni.h"
+ #include "chrome/browser/endpoint_fetcher/jni_headers/EndpointResponse_jni.h"
+#include "chrome/browser/endpoint_fetcher/jni_headers/EndpointHeaderResponse_jni.h"
+ #include "chrome/browser/profiles/profile_android.h"
+ 
+ #endif  // defined(OS_ANDROID)
+ 
+#include "net/base/load_flags.h"
+#include "net/http/http_status_code.h"
+#include "services/network/public/cpp/resource_request.h"
+
+ namespace {
+ const char kContentTypeKey[] = "Content-Type";
+ const char kDeveloperKey[] = "X-Developer-Key";
+@@ -151,6 +156,19 @@ EndpointFetcher::EndpointFetcher(
+       identity_manager_(nullptr),
+       sanitize_response_(true) {}
+ 
+EndpointFetcher::EndpointFetcher(
+    Profile* const profile,
+    const GURL& url,
+    int64_t timeout_ms,
+    const net::NetworkTrafficAnnotationTag& annotation_tag)
+    : url_(url),
+      timeout_ms_(timeout_ms),
+      annotation_tag_(annotation_tag),
+      url_loader_factory_(profile->GetDefaultStoragePartition()
+                              ->GetURLLoaderFactoryForBrowserProcess()),
+      identity_manager_(nullptr),
+      sanitize_response_(false) {}
+
+ EndpointFetcher::~EndpointFetcher() = default;
+ 
+ void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
+@@ -280,6 +298,77 @@ void EndpointFetcher::OnSanitizationResult(
+   std::move(endpoint_fetcher_callback).Run(std::move(response));
+ }
+ 
+void EndpointFetcher::PerformHeadRequest(
+    EndpointFetcherCallback endpoint_fetcher_callback,
+    const char* key,
+    bool allow_redirect) {
+
+  endpoint_fetcher_callback_ = std::move(endpoint_fetcher_callback);
+
+  auto resource_request = std::make_unique<network::ResourceRequest>();
+  resource_request->method = "HEAD";
+  resource_request->url = url_;
+  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
+  resource_request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE
+                                  | net::LOAD_DO_NOT_SAVE_COOKIES;
+  if (allow_redirect == false) {
+    resource_request->redirect_mode = network::mojom::RedirectMode::kManual;
+  }
+
+  simple_url_loader_ = network::SimpleURLLoader::Create(
+      std::move(resource_request), annotation_tag_);
+  simple_url_loader_->SetTimeoutDuration(
+      base::TimeDelta::FromMilliseconds(timeout_ms_));
+  simple_url_loader_->SetAllowHttpErrorResults(true);
+
+  if (!response_)
+    response_ = std::make_unique<EndpointResponse>();
+
+  if (allow_redirect == false) {
+    simple_url_loader_->SetOnRedirectCallback(base::BindRepeating(
+      &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this)));
+  }
+
+  simple_url_loader_->DownloadHeadersOnly(
+      url_loader_factory_.get(),
+      base::BindOnce(&EndpointFetcher::OnURLLoadComplete,
+                     base::Unretained(this)));
+}
+
+void EndpointFetcher::OnSimpleLoaderRedirect(
+    const net::RedirectInfo& redirect_info,
+    const network::mojom::URLResponseHead& response_head,
+    std::vector<std::string>* removed_headers) {
+  url_ = redirect_info.new_url;
+  if (response_->redirect_url.empty()) {
+    response_->redirect_url = url_.spec();
+    response_->response = std::to_string(redirect_info.status_code);
+  } else {
+    LOG(INFO) << "BromiteUpdater: redirect URL is not empty, status code is " << redirect_info.status_code;
+  }
+
+  std::move(endpoint_fetcher_callback_).Run(std::move(response_));
+}
+
+void EndpointFetcher::OnURLLoadComplete(
+    scoped_refptr<net::HttpResponseHeaders> headers) {
+  if (!endpoint_fetcher_callback_)
+    return;
+
+  if (headers) {
+    if (response_->redirect_url.empty()) {
+      std::string location;
+      if (simple_url_loader_->ResponseInfo()->headers->IsRedirect(&location)) {
+        response_->redirect_url = location;
+      }
+    }
+  }
+
+  std::string net_error = net::ErrorToString(simple_url_loader_->NetError());
+  response_->response = net_error;
+  std::move(endpoint_fetcher_callback_).Run(std::move(response_));
+}
+
+ #if defined(OS_ANDROID)
+ namespace {
+ static void OnEndpointFetcherComplete(
+@@ -296,6 +385,25 @@ static void OnEndpointFetcherComplete(
+                        base::android::AttachCurrentThread(),
+                        std::move(endpoint_response->response))));
+ }
+
+static void OnEndpointFetcherHeadComplete(
+    const base::android::JavaRef<jobject>& jcaller,
+    // Passing the endpoint_fetcher ensures the endpoint_fetcher's
+    // lifetime extends to the callback and is not destroyed
+    // prematurely (which would result in cancellation of the request).
+    std::unique_ptr<EndpointFetcher> endpoint_fetcher,
+    std::unique_ptr<EndpointResponse> endpoint_response) {
+  base::android::RunObjectCallbackAndroid(
+      jcaller, Java_EndpointHeaderResponse_createEndpointResponse(
+                   base::android::AttachCurrentThread(),
+                   base::android::ConvertUTF8ToJavaString(
+                       base::android::AttachCurrentThread(),
+                       std::move(endpoint_response->response)),
+                   base::android::ConvertUTF8ToJavaString(
+                       base::android::AttachCurrentThread(),
+                       std::move(endpoint_response->redirect_url))));
+}
+
+ }  // namespace
+ 
+ // TODO(crbug.com/1077537) Create a KeyProvider so
+@@ -381,4 +489,25 @@ static void JNI_EndpointFetcher_NativeFetchWithNoAuth(
+       nullptr);
+ }
+ 
+static void JNI_EndpointFetcher_NativeHeadWithNoAuth(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& jprofile,
+    const base::android::JavaParamRef<jstring>& jurl,
+    jlong jtimeout, jboolean allow_redirect,
+    const base::android::JavaParamRef<jobject>& jcallback) {
+  auto endpoint_fetcher = std::make_unique<EndpointFetcher>(
+      ProfileAndroid::FromProfileAndroid(jprofile),
+      GURL(base::android::ConvertJavaStringToUTF8(env, jurl)),
+      jtimeout,
+      NO_TRAFFIC_ANNOTATION_YET);
+  auto* const endpoint_fetcher_ptr = endpoint_fetcher.get();
+  endpoint_fetcher_ptr->PerformHeadRequest(
+      base::BindOnce(&OnEndpointFetcherHeadComplete,
+                     base::android::ScopedJavaGlobalRef<jobject>(jcallback),
+                     // unique_ptr endpoint_fetcher is passed until the callback
+                     // to ensure its lifetime across the request.
+                     std::move(endpoint_fetcher)),
+      nullptr, allow_redirect);
+}
+
+ #endif  // defined(OS_ANDROID)
+diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.h b/chrome/browser/endpoint_fetcher/endpoint_fetcher.h
+--- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.h
+++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.h
+@@ -14,6 +14,8 @@
+ #include "components/signin/public/identity_manager/scope_set.h"
+ #include "net/traffic_annotation/network_traffic_annotation.h"
+ #include "services/data_decoder/public/cpp/json_sanitizer.h"
+#include "services/network/public/cpp/resource_request.h"
+#include "services/network/public/mojom/url_response_head.mojom.h"
+ 
+ namespace network {
+ struct ResourceRequest;
+@@ -31,6 +33,8 @@ class Profile;
+ 
+ struct EndpointResponse {
+   std::string response;
+  long last_modified;
+  std::string redirect_url;
+   // TODO(crbug.com/993393) Add more detailed error messaging
+ };
+ 
+@@ -77,6 +81,12 @@ class EndpointFetcher {
+                   const GURL& url,
+                   const net::NetworkTrafficAnnotationTag& annotation_tag);
+ 
+  // Constructor if no authentication is needed, with timeout
+  EndpointFetcher(Profile* const profile,
+                  const GURL& url,
+                  int64_t timeout_ms,
+                  const net::NetworkTrafficAnnotationTag& annotation_tag);
+
+   // Used for tests. Can be used if caller constructs their own
+   // url_loader_factory and identity_manager.
+   EndpointFetcher(
+@@ -113,6 +123,10 @@ class EndpointFetcher {
+   virtual void PerformRequest(EndpointFetcherCallback endpoint_fetcher_callback,
+                               const char* key);
+ 
+  virtual void PerformHeadRequest(EndpointFetcherCallback endpoint_fetcher_callback,
+                                  const char* key,
+                                  bool allow_redirect);
+
+  protected:
+   // Used for Mock only. see MockEndpointFetcher class.
+   explicit EndpointFetcher(
+@@ -126,6 +140,10 @@ class EndpointFetcher {
+                          std::unique_ptr<std::string> response_body);
+   void OnSanitizationResult(EndpointFetcherCallback endpoint_fetcher_callback,
+                             data_decoder::JsonSanitizer::Result result);
+  void OnURLLoadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
+  void OnSimpleLoaderRedirect(const net::RedirectInfo& redirect_info,
+                              const network::mojom::URLResponseHead& response_head,
+                              std::vector<std::string>* removed_headers);
+ 
+   enum AuthType { CHROME_API_KEY, OAUTH, NO_AUTH };
+   AuthType auth_type_;
+@@ -133,7 +151,7 @@ class EndpointFetcher {
+   // Members set in constructor to be passed to network::ResourceRequest or
+   // network::SimpleURLLoader.
+   const std::string oauth_consumer_name_;
+-  const GURL url_;
+  GURL url_;
+   const std::string http_method_;
+   const std::string content_type_;
+   int64_t timeout_ms_;
+@@ -152,6 +170,9 @@ class EndpointFetcher {
+       access_token_fetcher_;
+   std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
+ 
+  EndpointFetcherCallback endpoint_fetcher_callback_;
+  std::unique_ptr<EndpointResponse> response_;
+
+   base::WeakPtrFactory<EndpointFetcher> weak_ptr_factory_{this};
+ };
+ 
+diff --git a/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java b/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java
+--- a/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java
+++ b/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java
+@@ -68,6 +68,14 @@ public final class EndpointFetcher {
+                 profile, url, httpsMethod, contentType, postData, timeout, headers, callback);
+     }
+ 
+    @MainThread
+    public static void nativeHeadWithNoAuth(
+            Callback<EndpointHeaderResponse> callback, Profile profile,
+            String url, long timeout, boolean allow_redirect) {
+        EndpointFetcherJni.get().nativeHeadWithNoAuth(
+                profile, url, timeout, allow_redirect, callback);
+    }
+
+     @NativeMethods
+     public interface Natives {
+         void nativeFetchOAuth(Profile profile, String oathConsumerName, String url,
+@@ -78,5 +86,8 @@ public final class EndpointFetcher {
+                 Callback<EndpointResponse> callback);
+         void nativeFetchWithNoAuth(
+                 Profile profile, String url, Callback<EndpointResponse> callback);
+        void nativeHeadWithNoAuth(
+                Profile profile, String url, long timeout, boolean allow_redirect,
+                Callback<EndpointHeaderResponse> callback);
+     }
+ }
+diff --git a/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java b/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointHeaderResponse.java
+@@ -0,0 +1,31 @@
+// 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.chrome.browser.endpoint_fetcher;
+
+import org.chromium.base.annotations.CalledByNative;
+
+public class EndpointHeaderResponse {
+    private final String mResponseString;
+    private final String mRedirectUrl;
+
+    public EndpointHeaderResponse(String responseString, String redirectUrl) {
+        mResponseString = responseString;
+        mRedirectUrl = redirectUrl;
+    }
+
+    public String getResponseString() {
+        return mResponseString;
+    }
+
+    public String getRedirectUrl() {
+        return mRedirectUrl;
+    }
+
+    @CalledByNative
+    private static EndpointHeaderResponse createEndpointResponse(
+            String response, String redirectUrl) {
+        return new EndpointHeaderResponse(response, redirectUrl);
+    }
+}
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
+@@ -2037,7 +2037,7 @@
+   {
+     "name": "enable-inline-update-flow",
+     "owners": [ "nyquist", "dtrainor" ],
+-    "expiry_milestone": 83
+    "expiry_milestone": -1
+   },
+   {
+     "name": "enable-input-event-logging",
+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
+@@ -3582,10 +3582,9 @@ const char kVoiceButtonInTopToolbarDescription[] =
+     "Enables showing the voice search button in the top toolbar. Enabling "
+     "Adaptive Button overrides this.";
+ 
+-const char kInlineUpdateFlowName[] = "Enable Google Play inline update flow";
+const char kInlineUpdateFlowName[] = "Enable inline update flow";
+ const char kInlineUpdateFlowDescription[] =
+-    "When this flag is set, instead of taking the user to the Google Play "
+-    "Store when an update is available, the user is presented with an inline "
+    "When this flag is set, the user is presented with an inline "
+     "flow where they do not have to leave Chrome until the update is ready "
+     "to install.";
+ 
+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
+@@ -627,7 +627,7 @@ const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
+                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kInlineUpdateFlow{"InlineUpdateFlow",
+-                                      base::FEATURE_DISABLED_BY_DEFAULT};
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ const base::Feature kInstantStart{"InstantStart",
+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+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
+@@ -1663,6 +1663,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
+         Chrome updates are no longer supported for this version of Android
+       </message>
+      <message name="IDS_ALLOW_INLINE_UPDATE_TITLE" desc="Title for allow inline update preference">
+        Allow checking for updates
+      </message>
+      <message name="IDS_ALLOW_INLINE_UPDATE_SUMMARY" desc="Summary for allow inline update preference">
+        Notify about new releases by periodically checking for their availability
+      </message>
+ 
+       <!-- Account management UI strings. -->
+       <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
+@@ -3150,7 +3156,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+ 
+       <!-- Main menu items -->
+       <message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
+-        Update Chrome
+        Update Bromite
+       </message>
+       <message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
+         Newer version is available
+-- 
+2.17.1
+
@@ -0,0 +1,34 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 May 2020 14:42:37 +0200
+Subject: Change default webRTC policy to not use any address
+
+This prevents leakage of the local IP address.
+
+See also: https://github.com/bromite/bromite/issues/553
+---
+ .../peerconnection/peer_connection_dependency_factory.cc   | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
+--- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
+++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
+@@ -663,12 +663,13 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+           port_config.enable_nonproxied_udp = false;
+           break;
+         case DEFAULT:
+-          port_config.enable_multiple_routes = true;
+-          port_config.enable_nonproxied_udp = true;
+          port_config.enable_multiple_routes = false;
+          port_config.enable_nonproxied_udp = false;
+          port_config.enable_default_local_candidate = false;
+           break;
+       }
+ 
+-      VLOG(3) << "WebRTC routing preferences: "
+      LOG(INFO) << "WebRTC routing preferences: "
+               << "policy: " << policy
+               << ", multiple_routes: " << port_config.enable_multiple_routes
+               << ", nonproxied_udp: " << port_config.enable_nonproxied_udp
+-- 
+2.17.1
+
@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Sep 2021 11:17:53 +0200
+Subject: Disable AGSA by default
+
+---
+ chrome/browser/flags/android/chrome_feature_list.cc             | 2 +-
+ .../org/chromium/chrome/browser/flags/CachedFeatureFlags.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
+@@ -605,7 +605,7 @@ const base::Feature kEnhancedProtectionPromoCard{
+     "EnhancedProtectionPromoCard", base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa",
+-                                        base::FEATURE_ENABLED_BY_DEFAULT};
+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kExploreSites{"ExploreSites",
+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+@@ -86,7 +86,7 @@ public class CachedFeatureFlags {
+                     .put(ChromeFeatureList.CCT_REMOVE_REMOTE_VIEW_IDS, true)
+                     .put(ChromeFeatureList.OFFLINE_MEASUREMENTS_BACKGROUND_TASK, false)
+                     .put(ChromeFeatureList.CCT_INCOGNITO, true)
+-                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true)
+                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false)
+                     .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)
+                     .put(ChromeFeatureList.CLIPBOARD_SUGGESTION_CONTENT_HIDDEN, false)
+                     .put(ChromeFeatureList.OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, false)
+-- 
+2.17.1
+
@@ -9,7 +9,7 @@ Subject: Disable DRM media origin IDs preprovisioning
 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
-@@ -476,7 +476,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -660,7 +660,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",
@@ -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.
-@@ -287,7 +287,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
+@@ -291,7 +291,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"(
-@@ -328,4 +328,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
+@@ -336,4 +336,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
   loader_->SetAllowHttpErrorResults(true);
   loader_->SetOnRedirectCallback(base::BindRepeating(
       &ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
@@ -40,14 +40,14 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/c
 diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
 --- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
 +++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
-@@ -127,7 +127,7 @@ class ChromeOmniboxNavigationObserver : public OmniboxNavigationObserver,
+@@ -130,7 +130,7 @@ class ChromeOmniboxNavigationObserver : public OmniboxNavigationObserver,
 
   // Creates a URL loader for |destination_url| and stores it in |loader_|.
   // Does not start the loader.
 -  void CreateLoader(const GURL& destination_url);
 +  //void CreateLoader(const GURL& destination_url);
 
-   const base::string16 text_;
+   const std::u16string text_;
   const AutocompleteMatch match_;
 -- 
 2.17.1
@@ -3,10 +3,24 @@ Date: Thu, 12 Oct 2017 08:15:17 +0200
 Subject: Disable NTP remote suggestions by default

 ---
- components/ntp_snippets/features.cc                           | 4 ++--
- .../remote/remote_suggestions_status_service_impl.cc          | 4 ++--
+ components/feed/core/shared_prefs/pref_names.cc | 4 ++--
+ components/ntp_snippets/features.cc             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

+diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
+--- a/components/feed/core/shared_prefs/pref_names.cc
+++ b/components/feed/core/shared_prefs/pref_names.cc
+@@ -20,8 +20,8 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
+ const char kVideoPreviewsType[] = "ntp_snippets.video_previews_type";
+ 
+ void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
+-  registry->RegisterBooleanPref(kEnableSnippets, true);
+-  registry->RegisterBooleanPref(kArticlesListVisible, true);
+  registry->RegisterBooleanPref(kEnableSnippets, false);
+  registry->RegisterBooleanPref(kArticlesListVisible, false);
+   registry->RegisterIntegerPref(kVideoPreviewsType, 1);
+ }
+ 
 diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/features.cc
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
@@ -28,20 +42,6 @@ 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.17.1

@@ -1,50 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 26 Nov 2017 23:11:56 +0100
-Subject: Disable Omaha update checks
-
-Do not consider Jelly Bean unsupported
---
- .../java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
- .../org/chromium/chrome/browser/omaha/VersionNumberGetter.java  | 2 +-
- chrome/browser/android/chrome_feature_list.cc                   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -136,7 +136,7 @@ public class OmahaBase {
- 
-     /** See {@link #sIsDisabled}. */
-     static boolean isDisabled() {
-        return sIsDisabled;
-+        return true;
-     }
- 
-     /**
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
-@@ -43,7 +43,7 @@ public class VersionNumberGetter {
-     private static VersionNumberGetter sInstanceForTests;
- 
-     /** If false, OmahaClient will never report that a newer version is available. */
-    private static boolean sEnableUpdateDetection = true;
-+    private static boolean sEnableUpdateDetection = false;
- 
-     protected VersionNumberGetter() { }
- 
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -464,7 +464,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.17.1
-
@@ -1,28 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 26 Oct 2017 16:59:03 +0200
-Subject: Disable WebRTC by default
-
---
- chrome/browser/ui/browser_ui_prefs.cc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
--- a/chrome/browser/ui/browser_ui_prefs.cc
-+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -83,10 +83,10 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-                                 false);
- #endif
-   // TODO(guoweis): Remove next 2 options at M50.
-  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
-  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, false);
-+  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, false);
-   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
-                               blink::kWebRTCIPHandlingDefault);
-+                               blink::kWebRTCIPHandlingDisableNonProxiedUdp);
-   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
-   registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
-   registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
-- 
-2.17.1
-
@@ -1,36 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 19 Dec 2019 21:46:10 +0100
-Subject: Disable addresses autofill by default
-
---
- .../autofill_assistant/AutofillAssistantPreferencesUtil.java    | 2 +-
- .../autofill_assistant/AutofillAssistantPreferences.java        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-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
-@@ -26,7 +26,7 @@ class AutofillAssistantPreferencesUtil {
-     /** Checks whether the Autofill Assistant switch preference in settings is on. */
-     static boolean isAutofillAssistantSwitchOn() {
-         return ContextUtils.getAppSharedPreferences().getBoolean(
-                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
-+                AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, false);
-     }
- 
-     /** Checks whether the Autofill Assistant onboarding has been accepted. */
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/autofill_assistant/AutofillAssistantPreferences.java
-@@ -48,7 +48,7 @@ public class AutofillAssistantPreferences extends PreferenceFragmentCompat {
-         // (e.g. the switch will say "On" when it is really turned off), so .setChecked() should be
-         // called after .addPreference()
-         autofillAssistantSwitch.setChecked(ContextUtils.getAppSharedPreferences().getBoolean(
-                PREF_AUTOFILL_ASSISTANT_SWITCH, true));
-+                PREF_AUTOFILL_ASSISTANT_SWITCH, false));
-     }
- 
-     private Context getStyledContext() {
-- 
-2.17.1
-
@@ -9,16 +9,16 @@ Subject: Disable all promo dialogs
 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
-@@ -183,7 +183,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+@@ -822,7 +822,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      * displayed.
      */
-     private boolean triggerPromo() {
+     private boolean triggerPromo(boolean intentWithEffect) {
 -        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
-@@ -214,8 +214,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
+             if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
+                 return false;
+             }
+@@ -857,8 +857,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                 preferenceManager.writeBoolean(
                         ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
             }
@@ -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
+@@ -23,7 +23,7 @@ public 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 proactive help is enabled. */
+-- 
+2.17.1
+
@@ -1,210 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 20 May 2019 23:14:36 +0200
-Subject: Disable dynamic module loading
-
---
- chrome/android/chrome_java_sources.gni        | 13 --------
- .../browser/customtabs/CustomTabActivity.java | 18 -----------
- .../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
-@@ -426,19 +426,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",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityDelegatePostMessageBackend.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ActivityHostImpl.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleConstants.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleCoordinator.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleNavigationEventObserver.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModulePageLoadObserver.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleToolbarController.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleEntryPoint.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleHostImpl.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleLoader.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java",
-  "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java",
-   "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
-   "java/src/org/chromium/chrome/browser/customtabs/features/ImmersiveModeController.java",
-   "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.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
-@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabIntentHandler.Int
- import org.chromium.chrome.browser.customtabs.content.TabCreationMode;
- import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityComponent;
- import org.chromium.chrome.browser.customtabs.dependency_injection.CustomTabActivityModule;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
- import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
- import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
- import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
-@@ -79,9 +78,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
- 
-     private final CustomTabsConnection mConnection = CustomTabsConnection.getInstance();
- 
-    @Nullable
-    private DynamicModuleCoordinator mDynamicModuleCoordinator;
-
-     private CustomTabNightModeStateController mNightModeStateController;
- 
-     /**
-@@ -217,12 +213,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
-     public void finishNativeInitialization() {
-         if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
- 
-        // Try to initialize dynamic module early to enqueue navigation events
-        // @see DynamicModuleNavigationEventObserver
-        if (mIntentDataProvider.isDynamicModuleEnabled()) {
-            mDynamicModuleCoordinator = getComponent().resolveDynamicModuleCoordinator();
-        }
-
-         mConnection.showSignInToastIfNecessary(mSession, getIntent());
- 
-         if (isTaskRoot() && UsageStatsService.isEnabled()) {
-@@ -259,10 +249,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
-         WebContents webContents = tab == null ? null : tab.getWebContents();
-         mConnection.resetPostMessageHandlerForSession(
-                 mIntentDataProvider.getSession(), webContents);
-
-        if (mDynamicModuleCoordinator != null) {
-            mDynamicModuleCoordinator.resetPostMessageHandlersForCurrentSession(null);
-        }
-     }
- 
-     @Override
-@@ -503,10 +489,6 @@ public class CustomTabActivity extends BaseCustomTabActivity<CustomTabActivityCo
-         if (mIntentDataProvider.isTrustedWebActivity()) {
-             component.resolveTrustedWebActivityCoordinator();
-         }
-        if (mConnection.shouldHideTopBarOnModuleManagedUrlsForSession(
-                    mIntentDataProvider.getSession())) {
-            component.resolveDynamicModuleToolbarController();
-        }
- 
-         return component;
-     }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.ChromeFeatureList;
- import org.chromium.chrome.browser.ChromeVersionInfo;
- import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
- import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
- import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
- import org.chromium.chrome.browser.ui.styles.ChromeColors;
-@@ -824,20 +823,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
-         // even receive the extras for using the feature.
-         if (componentName == null) return false;
- 
-        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE)) {
-            Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
-            ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.FEATURE_DISABLED);
-            return false;
-        }
-
-        ExternalAuthUtils authUtils = ChromeApplication.getComponent().resolveExternalAuthUtils();
-        if (!authUtils.isGoogleSigned(componentName.getPackageName())) {
-            Log.w(TAG, "The %s package is not Google-signed.", componentName.getPackageName());
-            ModuleMetrics.recordLoadResult(ModuleMetrics.LoadResult.NOT_GOOGLE_SIGNED);
-            return false;
-        }
-
-        return true;
-+        Log.w(TAG, "The %s feature is disabled.", ChromeFeatureList.CCT_MODULE);
-+        return false;
-     }
- 
-     @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
-@@ -58,8 +58,6 @@ import org.chromium.chrome.browser.browserservices.Origin;
- import org.chromium.chrome.browser.browserservices.PostMessageHandler;
- import org.chromium.chrome.browser.browserservices.SessionDataHolder;
- import org.chromium.chrome.browser.browserservices.SessionHandler;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleLoader;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.ModuleMetrics;
- import org.chromium.chrome.browser.device.DeviceClassManager;
- import org.chromium.chrome.browser.init.ChainedTasks;
- import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
-@@ -220,7 +218,6 @@ public class CustomTabsConnection {
- 
-     private volatile ChainedTasks mWarmupTasks;
- 
-    private @Nullable ModuleLoader mModuleLoader;
-     /**
-      * <strong>DO NOT CALL</strong>
-      * Public to be instanciable from {@link ChromeApplication}. This is however
-@@ -1388,7 +1385,6 @@ public class CustomTabsConnection {
-         if (ChromeApplication.isSevereMemorySignal(level)) {
-             getInstance().mClientManager.cleanupUnusedSessions();
-         }
-        if (getInstance().mModuleLoader != null) getInstance().mModuleLoader.onTrimMemory(level);
-     }
- 
-     @VisibleForTesting
-@@ -1524,32 +1520,6 @@ public class CustomTabsConnection {
-         recordSpeculationStatusOnSwap(SPECULATION_STATUS_ON_SWAP_BACKGROUND_TAB_NOT_MATCHED);
-     }
- 
-    public ModuleLoader getModuleLoader(ComponentName componentName, @Nullable String assetName) {
-        if (!ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_MODULE_DEX_LOADING)) {
-            assetName = null;
-        }
-
-        if (mModuleLoader != null) {
-            boolean isComponentNameChanged =
-                    !componentName.equals(mModuleLoader.getComponentName());
-            boolean isAssetNameChanged =
-                    !TextUtils.equals(assetName, mModuleLoader.getDexAssetName());
-            ModuleLoader.ModuleApkVersion newModuleApkVersion =
-                    ModuleLoader.ModuleApkVersion.getModuleVersion(componentName.getPackageName());
-            boolean isModuleVersionChanged =
-                    !mModuleLoader.getModuleApkVersion().equals(newModuleApkVersion);
-
-            if (isComponentNameChanged || isAssetNameChanged || isModuleVersionChanged) {
-                mModuleLoader.destroyModule(ModuleMetrics.DestructionReason.MODULE_LOADER_CHANGED);
-                mModuleLoader = null;
-            }
-        }
-
-        if (mModuleLoader == null) mModuleLoader = new ModuleLoader(componentName, assetName);
-
-        return mModuleLoader;
-    }
-
-     @CalledByNative
-     public static void notifyClientOfDetachedRequestCompletion(
-             CustomTabsSessionToken session, String url, int status) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java
-@@ -17,8 +17,6 @@ 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.CustomTabIntentHandler;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
- import org.chromium.chrome.browser.customtabs.features.ImmersiveModeController;
- import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarColorController;
- import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-@@ -34,8 +32,6 @@ import dagger.Subcomponent;
- @ActivityScope
- public interface CustomTabActivityComponent extends BaseCustomTabActivityComponent {
-     TrustedWebActivityCoordinator resolveTrustedWebActivityCoordinator();
-    DynamicModuleToolbarController resolveDynamicModuleToolbarController();
-    DynamicModuleCoordinator resolveDynamicModuleCoordinator();
- 
-     CustomTabBottomBarDelegate resolveBottomBarDelegate();
-     CustomTabActivityTabController resolveTabController();
-- 
-2.17.1
-
@@ -0,0 +1,61 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 22:52:53 +0100
+Subject: Disable feeds support by default
+
+---
+ .../chromium/chrome/browser/feed/shared/FeedFeatures.java | 8 +-------
+ .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
+ components/feed/feed_feature_list.cc                      | 4 ++--
+ 3 files changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java
+--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/shared/FeedFeatures.java
+@@ -35,13 +35,7 @@ public final class FeedFeatures {
+      *         the user is signed in and confirms it's not a child profile.
+      */
+     public static boolean isWebFeedUIEnabled() {
+-        // TODO(b/197354832, b/188188861): change consent check to SIGNIN.
+-        return ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)
+-                && IdentityServicesProvider.get()
+-                           .getSigninManager(Profile.getLastUsedRegularProfile())
+-                           .getIdentityManager()
+-                           .hasPrimaryAccount(ConsentLevel.SYNC)
+-                && !Profile.getLastUsedRegularProfile().isChild();
+        return false;
+     }
+ 
+     /**
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+@@ -77,7 +77,7 @@ public class CachedFeatureFlags {
+                     .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true)
+                     .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false)
+                     .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true)
+-                    .put(ChromeFeatureList.INTEREST_FEED_V2, true)
+                    .put(ChromeFeatureList.INTEREST_FEED_V2, false)
+                     .put(ChromeFeatureList.THEME_REFACTOR_ANDROID, false)
+                     .put(ChromeFeatureList.USE_CHIME_ANDROID_SDK, false)
+                     .put(ChromeFeatureList.CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY, false)
+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
+@@ -12,12 +12,12 @@
+ namespace feed {
+ 
+ const base::Feature kInterestFeedContentSuggestions{
+-    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
+    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
+ // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
+ // changed, please update the cached one's default value in CachedFeatureFlags.
+ const base::Feature kInterestFeedV2{"InterestFeedV2",
+-                                    base::FEATURE_ENABLED_BY_DEFAULT};
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay",
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.17.1
+
@@ -3,53 +3,13 @@ Date: Sun, 8 Jul 2018 18:16:34 +0200
 Subject: Disable fetching of all field trials

 ---
- .../chrome/browser/ChromeFeatureList.java         | 15 +++------------
- .../variations/service/variations_service.cc      | 12 +-----------
- 2 files changed, 4 insertions(+), 23 deletions(-)
+ .../variations/service/variations_service.cc       | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 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
-@@ -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 ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
-                featureName, paramName, defaultValue);
-+        return defaultValue;
-     }
- 
-     /**
-@@ -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 ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
-                featureName, paramName, defaultValue);
-+        return defaultValue;
-     }
- 
-     /**
-@@ -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 ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
-                featureName, paramName, defaultValue);
-+        return defaultValue;
-     }
- 
-     // Alphabetical:
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -241,17 +241,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -240,17 +240,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -68,6 +28,15 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 }
 
 std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
+@@ -610,7 +600,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+   // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
+   // had a chance to run yet from the previous request. In this case, don't
+   // start a new request and just let the previous one finish.
+-  if (pending_seed_request_)
+  if ((true) || pending_seed_request_)
+     return false;
+ 
+   last_request_was_http_retry_ = is_http_retry;
 -- 
 2.17.1

@@ -0,0 +1,21 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 8 Oct 2021 00:30:26 +0200
+Subject: Disable lock icon in address bar by default
+
+---
+ chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+@@ -313,5 +313,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
+ void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
+-  registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, false);
+  registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, true);
+ }
+-- 
+2.17.1
+
@@ -3,64 +3,80 @@ Date: Thu, 4 Jul 2019 19:08:52 -0400
 Subject: Disable media router and remoting by default

 ---
- .../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(-)
+ .../media/router/media_router_feature.cc      | 25 ++++++-------------
+ chrome/browser/profiles/profile.cc            |  2 +-
+ chrome/browser/profiles/profile_impl.cc       |  2 +-
+ 3 files changed, 9 insertions(+), 20 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
-@@ -51,17 +51,16 @@ const PrefService::Preference* GetMediaRouterPref(
+@@ -37,26 +37,15 @@ const base::Feature kAllowAllSitesToInitiateMirroring{
+     "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif  // !defined(OS_ANDROID)
+ 
+-namespace {
+-const PrefService::Preference* GetMediaRouterPref(
+-    content::BrowserContext* context) {
+-  return user_prefs::UserPrefs::Get(context)->FindPreference(
+-      ::prefs::kEnableMediaRouter);
+-}
+-
+-base::flat_map<content::BrowserContext*, bool>& GetStoredPrefValues() {
+-  static base::NoDestructor<base::flat_map<content::BrowserContext*, bool>>
+-      stored_pref_values;
+-
+-  return *stored_pref_values;
+-}
+-}  // namespace
+-
+-void ClearMediaRouterStoredPrefsForTesting() {
+/*void ClearMediaRouterStoredPrefsForTesting() {
+   GetStoredPrefValues().clear();
+-}
+}*/
 
 bool MediaRouterEnabled(content::BrowserContext* context) {
- #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
-  const PrefService::Preference* pref = GetMediaRouterPref(context);
-  // Only use the pref value if it set from a mandatory policy.
-  if (pref->IsManaged() && !pref->IsDefaultValue()) {
-    bool allowed = false;
-    CHECK(pref->GetValue()->GetAsBoolean(&allowed));
-    return allowed;
-  }
-
-   // The component extension cannot be loaded in guest sessions.
-   // TODO(crbug.com/756243): Figure out why.
-  return !Profile::FromBrowserContext(context)->IsGuestSession();
-+  if (Profile::FromBrowserContext(context)->IsGuestSession()) {
-+    return false;
-+  }
+  return false;
+}
 +
-+  const PrefService::Preference* pref = GetMediaRouterPref(context);
-+  bool allowed = false;
-+  pref->GetValue()->GetAsBoolean(&allowed);
-+  return allowed;
- #else   // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))
-   return false;
- #endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
+/*
+ #if !defined(OS_ANDROID)
+   if (!base::FeatureList::IsEnabled(kMediaRouter))
+     return false;
+@@ -80,7 +69,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
+     return allowed;
+   }
+   return true;
+-}
+}*/
+ 
+ #if !defined(OS_ANDROID)
+ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
 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
-@@ -232,7 +232,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
-       prefs::kMediaRouterFirstRunFlowAcknowledged,
-       false,
+@@ -356,7 +356,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       media_router::prefs::kMediaRouterEnableCloudServices, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, false);
-   registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
- 
-   registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
+   registry->RegisterBooleanPref(
+-      media_router::prefs::kMediaRouterMediaRemotingEnabled, true);
+      media_router::prefs::kMediaRouterMediaRemotingEnabled, false);
+   registry->RegisterListPref(
+       media_router::prefs::kMediaRouterTabMirroringSources);
+ #endif
 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
-@@ -401,7 +401,7 @@ void ProfileImpl::RegisterProfilePrefs(
-   registry->RegisterStringPref(
-       prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
+@@ -434,7 +434,7 @@ void ProfileImpl::RegisterProfilePrefs(
+ #endif
+ 
   registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
 -  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true);
 +  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, false);
- #if defined(OS_CHROMEOS)
-   registry->RegisterBooleanPref(
-       prefs::kOobeMarketingOptInScreenFinished, false,
+ #if !defined(OS_ANDROID)
+   registry->RegisterBooleanPref(prefs::kShowCastIconInToolbar, false);
+ #endif  // !defined(OS_ANDROID)
 -- 
 2.17.1

@@ -3,9 +3,9 @@ Date: Wed, 20 Feb 2019 21:41:26 +0100
 Subject: Disable metrics collection for NTP tiles

 ---
- .../browser/android/ntp/most_visited_sites_bridge.cc  | 11 ++---------
- components/ntp_tiles/BUILD.gn                         |  3 ---
- 2 files changed, 2 insertions(+), 12 deletions(-)
+ .../browser/android/ntp/most_visited_sites_bridge.cc   | 10 ++--------
+ components/ntp_tiles/BUILD.gn                          |  3 ---
+ 2 files changed, 2 insertions(+), 11 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
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 #include "components/ntp_tiles/most_visited_sites.h"
 #include "components/ntp_tiles/section_type.h"
 #include "ui/gfx/android/java_bitmap.h"
-@@ -44,7 +43,6 @@ using ntp_tiles::NTPTilesVector;
+@@ -45,7 +44,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 {
 
-@@ -235,7 +233,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
+@@ -233,7 +231,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint jtiles_count) {
@@ -34,31 +34,30 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 }
 
 void MostVisitedSitesBridge::RecordTileImpression(
-@@ -248,6 +245,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+@@ -245,6 +242,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+     jint jtitle_source,
     jint jsource,
-     jlong jdata_generation_time_ms,
-     const JavaParamRef<jstring>& jurl) {
+     const JavaParamRef<jobject>& jurl) {
 +#if 0
-   GURL url(ConvertJavaStringToUTF8(env, jurl));
+   std::unique_ptr<GURL> url = url::GURLAndroid::ToNativeGURL(env, jurl);
   TileTitleSource title_source = static_cast<TileTitleSource>(jtitle_source);
   TileSource source = static_cast<TileSource>(jsource);
-@@ -258,6 +256,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+@@ -254,6 +252,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));
+       jindex, source, title_source, visual_type, icon_type, *url));
 +#endif
 }
 
 void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
-@@ -268,12 +267,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+@@ -263,11 +262,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+     jint tile_type,
     jint title_source,
-     jint source,
-     jlong jdata_generation_time_ms) {
+     jint source) {
 -  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
 -      index, static_cast<TileSource>(source),
 -      static_cast<TileTitleSource>(title_source),
 -      static_cast<TileVisualType>(tile_type), favicon_base::IconType::kInvalid,
-      base::Time::FromJavaTime(jdata_generation_time_ms),
 -      /*url_for_rappor=*/GURL()));
 }
 
@@ -66,7 +65,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
 --- a/components/ntp_tiles/BUILD.gn
 +++ b/components/ntp_tiles/BUILD.gn
-@@ -22,8 +22,6 @@ static_library("ntp_tiles") {
+@@ -20,8 +20,6 @@ static_library("ntp_tiles") {
     "icon_cacher.h",
     "icon_cacher_impl.cc",
     "icon_cacher_impl.h",
@@ -75,7 +74,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",
-@@ -79,7 +77,6 @@ source_set("unit_tests") {
+@@ -83,7 +81,6 @@ source_set("unit_tests") {
     "custom_links_manager_impl_unittest.cc",
     "custom_links_store_unittest.cc",
     "icon_cacher_impl_unittest.cc",
@@ -3,34 +3,21 @@ Date: Wed, 25 Apr 2018 10:23:51 +0200
 Subject: Disable metrics on all I/O threads

 ---
- chrome/browser/browser_process_impl.cc     | 2 +-
- chrome/browser/profiles/profile_io_data.cc | 2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
+ chrome/browser/browser_process_impl.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

 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
-@@ -907,7 +907,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
- #endif  // defined(OS_CHROMEOS)
+@@ -965,7 +965,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
 -                                GoogleUpdateSettings::GetCollectStatsConsent());
 +                                false);
+   registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
+ }
 
- #if defined(OS_ANDROID)
-   registry->RegisterBooleanPref(
-diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
--- a/chrome/browser/profiles/profile_io_data.cc
-+++ b/chrome/browser/profiles/profile_io_data.cc
-@@ -48,8 +48,6 @@
- #include "components/content_settings/core/browser/host_content_settings_map.h"
- #include "components/cookie_config/cookie_store_util.h"
- #include "components/dom_distiller/core/url_constants.h"
-#include "components/metrics/metrics_pref_names.h"
-#include "components/metrics/metrics_service.h"
- #include "components/net_log/chrome_net_log.h"
- #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
- #include "components/signin/public/base/signin_pref_names.h"
 -- 
 2.17.1

@@ -10,15 +10,15 @@ Subject: Disable offline pages in the downloads home to be opened in CCT by
 diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
 --- a/components/offline_pages/core/offline_page_feature.cc
 +++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -51,7 +51,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
+@@ -39,7 +39,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
     "OfflinePagesDescriptivePendingStatus", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kOfflinePagesInDownloadHomeOpenInCctFeature{
 -    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kOfflinePagesCTSuppressNotificationsFeature{
-     "OfflinePagesCTSuppressNotifications", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kOfflineIndicatorFeature{"OfflineIndicator",
+                                              base::FEATURE_DISABLED_BY_DEFAULT};
 -- 
 2.17.1

@@ -5,13 +5,25 @@ Subject: Disable omission of URL elements in Omnibox
 Disable all omissions because they are used throughout the code without
 a corresponding user option to individually disable their usage.
 ---
- components/url_formatter/url_formatter.cc | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ .../toolbar/chrome_location_bar_model_delegate.cc  |  2 +-
+ components/url_formatter/url_formatter.cc          | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)

+diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+@@ -312,6 +312,6 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
+ // static
+ void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+-  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
+  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
+   registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, false);
+ }
 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
-@@ -460,13 +460,13 @@ bool IDNToUnicodeOneComponent(const base::char16* comp,
+@@ -463,13 +463,13 @@ ComponentResult IDNToUnicodeOneComponent(
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -1,26 +0,0 @@
-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 | 4 ++--
- 1 file changed, 2 insertions(+), 2 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_detection_support = !is_ios && !is_android
- password_reuse_warning_support = !is_android && !is_ios
-password_on_focus_ping_support = !is_ios
-+password_on_focus_ping_support = !is_android && !is_ios
- 
- config("password_reuse_detection_config") {
-   defines = []
-- 
-2.17.1
-
@@ -9,11 +9,11 @@ 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
-@@ -1177,10 +1177,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1851,10 +1851,8 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
-  if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
+-  if (!Loader().AllowPlugins())
 -    return nullptr;
 -  return GetPage()->GetPluginData(
 -      Tree().Top().GetSecurityContext()->GetSecurityOrigin());
@@ -1,28 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 8 Jan 2019 08:54:50 +0100
-Subject: Disable previews by default
-
---
- components/previews/core/previews_features.cc | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/components/previews/core/previews_features.cc b/components/previews/core/previews_features.cc
--- a/components/previews/core/previews_features.cc
-+++ b/components/previews/core/previews_features.cc
-@@ -14,12 +14,7 @@ namespace features {
- // are enabled are controlled by other features.
- const base::Feature kPreviews {
-   "Previews",
-#if defined(OS_ANDROID) || defined(OS_LINUX)
-      // Previews allowed for Android (but also allow on Linux for dev/debug).
-      base::FEATURE_ENABLED_BY_DEFAULT
-#else   // !defined(OS_ANDROID) || defined(OS_LINUX)
-      base::FEATURE_DISABLED_BY_DEFAULT
-#endif  // defined(OS_ANDROID) || defined(OS_LINUX)
-+   base::FEATURE_DISABLED_BY_DEFAULT
- };
- 
- // Enables the Offline previews on android slow connections.
-- 
-2.17.1
-
@@ -1,306 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 10 Nov 2018 17:20:21 +0100
-Subject: Disable promos displayed in bookmarks manager
-
-Remove personalized signin promo view from
-bookmarks, never reach signin thresholds.
---
- ...rsonalized_signin_promo_view_bookmarks.xml | 30 -----------
- .../bookmarks/BookmarkItemsAdapter.java       | 23 +-------
- .../bookmarks/BookmarkPromoHeader.java        | 52 +------------------
- .../ReorderBookmarkItemsAdapter.java          | 19 +------
- .../browser/signin/SigninPromoController.java | 21 +-------
- 5 files changed, 7 insertions(+), 138 deletions(-)
- delete mode 100644 chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
-
-diff --git a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml b/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
-deleted file mode 100644
--- a/chrome/android/java/res/layout/personalized_signin_promo_view_bookmarks.xml
-+++ /dev/null
-@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2017 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<org.chromium.chrome.browser.signin.PersonalizedSigninPromoView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/signin_promo_view_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="16dp"
-    android:background="@drawable/hairline_border_card_background"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingBottom="12dp"
-    android:paddingTop="14dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginStart="12dp">
-
-        <include layout="@layout/personalized_signin_promo_view_header"/>
-    </FrameLayout>
-
-    <include layout="@layout/personalized_signin_promo_view_body"/>
-
-</org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
-\ No newline at end of file
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
-@@ -60,7 +60,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
- 
-     private BookmarkDelegate mDelegate;
-     private Context mContext;
-    private BookmarkPromoHeader mPromoHeaderManager;
-     private String mSearchText;
-     private BookmarkId mCurrentFolder;
- 
-@@ -219,9 +218,9 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
- 
-         switch (viewType) {
-             case ViewType.PERSONALIZED_SIGNIN_PROMO:
-                return mPromoHeaderManager.createPersonalizedSigninPromoHolder(parent);
-+                return null;
-             case ViewType.SYNC_PROMO:
-                return mPromoHeaderManager.createSyncPromoHolder(parent);
-+                return null;
-             case ViewType.FOLDER:
-                 BookmarkFolderRow folder = (BookmarkFolderRow) LayoutInflater.from(
-                         parent.getContext()).inflate(R.layout.bookmark_folder_row, parent, false);
-@@ -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:
-                PersonalizedSigninPromoView view = (PersonalizedSigninPromoView) holder.itemView;
-                mPromoHeaderManager.setupPersonalizedSigninPromo(view);
-                 break;
-             case ViewType.SYNC_PROMO:
-                 break;
-@@ -262,7 +259,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
-     public void onViewRecycled(ViewHolder holder) {
-         switch (holder.getItemViewType()) {
-             case ViewType.PERSONALIZED_SIGNIN_PROMO:
-                mPromoHeaderManager.detachPersonalizePromoView();
-                 break;
-             default:
-                 // Other view holders don't have special recycling code.
-@@ -298,7 +294,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
-             }
-         };
- 
-        mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
-         populateTopLevelFoldersList();
-         notifyDataSetChanged();
-     }
-@@ -309,7 +304,6 @@ class BookmarkItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
-         mDelegate.removeUIObserver(this);
-         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
-         mDelegate = null;
-        mPromoHeaderManager.destroy();
-     }
- 
-     @Override
-@@ -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";
-
-        switch (mPromoHeaderManager.getPromoState()) {
-            case BookmarkPromoHeader.PromoState.PROMO_NONE:
-                return;
-            case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
-                mPromoHeaderSection.add(ViewType.PERSONALIZED_SIGNIN_PROMO);
-                return;
-            case BookmarkPromoHeader.PromoState.PROMO_SYNC:
-                mPromoHeaderSection.add(ViewType.SYNC_PROMO);
-                return;
-            default:
-                assert false : "Unexpected value for promo state!";
-        }
-     }
- 
-     private void populateTopLevelFoldersList() {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
-@@ -20,7 +20,6 @@ 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.SigninManager;
- import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
-@@ -124,19 +123,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
-         return mPromoState;
-     }
- 
-    /**
-     * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
-     *         {@link RecyclerView}.
-     */
-    // TODO(crbug.com/160194): Clean up after bookmark reordering launches.
-    ViewHolder createPersonalizedSigninPromoHolder(ViewGroup parent) {
-        View view = LayoutInflater.from(mContext).inflate(
-                R.layout.personalized_signin_promo_view_bookmarks, parent, false);
-
-        // ViewHolder is abstract and it cannot be instantiated directly.
-        return new ViewHolder(view) {};
-    }
-
-     /**
-      * @return Sync promo header {@link ViewHolder} instance that can be used with
-      *         {@link RecyclerView}.
-@@ -149,40 +135,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
-         return new ViewHolder(view) {};
-     }
- 
-    /**
-     * Configures the personalized signin promo and records promo impressions.
-     * @param view The view to be configured.
-     */
-    void setupPersonalizedSigninPromo(PersonalizedSigninPromoView view) {
-        SigninPromoUtil.setupPromoViewFromCache(mSigninPromoController, mProfileDataCache, view,
-                this::setPersonalizedSigninPromoDeclined);
-    }
-
-    /**
-     * Detaches the previously configured {@link PersonalizedSigninPromoView}.
-     */
-    void detachPersonalizePromoView() {
-        if (mSigninPromoController != null) mSigninPromoController.detach();
-    }
-
-    /**
-     * Saves that the personalized signin promo was declined and updates the UI.
-     */
-    private void setPersonalizedSigninPromoDeclined() {
-        SharedPreferencesManager.getInstance().writeBoolean(
-                ChromePreferenceKeys.PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, true);
-        mPromoState = calculatePromoState();
-        triggerPromoUpdate();
-    }
-
-    /**
-     * @return Whether the user declined the personalized signin promo.
-     */
-    private boolean wasPersonalizedSigninPromoDeclined() {
-        return SharedPreferencesManager.getInstance().readBoolean(
-                ChromePreferenceKeys.PREF_PERSONALIZED_SIGNIN_PROMO_DECLINED, false);
-    }
-
-     private @PromoState int calculatePromoState() {
-         if (sPromoStateForTests != null) {
-             return sPromoStateForTests;
-@@ -195,8 +147,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;
-@@ -248,7 +199,6 @@ class BookmarkPromoHeader implements AndroidSyncSettingsObserver, SignInStateObs
-     }
- 
-     private void triggerPromoUpdate() {
-        detachPersonalizePromoView();
-         mPromoHeaderChangeAction.run();
-     }
- 
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java
-@@ -188,8 +188,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
-         assert mDelegate != null;
- 
-         switch (viewType) {
-            case ViewType.PERSONALIZED_SIGNIN_PROMO:
-                return mPromoHeaderManager.createPersonalizedSigninPromoHolder(parent);
-             case ViewType.SYNC_PROMO:
-                 return mPromoHeaderManager.createSyncPromoHolder(parent);
-             case ViewType.FOLDER:
-@@ -204,10 +202,7 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
- 
-     @Override
-     public void onBindViewHolder(ViewHolder holder, int position) {
-        if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO) {
-            PersonalizedSigninPromoView view = (PersonalizedSigninPromoView) holder.itemView;
-            mPromoHeaderManager.setupPersonalizedSigninPromo(view);
-        } else if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
-+        if (!(holder.getItemViewType() == ViewType.SYNC_PROMO)) {
-             BookmarkRow row = ((BookmarkRow) holder.itemView);
-             BookmarkId id = getIdByPosition(position);
-             row.setBookmarkId(id, getLocationFromPosition(position));
-@@ -231,13 +226,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
- 
-     @Override
-     public void onViewRecycled(ViewHolder holder) {
-        switch (holder.getItemViewType()) {
-            case ViewType.PERSONALIZED_SIGNIN_PROMO:
-                mPromoHeaderManager.detachPersonalizePromoView();
-                break;
-            default:
-                // Other view holders don't have special recycling code.
-        }
-     }
- 
-     /**
-@@ -406,9 +394,6 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
-                 case BookmarkPromoHeader.PromoState.PROMO_NONE:
-                     mPromoHeaderType = ViewType.INVALID_PROMO;
-                     break;
-                case BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED:
-                    mPromoHeaderType = ViewType.PERSONALIZED_SIGNIN_PROMO;
-                    break;
-                 case BookmarkPromoHeader.PromoState.PROMO_SYNC:
-                     mPromoHeaderType = ViewType.SYNC_PROMO;
-                     break;
-@@ -573,4 +558,4 @@ class ReorderBookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkIte
-     private void clearHighlight() {
-         mHighlightedBookmark = null;
-     }
-}
-\ No newline at end of file
-+}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoController.java
-@@ -70,25 +70,8 @@ public class SigninPromoController {
-      */
-     public static boolean hasNotReachedImpressionLimit(@AccessPoint int accessPoint) {
-         SharedPreferencesManager preferencesManager = SharedPreferencesManager.getInstance();
-        switch (accessPoint) {
-            case SigninAccessPoint.BOOKMARK_MANAGER:
-                return preferencesManager.readInt(
-                               ChromePreferenceKeys.SIGNIN_PROMO_IMPRESSIONS_COUNT_BOOKMARKS)
-                        < MAX_IMPRESSIONS_BOOKMARKS;
-            case SigninAccessPoint.NTP_CONTENT_SUGGESTIONS:
-                // There is no impression limit for NTP content suggestions.
-                return true;
-            case SigninAccessPoint.RECENT_TABS:
-                // There is no impression limit for Recent Tabs.
-                return true;
-            case SigninAccessPoint.SETTINGS:
-                return 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;
-     }
- 
-     /**
-- 
-2.17.1
-
@@ -12,15 +12,15 @@ Subject: Disable references to fonts.googleapis.com
 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
- }
- 
- std::string DomDistillerViewerSource::GetContentSecurityPolicyStyleSrc() {
-  return "style-src 'self' https://fonts.googleapis.com;";
-+  return "style-src 'self';";
- }
- 
- std::string DomDistillerViewerSource::GetContentSecurityPolicyChildSrc() {
+@@ -300,7 +300,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+ std::string DomDistillerViewerSource::GetContentSecurityPolicy(
+     network::mojom::CSPDirectiveName directive) {
+   if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
+-    return "style-src 'self' https://fonts.googleapis.com;";
+    return "style-src 'self';";
+   } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) {
+     return "child-src *;";
+   } else if (directive ==
 diff --git a/components/dom_distiller/core/html/preview.html b/components/dom_distiller/core/html/preview.html
 --- a/components/dom_distiller/core/html/preview.html
 +++ b/components/dom_distiller/core/html/preview.html
@@ -36,7 +36,7 @@ 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
-@@ -132,7 +132,7 @@ function maybeSetWebFont() {
+@@ -109,7 +109,7 @@ function maybeSetWebFont() {
   }
 
   const e = document.createElement('link');
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Aug 2021 23:11:16 +0200
+Subject: Disable search engine DSE automatic permission
+
+---
+ components/permissions/features.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/components/permissions/features.cc b/components/permissions/features.cc
+--- a/components/permissions/features.cc
+++ b/components/permissions/features.cc
+@@ -76,7 +76,7 @@ const base::Feature kRevisedOriginHandling{"PermissionsRevisedOriginHandling",
+ // When enabled, the Default Search Engine does not automatically receive the
+ // "geolocation" and "notifications" permissions. DSE only applies to Android.
+ const base::Feature kRevertDSEAutomaticPermissions{
+-    "RevertDSEAutomaticPermissions", base::FEATURE_DISABLED_BY_DEFAULT};
+    "RevertDSEAutomaticPermissions", base::FEATURE_ENABLED_BY_DEFAULT};
+ #endif  // defined(OS_ANDROID)
+ 
+ }  // namespace features
+-- 
+2.17.1
+
@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 12 Aug 2019 08:47:04 +0200
-Subject: Disable search-ready omnibox by default
-
---
- chrome/browser/android/chrome_feature_list.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
--- a/chrome/browser/android/chrome_feature_list.cc
-+++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -521,7 +521,7 @@ const base::Feature kScrollToExpandPaymentHandler{
-     "ScrollToExpandPaymentHandler", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kSearchReadyOmniboxFeature{
-    "SearchReadyOmnibox", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "SearchReadyOmnibox", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kServiceManagerForBackgroundPrefetch{
-     "ServiceManagerForBackgroundPrefetch", base::FEATURE_DISABLED_BY_DEFAULT};
-- 
-2.17.1
-
@@ -3,23 +3,35 @@ Date: Tue, 25 Dec 2018 16:19:51 -0500
 Subject: Disable seed-based field trials

 ---
- components/variations/service/variations_field_trial_creator.cc | 2 ++
- 1 file changed, 2 insertions(+)
+ .../variations/service/variations_field_trial_creator.cc      | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)

 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
-@@ -545,8 +545,10 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+@@ -258,8 +258,8 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+   // instance is set.
+   feature_list->RegisterExtraFeatureOverrides(extra_overrides);
+ 
+-  bool used_testing_config = false;
+ #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
+  bool used_testing_config = false;
+   if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&
+       !command_line->HasSwitch(::switches::kForceFieldTrials) &&
+       !command_line->HasSwitch(switches::kVariationsServerURL)) {
+@@ -273,10 +273,12 @@ bool VariationsFieldTrialCreator::SetupFieldTrials(
+   }
 #endif  // BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
   bool used_seed = false;
-   if (!used_testing_config) {
 +#if defined(FIELDTRIAL_SEED_ENABLED)
-     used_seed = CreateTrialsFromSeed(std::move(low_entropy_provider),
+   if (!used_testing_config) {
+     used_seed = CreateTrialsFromSeed(low_entropy_provider.get(),
                                      feature_list.get(), safe_seed_manager);
-+#endif
   }
+#endif  // BUILDFLAG(FIELDTRIAL_SEED_ENABLED)
 
-   platform_field_trials->SetupFeatureControllingFieldTrials(used_seed,
+   platform_field_trials->SetupFeatureControllingFieldTrials(
+       used_seed, low_entropy_provider.get(), feature_list.get());
 -- 
 2.17.1

@@ -5,29 +5,88 @@ Subject: Disable smart selection by default
 Allow web search in incognito mode (reverts
 commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69)

+Partial revert of da1d809c003749846cb4ade8c11b6d038e44416b to restore
+the ChromeSmartSelection feature flag.
+
 Notice that re-enabling smart selection would make incognito mode potentially
 leak information through the TextClassifier set by OEM, if any
 ---
- chrome/browser/android/chrome_feature_list.cc                   | 2 +-
- .../content/browser/selection/SelectionPopupControllerImpl.java | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../contextualsearch/SelectionClientManager.java  |  4 +++-
+ .../browser/flags/android/chrome_feature_list.cc  |  4 ++++
+ .../browser/flags/android/chrome_feature_list.h   |  1 +
+ .../chrome/browser/flags/ChromeFeatureList.java   |  1 +
+ .../selection/SelectionPopupControllerImpl.java   |  2 +-
+ testing/variations/fieldtrial_testing_config.json | 15 +++++++++++++++
+ 6 files changed, 25 insertions(+), 2 deletions(-)

-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
-@@ -366,7 +366,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
+@@ -10,6 +10,7 @@ import android.view.textclassifier.TextClassifier;
+ import androidx.annotation.Nullable;
+ import androidx.annotation.VisibleForTesting;
 
- const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
-                                          base::FEATURE_ENABLED_BY_DEFAULT};
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.content_public.browser.SelectionClient;
+ import org.chromium.content_public.browser.SelectionEventProcessor;
+ import org.chromium.content_public.browser.SelectionPopupController;
+@@ -44,7 +45,8 @@ public class SelectionClientManager {
+      * @param webContents The {@link WebContents} that will show popups for this client.
+      */
+     SelectionClientManager(WebContents webContents) {
+-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SMART_SELECTION)
+                && Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
+             assert webContents != null;
+             mOptionalSelectionClient = SelectionClient.createSmartSelectionClient(webContents);
+             SelectionPopupController controller =
+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
+@@ -172,6 +172,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kCCTClientDataHeader,
+     &kCCTExternalLinkHandling,
+     &kCCTIncognito,
+    &kChromeSmartSelection,
+     &kCCTIncognitoAvailableToThirdParty,
+     &kCCTPostMessageAPI,
+     &kCCTRedirectPreconnect,
+@@ -492,6 +493,9 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub",
+ const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid",
+                                              base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
 +                                          base::FEATURE_DISABLED_BY_DEFAULT};
- 
+
 const base::Feature kCommandLineOnNonRooted{"CommandLineOnNonRooted",
                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
+--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
+@@ -52,6 +52,7 @@ extern const base::Feature kChromeShareHighlightsAndroid;
+ extern const base::Feature kChromeShareLongScreenshot;
+ extern const base::Feature kChromeShareScreenshot;
+ extern const base::Feature kChromeSharingHub;
+extern const base::Feature kChromeSmartSelection;
+ extern const base::Feature kChromeSurveyNextAndroid;
+ extern const base::Feature kCommandLineOnNonRooted;
+ extern const base::Feature kConditionalTabStripAndroid;
+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
+@@ -277,6 +277,7 @@ public abstract class ChromeFeatureList {
+     public static final String CCT_EXTERNAL_LINK_HANDLING = "CCTExternalLinkHandling";
+     public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI";
+     public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
+    public static final String CHROME_SMART_SELECTION = "ChromeSmartSelection";
+     public static final String CCT_REMOVE_REMOTE_VIEW_IDS = "CCTRemoveRemoteViewIds";
+     public static final String CCT_RESIZABLE_FOR_FIRST_PARTIES = "CCTResizableForFirstParties";
+     public static final String CCT_RESIZABLE_FOR_THIRD_PARTIES = "CCTResizableForThirdParties";
 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
-@@ -775,7 +775,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+@@ -839,7 +839,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
             menu.removeItem(R.id.select_action_menu_share);
         }
 
@@ -36,6 +95,31 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 || !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
             menu.removeItem(R.id.select_action_menu_web_search);
         }
+diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
+--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
+@@ -1951,6 +1951,21 @@
+             ]
+         }
+     ],
+    "ChromeSmartSelection": [
+        {
+            "platforms": [
+                "android"
+            ],
+            "experiments": [
+                {
+                    "name": "Enabled_Launch",
+                    "enable_features": [
+                        "ChromeSmartSelection"
+                    ]
+                }
+            ]
+        }
+    ],
+     "ChromeStart": [
+         {
+             "platforms": [
 -- 
 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
-@@ -500,7 +500,7 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -704,7 +704,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
-@@ -510,7 +510,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
+@@ -714,7 +714,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
 // Origin-Signed HTTP Exchanges (for WebPackage Loading)
 // https://www.chromestatus.com/features/5745285984681984
 const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
@@ -0,0 +1,96 @@
+From: Michael Gilbert <mgilbert@debian.org>
+Date: Wed, 21 Nov 2018 02:37:35 +0000
+Subject: Disable support for RAR files inspection
+
+---
+ .../download_protection/file_analyzer.cc      |  2 +-
+ chrome/common/safe_browsing/BUILD.gn          | 33 -------------------
+ .../file_util/safe_archive_analyzer.cc        |  4 +--
+ 3 files changed, 2 insertions(+), 37 deletions(-)
+
+diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+@@ -90,7 +90,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
+   if (inspection_type == DownloadFileType::ZIP) {
+     StartExtractZipFeatures();
+   } else if (inspection_type == DownloadFileType::RAR) {
+-    StartExtractRarFeatures();
+    LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build";
+ #if defined(OS_MAC)
+   } else if (inspection_type == DownloadFileType::DMG) {
+     StartExtractDmgFeatures();
+diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
+--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
+@@ -41,38 +41,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+   }
+ 
+-  source_set("rar_analyzer") {
+-    sources = [
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+-    ]
+-
+-    deps = [
+-      ":archive_analyzer_results",
+-      ":download_type_util",
+-      "//base",
+-      "//base:i18n",
+-      "//components/safe_browsing/core/common",
+-      "//third_party/unrar:unrar",
+-    ]
+-
+-    defines = [
+-      "_FILE_OFFSET_BITS=64",
+-      "LARGEFILE_SOURCE",
+-      "RAR_SMP",
+-      "SILENT",
+-
+-      # The following is set to disable certain macro definitions in the unrar
+-      # source code.
+-      "CHROMIUM_UNRAR",
+-
+-      # Disables exceptions in unrar, replaces them with process termination.
+-      "UNRAR_NO_EXCEPTIONS",
+-    ]
+-
+-    public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
+-  }
+-
+   if (is_mac) {
+     source_set("disk_image_type_sniffer_mac") {
+       sources = [
+@@ -142,7 +110,6 @@ source_set("safe_browsing") {
+       ":archive_analyzer_results",
+       ":binary_feature_extractor",
+       ":download_type_util",
+-      ":rar_analyzer",
+       "//components/safe_browsing/core/common",
+     ]
+ 
+diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
+--- a/chrome/services/file_util/safe_archive_analyzer.cc
+++ b/chrome/services/file_util/safe_archive_analyzer.cc
+@@ -7,7 +7,6 @@
+ #include "base/macros.h"
+ #include "build/build_config.h"
+ #include "chrome/common/safe_browsing/archive_analyzer_results.h"
+-#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "chrome/common/safe_browsing/zip_analyzer.h"
+ 
+ #if defined(OS_MAC)
+@@ -47,8 +46,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+                                          AnalyzeRarFileCallback callback) {
+   DCHECK(rar_file.IsValid());
+ 
+  LOG(FATAL) << "AnalyzeRarFile is disabled in this build";
+   safe_browsing::ArchiveAnalyzerResults results;
+-  safe_browsing::rar_analyzer::AnalyzeRarFile(
+-      std::move(rar_file), std::move(temporary_file), &results);
+   std::move(callback).Run(results);
+ }
+-- 
+2.17.1
+
@@ -1,44 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 11 Nov 2019 23:09:48 +0100
-Subject: Disable sync services menu entry
-
---
- chrome/android/java/res/xml/main_preferences.xml    | 6 ------
- chrome/android/java/res/xml/privacy_preferences.xml | 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
-+++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -14,12 +14,6 @@
-         android:key="sign_in"
-         android:order="1"
-         android:title="@string/sign_in_to_chrome"/>
-    <org.chromium.chrome.browser.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.settings.sync.SyncAndServicesPreferences"/>
- 
-     <PreferenceCategory
-         android:key="basics_section"
-diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
-+++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -29,12 +29,4 @@
-         android:title="@string/clear_browsing_data_title"
-         android:summary="@string/clear_browsing_data_summary"
-         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.settings.TextMessagePreference
-        android:key="sync_and_services_link"
-        android:summary="@string/privacy_sync_and_services_link"
-        app:allowDividerBelow="false" />
- </PreferenceScreen>
-- 
-2.17.1
-
@@ -0,0 +1,160 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 22 Aug 2020 12:46:20 +0200
+Subject: Disable text fragments by default
+
+Revert "[Text Fragment] Unflag fragment directive removal."
+---
+ chrome/browser/about_flags.cc                 |  1 +
+ chrome/browser/flag-metadata.json             |  2 +-
+ chrome/browser/ui/prefs/prefs_tab_helper.cc   |  2 +-
+ content/child/runtime_features.cc             |  1 +
+ third_party/blink/common/features.cc          |  2 +-
+ .../blink/renderer/core/dom/document.cc       |  5 ++++
+ .../text_fragment_anchor_metrics_test.cc      | 29 +++++++------------
+ .../platform/runtime_enabled_features.json5   |  3 +-
+ 8 files changed, 21 insertions(+), 24 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
+@@ -5377,6 +5377,7 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)},
+ #endif  // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX)
+     // will override runtime text fragment identifiers setting too
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+     {"ash-enable-pip-rounded-corners",
+diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
+--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
+@@ -2941,7 +2941,7 @@
+   {
+     "name": "ev-details-in-page-info",
+     "owners": [ "cthomp" ],
+-    "expiry_milestone": 83
+    "expiry_milestone": -1
+   },
+   {
+     "name": "exo-gamepad-vibration",
+diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
+--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
+@@ -360,7 +360,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
+       prefs::kEnableReferrers,
+       !base::FeatureList::IsEnabled(features::kNoReferrers));
+   registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true);
+-  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true);
+  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false);
+ #if defined(OS_ANDROID)
+   registry->RegisterDoublePref(prefs::kWebKitFontScaleFactor, 1.0);
+   registry->RegisterBooleanPref(prefs::kWebKitForceEnableZoom,
+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
+@@ -263,6 +263,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+     {wf::EnableMouseSubframeNoImplicitCapture,
+      features::kMouseSubframeNoImplicitCapture},
+     {wf::EnableNeverSlowMode, features::kNeverSlowMode},
+    // will set the TextFragmentIdentifiers runtime feature
+     {wf::EnableNotificationContentImage, features::kNotificationContentImage,
+      kSetOnlyIfOverridden},
+     {wf::EnableParseUrlProtocolHandler,
+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
+@@ -370,7 +370,7 @@ const base::Feature kStorageAccessAPI{"StorageAccessAPI",
+ 
+ // Enable text snippets in URL fragments. https://crbug.com/919204.
+ const base::Feature kTextFragmentAnchor{"TextFragmentAnchor",
+-                                        base::FEATURE_ENABLED_BY_DEFAULT};
+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ // File handling integration. https://crbug.com/829689
+ const base::Feature kFileHandlingAPI{"FileHandlingAPI",
+diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
+--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
+@@ -4070,6 +4070,10 @@ void Document::SetURL(const KURL& url) {
+     }
+   }
+ 
+  // If text fragment identifiers are enabled, we strip the fragment directive
+  // from the URL fragment.
+  // E.g. "#id:~:text=a" --> "#id"
+  if (RuntimeEnabledFeatures::TextFragmentIdentifiersEnabled(domWindow())) {
+   // Strip the fragment directive from the URL fragment. E.g. "#id:~:text=a"
+   // --> "#id". See https://github.com/WICG/scroll-to-text-fragment.
+   String fragment = new_url.FragmentIdentifier();
+@@ -4083,6 +4087,7 @@ void Document::SetURL(const KURL& url) {
+     else
+       new_url.SetFragmentIdentifier(fragment.Substring(0, start_pos));
+   }
+  }
+ 
+   url_ = new_url;
+   access_entry_from_url_ = nullptr;
+diff --git a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc
+--- a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc
+++ b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc
+@@ -1249,34 +1249,25 @@ TEST_P(TextFragmentRelatedMetricTest, ElementIdSuccessFailureCounts) {
+   // result of the element-id fragment if a text directive is successfully
+   // parsed. If the feature is off we treat the text directive as an element-id
+   // and should count the result.
+  const int kUncountedOrNotFound = GetParam() ? kUncounted : kNotFound;
+   const int kUncountedOrFound = GetParam() ? kUncounted : kFound;
+ 
+-  // Note: We'll strip the fragment directive (i.e. anything after :~:) leaving
+-  // just the element anchor. The fragment directive stripping behavior is now
+-  // shipped unflagged so it should always be performed.
+  // When the TextFragmentAnchors feature is on, we'll strip the fragment
+  // directive (i.e. anything after :~:) leaving just the element anchor.
+  const int kFoundIfDirectiveStripped = GetParam() ? kFound : kNotFound;
+ 
+   Vector<std::pair<String, int>> test_cases = {
+       {"", kUncounted},
+       {"#element", kFound},
+       {"#doesntExist", kNotFound},
+-      // `:~:foo` will be stripped so #element will be found and #doesntexist
+-      // ##element will be not found.
+-      {"#element:~:foo", kFound},
+      {"#element:~:foo", kFoundIfDirectiveStripped},
+       {"#doesntexist:~:foo", kNotFound},
+       {"##element", kNotFound},
+-      // If the feature  is on, `:~:text=` will parse so we shouldn't count.
+-      // Otherwise, it'll just be stripped so #element will be found.
+-      {"#element:~:text=doesntexist", kUncountedOrFound},
+-      {"#element:~:text=page", kUncountedOrFound},
+-      // If the feature is on, `:~:text` is parsed so we don't count. If it's
+-      // off the entire fragment is a directive that's stripped so no search is
+-      // performed either.
+-      {"#:~:text=doesntexist", kUncounted},
+-      {"#:~:text=page", kUncounted},
+-      {"#:~:text=name", kUncounted},
+-      // If the feature is enabled, `:~:text` parses and we don't count the
+-      // element-id. If the feature is off, we still strip the :~: directive
+-      // and the remaining fragment does match an element id.
+      {"#element:~:text=doesntexist", kUncountedOrNotFound},
+      {"#element:~:text=page", kUncountedOrNotFound},
+      {"#:~:text=doesntexist", kUncountedOrNotFound},
+      {"#:~:text=page", kUncountedOrNotFound},
+      {"#:~:text=name", kUncountedOrFound},
+       {"#element:~:text=name", kUncountedOrFound}};
+ 
+   const int kNotFoundSample = 0;
+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
+@@ -2130,8 +2130,7 @@
+     },
+     {
+       name: "TextFragmentIdentifiers",
+-      origin_trial_feature_name: "TextFragmentIdentifiers",
+-      status: "stable",
+      origin_trial_feature_name: "TextFragmentIdentifiers"
+     },
+     {
+       name: "TextFragmentTapOpensContextMenu",
+-- 
+2.17.1
+
@@ -0,0 +1,35 @@
+From: Blaise <BlaiseD@GMail.com>
+Date: Sun, 23 Aug 2020 14:32:55 -0500
+Subject: Disable the DIAL repeating discovery
+
+This causes unnecessary SSDP network spam
+---
+ chrome/browser/media/router/discovery/dial/dial_registry.cc | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrome/browser/media/router/discovery/dial/dial_registry.cc
+--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
+++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
+@@ -191,10 +191,6 @@ void DialRegistry::StartPeriodicDiscovery() {
+ 
+   dial_ = CreateDialService();
+   dial_->AddObserver(this);
+-  DoDiscovery();
+-  repeating_timer_ = std::make_unique<base::RepeatingTimer>();
+-  repeating_timer_->Start(FROM_HERE, refresh_interval_delta_, this,
+-                          &DialRegistry::DoDiscovery);
+ }
+ 
+ void DialRegistry::DoDiscovery() {
+@@ -208,8 +204,6 @@ void DialRegistry::StopPeriodicDiscovery() {
+   if (!dial_)
+     return;
+ 
+-  repeating_timer_->Stop();
+-  repeating_timer_.reset();
+   dial_->RemoveObserver(this);
+   ClearDialService();
+ }
+-- 
+2.17.1
+
@@ -4,21 +4,21 @@ Subject: Disable third-party cookies by default

 author: Chad Miller <chad.miller@canonical.com>
 ---
- components/content_settings/core/browser/cookie_settings.cc | 2 +-
+ chrome/browser/prefs/browser_prefs.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
--- a/components/content_settings/core/browser/cookie_settings.cc
-+++ b/components/content_settings/core/browser/cookie_settings.cc
-@@ -58,7 +58,7 @@ void CookieSettings::GetCookieSettings(
- void CookieSettings::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-      prefs::kBlockThirdPartyCookies, false,
-+      prefs::kBlockThirdPartyCookies, true,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterIntegerPref(
-       prefs::kCookieControlsMode,
+diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
+--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
+@@ -698,7 +698,7 @@ void RegisterProfilePrefsForMigration(
+ 
+   chrome_browser_net::secure_dns::RegisterProbesSettingBackupPref(registry);
+ 
+-  registry->RegisterBooleanPref(kBlockThirdPartyCookies, false);
+  registry->RegisterBooleanPref(kBlockThirdPartyCookies, true);
+ 
+   registry->RegisterTimePref(kPluginsDeprecationInfobarLastShown, base::Time());
+ 
 -- 
 2.17.1

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 19 Dec 2020 20:04:14 +0100
+Subject: Disable unified autoplay feature
+
+---
+ 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
+@@ -498,7 +498,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
+ // Enables the Unified Autoplay policy by overriding the platform's default
+ // autoplay policy.
+ const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
+-                                     base::FEATURE_ENABLED_BY_DEFAULT};
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+ 
+ #if defined(OS_LINUX)
+ // Enable vaapi video decoding on linux. This is already enabled by default on
+-- 
+2.17.1
+
@@ -3,31 +3,23 @@ Date: Sat, 27 Oct 2018 17:54:01 +0200
 Subject: Disable update scheduler

 ---
- .../chrome/browser/component_updater/UpdateScheduler.java  | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
+ .../components/component_updater/UpdateScheduler.java         | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)

-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/component_updater/UpdateScheduler.java
-@@ -36,10 +36,7 @@ public class UpdateScheduler {
+diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
+--- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
+++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
+@@ -34,9 +34,7 @@ public class UpdateScheduler {
 
     @CalledByNative
     /* package */ static boolean isAvailable() {
 -        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                || GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
-                           ContextUtils.getApplicationContext())
-                == ConnectionResult.SUCCESS;
+-                || ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(
+-                        ContextUtils.getApplicationContext());
 +        return false;
     }
 
     /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
-@@ -112,4 +109,4 @@ public class UpdateScheduler {
-         void onStartTask(long nativeBackgroundTaskUpdateScheduler, UpdateScheduler caller);
-         void onStopTask(long nativeBackgroundTaskUpdateScheduler, UpdateScheduler caller);
-     }
-}
-\ No newline at end of file
-+}
 -- 
 2.17.1

@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 23 Jul 2021 15:05:19 +0200
+Subject: Do not build API keys infobar
+
+---
+ chrome/browser/ui/BUILD.gn | 2 --
+ 1 file changed, 2 deletions(-)
+
+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
+@@ -1195,8 +1195,6 @@ static_library("ui") {
+       "singleton_tabs.h",
+       "startup/automation_infobar_delegate.cc",
+       "startup/automation_infobar_delegate.h",
+-      "startup/google_api_keys_infobar_delegate.cc",
+-      "startup/google_api_keys_infobar_delegate.h",
+       "startup/launch_mode_recorder.cc",
+       "startup/launch_mode_recorder.h",
+       "startup/obsolete_system_infobar_delegate.cc",
+-- 
+2.17.1
+
@@ -0,0 +1,104 @@
+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/browser/ui/RootUiCoordinator.java   |  5 -----
+ .../ChromeProvidedSharingOptionsProvider.java  | 17 -----------------
+ chrome/browser/share/android/java_sources.gni  | 18 ------------------
+ 3 files changed, 40 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+@@ -78,7 +78,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
+ import org.chromium.chrome.browser.share.ShareDelegate;
+ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
+ import org.chromium.chrome.browser.share.ShareUtils;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
+ import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
+ import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -401,10 +400,6 @@ public class RootUiCoordinator
+     }
+ 
+     public void onAttachFragment(Fragment fragment) {
+-        if (fragment instanceof QrCodeDialog) {
+-            QrCodeDialog qrCodeDialog = (QrCodeDialog) fragment;
+-            qrCodeDialog.setAndroidPermissionDelegate(mWindowAndroid);
+-        }
+     }
+ 
+     @Override
+diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
+--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
+@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator;
+ import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator.LinkGeneration;
+ import org.chromium.chrome.browser.share.link_to_text.LinkToTextMetricsHelper;
+ import org.chromium.chrome.browser.share.long_screenshots.LongScreenshotsCoordinator;
+-import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
+ import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
+ import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
+ import org.chromium.chrome.browser.share.share_sheet.ShareSheetPropertyModelBuilder.ContentType;
+@@ -257,9 +256,6 @@ public class ChromeProvidedSharingOptionsProvider {
+                         ChromeFeatureList.PREEMPTIVE_LINK_TO_TEXT_GENERATION)) {
+             mOrderedFirstPartyOptions.add(createHighlightsFirstPartyOption());
+         }
+-        if (!mTabProvider.get().getWebContents().isIncognito()) {
+-            mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
+-        }
+         if (UserPrefs.get(Profile.getLastUsedRegularProfile()).getBoolean(Pref.PRINTING_ENABLED)) {
+             mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
+         }
+@@ -408,19 +404,6 @@ public class ChromeProvidedSharingOptionsProvider {
+                 .build();
+     }
+ 
+-    private FirstPartyOption createQrCodeFirstPartyOption() {
+-        return new FirstPartyOptionBuilder(
+-                ContentType.LINK_PAGE_VISIBLE, ContentType.LINK_PAGE_NOT_VISIBLE, ContentType.IMAGE)
+-                .setIcon(R.drawable.qr_code, R.string.qr_code_share_icon_label)
+-                .setFeatureNameForMetrics("SharingHubAndroid.QRCodeSelected")
+-                .setOnClickCallback((view) -> {
+-                    QrCodeCoordinator qrCodeCoordinator = new QrCodeCoordinator(
+-                            mActivity, mUrl, mTabProvider.get().getWindowAndroid());
+-                    qrCodeCoordinator.show();
+-                })
+-                .build();
+-    }
+-
+     private FirstPartyOption createPrintingFirstPartyOption() {
+         return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
+                 .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
+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
+@@ -21,24 +21,6 @@ share_java_sources = [
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java",
+-  "//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/TabLayoutPageListener.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/QrCodeShareMediator.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
+-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotSource.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
+   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
+-- 
+2.17.1
+
@@ -1,43 +0,0 @@
-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
-
@@ -1,77 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 10 Nov 2018 19:47:39 +0100
-Subject: Do not grant notifications to default search engine
-
-Block gelocation by default instead of granting it for non-enterprise use cases (almost the totality of users)
---
- .../search_permissions_service.cc             | 20 ++++++-------------
- chrome/common/chrome_features.cc              |  2 +-
- 2 files changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc
--- a/chrome/browser/android/search_permissions/search_permissions_service.cc
-+++ b/chrome/browser/android/search_permissions/search_permissions_service.cc
-@@ -190,7 +190,7 @@ void SearchPermissionsService::ResetDSEPermission(ContentSettingsType type) {
-   DCHECK(dse_url.is_empty() || IsPermissionControlledByDSE(type, dse_origin));
- 
-   if (!dse_url.is_empty())
-    SetContentSetting(dse_url, type, CONTENT_SETTING_ALLOW);
-+    SetContentSetting(dse_url, type, CONTENT_SETTING_BLOCK);
- }
- 
- void SearchPermissionsService::ResetDSEPermissions() {
-@@ -333,11 +333,7 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
-     return;
-   }
- 
-  // If we get to here, the DSE is not disabled by enterprise policy. If it was
-  // previously enterprise controlled, we initialize the setting to BLOCK since
-  // we don't know what the user's setting was previously.
-  bool was_enterprise_controlled =
-      pref_service_->GetBoolean(prefs::kDSEWasDisabledByPolicy);
-+  // If this line is reached then DSE is not disabled by enterprise policy.
-   pref_service_->ClearPref(prefs::kDSEWasDisabledByPolicy);
- 
-   // Initialize the pref for geolocation if it hasn't been initialized yet.
-@@ -370,10 +366,8 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
-       pref_service_->ClearPref(prefs::kDSEGeolocationSettingDeprecated);
-     } else if (dse_geolocation_setting == CONTENT_SETTING_ASK) {
-       // If the user hasn't explicitly allowed or blocked geolocation for the
-      // DSE, initialize it to allowed.
-      dse_geolocation_setting = was_enterprise_controlled
-                                    ? CONTENT_SETTING_BLOCK
-                                    : CONTENT_SETTING_ALLOW;
-+      // DSE, initialize it to blocked.
-+      dse_geolocation_setting = CONTENT_SETTING_BLOCK;
-     }
- 
-     // Update the content setting with the auto-grants for the DSE.
-@@ -398,11 +392,9 @@ void SearchPermissionsService::InitializeSettingsIfNeeded() {
-         GetContentSetting(dse_origin, 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.
-+    // DSE, initialize it to blocked.
-     if (dse_notifications_setting == CONTENT_SETTING_ASK) {
-      dse_notifications_setting = was_enterprise_controlled
-                                      ? CONTENT_SETTING_BLOCK
-                                      : CONTENT_SETTING_ALLOW;
-+      dse_notifications_setting = CONTENT_SETTING_BLOCK;
-     }
- 
-     // Update the content setting with the auto-grants for the DSE.
-diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -320,7 +320,7 @@ const base::FeatureParam<std::string> kDnsOverHttpsTemplatesParam{
- #if defined(OS_ANDROID)
- // Enable changing default downloads storage location on Android.
- const base::Feature kDownloadsLocationChange{"DownloadsLocationChange",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
- 
- // If enabled, Drive will use FCM for its invalidations.
-- 
-2.17.1
-
--- a/Show More
+++ b/Show More