v109 fix move navigation bar to bottom

replaced CachedFeatureFlags.isEnabled(flagname) with ChromeFeatureList.flagname
v109 fix build (fixup)
2023-01-06 15:28:35 +01:00 · 2023-01-06 15:02:37 +01:00 · 2023-01-06 14:54:21 +01:00 · 2023-01-06 14:53:55 +01:00 · 2023-01-06 14:53:06 +01:00 · 2023-01-06 14:51:58 +01:00
310 changed files with 94110 additions and 272257 deletions
@@ -1,4 +1,4 @@
 # These are supported funding model platforms

-liberapay: csagan5
+patreon: csagan5
 custom: https://www.bromite.org/#donate
@@ -1,54 +0,0 @@
---
-name: Bug report
-about: Create a Bromite bug report
-
---
-
-### Bromite version
-
-Version: `76.0...`
-Arch: `arm` or `arm64` or `x86`
-Android version: (example: `9.0`)
-Device model: (example: `SM-G960UZKABST`)
-
-### Is this bug about the SystemWebView?
-Yes/No
-
-<!-- No support for SystemWebView installations is provided. -->
-
-### Is the bug reproducible with latest version?
-
-<!-- Do not report bugs which are not reproducible with latest version. -->
-
-### Can the bug be reproduced with corresponding Chromium version?
-
-<!--
-Please pick the same version of Chromium as Bromite from here: https://github.com/bromite/chromium/releases
-If the bug is reproducible then it might be a configuration issue or an upstream bug. Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.
-->
-
-### Is the bug a crash?
-
-<!--
-If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
-->
-
-### Describe the bug
-
-!-- Write here a clear and concise description of the bug. -->
-
-### Steps to reproduce the bug
-
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-### Expected behavior
-
-<!-- A clear and concise description of what you expected to happen. -->
-
-### Screenshots
-
-<!-- If applicable, add screenshots to help explain your problem. Otherwise remove this section. -->
@@ -0,0 +1,213 @@
+name: Bug report
+description: Create a Bromite bug report
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome! Thanks for taking the time to submit a bug report.
+        
+        If this is not a bug about the Bromite browser, or you are looking for a place to ask a question to the community,
+        then please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions) instead.
+        
+        Make sure you have acknowledged and completed this template before submitting your issue.
+        
+        Please read it carefully: incorrect issues will be automatically closed and ignored.
+        
+  - type: checkboxes
+    id: preliminary_checklist
+    attributes:
+      label: Preliminary checklist
+      options:
+        - label: "I have read the [README](https://github.com/bromite/bromite/blob/master/README.md)."
+          required: true
+        - label: "I have searched the existing issues for my problem. This is a new ticket, NOT a duplicate or related to another open issue."
+          required: true
+        - label: "I have read the [FAQs](https://github.com/bromite/bromite/blob/master/FAQ.md)."
+          required: true
+        - label: "I have updated Bromite to the latest version. The bug is reproducible on this latest version."
+          required: true
+        - label: "This is a bug report about the Bromite browser (not about the website, building Bromite, F-Droid or anything else)."
+          required: true
+
+  - type: dropdown
+    id: is_chromium
+    attributes:
+      label: Can the bug be reproduced with corresponding Chromium version?
+      description: |
+          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".
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: input
+    id: bromite_version
+    attributes:
+      label: Bromite version
+      description: What version of Bromite are you using? Please specify a single version e.g. `96.0.4664.1` not `latest`. If this is not the latest version then please update and retry before submitting this bug report.
+    validations:
+      required: true
+
+  - type: dropdown
+    id: device_architecture
+    attributes:
+      label: Device architecture
+      multiple: false
+      options:
+        - arm
+        - arm64
+        - arm64-v8a
+        - armeabi-v7a
+        - x86
+        - x64
+    validations:
+      required: true
+
+  - type: dropdown
+    id: android_version
+    attributes:
+      label: Android version
+      multiple: false
+      description: What version of Android are you running?
+      options:
+        - 13
+        - 12.1
+        - 12.0
+        - 11
+        - 10
+        - 9
+        - 8.1
+        - 8.0
+        - 7.1
+        - 7.0
+        - 6
+        - 5.1
+        - 5.0
+        - 4.4
+        - 4.3
+        - 4.2
+        - 4.1
+        - 4.0
+    validations:
+      required: true
+
+  - type: input
+    id: device_model
+    attributes:
+      label: Device model
+      description: What is your device model? This can usually be found in your device's settings in the "About" section.
+      placeholder: (e.g. `OnePlus 8 (IN2010)`, or `SM-G960UZKABST`, etc.)
+    validations:
+      required: true
+
+  - type: textarea
+    id: changed_flags
+    attributes:
+      label: Changed flags
+      description: |
+        These are the flags changed under `chrome://flags`.
+        Report all the flags with non-default configuration (they will be blue-highlighted).
+        
+        If no flags are changed then write 'no flags changed'.
+      placeholder: show-overdraw-feedback, enable-parallel-downloading
+    validations:
+      required: true
+
+  - type: dropdown
+    id: is_system_webview
+    attributes:
+      label: Is this bug about the SystemWebView?
+      description: Please note that no support for System WebView installation is provided.
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: is_incognito
+    attributes:
+      label: Is this bug happening in an incognito tab?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: adblock
+    attributes:
+      label: Is this bug caused by the adblocker?
+      description: You can test this by temporarily allowing ads for the site.
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug_crash
+    attributes:
+      label: Is this bug a crash?
+      description: |
+        1. No.
+        2. Yes, I have attached the crash report dump that I downloaded from `chrome://crashes`
+        3. Yes, I have copy/pasted the crash dump
+      placeholder: |
+        Drag the crash report dump here to attach it or paste the logcat dump individuated with `adb logcat | grep -E '( cr_|bromite|chromium)'`.
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug_description
+    attributes:
+      label: Describe the bug
+      description: Write a clear and concise description of the bug.
+    validations:
+      required: true
+
+  - type: textarea
+    id: bug_steps
+    attributes:
+      label: Steps to reproduce the bug
+      description: |
+        Explain how to cause the bug as clearly as possible. Bugs that are not reproducible cannot be investigated.
+        
+        Also, do not write "any website": please specify which URLs can be used to reproduce the issue.
+      placeholder: |
+        Steps to reproduce the bug (e.g.):
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: |
+        If applicable, add screenshots to help explain your problem.
+        Otherwise, ignore this section.
+      placeholder: |
+        Drag the screenshot files here to attach them.
+    validations:
+      required: false
@@ -1,23 +0,0 @@
---
-name: Feature request
-about: Suggest a privacy-related idea for this project
-
---
-
-### Is your feature request related to privacy?
-
-<!-- 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. -->
-
-### Describe the solution you would like
-
-<!-- A clear and concise description of what you want to happen.
-
-Do not ask "I would like feature X which is available in browser Y"; such issues are closed immediately. -->
-
-### Describe alternatives you have considered
-
-<!-- A clear and concise description of any alternative solutions or features you have considered. -->
@@ -0,0 +1,68 @@
+name: Feature request
+description: Create a Bromite feature request
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Welcome! Thanks for taking time to submit a feature request.
+        
+        If this is not a feature request about the Bromite browser, or you are looking for a place
+        to ask a question to the community then please use the [GitHub Discussions](https://github.com/bromite/bromite/discussions) instead.
+        
+        Make sure you have acknowledged and completed this template before submitting your issue.
+        
+        Please read it carefully: incorrect issues will be automatically closed and ignored.
+        
+        Note:
+          - Features unrelated to privacy will not be considered.
+          - Do not ask "I would like feature X which is available in browser Y."
+
+  - type: checkboxes
+    id: preliminary_checklist
+    attributes:
+      label: Preliminary checklist
+      options:
+        - label: "I have read the [README](https://github.com/bromite/bromite/blob/master/README.md)"
+          required: true
+        - label: "I have read the [FAQs](https://github.com/bromite/bromite/blob/master/FAQ.md)."
+          required: true
+        - label: "I have searched [existing issues](https://github.com/bromite/bromite/issues) for my feature request. This is a new issue (NOT a duplicate) and is not related to another issue."
+          required: true
+        - label: "This is a feature request for the Bromite browser; not the website nor F-Droid nor anything else."
+          required: true
+
+  - type: dropdown
+    id: is_privacy_related
+    attributes:
+      label: Is your feature request related to privacy?
+      description: Features that are not related to privacy are not considered.
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+    validations:
+      required: true
+
+  - type: textarea
+    id: is_patch_available
+    attributes:
+      label: Is there a patch available for this feature somewhere?
+      description: If yes please provide URL and related license information.
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution_description
+    attributes:
+      label: Describe the solution you would like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives_considered
+    attributes:
+      label: Describe alternatives you have considered
+      description: A clear and concise description of any alternative solutions or features you have considered.
+    validations:
+      required: true
@@ -0,0 +1,15 @@
+## Description
+
+*Please explain here what feature or bugfix these changes are addressing and why they should be included*
+
+## All submissions
+
+* [ ] there are no other open [Pull Requests](../../../pulls) for the same update/change
+* [ ] Bromite can be built with these changes
+* [ ] I have tested that the new change works as intended (AVD or physical device will do)
+
+### Format
+
+* [ ] patch subject and filename match (e.g. `Subject: Alternative cache (NIK-based)` -> `Alternative-cache-NIK-based.patch`)
+* [ ] patch description contains explanation of changes
+* [ ] no unnecessary whitespace or unrelated changes
@@ -1,3 +1,588 @@
+# 108.0.5359.156
+
+# 108.0.5359.109
+* reintroduce adaptive-button-in-top-toolbar-customization flag
+
+# 108.0.5359.106
+* fix crash when using always incognito (fixes https://github.com/bromite/bromite/issues/2482)
+* enable third-party storage partitioning (fixes https://github.com/bromite/bromite/issues/2337)
+* disable features ExperimentsForAgsa, KeepPrefetchedContentSuggestions, CriticalClientHint, AcceptCHFrame (accidentally enabled but not effective in 108.0.5359.75)
+
+# 108.0.5359.75
+* drop patch to mark all favicons ON_DEMAND (fixed by upstream, see https://bugs.chromium.org/p/chromium/issues/detail?id=1096660)
+* enable AutomaticLazyFrameLoadingToAds and AutomaticLazyFrameLoadingToEmbeds features
+* drop patch for SDK21 to prevent crashes on download
+* fix patch to ignore enterprise policies for secure DNS (fixes https://github.com/bromite/bromite/issues/2463)
+* stop using SM-G960U as model provided via client hints and Javascript (fixes https://github.com/bromite/bromite/issues/2465)
+* temptative fix for OfflinePageModelFactory crash (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2419)
+* fix fingerprinting vector via Window.requestAnimationFrame() (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2370)
+* remove patch for offline measurements background task (fixes https://github.com/bromite/bromite/issues/2468)
+* enable PermuteTLSExtensions (fixes https://github.com/bromite/bromite/issues/2467)
+* hide "turn on enhanced protection" in security interstitials
+
+# 107.0.5304.114
+* fix for drag selection not working with bottom toolbar (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2411)
+* fix for navbar color not matching site color (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2416)
+* clamp time resolution in WebWorkers' requestAnimationFrame (thanks to @uazo)
+* drop patch for AV1 codec support (already in upstream)
+
+# 107.0.5304.96
+* bottom toolbar: fix for white strip at top in tab view (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2407)
+* reverse tab order from top to bottom when using bottom toolbar (thanks to @uazo)
+* dropped patches already merged upstream (partition DNS requests by top frame NIK, clipboard user gesture requirement removal)
+* disable StartSurface feature
+
+# 106.0.5249.163
+* enable ECH (Encrypted ClientHello) by default
+
+# 106.0.5249.72
+* dropped patches already merged upstream
+
+# 105.0.5195.147
+* enable HEVC by default (fixes https://github.com/bromite/bromite/issues/2331)
+* partition blobs by top frame URL (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2312)
+* use first accept-language as system language for Blink (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2160)
+* fix user scripts injection with back-forward cache enabled (thanks to @uazo)
+* remove HTTP referrals in cross-origin navigation (thanks to @uazo)
+* update noise factor for anti-fingerpriting mitigations only once per document (fixes https://github.com/bromite/bromite/issues/2352)
+* disable add to home screen prompt (fixes https://github.com/bromite/bromite/issues/2340)
+
+# 105.0.5195.41
+* revert by-pass for clipboard permissions for NTP doodles (fixes https://bugs.chromium.org/p/chromium/issues/detail?id=1334203)
+* prevent history detection via favicon (fixes https://github.com/bromite/bromite/issues/2269)
+* fix the lack of protection in canvas.convertToBlob()
+* improve incognito mode detection countermeasures (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1615)
+* fix toolbar gesture when using bottom navigation bar (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2253)
+
+# 104.0.5112.91
+* re-introduce modal flag to prompt when closing all tabs
+* sharing hub: always use visible URL (fixes https://github.com/bromite/bromite/issues/2204)
+* add SVG fingerprinting mitigation (thanks to @uazo)
+* updated zh_CN translactions (thanks to @zhmars)
+* dropped patch to open YouTube links in Bromite
+
+# 104.0.5112.63
+
+# 103.0.5060.140
+* fix timezone override not working correctly (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2133)
+* never provide navigator.connection info (thanks to @uazo)
+* fix management of custom User-Agent (thanks to @uazo)
+
+# 103.0.5060.126
+* fix malfunctioning sticky desktop mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2179)
+* fix non-working passwords manager (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2188)
+* fix crash when opening recent tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2190)
+* fix autoplay not working correctly (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2096)
+* add GN flag for clangd builds (thanks to @uazo)
+
+# 103.0.5060.121
+* do not enable always use HTTPS by default
+* match system dark mode (thanks to @krlvm)
+* remove window name on cross origin navigation (thanks to @uazo)
+* remove preload of GMS fonts on stock Android (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2156)
+
+# 102.0.5005.96
+* fix history expiration bug (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2104)
+* fix category setting activation (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2091)
+* improve plain text rendering on mobile
+* rewritten certificate transparency patch (fixes https://github.com/bromite/bromite/issues/2101)
+
+# 102.0.5005.92
+* restore offline-indicator-v2 flag functionality (thanks to @Zelda189)
+
+# 102.0.5005.67
+* dropped patch to disable mobile identity consistency by default
+* fix text for blocked ads (fixes https://github.com/bromite/bromite/issues/2026)
+* fix OpenSeach visited site detection bug (fixes https://github.com/bromite/bromite/issues/1994)
+
+# 101.0.4951.69
+* flag to toggle site engagement (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2022)
+* site settings to enable webGL (thanks to @uazo)
+* removed flag to disable webGL
+* fix bottom navigation bar search/site suggestions behaviour (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2049)
+* enable process isolation for all iframes
+* add webRTC site settings (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1965)
+
+# 101.0.4951.53
+* move incognito settings to separate page (thanks to @uazo)
+* disable automatic offline pages saving by default (thanks to @uazo)
+* make history support and site settings in always incognito mode disabled by default (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1991)
+* move pop-up toolbar to the bottom when using bottom navigation bar (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2030)
+* menu does not show all entries (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2011)
+* stray shadow when using bottom toolbar (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1995)
+
+# 101.0.4951.39
+* save only ContentSettings in always-incognito mode (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1942)
+* fix a couple issues related to signin and metrics leftover code affecting debug builds (thanks to @uazo)
+* remove some more parameters from the English-version search engine (thanks to @uazo)
+* add welcome screen with mention of privacy statements (fixes https://github.com/bromite/bromite/issues/691)
+
+# 100.0.4896.135
+* remove mremap from seccomp baseline policy
+* add flag to move top toolbar to bottom (thanks to @uazo)
+
+# 100.0.4896.92
+* improve user script errors and visualized name (thanks to @uazo)
+* fix autofill password not working anymore (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1956)
+* mark sites as visited when they have an already-parsed OpenSearch descriptor
+* disable TLS resumption by default (thanks to @uazo)
+* partition DoH requests by top-frame NIK (thanks to @uazo)
+
+# 100.0.4896.83
+* update zh_CN translations (thanks to @zhmars)
+* fix custom UA reported via Javascript (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1936)
+* introduce session granularity for permissions (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1549)
+* disable crash reporting
+* avoid script injection on some sites
+* fix upstream OpenSearch bug with search engines prematurely discarded
+* fix upstream DNS bug with inconsistent Android system DNS configuration (fixes https://github.com/bromite/bromite/issues/1960)
+* use less invasive approach to protect local IP address when using webRTC (fixes https://github.com/bromite/bromite/issues/589)
+* add menu entry to select all bookmarks (fixes https://github.com/bromite/bromite/issues/1959)
+* fix Note 9 crash on startup (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1871)
+* remove passwords menu entry for leak check
+* remove privacy menu entry to use phone as a security key
+
+# 100.0.4896.57
+* allow OpenSearch search engine URLs with path
+* disable AsyncDNS by default
+* remove translate menu entries
+* fix patch to remove contextual search (thanks to @nikolowry)
+* add option to never expire history
+* improve description for JIT site settings (fixes https://github.com/bromite/bromite/issues/1931)
+* remove more signin integration (fixes https://github.com/bromite/bromite/issues/1902)
+* miscellaneous fixes for AMP and background video playback (fixes https://github.com/bromite/bromite/issues/1921)
+* update zh_CN translations (thanks to @zhmars)
+
+# 99.0.4844.77
+* fix missing adaptive icon for updates
+* do not close adblock filters editor when tapping reset button
+* change text for 'Never' in history days to keep setting
+* bring back dictionary hints in address bar
+
+# 99.0.4844.58
+* remove contextual search (fixes https://github.com/bromite/bromite/issues/1750)
+* remove global JIT settings
+* add privacy setting for how many number of days of history to keep (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1870)
+* disable UA full version (thanks to @uazo)
+* reintroduce patch for Save-Data header
+* updated zh_CN translations (thanks to @zhmars)
+* reintroduce Save-Data header flag
+
+# 99.0.4844.55
+* flag to enable Certificate Transparency (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1554)
+* allow adding search engines from incognito mode
+* disable all predictors code (thanks to @uazo)
+* revert allow block of view-source URLs
+* enable StrictOriginIsolation and SitePerProcess for all devices (thanks to @uazo)
+* JIT toggle site setting (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1720 and https://github.com/bromite/bromite/issues/1819)
+* move always incognito preference to native (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1496 and https://github.com/bromite/bromite/issues/1568)
+* remove Save-Data header flag
+* close a potential security issue with user scripts on native pages (thanks to @uazo)
+* disable safety checks and possible Omaha interactions
+* disable SegmentationPlatformFeature and Optimization Hints (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1632)
+* add notification for a major upstream version being released (fixes https://github.com/bromite/bromite/issues/1796)
+* fix screenshots in incognito allowed by default (fixes https://github.com/bromite/bromite/issues/1816)
+
+# 98.0.4758.116
+* disable minidumps upload
+* complete disabling of client hint headers (thanks to @uazo)
+* disable another way to activate origin trials (thanks to @uazo)
+* fix for gateway attacks via websockets blocking (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1693)
+
+# 98.0.4758.108
+* re-introduce flag for text fragments
+* re-introduce content feature flag to disable field trials
+* disable idle detection
+* disable critical client hints
+* disable supervised users
+* partial fix for incognito notification (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1503)
+* consider websockets 'unknown' address space as 'public' (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1693)
+* fix crash when accessing site settings of some sites (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1355)
+
+# 97.0.4692.106
+* disable url-keyed metrics reporting service (thanks to @uazo)
+* disable mobile identity consistency by default
+* disable appending variations header
+* use Google Chrome branding for client hints
+* make HTTPS-only mode enabled by default
+* enable trivial auto var init (thanks to @BayLee4, fixes https://github.com/bromite/bromite/issues/1749)
+* enable use_cfi_cast
+
+# 96.0.4664.183
+* updated zh_CN translations (thanks to @zhmars)
+
+# 96.0.4664.104
+* separate patches for package name
+
+# 96.0.4664.54
+* restored offline-indicator-v2 flag (fixes https://github.com/bromite/bromite/issues/1588)
+* re-introduced option to use home page as NTP (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1519)
+* ask user before closing all tabs (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1561)
+* fix crash on always incognito on tablet (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1611)
+* dropped patch to not upload crash data
+* fix autofill pop-up not appearing (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1534)
+
+# 95.0.4638.79
+* improvements for field trials disable patch (thanks to @uazo)
+* remove privacy sandbox UI leftover (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1560)
+* disable conversion measurement API (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1531)
+* remove all code related to FLoC (thanks to @uazo)
+* remove all code related to ENABLE_REPORTING (thanks to @uazo)
+* enable ad-tagging feature
+* SystemWebView: ignore StrictMode warning (thanks to @jylitalbit, https://github.com/bromite/bromite/pull/1567)
+* improvements for field trials fetch patch (thanks to @uazo)
+* disable accessibility service by default (thanks to @uazo, https://github.com/bromite/bromite/pull/1559)
+
+# 95.0.4638.78
+* disable third-party origin trials (fixes https://github.com/bromite/bromite/issues/1530)
+* dropped patch for async DNS flag
+* dropped duplicate patch for pull-to-refresh flag
+* fix application not closing on incognito tab (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1503)
+* fix external links in incognito not always opening (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1474)
+* fix incognito tab closing new tab under normal tab (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/1030)
+* allow custom tab intents and opening external links in incognito (thanks to @uazo)
+* never use HTTP probes for connectivity check on Android < M
+* re-introduce option to use home page as NTP (thanks to @uazo, https://github.com/bromite/bromite/pull/1586)
+
+# 94.0.4606.109
+* experimental user scripts support (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/792)
+* Bromite auto-update notifications enabled by default
+* enable Android native autofill (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/547)
+
+# 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/1459)
+* 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
@@ -20,7 +20,7 @@ Projects which follow a strict approach on this are [Iridium](https://iridiumbro

 Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium).
 This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization
-To disable this functionality you should disable protected content playback from Site settings -> Multimedia.
+To disable this functionality you should disable protected content playback from Site settings -> Protected Content.

 ## What is the SystemWebView?
 It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it.
@@ -31,14 +31,14 @@ Ad-blocking was present and always enabled in the SystemWebView from version `72

 ## How to enable DNS-over-HTTPS?

-See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
+See [this page](https://www.bromite.org/doh).

 ## Can you add HTTPS everywhere?
 No.
 We cannot add add-ons to Bromite (merely some features).

 ## Is Bromite on Play Store?
-No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
+No, and this is not going to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.

 Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.

@@ -48,9 +48,7 @@ It is not on the official F-Droid repository and there are no (more) plans to su
 You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).

 ## Does Bromite support WebRTC?
-Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
-
-The WebRTC functionality has always been using safe defaults to prevent leaks (disabled multiple routes and non-proxied UDP).
+Partially, see https://github.com/bromite/bromite/wiki/WebRTC

 ## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite?
 In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design.
@@ -71,3 +69,27 @@ when websites use the [Push API](https://w3c.github.io/push-api/); this will not
 ## 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?
+
+Yes, since version 94.0.4606.109 the native Android autofill can be used; this does not require accessibility services as a workaround.
+
+## Does Bromite support casting media content?
+
+No, this would require Play Store binary blobs.
+
+## Can you add this search engine as default?
+No.
+Bromite does not make any choice related to default search engines, the Chromium default is used.
+Various Android browsers get some fee to ship their apps with a specific default search engine, Bromite does not get any fee from anyone.
+Changing the default search engine would lead to an endless series of requests to change it based on personal preferences, thus no change is made to the default.
+See also: https://github.com/bromite/bromite/wiki/SearchEngines
+
+## Some websites show ads, how can I fix this?
+You can compare the blocked URLs with a desktop browser and Bromite (using [remote debugging](https://developer.chrome.com/docs/devtools/remote-debugging/)) and figure out some new filter rules to be added.
+If the ads are blocked via cosmetic filtering then blocking them is not possible with Bromite's engine and you might need something like an [user script](https://github.com/bromite/bromite/wiki/UserScripts) instead.
+See also: https://github.com/bromite/bromite/wiki/AdBlocking
+
+## This JavaScript/WebGL website is not performing well with Bromite, how can I fix this?
+Bromite comes with [JavaScript JIT](https://hacks.mozilla.org/2017/02/a-crash-course-in-just-in-time-jit-compilers/) disabled by default; if you trust the website you can enable it.
+For more information about this, search "javascript jit vulnerabilities" on your favorite search engine.
@@ -1,14 +1,20 @@
+[![Stand With Ukraine](./banner2-direct.svg)](https://stand-with-ukraine.pp.ua/)
+
 # Bromite - Take back your browser
+<a href="https://github.com/bromite/bromite/releases/latest">
+  <img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> </a>
+<a href="https://github.com/bromite/bromite/blob/master/LICENSE">
+  <img src="https://www.bromite.org/license.svg" alt="GNU GPL v3" title="GNU VPL v3" />
+</a> <br>
+<a href="https://www.bromite.org">
+  <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
+</a>

-<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> <img src="https://www.bromite.org/license.svg" alt="GNU GPL v3" title="GNU VPL v3" />
+Bromite is a [Chromium](https://www.chromium.org/Home) fork with support for ad blocking and enhanced privacy.

-<img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
+Bromite is only available for Android Marshmallow (v6.0, API level 23) and above.

-Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.
-
-Bromite is only available for Android v4.4 and above.
-
-<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />
+<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).

@@ -23,38 +29,74 @@ Minimal UI changes are applied to help curbing the idea of "browser as an advert

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

-[&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)
+## &rarr; Support development with a donation

-<a href="bitcoin:bc1qmpyuqsvs3tz3uaysplmwjr33gg4rzu6cqweaq834ehc25vduxppqkrszel">BTC donations address</a>: `bc1qmpyuqsvs3tz3uaysplmwjr33gg4rzu6cqweaq834ehc25vduxppqkrszel`
+Patreon: https://www.patreon.com/csagan5

-ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
+<a href="bitcoin:bc1qlx7h0lj9z88g2xfeuwsrtfs77sxuhrxf2t28sw">BTC donations address</a>: `bc1qlx7h0lj9z88g2xfeuwsrtfs77sxuhrxf2t28sw`
+
+ETH donations address: `0x5d392F8FBf3465afe05B1Adc575e248D33B891F6`

 # Features

-* customizable adblock filters via user-provided URL
+* customizable adblock filters via user-provided URL (see https://www.bromite.org/custom-filters)
+* automatically updated adblock 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
+* always-visible cookies, javascript and ads site settings from address bar popup
 * remove Play integration binary blobs
 * use [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) on all architectures except x86
+* enable trivial auto var init
 * 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 (partial fix, see [this upstream issue](https://bugs.chromium.org/p/chromium/issues/detail?id=590714))
+* 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 and privacy sandbox by default
+* disable feeds
+* disable reporting of certificate errors
+* use pre-defined phone model for client hints and Javascript
+* allow forcing external links to open in incognito
+* disable AGSA by default
+* flag to enable Certificate Transparency
+* allow adding search engines from incognito mode
+* disable predictors
+* disable supervised users
+* disable safety check
+* disable capability to block `view-source:` URLs
+* disable `SegmentationPlatformFeature`, `OptimizationHints`, client hint headers
+* disable `AsyncDNS` by default
+* customize history expiration threshold
+* disable idle detection
+* HTTPS-only mode enabled by default
+* disable TLS resumption by default
+* partition DoH requests by top-frame NIK
+* strict site isolation and strict origin isolation

 ## Features not related to privacy
+* browser automatic updates, enabled by default
+* native Android autofill support
 * import/export bookmarks
+* bookmark all tabs from tabs regroup menu
 * 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 +106,21 @@ 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
+* sticky desktop mode setting
+* mobile/desktop user agent customization
+* accessibility preference to force tablet UI
+* use Alt+D to focus address bar
+* allow sharing to Bromite
+* UI for crash information collection
+* allow OpenSearch search engine detection in incognito
+* allow OpenSearch search engine detection with paths
+* keyboard dictionary hints in address bar
+* always allow `view-source:` URLs
+* allow moving navigation bar to bottom
+* add option to use home page as NTP

 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 +128,46 @@ 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`
+* `#offline-indicator-v2`
+
+New flags:
+
+* `#fingerprinting-canvas-image-data-noise`, `#fingerprinting-client-rects-noise` and `#fingerprinting-canvas-measuretext-noise`, enabled by default
+* `#incognito-screenshot`, disabled by default
+* `#max-connections-per-host`
+* `#resume-background-video`
+* `#ipv6-probing`
+* `#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`, can be used to disable opening any external app for any URL
+* `#enable-userscripts-log`, see https://github.com/bromite/bromite/wiki/UserScripts#flags
+* `#certificate-transparency-enabled`, enabled by default; see https://chromium.googlesource.com/chromium/src/+/master/net/docs/certificate-transparency.md
+* `#move-top-toolbar-to-bottom`, disabled by default
+* `#site-engagement`, enabled by default
+* `#offline-pages-auto-save`, disabled by default, allows auto-saving of pages when device goes offline
+* `#adaptive-button-in-top-toolbar-customization`, disabled by default, allows having a new tab or share button on the address bar
+
+### Site settings
+
+* webGL, disabled by default
+* images, enabled by default
+* Javascript JIT, disabled by default
+* timezone customization override
+* autoplay, disabled by default
+* webRTC, disabled by default

 # Privacy limitations

@@ -85,9 +179,11 @@ All built versions are available as [releases](https://github.com/bromite/bromit

 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+).
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK version 23+; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK23+).
 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 will automatically receive notifications about new updates (and be able to install them) via the auto updater functionality (enabled by default), 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,15 +212,26 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags

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

-The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).
+The 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: [bromite.gn_args](./build/bromite.gn_args).
 The patches are to be applied second the order specified in the `bromite_patches_list.txt` file (you can use `git am`).

+NOTE: no official support is provided for builds.
+
 ## How to build the filters

 See upstream documentation: https://github.com/chromium/chromium/blob/master/components/subresource_filter/FILTER_LIST_GENERATION.md

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

+# 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 +240,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 +249,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).
@@ -0,0 +1,64 @@
+<svg viewBox="0 0 1040 200" xmlns="http://www.w3.org/2000/svg">
+  <style>
+@namespace svg url(http://www.w3.org/2000/svg);
+
+svg {
+  font-family: Helvetica, Arial, sans-serif;
+  text-rendering: geometricPrecision;
+}
+svg|a:link, svg|a:visited {
+  cursor: pointer;
+}
+.flag-blue {
+  fill: #0057b7;
+}
+.flag-yellow {
+  fill: #ffd700;
+}
+.message {
+  fill: white;
+  font-size: 20px;
+}
+.call {
+  fill: black;
+  font-size: 32px;
+}
+.mobile-only {
+  display: none;
+}
+.arrow {
+  font-size: 24px;
+}
+@media (max-width: 770px) {
+  .message {
+    display: none;
+    font-size: 29px;
+  }
+  .mobile-only {
+    display: inherit;
+  }
+  .call {
+    font-size: 36px;
+  }
+}
+  </style>
+
+  <a href="https://stand-with-ukraine.pp.ua">
+    <rect x="0" y="0" width="100%" height="100%" class="flag-yellow"/>
+    <rect x="0" y="0" width="100%" height="110px" class="flag-blue"/>
+
+    <text x="0" y="25" class="message">
+      <tspan x="25" dy="1.15em">Russia has invaded Ukraine and already killed tens of thousands of civilians, with many more raped or tortured.</tspan>
+      <tspan x="25" dy="1.35em">The death toll keeps climbing. It's a <tspan font-weight="bold">genocide</tspan>. We need your help. Let's fight back against the Russian regime.</tspan>
+    </text>
+    <text x="0" y="25" class="message mobile-only">
+      <tspan x="25" dy=".7em">Russia has invaded Ukraine and already killed tens of thousands of civilians,</tspan>
+      <tspan x="25" dy="1.2em">with many more raped or tortured. It's a <tspan font-weight="bold">genocide</tspan>. We need your help.</tspan>
+    </text>
+
+    <text x="50%" y="78.5%" dominant-baseline="middle" text-anchor="middle" class="call">
+      Help Ukraine Now <tspan dominant-baseline="middle" class="arrow">➔</tspan>
+    </text>
+  </a>
+
+</svg>
@@ -0,0 +1 @@
+56775bdf8d12f9d3e1a99fcf1dde6a7417522963-
@@ -0,0 +1 @@
+109.0.5414.61
@@ -0,0 +1 @@
+1b133d62395a6ad11c65997a1c24acffb3f73d9e
@@ -1,38 +1,48 @@
 android_channel="stable"
 blink_symbol_level=1
+build_contextual_search=false
+build_with_tflite_lib=false
+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=false
+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
+system_webview_package_name="org.bromite.webview"
 target_os="android"
+treat_warnings_as_errors=true
+use_cfi_cast=true
 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_stable_package_name_for_trichrome=false
 use_sysroot=false
+webview_includes_weblayer=false
@@ -1,141 +1,204 @@
-Disable-third-party-cookies-by-default.patch
-Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
+Remove-EV-certificates.patch
+do-not-hide-.orig-files.patch
+Do-not-link-with-libatomic.patch
+do-not-add-suffix-to-package-name.patch
+exit-on-failure-of-inclusion.patch
+Disable-safe-browsing.patch
+Remove-signin-and-sync-integrations.patch
+Move-some-account-settings-back-to-privacy-settings.patch
+Remove-contextual-search-manager.patch
+kill-Vision.patch
+kill-Location-fall-back-to-system.patch
+kill-Auth.patch
+Remove-binary-blob-integrations.patch
+Remove-SMS-integration.patch
+Remove-price-shopping-commerce-integrations.patch
+Remove-voice-recognition-integration.patch
+Do-not-compile-QR-code-sharing.patch
+Timezone-customization.patch
+Revert-the-removal-of-an-option-to-block-autoplay.patch
+Add-support-for-ISupportHelpAndFeedback.patch
+JIT-site-settings.patch
+Site-setting-for-images.patch
+Content-settings-infrastructure.patch
+Add-webGL-site-setting.patch
+Add-webRTC-site-settings.patch
+Switch-to-fstack-protector-strong.patch
+Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
+Bromite-package-name.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
+disable-battery-status-updater.patch
 Battery-API-return-nothing.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
-Never-send-any-crash-upload-data.patch
-Hide-send-reports-checkbox.patch
+webRTC-do-not-expose-local-IP-addresses.patch
 Never-fetch-popular-sites.patch
 ungoogled-chromium-Disable-webRTC-log-uploader.patch
 ungoogled-chromium-Disable-untraceable-URLs.patch
 ungoogled-chromium-Disable-translate-integration.patch
-ungoogled-chromium-Disable-profile-avatar-downloading.patch
-ungoogled-chromium-Disable-intranet-redirect-detector.patch
-ungoogled-chromium-Disable-Google-host-detection.patch
-ungoogled-chromium-Disable-GCM.patch
+ungoogled-chromium-Disable-profile-avatar.patch
+ungoogled-chromium-Disable-intranet-detector.patch
+ungoogled-chromium-no-special-hosts-domains.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
-Disable-metrics-on-all-I-O-threads.patch
-Always-respect-async-dns-flag-regardless-of-SDK-version.patch
+AudioBuffer-AnalyserNode-fp-mitigations.patch
+Multiple-fingerprinting-mitigations.patch
 Add-flag-to-configure-maximum-connections-per-host.patch
-Add-site-settings-option-for-session-only-cookies.patch
-Add-bookmark-import-export-actions.patch
-Disable-promos-displayed-in-bookmarks-manager.patch
-Add-an-always-incognito-mode.patch
-Add-custom-tab-intents-privacy-option.patch
-Add-option-to-not-persist-tabs-across-sessions.patch
-Disable-fetching-of-all-field-trials.patch
-Disable-seed-based-field-trials.patch
-Disable-plugins-enumeration.patch
-net-cert-increase-default-key-length-for-newly-generated-RSA-keys.patch
-dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
-profile-resetter-do-not-tick-send-settings-by-default.patch
-browser-ui-disable-warning-about-missing-API-keys.patch
-autofill-disable-autofill-download-manager.patch
-first_run-deactivate-autoupdate-globally.patch
-translate-disable-fetching-of-translate-languages-from-server.patch
-kill-TOS-and-metrics-opt-out.patch
-kill-Translate.patch
-kill-Vision.patch
-kill-Location-fall-back-to-system.patch
-kill-Auth.patch
-Remove-dependency-on-com.google.android.gms.auth.patch
-kill-GCM.patch
-Remove-dependency-on-com.google.android.gcm.patch
-Remove-dependency-on-com.google.android.gms.gcm.patch
-Remove-dependency-on-com.google.android.play.patch
-Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
-Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
-Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
-Remove-dependency-on-com.google.android.gms.cast.patch
-Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
-Remove-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
-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
+Add-support-for-writing-URIs.patch
+Add-bookmark-import-export-actions.patch
+Bookmarks-select-all-menu-entry.patch
+Add-an-always-incognito-mode.patch
+Keep-flag-to-allow-screenshots-in-Incognito-mode.patch
+Add-option-to-not-persist-tabs-across-sessions.patch
+Add-a-proxy-configuration-page.patch
+Add-custom-tab-intents-privacy-option.patch
+Disable-FLoC-and-privacy-sandbox.patch
+History-number-of-days-privacy-setting.patch
+Disable-fetching-of-all-field-trials.patch
+Disable-plugins-enumeration.patch
+net-cert-increase-default-key-length.patch
+dns-send-IPv6-connectivity-probes-to-RIPE-DNS.patch
+Add-flag-to-disable-IPv6-probes.patch
+profile-resetter-disable-send-settings.patch
+Do-not-build-API-keys-infobar.patch
+autofill-miscellaneous.patch
+Enable-native-Android-autofill.patch
+first_run-deactivate-autoupdate-globally.patch
+translate-disable-fetching-of-languages-from-server.patch
+Offer-builtin-autocomplete-for-chrome-flags.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
-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-various-metrics.patch
+Enable-SPPI-for-devices-with-enough-memory.patch
+Enable-StrictOriginIsolation-and-SitePerProcess.patch
+Use-64-bit-WebView-processes.patch
+prefs-always-prompt-for-download-directory.patch
+Disable-offline-pages-in-CCT.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
+Bromite-subresource-adblocker.patch
+Bromite-auto-updater.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
+Increase-number-of-autocomplete-matches-to-10.patch
+Disable-requests-for-single-word-Omnibar-searches.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-improvements.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-autofill-assistant-by-default.patch
-Always-show-site-settings-for-cookies-javascript-and-ads.patch
-Do-not-enable-QUIC-by-default.patch
-Restore-enable-horizontal-tab-switcher-flag.patch
-Use-a-minimum-DoH-timeout-of-400ms.patch
+Disable-feeds-support-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-AImageReader-for-ARM64-P-and-ARM64-Q.patch
-Upstream-internal-DownloadCollectionBridge-code.patch
-Add-missing-android_provider.patch
+Guard-for-user-agent-reduction.patch
+AImageReader-CFI-crash-mitigations.patch
+Add-menu-item-to-view-source.patch
+Revert-removal-of-execution-context-address-space.patch
+Block-gateway-attacks-via-websockets.patch
+Enable-prefetch-privacy-changes-by-default.patch
+Disable-support-for-RAR-files-inspection.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
+Restore-Simplified-NTP-launch.patch
+Add-option-to-use-home-page-as-NTP.patch
+Disable-text-fragments-by-default.patch
+disable-WebView-variations-support.patch
+Enable-network-isolation-features.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
+Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
+Add-option-to-force-tablet-UI.patch
+Add-Alt-D-hotkey-to-focus-address-bar.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
+Revert-Delete-block-external-form-redirects.patch
+Add-flag-to-disable-external-intent-requests.patch
+Enable-share-intent.patch
+Logcat-crash-reports-UI.patch
+Add-flag-to-disable-vibration.patch
+mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
+Client-hints-overrides.patch
+Disable-AGSA-by-default.patch
+Allow-building-without-enable_reporting.patch
+Disable-lock-icon-in-address-bar-by-default.patch
+Experimental-user-scripts-support.patch
+Keep-empty-tabs-between-sessions.patch
+Disable-third-party-origin-trials.patch
+Never-use-HTTP-probes-for-connection-detection.patch
+Disable-Accessibility-service-by-default.patch
+Disable-conversion-measurement-api.patch
+Restore-offline-indicator-v2-flag.patch
+Re-introduce-override_build_timestamp.patch
+enable-ftrivial-auto-var-init-zero.patch
+disable-appending-variations-header.patch
+Disable-idle-detection.patch
+Allow-building-without-supervised-users.patch
+Disable-minidump-upload-scheduling.patch
+Revert-Permit-blocking-of-view-source.patch
+Disable-safety-check.patch
+Disable-all-predictors-code.patch
+OpenSearch-miscellaneous.patch
+Update-i18n-zh_CN-support.patch
+Add-flag-for-save-data-header.patch
+Disable-UA-full-version.patch
+Dictionary-suggestions-for-the-Omnibox.patch
+Disable-AsyncDNS-by-default.patch
+Add-lifetime-options-for-permissions.patch
+Disable-crash-reporting.patch
+Samsung-Note-9-SDK27-crazylinker-workaround.patch
+Disable-TLS-resumption.patch
+Remove-mremap-from-seccomp-baseline-policy.patch
+Move-navigation-bar-to-bottom.patch
+Welcome-screen.patch
+Add-site-engagement-flag.patch
+Enable-Certificate-Transparency.patch
+Invalidate-components-public-key.patch
+Improve-plain-text-rendering-on-mobile.patch
+Remove-segmentation-platform.patch
+Follow-only-system-dark-mode.patch
+Remove-window-name-on-cross-origin-navigation.patch
+Remove-preload-of-com.google.android.gms.fonts.patch
+Partition-Blink-memory-cache.patch
+Remove-navigator.connection-info.patch
+Disable-PrivacyGuide.patch
+sharing-hub-always-use-visible-URL.patch
+Re-introduce-kWebAuthCable.patch
+Enable-HEVC-by-default.patch
+Partition-blobs-by-top-frame-URL.patch
+Override-Navigator-Language.patch
+Disable-add-to-home-screen-prompt.patch
+Remove-HTTP-referrals-in-cross-origin-navigation.patch
+Enable-ECH-by-default.patch
+Disable-StartSurface-feature.patch
+Clamp-time-resolution-in-requestAnimationFrame.patch
+Enable-PermuteTLSExtensions-by-default.patch
+Enable-third-party-storage-partitioning.patch
+Restore-adaptive-button-in-top-toolbar-customization.patch
 Automated-domain-substitution.patch
@@ -0,0 +1,48 @@
+android_channel="stable"
+blink_symbol_level=1
+build_contextual_search=false
+build_with_tflite_lib=false
+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_gvr_services=false
+enable_hangout_services_extension=false
+enable_iterator_debugging=false
+enable_mdns=false
+enable_mse_mpeg2ts_stream_parser=true
+enable_nacl=false
+enable_platform_dolby_vision=true
+enable_platform_hevc=true
+enable_remoting=false
+enable_reporting=true
+enable_vr=false
+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=2
+symbol_level=1
+system_webview_package_name="com.android.webview"
+target_os="android"
+treat_warnings_as_errors=true
+use_cfi_cast=true
+use_debug_fission=true
+use_errorprone_java_compiler=false
+use_gnome_keyring=false
+use_official_google_api_keys=false
+use_rtti=false
+use_stable_package_name_for_trichrome=false
+use_sysroot=false
+webview_includes_weblayer=false
@@ -1,6 +1,10 @@
-Revert-Remove-pre-unified-consent-code-in-sync-and-privacy-directory.patch
-AV1-codec-support.patch
+exit-on-failure-of-inclusion.patch
+Reintroduce-override_build_timestamp.patch
+do-not-hide-.orig-files.patch
+Do-not-link-with-libatomic.patch
+do-not-add-suffix-to-package-name.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
+enable-ftrivial-auto-var-init-zero.patch
+Disable-feeds-support-by-default.patch
+Chromium-package-name.patch
@@ -0,0 +1,650 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 08:14:13 +0000
+Subject: 109 Move navigation bar to bottom fixup
+
+---
+ .../features/start_surface/StartSurfaceMediator.java      | 2 +-
+ .../tasks/tab_management/TabGroupUiToolbarView.java       | 2 +-
+ .../browser/tasks/tab_management/TabListCoordinator.java  | 2 +-
+ .../browser/tasks/tab_management/TabListRecyclerView.java | 6 +++---
+ .../browser/tasks/tab_management/TabSwitcherMediator.java | 8 ++++----
+ .../settings/ChromeAccessibilitySettingsDelegate.java     | 2 +-
+ .../org/chromium/chrome/browser/app/ChromeActivity.java   | 2 +-
+ .../chrome/browser/compositor/CompositorViewHolder.java   | 2 +-
+ .../browser/compositor/layouts/LayoutManagerChrome.java   | 2 +-
+ .../browser/compositor/layouts/ToolbarSwipeLayout.java    | 4 ++--
+ .../overlays/strip/StripLayoutHelperManager.java          | 2 +-
+ .../compositor/scene_layer/StaticTabSceneLayer.java       | 2 +-
+ .../browser/compositor/scene_layer/TabListSceneLayer.java | 4 ++--
+ .../compositor/scene_layer/TabStripSceneLayer.java        | 2 +-
+ .../chrome/browser/findinpage/FindToolbarTablet.java      | 2 +-
+ .../chrome/browser/fullscreen/BrowserControlsManager.java | 4 ++--
+ .../browser/messages/MessageContainerCoordinator.java     | 4 ++--
+ .../src/org/chromium/chrome/browser/ntp/NewTabPage.java   | 2 +-
+ .../org/chromium/chrome/browser/ntp/RecentTabsPage.java   | 6 +++---
+ .../chrome/browser/searchwidget/SearchActivity.java       | 2 +-
+ .../status_indicator/StatusIndicatorCoordinator.java      | 2 +-
+ .../status_indicator/StatusIndicatorSceneLayer.java       | 2 +-
+ .../chromium/chrome/browser/toolbar/ToolbarManager.java   | 4 ++--
+ .../org/chromium/chrome/browser/ui/BottomContainer.java   | 6 +++---
+ .../browser/ui/system/StatusBarColorController.java       | 2 +-
+ .../browser_controls/BrowserControlsMarginSupplier.java   | 2 +-
+ .../org/chromium/chrome/browser/ui/appmenu/AppMenu.java   | 8 ++++----
+ .../chrome/browser/ui/appmenu/AppMenuHandlerImpl.java     | 2 +-
+ .../chrome/browser/omnibox/UrlBarCoordinator.java         | 2 +-
+ .../omnibox/suggestions/AutocompleteCoordinator.java      | 2 +-
+ .../browser/omnibox/suggestions/AutocompleteMediator.java | 2 +-
+ .../omnibox/suggestions/OmniboxSuggestionsDropdown.java   | 4 ++--
+ .../browser/toolbar/LocationBarFocusScrimHandler.java     | 2 +-
+ .../browser/toolbar/bottom/BottomControlsMediator.java    | 2 +-
+ .../toolbar/bottom/ScrollingBottomViewSceneLayer.java     | 2 +-
+ .../browser/toolbar/top/ToolbarControlContainer.java      | 2 +-
+ .../chrome/browser/toolbar/top/TopToolbarSceneLayer.java  | 2 +-
+ 37 files changed, 55 insertions(+), 55 deletions(-)
+
+diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+@@ -1134,7 +1134,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+     }
+ 
+     private void setTopMargin(int topMargin) {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             topMargin = 0;
+         mPropertyModel.set(TOP_MARGIN, topMargin);
+     }
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java
+@@ -177,7 +177,7 @@ public class TabGroupUiToolbarView extends FrameLayout {
+     }
+ 
+     void setPrimaryColorAndApplyTint(int color) {
+-        if (!CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             return;
+ 
+         // change the background color of the bottom bar if the top toolbar is below
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java
+@@ -324,7 +324,7 @@ public class TabListCoordinator
+             if (mMode == TabListMode.GRID) {
+                 GridLayoutManager gridLayoutManager =
+                         new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
+-                if (titleProvider != null && CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                if (titleProvider != null && ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                     gridLayoutManager =
+                         new GridLayoutManagerDockBottom(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
+                     ((GridLayoutManagerDockBottom)gridLayoutManager)
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListRecyclerView.java
+@@ -232,7 +232,7 @@ class TabListRecyclerView
+     }
+ 
+     void setShadowVisibility(boolean shouldShowShadow) {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()
+                 && mIsVisible) {
+             // always show shadow
+             shouldShowShadow = true;
+@@ -250,7 +250,7 @@ class TabListRecyclerView
+                 // Add shadow for grid tab switcher.
+                 FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+                         LayoutParams.MATCH_PARENT, shadowHeight,
+-                        (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) ?
+                        (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled() ?
+                             Gravity.BOTTOM :
+                             Gravity.TOP));
+                 mShadowImageView.setLayoutParams(params);
+@@ -279,7 +279,7 @@ class TabListRecyclerView
+ 
+     void setShadowTopOffset(int shadowTopOffset) {
+         mShadowTopOffset = shadowTopOffset;
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // invert the offset since Gravity is set to BOTTOM
+             mShadowTopOffset = -mShadowTopOffset;
+         }
+diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
+--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
+@@ -461,7 +461,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+             updateTopControlsProperties();
+             mContainerViewModel.set(
+                     BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 mContainerViewModel.set(
+                     BOTTOM_CONTROLS_HEIGHT, mContainerViewModel.get(BOTTOM_CONTROLS_HEIGHT) +
+                         mBrowserControlsStateProvider.getContentOffset());
+@@ -471,7 +471,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+         if (mMode == TabListMode.GRID) {
+             mContainerViewModel.set(BOTTOM_PADDING,
+                     (int) context.getResources().getDimension(R.dimen.tab_grid_bottom_padding));
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 // adjust the bottom margin so as not to cover the top toolbar at the bottom
+                 mContainerViewModel.set(
+                     BOTTOM_PADDING, mContainerViewModel.get(BOTTOM_PADDING) +
+@@ -604,7 +604,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+         final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
+ 
+         mContainerViewModel.set(TOP_MARGIN, contentOffset);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // move the view up since the toolbar is at the bottom
+             mContainerViewModel.set(TOP_MARGIN, 0);
+         }
+@@ -764,7 +764,7 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+     private void setInitialScrollIndexOffset() {
+         int offset = mMode == TabListMode.CAROUSEL ? INITIAL_SCROLL_INDEX_OFFSET_CAROUSEL
+                                                    : INITIAL_SCROLL_INDEX_OFFSET_GTS;
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             offset = 0;
+         }
+         int initialPosition = Math.max(
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+@@ -104,7 +104,7 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+     private static class MoveTopToolbarToBottomDelegate implements BooleanPreferenceDelegate {
+         @Override
+         public boolean isEnabled() {
+-            return CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM);
+            return ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled();
+         }
+ 
+         @Override
+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
+@@ -764,7 +764,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+                     ImageView shadowImage = findViewById(R.id.toolbar_hairline);
+                     if (shadowImage != null) {
+                         // Invert the shadown if the top toolbar is at the bottom
+-                        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                             ViewGroup.MarginLayoutParams marginParams = (ViewGroup.MarginLayoutParams)shadowImage.getLayoutParams();
+                             marginParams.setMargins(marginParams.leftMargin, 0,
+                                 marginParams.rightMargin, marginParams.bottomMargin);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+@@ -319,7 +319,7 @@ public class CompositorViewHolder extends FrameLayout
+                         WebContents webContents = mTabVisible.getWebContents();
+                         if (webContents == null) return;
+                         EventForwarder forwarder = webContents.getEventForwarder();
+-                        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                             // no need to adjust the touch offsets, since the content view is never moved
+                             top = 0;
+                         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
+@@ -213,7 +213,7 @@ public class LayoutManagerChrome
+     @Override
+     public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) {
+         boolean move_top_toolbar =
+-            CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM);
+            ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled();
+         return new ToolbarSwipeHandler(supportSwipeDown && !move_top_toolbar,
+                                        supportSwipeDown && move_top_toolbar);
+     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ToolbarSwipeLayout.java
+@@ -411,7 +411,7 @@ public class ToolbarSwipeLayout extends Layout {
+                 mLeftToolbarOverlay.setXOffset(leftX * dpToPx);
+             }
+             mLeftTab.setX(leftX);
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 mLeftTab.setY(0);
+             } else {
+                 mLeftTab.setY(mBrowserControlsStateProvider.getContentOffset() / dpToPx);
+@@ -428,7 +428,7 @@ public class ToolbarSwipeLayout extends Layout {
+                 mRightToolbarOverlay.setXOffset(rightX * dpToPx);
+             }
+             mRightTab.setX(rightX);
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 mRightTab.setY(0);
+             } else {
+                 mRightTab.setY(mBrowserControlsStateProvider.getContentOffset() / dpToPx);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+@@ -421,7 +421,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
+                 mWidth, mHeight, orientationChanged, LayoutManagerImpl.time());
+ 
+         float top = 0;
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) &&
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled() &&
+             mBrowserControlsManagerSupplier.get() != null) {
+             // move the rectangle to grab the touch events as the tab list (in tablet mode)
+             // is down and is following the toolbar offset as it moves.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java
+@@ -48,7 +48,7 @@ public class StaticTabSceneLayer extends SceneLayer {
+         float x = model.get(LayoutTab.RENDER_X) * LayoutTab.sDpToPx;
+         float y = model.get(LayoutTab.CONTENT_OFFSET)
+                 + model.get(LayoutTab.RENDER_Y) * LayoutTab.sDpToPx;
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // the page content window never moves, it is fixed at the top
+             y = 0;
+         }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
+@@ -86,7 +86,7 @@ public class TabListSceneLayer extends SceneLayer {
+ 
+         TabListSceneLayerJni.get().beginBuildingFrame(mNativePtr, TabListSceneLayer.this);
+ 
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // the tabs list content window is fixed at the top, where the top toolbar used to be
+             viewport.top = 0;
+             backgroundTopOffset = 0;
+@@ -126,7 +126,7 @@ public class TabListSceneLayer extends SceneLayer {
+                 contentOffset = browserControls.getContentOffset();
+             }
+ 
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 toolbarYOffset = 0;
+                 contentOffset = 0;
+             }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+@@ -84,7 +84,7 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
+         if (mNativePtr == 0) return;
+ 
+         boolean visible = yOffset > -layoutHelper.getHeight();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+            // the list of open tabs (in tablet mode) is moved down, above the top
+            // toolbar which is also below.
+            // values are in pixel.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java
+@@ -169,7 +169,7 @@ public class FindToolbarTablet extends FindToolbar {
+ 
+         if (show && getVisibility() != View.VISIBLE && mCurrentAnimation != mAnimationEnter) {
+             View anchorView = getRootView().findViewById(R.id.toolbar);
+-            if (!CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams();
+                 lp.topMargin = anchorView.getBottom() - mYInsetPx;
+                 setLayoutParams(lp);
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
+@@ -400,7 +400,7 @@ public class BrowserControlsManager
+ 
+     @Override
+     public int getTopControlsHeightRealOffset() {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             return 0;
+         else
+             return mTopControlContainerHeight;
+@@ -472,7 +472,7 @@ public class BrowserControlsManager
+ 
+     @Override
+     public float getTopVisibleContentOffset() {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             return 0;
+         return getTopControlsHeight() + getTopControlOffset();
+     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/messages/MessageContainerCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/messages/MessageContainerCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/messages/MessageContainerCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/messages/MessageContainerCoordinator.java
+@@ -64,7 +64,7 @@ public class MessageContainerCoordinator implements BrowserControlsStateProvider
+         }
+         CoordinatorLayout.LayoutParams params =
+                 (CoordinatorLayout.LayoutParams) mContainer.getLayoutParams();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             params.gravity = Gravity.START | Gravity.BOTTOM;
+             params.bottomMargin = getContainerTopOffset();
+         } else {
+@@ -129,7 +129,7 @@ public class MessageContainerCoordinator implements BrowserControlsStateProvider
+ 
+     /** @return Offset of the message container from the top of the screen. */
+     private int getContainerTopOffset() {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             return mControlsManager.getContentOffset()
+                      + (mControlsManager.getBottomControlsHeight() - mControlsManager.getBottomControlOffset())
+                      + mContainer.getMessageShadowTopMargin();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+@@ -565,7 +565,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
+ 
+         int bottomMargin = mBrowserControlsStateProvider.getBottomControlsHeight()
+                 - mBrowserControlsStateProvider.getBottomControlOffset();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // move the margin of the new tab page up if the top toolbar is at the bottom
+             bottomMargin += mBrowserControlsStateProvider.getTopControlsHeight();
+             topMargin = -mBrowserControlsStateProvider.getTopControlsHeight();
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java
+@@ -91,7 +91,7 @@ public class RecentTabsPage
+         mView.addOnAttachStateChangeListener(this);
+ 
+         if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) ||
+-                CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             mBrowserControlsStateProvider = browserControlsStateProvider;
+             mBrowserControlsStateProvider.addObserver(this);
+             onBottomControlsHeightChanged(mBrowserControlsStateProvider.getBottomControlsHeight(),
+@@ -289,7 +289,7 @@ public class RecentTabsPage
+ 
+         // If the content offset is different from the margin, we use translationY to position the
+         // view in line with the content offset.
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             topMargin = 0;
+             recentTabsRoot.setTranslationY(0);
+         } else {
+@@ -297,7 +297,7 @@ public class RecentTabsPage
+         }
+ 
+         int bottomMargin = mBrowserControlsStateProvider.getBottomControlsHeight();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             bottomMargin += mBrowserControlsStateProvider.getTopControlsHeight();
+         }
+         if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+@@ -194,7 +194,7 @@ public class SearchActivity extends AsyncInitializationActivity
+         mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
+                 R.id.search_location_bar);
+         mAnchorView = mContentView.findViewById(R.id.toolbar);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams)
+                 mAnchorView.getLayoutParams();
+             layoutParams.gravity = Gravity.START | Gravity.BOTTOM;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorCoordinator.java
+@@ -179,7 +179,7 @@ public class StatusIndicatorCoordinator {
+     private void initialize() {
+         final ViewStub stub = mActivity.findViewById(R.id.status_indicator_stub);
+         final ViewResourceFrameLayout root = (ViewResourceFrameLayout) stub.inflate();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // status messages (such as the offline indicator) are docked at the bottom
+             CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams)root.getLayoutParams();
+             layoutParams.gravity = Gravity.START | Gravity.BOTTOM;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java
+@@ -80,7 +80,7 @@ class StatusIndicatorSceneLayer extends SceneOverlayLayer implements SceneOverla
+     public SceneOverlayLayer getUpdatedSceneOverlayTree(
+             RectF viewport, RectF visibleViewport, ResourceManager resourceManager, float yOffset) {
+         int offset = mBrowserControlsStateProvider.getTopControlsMinHeightOffset();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             offset = (int)viewport.bottom - offset;
+         }
+         StatusIndicatorSceneLayerJni.get().updateStatusIndicatorLayer(
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+@@ -1318,7 +1318,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+ 
+     private void MoveBottomBarOverTopBar() {
+         if (bottomRoot != null &&
+-                CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // move up the container view of the ui
+             // below there is the toolbar
+             bottomRoot.setTranslationY(-mBrowserControlsSizer.getTopControlsHeight());
+@@ -2123,7 +2123,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+     private void setControlContainerTopMargin(int margin) {
+         final ViewGroup.MarginLayoutParams layoutParams =
+                 ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             if (layoutParams.bottomMargin == margin) {
+                 return;
+             }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java
+@@ -66,13 +66,13 @@ public class BottomContainer
+ 
+     @Override
+     public void onTopControlsHeightChanged(int topControlsHeight, int topControlsMinHeight) {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             setTranslationY(mBaseYOffset);
+     }
+ 
+     @Override
+     public void onAndroidVisibilityChanged(int visibility) {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             setTranslationY(mBaseYOffset);
+     }
+ 
+@@ -80,7 +80,7 @@ public class BottomContainer
+     public void setTranslationY(float y) {
+         mBaseYOffset = y;
+ 
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // the snackbar container is moved up because there is the top toolbar at the bottom
+             mBaseYOffset = -(mBrowserControlsStateProvider.getTopControlsHeight()
+                              + mBrowserControlsStateProvider.getTopControlOffset());
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
+@@ -428,7 +428,7 @@ public class StatusBarColorController
+         boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
+         ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
+         ApiCompatibilityUtils.setStatusBarColor(mWindow, color);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) &&
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled() &&
+                 Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+             UiUtils.setNavigationBarIconColor(mWindow.getDecorView().getRootView(),
+                 needsDarkStatusBarIcons);
+diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java
+--- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java
+++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserControlsMarginSupplier.java
+@@ -54,7 +54,7 @@ public class BrowserControlsMarginSupplier extends ObservableSupplierImpl<Rect>
+                 + mBrowserControlsStateProvider.getTopControlOffset();
+         int bottomMargin = mBrowserControlsStateProvider.getBottomControlsHeight()
+                 - mBrowserControlsStateProvider.getBottomControlOffset();
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             bottomMargin += topMargin;
+             topMargin = 0;
+         }
+diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
+--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
+@@ -265,7 +265,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+         }
+ 
+         mListView = (ListView) contentView.findViewById(R.id.app_menu_list);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // always scroll to the bottom to show new items
+             mListView.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
+             // fill content starting from the bottom of the view
+@@ -310,7 +310,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+         if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) {
+             mPopup.setHeight(visibleDisplayFrame.height());
+         }
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // due to some unknown behaviour, the popup must be resized to
+             // allow selection without leaving touch
+             mPopup.setHeight(popupHeight-1);
+@@ -362,7 +362,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+         int anchorViewX = tempLocation[0];
+         int anchorViewY = tempLocation[1];
+ 
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // moves the view offset up by the height of the popup
+             anchorViewY -= popupHeight;
+             // fix it if it goes offscreen
+@@ -560,7 +560,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
+         }
+         int availableScreenSpace = Math.max(
+                 anchorViewY, appDimensions.height() - anchorViewY - anchorViewImpactHeight);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // use all available space
+             availableScreenSpace = appDimensions.height() - anchorViewImpactHeight;
+             if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N) {
+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
+@@ -184,7 +184,7 @@ class AppMenuHandlerImpl
+         }),
+                 this);
+ 
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // reverses the order of items in the menu
+             ModelList modelListReversed = new ModelList();
+             for (int i = 0; i < modelList.size(); i++) {
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
+@@ -239,7 +239,7 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
+         // to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and
+         // receive a second request to hide the keyboard instantly.
+         if (showKeyboard) {
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 // probably due to an android bug, fix the size rather than pan the view.
+                 // with the pan the bar may not always follow the focus if not at the first input by the user
+                 setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE, /* delay */ false);
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
+@@ -236,7 +236,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
+                 ViewGroup container = (ViewGroup) ((ViewStub) mParent.getRootView().findViewById(
+                                                            R.id.omnibox_results_container_stub))
+                                               .inflate();
+-                if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                     // make margins works
+                     dropdown.getViewGroup().setClipToPadding(true);
+                     container.bringToFront();
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
+@@ -1013,7 +1013,7 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
+     @Override
+     public void onSuggestionDropdownScroll() {
+         mSuggestionsListScrolled = true;
+-        if (!CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             mDelegate.setKeyboardVisibility(false, false);
+         }
+     }
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+@@ -266,7 +266,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+         final Resources resources = context.getResources();
+         int paddingBottom =
+                 resources.getDimensionPixelOffset(R.dimen.omnibox_suggestion_list_padding_bottom);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // reverse the layout so that the items are at the bottom (in reverse order)
+             // and anchored to the bottom edge
+             mLayoutScrollListener.setReverseLayout(true);
+@@ -496,7 +496,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+     }
+ 
+     private int calculateAnchorBottomRelativeToContent() {
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM))
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+             return 0;
+         View contentView =
+                 mEmbedder.getAnchorView().getRootView().findViewById(android.R.id.content);
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarFocusScrimHandler.java
+@@ -58,7 +58,7 @@ public class LocationBarFocusScrimHandler implements UrlFocusChangeListener {
+ 
+         Resources resources = context.getResources();
+         int topMargin = resources.getDimensionPixelSize(R.dimen.tab_strip_height);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // since the top bar is at the bottom, we need to cover the whole page
+             topMargin = 0;
+         }
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator.java
+@@ -105,7 +105,7 @@ class BottomControlsMediator implements BrowserControlsStateProvider.Observer,
+     void setBottomControlsVisible(boolean visible) {
+         if (visible == true
+                 && mIsBottomControlsVisible == false
+-                && CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+                && ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // always show the toolbar if the bottom controls are visible, so as not to leave the hole below.
+             mBrowserControlsSizer.getBrowserVisibilityDelegate().showControlsTransient();
+         }
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
+@@ -127,7 +127,7 @@ public class ScrollingBottomViewSceneLayer extends SceneOverlayLayer implements
+         boolean isShadowVisible = mBottomView.getVisibility() != View.VISIBLE;
+ 
+         float offsetPy = viewport.height() + mCurrentYOffsetPx;
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // fix the offset of the fake bottom controls, used only for animations
+             offsetPy -= (mBottomView.getHeight() - mCurrentYOffsetPx + mTopControlsMinHeightOffset);
+         }
+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
+     @Override
+     public void initWithToolbar(int toolbarLayoutId) {
+         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
+-            if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+            if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+                 // the top toolbar is docked at the bottom
+                 CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams)getLayoutParams();
+                 layoutParams.gravity = Gravity.START | Gravity.BOTTOM;
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java
+@@ -41,7 +41,7 @@ class TopToolbarSceneLayer extends SceneOverlayLayer {
+     private void pushProperties(PropertyModel model) {
+         if (mResourceManagerSupplier.get() == null) return;
+         float offsetY = model.get(TopToolbarOverlayProperties.Y_OFFSET);
+-        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+        if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
+             // fix the offset of the fake top controls, used only for animations
+             offsetY = model.get(TopToolbarOverlayProperties.VIEWPORT_HEIGHT) -
+                       model.get(TopToolbarOverlayProperties.TOOLBAR_HEIGHT) -
+--
+2.25.1
@@ -0,0 +1,53 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:48:07 +0000
+Subject: Add a proxy configuration page (add fixup)
+
+---
+ chrome/browser/resources/proxy_config.js   | 13 ++++++++++++-
+ chrome/browser/ui/webui/proxy_config_ui.cc |  2 +-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources/proxy_config.js
+--- a/chrome/browser/resources/proxy_config.js
+++ b/chrome/browser/resources/proxy_config.js
+@@ -16,7 +16,6 @@
+ */
+ 
+ import {$} from 'chrome://resources/js/util.js';
+-import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+ 
+ /**
+  * Main entry point called once the page has loaded.
+@@ -60,6 +59,18 @@ var ProxyConfigView = (function() {
+   var kIdFtpProxies = 'ftp-proxies';
+   var kIdFallbackProxies = 'fallback-proxies';
+ 
+  /**
+  * Adds a {@code getInstance} static method that always return the same
+  * instance object.
+  * @param {!Function} ctor The constructor for the class to add the static
+  *     method to.
+  */
+  function addSingletonGetter(ctor) {
+    ctor.getInstance = function() {
+      return ctor.instance_ || (ctor.instance_ = new ctor());
+    };
+  }
+
+   /**
+    * @constructor
+    */
+diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
+--- a/chrome/browser/ui/webui/proxy_config_ui.cc
+++ b/chrome/browser/ui/webui/proxy_config_ui.cc
+@@ -164,7 +164,7 @@ void ProxyConfigMessageHandler::OnProxyConfigChanged(
+ 
+   // call Javascript function
+   web_ui()->CallJavascriptFunctionUnsafe("ProxyConfigView.getInstance().onProxyConfigChanged",
+-                                         *state.CreateDeepCopy());
+                                         state.Clone());
+ }
+ 
+ const std::string omitDirect(const std::string pacString) {
+--
+2.25.1
@@ -0,0 +1,26 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:37:12 +0000
+Subject: Add webGL site setting (add fixup)
+
+---
+ .../core/browser/content_settings_registry.cc               | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -636,9 +636,9 @@ void ContentSettingsRegistry::Init() {
+ 
+   Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK,
+            WebsiteSettingsInfo::SYNCABLE,
+-           AllowlistedSchemes(),
+-           ValidSettings(CONTENT_SETTING_ALLOW,
+-                         CONTENT_SETTING_BLOCK),
+           /*allowlisted_schemes=*/{},
+           /*valid_settings=*/{CONTENT_SETTING_ALLOW,
+                               CONTENT_SETTING_BLOCK},
+            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+            WebsiteSettingsRegistry::PLATFORM_ANDROID,
+            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+--
+2.25.1
@@ -0,0 +1,26 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:37:41 +0000
+Subject: Add webRTC site settings (add fixup)
+
+---
+ .../core/browser/content_settings_registry.cc               | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -650,9 +650,9 @@ void ContentSettingsRegistry::Init() {
+ 
+   Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK,
+            WebsiteSettingsInfo::SYNCABLE,
+-           AllowlistedSchemes(),
+-           ValidSettings(CONTENT_SETTING_ALLOW,
+-                         CONTENT_SETTING_BLOCK),
+           /*allowlisted_schemes=*/{},
+           /*valid_settings=*/{CONTENT_SETTING_ALLOW,
+                               CONTENT_SETTING_BLOCK},
+            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+            WebsiteSettingsRegistry::PLATFORM_ANDROID,
+            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+--
+2.25.1
@@ -0,0 +1,24 @@
+From: Your Name <you@example.com>
+Date: Sun, 18 Dec 2022 16:38:48 +0000
+Subject: Client hints overrides (add fixup)
+
+---
+ .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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
+@@ -2832,8 +2832,8 @@
+       public: true,
+     },
+     {
+-      name: "UserAgentClientHint",
+-      status: "stable",
+      name: "UserAgentClientHint",  // always disabled
+      status: "experimental",       // in bromite
+       base_feature: "UserAgentClientHint",
+     },
+     {
+--
+2.25.1
@@ -0,0 +1,29 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:35:28 +0000
+Subject: Disable all predictors code (add fixup)
+
+---
+ components/optimization_guide/core/BUILD.gn | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn
+--- a/components/optimization_guide/core/BUILD.gn
+++ b/components/optimization_guide/core/BUILD.gn
+@@ -77,12 +77,14 @@ static_library("model_executor") {
+   }
+   deps = [
+     ":features",
+-    ":machine_learning",
+     "//base",
+     "//components/optimization_guide/proto:optimization_guide_proto",
+     "//net",
+     "//url",
+   ]
+  if (build_with_tflite_lib) {
+    deps += [ ":machine_learning", ]
+  }
+ }
+ 
+ mojom("interfaces") {
+--
+2.25.1
@@ -0,0 +1,48 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:33:47 +0000
+Subject: Disable conversion measurement api (add fixup)
+
+---
+ .../attribution_report_network_sender.cc                  | 8 ++++++--
+ content/renderer/render_thread_impl.cc                    | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
+--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
+++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
+@@ -76,6 +76,9 @@ void AttributionReportNetworkSender::SendReport(AttributionDebugReport report) {
+ void AttributionReportNetworkSender::SendReport(GURL url,
+                                                 base::ValueView report_body,
+                                                 UrlLoaderCallback callback) {
+  // this is never called on Bromite but nothing would be sent if it were
+  if ((true)) return;
+
+   auto resource_request = std::make_unique<network::ResourceRequest>();
+   resource_request->url = std::move(url);
+   resource_request->method = net::HttpRequestHeaders::kPostMethod;
+@@ -132,8 +135,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
+                    network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED;
+   simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode);
+ 
+-  // this is never called on Bromite but nothing would be sent if it were
+-  OnReportSent(std::move(it), report, is_debug_report, std::move(sent_callback), nullptr);
+  simple_url_loader_ptr->DownloadHeadersOnly(
+      url_loader_factory_.get(),
+      base::BindOnce(std::move(callback), std::move(it)));
+ }
+ 
+ void AttributionReportNetworkSender::OnReportSent(
+diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
+--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
+@@ -1823,7 +1823,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() {
+ 
+ void RenderThreadImpl::SetOsSupportForAttributionReporting(
+     blink::mojom::AttributionOsSupport attribution_os_support) {
+-  attribution_os_support_ = attribution_os_support;
+  attribution_os_support_ = blink::mojom::AttributionOsSupport::kDisabled;
+ }
+ 
+ }  // namespace content
+--
+2.25.1
@@ -0,0 +1,74 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:34:41 +0000
+Subject: Disable safe browsing (add fixup)
+
+---
+ .../chrome_file_system_access_permission_context.cc           | 4 +++-
+ chrome/browser/ui/android/strings/android_chrome_strings.grd  | 3 +++
+ chrome/browser/ui/webui/interstitials/interstitial_ui.cc      | 4 ----
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+@@ -115,6 +115,7 @@ const char kPathKey[] = "path";
+ const char kPathTypeKey[] = "path-type";
+ const char kTimestampKey[] = "timestamp";
+ 
+#if defined(FULL_SAFE_BROWSING)
+ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
+     content::GlobalRenderFrameHostId frame_id,
+     const url::Origin& origin,
+@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
+       origin, handle_type, std::move(callback), web_contents);
+ }
+ 
+-#if defined(FULL_SAFE_BROWSING)
+ void ShowFileSystemAccessDangerousFileDialogOnUIThread(
+     content::GlobalRenderFrameHostId frame_id,
+     const url::Origin& origin,
+@@ -431,6 +431,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
+                                    : kPermissionReadableKey;
+ }
+ 
+#if defined(FULL_SAFE_BROWSING)
+ bool FileHasDangerousExtension(const url::Origin& origin,
+                                const base::FilePath& path,
+                                Profile* profile) {
+@@ -442,6 +443,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
+   return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
+          danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
+ }
+#endif
+ 
+ }  // namespace
+ 
+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
+@@ -467,6 +467,9 @@ CHAR_LIMIT guidelines:
+       <message name="IDS_PRELOAD_PAGES_EXTENDED_PRELOADING_BULLET_FOUR" desc="Fourth bullet point under the Preload Pages extended preloading mode. Informs the user about what the extended preloading setting does.">
+         Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account.
+       </message>
+      <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
+        Help improve Chrome\u2019s features and performance
+      </message>
+ 
+       <!-- Metrics settings -->
+       <message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
+diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+@@ -518,10 +518,6 @@ void InterstitialHTMLSource::StartDataRequest(
+     interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
+   } else if (path_without_query == "/blocked-interception") {
+     interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
+-  } else if (path_without_query == "/enterprise-block") {
+-    interstitial_delegate = CreateEnterpriseBlockPage(web_contents);
+-  } else if (path_without_query == "/enterprise-warn") {
+-    interstitial_delegate = CreateEnterpriseWarnPage(web_contents);
+   } else if (path_without_query == "/clock") {
+     interstitial_delegate = CreateBadClockBlockingPage(web_contents);
+   } else if (path_without_query == "/lookalike") {
+--
+2.25.1
@@ -0,0 +1,53 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:26:25 +0000
+Subject: Remove binary blob integrations (add fixup)
+
+---
+ chrome/android/java/AndroidManifest.xml                   | 2 ++
+ chrome/browser/privacy/BUILD.gn                           | 1 +
+ .../browser/ui/signin/fre/SigninFirstRunMediator.java     | 8 ++------
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
+--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
+@@ -751,6 +751,8 @@ by a child template that "extends" this file.
+             android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar"
+             android:excludeFromRecents="true"
+             android:process=":browser_restart_process">
+        </activity>
+
+         <activity
+             android:name="org.chromium.chrome.browser.sharing.shared_intent.SharedIntentShareActivity"
+             android:icon="@drawable/ic_launcher"
+diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
+--- a/chrome/browser/privacy/BUILD.gn
+++ b/chrome/browser/privacy/BUILD.gn
+@@ -11,6 +11,7 @@ if (is_android) {
+       "//chrome/android:*",
+       "//chrome/browser/feed/android:*",
+       "//chrome/browser/ui/android/omnibox:*",
+      "//chrome/browser/ui/android/signin:*",
+     ]
+     sources = [
+       "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java",
+diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
+--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
+@@ -186,12 +186,8 @@ public class SigninFirstRunMediator
+         boolean isSigninDisabledByPolicy = false;
+         boolean isMetricsReportingDisabledByPolicy = false;
+         if (hasPolicies) {
+-            isSigninDisabledByPolicy =
+-                    IdentityServicesProvider.get()
+-                            .getSigninManager(Profile.getLastUsedRegularProfile())
+-                            .isSigninDisabledByPolicy();
+-            isMetricsReportingDisabledByPolicy =
+-                    !mPrivacyPreferencesManager.isUsageAndCrashReportingPermittedByPolicy();
+            isSigninDisabledByPolicy = true;
+            isMetricsReportingDisabledByPolicy = true;
+ 
+             final FrePolicy frePolicy = new FrePolicy();
+             frePolicy.metricsReportingDisabledByPolicy = isMetricsReportingDisabledByPolicy;
+--
+2.25.1
@@ -0,0 +1,105 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:29:23 +0000
+Subject: Remove price/shopping/commerce integra (add fixup)
+
+---
+ .../chrome/browser/app/ChromeActivity.java    |  4 ----
+ .../bookmarks/BookmarkItemsAdapter.java       |  2 --
+ .../bookmarks/BookmarkSaveFlowMediator.java   | 21 -------------------
+ .../commerce/core/commerce_feature_list.cc    |  4 ++--
+ 4 files changed, 2 insertions(+), 29 deletions(-)
+
+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
+@@ -2395,10 +2395,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+         }
+ 
+         if (id == R.id.disable_price_tracking_menu_id) {
+-            PowerBookmarkUtils.setPriceTrackingEnabledWithSnackbars(mBookmarkModelSupplier.get(),
+-                    mBookmarkModelSupplier.get().getUserBookmarkIdForTab(currentTab),
+-                    /*enabled=*/false, mSnackbarManager, getResources(), (success) -> {});
+-            RecordUserAction.record("MobileMenuDisablePriceTracking");
+             return true;
+         }
+ 
+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
+@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location;
+ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.profiles.Profile;
+-import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkItem;
+@@ -226,7 +225,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
+                 return createViewHolderHelper(parent, R.layout.bookmark_folder_row);
+             case ViewType.BOOKMARK:
+                 return createViewHolderHelper(parent, R.layout.bookmark_item_row);
+-                            .init(mImageFetcher, mDelegate.getModel(), mSnackbarManager);
+             case ViewType.DIVIDER:
+                 return new ViewHolder(
+                         LayoutInflater.from(parent.getContext())
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkSaveFlowMediator.java
+@@ -17,7 +17,6 @@ import org.chromium.base.metrics.RecordUserAction;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.commerce.PriceTrackingUtils;
+ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
+-import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkItem;
+@@ -39,9 +38,6 @@ public class BookmarkSaveFlowMediator
+     private BookmarkId mBookmarkId;
+     private PowerBookmarkMeta mPowerBookmarkMeta;
+     private boolean mWasBookmarkMoved;
+-    private SubscriptionsManager mSubscriptionsManager;
+-    private CommerceSubscription mSubscription;
+-    private Callback<Boolean> mSubscriptionsManagerCallback;
+     private String mFolderName;
+ 
+     /**
+@@ -121,23 +117,6 @@ public class BookmarkSaveFlowMediator
+     }
+ 
+     void handleNotificationSwitchToggle(CompoundButton view, boolean toggled) {
+-        if (mSubscriptionsManagerCallback == null) {
+-            mSubscriptionsManagerCallback =
+-                    mCallbackController.makeCancelable((Boolean success) -> {
+-                        setPriceTrackingToggleVisualsOnly(success && view.isChecked());
+-                        setPriceTrackingNotificationUiEnabled(success);
+-                    });
+-        }
+-
+-        // Make sure the notification channel is initialized when the user tracks a product.
+-        // TODO(crbug.com/1382191): Add a SubscriptionsObserver in the PriceDropNotificationManager
+-        // and initialize the channel there.
+-        if (toggled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+-            PriceDropNotificationManagerFactory.create().createNotificationChannel();
+-        }
+-        setPriceTrackingIconForEnabledState(toggled);
+-        PriceTrackingUtils.setPriceTrackingStateForBookmark(Profile.getLastUsedRegularProfile(),
+-                mBookmarkId.getId(), toggled, mSubscriptionsManagerCallback);
+     }
+ 
+     void setPriceTrackingNotificationUiEnabled(boolean enabled) {
+diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
+--- a/components/commerce/core/commerce_feature_list.cc
+++ b/components/commerce/core/commerce_feature_list.cc
+@@ -98,8 +98,8 @@ BASE_FEATURE(kCommerceMerchantViewer,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kCommercePriceTracking,
+-             "CommercePriceTracking",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
+             "CommercePriceTracking",               // guard this
+             base::FEATURE_DISABLED_BY_DEFAULT);    // guard this
+ 
+ const base::FeatureParam<bool> kDeleteAllMerchantsOnClearBrowsingHistory{
+     &kCommerceMerchantViewer, "delete_all_merchants_on_clear_history", false};
+--
+2.25.1
@@ -0,0 +1,42 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:27:59 +0000
+Subject: Remove signin and sync integrations (add fixup)
+
+---
+ chrome/android/BUILD.gn                                        | 1 +
+ .../chrome/browser/app/feed/FeedActionDelegateImpl.java        | 3 ---
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -276,6 +276,7 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/ui/android/management:java_resources",
+       "//chrome/browser/ui/android/omnibox:java_resources",
+       "//chrome/browser/ui/android/quickactionsearchwidget:java_resources",
+      "//chrome/browser/ui/android/signin:java_resources",
+       "//chrome/browser/ui/android/strings:ui_strings_grd",
+       "//chrome/browser/ui/android/theme:java_resources",
+       "//chrome/browser/ui/android/toolbar:java_resources",
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java
+@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
+ import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.share.crow.CrowButtonDelegate;
+-import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
+ import org.chromium.chrome.browser.suggestions.SuggestionsConfig;
+ import org.chromium.chrome.browser.tab.EmptyTabObserver;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -129,8 +128,6 @@ public class FeedActionDelegateImpl implements FeedActionDelegate {
+     @Override
+     public void showSignInActivity() {
+         if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEED_SHOW_SIGN_IN_COMMAND)) {
+-            SyncConsentActivityLauncherImpl.get().launchActivityIfAllowed(
+-                    mActivityContext, SigninAccessPoint.NTP_CONTENT_SUGGESTIONS);
+         }
+     }
+ 
+--
+2.25.1
@@ -0,0 +1,28 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:36:46 +0000
+Subject: Timezone customization (add fixup)
+
+---
+ .../core/browser/content_settings_registry.cc             | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -614,10 +614,10 @@ void ContentSettingsRegistry::Init() {
+ 
+   Register(ContentSettingsType::TIMEZONE_OVERRIDE, "timezone-override", CONTENT_SETTING_ALLOW,
+            WebsiteSettingsInfo::SYNCABLE,
+-           AllowlistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
+-           ValidSettings(CONTENT_SETTING_ALLOW,   // use system time
+-                         CONTENT_SETTING_ASK,     // custom timezone, default UTC
+-                         CONTENT_SETTING_BLOCK),  // random
+           /*allowlisted_schemes=*/{},
+           /*valid_settings=*/{CONTENT_SETTING_ALLOW,   // use system time
+                               CONTENT_SETTING_ASK,     // custom timezone, default UTC
+                               CONTENT_SETTING_BLOCK},  // random
+            WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+            WebsiteSettingsRegistry::PLATFORM_ANDROID,
+            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+--
+2.25.1
@@ -0,0 +1,31 @@
+From: Your Name <you@example.com>
+Date: Thu, 5 Jan 2023 11:30:19 +0000
+Subject: User agent customization (add fixup)
+
+---
+ .../android/preferences/privacy_preferences_manager_impl.cc   | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
+--- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
+++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
+@@ -17,6 +17,7 @@
+ #include "base/command_line.h"
+ #include "base/base_switches.h"
+ #include "chrome/common/chrome_switches.h"
+#include "content/browser/attribution_reporting/attribution_manager.h"
+ #include "content/browser/renderer_host/render_process_host_impl.h"
+ #include "content/common/renderer.mojom.h"
+ #include "chrome/browser/chrome_content_browser_client.h"
+@@ -88,7 +89,8 @@ static void UpdateOverrideUserAgent() {
+         std::vector<std::string> cors_exempt_header_list;
+         iter.GetCurrentValue()->GetRendererInterface()->InitializeRenderer(
+           /*user_agent*/ ua, /*full_user_agent*/ ua, /*reduced_user_agent*/ ua,
+-          /*metadata*/ blink::UserAgentMetadata(), cors_exempt_header_list);
+          /*metadata*/ blink::UserAgentMetadata(), cors_exempt_header_list,
+          content::AttributionManager::GetOsSupport());
+       }
+     }
+   }
+--
+2.25.1
@@ -0,0 +1,258 @@
+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
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ base/android/android_image_reader_compat.cc |  8 +++++++-
+ base/android/android_image_reader_compat.h  |  4 ++++
+ chrome/browser/flag-metadata.json           |  6 +++---
+ 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                |  5 +++++
+ media/base/media_switches.h                 |  1 +
+ 12 files changed, 66 insertions(+), 5 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
+@@ -24,6 +24,9 @@ class BASE_EXPORT AndroidImageReader {
+   AndroidImageReader(const AndroidImageReader&) = delete;
+   AndroidImageReader& operator=(const AndroidImageReader&) = delete;
+ 
+  // 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.
+@@ -61,6 +64,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
+@@ -2515,9 +2515,9 @@
+     "expiry_milestone": 115
+   },
+   {
+-    "name": "enable-image-reader",
+-    "owners": [ "vikassoni", "liberato" ],
+-    "expiry_milestone": 115
+    "name": "enable-image-reader",          // Bromite: do not expire
+    "owners": [ "vikassoni", "liberato" ],  // flag
+    "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
+@@ -3199,6 +3199,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
+@@ -64,6 +64,11 @@ BASE_FEATURE(kUseGles2ForOopR,
+ #endif
+ );
+ 
+
+// Use android AImageReader when playing videos with MediaPlayer.
+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+
+ #if BUILDFLAG(IS_ANDROID)
+ // Use android SurfaceControl API for managing display compositor's buffer queue
+ // and using overlays on Android. Also used by webview to disable surface
+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 {
+ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
+ 
+ // All features in alphabetical order. The features should be documented
+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
+ // alongside the definition of their values in the .cc file.
+ #if BUILDFLAG(IS_ANDROID)
+ GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
+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
+@@ -121,6 +121,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+ #if !BUILDFLAG(IS_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;
+ 
+@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+     gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
+         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
+@@ -15,6 +15,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_encode
+ disable_accelerated_h264_encode
+ disable_accelerated_hevc_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
+@@ -626,6 +626,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+   }
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+  // 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"
+@@ -51,7 +52,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
+@@ -758,6 +758,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
+ // Allows automatically disabling hardware secure Content Decryption Module
+ // (CDM) after failures or crashes to fallback to software secure CDMs. If this
+ // feature is disabled, the fallback will never happen and users could be stuck
+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+BASE_FEATURE(kAImageReaderVideoOutput,
+             "AImageReaderVideoOutput",
+             base::FEATURE_ENABLED_BY_DEFAULT);
+
+ // in playback failures.
+ BASE_FEATURE(kHardwareSecureDecryptionFallback,
+              "HardwareSecureDecryptionFallback",
+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
+@@ -235,6 +235,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);
+ #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);
+--
+2.25.1
@@ -1,234 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 16 Dec 2018 15:24:19 +0100
-Subject: AV1 codec support
-
-libaom build fixes (requires -fPIC)
-Report AV1 as playable on Android
---
- media/base/mime_util_internal.cc                            | 6 +++++-
- third_party/libaom/BUILD.gn                                 | 6 ++++--
- third_party/libaom/libaom_srcs.gni                          | 5 +++++
- .../config/linux/arm-neon-cpu-detect/config/aom_config.asm  | 2 +-
- .../config/linux/arm-neon-cpu-detect/config/aom_config.h    | 2 +-
- .../source/config/linux/arm-neon/config/aom_config.asm      | 2 +-
- .../libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +-
- .../libaom/source/config/linux/arm/config/aom_config.asm    | 2 +-
- .../libaom/source/config/linux/arm/config/aom_config.h      | 2 +-
- .../libaom/source/config/linux/arm64/config/aom_config.asm  | 2 +-
- .../libaom/source/config/linux/arm64/config/aom_config.h    | 2 +-
- .../source/config/linux/generic/config/aom_config.asm       | 2 +-
- .../libaom/source/config/linux/generic/config/aom_config.h  | 2 +-
- .../libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-
- .../libaom/source/config/linux/x64/config/aom_config.h      | 2 +-
- 15 files changed, 26 insertions(+), 15 deletions(-)
-
-diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
--- a/media/base/mime_util_internal.cc
-+++ b/media/base/mime_util_internal.cc
-@@ -562,9 +562,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
-     case THEORA:
-       return false;
- 
-    // AV1 is not supported on Android yet.
-+    // AV1 is supported on Android.
-     case AV1:
-+#if BUILDFLAG(ENABLE_AV1_DECODER)
-+      return true;
-+#else
-       return false;
-+#endif
- 
-     // ----------------------------------------------------------------------
-     // The remaining codecs may be supported depending on platform abilities.
-diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
--- a/third_party/libaom/BUILD.gn
-+++ b/third_party/libaom/BUILD.gn
-@@ -74,7 +74,7 @@ if (enable_libaom_decoder) {
-       sources = aom_dsp_common_asm_sse2
-       sources += aom_dsp_common_asm_ssse3
-       sources += aom_ports_asm_x86
-      defines = [ "CHROMIUM" ]
-+      defines = [ "CHROMIUM", "PIC" ]
-       include_dirs = libaom_include_dirs
-     }
- 
-@@ -158,7 +158,7 @@ if (enable_libaom_decoder) {
-       configs += [ "//build/config/compiler:no_chromium_code" ]
-       if (current_cpu == "arm") {
-         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
-        cflags = [ "-mfpu=neon" ]
-+        cflags = [ "-mfpu=neon", "-fPIC" ]
-       }
-       configs += [ ":libaom_config" ]
- 
-@@ -202,6 +202,8 @@ if (enable_libaom_decoder) {
-     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
-         cpu_arch_full == "arm-neon-cpu-detect") {
-       deps += [ ":libaom_intrinsics_neon" ]
-+      # will detect CPU
-+      sources += aom_ports_arm_sources
-     }
-     if (is_android) {
-       deps += [ "//third_party/android_ndk:cpu_features" ]
-diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
--- a/third_party/libaom/libaom_srcs.gni
-+++ b/third_party/libaom/libaom_srcs.gni
-@@ -488,6 +488,11 @@ aom_mem_sources = [
- 
- aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
- 
-+aom_ports_arm_sources = [
-+  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
-+  "//third_party/libaom/source/libaom/aom_ports/arm.h",
-+ ]
-+
- aom_rtcd_sources = [
-   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c",
-   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl",
-diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
- CONFIG_OS_SUPPORT equ 1
-CONFIG_PIC equ 0
-+CONFIG_PIC equ 1
- CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 1
- CONFIG_SHARED equ 0
-diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
- CONFIG_OS_SUPPORT equ 1
-CONFIG_PIC equ 0
-+CONFIG_PIC equ 1
- CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
-diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
- CONFIG_OS_SUPPORT equ 1
-CONFIG_PIC equ 0
-+CONFIG_PIC equ 1
- CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
-diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
- CONFIG_OS_SUPPORT equ 1
-CONFIG_PIC equ 0
-+CONFIG_PIC equ 1
- CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 0
- CONFIG_SHARED equ 0
-diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 0
- #define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
-@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1
- CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_ONE_PASS_SVM equ 0
- CONFIG_OS_SUPPORT equ 1
-CONFIG_PIC equ 0
-+CONFIG_PIC equ 1
- CONFIG_RD_DEBUG equ 0
- CONFIG_RUNTIME_CPU_DETECT equ 1
- CONFIG_SHARED equ 0
-diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
-+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
-@@ -35,7 +35,7 @@
- %define CONFIG_NORMAL_TILE_MODE 1
- %define CONFIG_ONE_PASS_SVM 0
- %define CONFIG_OS_SUPPORT 1
-%define CONFIG_PIC 0
-+%define CONFIG_PIC 1
- %define CONFIG_RD_DEBUG 0
- %define CONFIG_RUNTIME_CPU_DETECT 1
- %define CONFIG_SHARED 0
-diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
-+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
-@@ -47,7 +47,7 @@
- #define CONFIG_NORMAL_TILE_MODE 1
- #define CONFIG_ONE_PASS_SVM 0
- #define CONFIG_OS_SUPPORT 1
-#define CONFIG_PIC 0
-+#define CONFIG_PIC 1
- #define CONFIG_RD_DEBUG 0
- #define CONFIG_RUNTIME_CPU_DETECT 1
- #define CONFIG_SHARED 0
-- 
-2.17.1
-
@@ -0,0 +1,168 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 26 Apr 2021 13:28:24 +0000
+Subject: Add AllowUserCertificates flag
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../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          | 5 +++++
+ chrome/browser/flags/android/chrome_feature_list.h           | 1 +
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++
+ net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++
+ 9 files changed, 30 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
+@@ -226,6 +226,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;
+@@ -961,6 +962,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
+@@ -77,6 +77,7 @@ public class ChromeCachedFlags {
+                 add(ChromeFeatureList.sAndroidAuxiliarySearch);
+                 add(ChromeFeatureList.sAnonymousUpdateChecks);
+                 add(ChromeFeatureList.sAppMenuMobileSiteOption);
+                add(ChromeFeatureList.sAllowUserCertificates);
+                 add(ChromeFeatureList.sBackGestureRefactorAndroid);
+                 add(ChromeFeatureList.sCctBrandTransparency);
+                 add(ChromeFeatureList.sCctIncognito);
+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
+@@ -8936,6 +8936,10 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
+ #endif  // BUILDFLAG(IS_WIN)
+ 
+    {"allow-user-certificates",
+     flag_descriptions::kAllowUserCertificatesName,
+     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},
+     {"omnibox-updated-connection-security-indicators",
+      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,
+      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsDescription,
+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
+@@ -13,6 +13,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
+@@ -40,6 +40,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
+@@ -153,6 +153,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &feed::kFeedReplaceAll,
+     &feed::kFeedShowSignInCommand,
+     &feed::kInterestFeedContentSuggestions,
+    &kAllowUserCertificates,
+     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
+     &feed::kInterestFeedV2,
+     &feed::kInterestFeedV2Autoplay,
+@@ -469,6 +470,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
+              "AllowNewIncognitoTabIntents",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+BASE_FEATURE(kAllowUserCertificates,
+             "AllowUserCertificates",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
+ BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents,
+              "FocusOmniboxInIncognitoTabIntents",
+              base::FEATURE_ENABLED_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
+@@ -17,6 +17,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);
+ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);
+ BASE_DECLARE_FEATURE(kAddToHomescreenIPH);
+ BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);
+BASE_DECLARE_FEATURE(kAllowUserCertificates);
+ BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);
+ BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);
+ BASE_DECLARE_FEATURE(kAssistantConsentModal);
+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
+@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {
+     }
+ 
+     /* Alphabetical: */
+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
+     public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
+@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList {
+             "SkipServiceWorkerForInstallPromot";
+ 
+     /* Alphabetical: */
+    public static final CachedFlag sAllowUserCertificates =
+            new CachedFlag(ALLOW_USER_CERTIFICATES, false);
+     public static final CachedFlag sAndroidAuxiliarySearch =
+             new CachedFlag(OMNIBOX_ANDROID_AUXILIARY_SEARCH, false);
+     public static final CachedFlag sAnonymousUpdateChecks =
+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
+@@ -437,6 +437,8 @@ public class X509Util {
+         return false;
+     }
+ 
+    public static boolean AllowUserCertificates = false;
+
+     public static AndroidCertVerifyResult verifyServerCertificates(byte[][] certChain,
+                                                                    String authType,
+                                                                    String host)
+@@ -517,6 +519,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.25.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
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../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
+@@ -155,6 +155,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.25.1
@@ -0,0 +1,98 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 26 Apr 2021 15:04:11 +0000
+Subject: Add IsCleartextPermitted flag
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/about_flags.cc           | 4 ++++
+ chrome/browser/flag_descriptions.cc     | 4 ++++
+ chrome/browser/flag_descriptions.h      | 3 +++
+ net/base/features.cc                    | 4 ++++
+ 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
+@@ -9171,6 +9171,10 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kRequestDesktopSiteExceptionsName,
+      flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
+    {"cleartext-permitted",
+     flag_descriptions::kIsCleartextPermittedName,
+     flag_descriptions::kIsCleartextPermittedDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
+ #endif
+ 
+     {"export-bookmarks-use-saf",
+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
+@@ -1651,6 +1651,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
+@@ -935,6 +935,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
+ 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
+@@ -113,6 +113,10 @@ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey,
+              "PartitionNelAndReportingByNetworkIsolationKey",         // must be enabled
+              base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
+ 
+BASE_FEATURE(kIsCleartextPermitted,
+             "IsCleartextPermitted",
+             base::FEATURE_ENABLED_BY_DEFAULT);
+
+ BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey,
+              "EnableDoubleKeyNetworkAnonymizationKey",
+              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
+@@ -29,6 +29,8 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAvoidH2Reprioritization);
+ // origin requests are restricted to contain at most the source origin.
+ NET_EXPORT BASE_DECLARE_FEATURE(kCapReferrerToOriginOnCrossOrigin);
+ 
+NET_EXPORT BASE_DECLARE_FEATURE(kIsCleartextPermitted);
+
+ // Support for altering the parameters used for DNS transaction timeout. See
+ // ResolveContext::SecureTransactionTimeout().
+ NET_EXPORT BASE_DECLARE_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
+@@ -212,6 +212,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+     }
+ 
+ #if BUILDFLAG(IS_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.25.1
@@ -1,999 +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
-@@ -193,6 +193,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,
-@@ -51,7 +51,7 @@ const PrepopulatedEngine* const engines_AE[] = {
- 
- // Albania
- const PrepopulatedEngine* const engines_AL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AL[] = {
- 
- // Argentina
- const PrepopulatedEngine* const engines_AR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_ar,
-     &duckduckgo, &duckduckgo_light,
-@@ -69,7 +69,7 @@ const PrepopulatedEngine* const engines_AR[] = {
- 
- // Austria
- const PrepopulatedEngine* const engines_AT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo_at,
-@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AT[] = {
- 
- // Australia
- const PrepopulatedEngine* const engines_AU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo_au,
-@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_AU[] = {
- 
- // Bosnia and Herzegovina
- const PrepopulatedEngine* const engines_BA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -96,7 +96,7 @@ const PrepopulatedEngine* const engines_BA[] = {
- 
- // Belgium
- const PrepopulatedEngine* const engines_BE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ecosia,
-@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BE[] = {
- 
- // Bulgaria
- const PrepopulatedEngine* const engines_BG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BG[] = {
- 
- // Bahrain
- const PrepopulatedEngine* const engines_BH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BH[] = {
- 
- // Burundi
- const PrepopulatedEngine* const engines_BI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BI[] = {
- 
- // Brunei
- const PrepopulatedEngine* const engines_BN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BN[] = {
- 
- // Bolivia
- const PrepopulatedEngine* const engines_BO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BO[] = {
- 
- // Brazil
- const PrepopulatedEngine* const engines_BR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_br,
-     &duckduckgo, &duckduckgo_light,
-@@ -159,7 +159,7 @@ const PrepopulatedEngine* const engines_BR[] = {
- 
- // Belarus
- const PrepopulatedEngine* const engines_BY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_by,
-     &mail_ru,
-     &bing,
-@@ -168,7 +168,7 @@ const PrepopulatedEngine* const engines_BY[] = {
- 
- // Belize
- const PrepopulatedEngine* const engines_BZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
- 
- // Canada
- const PrepopulatedEngine* const engines_CA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_ca,
-     &duckduckgo, &duckduckgo_light,
-@@ -186,7 +186,7 @@ const PrepopulatedEngine* const engines_CA[] = {
- 
- // Switzerland
- const PrepopulatedEngine* const engines_CH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo_ch,
-@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CH[] = {
- 
- // Chile
- const PrepopulatedEngine* const engines_CL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_cl,
-     &duckduckgo, &duckduckgo_light,
-@@ -206,14 +206,14 @@ const PrepopulatedEngine* const engines_CL[] = {
- const PrepopulatedEngine* const engines_CN[] = {
-     &baidu,
-     &sogou,
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &so_360,
-     &bing,
- };
- 
- // Colombia
- const PrepopulatedEngine* const engines_CO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_co,
-     &ecosia,
-@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CO[] = {
- 
- // Costa Rica
- const PrepopulatedEngine* const engines_CR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -231,7 +231,7 @@ const PrepopulatedEngine* const engines_CR[] = {
- 
- // Czech Republic
- const PrepopulatedEngine* const engines_CZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &seznam_cz,
-     &bing,
-     &yahoo,
-@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
- 
- // Germany
- const PrepopulatedEngine* const engines_DE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_de,
-     &duckduckgo, &duckduckgo_light,
-@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DE[] = {
- 
- // Denmark
- const PrepopulatedEngine* const engines_DK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_dk,
-     &duckduckgo, &duckduckgo_light,
-@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DK[] = {
- 
- // Dominican Republic
- const PrepopulatedEngine* const engines_DO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_DO[] = {
- 
- // Algeria
- const PrepopulatedEngine* const engines_DZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -276,7 +276,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
- 
- // Ecuador
- const PrepopulatedEngine* const engines_EC[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ecosia,
-@@ -285,7 +285,7 @@ const PrepopulatedEngine* const engines_EC[] = {
- 
- // Estonia
- const PrepopulatedEngine* const engines_EE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yandex_ru,
-     &yahoo,
-@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_EE[] = {
- 
- // Egypt
- const PrepopulatedEngine* const engines_EG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_EG[] = {
- 
- // Spain
- const PrepopulatedEngine* const engines_ES[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_es,
-     &duckduckgo, &duckduckgo_light,
-@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_ES[] = {
- 
- // Finland
- const PrepopulatedEngine* const engines_FI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_fi,
-     &duckduckgo, &duckduckgo_light,
-@@ -321,7 +321,7 @@ const PrepopulatedEngine* const engines_FI[] = {
- 
- // Faroe Islands
- const PrepopulatedEngine* const engines_FO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_dk,
-     &duckduckgo, &duckduckgo_light,
-@@ -330,7 +330,7 @@ const PrepopulatedEngine* const engines_FO[] = {
- 
- // France
- const PrepopulatedEngine* const engines_FR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_fr,
-     &qwant,
-@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_FR[] = {
- 
- // United Kingdom
- const PrepopulatedEngine* const engines_GB[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_uk,
-     &duckduckgo, &duckduckgo_light,
-@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GB[] = {
- 
- // Greece
- const PrepopulatedEngine* const engines_GR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GR[] = {
- 
- // Guatemala
- const PrepopulatedEngine* const engines_GT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ecosia,
-@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_GT[] = {
- 
- // Hong Kong
- const PrepopulatedEngine* const engines_HK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_hk,
-     &bing,
-     &yandex_com,
-@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HK[] = {
- 
- // Honduras
- const PrepopulatedEngine* const engines_HN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -384,7 +384,7 @@ const PrepopulatedEngine* const engines_HN[] = {
- 
- // Croatia
- const PrepopulatedEngine* const engines_HR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HR[] = {
- 
- // Hungary
- const PrepopulatedEngine* const engines_HU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -402,7 +402,7 @@ const PrepopulatedEngine* const engines_HU[] = {
- 
- // Indonesia
- const PrepopulatedEngine* const engines_ID[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_id,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_ID[] = {
- 
- // Ireland
- const PrepopulatedEngine* const engines_IE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IE[] = {
- 
- // Israel
- const PrepopulatedEngine* const engines_IL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IL[] = {
- 
- // India
- const PrepopulatedEngine* const engines_IN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_in,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -438,7 +438,7 @@ const PrepopulatedEngine* const engines_IN[] = {
- 
- // Iraq
- const PrepopulatedEngine* const engines_IQ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -447,7 +447,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
- 
- // Iran
- const PrepopulatedEngine* const engines_IR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -456,7 +456,7 @@ const PrepopulatedEngine* const engines_IR[] = {
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IS[] = {
- 
- // Italy
- const PrepopulatedEngine* const engines_IT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_IT[] = {
- 
- // Jamaica
- const PrepopulatedEngine* const engines_JM[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_JM[] = {
- 
- // Jordan
- const PrepopulatedEngine* const engines_JO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JO[] = {
- 
- // Japan
- const PrepopulatedEngine* const engines_JP[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_jp,
-     &bing,
-     &baidu,
-@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_JP[] = {
- 
- // Kenya
- const PrepopulatedEngine* const engines_KE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -510,7 +510,7 @@ const PrepopulatedEngine* const engines_KE[] = {
- 
- // South Korea
- const PrepopulatedEngine* const engines_KR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &naver,
-     &bing,
-     &daum,
-@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_KR[] = {
- 
- // Kuwait
- const PrepopulatedEngine* const engines_KW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -528,7 +528,7 @@ const PrepopulatedEngine* const engines_KW[] = {
- 
- // Kazakhstan
- const PrepopulatedEngine* const engines_KZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_kz,
-     &mail_ru,
-     &bing,
-@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
- 
- // Lebanon
- const PrepopulatedEngine* const engines_LB[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_LB[] = {
- 
- // Liechtenstein
- const PrepopulatedEngine* const engines_LI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LI[] = {
- 
- // Lithuania
- const PrepopulatedEngine* const engines_LT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -564,7 +564,7 @@ const PrepopulatedEngine* const engines_LT[] = {
- 
- // Luxembourg
- const PrepopulatedEngine* const engines_LU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -573,7 +573,7 @@ const PrepopulatedEngine* const engines_LU[] = {
- 
- // Latvia
- const PrepopulatedEngine* const engines_LV[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ru,
-     &bing,
-     &yahoo,
-@@ -582,7 +582,7 @@ const PrepopulatedEngine* const engines_LV[] = {
- 
- // Libya
- const PrepopulatedEngine* const engines_LY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_com,
-@@ -591,7 +591,7 @@ const PrepopulatedEngine* const engines_LY[] = {
- 
- // Morocco
- const PrepopulatedEngine* const engines_MA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -600,7 +600,7 @@ const PrepopulatedEngine* const engines_MA[] = {
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -609,7 +609,7 @@ const PrepopulatedEngine* const engines_MC[] = {
- 
- // Moldova
- const PrepopulatedEngine* const engines_MD[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ru,
-     &mail_ru,
-     &duckduckgo, &duckduckgo_light,
-@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_MD[] = {
- 
- // Montenegro
- const PrepopulatedEngine* const engines_ME[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_ME[] = {
- 
- // Macedonia
- const PrepopulatedEngine* const engines_MK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MK[] = {
- 
- // Mexico
- const PrepopulatedEngine* const engines_MX[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_mx,
-     &ecosia,
-@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MX[] = {
- 
- // Malaysia
- const PrepopulatedEngine* const engines_MY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_my,
-     &duckduckgo, &duckduckgo_light,
-@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_MY[] = {
- 
- // Nicaragua
- const PrepopulatedEngine* const engines_NI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_NI[] = {
- 
- // Netherlands
- const PrepopulatedEngine* const engines_NL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_nl,
-     &duckduckgo, &duckduckgo_light,
-@@ -673,7 +673,7 @@ const PrepopulatedEngine* const engines_NL[] = {
- 
- // Norway
- const PrepopulatedEngine* const engines_NO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_NO[] = {
- 
- // New Zealand
- const PrepopulatedEngine* const engines_NZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo_nz,
-@@ -691,7 +691,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
- 
- // Oman
- const PrepopulatedEngine* const engines_OM[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -700,7 +700,7 @@ const PrepopulatedEngine* const engines_OM[] = {
- 
- // Panama
- const PrepopulatedEngine* const engines_PA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PA[] = {
- 
- // Peru
- const PrepopulatedEngine* const engines_PE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_pe,
-     &ecosia,
-@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PE[] = {
- 
- // Philippines
- const PrepopulatedEngine* const engines_PH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_ph,
-     &bing,
-     &ecosia,
-@@ -727,7 +727,7 @@ const PrepopulatedEngine* const engines_PH[] = {
- 
- // Pakistan
- const PrepopulatedEngine* const engines_PK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_PK[] = {
- 
- // Poland
- const PrepopulatedEngine* const engines_PL[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -745,7 +745,7 @@ const PrepopulatedEngine* const engines_PL[] = {
- 
- // Puerto Rico
- const PrepopulatedEngine* const engines_PR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_PR[] = {
- 
- // Portugal
- const PrepopulatedEngine* const engines_PT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -763,7 +763,7 @@ const PrepopulatedEngine* const engines_PT[] = {
- 
- // Paraguay
- const PrepopulatedEngine* const engines_PY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -772,7 +772,7 @@ const PrepopulatedEngine* const engines_PY[] = {
- 
- // Qatar
- const PrepopulatedEngine* const engines_QA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -781,7 +781,7 @@ const PrepopulatedEngine* const engines_QA[] = {
- 
- // Romania
- const PrepopulatedEngine* const engines_RO[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -790,7 +790,7 @@ const PrepopulatedEngine* const engines_RO[] = {
- 
- // Serbia
- const PrepopulatedEngine* const engines_RS[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RS[] = {
- 
- // Russia
- const PrepopulatedEngine* const engines_RU[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ru,
-     &mail_ru,
-     &bing,
-@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_RU[] = {
- 
- // Rwanda
- const PrepopulatedEngine* const engines_RW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_RW[] = {
- 
- // Saudi Arabia
- const PrepopulatedEngine* const engines_SA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_com,
-@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_SA[] = {
- 
- // Sweden
- const PrepopulatedEngine* const engines_SE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo_se,
-     &duckduckgo, &duckduckgo_light,
-@@ -835,7 +835,7 @@ const PrepopulatedEngine* const engines_SE[] = {
- 
- // Singapore
- const PrepopulatedEngine* const engines_SG[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yandex_com,
-     &yahoo_sg,
-@@ -844,7 +844,7 @@ const PrepopulatedEngine* const engines_SG[] = {
- 
- // Slovenia
- const PrepopulatedEngine* const engines_SI[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-     &yahoo,
-@@ -853,7 +853,7 @@ const PrepopulatedEngine* const engines_SI[] = {
- 
- // Slovakia
- const PrepopulatedEngine* const engines_SK[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -862,7 +862,7 @@ const PrepopulatedEngine* const engines_SK[] = {
- 
- // El Salvador
- const PrepopulatedEngine* const engines_SV[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SV[] = {
- 
- // Syria
- const PrepopulatedEngine* const engines_SY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -880,7 +880,7 @@ const PrepopulatedEngine* const engines_SY[] = {
- 
- // Thailand
- const PrepopulatedEngine* const engines_TH[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_th,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -889,7 +889,7 @@ const PrepopulatedEngine* const engines_TH[] = {
- 
- // Tunisia
- const PrepopulatedEngine* const engines_TN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo,
-     &bing,
-     &yandex_ru,
-@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TN[] = {
- 
- // Turkey
- const PrepopulatedEngine* const engines_TR[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_tr,
-     &yahoo_tr,
-     &bing,
-@@ -907,7 +907,7 @@ const PrepopulatedEngine* const engines_TR[] = {
- 
- // Trinidad and Tobago
- const PrepopulatedEngine* const engines_TT[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -916,7 +916,7 @@ const PrepopulatedEngine* const engines_TT[] = {
- 
- // Taiwan
- const PrepopulatedEngine* const engines_TW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_tw,
-     &bing,
-     &baidu,
-@@ -925,7 +925,7 @@ const PrepopulatedEngine* const engines_TW[] = {
- 
- // Tanzania
- const PrepopulatedEngine* const engines_TZ[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -934,7 +934,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
- 
- // Ukraine
- const PrepopulatedEngine* const engines_UA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yandex_ua,
-     &bing,
-     &mail_ru,
-@@ -943,7 +943,7 @@ const PrepopulatedEngine* const engines_UA[] = {
- 
- // United States
- const PrepopulatedEngine* const engines_US[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -952,7 +952,7 @@ const PrepopulatedEngine* const engines_US[] = {
- 
- // Uruguay
- const PrepopulatedEngine* const engines_UY[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -961,7 +961,7 @@ const PrepopulatedEngine* const engines_UY[] = {
- 
- // Venezuela
- const PrepopulatedEngine* const engines_VE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &yahoo_ve,
-     &bing,
-     &duckduckgo, &duckduckgo_light,
-@@ -970,7 +970,7 @@ const PrepopulatedEngine* const engines_VE[] = {
- 
- // Vietnam
- const PrepopulatedEngine* const engines_VN[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &coccoc,
-     &yahoo,
-     &bing,
-@@ -979,7 +979,7 @@ const PrepopulatedEngine* const engines_VN[] = {
- 
- // Yemen
- const PrepopulatedEngine* const engines_YE[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &yandex_ru,
-@@ -988,7 +988,7 @@ const PrepopulatedEngine* const engines_YE[] = {
- 
- // South Africa
- const PrepopulatedEngine* const engines_ZA[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &duckduckgo, &duckduckgo_light,
-@@ -997,7 +997,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
- 
- // Zimbabwe
- const PrepopulatedEngine* const engines_ZW[] = {
-    &googleen, &google,
-+    &googleen, &google, &qwant,
-     &bing,
-     &yahoo,
-     &ask,
-- 
-2.17.1
-
@@ -3,30 +3,43 @@ Date: Thu, 29 Mar 2018 00:43:32 +0200
 Subject: Add a proxy configuration page

 Accessible from proxy settings and chrome://proxy
-Allows to use a PAC script URL, automatic configuration and explicit proxy
-settings.
+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;
+this implementation is the same as the one in ChromeOS which gets proxy information from the LocalState
+for the system network context; this is strictly not correct on Android because the network context is
+never connected to any user profile and only gets proxy information from the system.
+Existing settings on Profile are migrated to LocalState on startup.
+
+Credits to @uazo for the LocalState integration.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 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   |  24 +-
+ 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.js      | 267 +++++++++++
 chrome/browser/ui/BUILD.gn                    |   2 +
 .../webui/chrome_web_ui_controller_factory.cc |   3 +
- chrome/browser/ui/webui/proxy_config_ui.cc    | 395 ++++++++++++++++++
- chrome/browser/ui/webui/proxy_config_ui.h     |  33 ++
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 418 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++
 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 +-
+ .../proxy_config/proxy_policy_handler.cc      |   2 +-
+ net/proxy_resolution/proxy_config.cc          |  52 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 19 files changed, 913 insertions(+), 12 deletions(-)
+ 24 files changed, 996 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,68 +49,172 @@ 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
-@@ -72,6 +72,9 @@
-     <!-- Value for scaleX to mirror drawables correctly for LTR / RTL layouts. -->
-     <integer name="automirror_scale_x_reverse">-1</integer>
+@@ -27,6 +27,9 @@ found in the LICENSE file.
+     <!-- 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>
 +
     <!-- Download InfoBar animation. -->
-     <integer name="download_infobar_sweep_up_delay">500</integer>
-     <integer name="download_infobar_sweep_down_delay">800</integer>
+     <integer name="download_infobar_fill_in_delay">1200</integer>
+     <integer name="download_infobar_fill_out_delay">200</integer>
 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
-@@ -6,6 +6,10 @@
+@@ -8,6 +8,10 @@ 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.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
+@@ -59,6 +59,7 @@ public class PrivacySettings
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
+    private static final String PREF_PROXY_OPTIONS = "proxy";
+     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
+     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
+ 
 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
-@@ -231,6 +231,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
-   std::vector<base::string16> builtins_to_provide;
+@@ -284,6 +284,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
-@@ -117,6 +117,12 @@
-         <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
+@@ -81,6 +81,12 @@
+         <include name="IDR_DESK_API_MANIFEST" file="resources\chromeos\desk_api\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
+@@ -6,6 +6,7 @@
+ 
+ #include <utility>
+ 
+#include "base/logging.h"
+ #include "base/threading/thread_task_runner_handle.h"
+ #include "build/build_config.h"
+ #include "build/chromeos_buildflags.h"
+@@ -13,6 +14,9 @@
+ #include "content/public/browser/browser_task_traits.h"
+ #include "content/public/browser/browser_thread.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/ash/components/network/proxy/proxy_config_service_impl.h"
+@@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
+   return std::make_unique<ash::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::Value::Dict& dict =
+        profile_prefs->GetDict(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)
+ }
+ 
+@@ -86,3 +103,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
+@@ -6,6 +6,7 @@
+ #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
+ 
+ #include <memory>
+#include "components/prefs/pref_registry_simple.h"
+ 
+ class PrefProxyConfigTracker;
+ class PrefService;
+@@ -35,6 +36,8 @@ class ProxyServiceFactory {
+   CreatePrefProxyConfigTrackerOfProfile(PrefService* profile_prefs,
+                                         PrefService* local_state_prefs);
+ 
+  static void RegisterPrefs(PrefRegistrySimple* registry);
+
+   // Creates a PrefProxyConfigTracker that tracks local state only. This tracker
+   // should be used for the system request context and the signin screen
+   // (ChromeOS only).
+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
+@@ -167,6 +167,8 @@
+ #include "rlz/buildflags/buildflags.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
+#include "chrome/browser/net/proxy_service_factory.h"
+
+ #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
+ #include "chrome/browser/background/background_mode_manager.h"
+ #endif
+@@ -1055,6 +1057,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+   chrome::enterprise_util::RegisterLocalStatePrefs(registry);
+   component_updater::RegisterPrefs(registry);
+   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
+  ProxyServiceFactory::RegisterPrefs(registry);
+
+   enterprise_reporting::RegisterLocalStatePrefs(registry);
+   ExternalProtocolHandler::RegisterPrefs(registry);
+   flags_ui::PrefServiceFlagsStorage::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() {
-     SetValue(
-         proxy_config::prefs::kProxy,
-         std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
-            proxy_server, bypass_list)),
-+            proxy_server, bypass_list, false)),
-         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+@@ -159,7 +159,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
+     SetValue(proxy_config::prefs::kProxy,
+              base::Value(ProxyConfigDictionary::CreateFixedServers(
+-                 proxy_server, bypass_list)),
+                 proxy_server, bypass_list, false)),
+              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   }
 }
 diff --git a/chrome/browser/resources/proxy_config.css b/chrome/browser/resources/proxy_config.css
@@ -184,9 +301,8 @@ new file mode 100644
 +<script src="chrome://resources/js/ios/web_ui.js"></script>
 +</if>
 +
-+<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://resources/js/assert.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 +333,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 +370,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,267 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -271,6 +388,9 @@ new file mode 100644
 +    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
 +*/
 +
+import {$} from 'chrome://resources/js/util.js';
+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+
 +/**
 + * Main entry point called once the page has loaded.
 + */
@@ -296,6 +416,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 +448,8 @@ new file mode 100644
 +    chrome.send('enableNotifyUIWithState');
 +  }
 +
-+  cr.addSingletonGetter(ProxyConfigView);
+  addSingletonGetter(ProxyConfigView);
+  window.ProxyConfigView = ProxyConfigView;
 +
 +  ProxyConfigView.prototype = {
 +    /**
@@ -381,7 +503,7 @@ new file mode 100644
 +          "rules": {
 +            "bypass_rules": "",
 +            "reverse_bypass": false,
-+            "type": "empty"
+            "type": "none"
 +          }
 +        };
 +    },
@@ -394,7 +516,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 +534,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 +568,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,40 +641,40 @@ 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
-@@ -267,6 +267,8 @@ jumbo_static_library("ui") {
-     "webui/metrics_handler.h",
+@@ -287,6 +287,8 @@ static_library("ui") {
+     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
 +    "webui/proxy_config_ui.cc",
 +    "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
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
+ #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
- #include "chrome/browser/ui/webui/policy_ui.h"
- #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
+ #include "chrome/browser/ui/webui/policy/policy_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"
-@@ -409,6 +410,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
-     return &NewWebUI<MemoryInternalsUI>;
+ #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
+ #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
+ #include "chrome/browser/ui/webui/signin_internals_ui.h"
+@@ -801,6 +802,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+     return &NewWebUI<MetricsInternalsUI>;
   if (url.host_piece() == chrome::kChromeUINetExportHost)
     return &NewWebUI<NetExportUI>;
 +  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
 +    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,418 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -571,9 +703,7 @@ new file mode 100644
 +#include "base/bind.h"
 +#include "base/command_line.h"
 +#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"
@@ -620,6 +750,8 @@ new file mode 100644
 +      public base::SupportsWeakPtr<ProxyConfigMessageHandler>,
 +      public net::ProxyConfigService::Observer {
 + public:
+  ProxyConfigMessageHandler(const ProxyConfigMessageHandler&) = delete;
+  ProxyConfigMessageHandler& operator=(const ProxyConfigMessageHandler&) = delete;
 +  // Creates a ProxyConfigMessageHandler that handles message exchanges with the Javascript
 +  // side of the UI and gets proxy settings from the Web UI associated profile to watch for changes.
 +  // The created ProxyConfigMessageHandler must be destroyed before |profile|.
@@ -630,9 +762,9 @@ new file mode 100644
 +  void RegisterMessages() override;
 +
 +  // Messages
-+  void OnEnableNotifyUIWithState(const base::ListValue* list);
-+  void OnApply(const base::ListValue* config);
-+  void OnClear(const base::ListValue* config);
+  void OnEnableNotifyUIWithState(const base::Value::List& args);
+  void OnApply(const base::Value::List& args);
+  void OnClear(const base::Value::List& args);
 +
 +  // net::ProxyConfigService::Observer implementation:
 +  // Calls ProxyConfigView.onProxyConfigChanged JavaScript function in the
@@ -643,7 +775,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_;
@@ -654,8 +786,6 @@ new file mode 100644
 +  void apply(const net::ProxyConfig& config);
 +
 +  base::WeakPtrFactory<ProxyConfigMessageHandler> weak_ptr_factory_;
-+
-+  DISALLOW_COPY_AND_ASSIGN(ProxyConfigMessageHandler);
 +};
 +
 +ProxyConfigMessageHandler::ProxyConfigMessageHandler(Profile *profile)
@@ -663,7 +793,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;
 +
@@ -684,7 +814,7 @@ new file mode 100644
 +  }
 +
 +  proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
-+      pref_proxy_config_tracker_.get());
+      pref_proxy_config_tracker_.get(), nullptr);
 +}
 +
 +void ProxyConfigMessageHandler::OnProxyConfigChanged(
@@ -700,7 +830,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 +857,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";
@@ -789,7 +923,7 @@ new file mode 100644
 +// The proxy configuration UI is not notified of state changes until this function runs.
 +// After this function, OnProxyConfigChanged() will be called on all proxy state changes.
 +void ProxyConfigMessageHandler::OnEnableNotifyUIWithState(
-+    const base::ListValue* list) {
+    const base::Value::List& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
 +  if (!is_observing_) {
@@ -799,24 +933,36 @@ new file mode 100644
 +
 +  net::ProxyConfigWithAnnotation config;
 +  auto availability = proxy_config_service_->GetLatestProxyConfig(&config);
+
+  const PrefService::Preference* const pref =
+      pref_service_->FindPreference(proxy_config::prefs::kProxy);
+  ProxyConfigDictionary proxy_dict(pref->GetValue()->GetDict().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) {
+void ProxyConfigMessageHandler::OnClear(const base::Value::List& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  profile_->GetPrefs()->ClearPref(proxy_config::prefs::kProxy);
+  const base::Value::Dict cfg = ProxyConfigDictionary::CreateSystem();
+  pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
+  pref_service_->CommitPendingWrite();
+  OnEnableNotifyUIWithState(list);
 +}
 +
-+void ProxyConfigMessageHandler::OnApply(const base::ListValue* list) {
+void ProxyConfigMessageHandler::OnApply(const base::Value::List& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  if ((list->GetList().size() != 1) || !list->GetList()[0].is_dict()) {
+  if ((list.size() != 1) || !list[0].is_dict()) {
 +    return;
 +  }
 +
 +  const base::DictionaryValue* config = nullptr;
-+  if (!list->GetDictionary(0, &config))
+  if (!list[0].GetAsDictionary(&config))
 +    return;
 +
 +  const base::Value *autoDetect = config->FindKeyOfType("auto_detect", base::Value::Type::BOOLEAN);
@@ -883,8 +1029,12 @@ 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") {
+      base::Value::List empty;
+      OnClear(empty);
+      return;
 +  } else {
 +     // invalid type
 +     LOG(WARNING) << "invalid proxy configuration type";
@@ -910,22 +1060,27 @@ 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;
+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateAutoDetect();
+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } 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;
+    const base::Value::Dict cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
+  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {
+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateDirect();
+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
+  } else {
+    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
+    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
+
+    // fixed servers
+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
+                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
+    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  }
+  pref_service_->CommitPendingWrite();
 +
-+  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);
+  base::Value::List empty;
+  OnEnableNotifyUIWithState(empty);
 +}
 +
 +}  // namespace
@@ -942,7 +1097,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.h
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,31 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -963,42 +1118,40 @@ new file mode 100644
 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +
-+#include "base/macros.h"
 +#include "content/public/browser/web_ui_controller.h"
 +
 +// The WebUI for chrome://proxy/.
 +class ProxyConfigUI : public content::WebUIController {
 + public:
+  ProxyConfigUI(const ProxyConfigUI&) = delete;
+  ProxyConfigUI& operator=(const ProxyConfigUI&) = delete;
 +  explicit ProxyConfigUI(content::WebUI* web_ui);
-+
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(ProxyConfigUI);
 +};
 +
 +#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 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
-@@ -189,6 +189,8 @@ const char kChromeUINativePhysicalWebDiagnosticsURL[] =
- const char kChromeUINativeScheme[] = "chrome-native";
- const char kChromeUIOfflineInternalsHost[] = "offline-internals";
- const char kChromeUIPhysicalWebDiagnosticsHost[] = "physical-web-diagnostics";
+@@ -47,6 +47,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
-@@ -472,6 +474,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
-       kResetSubPage,
-       kSmartLockSettingsSubPage,
-       kSmbSharesSubPage,
-+      kChromeUIProxyConfigHost,
-       kStorageSubPage,
-       kStylusSubPage,
-       kSwitchAccessSubPage,
-@@ -577,6 +580,7 @@ const char* const kChromeHostURLs[] = {
- #if !defined(OS_ANDROID)
- #if !defined(OS_CHROMEOS)
+ const char kChromeUIChromeURLsHost[] = "chrome-urls";
+ const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
+ const char kChromeUIComponentsHost[] = "components";
+@@ -446,6 +448,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+     kChromeUILockScreenNetworkHost,
+     kChromeUILockScreenStartReauthHost,
+     kChromeUIMobileSetupHost,
+    kChromeUIProxyConfigHost,
+     kChromeUIMultiDeviceSetupHost,
+     kChromeUINetworkHost,
+     kChromeUINotificationTesterHost,
+@@ -718,6 +721,7 @@ const char* const kChromeHostURLs[] = {
+ #if !BUILDFLAG(IS_ANDROID)
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
     kChromeUIAppLauncherPageHost,
 +    kChromeUIProxyConfigHost,
 #endif
@@ -1007,7 +1160,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
-@@ -106,6 +106,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -134,6 +134,8 @@ extern const char kChromeUIMetricsInternalsHost[];
 extern const char kChromeUINTPTilesInternalsHost[];
 extern const char kChromeUINaClHost[];
 extern const char kChromeUINetExportHost[];
@@ -1016,22 +1169,21 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
 extern const char kChromeUINetInternalsHost[];
 extern const char kChromeUINetInternalsURL[];
 extern const char kChromeUINewTabHost[];
-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));
+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);
       }
-       break;
-     }
+      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
-@@ -28,6 +28,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
+@@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
 // String containing proxy bypass rules. For a specification of the
 // expected syntax see net::ProxyBypassRules::ParseFromString().
 const char kProxyBypassList[] = "bypass_list";
@@ -1040,31 +1192,47 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 
 }  // namespace
 
-@@ -79,29 +81,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
+@@ -76,6 +78,14 @@ bool ProxyConfigDictionary::HasBypassList() const {
+   return dict_.Find(kProxyBypassList);
+ }
+ 
+bool ProxyConfigDictionary::HasReverseBypass() const {
+  const base::Value* value = dict_.Find(kProxyReverseBypass);
+  if (!value || !value->is_bool()) {
+    return false;
+  }
+  return value->GetBool();
+}
+
+ const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
+   return dict_;
+ }
+@@ -83,13 +93,13 @@ const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
 // static
- base::Value ProxyConfigDictionary::CreateDirect() {
+ base::Value::Dict ProxyConfigDictionary::CreateDirect() {
   return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
- base::Value ProxyConfigDictionary::CreateAutoDetect() {
+ base::Value::Dict ProxyConfigDictionary::CreateAutoDetect() {
   return CreateDictionary(ProxyPrefs::MODE_AUTO_DETECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
- base::Value ProxyConfigDictionary::CreatePacScript(const std::string& pac_url,
-                                                    bool pac_mandatory) {
+@@ -97,16 +107,17 @@ base::Value::Dict ProxyConfigDictionary::CreatePacScript(
+     const std::string& pac_url,
+     bool pac_mandatory) {
   return CreateDictionary(ProxyPrefs::MODE_PAC_SCRIPT, pac_url, pac_mandatory,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
- base::Value ProxyConfigDictionary::CreateFixedServers(
+ base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
     const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
@@ -1076,33 +1244,33 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   } else {
     return CreateDirect();
   }
-@@ -110,7 +113,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
+@@ -115,7 +126,7 @@ base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
 // static
- base::Value ProxyConfigDictionary::CreateSystem() {
+ base::Value::Dict ProxyConfigDictionary::CreateSystem() {
   return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
-@@ -119,7 +122,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -124,7 +135,8 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
     const std::string& pac_url,
     bool pac_mandatory,
     const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
 +    bool reverse_bypass) {
-   base::Value dict(base::Value::Type::DICTIONARY);
-   dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode)));
+   base::Value::Dict dict;
+   dict.Set(kProxyMode, base::Value(ProxyModeToString(mode)));
   if (!pac_url.empty()) {
-@@ -128,8 +132,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -133,8 +145,10 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
   }
   if (!proxy_server.empty())
-     dict.SetKey(kProxyServer, base::Value(proxy_server));
+     dict.Set(kProxyServer, base::Value(proxy_server));
 -  if (!bypass_list.empty())
 +  if (!bypass_list.empty()) {
-     dict.SetKey(kProxyBypassList, base::Value(bypass_list));
-+    dict.SetKey(kProxyReverseBypass, base::Value(reverse_bypass));
+     dict.Set(kProxyBypassList, base::Value(bypass_list));
+    dict.Set(kProxyReverseBypass, base::Value(reverse_bypass));
 +  }
   return dict;
 }
@@ -1110,30 +1278,59 @@ 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 {
-   static base::Value CreatePacScript(const std::string& pac_url,
-                                      bool pac_mandatory);
-   static base::Value CreateFixedServers(const std::string& proxy_server,
-                                        const std::string& bypass_list);
-+                                        const std::string& bypass_list,
-+                                        bool reverse_bypass);
-   static base::Value CreateSystem();
+@@ -42,6 +42,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::Dict& GetDictionary() const;
+ 
+@@ -50,7 +51,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+   static base::Value::Dict CreatePacScript(const std::string& pac_url,
+                                            bool pac_mandatory);
+   static base::Value::Dict CreateFixedServers(const std::string& proxy_server,
+-                                              const std::string& bypass_list);
+                                              const std::string& bypass_list,
+                                              bool reverse_bypass);
+   static base::Value::Dict CreateSystem();
 
   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
-@@ -62,7 +63,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-                                       const std::string& pac_url,
-                                       bool pac_mandatory,
-                                       const std::string& proxy_server,
-                                      const std::string& bypass_list);
-+                                      const std::string& bypass_list,
-+                                      bool reverse_bypass);
- 
-   base::Value dict_;
+@@ -66,7 +68,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+                                             const std::string& pac_url,
+                                             bool pac_mandatory,
+                                             const std::string& proxy_server,
+-                                            const std::string& bypass_list);
+                                            const std::string& bypass_list,
+                                            bool reverse_bypass);
 
+   base::Value::Dict dict_;
+ };
+diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
+--- a/components/proxy_config/proxy_policy_handler.cc
+++ b/components/proxy_config/proxy_policy_handler.cc
+@@ -263,7 +263,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
+             server->GetString(), bypass_list && bypass_list->is_string()
+                                      ? bypass_list->GetString()
+-                                     : std::string()));
+                                     : std::string(), false));
+       }
+       break;
+     }
 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) {
+@@ -109,7 +109,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.
+@@ -140,6 +140,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
   }
 }
 
@@ -1142,13 +1339,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 += ProxyServerToProxyUri(proxy_server) + ";";
 +    }
-+    // 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) {
@@ -1161,19 +1363,19 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +  std::string list;
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_http.GetAll()) {
-+    list += "http=" + proxy_server.ToURI() + ";";
+    list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_https.GetAll()) {
-+    list += "https=" + proxy_server.ToURI() + ";";
+    list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_ftp.GetAll()) {
-+    list += "ftp=" + proxy_server.ToURI() + ";";
+    list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       fallback_proxies.GetAll()) {
-+    list += "socks=" + proxy_server.ToURI() + ";";
+    list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
 +  }
 +  if (list.length() != 0 ) {
 +    // remove last semicolon
@@ -1198,6 +1400,5 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
 
     // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
     // &fallback_proxies}, or NULL if there is no proxy to use.
-- 
-2.17.1
-
+--
+2.25.1
@@ -2,101 +2,201 @@ 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/PrivacySettings.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
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../java/res/xml/privacy_preferences.xml      | 10 ++++++++
+ .../browser/LaunchIntentDispatcher.java       | 22 +++++++++++++++++
+ .../IncognitoCustomTabIntentDataProvider.java |  6 +++++
+ .../privacy/settings/PrivacySettings.java     | 24 +++++++++++++++++++
+ .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++++-
+ .../strings/android_chrome_strings.grd        | 15 ++++++++++++
+ 6 files changed, 82 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
-@@ -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.DoNotTrackSettings"
+@@ -58,6 +58,16 @@ found in the LICENSE file.
+         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;
+@@ -45,6 +45,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.PrivacySettings;
- import org.chromium.chrome.browser.util.IntentUtils;
- import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.chrome.browser.tab.TabLaunchType;
+ import org.chromium.chrome.browser.translate.TranslateIntentHandler;
+ import org.chromium.chrome.browser.util.AndroidTaskUtils;
 import org.chromium.chrome.browser.vr.VrModuleProvider;
-@@ -251,6 +252,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -58,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.
+@@ -268,6 +271,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
-+        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, 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/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-@@ -41,6 +41,8 @@ public class PrivacySettings
+@@ -287,6 +293,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+         newIntent.setData(uri);
+         newIntent.setClassName(context, CustomTabActivity.class.getName());
 
+        if (ContextUtils.getAppSharedPreferences()
+                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
+            newIntent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
+
+         // Since configureIntentForResizableCustomTab() might change the componenet/class
+         // associated with the passed intent, it needs to be called after #setClassName(context,
+         // CustomTabActivity.class.getName());
+@@ -438,6 +448,18 @@ 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());
+                IntentHandler.setTabLaunchType(newIntent, TabLaunchType.FROM_EXTERNAL_APP);
+                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/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
+@@ -35,6 +35,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+ import java.util.ArrayList;
+ import java.util.List;
+ 
+import org.chromium.base.ContextUtils;
+import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
+
+ /**
+  * A model class that parses the incoming intent for incognito Custom Tabs specific customization
+  * data.
+@@ -108,6 +111,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+     }
+ 
+     private static boolean isIntentFromThirdPartyAllowed() {
+        if (ContextUtils.getAppSharedPreferences()
+                        .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
+            return true;
+         return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
+     }
+ 
+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
+@@ -76,6 +76,9 @@ public class PrivacySettings
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+     private IncognitoLockSettings mIncognitoLockSettings;
 
-+    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 PrivacySettings
-                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
-         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
-             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
+         PrivacyPreferencesManagerImpl privacyPrefManager =
+@@ -135,6 +138,9 @@ public class PrivacySettings
+         updatePreferences();
+     }
+ 
+    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();
+@@ -151,6 +157,14 @@ public class PrivacySettings
+         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.SEARCH_SUGGEST_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);
+        } 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();
         }
-@@ -111,6 +117,11 @@ public class PrivacySettings
-                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
+         return true;
+     }
+@@ -173,6 +187,16 @@ public class PrivacySettings
+             canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
-+        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
+        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/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
+--- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
+++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
+@@ -84,7 +84,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
+     public static boolean isOpenedFromExternalApp(Tab tab) {
+         TabAssociatedApp app = get(tab);
+         if (app == null) return false;
+-
+        if (ContextUtils.getAppSharedPreferences()
+                        .getBoolean("open_external_links_incognito", false) &&
+                tab.isIncognito() &&
+                tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP)
+            return true;
+         String packageName = ContextUtils.getApplicationContext().getPackageName();
+         return tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP
+                 && !TextUtils.equals(app.getAppId(), packageName);
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3863,6 +3863,13 @@ Only you can see what your camera is looking at. The site can't see your camera'
+@@ -4783,6 +4783,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 +206,17 @@ 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]">
-- 
-2.17.1
-
+       <!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
+--
+2.25.1
@@ -3,37 +3,103 @@ Date: Tue, 31 Jan 2017 22:12:27 -0500
 Subject: Add exit menu item

 Corrected Exit functionality
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- 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/ApplicationLifetime.java    | 2 ++
+ .../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(-)
+ 6 files changed, 26 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
-@@ -87,6 +87,8 @@
-             android:title="@string/menu_help" />
-         <item android:id="@+id/enter_vr_id"
-             android:title="@string/enter_vr" />
+@@ -161,6 +161,9 @@ found in the LICENSE file.
+         <item android:id="@+id/managed_by_menu_id"
+             android:title="@string/managed_browser"
+             android:icon="@drawable/ic_business" />
 +        <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
-@@ -2044,6 +2044,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             AddToHomescreenCoordinator.showForAppMenu(
-                     this, getWindowAndroid(), getModalDialogManager(), currentTab.getWebContents());
-             RecordUserAction.record("MobileMenuAddToHomescreen");
+@@ -187,6 +190,9 @@ found in the LICENSE file.
+         <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 when the tablet has no visible tabs -->
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java
+@@ -6,6 +6,7 @@ package org.chromium.chrome.browser;
+ 
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
+ 
+ /**
+  * Watches for when Chrome is told to restart itself.
+@@ -42,6 +43,7 @@ public class ApplicationLifetime {
+ 
+     @CalledByNative
+     public static void terminate(boolean restart) {
+        IncognitoNotificationManager.dismissIncognitoNotification();
+         for (Observer observer : sObservers) {
+             observer.onTerminate(restart);
+         }
+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
+@@ -225,6 +225,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.
+@@ -2202,6 +2204,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.
+             CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
+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
+@@ -63,6 +63,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;
+@@ -2332,6 +2333,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,16 +119,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
-@@ -2818,6 +2818,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
-         Settings
+@@ -3470,6 +3470,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
+         Dark theme
       </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
-
+--
+2.25.1
@@ -0,0 +1,140 @@
+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.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/about_flags.cc                 | 22 ++++++++++++++++++-
+ .../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(+), 1 deletion(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -539,6 +539,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if BUILDFLAG(IS_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"},
+};
+
+ const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
+     {"mode", "always-none"}};
+ const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = {
+@@ -4428,7 +4444,11 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsMac | kOsLinux | kOsWin,
+      FEATURE_VALUE_TYPE(features::kSystemNotifications)},
+ #endif  // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH)
+-#if BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_ANDROID) // Bromite autocomplete filtering
+    {"omnibox-autocomplete-filtering",
+     "Omnibox Autocomplete Filtering",
+     "Restrict omnibox autocomplete results to a combination of search suggestions (if enabled), bookmarks, and internal chrome pages.",
+     kOsAll, MULTI_VALUE_TYPE(kOmniboxAutocompleteFiltering)},
+     {"adaptive-button-in-top-toolbar",
+      flag_descriptions::kAdaptiveButtonInTopToolbarName,
+      flag_descriptions::kAdaptiveButtonInTopToolbarDescription, kOsAndroid,
+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_functions.h"
+@@ -337,6 +339,15 @@ AutocompleteController::AutocompleteController(
+       is_cros_launcher_(is_cros_launcher),
+       search_service_worker_signal_sent_(false),
+       template_url_service_(provider_client_->GetTemplateURLService()) {
+  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;
+  }
+   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
+ 
+   if (OmniboxFieldTrial::kAutocompleteStabilityAsyncProvidersFirst.Get()) {
+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
+@@ -475,6 +475,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"
+@@ -671,6 +672,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
+@@ -7,6 +7,8 @@
+ #include <stddef.h>
+ 
+ #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/i18n/char_iterator.h"
+@@ -608,6 +610,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.25.1
@@ -0,0 +1,112 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Mon, 1 Feb 2021 19:18:55 +0200
+Subject: Add flag for save-data-header
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/about_flags.cc                             | 5 ++++-
+ chrome/browser/flag_descriptions.cc                       | 4 ++++
+ chrome/browser/flag_descriptions.h                        | 3 +++
+ .../browser/loader/browser_initiated_resource_request.cc  | 8 ++++++++
+ services/network/public/cpp/features.cc                   | 5 +++++
+ services/network/public/cpp/features.h                    | 2 +-
+ 6 files changed, 25 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
+@@ -5018,7 +5018,10 @@ const FeatureEntry kFeatureEntries[] = {
+     {"force-text-direction", flag_descriptions::kForceTextDirectionName,
+      flag_descriptions::kForceTextDirectionDescription, kOsAll,
+      MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
+-#if BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_ANDROID) // Bromite save data header
+    {"enable-save-data-header", flag_descriptions::kEnableSaveDataHeaderName,
+     flag_descriptions::kEnableSaveDataHeaderDescription, kOsAndroid,
+     FEATURE_VALUE_TYPE(network::features::kEnableSaveDataHeader)},
+     {"force-update-menu-type", flag_descriptions::kUpdateMenuTypeName,
+      flag_descriptions::kUpdateMenuTypeDescription, kOsAndroid,
+      MULTI_VALUE_TYPE(kForceUpdateMenuTypeChoices)},
+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
+@@ -1222,6 +1222,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
+     "Show deprecation notifications and disable functionality for Alt based "
+     "six pack deprecations. The Search based versions continue to work.";
+ 
+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
+@@ -650,6 +650,9 @@ extern const char kDeprecateAltClickDescription[];
+ extern const char kDeprecateAltBasedSixPackName[];
+ extern const char kDeprecateAltBasedSixPackDescription[];
+ 
+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
+@@ -4,6 +4,9 @@
+ 
+ #include "content/browser/loader/browser_initiated_resource_request.h"
+ 
+#include "base/feature_list.h"
+#include "services/network/public/cpp/features.h"
+
+ #include "content/public/browser/browser_context.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/content_browser_client.h"
+@@ -37,8 +40,13 @@ void UpdateAdditionalHeadersForBrowserInitiatedRequest(
+   // Save-Data was previously included in hints for workers, thus we cannot
+   // remove it for the time being. If you're reading this, consider building
+   // permissions policies for workers and/or deprecating this inclusion.
+  bool setHeader = false;
+   if (is_for_worker_script &&
+       GetContentClient()->browser()->IsDataSaverEnabled(browser_context)) {
+    setHeader = true;
+  }
+  setHeader |= base::FeatureList::IsEnabled(network::features::kEnableSaveDataHeader);
+  if (setHeader) {
+     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
+@@ -20,6 +20,11 @@ BASE_FEATURE(kExpectCTReporting,
+              "ExpectCTReporting",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+// Enable save-data header separately (without enabled data reduction service).
+BASE_FEATURE(kEnableSaveDataHeader,
+             "EnableSaveDataHeader",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
+ BASE_FEATURE(kNetworkErrorLogging,
+              "NetworkErrorLogging",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+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
+@@ -50,7 +50,7 @@ extern const base::FeatureParam<TrustTokenOriginTrialSpec>
+     kTrustTokenOperationsRequiringOriginTrial;
+ COMPONENT_EXPORT(NETWORK_CPP)
+ extern const base::FeatureParam<bool> kPlatformProvidedTrustTokenIssuance;
+-
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader);
+ COMPONENT_EXPORT(NETWORK_CPP)
+ BASE_DECLARE_FEATURE(kWebSocketReassembleShortMessages);
+ 
+--
+2.25.1
@@ -5,6 +5,8 @@ Subject: Add flag to configure maximum connections per host
 With the introduction of this flag it is possible to increase the maximum
 allowed connections per host; this can however be detrimental to devices
 with limited CPU/memory resources and it is disabled by default.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/browser/about_flags.cc                   |  8 ++++++++
 chrome/browser/flag_descriptions.cc             |  4 ++++
@@ -19,8 +21,8 @@ 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
-@@ -736,6 +736,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
-      net::kEffectiveConnectionType4G},
+@@ -1097,6 +1097,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
+      switches::kForceDisplayColorProfile, "hdr10"},
 };
 
 +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
@@ -28,25 +30,25 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 +    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
 +};
 +
- // 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 ==
-@@ -2695,6 +2700,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kPassiveDocumentEventListenersName,
-      flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll,
-      FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)},
+ const FeatureEntry::Choice kMemlogModeChoices[] = {
+     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
+     {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
+@@ -4917,6 +4922,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
-@@ -1181,6 +1181,10 @@ const char kMediaInspectorLoggingDescription[] =
-     "project; #enable-devtools-experiments must also be enabled as well on "
-     "desktop platforms";
+@@ -1830,6 +1830,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
+     "websites abusing the API will still eventually have their setTimeouts "
+     "clamped.";
 
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -58,9 +60,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
-@@ -703,6 +703,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
- extern const char kMediaInspectorLoggingName[];
- extern const char kMediaInspectorLoggingDescription[];
+@@ -1037,6 +1037,9 @@ extern const char kLogJsConsoleMessagesDescription[];
+ extern const char kUnthrottledNestedTimeoutName[];
+ extern const char kUnthrottledNestedTimeoutDescription[];
 
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -96,7 +98,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 +112,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
-@@ -73,6 +73,7 @@ executable("make_top_domain_list_variables") {
-     "//base",
+@@ -89,6 +89,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 @@
+@@ -19,6 +19,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"
+@@ -172,6 +176,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);
@@ -152,6 +154,5 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
   return g_max_sockets_per_group[pool_type];
 }
 
-- 
-2.17.1
-
+--
+2.25.1
@@ -3,33 +3,35 @@ Date: Thu, 25 Oct 2018 23:13:34 +0200
 Subject: Add flag to control video playback resume feature

 Disable it by default on Android as it is everywhere else
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 chrome/browser/about_flags.cc       | 4 ++++
 chrome/browser/flag_descriptions.cc | 5 +++++
 chrome/browser/flag_descriptions.h  | 3 +++
- media/base/media_switches.cc        | 6 +-----
- 4 files changed, 13 insertions(+), 5 deletions(-)
+ media/base/media_switches.cc        | 8 ++------
+ 4 files changed, 14 insertions(+), 6 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
-@@ -1697,6 +1697,10 @@ const FeatureEntry kFeatureEntries[] = {
- #if defined(USE_AURA)
-     {"overlay-scrollbars", flag_descriptions::kOverlayScrollbarsName,
-      flag_descriptions::kOverlayScrollbarsDescription,
+@@ -3730,6 +3730,10 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
+ #endif  // ENABLE_EXTENSIONS
+ #if BUILDFLAG(IS_ANDROID)
 +    {"resume-background-video",
 +     flag_descriptions::kResumeBackgroundVideoName,
 +     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
-      // Uses the system preference on Mac (a different implementation).
-      // On Android, this is always enabled.
-      kOsAura, FEATURE_VALUE_TYPE(features::kOverlayScrollbar)},
+     {"osk-resizes-visual-viewport-by-default",
+      flag_descriptions::kEnableOskResizesVisualViewportByDefaultName,
+      flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
 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
-@@ -800,6 +800,11 @@ const char kMemlogStackModeNative[] = "Native";
- const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
- const char kMemlogStackModePseudo[] = "Trace events";
+@@ -1317,6 +1317,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,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -462,6 +462,9 @@ extern const char kEnablePortalsDescription[];
+@@ -722,6 +722,9 @@ extern const char kEnablePortalsDescription[];
 extern const char kEnablePortalsCrossOriginName[];
 extern const char kEnablePortalsCrossOriginDescription[];
 
@@ -55,19 +57,20 @@ 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
-@@ -229,11 +229,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -316,12 +316,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad,
+ // Let videos be resumed via remote controls (for example, the notification)
 // when in background.
- const base::Feature kResumeBackgroundVideo {
-   "resume-background-video",
-#if defined(OS_ANDROID)
-      base::FEATURE_ENABLED_BY_DEFAULT
+ BASE_FEATURE(kResumeBackgroundVideo,
+-             "resume-background-video",
+-#if BUILDFLAG(IS_ANDROID)
+-             base::FEATURE_ENABLED_BY_DEFAULT
 -#else
-      base::FEATURE_DISABLED_BY_DEFAULT
+-             base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
-+   base::FEATURE_DISABLED_BY_DEFAULT
- };
+             "resume-background-video",           // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT    // in Bromite
+ );
 
- // Enable Media Capabilities with finch-parameters.
-- 
-2.17.1
-
+ // When enabled, MediaCapabilities will check with GPU Video Accelerator
+--
+2.25.1
@@ -2,51 +2,51 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sun, 18 Nov 2018 13:06:49 +0100
 Subject: Add flag to disable IPv6 probes

+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                            | 5 +++++
+ chrome/browser/about_flags.cc                            | 4 ++++
 chrome/browser/flag_descriptions.cc                      | 4 ++++
 chrome/browser/flag_descriptions.h                       | 3 +++
 components/subresource_filter/tools/BUILD.gn             | 6 ++++++
 .../url_formatter/spoof_checks/top_domains/BUILD.gn      | 3 ++-
 net/dns/host_resolver_manager.cc                         | 9 ++++++++-
- services/network/public/cpp/features.cc                  | 4 ++++
- services/network/public/cpp/features.h                   | 2 ++
- 8 files changed, 34 insertions(+), 2 deletions(-)
+ services/network/public/cpp/features.cc                  | 5 +++++
+ services/network/public/cpp/features.h                   | 1 +
+ 8 files changed, 33 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
-@@ -3327,6 +3327,11 @@ const FeatureEntry kFeatureEntries[] = {
-          kMarkHttpAsFeatureVariations,
-          "HTTPReallyBadFinal")},
- 
+@@ -6166,6 +6166,10 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
+      flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
 +    {"ipv6-probing",
 +     flag_descriptions::kIPv6ProbingName,
 +     flag_descriptions::kIPv6ProbingDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
-+
- #if !defined(OS_ANDROID)
-     {"enable-web-authentication-testing-api",
-      flag_descriptions::kEnableWebAuthenticationTestingAPIName,
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+     {"shopping-list", commerce::flag_descriptions::kShoppingListName,
 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
-@@ -2376,6 +2376,10 @@ const char kContextualSearchRankerQueryDescription[] =
+@@ -3517,6 +3517,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
+     "Enables sending real-time engagement signals (e.g. scroll) through "
+     "CustomTabsCallback.";
 
- const char kContextualSearchSecondTapName[] =
-     "Contextual Search second tap triggering";
 +const char kIPv6ProbingName[] = "Enable IPv6 probing.";
 +const char kIPv6ProbingDescription[] =
 +    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
 +
- const char kContextualSearchSecondTapDescription[] =
-     "Enables triggering on a second tap gesture even when Ranker would "
-     "normally suppress that tap.";
+ const char kChimeAlwaysShowNotificationDescription[] =
+     "A debug flag to always show Chime notification after receiving a payload.";
+ const char kChimeAlwaysShowNotificationName[] =
 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 kEnableWasmThreadsName[];
- extern const char kEnableWasmThreadsDescription[];
+@@ -788,6 +788,9 @@ extern const char kEnableWasmLazyCompilationName[];
+ extern const char kEnableWasmLazyCompilationDescription[];
 
 extern const char kEnableWasmTieringName[];
 +extern const char kIPv6ProbingName[];
@@ -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
-@@ -73,7 +73,8 @@ executable("make_top_domain_list_variables") {
-     "//base",
+@@ -89,7 +89,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 @@
+@@ -104,6 +104,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)
-@@ -3593,8 +3594,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
-   bool cached = true;
-   if ((tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
-       kIPv6ProbePeriodMs) {
+@@ -3758,8 +3759,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,13 +128,14 @@ 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
-@@ -52,6 +52,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
- const base::Feature kThrottleDelayable{"ThrottleDelayable",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -38,6 +38,11 @@ BASE_FEATURE(kThrottleDelayable,
+              "ThrottleDelayable",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +// Enable IPv6 ping probes to RIPE DNS.
-+const base::Feature kIPv6Probing{"IPv6Probing",
-+                                       base::FEATURE_ENABLED_BY_DEFAULT};
+BASE_FEATURE(kIPv6Probing,
+             "IPv6Probing",
+             base::FEATURE_ENABLED_BY_DEFAULT);
 +
 // When kPriorityRequestsDelayableOnSlowConnections is enabled, HTTP
 // requests fetched from a SPDY/QUIC/H2 proxies can be delayed by the
@@ -142,15 +143,13 @@ 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;
+@@ -17,6 +17,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kExpectCTReporting);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNetworkErrorLogging);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kReporting);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kThrottleDelayable);
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kIPv6Probing);
 COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kNetworkService;
+ BASE_DECLARE_FEATURE(kDelayRequestsOnMultiplexedConnections);
 COMPONENT_EXPORT(NETWORK_CPP)
-+extern const base::Feature kIPv6Probing;
-+COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kOutOfBlinkCors;
- COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kReporting;
-- 
-2.17.1
-
+--
+2.25.1
@@ -1,53 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 16 Nov 2019 11:18:09 +0100
-Subject: Add flag to disable WebGL
-
---
- chrome/browser/about_flags.cc       | 3 +++
- chrome/browser/flag_descriptions.cc | 4 ++++
- chrome/browser/flag_descriptions.h  | 3 +++
- 3 files changed, 10 insertions(+)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1544,6 +1544,9 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kAccelerated2dCanvasName,
-      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
-+    {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName,
-+     flag_descriptions::kDisableWebGLDescription, kOsAll,
-+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)},
-     {"composited-layer-borders", flag_descriptions::kCompositedLayerBordersName,
-      flag_descriptions::kCompositedLayerBordersDescription, kOsAll,
-      SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -414,6 +414,10 @@ const char kDevtoolsExperimentsDescription[] =
-     "Enables Developer Tools experiments. Use Settings panel in Developer "
-     "Tools to toggle individual experiments.";
- 
-+const char kDisableWebGLName[] = "Disable all versions of WebGL";
-+
-+const char kDisableWebGLDescription[] = "Disable all versions of WebGL";
-+
- const char kDisableBestEffortTasksName[] = "Skip best effort tasks";
- const char kDisableBestEffortTasksDescription[] =
-     "With this flag on, tasks of the lowest priority will not be executed "
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -264,6 +264,9 @@ extern const char kDeviceDiscoveryNotificationsDescription[];
- extern const char kDevtoolsExperimentsName[];
- extern const char kDevtoolsExperimentsDescription[];
- 
-+extern const char kDisableWebGLName[];
-+extern const char kDisableWebGLDescription[];
-+
- extern const char kDisableBestEffortTasksName[];
- extern const char kDisableBestEffortTasksDescription[];
- 
-- 
-2.17.1
-
@@ -0,0 +1,58 @@
+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
+
+Adds a new flag that allows to control the switch with same name;
+when flag is disabled no external intent will ever be allowed, for any URL.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ 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
+@@ -3692,6 +3692,9 @@ const FeatureEntry kFeatureEntries[] = {
+     {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
+      flag_descriptions::kUiPartialSwapDescription, kOsAll,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
+    {"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
+@@ -3874,6 +3874,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
+ const char kPhotoPickerVideoSupportDescription[] =
+     "Enables video files to be shown in the Photo Picker dialog";
+ 
+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
+@@ -2236,6 +2236,9 @@ extern const char kQueryTilesNTPDescription[];
+ extern const char kQueryTilesOnStartName[];
+ extern const char kQueryTilesOnStartDescription[];
+ 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.25.1
@@ -0,0 +1,156 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Jun 2021 17:35:39 +0200
+Subject: Add flag to disable vibration
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/about_flags.cc                                | 4 ++++
+ chrome/browser/flag_descriptions.cc                          | 3 +++
+ chrome/browser/flag_descriptions.h                           | 2 ++
+ content/child/runtime_features.cc                            | 1 +
+ content/public/common/content_features.cc                    | 5 +++++
+ 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, 29 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
+@@ -7623,6 +7623,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
+@@ -6271,6 +6271,9 @@ const char kLacrosScreenCoordinatesEnabledDescription[] =
+     "moveBy, moveTo or session restore.";
+ #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
+ 
+const char kEnableVibrationName[] = "Vibration";
+const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed.";
+
+ #if BUILDFLAG(IS_CHROMEOS)
+ const char kAllowDefaultWebAppMigrationForChromeOsManagedUsersName[] =
+     "Allow default web app migration for ChromeOS managed users";
+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
+@@ -3847,6 +3847,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+ extern const char kWebUITabStripTabDragIntegrationDescription[];
+ #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
+ 
+extern const char kEnableVibrationName[];
+extern const char kEnableVibrationDescription[];
+ #if defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
+ 
+ extern const char kAutofillCreditCardUploadName[];
+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 BUILDFLAG(IS_ANDROID)
+   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
+     WebRuntimeFeatures::EnableMediaSession(false);
+  WebRuntimeFeatures::EnableVibration(base::FeatureList::IsEnabled(features::kVibration));
+ #endif
+ 
+ #if BUILDFLAG(IS_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
+@@ -131,6 +131,11 @@ BASE_FEATURE(kBackForwardCacheMemoryControls,
+ #endif
+ );
+ 
+// Enables vibration; an user gesture will still be required if enabled.
+BASE_FEATURE(kVibration,
+             "Vibration",
+             base::FEATURE_DISABLED_BY_DEFAULT);
+
+ // When this feature is enabled, private network requests initiated from
+ // non-secure contexts in the `public` address space  are blocked.
+ //
+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
+@@ -322,6 +322,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
+     kCompositorLockTimeout;
+ 
+ #endif  // BUILDFLAG(IS_ANDROID)
+CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration);
+
+ 
+ #if BUILDFLAG(IS_MAC)
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDeviceMonitorMac);
+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
+@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+   static void EnableFingerprintingCanvasMeasureTextNoise(bool);
+   static void EnableFingerprintingCanvasImageDataNoise(bool);
+   static void EnableFluentScrollbars(bool);
+  static void EnableVibration(bool);
+ 
+   WebRuntimeFeatures() = delete;
+ };
+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
+@@ -29,6 +29,7 @@
+ #include "third_party/blink/renderer/core/frame/local_frame.h"
+ #include "third_party/blink/renderer/core/frame/navigator.h"
+ #include "third_party/blink/renderer/core/page/page.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+ 
+ // Maximum number of entries in a vibration pattern.
+ const unsigned kVibrationPatternLengthMax = 99;
+@@ -152,6 +153,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
+@@ -52,6 +52,10 @@ void WebRuntimeFeatures::EnableTestOnlyFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetTestFeaturesEnabled(enable);
+ }
+ 
+void WebRuntimeFeatures::EnableVibration(bool enable) {
+  RuntimeEnabledFeatures::SetVibrationEnabled(enable);
+}
+
+ void WebRuntimeFeatures::EnableOriginTrialControlledFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetOriginTrialControlledFeaturesEnabled(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
+@@ -1903,6 +1903,10 @@
+       name: "OrientationEvent",
+       status: {"Android": "stable"},
+     },
+    {
+      name: "Vibration",
+      status: "stable",
+    },
+     {
+       name: "OriginIsolationHeader",
+       status: "stable",
+--
+2.25.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
-@@ -1771,6 +1771,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
-@@ -594,6 +594,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
-@@ -362,6 +362,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
-@@ -756,6 +756,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
-@@ -165,6 +165,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
- CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
- CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi;
- 
-+CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
-+
- #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
-@@ -100,6 +100,8 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
-   BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
-   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
-+  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
-@@ -245,9 +245,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
-@@ -183,6 +183,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
-@@ -1171,6 +1171,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,699 @@
+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
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/java/res/menu/main_menu.xml    |  7 +++
+ .../chrome/browser/ChromeTabbedActivity.java  | 24 ++++++++
+ .../browser/bookmarks/BookmarkBridge.java     | 61 +++++++++++++++++++
+ .../browser/bookmarks/BookmarkUtils.java      |  4 ++
+ .../bookmarks/android/bookmark_bridge.cc      | 17 ++++++
+ .../bookmarks/android/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, 201 insertions(+), 10 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
+@@ -66,6 +66,10 @@ found in the LICENSE file.
+         <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" />
+@@ -184,6 +188,9 @@ found in the LICENSE file.
+         <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/menu_select_tabs"
+             android:title="@string/menu_select_tabs"
+             android:icon="@drawable/ic_select_tabs" />
+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
+@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
+ import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
+ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
+ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+ import org.chromium.chrome.browser.compositor.layouts.Layout;
+ import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
+ import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
+@@ -2217,6 +2218,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+             CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
+                     () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
+             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
+             CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
+@@ -2269,6 +2272,27 @@ 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 BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();
+        bookmarkModel.finishLoadingBookmarkModel(() -> {
+            for (int i = 0; i < tabModel.getCount(); i++) {
+                Tab tab = tabModel.getTabAt(i);
+                if (tab.isNativePage()) {
+                    continue;
+                }
+                bookmarkModel.addToTabsCollection(this, tab);
+            }
+            bookmarkModel.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
+@@ -29,6 +29,7 @@ import com.google.common.primitives.UnsignedLongs;
+ import com.google.protobuf.InvalidProtocolBufferException;
+ 
+ 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;
+@@ -40,6 +41,10 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.read_later.ReadingListUtils;
+ 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.BookmarkItem;
+ import org.chromium.components.bookmarks.BookmarkType;
+@@ -84,6 +89,8 @@ import java.io.File;
+  * bookmark model stored in native.
+  */
+ class BookmarkBridge {
+    private static final String TAG = "BookmarkBridge";
+
+     private final Profile mProfile;
+     private boolean mIsDestroyed;
+     private boolean mIsDoingExtensiveChanges;
+@@ -356,6 +363,16 @@ 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.
+      */
+@@ -957,6 +974,49 @@ 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();
+        BookmarkId existingId = getUserBookmarkIdForTab(tab);
+        if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
+            BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), 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());
+
+        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.
+@@ -1167,6 +1227,7 @@ 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
+@@ -648,6 +648,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 =
+@@ -673,6 +674,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/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
+--- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
+@@ -431,6 +431,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());
+@@ -478,6 +483,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(),
+   };
+@@ -530,6 +536,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/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
+--- a/chrome/browser/bookmarks/android/bookmark_bridge.h
+++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
+@@ -119,6 +119,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
+@@ -190,6 +190,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);
+@@ -201,7 +203,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;
+     }
+@@ -466,6 +470,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
+@@ -144,6 +144,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
+@@ -79,7 +79,7 @@ public class DownloadLocationCustomView
+         mDirectoryAdapter.update();
+     }
+ 
+-    void setTitle(CharSequence title) {
+    public void setTitle(CharSequence title) {
+         mTitle.setText(title);
+     }
+ 
+@@ -87,7 +87,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
+@@ -3603,6 +3603,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
+         Select tabs
+       </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
+@@ -35,6 +35,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "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";
+@@ -78,7 +79,8 @@ BookmarkCodec::~BookmarkCodec() = default;
+ base::Value BookmarkCodec::Encode(BookmarkModel* model,
+                                   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(),
+                 model->root_node()->GetUnsyncedMetaInfoMap(),
+                 std::move(sync_metadata_str));
+ }
+@@ -87,6 +89,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 BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
+     std::string sync_metadata_str) {
+@@ -109,6 +112,7 @@ base::Value BookmarkCodec::Encode(
+   roots.SetKey(kBookmarkBarFolderNameKey, 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));
+   if (model_unsynced_meta_info_map) {
+@@ -130,6 +134,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();
+@@ -137,7 +142,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;
+@@ -145,12 +151,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;
+ }
+@@ -207,6 +214,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())
+@@ -238,6 +246,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+     return false;
+ 
+   DecodeNode(*bb_value, nullptr, bb_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);
+
+   DecodeNode(*other_folder_value, nullptr, other_folder_node);
+   DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
+ 
+@@ -508,11 +522,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
+@@ -49,6 +49,7 @@ class BookmarkCodec {
+       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 BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
+       std::string sync_metadata_str);
+@@ -62,6 +63,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);
+ 
+@@ -113,6 +115,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[];
+   static const char kDateLastUsed[];
+ 
+   // Possible values for kTypeKey.
+@@ -130,6 +133,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);
+ 
+@@ -141,7 +145,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
+@@ -37,6 +37,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
+@@ -47,6 +47,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_); }
+@@ -112,6 +113,7 @@ class BookmarkLoadDetails {
+       nullptr;
+   raw_ptr<BookmarkPermanentNode, DanglingUntriaged> 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
+@@ -670,7 +670,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) {
+@@ -926,6 +926,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
+@@ -122,6 +122,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_;
+@@ -446,6 +452,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+       nullptr;
+   raw_ptr<BookmarkPermanentNode, DanglingUntriaged> other_node_ = nullptr;
+   raw_ptr<BookmarkPermanentNode, DanglingUntriaged> mobile_node_ = nullptr;
+  raw_ptr<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";
+@@ -275,6 +279,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
+@@ -35,6 +35,7 @@ class BookmarkNode : public ui::TreeNode<BookmarkNode>, public TitledUrlNode {
+     FOLDER,
+     BOOKMARK_BAR,
+     OTHER_NODE,
+    TABS_COLLECTION,
+     MOBILE
+   };
+ 
+@@ -52,6 +53,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.
+@@ -270,6 +272,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
+@@ -58,7 +58,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
+@@ -446,6 +446,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.25.1
@@ -0,0 +1,130 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 13 Jul 2020 00:37:06 +0200
+Subject: Add menu item to view source
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../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 +++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java | 18 ++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java    |  1 +
+ .../android/strings/android_chrome_strings.grd |  4 ++++
+ 7 files changed, 36 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
+@@ -51,6 +51,9 @@ found in the LICENSE file.
+         <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
+@@ -108,6 +108,9 @@ found in the LICENSE file.
+         <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
+@@ -2243,6 +2243,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.openMostRecentlyClosedEntry();
+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
+@@ -2488,6 +2488,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
+@@ -550,6 +550,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                         isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
+ 
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
+        updateViewSourceMenuItem(menu, currentTab);
+ 
+         updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
+ 
+@@ -1244,6 +1245,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         stopPriceTrackingMenuItem.setVisible(false);
+     }
+ 
+    /**
+     * 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);
+        boolean visible = false;
+        if (currentTab != null) {
+                String url = currentTab.getUrl().getSpec();
+                visible = !url.isEmpty() && !url.startsWith("view-source:");
+        }
+        viewSourceMenuItem.setVisible(visible);
+    }
+
+     /**
+      * 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
+@@ -228,6 +228,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+ 
+             updateRequestDesktopSiteMenuItem(
+                     menu, currentTab, requestDesktopSiteVisible, isChromeScheme);
+            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
+@@ -312,6 +312,10 @@ CHAR_LIMIT guidelines:
+         USB
+       </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>
+
+       <!-- Sign-in, sync and personalization preferences -->
+       <message name="IDS_PREFS_SECTION_ACCOUNT_AND_GOOGLE_SERVICES" desc="Title for the group of account-related entries and google services in Settings. [CHAR_LIMIT=32]">
+         You and Google
+--
+2.25.1
@@ -1,266 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Mar 2020 19:56:49 +0100
-Subject: Add missing android_provider
-
---
- third_party/android_provider/BUILD.gn         |  14 ++
- .../android/provider/MediaStoreUtils.java     | 228 ++++++++++++++++++
- 2 files changed, 242 insertions(+)
- create mode 100644 third_party/android_provider/BUILD.gn
- create mode 100644 third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
-
-diff --git a/third_party/android_provider/BUILD.gn b/third_party/android_provider/BUILD.gn
-new file mode 100644
--- /dev/null
-+++ b/third_party/android_provider/BUILD.gn
-@@ -0,0 +1,14 @@
-+# Copyright 2020 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/android/rules.gni")
-+
-+assert(is_android)
-+
-+android_library("android_provider_java") {
-+  sources = [
-+    "java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java",
-+  ]
-+  deps = [ "//third_party/android_deps:androidx_annotation_annotation_java" ]
-+}
-diff --git a/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
-new file mode 100644
--- /dev/null
-+++ b/third_party/android_provider/java/src/org/chromium/third_party/android/provider/MediaStoreUtils.java
-@@ -0,0 +1,228 @@
-+/*
-+ * Copyright (C) 2019 The Android Open Source Project
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ *      http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License
-+ */
-+
-+package org.chromium.third_party.android.provider;
-+
-+import android.content.ContentValues;
-+import android.content.Context;
-+import android.net.Uri;
-+import android.os.ParcelFileDescriptor;
-+import android.provider.MediaStore;
-+import android.provider.MediaStore.DownloadColumns;
-+import android.provider.MediaStore.MediaColumns;
-+import android.util.Log;
-+
-+import androidx.annotation.NonNull;
-+import androidx.annotation.Nullable;
-+
-+import java.io.FileNotFoundException;
-+import java.io.OutputStream;
-+import java.util.Objects;
-+
-+/**
-+ * Utility class to contribute download to the public download collection using
-+ * MediaStore API from Q.
-+ */
-+public class MediaStoreUtils {
-+    private static final String TAG = "MediaStoreUtils";
-+
-+    /**
-+     * Creates a new pending media item using the given parameters. Pending items
-+     * are expected to have a short lifetime, and owners should either
-+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a
-+     * pending item within a few hours after first creating it.
-+     *
-+     * @param context Application context.
-+     * @param params Parameters used to configure the item.
-+     * @return token which can be passed to {@link #openPending(Context, Uri)}
-+     *         to work with this pending item.
-+     */
-+    public static @NonNull Uri createPending(
-+            @NonNull Context context, @NonNull PendingParams params) {
-+        return context.getContentResolver().insert(params.mInsertUri, params.mInsertValues);
-+    }
-+
-+    /**
-+     * Opens a pending media item to make progress on it. You can open a pending
-+     * item multiple times before finally calling either
-+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()}.
-+     *
-+     * @param uri token which was previously returned from
-+     *            {@link #createPending(Context, PendingParams)}.
-+     * @return pending session that was opened.
-+     */
-+    public static @NonNull PendingSession openPending(@NonNull Context context, @NonNull Uri uri) {
-+        return new PendingSession(context, uri);
-+    }
-+
-+    /**
-+     * Parameters that describe a pending media item.
-+     */
-+    public static class PendingParams {
-+        final Uri mInsertUri;
-+        final ContentValues mInsertValues;
-+
-+        /**
-+         * Creates parameters that describe a pending media item.
-+         *
-+         * @param insertUri the {@code content://} Uri where this pending item
-+         *            should be inserted when finally published. For example, to
-+         *            publish an image, use
-+         *            {@link MediaStore.Images.Media#getContentUri(String)}.
-+         * @param displayName Display name of the item.
-+         * @param mimeType MIME type of the item.
-+         */
-+        public PendingParams(
-+                @NonNull Uri insertUri, @NonNull String displayName, @NonNull String mimeType) {
-+            mInsertUri = Objects.requireNonNull(insertUri);
-+            final long now = System.currentTimeMillis() / 1000;
-+            mInsertValues = new ContentValues();
-+            mInsertValues.put(MediaColumns.DISPLAY_NAME, Objects.requireNonNull(displayName));
-+            mInsertValues.put(MediaColumns.MIME_TYPE, Objects.requireNonNull(mimeType));
-+            mInsertValues.put(MediaColumns.DATE_ADDED, now);
-+            mInsertValues.put(MediaColumns.DATE_MODIFIED, now);
-+            try {
-+                setPendingContentValues(this.mInsertValues, true);
-+            } catch (Exception e) {
-+                Log.e(TAG, "Unable to set pending content values.", e);
-+            }
-+        }
-+
-+        /**
-+         * Optionally sets the Uri from where the file has been downloaded. This is used
-+         * for files being added to {@link Downloads} table.
-+         *
-+         * @see DownloadColumns#DOWNLOAD_URI
-+         */
-+        public void setDownloadUri(@Nullable Uri downloadUri) {
-+            if (downloadUri == null) {
-+                mInsertValues.remove(DownloadColumns.DOWNLOAD_URI);
-+            } else {
-+                mInsertValues.put(DownloadColumns.DOWNLOAD_URI, downloadUri.toString());
-+            }
-+        }
-+
-+        /**
-+         * Optionally set the Uri indicating HTTP referer of the file. This is used for
-+         * files being added to {@link Downloads} table.
-+         *
-+         * @see DownloadColumns#REFERER_URI
-+         */
-+        public void setRefererUri(@Nullable Uri refererUri) {
-+            if (refererUri == null) {
-+                mInsertValues.remove(DownloadColumns.REFERER_URI);
-+            } else {
-+                mInsertValues.put(DownloadColumns.REFERER_URI, refererUri.toString());
-+            }
-+        }
-+
-+        /**
-+         * Sets the expiration time of the download.
-+         *
-+         * @time Epoch time in seconds.
-+         */
-+        public void setExpirationTime(long time) {
-+            mInsertValues.put("date_expires", time);
-+        }
-+    }
-+
-+    /**
-+     * Session actively working on a pending media item. Pending items are
-+     * expected to have a short lifetime, and owners should either
-+     * {@link PendingSession#publish()} or {@link PendingSession#abandon()} a
-+     * pending item within a few hours after first creating it.
-+     */
-+    public static class PendingSession implements AutoCloseable {
-+        private final Context mContext;
-+        private final Uri mUri;
-+
-+        /**
-+         * Create a new pending session item to be published.
-+         * @param context Contexxt of the application.
-+         * @param uri Token which was previously returned from
-+         *            {@link #createPending(Context, PendingParams)}.
-+         */
-+        PendingSession(Context context, Uri uri) {
-+            mContext = Objects.requireNonNull(context);
-+            mUri = Objects.requireNonNull(uri);
-+        }
-+
-+        /**
-+         * Open the underlying file representing this media item. When a media
-+         * item is successfully completed, you should
-+         * {@link ParcelFileDescriptor#close()} and then {@link #publish()} it.
-+         *
-+         * @return ParcelFileDescriptor to be written into.
-+         */
-+        public @NonNull ParcelFileDescriptor open() throws FileNotFoundException {
-+            return mContext.getContentResolver().openFileDescriptor(mUri, "rw");
-+        }
-+
-+        /**
-+         * Open the underlying file representing this media item. When a media
-+         * item is successfully completed, you should
-+         * {@link OutputStream#close()} and then {@link #publish()} it.
-+         *
-+         * @return OutputStream to be written into.
-+         */
-+        public @NonNull OutputStream openOutputStream() throws FileNotFoundException {
-+            return mContext.getContentResolver().openOutputStream(mUri);
-+        }
-+
-+        /**
-+         * When this media item is successfully completed, call this method to
-+         * publish and make the final item visible to the user.
-+         *
-+         * @return the final {@code content://} Uri representing the newly
-+         *         published media.
-+         */
-+        public @NonNull Uri publish() {
-+            try {
-+                final ContentValues values = new ContentValues();
-+                setPendingContentValues(values, false);
-+                values.putNull("date_expires");
-+                mContext.getContentResolver().update(mUri, values, null, null);
-+            } catch (Exception e) {
-+                Log.e(TAG, "Unable to publish pending session.", e);
-+            }
-+            return mUri;
-+        }
-+
-+        /**
-+         * When this media item has failed to be completed, call this method to
-+         * destroy the pending item record and any data related to it.
-+         */
-+        public void abandon() {
-+            mContext.getContentResolver().delete(mUri, null, null);
-+        }
-+
-+        @Override
-+        public void close() {
-+            // No resources to close, but at least we can inform people that no
-+            // progress is being actively made.
-+        }
-+    }
-+
-+    /**
-+     * Helper method to set the ContentValues to pending or non-pending.
-+     * @param values ContentValues to be set.
-+     * @param isPending Whether the item is pending.
-+     */
-+    private static void setPendingContentValues(ContentValues values, boolean isPending)
-+            throws Exception {
-+        values.put(MediaColumns.IS_PENDING, isPending ? 1 : 0);
-+    }
-+}
-- 
-2.17.1
-
@@ -1,505 +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/flags/FeatureUtilities.java       | 10 ++
- .../browser/settings/AdBlockEditor.java       | 92 +++++++++++++++++++
- .../browser/settings/AdBlockPreferences.java  | 56 +++++++++++
- chrome/app/generated_resources.grd            | 10 ++
- chrome/browser/android/feature_utilities.cc   |  8 ++
- chrome/browser/browser_process_impl.cc        |  3 +-
- .../net/system_network_context_manager.cc     |  3 +
- .../strings/android_chrome_strings.grd        | 14 +++
- chrome/common/pref_names.cc                   |  3 +
- chrome/common/pref_names.h                    |  1 +
- .../adblock_updater_service.cc                |  6 +-
- .../adblock_updater_service.h                 |  3 +-
- 17 files changed, 303 insertions(+), 5 deletions(-)
- create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
- create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -1296,6 +1296,8 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java",
-   "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
-   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java",
-+  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
-+  "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
-   "java/src/org/chromium/chrome/browser/photo_picker/FileEnumWorkerTask.java",
-   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java",
-   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java",
-diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/java/res/layout/adblock_editor.xml
-new file mode 100644
--- /dev/null
-+++ 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.components.browser_ui.widget.text.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.components.browser_ui.widget.text.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/settings_action_bar_shadow"/>
-+
-+</FrameLayout>
-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ b/chrome/android/java/res/values/values.xml
-@@ -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
-@@ -55,6 +55,11 @@
-         android:key="privacy"
-         android:order="12"
-         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/flags/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/flags/FeatureUtilities.java
-@@ -238,6 +238,14 @@ public class FeatureUtilities {
-                 ChromeFeatureList.isEnabled(ChromeFeatureList.REACHED_CODE_PROFILER));
-     }
- 
-+     public static void setAdBlockFiltersURL(String url) {
-+         FeatureUtilitiesJni.get().setAdBlockFiltersURL(url);
-+     }
-+
-+     public static String getAdBlockFiltersURL() {
-+         return FeatureUtilitiesJni.get().getAdBlockFiltersURL();
-+     }
-+
-     /**
-      * @return True if tab model merging for Android N+ is enabled.
-      */
-@@ -785,5 +793,7 @@ public class FeatureUtilities {
-     @NativeMethods
-     interface Natives {
-         boolean isNetworkServiceWarmUpEnabled();
-+        void setAdBlockFiltersURL(String url);
-+        String getAdBlockFiltersURL();
-     }
- }
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
-new file mode 100644
--- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/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.components.content_settings.ContentSettingsType;
-+import org.chromium.chrome.browser.settings.SettingsUtils;
-+import org.chromium.chrome.browser.flags.FeatureUtilities;
-+import androidx.annotation.VisibleForTesting;
-+import org.chromium.chrome.R;
-+
-+/**
-+ * 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
-@@ -9937,6 +9937,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
-@@ -32,6 +32,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
- } // namespace android
- } // namespace chrome
- 
-+static ScopedJavaLocalRef<jstring> JNI_FeatureUtilities_GetAdBlockFiltersURL(JNIEnv* env) {
-+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
-+}
-+
-+static void JNI_FeatureUtilities_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
-+  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
-+}
-+
- static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
-     JNIEnv* env) {
-   return content::IsOutOfProcessNetworkService() &&
-diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
--- a/chrome/browser/browser_process_impl.cc
-+++ b/chrome/browser/browser_process_impl.cc
-@@ -1035,7 +1035,8 @@ BrowserProcessImpl::adblock_updater() {
-   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
-           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
-           std::move(scheduler),
-          g_browser_process->subresource_filter_ruleset_service());
-+          g_browser_process->subresource_filter_ruleset_service(),
-+          local_state()->GetString(prefs::kAdBlockFiltersURL));
- 
-   return adblock_updater_.get();
- }
-diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
--- a/chrome/browser/net/system_network_context_manager.cc
-+++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -358,6 +358,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-       ssl_config_service_manager_(
-           SSLConfigServiceManager::CreateDefaultManager(local_state_)),
-       proxy_config_monitor_(local_state_) {
-+  local_state_->SetDefaultPrefValue(prefs::kAdBlockFiltersURL,
-+                                    base::Value("https://www.bromite.org/filters/filters.dat"));
- #if !defined(OS_ANDROID)
-   // QuicAllowed was not part of Android policy.
-   const base::Value* value =
-@@ -462,6 +464,7 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
- 
- // static
- void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
-+  registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string());
-   // Register the DnsClient and DoH preferences. The feature list has not been
-   // initialized yet, so setting the preference defaults here to reflect the
-   // corresponding features will only cause the preference defaults to reflect
-diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
-+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -804,6 +804,20 @@ Your Google account may have other forms of browsing history like searches and a
-         Captions
-       </message>
- 
-+      <!-- 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
-@@ -2002,6 +2002,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,252 @@
+From: Wengling Chen <feiyu2817@gmail.com>
+Date: Mon, 1 Feb 2021 19:18:55 +0200
+Subject: Add option to force tablet UI
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++++++
+ .../preferences/ChromePreferenceKeys.java     |  1 +
+ .../LegacyChromePreferenceKeys.java           |  1 +
+ .../omnibox/LocationBarCoordinator.java       |  2 +-
+ .../strings/android_chrome_strings.grd        |  6 ++++++
+ .../toolbar/top/ToolbarControlContainer.java  | 16 ----------------
+ components/BUILD.gn                           |  6 +++---
+ .../res/xml/accessibility_preferences.xml     |  5 +++++
+ .../accessibility/AccessibilitySettings.java  | 10 ++++++++++
+ .../AccessibilitySettingsDelegate.java        |  2 ++
+ ui/android/BUILD.gn                           |  2 ++
+ .../chromium/ui/base/DeviceFormFactor.java    |  5 +++++
+ 12 files changed, 55 insertions(+), 20 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
+@@ -68,6 +68,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+         return new ReaderForAccessibilityDelegate();
+     }
+ 
+    private static class ForceTabletUIDelegate implements BooleanPreferenceDelegate {
+        @Override
+        public boolean isEnabled() {
+            return SharedPreferencesManager.getInstance().readBoolean(
+                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false);
+        }
+
+        @Override
+        public void setEnabled(boolean value) {
+            SharedPreferencesManager.getInstance().writeBoolean(
+                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, value);
+        }
+    }
+
+    @Override
+    public BooleanPreferenceDelegate getForceTabletUIDelegate() {
+        return new ForceTabletUIDelegate();
+    }
+
+     @Override
+     public void addExtraPreferences(PreferenceFragmentCompat fragment) {
+         if (ImageDescriptionsController.getInstance().shouldShowImageDescriptionsMenuItem()) {
+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
+@@ -418,6 +418,7 @@ public final class ChromePreferenceKeys {
+             AccessibilityConstants.FONT_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
+@@ -67,6 +67,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
+@@ -376,7 +376,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+     // 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
+@@ -1439,6 +1439,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">
+         Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps
+       </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>
+ 
+       <!-- Safety check -->
+       <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [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
+@@ -138,22 +138,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
+         mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier,
+                 tabSupplier, compositorInMotionSupplier,
+                 browserStateBrowserControlsVisibilityDelegate, isVisible);
+-
+-        View toolbarView = findViewById(R.id.toolbar);
+-        assert toolbarView != null;
+-
+-        if (toolbarView instanceof ToolbarTablet) {
+-            // 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.)
+-            final Drawable backgroundDrawable =
+-                    AppCompatResources.getDrawable(getContext(), R.drawable.toolbar_background)
+-                            .mutate();
+-            backgroundDrawable.setTint(
+-                    ChromeColors.getDefaultThemeColor(getContext(), isIncognito));
+-            backgroundDrawable.setTintMode(PorterDuff.Mode.MULTIPLY);
+-            setBackground(backgroundDrawable);
+-        }
+     }
+ 
+     @Override
+diff --git a/components/BUILD.gn b/components/BUILD.gn
+--- a/components/BUILD.gn
+++ b/components/BUILD.gn
+@@ -45,7 +45,7 @@ if (is_ios) {
+ 
+ # Omit Lacros because it allows //components to depend on //chrome, which in
+ # turn depends on //extensions.
+-if (!is_chromeos_lacros) {
+if (!is_chromeos_lacros && !is_android) {
+   disallowed_extension_deps_ = [
+     # Components should largely not depend on //extensions. Since // extensions
+     # is not a component target and is linked with //chrome, depending on most
+@@ -686,7 +686,7 @@ test("components_unittests") {
+   # On other platforms, no components should depend on Chrome.
+   # Since //chrome depends on //extensions, we also only assert_no_deps on
+   # extensions targets for non-lacros builds.
+-  if (!is_chromeos_lacros) {
+  if (!is_chromeos_lacros  && !is_android) {
+     assert_no_deps = [ "//chrome/*" ]
+     assert_no_deps += disallowed_extension_deps_
+   }
+@@ -966,7 +966,7 @@ if (!is_ios) {
+     # dependency. On other platforms, no components should depend on Chrome.
+     # Since //chrome depends on //extensions, we also only assert_no_deps on
+     # extensions targets for non-lacros builds.
+-    if (!is_chromeos_lacros) {
+    if (!is_chromeos_lacros  && !is_android) {
+       assert_no_deps = [ "//chrome/*" ]
+       assert_no_deps += disallowed_extension_deps_
+     }
+diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+@@ -36,6 +36,11 @@ found in the LICENSE file.
+         android:summary="@string/accessibility_tab_switcher_summary"
+         android:title="@string/accessibility_tab_switcher_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:key="captions"
+         android:title="@string/accessibility_captions_title"/>
+diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+@@ -30,6 +30,8 @@ public class AccessibilitySettings
+     public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility";
+     public static final String PREF_CAPTIONS = "captions";
+ 
+    private BooleanPreferenceDelegate mForceTabletUIDelegate;
+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
+     private TextScalePreference mTextScalePref;
+     private PageZoomPreference mPageZoomDefaultZoomPref;
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -106,6 +108,12 @@ public class AccessibilitySettings
+             getPreferenceScreen().removePreference(readerForAccessibilityPref);
+         }
+ 
+        ChromeBaseCheckBoxPreference forceTabletUiPref =
+                (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI);
+        mForceTabletUIDelegate = mDelegate.getForceTabletUIDelegate();
+        forceTabletUiPref.setChecked(mForceTabletUIDelegate.isEnabled());
+        forceTabletUiPref.setOnPreferenceChangeListener(this);
+
+         ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref =
+                 (ChromeBaseCheckBoxPreference) findPreference(
+                         AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);
+@@ -162,6 +170,8 @@ 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())) {
+            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
+         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
+             if (mReaderForAccessibilityDelegate != null) {
+                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
+diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
+--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
+@@ -44,6 +44,8 @@ public interface AccessibilitySettingsDelegate {
+      */
+     BooleanPreferenceDelegate getReaderForAccessibilityDelegate();
+ 
+    BooleanPreferenceDelegate getForceTabletUIDelegate();
+
+     /**
+      * Allows the embedder to add more preferences to the preference screen.
+      *
+diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
+--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
+@@ -373,6 +373,8 @@ android_library("ui_no_recycler_view_java") {
+   deps = [
+     ":ui_java_resources",
+     ":ui_utils_java",
+    # dependency for ui_no_recycler_view_java
+    "//chrome/browser/preferences:java",
+     "//base:base_java",
+     "//base:jni_java",
+     "//build/android:build_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
+@@ -12,6 +12,8 @@ import androidx.annotation.VisibleForTesting;
+ 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;
+@@ -62,6 +64,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.25.1
@@ -2,46 +2,41 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sat, 7 Sep 2019 15:07:42 +0200
 Subject: Add option to not persist tabs across sessions

+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/values/values.xml            |  3 +++
- chrome/android/java/res/xml/privacy_preferences.xml  |  5 +++++
- .../chrome/browser/ChromeTabbedActivity.java         |  4 +++-
- .../browser/settings/privacy/PrivacySettings.java    | 12 ++++++++++++
- .../ui/android/strings/android_chrome_strings.grd    |  6 ++++++
- 5 files changed, 29 insertions(+), 1 deletion(-)
+ .../android/java/res/xml/privacy_preferences.xml |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java     |  5 ++++-
+ .../privacy/settings/PrivacySettings.java        | 16 +++++++++++++++-
+ .../android/strings/android_chrome_strings.grd   |  6 ++++++
+ 4 files changed, 30 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"
-         android:defaultValue="false" />
-+    <org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference
+@@ -45,6 +45,11 @@ found in the LICENSE file.
+         android:title="@string/incognito_settings_title"
+         android:summary="@string/incognito_settings_summary"
+         android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
+    <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
-@@ -1104,8 +1104,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -40,6 +40,7 @@ import androidx.lifecycle.LifecycleRegistry;
+ import org.chromium.base.BuildInfo;
+ import org.chromium.base.CallbackController;
+ import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
+ import org.chromium.base.IntentUtils;
+ import org.chromium.base.Log;
+ import org.chromium.base.MemoryPressureListener;
+@@ -1322,8 +1323,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -52,61 +47,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/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/privacy/PrivacySettings.java
-@@ -4,6 +4,7 @@
- 
- package org.chromium.chrome.browser.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.feedback.HelpAndFeedbackLauncherImpl;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -36,6 +38,7 @@ public class PrivacySettings
-     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
-     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
-     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
-+    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
-     private static final String PREF_DO_NOT_TRACK = "do_not_track";
-     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+@@ -67,6 +70,8 @@ public class PrivacySettings
+             SharedPreferencesManager.getInstance();
+     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
 
-@@ -84,6 +87,10 @@ public class PrivacySettings
-             sharedPreferencesEditor.apply();
-         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
-             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
-+        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
+    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+     private IncognitoLockSettings mIncognitoLockSettings;
+ 
+@@ -132,7 +137,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();
+        } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {
+             UserPrefs.get(Profile.getLastUsedRegularProfile())
+                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+         } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
+@@ -176,6 +185,11 @@ public class PrivacySettings
+                     PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
         }
 
-         return true;
-@@ -128,6 +135,11 @@ public class PrivacySettings
-                             ? R.string.text_on
-                             : R.string.text_off);
-         }
-+
-+        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() {
+
+         Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
+         if (secureDnsPref != null && secureDnsPref.isVisible()) {
+             secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3618,6 +3618,12 @@ Only you can see what your camera is looking at. The site can't see your camera'
+@@ -4415,6 +4415,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>
@@ -119,6 +118,5 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
         LINK
       </message>
-- 
-2.17.1
-
+--
+2.25.1
@@ -1,66 +1,44 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Mon, 18 Mar 2019 21:47:12 +0100
+Date: Sat, 20 Nov 2021 15:36:54 +0000
 Subject: Add option to use home page as NTP

-Use about:blank as default homepage
+And allow use about:blank as default homepage
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../java/res/xml/homepage_preferences.xml     |  5 +++++
- .../HomepageManager.java                      | 22 +++++++++++++++++--
- .../settings/homepage/HomepageSettings.java   | 11 ++++++++++
- .../browser/tabmodel/TabCreatorManager.java   | 11 ++++++++--
- .../strings/android_chrome_strings.grd        |  3 +++
- chrome/browser/ui/browser_ui_prefs.cc         |  2 ++
- chrome/common/pref_names.cc                   |  4 ++++
- chrome/common/pref_names.h                    |  1 +
- 8 files changed, 55 insertions(+), 4 deletions(-)
+ .../java/res/xml/homepage_preferences.xml        |  5 +++++
+ .../chrome/browser/homepage/HomepageManager.java | 16 ++++++++++++++++
+ .../homepage/settings/HomepageSettings.java      | 12 ++++++++++++
+ .../chrome/browser/metrics/LaunchMetrics.java    |  1 -
+ .../browser/tabmodel/ChromeTabCreator.java       |  7 +++++++
+ .../preferences/ChromePreferenceKeys.java        |  1 +
+ .../preferences/LegacyChromePreferenceKeys.java  |  1 +
+ .../android/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 +
+ 11 files changed, 52 insertions(+), 1 deletion(-)

 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">
+@@ -14,6 +14,11 @@ found in the LICENSE file.
+         android:summaryOn="@string/text_on"
+         android:summaryOff="@string/text_off" />
 
-+    <org.chromium.chrome.browser.settings.ChromeSwitchPreference
+    <org.chromium.components.browser_ui.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
-@@ -28,6 +28,7 @@ import java.lang.annotation.RetentionPolicy;
-  * This class serves as a single homepage logic gateway.
-  */
- public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStateListener {
-+    public static final String PREF_NTP_IS_HOMEPAGE = "newtabpage_is_homepage";
-     /**
-      * Possible states for HomeButton. Used for Histogram
-      * Settings.ShowHomeButtonPreferenceStateManaged. Currently {@link
-@@ -123,7 +124,8 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
-      */
-     public static boolean shouldCloseAppWithZeroTabs() {
-         return HomepageManager.isHomepageEnabled()
-                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri());
-+                && !NewTabPage.isNTPUrl(HomepageManager.getHomepageUri())
-+                && (HomepageManager.getHomepageUri() != UrlConstants.CHROME_BLANK_URL);
-     }
- 
-     /**
-@@ -141,7 +143,7 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
-      *         if the homepage button is force enabled via flag.
-      */
-     private static String getDefaultHomepageUri() {
-        return UrlConstants.NTP_NON_NATIVE_URL;
-+        return UrlConstants.CHROME_BLANK_URL;
-     }
- 
-     /**
-@@ -170,6 +172,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
-         return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_ENABLED, true);
+     <org.chromium.chrome.browser.homepage.settings.RadioButtonGroupHomepagePreference
+         android:key="homepage_radio_group"
+         android:selectable="false"
+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
+@@ -223,6 +223,22 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+         notifyHomepageUpdated();
     }
 
 +    /**
@@ -68,42 +46,43 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomiz
 +     *
 +     */
 +    public boolean getPrefNTPIsHomepageEnabled() {
-+        return mSharedPreferencesManager.readBoolean(PREF_NTP_IS_HOMEPAGE, false);
+        return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_NTP_IS_HOMEPAGE, false);
 +    }
 +
-     /**
-      * Sets the user preference for whether the homepage is enabled.
-      */
-@@ -181,6 +191,14 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
-         notifyHomepageUpdated();
-     }
- 
 +    /**
 +     * Sets the user preference for whether the new tab page is the homepage or not.
 +     */
 +    public void setPrefNTPIsHomepageEnabled(boolean enabled) {
-+        mSharedPreferencesManager.writeBoolean(PREF_NTP_IS_HOMEPAGE, enabled);
+        mSharedPreferencesManager.writeBoolean(ChromePreferenceKeys.HOMEPAGE_NTP_IS_HOMEPAGE, enabled);
 +        notifyHomepageUpdated();
 +    }
 +
     /**
      * @return User specified homepage custom URI string.
      */
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/homepage/HomepageSettings.java
-@@ -27,6 +27,8 @@ public class HomepageSettings extends PreferenceFragmentCompat {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
+@@ -22,6 +22,7 @@ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+ import org.chromium.components.browser_ui.settings.SettingsUtils;
+ import org.chromium.components.embedder_support.util.UrlUtilities;
+ import org.chromium.components.url_formatter.UrlFormatter;
+import org.chromium.components.embedder_support.util.UrlConstants;
+ 
+ /**
+  * Fragment that allows the user to configure homepage related preferences.
+@@ -32,6 +33,8 @@ public class HomepageSettings extends PreferenceFragmentCompat {
     @VisibleForTesting
-     public static final String PREF_HOMEPAGE_EDIT = "homepage_edit";
+     public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
 
 +    private static final String PREF_NTP_HOMEPAGE_SWITCH = "ntp_is_homepage_switch";
 +
     /**
      * Delegate used to mark that the homepage is being managed.
      * Created for {@link org.chromium.chrome.browser.settings.HomepagePreferences}
-@@ -63,6 +65,15 @@ public class HomepageSettings extends PreferenceFragmentCompat {
-             });
-         }
+@@ -72,6 +75,15 @@ public class HomepageSettings extends PreferenceFragmentCompat {
+         });
+         mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
 
 +        ChromeSwitchPreference mNTPIsHomepageSwitch =
 +                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
@@ -114,45 +93,70 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/homepa
 +            return true;
 +        });
 +
-         mHomepageEdit = findPreference(PREF_HOMEPAGE_EDIT);
-         updateCurrentHomepageUrl();
+         RecordUserAction.record("Settings.Homepage.Opened");
     }
-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
-@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.tab.TabState;
- import org.chromium.chrome.browser.util.UrlConstants;
- import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.content_public.browser.WebContents;
-+import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 
- /**
-  * An interface to return a {@link TabCreator} either for regular or incognito tabs.
-@@ -86,12 +87,18 @@ public interface TabCreatorManager {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
+@@ -103,7 +103,6 @@ public class LaunchMetrics {
+             boolean showHomeButton, boolean homepageIsNtp, String homepageUrl) {
+         if (homepageUrl == null) {
+             homepageUrl = "";
+-            assert !showHomeButton : "Homepage should be disabled for a null URL";
         }
+         LaunchMetricsJni.get().recordHomePageLaunchMetrics(
+                 showHomeButton, homepageIsNtp, homepageUrl);
+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
+@@ -19,6 +19,7 @@ import org.chromium.chrome.browser.ServiceTabLauncher;
+ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFactory;
+ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
+ import org.chromium.chrome.browser.compositor.CompositorViewHolder;
+import org.chromium.chrome.browser.homepage.HomepageManager;
+ import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
+ import org.chromium.chrome.browser.ntp.NewTabPageUtils;
+ import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
+@@ -311,6 +312,12 @@ public class ChromeTabCreator extends TabCreator {
+      * @return the created tab.
+      */
+     public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
+        if (!mIncognito && url.equals(UrlConstants.NTP_URL)) {
+            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
+                url = HomepageManager.getInstance().getHomepageUri();
+            }
+        }
+
+         LoadUrlParams loadUrlParams = new LoadUrlParams(url);
+         loadUrlParams.setIntentReceivedTimestamp(intentTimestamp);
+         return createNewTab(loadUrlParams, type, null, intent);
+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
+@@ -429,6 +429,7 @@ public final class ChromePreferenceKeys {
+     public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
+             "Chrome.Homepage.PartnerCustomizedDefaultGurl";
 
-         /**
-         * 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");
-             }
+    public static final String HOMEPAGE_NTP_IS_HOMEPAGE = "newtabpage_is_homepage";
+     /**
+      * Key used to save homepage location set by enterprise policy
+      */
+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
+@@ -72,6 +72,7 @@ public class LegacyChromePreferenceKeys {
+                 ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,
+                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
+                 ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
+                ChromePreferenceKeys.HOMEPAGE_NTP_IS_HOMEPAGE,
+                 ChromePreferenceKeys.INCOGNITO_SHORTCUT_ADDED,
+                 ChromePreferenceKeys.LATEST_UNSUPPORTED_VERSION,
+                 ChromePreferenceKeys.LEGACY_FIRST_RUN_AND_BACKUP_SIGNIN_COMPLETE,
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -732,6 +732,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1254,6 +1254,9 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
         Last hour
       </message>
@@ -165,7 +169,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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) {
+@@ -65,6 +65,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
@@ -177,7 +181,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 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";
+@@ -61,6 +61,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";
 
@@ -191,14 +195,13 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -326,6 +326,7 @@ extern const char kSettingsShowOSBanner[];
- extern const char kDeviceLoginScreenWebUsbAllowDevicesForUrls[];
- #endif  // defined(OS_CHROMEOS)
+@@ -389,6 +389,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
+ extern const char kUsedPolicyCertificates[];
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 extern const char kShowHomeButton[];
 +extern const char kNewTabPageIsHomePage[];
 extern const char kSpeechRecognitionFilterProfanities[];
 extern const char kAllowDeletingBrowserHistory[];
- #if !defined(OS_ANDROID)
-- 
-2.17.1
-
+ extern const char kForceGoogleSafeSearch[];
+--
+2.25.1
@@ -0,0 +1,186 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 2 May 2022 11:48:03 +0000
+Subject: Add site engagement flag
+
+Enabled by default.
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/about_flags.cc                 |  6 ++++
+ chrome/browser/flag_descriptions.cc           |  5 +++
+ chrome/browser/flag_descriptions.h            |  3 ++
+ .../content/site_engagement_score.cc          |  5 +++
+ components/site_engagement/core/BUILD.gn      |  6 ++++
+ components/site_engagement/core/features.cc   | 29 ++++++++++++++++
+ components/site_engagement/core/features.h    | 34 +++++++++++++++++++
+ 7 files changed, 88 insertions(+)
+ create mode 100644 components/site_engagement/core/features.cc
+ create mode 100644 components/site_engagement/core/features.h
+
+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
+@@ -144,6 +144,7 @@
+ #include "components/segmentation_platform/public/features.h"
+ #include "components/send_tab_to_self/features.h"
+ #include "components/services/heap_profiling/public/cpp/switches.h"
+#include "components/site_engagement/core/features.h"
+ #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
+ #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
+ #include "components/signin/public/base/signin_buildflags.h"
+@@ -9283,6 +9284,11 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
+      FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
+ 
+    {"site-engagement",
+     flag_descriptions::kSiteEngagementName,
+     flag_descriptions::kSiteEngagementDescription, kOsAll,
+     FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)},
+
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+     {"use-multiple-overlays", flag_descriptions::kUseMultipleOverlaysName,
+      flag_descriptions::kUseMultipleOverlaysDescription, 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
+@@ -3407,6 +3407,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
+     "Skips starting the service worker and run the fetch handler if the fetch "
+     "handler is recognized as skippable.";
+ 
+const char kSiteEngagementName[] =
+    "Enable site engagement feature";
+const char kSiteEngagementDescription[] =
+    "Site Engagement Service provides information about how engaged a user is with a origin; this affects which NTP tiles are automatically created.";
+
+ const char kWebSQLAccessName[] = "Allows access to WebSQL APIs";
+ const char kWebSQLAccessDescription[] =
+     "The WebSQL API is enabled by default, but can be disabled here.";
+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
+@@ -1957,6 +1957,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
+ extern const char kSkipServiceWorkerFetchHandlerName[];
+ extern const char kSkipServiceWorkerFetchHandlerDescription[];
+ 
+extern const char kSiteEngagementName[];
+extern const char kSiteEngagementDescription[];
+
+ extern const char kWebSQLAccessName[];
+ extern const char kWebSQLAccessDescription[];
+ 
+diff --git a/components/site_engagement/content/site_engagement_score.cc b/components/site_engagement/content/site_engagement_score.cc
+--- a/components/site_engagement/content/site_engagement_score.cc
+++ b/components/site_engagement/content/site_engagement_score.cc
+@@ -17,6 +17,7 @@
+ #include "components/content_settings/core/common/content_settings.h"
+ #include "components/content_settings/core/common/content_settings_types.h"
+ #include "components/content_settings/core/common/content_settings_utils.h"
+#include "components/site_engagement/core/features.h"
+ #include "components/site_engagement/content/engagement_type.h"
+ #include "components/site_engagement/content/site_engagement_metrics.h"
+ #include "components/variations/variations_associated_data.h"
+@@ -275,6 +276,10 @@ void SiteEngagementScore::Commit() {
+   if (!UpdateScoreDict(*score_dict_))
+     return;
+ 
+  if (!base::FeatureList::IsEnabled(features::kSiteEngagement)) {
+    score_dict_.reset();
+    return;
+  }
+   settings_map_->SetWebsiteSettingDefaultScope(
+       origin_, GURL(), ContentSettingsType::SITE_ENGAGEMENT,
+       base::Value(std::move(*score_dict_)));
+diff --git a/components/site_engagement/core/BUILD.gn b/components/site_engagement/core/BUILD.gn
+--- a/components/site_engagement/core/BUILD.gn
+++ b/components/site_engagement/core/BUILD.gn
+@@ -4,8 +4,14 @@
+ 
+ static_library("core") {
+   sources = [
+    "features.cc",
+    "features.h",
+     "pref_names.cc",
+     "pref_names.h",
+     "site_engagement_score_provider.h",
+   ]
+
+  deps = [
+    "//base",
+  ]
+ }
+diff --git a/components/site_engagement/core/features.cc b/components/site_engagement/core/features.cc
+new file mode 100644
+--- /dev/null
+++ b/components/site_engagement/core/features.cc
+@@ -0,0 +1,29 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#include "components/site_engagement/core/features.h"
+
+#include "base/feature_list.h"
+
+namespace site_engagement {
+namespace features {
+
+const base::Feature kSiteEngagement{"SiteEngagement",
+                                    base::FEATURE_ENABLED_BY_DEFAULT};
+
+}  // namespace features
+}  // namespace site_engagement
+diff --git a/components/site_engagement/core/features.h b/components/site_engagement/core/features.h
+new file mode 100644
+--- /dev/null
+++ b/components/site_engagement/core/features.h
+@@ -0,0 +1,34 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#ifndef SITE_ENGAGEMENT_CORE_FEATURES_H_
+#define SITE_ENGAGEMENT_CORE_FEATURES_H_
+
+#include <string>
+
+#include "base/feature_list.h"
+
+namespace site_engagement {
+namespace features {
+
+// Enable site engagement
+extern const base::Feature kSiteEngagement;
+
+}  // namespace features
+}  // namespace site_engagement
+
+#endif  // SITE_ENGAGEMENT_CORE_FEATURES_H_
+--
+2.25.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/SingleCategorySettings.java       | 21 ++++++++++++-
- .../preferences/pref_service_bridge.cc        | 31 +++++++++++++++++++
- .../preferences/PrefServiceBridge.java        | 10 ++++++
- .../strings/android_chrome_strings.grd        |  6 ++++
- 6 files changed, 77 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ 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/SingleCategorySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleCategorySettings.java
-@@ -130,6 +130,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
- 
-     // Keys for category-specific preferences (toggle, link, button etc.), dynamically shown.
-     public static final String THIRD_PARTY_COOKIES_TOGGLE_KEY = "third_party_cookies";
-+    public static final String COOKIES_SESSION_ONLY_TOGGLE_KEY = "cookies_session_only";
-     public static final String NOTIFICATIONS_VIBRATE_TOGGLE_KEY = "notifications_vibrate";
-     public static final String NOTIFICATIONS_QUIET_UI_TOGGLE_KEY = "notifications_quiet_ui";
-     public static final String EXPLAIN_PROTECTED_MEDIA_KEY = "protected_content_learn_more";
-@@ -478,6 +479,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
- 
-                 if (type == SiteSettingsCategory.Type.COOKIES) {
-                     updateThirdPartyCookiesCheckBox();
-+                    updateCookiesSessionOnlyCheckBox();
-                 } else if (type == SiteSettingsCategory.Type.NOTIFICATIONS) {
-                     updateNotificationsSecondaryControls();
-                 }
-@@ -516,6 +518,8 @@ public class SingleCategorySettings 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));
-@@ -829,6 +833,8 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
-         TriStateSiteSettingsPreference triStateToggle =
-                 (TriStateSiteSettingsPreference) screen.findPreference(TRI_STATE_TOGGLE_KEY);
-         Preference thirdPartyCookies = screen.findPreference(THIRD_PARTY_COOKIES_TOGGLE_KEY);
-+        Preference cookiesSessionOnly = getPreferenceScreen().findPreference(
-+                COOKIES_SESSION_ONLY_TOGGLE_KEY);
-         Preference notificationsVibrate = screen.findPreference(NOTIFICATIONS_VIBRATE_TOGGLE_KEY);
-         Preference notificationsQuietUi = screen.findPreference(NOTIFICATIONS_QUIET_UI_TOGGLE_KEY);
-         Preference explainProtectedMediaKey = screen.findPreference(EXPLAIN_PROTECTED_MEDIA_KEY);
-@@ -861,6 +867,7 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
- 
-         if (hideSecondaryToggles) {
-             screen.removePreference(thirdPartyCookies);
-+            screen.removePreference(cookiesSessionOnly);
-             screen.removePreference(notificationsVibrate);
-             screen.removePreference(notificationsQuietUi);
-             screen.removePreference(explainProtectedMediaKey);
-@@ -872,12 +879,15 @@ public class SingleCategorySettings extends PreferenceFragmentCompat
-             return;
-         }
- 
-        // Configure/hide the third-party cookies toggle, as needed.
-+        // Configure/hide the third-party cookies toggle and session-only cookie toggle, as needed.
-         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.
-@@ -992,6 +1002,15 @@ public class SingleCategorySettings 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
-@@ -814,6 +814,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_BLOCK_THIRD_PARTY_COOKIES_SUMMARY" desc="Summary text for Block Third Party Cookies preference">
-         Prevent third-party websites from saving and reading cookie data
-       </message>
-+      <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,53 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 17 May 2021 12:30:12 +0000
+Subject: Add support for ISupportHelpAndFeedback
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../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
+@@ -66,6 +66,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto
+ import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
+ 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.components.browser_ui.widget.displaystyle.UiConfig;
+ import org.chromium.components.browser_ui.widget.displaystyle.ViewResizer;
+@@ -328,9 +329,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
+@@ -97,4 +97,8 @@ public class SettingsUtils {
+         ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility);
+         return true;
+     }
+
+    public interface ISupportHelpAndFeedback {
+        void onHelpAndFeebackPressed();
+    }
+ }
+--
+2.25.1
@@ -0,0 +1,100 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 12 Apr 2022 15:58:01 +0000
+Subject: Add support for writing URIs
+
+Allows native-side URI file writing
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ base/android/content_uri_utils.cc             | 10 ++++++
+ base/android/content_uri_utils.h              |  4 +++
+ .../org/chromium/base/ContentUriUtils.java    | 33 +++++++++++++++++++
+ 3 files changed, 47 insertions(+)
+
+diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
+--- a/base/android/content_uri_utils.cc
+++ b/base/android/content_uri_utils.cc
+@@ -30,6 +30,16 @@ File OpenContentUriForRead(const FilePath& content_uri) {
+   return File(fd);
+ }
+ 
+File OpenContentUriForWrite(const FilePath& content_uri) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> j_uri =
+      ConvertUTF8ToJavaString(env, content_uri.value());
+  jint fd = Java_ContentUriUtils_openContentUriForWrite(env, j_uri);
+  if (fd < 0)
+    return File();
+  return File(fd);
+}
+
+ std::string GetContentUriMimeType(const FilePath& content_uri) {
+   JNIEnv* env = base::android::AttachCurrentThread();
+   ScopedJavaLocalRef<jstring> j_uri =
+diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
+--- a/base/android/content_uri_utils.h
+++ b/base/android/content_uri_utils.h
+@@ -18,6 +18,10 @@ namespace base {
+ // Returns -1 if the URI is invalid.
+ BASE_EXPORT File OpenContentUriForRead(const FilePath& content_uri);
+ 
+// Opens a content URI for write and returns the file descriptor to the caller.
+// Returns -1 if the URI is invalid.
+BASE_EXPORT File OpenContentUriForWrite(const FilePath& content_uri);
+
+ // Check whether a content URI exists.
+ BASE_EXPORT bool ContentUriExists(const FilePath& content_uri);
+ 
+diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java
+--- a/base/android/java/src/org/chromium/base/ContentUriUtils.java
+++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java
+@@ -23,6 +23,9 @@ import org.chromium.base.annotations.CalledByNative;
+ import java.io.File;
+ import java.io.IOException;
+ 
+import android.system.Os;
+import android.content.ContentProviderClient;
+
+ /**
+  * This class provides methods to access content URI schemes.
+  */
+@@ -89,6 +92,36 @@ public abstract class ContentUriUtils {
+         return -1;
+     }
+ 
+    @CalledByNative
+    public static int openContentUriForWrite(String uriString) {
+        try {
+            Uri uri = Uri.parse(uriString);
+            ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
+            ContentProviderClient client = resolver.acquireContentProviderClient(
+                                            uri.getAuthority());
+            ParcelFileDescriptor pfd = client.openFile(uri, "rw");
+            int fd = pfd.detachFd();
+            client.close();
+            return fd;
+        } catch (Exception e) {
+            Log.e(TAG, "Cannot open intermediate URI", e);
+        }
+        return -1;
+    }
+
+    public static String getFilePathFromContentUri(Uri uri) {
+        String path = null;
+        try {
+            ContentResolver resolver = ContextUtils.getApplicationContext().getContentResolver();
+            ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "r");
+            path = Os.readlink("/proc/self/fd/" + pfd.getFd());
+            pfd.close();
+        } catch (Exception e) {
+            Log.e(TAG, "Cannot get file path from content URI", e);
+        }
+        return path;
+    }
+
+     /**
+      * Check whether a content URI exists.
+      *
+--
+2.25.1
@@ -1,518 +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     | 41 ++-------
- .../strings/android_chrome_strings.grd        | 11 +++
- chrome/common/chrome_features.cc              |  4 +-
- 13 files changed, 320 insertions(+), 34 deletions(-)
- create mode 100644 chrome/android/java/res/layout/doh_editor.xml
- create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
- create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/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/searchwidget/SearchWidgetProvider.java",
-   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java",
-   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java",
-+  "java/src/org/chromium/chrome/browser/settings/DoHEditor.java",
-+  "java/src/org/chromium/chrome/browser/settings/DoHPreferences.java",
-   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationManager.java",
-   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationSharedPrefManager.java",
-   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridge.java",
-diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml
-new file mode 100644
--- /dev/null
-+++ 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.components.browser_ui.widget.text.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.components.browser_ui.widget.text.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/settings_action_bar_shadow"/>
-+
-+</FrameLayout>
-diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
--- a/chrome/android/java/res/values/values.xml
-+++ b/chrome/android/java/res/values/values.xml
-@@ -86,6 +86,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
-@@ -120,6 +120,26 @@ public class FeatureUtilities {
-     private static Boolean sEnabledTabThumbnailApsectRatioForTesting;
-     private static final String ALLOW_TO_REFETCH = "allow_to_refetch";
- 
-+     /**
-+     * Records whether custom URL for DoH is enabled with native-side feature utilities.
-+     * @param url Whether custom URL is enabled or not.
-+     */
-+     public static void setDoHEnabled(boolean enabled) {
-+         FeatureUtilitiesJni.get().setDoHEnabled(enabled);
-+     }
-+
-+     public static boolean getDoHEnabled() {
-+         return FeatureUtilitiesJni.get().getDoHEnabled();
-+     }
-+
-+     public static void setDoHTemplates(String t) {
-+         FeatureUtilitiesJni.get().setDoHTemplates(t);
-+     }
-+
-+     public static String getDoHTemplates() {
-+         return FeatureUtilitiesJni.get().getDoHTemplates();
-+     }
-+
-     /**
-      * Checks if a cached feature flag is enabled.
-      *
-@@ -792,6 +812,10 @@ public class FeatureUtilities {
- 
-     @NativeMethods
-     interface Natives {
-+        void setDoHEnabled(boolean enabled);
-+        boolean getDoHEnabled();
-+        void setDoHTemplates(String templates);
-+        String getDoHTemplates();
-         boolean isNetworkServiceWarmUpEnabled();
-         void setAdBlockFiltersURL(String url);
-         String getAdBlockFiltersURL();
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
-new file mode 100644
--- /dev/null
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -6848,6 +6848,12 @@ the Bookmarks menu.">
-         <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of the home page overlay on Android" formatter_data="android_java">
-           Home page
-         </message>
-+        <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 "content/public/common/content_features.h"
- #include "content/public/common/network_service_util.h"
- 
-@@ -45,3 +48,23 @@ static jboolean JNI_FeatureUtilities_IsNetworkServiceWarmUpEnabled(
-   return content::IsOutOfProcessNetworkService() &&
-          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
- }
-+
-+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
-@@ -379,40 +379,12 @@ SystemNetworkContextManager::SystemNetworkContextManager(
-   local_state_->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
-                                     base::Value(ShouldEnableAsyncDns()));
-   std::string default_doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
-  std::string default_doh_templates = "";
-  if (base::FeatureList::IsEnabled(features::kDnsOverHttps)) {
-    if (features::kDnsOverHttpsFallbackParam.Get()) {
-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeAutomatic;
-    } else {
-      default_doh_mode = chrome_browser_net::kDnsOverHttpsModeSecure;
-    }
-    default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
-  }
-+  std::string default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
-   local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsMode,
-                                     base::Value(default_doh_mode));
-   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);
-  }
-
-   PrefChangeRegistrar::NamedChangeCallback dns_pref_callback =
-       base::BindRepeating(&OnStubResolverConfigChanged,
-                           base::Unretained(local_state_));
-@@ -548,9 +520,14 @@ void SystemNetworkContextManager::GetStubResolverConfig(
- 
-   std::string doh_templates =
-       local_state->GetString(prefs::kDnsOverHttpsTemplates);
-  std::string server_method;
-  if (!doh_templates.empty() &&
-      *secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
-+  if (doh_templates.empty()) {
-+    *secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
-+    doh_mode = chrome_browser_net::kDnsOverHttpsModeOff;
-+  }
-+
-+  LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << doh_mode;
-+  if (*secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
-+    std::string server_method;
-     for (const std::string& server_template :
-          SplitString(doh_templates, " ", base::TRIM_WHITESPACE,
-                      base::SPLIT_WANT_NONEMPTY)) {
-diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
-+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -578,6 +578,17 @@ CHAR-LIMIT guidelines:
-         Chrome Passwords
-       </message>
- 
-+      <!-- DoH preferences -->
-+      <message name="IDS_OPTIONS_DOH_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used for DNS-over-HTTPS queries.">
-+        Edit DoH template URLs
-+      </message>
-+      <message name="IDS_OPTIONS_DOH_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used for DNS-over-HTTPS queries.">
-+        DoH template URLs
-+      </message>
-+      <message name="IDS_DOH_HELP" desc="The title of the hyperlink that allows users to visit the wiki page with instructions for DNS-over-HTTPS configuration.">
-+        Visit help page
-+      </message>
-+
-       <!-- Homepage preferences -->
-       <message name="IDS_OPTIONS_HOMEPAGE_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that opens when they tap on the home page button in the omnibox.">
-         Edit home page
-diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
-+++ b/chrome/common/chrome_features.cc
-@@ -293,12 +293,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,505 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 3 May 2022 14:44:11 +0000
+Subject: Add webGL site setting
+
+Do not provide any device information when serving context creation errors.
+
+Requires patch: Content-settings-infrastructure.patch
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../browser_ui/site_settings/android/BUILD.gn |  3 +
+ .../BromiteCustomContentSettingImpl.java      |  1 +
+ .../BromiteWebGLContentSetting.java           | 85 +++++++++++++++++++
+ .../site_settings/SiteSettingsCategory.java   |  5 +-
+ .../strings/android/browser_ui_strings.grd    |  1 +
+ .../browser_ui/strings/android/webgl.grdp     | 18 ++++
+ components/components_strings.grd             |  1 +
+ .../core/browser/content_settings_registry.cc | 14 +++
+ .../core/browser/content_settings_utils.cc    |  2 +
+ .../core/common/content_settings.cc           |  4 +-
+ .../core/common/content_settings.h            |  1 +
+ .../core/common/content_settings.mojom        |  1 +
+ .../common/content_settings_mojom_traits.cc   |  3 +-
+ .../common/content_settings_mojom_traits.h    |  5 ++
+ .../core/common/content_settings_types.h      |  2 +
+ .../renderer/content_settings_agent_impl.cc   |  9 ++
+ .../renderer/content_settings_agent_impl.h    |  1 +
+ .../platform/web_content_settings_client.h    |  2 +
+ .../execution_context/execution_context.cc    | 23 +++++
+ .../execution_context/execution_context.h     |  5 ++
+ .../webgl/webgl_rendering_context_base.cc     | 32 +++----
+ .../webgl/webgl_rendering_context_base.h      |  2 +
+ 22 files changed, 197 insertions(+), 23 deletions(-)
+ create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java
+ create mode 100644 components/browser_ui/strings/android/webgl.grdp
+
+diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
+--- a/components/browser_ui/site_settings/android/BUILD.gn
+++ b/components/browser_ui/site_settings/android/BUILD.gn
+@@ -92,6 +92,9 @@ android_library("java") {
+     "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",
+     "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java",
+   ]
+  sources += [
+    "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java",
+  ]
+   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+   resources_package = "org.chromium.components.browser_ui.site_settings"
+   deps = [
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+@@ -43,6 +43,7 @@ public abstract class BromiteCustomContentSettingImpl {
+ 
+     static {
+         mItemList = new ArrayList<BromiteCustomContentSetting>();
+        mItemList.add(new BromiteWebGLContentSetting());
+     }
+ 
+     public static SiteSettingsCategory createFromType(
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java
+new file mode 100644
+--- /dev/null
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java
+@@ -0,0 +1,85 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.components.browser_ui.site_settings;
+
+import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
+import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSettingsType;
+import org.chromium.content_public.browser.BrowserContextHandle;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import java.util.ArrayList;
+
+public class BromiteWebGLContentSetting extends BromiteCustomContentSetting {
+    public BromiteWebGLContentSetting() {
+        super(/*contentSettingsType*/ ContentSettingsType.WEBGL,
+              /*siteSettingsCategory*/ SiteSettingsCategory.Type.WEBGL,
+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*allowException*/ true,
+              /*preferenceKey*/ "webgl",
+              /*profilePrefKey*/ "webgl");
+    }
+
+    @Override
+    public ContentSettingsResources.ResourceItem getResourceItem() {
+        return new ContentSettingsResources.ResourceItem(
+            /*icon*/ R.drawable.web_asset,
+            /*title*/ R.string.webgl_permission_title,
+            /*defaultEnabledValue*/ getDefaultEnabledValue(),
+            /*defaultDisabledValue*/ getDefaultDisabledValue(),
+            /*enabledSummary*/ R.string.website_settings_category_webgl_enabled,
+            /*disabledSummary*/ R.string.website_settings_category_webgl_disabled);
+    }
+
+    @Override
+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+        switch (value) {
+            case ContentSettingValues.ALLOW:
+                return R.string.website_settings_category_webgl_enabled;
+            case ContentSettingValues.BLOCK:
+                return R.string.website_settings_category_webgl_disabled;
+            default:
+                return 0;
+        }
+    }
+
+    @Override
+    public boolean requiresTriStateContentSetting() {
+        return false;
+    }
+
+    @Override
+    public boolean showOnlyDescriptions() {
+        return true;
+    }
+
+    @Override
+    public int getAddExceptionDialogMessage() {
+        return R.string.website_settings_category_webgl_enabled;
+    }
+
+    @Override
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
+        return value != ContentSettingValues.BLOCK;
+    }
+}
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+@@ -44,7 +44,7 @@ public class SiteSettingsCategory {
+             Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY,
+             Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE,
+             Type.FEDERATED_IDENTITY_API, Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT,
+-            Type.IMAGES})
+            Type.IMAGES, Type.WEBGL})
+     @Retention(RetentionPolicy.SOURCE)
+     public @interface Type {
+         // All updates here must also be reflected in {@link #preferenceKey(int)
+@@ -79,10 +79,11 @@ public class SiteSettingsCategory {
+         int AUTOPLAY = 27;
+         int JAVASCRIPT_JIT = 28;
+         int IMAGES = 29;
+        int WEBGL = 30;
+         /**
+          * Number of handled categories used for calculating array sizes.
+          */
+-        int NUM_ENTRIES = 30;
+        int NUM_ENTRIES = 31;
+     }
+ 
+     private final BrowserContextHandle mBrowserContextHandle;
+diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
+--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
+@@ -174,6 +174,7 @@
+   <release seq="1">
+     <messages fallback_to_english="true">
+       <part file="site_settings.grdp" />
+      <part file="webgl.grdp" />
+ 
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
+         Got it
+diff --git a/components/browser_ui/strings/android/webgl.grdp b/components/browser_ui/strings/android/webgl.grdp
+new file mode 100644
+--- /dev/null
+++ b/components/browser_ui/strings/android/webgl.grdp
+@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <message name="IDS_SITE_SETTINGS_TYPE_WEBGL" desc="The label used for webgl site settings controls.">
+    Webgl
+  </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE" desc="The label used for webgl site settings controls when used mid-sentence.">
+    webgl
+  </message>
+  <message name="IDS_WEBGL_PERMISSION_TITLE" desc="Title of the permission to use webgl [CHAR-LIMIT=32]">
+    Webgl
+  </message>
+  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_WEBGL_ENABLED" desc="Summary text explaining that webgl is full enabled.">
+    Enabled
+  </message>
+  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_WEBGL_DISABLED" desc="Summary text explaining that webgl is full disabled.">
+    Disabled
+  </message>
+</grit-part>
+diff --git a/components/components_strings.grd b/components/components_strings.grd
+--- a/components/components_strings.grd
+++ b/components/components_strings.grd
+@@ -338,6 +338,7 @@
+       <part file="version_ui_strings.grdp" />
+       <part file="webapps_strings.grdp" />
+ 
+      <part file="browser_ui/strings/android/webgl.grdp" />
+       <if expr="not is_ios">
+         <part file="history_clusters_strings.grdp" />
+       </if>
+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -633,6 +633,20 @@ void ContentSettingsRegistry::Init() {
+            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+            ContentSettingsInfo::PERSISTENT,
+            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+
+  Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK,
+           WebsiteSettingsInfo::SYNCABLE,
+           AllowlistedSchemes(),
+           ValidSettings(CONTENT_SETTING_ALLOW,
+                         CONTENT_SETTING_BLOCK),
+           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+           WebsiteSettingsRegistry::PLATFORM_ANDROID,
+           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+           ContentSettingsInfo::PERSISTENT,
+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS,
+           /*show_into_info_page*/ true,
+           /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL,
+           /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE);
+ }
+ 
+ void ContentSettingsRegistry::Register(
+diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
+--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
+@@ -156,6 +156,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+   std::string timezone;
+   map->GetTimezoneOverrideValue(timezone);
+   rules->timezone_override_value = timezone;
+  map->GetSettingsForOneType(ContentSettingsType::WEBGL,
+                             &(rules->webgl_rules));
+ }
+ 
+ bool IsMorePermissive(ContentSetting a, ContentSetting b) {
+diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
+--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
+@@ -208,7 +208,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+          content_type == ContentSettingsType::AUTOPLAY ||
+          content_type == ContentSettingsType::MIXEDSCRIPT ||
+          content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
+-         content_type == ContentSettingsType::TIMEZONE_OVERRIDE;
+         content_type == ContentSettingsType::TIMEZONE_OVERRIDE ||
+         content_type == ContentSettingsType::WEBGL;
+ }
+ 
+ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -220,6 +221,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+   FilterRulesForType(auto_dark_content_rules, outermost_main_frame_url);
+   FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
+   FilterRulesForType(autoplay_rules, outermost_main_frame_url);
+  FilterRulesForType(webgl_rules, outermost_main_frame_url);
+ }
+ 
+ RendererContentSettingRules::RendererContentSettingRules() = default;
+diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
+--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
+@@ -96,6 +96,7 @@ struct RendererContentSettingRules {
+   ContentSettingsForOneType auto_dark_content_rules;
+   ContentSettingsForOneType timezone_override_rules;
+   std::string timezone_override_value;
+  ContentSettingsForOneType webgl_rules;
+ };
+ 
+ namespace content_settings {
+diff --git a/components/content_settings/core/common/content_settings.mojom b/components/content_settings/core/common/content_settings.mojom
+--- a/components/content_settings/core/common/content_settings.mojom
+++ b/components/content_settings/core/common/content_settings.mojom
+@@ -81,4 +81,5 @@ struct RendererContentSettingRules {
+   array<ContentSettingPatternSource> auto_dark_content_rules;
+   array<ContentSettingPatternSource> timezone_override_rules;
+   string timezone_override_value;
+  array<ContentSettingPatternSource> webgl_rules;
+ };
+diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
+--- a/components/content_settings/core/common/content_settings_mojom_traits.cc
+++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
+@@ -105,7 +105,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+          data.ReadMixedContentRules(&out->mixed_content_rules) &&
+          data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
+          data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
+-         data.ReadTimezoneOverrideValue(&out->timezone_override_value);
+         data.ReadTimezoneOverrideValue(&out->timezone_override_value) &&
+         data.ReadWebglRules(&out->webgl_rules);
+ }
+ 
+ }  // namespace mojo
+diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h
+--- a/components/content_settings/core/common/content_settings_mojom_traits.h
+++ b/components/content_settings/core/common/content_settings_mojom_traits.h
+@@ -165,6 +165,11 @@ struct StructTraits<
+     return r.timezone_override_value;
+   }
+ 
+  static const std::vector<ContentSettingPatternSource>& webgl_rules(
+      const RendererContentSettingRules& r) {
+    return r.webgl_rules;
+  }
+
+   static bool Read(
+       content_settings::mojom::RendererContentSettingRulesDataView data,
+       RendererContentSettingRules* out);
+diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
+--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
+@@ -277,6 +277,8 @@ enum class ContentSettingsType : int32_t {
+   // site instead of the mobile one.
+   REQUEST_DESKTOP_SITE,
+ 
+  WEBGL,
+
+   // Setting to indicate whether browser should allow signing into a website via
+   // the browser FedCM API.
+   FEDERATED_IDENTITY_API,
+diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
+--- a/components/content_settings/renderer/content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
+@@ -449,6 +449,15 @@ void ContentSettingsAgentImpl::ClearBlockedContentSettings() {
+   cached_script_permissions_.clear();
+ }
+ 
+bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) {
+  if (!content_setting_rules_)
+    return false;
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
+  return CONTENT_SETTING_ALLOW == GetContentSettingFromRules(
+             content_setting_rules_->webgl_rules,
+             url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL());
+}
+
+ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const {
+   if (should_allowlist_)
+     return true;
+diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h
+--- a/components/content_settings/renderer/content_settings_agent_impl.h
+++ b/components/content_settings/renderer/content_settings_agent_impl.h
+@@ -99,6 +99,7 @@ class ContentSettingsAgentImpl
+   bool AllowAutoplay(bool default_value) override;
+   bool AllowPopupsAndRedirects(bool default_value) override;
+   bool ShouldAutoupgradeMixedContent() override;
+  bool AllowWebgl(bool enabled_per_settings) override;
+ 
+   bool allow_running_insecure_content() const {
+     return allow_running_insecure_content_;
+diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/third_party/blink/public/platform/web_content_settings_client.h
+--- a/third_party/blink/public/platform/web_content_settings_client.h
+++ b/third_party/blink/public/platform/web_content_settings_client.h
+@@ -99,6 +99,8 @@ class WebContentSettingsClient {
+     return default_value;
+   }
+ 
+  virtual bool AllowWebgl(bool default_value) { return default_value; }
+
+   // Reports that passive mixed content was found at the provided URL.
+   virtual void PassiveInsecureContentFound(const WebURL&) {}
+ 
+diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
+--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
+@@ -67,6 +67,29 @@
+ 
+ namespace blink {
+ 
+blink::WebContentSettingsClient* GetContentSettingsClientFor(
+    ExecutionContext* context) {
+  blink::WebContentSettingsClient* settings = nullptr;
+  if (!context)
+    return settings;
+  if (auto* window = blink::DynamicTo<blink::LocalDOMWindow>(context)) {
+    auto* frame = window->GetFrame();
+    if (frame)
+      settings = frame->GetContentSettingsClient();
+  } else if (context->IsWorkerGlobalScope()) {
+    settings =
+        blink::To<blink::WorkerGlobalScope>(context)->ContentSettingsClient();
+  }
+  return settings;
+}
+
+bool AllowWebgl(ExecutionContext* context) {
+  blink::WebContentSettingsClient* settings = GetContentSettingsClientFor(context);
+  if (settings)
+    return settings->AllowWebgl(false);
+  return false;
+}
+
+ ExecutionContext::ExecutionContext(v8::Isolate* isolate, Agent* agent)
+     : isolate_(isolate),
+       security_context_(this),
+diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
+--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
+@@ -101,6 +101,7 @@ class SecurityOrigin;
+ class ScriptState;
+ class ScriptWrappable;
+ class TrustedTypePolicyFactory;
+class WebContentSettingsClient;
+ 
+ enum ReasonForCallingCanExecuteScripts {
+   kAboutToExecuteScript,
+@@ -109,6 +110,10 @@ enum ReasonForCallingCanExecuteScripts {
+ 
+ enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
+ 
+CORE_EXPORT bool AllowWebgl(ExecutionContext* context);
+CORE_EXPORT WebContentSettingsClient* GetContentSettingsClientFor(
+    ExecutionContext* context);
+
+ // An environment in which script can execute. This class exposes the common
+ // properties of script execution environments on the web (i.e, common between
+ // script executing in a window and script executing in a worker), such as:
+diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+@@ -246,6 +246,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+   }
+ }
+ 
+bool WebGLRenderingContextBase::AllowWebglForHost(blink::CanvasRenderingContextHost* host) {
+  if (!host)
+    return false;
+  blink::ExecutionContext* context = host->GetTopExecutionContext();
+  return blink::AllowWebgl(context);
+}
+
+ unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
+   base::AutoLock locker(WebGLContextLimitLock());
+   DCHECK(webgl_context_limits_initialized_);
+@@ -492,25 +499,6 @@ static String ExtractWebGLContextCreationError(
+     const Platform::GraphicsInfo& info) {
+   StringBuilder builder;
+   builder.Append("Could not create a WebGL context");
+-  FormatWebGLStatusString(
+-      "VENDOR",
+-      info.vendor_id ? String::Format("0x%04x", info.vendor_id) : "0xffff",
+-      builder);
+-  FormatWebGLStatusString(
+-      "DEVICE",
+-      info.device_id ? String::Format("0x%04x", info.device_id) : "0xffff",
+-      builder);
+-  FormatWebGLStatusString("GL_VENDOR", info.vendor_info, builder);
+-  FormatWebGLStatusString("GL_RENDERER", info.renderer_info, builder);
+-  FormatWebGLStatusString("GL_VERSION", info.driver_version, builder);
+-  FormatWebGLStatusString("Sandboxed", info.sandboxed ? "yes" : "no", builder);
+-  FormatWebGLStatusString("Optimus", info.optimus ? "yes" : "no", builder);
+-  FormatWebGLStatusString("AMD switchable", info.amd_switchable ? "yes" : "no",
+-                          builder);
+-  FormatWebGLStatusString(
+-      "Reset notification strategy",
+-      String::Format("0x%04x", info.reset_notification_strategy).Utf8().c_str(),
+-      builder);
+   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
+                           builder);
+   builder.Append('.');
+@@ -579,6 +567,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+     const CanvasContextCreationAttributesCore& attributes,
+     Platform::ContextType context_type,
+     Platform::GraphicsInfo* graphics_info) {
+  if (!AllowWebglForHost(host)) {
+    host->HostDispatchEvent(WebGLContextEvent::Create(
+        event_type_names::kWebglcontextcreationerror,
+        "disabled by site settings policy."));
+    return nullptr;
+  }
+   if ((context_type == Platform::kWebGL1ContextType &&
+        !host->IsWebGL1Enabled()) ||
+       (context_type == Platform::kWebGL2ContextType &&
+diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
+--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
+@@ -1920,6 +1920,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+                         DOMArrayBufferView* pixels,
+                         int64_t offset);
+ 
+  static bool AllowWebglForHost(blink::CanvasRenderingContextHost* host);
+
+   // Record Canvas/OffscreenCanvas.RenderingContextDrawnTo at the first draw
+   // call.
+   void RecordUKMCanvasDrawnToAtFirstDrawCall();
+--
+2.25.1
@@ -0,0 +1,401 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 6 May 2022 14:27:17 +0000
+Subject: Add webRTC site settings
+
+Requires patch: Content-settings-infrastructure.patch
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../browser_ui/site_settings/android/BUILD.gn |  3 +
+ .../BromiteCustomContentSettingImpl.java      |  1 +
+ .../BromiteWebRTCContentSetting.java          | 86 +++++++++++++++++++
+ .../site_settings/SiteSettingsCategory.java   |  5 +-
+ .../strings/android/browser_ui_strings.grd    |  1 +
+ .../browser_ui/strings/android/webrtc.grdp    | 18 ++++
+ components/components_strings.grd             |  1 +
+ .../core/browser/content_settings_registry.cc | 14 +++
+ .../core/browser/content_settings_utils.cc    |  2 +
+ .../core/common/content_settings.cc           |  4 +-
+ .../core/common/content_settings.h            |  1 +
+ .../core/common/content_settings.mojom        |  1 +
+ .../common/content_settings_mojom_traits.cc   |  3 +-
+ .../common/content_settings_mojom_traits.h    |  5 ++
+ .../core/common/content_settings_types.h      |  2 +
+ .../renderer/content_settings_agent_impl.cc   |  9 ++
+ .../renderer/content_settings_agent_impl.h    |  1 +
+ .../platform/web_content_settings_client.h    |  2 +
+ .../peer_connection_dependency_factory.cc     |  6 ++
+ 19 files changed, 161 insertions(+), 4 deletions(-)
+ create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java
+ create mode 100644 components/browser_ui/strings/android/webrtc.grdp
+
+diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
+--- a/components/browser_ui/site_settings/android/BUILD.gn
+++ b/components/browser_ui/site_settings/android/BUILD.gn
+@@ -95,6 +95,9 @@ android_library("java") {
+   sources += [
+     "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java",
+   ]
+  sources += [
+    "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java",
+  ]
+   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+   resources_package = "org.chromium.components.browser_ui.site_settings"
+   deps = [
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
+@@ -44,6 +44,7 @@ public abstract class BromiteCustomContentSettingImpl {
+     static {
+         mItemList = new ArrayList<BromiteCustomContentSetting>();
+         mItemList.add(new BromiteWebGLContentSetting());
+        mItemList.add(new BromiteWebRTCContentSetting());
+     }
+ 
+     public static SiteSettingsCategory createFromType(
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java
+new file mode 100644
+--- /dev/null
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteWebRTCContentSetting.java
+@@ -0,0 +1,86 @@
+/*
+    This file is part of Bromite.
+
+    Bromite is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Bromite is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+package org.chromium.components.browser_ui.site_settings;
+
+import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
+import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
+import org.chromium.components.content_settings.ContentSettingValues;
+import org.chromium.components.content_settings.ContentSettingsType;
+import org.chromium.content_public.browser.BrowserContextHandle;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import java.util.ArrayList;
+
+public class BromiteWebRTCContentSetting extends BromiteCustomContentSetting {
+    public BromiteWebRTCContentSetting() {
+        super(/*contentSettingsType*/ ContentSettingsType.WEBRTC,
+              /*siteSettingsCategory*/ SiteSettingsCategory.Type.WEBRTC,
+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
+              /*allowException*/ true,
+              /*preferenceKey*/ "webrtc",
+              /*profilePrefKey*/ "webrtc");
+    }
+
+    @Override
+    public ContentSettingsResources.ResourceItem getResourceItem() {
+        return new ContentSettingsResources.ResourceItem(
+            /*icon*/ R.drawable.web_asset,
+            /*title*/ R.string.webrtc_permission_title,
+            /*defaultEnabledValue*/ getDefaultEnabledValue(),
+            /*defaultDisabledValue*/ getDefaultDisabledValue(),
+            /*enabledSummary*/ R.string.website_settings_category_webrtc_enabled,
+            /*disabledSummary*/ R.string.website_settings_category_webrtc_disabled);
+    }
+
+    @Override
+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
+        switch (value) {
+            case ContentSettingValues.ALLOW:
+                return R.string.website_settings_category_webrtc_enabled;
+            case ContentSettingValues.BLOCK:
+                return R.string.website_settings_category_webrtc_disabled;
+            default:
+                // this will cause a runtime exception
+                return 0;
+        }
+    }
+
+    @Override
+    public boolean requiresTriStateContentSetting() {
+        return false;
+    }
+
+    @Override
+    public boolean showOnlyDescriptions() {
+        return true;
+    }
+
+    @Override
+    public int getAddExceptionDialogMessage() {
+        return R.string.website_settings_category_webrtc_enabled;
+    }
+
+    @Override
+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
+        return value != ContentSettingValues.BLOCK;
+    }
+}
+diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
+@@ -44,7 +44,7 @@ public class SiteSettingsCategory {
+             Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB, Type.VIRTUAL_REALITY,
+             Type.USE_STORAGE, Type.AUTO_DARK_WEB_CONTENT, Type.REQUEST_DESKTOP_SITE,
+             Type.FEDERATED_IDENTITY_API, Type.TIMEZONE_OVERRIDE, Type.AUTOPLAY, Type.JAVASCRIPT_JIT,
+-            Type.IMAGES, Type.WEBGL})
+            Type.IMAGES, Type.WEBGL, Type.WEBRTC})
+     @Retention(RetentionPolicy.SOURCE)
+     public @interface Type {
+         // All updates here must also be reflected in {@link #preferenceKey(int)
+@@ -80,10 +80,11 @@ public class SiteSettingsCategory {
+         int JAVASCRIPT_JIT = 28;
+         int IMAGES = 29;
+         int WEBGL = 30;
+        int WEBRTC = 31;
+         /**
+          * Number of handled categories used for calculating array sizes.
+          */
+-        int NUM_ENTRIES = 31;
+        int NUM_ENTRIES = 32;
+     }
+ 
+     private final BrowserContextHandle mBrowserContextHandle;
+diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
+--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
+@@ -175,6 +175,7 @@
+     <messages fallback_to_english="true">
+       <part file="site_settings.grdp" />
+       <part file="webgl.grdp" />
+      <part file="webrtc.grdp" />
+ 
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
+         Got it
+diff --git a/components/browser_ui/strings/android/webrtc.grdp b/components/browser_ui/strings/android/webrtc.grdp
+new file mode 100644
+--- /dev/null
+++ b/components/browser_ui/strings/android/webrtc.grdp
+@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <message name="IDS_SITE_SETTINGS_TYPE_WEBRTC" desc="The label used for webrtc site settings controls.">
+    WebRTC
+  </message>
+  <message name="IDS_SITE_SETTINGS_TYPE_WEBRTC_MID_SENTENCE" desc="The label used for webrtc site settings controls when used mid-sentence.">
+    webRTC
+  </message>
+  <message name="IDS_WEBRTC_PERMISSION_TITLE" desc="Title of the permission to use webrtc [CHAR-LIMIT=32]">
+    WebRTC
+  </message>
+  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_WEBRTC_ENABLED" desc="Summary text explaining that webrtc is full enabled.">
+    Enabled
+  </message>
+  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_WEBRTC_DISABLED" desc="Summary text explaining that webrtc is full disabled.">
+    Disabled
+  </message>
+</grit-part>
+diff --git a/components/components_strings.grd b/components/components_strings.grd
+--- a/components/components_strings.grd
+++ b/components/components_strings.grd
+@@ -339,6 +339,7 @@
+       <part file="webapps_strings.grdp" />
+ 
+       <part file="browser_ui/strings/android/webgl.grdp" />
+      <part file="browser_ui/strings/android/webrtc.grdp" />
+       <if expr="not is_ios">
+         <part file="history_clusters_strings.grdp" />
+       </if>
+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -647,6 +647,20 @@ void ContentSettingsRegistry::Init() {
+            /*show_into_info_page*/ true,
+            /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL,
+            /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE);
+
+  Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK,
+           WebsiteSettingsInfo::SYNCABLE,
+           AllowlistedSchemes(),
+           ValidSettings(CONTENT_SETTING_ALLOW,
+                         CONTENT_SETTING_BLOCK),
+           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
+           WebsiteSettingsRegistry::PLATFORM_ANDROID,
+           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
+           ContentSettingsInfo::PERSISTENT,
+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS,
+           /*show_into_info_page*/ true,
+           /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBRTC,
+           /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBRTC_MID_SENTENCE);
+ }
+ 
+ void ContentSettingsRegistry::Register(
+diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
+--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
+@@ -158,6 +158,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
+   rules->timezone_override_value = timezone;
+   map->GetSettingsForOneType(ContentSettingsType::WEBGL,
+                              &(rules->webgl_rules));
+  map->GetSettingsForOneType(ContentSettingsType::WEBRTC,
+                             &(rules->webrtc_rules));
+ }
+ 
+ bool IsMorePermissive(ContentSetting a, ContentSetting b) {
+diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
+--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
+@@ -209,7 +209,8 @@ bool RendererContentSettingRules::IsRendererContentSetting(
+          content_type == ContentSettingsType::MIXEDSCRIPT ||
+          content_type == ContentSettingsType::AUTO_DARK_WEB_CONTENT ||
+          content_type == ContentSettingsType::TIMEZONE_OVERRIDE ||
+-         content_type == ContentSettingsType::WEBGL;
+         content_type == ContentSettingsType::WEBGL ||
+         content_type == ContentSettingsType::WEBRTC;
+ }
+ 
+ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+@@ -222,6 +223,7 @@ void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
+   FilterRulesForType(timezone_override_rules, outermost_main_frame_url);
+   FilterRulesForType(autoplay_rules, outermost_main_frame_url);
+   FilterRulesForType(webgl_rules, outermost_main_frame_url);
+  FilterRulesForType(webrtc_rules, outermost_main_frame_url);
+ }
+ 
+ RendererContentSettingRules::RendererContentSettingRules() = default;
+diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
+--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
+@@ -97,6 +97,7 @@ struct RendererContentSettingRules {
+   ContentSettingsForOneType timezone_override_rules;
+   std::string timezone_override_value;
+   ContentSettingsForOneType webgl_rules;
+  ContentSettingsForOneType webrtc_rules;
+ };
+ 
+ namespace content_settings {
+diff --git a/components/content_settings/core/common/content_settings.mojom b/components/content_settings/core/common/content_settings.mojom
+--- a/components/content_settings/core/common/content_settings.mojom
+++ b/components/content_settings/core/common/content_settings.mojom
+@@ -82,4 +82,5 @@ struct RendererContentSettingRules {
+   array<ContentSettingPatternSource> timezone_override_rules;
+   string timezone_override_value;
+   array<ContentSettingPatternSource> webgl_rules;
+  array<ContentSettingPatternSource> webrtc_rules;
+ };
+diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
+--- a/components/content_settings/core/common/content_settings_mojom_traits.cc
+++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
+@@ -106,7 +106,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
+          data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
+          data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
+          data.ReadTimezoneOverrideValue(&out->timezone_override_value) &&
+-         data.ReadWebglRules(&out->webgl_rules);
+         data.ReadWebglRules(&out->webgl_rules) &&
+         data.ReadWebrtcRules(&out->webrtc_rules);
+ }
+ 
+ }  // namespace mojo
+diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h
+--- a/components/content_settings/core/common/content_settings_mojom_traits.h
+++ b/components/content_settings/core/common/content_settings_mojom_traits.h
+@@ -170,6 +170,11 @@ struct StructTraits<
+     return r.webgl_rules;
+   }
+ 
+  static const std::vector<ContentSettingPatternSource>& webrtc_rules(
+      const RendererContentSettingRules& r) {
+    return r.webrtc_rules;
+  }
+
+   static bool Read(
+       content_settings::mojom::RendererContentSettingRulesDataView data,
+       RendererContentSettingRules* out);
+diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h
+--- a/components/content_settings/core/common/content_settings_types.h
+++ b/components/content_settings/core/common/content_settings_types.h
+@@ -279,6 +279,8 @@ enum class ContentSettingsType : int32_t {
+ 
+   WEBGL,
+ 
+  WEBRTC,
+
+   // Setting to indicate whether browser should allow signing into a website via
+   // the browser FedCM API.
+   FEDERATED_IDENTITY_API,
+diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc
+--- a/components/content_settings/renderer/content_settings_agent_impl.cc
+++ b/components/content_settings/renderer/content_settings_agent_impl.cc
+@@ -458,6 +458,15 @@ bool ContentSettingsAgentImpl::AllowWebgl(bool enabled_per_settings) {
+              url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL());
+ }
+ 
+bool ContentSettingsAgentImpl::AllowWebRTC(bool enabled_per_settings) {
+  if (!content_setting_rules_)
+    return false;
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
+  return CONTENT_SETTING_ALLOW == GetContentSettingFromRules(
+             content_setting_rules_->webrtc_rules,
+             url::Origin(frame->GetDocument().GetSecurityOrigin()).GetURL());
+}
+
+ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const {
+   if (should_allowlist_)
+     return true;
+diff --git a/components/content_settings/renderer/content_settings_agent_impl.h b/components/content_settings/renderer/content_settings_agent_impl.h
+--- a/components/content_settings/renderer/content_settings_agent_impl.h
+++ b/components/content_settings/renderer/content_settings_agent_impl.h
+@@ -100,6 +100,7 @@ class ContentSettingsAgentImpl
+   bool AllowPopupsAndRedirects(bool default_value) override;
+   bool ShouldAutoupgradeMixedContent() override;
+   bool AllowWebgl(bool enabled_per_settings) override;
+  bool AllowWebRTC(bool enabled_per_settings) override;
+ 
+   bool allow_running_insecure_content() const {
+     return allow_running_insecure_content_;
+diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/third_party/blink/public/platform/web_content_settings_client.h
+--- a/third_party/blink/public/platform/web_content_settings_client.h
+++ b/third_party/blink/public/platform/web_content_settings_client.h
+@@ -101,6 +101,8 @@ class WebContentSettingsClient {
+ 
+   virtual bool AllowWebgl(bool default_value) { return default_value; }
+ 
+  virtual bool AllowWebRTC(bool default_value) { return default_value; }
+
+   // Reports that passive mixed content was found at the provided URL.
+   virtual void PassiveInsecureContentFound(const WebURL&) {}
+ 
+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
+@@ -33,6 +33,7 @@
+ #include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h"
+ #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
+ #include "third_party/blink/public/platform/platform.h"
+#include "third_party/blink/public/platform/web_content_settings_client.h"
+ #include "third_party/blink/public/platform/web_url.h"
+ #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
+ #include "third_party/blink/public/web/web_document.h"
+@@ -804,6 +805,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+       // origin.
+       WebRTCIPHandlingPolicy policy =
+           GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
+      blink::WebContentSettingsClient* settings = web_frame->GetContentSettingsClient();
+      if (settings && settings->AllowWebRTC(false)) {
+        policy = kDefault;
+      }
+
+       switch (policy) {
+         // TODO(guoweis): specify the flag of disabling local candidate
+         // collection when webrtc is updated.
+--
+2.25.1
@@ -0,0 +1,440 @@
+From: Zoraver Kang <Zoraver@users.noreply.github.com>
+Date: Fri, 22 May 2020 22:43:27 -0400
+Subject: Allow building without enable_reporting
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../browser/devtools/protocol/network_handler.cc |  2 ++
+ .../cross_origin_embedder_policy_reporter.cc     |  7 +++++--
+ .../cross_origin_opener_policy_reporter.cc       | 16 +++++++---------
+ .../browser/network/reporting_service_proxy.cc   |  3 +++
+ .../renderer_host/render_frame_host_impl.cc      |  6 ------
+ .../web_package/signed_exchange_reporter.cc      |  2 ++
+ ...content_switch_dependent_feature_overrides.cc |  1 +
+ net/reporting/reporting_service.cc               |  6 ++++++
+ services/network/network_context.h               |  4 ++--
+ services/network/public/mojom/BUILD.gn           |  1 -
+ .../network/public/mojom/network_context.mojom   |  2 ++
+ .../blink/renderer/core/frame/local_frame.cc     |  3 +++
+ .../blink/renderer/core/frame/local_frame.h      |  6 +++---
+ .../renderer/core/frame/reporting_context.cc     |  9 +++++++++
+ .../renderer/core/frame/reporting_context.h      |  7 +++++--
+ 15 files changed, 50 insertions(+), 25 deletions(-)
+
+diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
+--- a/content/browser/devtools/protocol/network_handler.cc
+++ b/content/browser/devtools/protocol/network_handler.cc
+@@ -1291,6 +1291,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+   }
+ }
+ 
+#if BUILDFLAG(ENABLE_REPORTING)
+ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+   std::vector<GURL> urls;
+   base::queue<FrameTreeNode*> queue;
+@@ -1308,6 +1309,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+   }
+   return urls;
+ }
+#endif  // BUILDFLAG(ENABLE_REPORTING)
+ 
+ }  // namespace
+ 
+diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/content/browser/network/cross_origin_embedder_policy_reporter.cc
+--- a/content/browser/network/cross_origin_embedder_policy_reporter.cc
+++ b/content/browser/network/cross_origin_embedder_policy_reporter.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "content/browser/network/cross_origin_embedder_policy_reporter.h"
+ 
+#include "net/base/features.h"
+ #include "base/strings/string_piece.h"
+ #include "base/values.h"
+ #include "content/public/browser/storage_partition.h"
+@@ -95,8 +96,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
+ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+     std::initializer_list<std::pair<base::StringPiece, base::StringPiece>> body,
+     bool report_only) {
+-  const absl::optional<std::string>& endpoint =
+-      report_only ? report_only_endpoint_ : endpoint_;
+   const char* const disposition = report_only ? "reporting" : "enforce";
+   if (observer_) {
+     std::vector<blink::mojom::ReportBodyElementPtr> list;
+@@ -111,6 +110,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+     observer_->Notify(blink::mojom::Report::New(
+         kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
+   }
+#if BUILDFLAG(ENABLE_REPORTING)
+  const absl::optional<std::string>& endpoint =
+      report_only ? report_only_endpoint_ : endpoint_;
+   if (endpoint) {
+     base::Value::Dict body_to_pass;
+     for (const auto& pair : body) {
+@@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+           /*user_agent=*/absl::nullopt, std::move(body_to_pass));
+     }
+   }
+#endif
+ }
+ 
+ }  // namespace content
+diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/content/browser/network/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/network/cross_origin_opener_policy_reporter.cc
+++ b/content/browser/network/cross_origin_opener_policy_reporter.cc
+@@ -18,25 +18,17 @@
+ #include "services/network/public/mojom/network_context.mojom.h"
+ #include "services/network/public/mojom/source_location.mojom.h"
+ #include "url/origin.h"
+#include "build/build_config.h"
+ 
+ namespace content {
+ 
+ namespace {
+ 
+ // Report attribute names (camelCase):
+-constexpr char kColumnNumber[] = "columnNumber";
+ constexpr char kDisposition[] = "disposition";
+-constexpr char kEffectivePolicy[] = "effectivePolicy";
+-constexpr char kInitialPopupURL[] = "initialPopupURL";
+-constexpr char kLineNumber[] = "lineNumber";
+ constexpr char kNextURL[] = "nextResponseURL";
+-constexpr char kOpeneeURL[] = "openeeURL";
+-constexpr char kOpenerURL[] = "openerURL";
+-constexpr char kOtherDocumentURL[] = "otherDocumentURL";
+ constexpr char kPreviousURL[] = "previousResponseURL";
+-constexpr char kProperty[] = "property";
+ constexpr char kReferrer[] = "referrer";
+-constexpr char kSourceFile[] = "sourceFile";
+ constexpr char kType[] = "type";
+ 
+ // Report attribute values:
+@@ -45,6 +37,7 @@ constexpr char kDispositionReporting[] = "reporting";
+ constexpr char kTypeFromResponse[] = "navigation-from-response";
+ constexpr char kTypeToResponse[] = "navigation-to-response";
+ 
+#if BUILDFLAG(ENABLE_REPORTING)
+ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
+   switch (coop_value) {
+     case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone:
+@@ -62,6 +55,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
+       return "restrict-properties-plus-coep";
+   }
+ }
+#endif
+ 
+ FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
+   FrameTreeNode* opener =
+@@ -233,6 +227,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+     network::mojom::SourceLocationPtr source_location,
+     const std::string& reported_window_url,
+     const std::string& initial_popup_url) const {
+#if BUILDFLAG(ENABLE_REPORTING)
+   // Cross-Origin-Opener-Policy-Report-Only is not required to provide
+   // endpoints.
+   if (!coop_.report_only_reporting_endpoint)
+@@ -280,12 +275,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+   storage_partition_->GetNetworkContext()->QueueReport(
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_, absl::nullopt, std::move(body));
+#endif
+ }
+ 
+ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+     base::Value::Dict body,
+     const std::string& endpoint,
+     bool is_report_only) {
+#if BUILDFLAG(ENABLE_REPORTING)
+   body.Set(kDisposition,
+            is_report_only ? kDispositionReporting : kDispositionEnforce);
+   body.Set(kEffectivePolicy,
+@@ -294,6 +291,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_,
+       /*user_agent=*/absl::nullopt, std::move(body));
+#endif
+ }
+ 
+ }  // namespace content
+diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browser/network/reporting_service_proxy.cc
+--- a/content/browser/network/reporting_service_proxy.cc
+++ b/content/browser/network/reporting_service_proxy.cc
+@@ -11,6 +11,7 @@
+ #include "base/memory/ref_counted.h"
+ #include "base/unguessable_token.h"
+ #include "base/values.h"
+#include "net/base/features.h"
+ #include "content/browser/service_worker/service_worker_host.h"
+ #include "content/browser/worker_host/dedicated_worker_host.h"
+ #include "content/browser/worker_host/shared_worker_host.h"
+@@ -174,12 +175,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+                    const std::string& group,
+                    const std::string& type,
+                    base::Value::Dict body) {
+#if BUILDFLAG(ENABLE_REPORTING)
+     auto* rph = RenderProcessHost::FromID(render_process_id_);
+     if (!rph)
+       return;
+     rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
+         type, group, url, reporting_source_, network_anonymization_key_,
+         /*user_agent=*/absl::nullopt, std::move(body));
+#endif
+   }
+ 
+   const int render_process_id_;
+diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
+--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
+@@ -11993,12 +11993,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+   base::Value::Dict body;
+   if (!reason.empty())
+     body.Set("reason", reason);
+-
+-  // Send the crash report to the Reporting API.
+-  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
+-      /*type=*/"crash", /*group=*/"default", last_committed_url_,
+-      GetReportingSource(), isolation_info_.network_anonymization_key(),
+-      absl::nullopt /* user_agent */, std::move(body));
+ }
+ 
+ void RenderFrameHostImpl::SendCommitNavigation(
+diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
+--- a/content/browser/web_package/signed_exchange_reporter.cc
+++ b/content/browser/web_package/signed_exchange_reporter.cc
+@@ -128,6 +128,7 @@ void ReportResult(
+     int frame_tree_node_id,
+     network::mojom::SignedExchangeReportPtr report,
+     const net::NetworkAnonymizationKey& network_anonymization_key) {
+#if BUILDFLAG(ENABLE_REPORTING)
+   FrameTreeNode* frame_tree_node =
+       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
+   if (!frame_tree_node)
+@@ -142,6 +143,7 @@ void ReportResult(
+   DCHECK(partition);
+   partition->GetNetworkContext()->QueueSignedExchangeReport(
+       std::move(report), network_anonymization_key);
+#endif
+ }
+ 
+ }  // namespace
+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
+@@ -8,6 +8,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"
+diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
+--- a/net/reporting/reporting_service.cc
+++ b/net/reporting/reporting_service.cc
+@@ -211,6 +211,12 @@ class ReportingServiceImpl : public ReportingService {
+       base::Value::Dict body,
+       int depth,
+       base::TimeTicks queued_ticks) {
+#if BUILDFLAG(ENABLE_REPORTING)
+    if ((true))
+      return;
+#else
+#error Attempting to build with enable_reporting
+#endif
+     DCHECK(initialized_);
+     context_->cache()->AddReport(
+         reporting_source, network_anonymization_key, sanitized_url, user_agent,
+diff --git a/services/network/network_context.h b/services/network/network_context.h
+--- a/services/network/network_context.h
+++ b/services/network/network_context.h
+@@ -465,10 +465,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+       const absl::optional<base::UnguessableToken>& reporting_source,
+       const net::NetworkAnonymizationKey& network_anonymization_key,
+       const absl::optional<std::string>& user_agent,
+-      base::Value::Dict body) override;
+      base::Value::Dict body);
+   void QueueSignedExchangeReport(
+       mojom::SignedExchangeReportPtr report,
+-      const net::NetworkAnonymizationKey& network_anonymization_key) override;
+      const net::NetworkAnonymizationKey& network_anonymization_key);
+   void AddDomainReliabilityContextForTesting(
+       const url::Origin& origin,
+       const GURL& upload_url,
+diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
+--- a/services/network/public/mojom/BUILD.gn
+++ b/services/network/public/mojom/BUILD.gn
+@@ -1168,7 +1168,6 @@ mojom("mojom") {
+     export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
+     export_header_blink = "third_party/blink/public/platform/web_common.h"
+     if (enable_reporting) {
+-      enabled_features += [ "enable_reporting" ]
+     }
+   }
+ 
+diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
+--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
+@@ -1072,6 +1072,7 @@ interface NetworkContext {
+   // provided |network_isolation_key|.
+   //
+   // Spec: https://w3c.github.io/reporting/#concept-reports
+  [EnableIf=enable_reporting]
+   QueueReport(string type,
+               string group,
+               url.mojom.Url url,
+@@ -1085,6 +1086,7 @@ interface NetworkContext {
+   // Note that this queued report will never be delivered if no reporting
+   // endpoint matching is registered for with the provided
+   // |network_isolation_key|.
+  [EnableIf=enable_reporting]
+   QueueSignedExchangeReport(SignedExchangeReport report,
+                             NetworkAnonymizationKey network_anonymization_key);
+ 
+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
+@@ -40,6 +40,7 @@
+ #include "build/build_config.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"
+@@ -2328,9 +2329,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
+@@ -35,9 +35,9 @@
+ #include "base/time/default_tick_clock.h"
+ #include "base/time/time.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"
+@@ -596,9 +596,9 @@ class CORE_EXPORT LocalFrame final
+   }
+ 
+   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"
+@@ -53,7 +54,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
+@@ -117,7 +120,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);
+ }
+@@ -139,6 +144,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()) {
+@@ -148,6 +154,7 @@ ReportingContext::GetReportingService() const {
+   }
+   return reporting_service_;
+ }
+#endif
+ 
+ void ReportingContext::NotifyInternal(Report* report) {
+   // Buffer the report.
+@@ -170,6 +177,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 ||
+@@ -227,6 +235,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"
+@@ -55,10 +56,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;
+@@ -69,8 +70,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.25.1
@@ -1,119 +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 -----------------
- chrome/android/feed/feed_java_sources.gni       |  2 --
- .../browser/native_page/NativePageFactory.java  |  7 -------
- components/feed/feed_feature_list.cc            |  2 +-
- 5 files changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
-+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java
-@@ -214,11 +214,6 @@ public class StartSurfaceCoordinator implements StartSurface {
-             mBottomBarCoordinator = new BottomBarCoordinator(
-                     mActivity, mActivity.getCompositorViewHolder(), mPropertyModel);
-         }
-
-        mExploreSurfaceCoordinator = new ExploreSurfaceCoordinator(mActivity,
-                mSurfaceMode == SurfaceMode.SINGLE_PANE ? mTasksSurface.getBodyViewContainer()
-                                                        : mActivity.getCompositorViewHolder(),
-                mPropertyModel, mSurfaceMode == SurfaceMode.SINGLE_PANE);
-     }
- 
-     private TabSwitcher.Controller initializeSecondaryTasksSurface() {
-diff --git a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-+++ b/chrome/android/features/start_surface/internal/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -415,15 +415,6 @@ class StartSurfaceMediator
-             assert (isShownState(shownState));
-             setOverviewState(shownState);
- 
-            // Make sure FeedSurfaceCoordinator is built before the explore surface is showing by
-            // default.
-            if (mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)
-                    && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
-                    && !mActivityStateChecker.isFinishingOrDestroyed()) {
-                mPropertyModel.set(FEED_SURFACE_COORDINATOR,
-                        mFeedSurfaceCreator.createFeedSurfaceCoordinator(
-                                mNightModeStateProvider.isInNightMode()));
-            }
-             mTabModelSelector.addObserver(mTabModelSelectorObserver);
- 
-             if (mFullScreenListener != null) {
-@@ -536,14 +527,6 @@ class StartSurfaceMediator
-     private void setExploreSurfaceVisibility(boolean isVisible) {
-         if (isVisible == mPropertyModel.get(IS_EXPLORE_SURFACE_VISIBLE)) return;
- 
-        if (isVisible && mPropertyModel.get(IS_SHOWING_OVERVIEW)
-                && mPropertyModel.get(FEED_SURFACE_COORDINATOR) == null
-                && !mActivityStateChecker.isFinishingOrDestroyed()) {
-            mPropertyModel.set(FEED_SURFACE_COORDINATOR,
-                    mFeedSurfaceCreator.createFeedSurfaceCoordinator(
-                            mNightModeStateProvider.isInNightMode()));
-        }
-
-         mPropertyModel.set(IS_EXPLORE_SURFACE_VISIBLE, isVisible);
- 
-         if (mOverviewModeState == OverviewModeState.SHOWN_TABSWITCHER_TWO_PANES) {
-diff --git a/chrome/android/feed/feed_java_sources.gni b/chrome/android/feed/feed_java_sources.gni
--- a/chrome/android/feed/feed_java_sources.gni
-+++ b/chrome/android/feed/feed_java_sources.gni
-@@ -35,7 +35,6 @@ if (enable_feed_in_chrome) {
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLifecycleBridge.java",
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedLoggingBridge.java",
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNetworkBridge.java",
-    "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineBridge.java",
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedOfflineIndicator.java",
-     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
-@@ -736,7 +735,6 @@ if (enable_feed_in_chrome) {
-   feed_deps = []
-   feed_java_sources = [
-     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedAppLifecycle.java",
-    "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedNewTabPage.java",
-     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedProcessScopeFactory.java",
-     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedRefreshTask.java",
-     "//chrome/android/feed/dummy/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java",
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.ChromeActivity;
- import org.chromium.chrome.browser.bookmarks.BookmarkPage;
- import org.chromium.chrome.browser.download.DownloadPage;
- import org.chromium.chrome.browser.explore_sites.ExploreSitesPage;
-import org.chromium.chrome.browser.feed.FeedNewTabPage;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
- import org.chromium.chrome.browser.history.HistoryPage;
-@@ -57,12 +56,6 @@ public class NativePageFactory {
-                         activity, new TabShim(tab, activity.getFullscreenManager()));
-             }
- 
-            if (ChromeFeatureList.isEnabled(ChromeFeatureList.INTEREST_FEED_CONTENT_SUGGESTIONS)) {
-                return new FeedNewTabPage(activity,
-                        new TabShim(tab, activity.getFullscreenManager()), tabModelSelector,
-                        activityTabProvider, activityLifecycleDispatcher, (TabImpl) tab);
-            }
-
-             return new NewTabPage(activity, new TabShim(tab, activity.getFullscreenManager()),
-                     tabModelSelector, activityTabProvider, activityLifecycleDispatcher,
-                     (TabImpl) tab);
-diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
--- a/components/feed/feed_feature_list.cc
-+++ b/components/feed/feed_feature_list.cc
-@@ -7,7 +7,7 @@
- namespace feed {
- 
- const base::Feature kInterestFeedContentSuggestions{
-    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::FeatureParam<std::string> kDisableTriggerTypes{
-     &kInterestFeedContentSuggestions, "disable_trigger_types", ""};
-- 
-2.17.1
-
@@ -0,0 +1,53 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 21 Feb 2022 01:24:11 +0100
+Subject: Allow building without supervised users
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../browser/supervised_user/ChildAccountService.java  | 11 -----------
+ .../child_accounts/child_account_service_android.cc   |  9 ---------
+ 2 files changed, 20 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/supervised_user/ChildAccountService.java
+@@ -31,21 +31,10 @@ public class ChildAccountService {
+         ThreadUtils.assertOnUiThread();
+         final Activity activity = windowAndroid.getActivity().get();
+         if (activity == null) {
+-            PostTask.postTask(UiThreadTaskTraits.DEFAULT, () -> {
+-                ChildAccountServiceJni.get().onReauthenticationFailed(nativeOnFailureCallback);
+-            });
+             return;
+         }
+         Account account = AccountUtils.createAccountFromName(accountName);
+         AccountManagerFacadeProvider.getInstance().updateCredentials(account, activity, success -> {
+-            if (!success) {
+-                ChildAccountServiceJni.get().onReauthenticationFailed(nativeOnFailureCallback);
+-            }
+         });
+     }
+-
+-    @NativeMethods
+-    interface Natives {
+-        void onReauthenticationFailed(long onFailureCallbackPtr);
+-    }
+ }
+diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc
+--- a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc
+++ b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc
+@@ -39,12 +39,3 @@ void ReauthenticateChildAccount(
+       env, window_android->GetJavaObject(), ConvertUTF8ToJavaString(env, email),
+       reinterpret_cast<jlong>(callback_copy.release()));
+ }
+-
+-void JNI_ChildAccountService_OnReauthenticationFailed(JNIEnv* env,
+-                                                      jlong jcallbackPtr) {
+-  // Cast the pointer value back to a Callback and take ownership of it.
+-  std::unique_ptr<base::RepeatingCallback<void()>> callback(
+-      reinterpret_cast<base::RepeatingCallback<void()>*>(jcallbackPtr));
+-
+-  callback->Run();
+-}
+--
+2.25.1
@@ -2,15 +2,16 @@ From: AlexeyBarabash <alexey@brave.com>
 Date: Thu, 2 Nov 2017 18:21:16 +0200
 Subject: Allow playing audio in background

+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/blink/webmediaplayer_impl.cc | 12 +++++++++++-
- media/blink/webmediaplayer_impl.h  |  2 ++
+ .../renderer/platform/media/web_media_player_impl.cc  | 11 ++++++++++-
+ .../renderer/platform/media/web_media_player_impl.h   |  3 +++
 2 files changed, 13 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
-@@ -977,6 +977,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+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
+@@ -1237,6 +1237,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -21,33 +22,32 @@ 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());
-@@ -3351,7 +3357,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3662,7 +3668,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+           : HasAudio();
+ 
   // Audio only stream is allowed to play when in background.
-   // TODO: We should check IsBackgroundOptimizationCandidate here. But we need
-   // to move the logic of checking video frames out of that function.
-  if (!HasVideo())
-+
+-  if (!HasVideo() && preserve_audio)
 +  //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
 +  //see media/base/pipeline_metadata.h. This is a workaround to allow audio
 +  //streams be played in background.
-+  if (!HasVideoNonEmptySize())
+  if (!HasVideoNonEmptySize() && preserve_audio)
     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
-@@ -149,6 +149,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
-   // True if the loaded media has a playable video/audio track.
+   // MediaPlayer always signals audio and video, so use an empty natural size to
+diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
+--- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
+@@ -197,6 +197,9 @@ class 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 blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
-- 
-2.17.1
-
+       const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
+   void SelectedVideoTrackChanged(
+--
+2.25.1
@@ -1,24 +0,0 @@
-From: xsmile <xsmile@users.noreply.github.com>
-Date: Thu, 11 Oct 2018 21:29:35 +0200
-Subject: Allow website sign-in without account sign-in
-
-Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found in chrome://settings
---
- chrome/browser/signin/account_consistency_mode_manager.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
-+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -134,7 +134,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
-   registry->RegisterBooleanPref(prefs::kAccountConsistencyMirrorRequired,
-                                 false);
- #endif
-  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
-+  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
- }
- 
- // static
-- 
-2.17.1
-
@@ -1,37 +0,0 @@
-From: samartnik <artem@brave.com>
-Date: Thu, 14 Dec 2017 16:19:50 +0200
-Subject: Always allow partner customisation
-
---
- .../PartnerBrowserCustomizations.java            | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -244,14 +244,14 @@ public class PartnerBrowserCustomizations {
-             @Override
-             protected Void doInBackground() {
-                 try {
-                    boolean systemOrPreStable =
-                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-                            || !ChromeVersionInfo.isStableBuild();
-                    if (!systemOrPreStable) {
-                        // Only allow partner customization if this browser is a system package, or
-                        // is in pre-stable channels.
-                        return null;
-                    }
-+                    //boolean systemOrPreStable =
-+                    //        (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
-+                    //        || !ChromeVersionInfo.isStableBuild();
-+                    //if (!systemOrPreStable) {
-+                    //    // Only allow partner customization if this browser is a system package, or
-+                    //    // is in pre-stable channels.
-+                    //    return null;
-+                    //}
- 
-                     if (isCancelled()) return null;
-                     refreshIncognitoModeDisabled();
-- 
-2.17.1
-
@@ -1,38 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 5 Jun 2018 13:46:40 +0200
-Subject: Always respect async dns flag (regardless of SDK version)
-
-Do not read experiment value for cronet async DNS configuration
---
- chrome/browser/net/system_network_context_manager.cc | 2 +-
- components/cronet/url_request_context_config.cc      | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-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
-@@ -196,7 +196,7 @@ void OnAuthPrefsChanged(PrefService* local_state,
- // Android this includes checking the Android version in the field trial.
- bool ShouldEnableAsyncDns() {
-   bool feature_can_be_enabled = true;
-#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)
-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
-@@ -540,7 +540,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
-         effective_experimental_options->Remove(it.key(), nullptr);
-         continue;
-       }
-      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
-+      bool ignored;
-+      async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
-     } else if (it.key() == kStaleDnsFieldTrialName) {
-       const base::DictionaryValue* stale_dns_args = nullptr;
-       if (!it.value().GetAsDictionary(&stale_dns_args)) {
-- 
-2.17.1
-
@@ -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/SingleWebsiteSettings.java        | 46 +++++++++----------
- .../browser/settings/website/Website.java     | 20 ++++++++
- 2 files changed, 42 insertions(+), 24 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/SingleWebsiteSettings.java
-@@ -72,6 +72,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
-     // Buttons:
-     public static final String PREF_RESET_SITE = "reset_site_button";
- 
-+    public static final String TAG = "SingleWebsitePreferences";
-     // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below)
-     // All permissions from the permissions preference category must be listed here.
-     private static final String[] PERMISSION_PREFERENCE_KEYS = {
-@@ -349,7 +350,24 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
-                 } else if (i == ContentSettingException.Type.SOUND) {
-                     setUpSoundPreference(preference);
-                 } else {
-                    setUpListPreference(preference, mSite.getContentSettingPermission(i));
-+                    // some Bromite-specific overrides for the defaults
-+                    @ContentSettingValues
-+                    @Nullable
-+                    Integer permission = mSite.getContentSettingPermission(i);
-+                    // initialize cookie and javascript with the category global defaults
-+                    if (permission == null) {
-+                       if (i == ContentSettingException.Type.COOKIE)
-+                          permission = WebsitePreferenceBridge.isCategoryEnabled(
-+                                 ContentSettingsType.COOKIES)
-+                                 ? ContentSettingValues.ALLOW
-+                                 : ContentSettingValues.BLOCK;
-+                       else if (i == ContentSettingException.Type.JAVASCRIPT)
-+                          permission = WebsitePreferenceBridge.isCategoryEnabled(
-+                                 ContentSettingsType.JAVASCRIPT)
-+                                 ? ContentSettingValues.ALLOW
-+                                 : ContentSettingValues.BLOCK;
-+                    }
-+                    setUpListPreference(preference, permission);
-                 }
-                 return;
-             }
-@@ -646,17 +664,8 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
-     }
- 
-     private void setUpAdsInformationalBanner() {
-        // Add the informational banner which shows at the top of the UI if ad blocking is
-        // activated on this site.
-        boolean adBlockingActivated = SiteSettingsCategory.adsCategoryEnabled()
-                && WebsitePreferenceBridge.getAdBlockingActivated(mSite.getAddress().getOrigin())
-                && findPreference(PERMISSION_PREFERENCE_KEYS[ContentSettingException.Type.ADS])
-                        != null;
-
-        if (!adBlockingActivated) {
-            removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO);
-            removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO_DIVIDER);
-        }
-+        removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO);
-+        removePreferenceSafely(PREF_INTRUSIVE_ADS_INFO_DIVIDER);
-     }
- 
-     private SiteSettingsCategory getWarningCategory() {
-@@ -733,6 +742,7 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
-         // TODO(crbug.com/735110): Figure out if this is the correct thing to do - here we are
-         // effectively treating non-ALLOW values as BLOCK.
-         int index = (value == ContentSettingValues.ALLOW ? 0 : 1);
-+
-         listPreference.setValueIndex(index);
-         listPreference.setOnPreferenceChangeListener(this);
-         listPreference.setSummary("%s");
-@@ -802,22 +812,10 @@ public class SingleWebsiteSettings extends PreferenceFragmentCompat
-             setUpListPreference(preference, null);
-             return;
-         }
-        // If the ad blocker is activated, then this site will have ads blocked unless there is an
-        // explicit permission disallowing the blocking.
-        boolean activated =
-                WebsitePreferenceBridge.getAdBlockingActivated(mSite.getAddress().getOrigin());
-         @ContentSettingValues
-         @Nullable
-         Integer permission = mSite.getContentSettingPermission(ContentSettingException.Type.ADS);
- 
-        // If |permission| is null, there is no explicit (non-default) permission set for this site.
-        // If the site is not considered a candidate for blocking, do the standard thing and remove
-        // the preference.
-        if (permission == null && !activated) {
-            setUpListPreference(preference, null);
-            return;
-        }
-
-         // However, if the blocking is activated, we still want to show the permission, even if it
-         // is in the default state.
-         if (permission == null) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/website/Website.java
-@@ -197,6 +197,26 @@ public class Website implements Serializable {
-                         new ContentSettingException(ContentSettingsType.ADS,
-                                 getAddress().getOrigin(), ContentSettingValues.BLOCK, "");
-             }
-+        } else if (type == ContentSettingException.Type.COOKIE) {
-+            // It is possible to set the permission without having an existing exception,
-+            // because we can show the ALLOW state even when this permission is set to the
-+            // default. In that case, just set an exception now to ALLOW to enable changing the
-+            // permission.
-+            if (mContentSettingException[type] == null) {
-+                mContentSettingException[type] =
-+                        new ContentSettingException(ContentSettingsType.COOKIES,
-+                                getAddress().getOrigin(), ContentSettingValues.ALLOW, "");
-+            }
-+        } else if (type == ContentSettingException.Type.JAVASCRIPT) {
-+            // It is possible to set the permission without having an existing exception,
-+            // because we can show the ALLOW state even when this permission is set to the
-+            // default. In that case, just set an exception now to ALLOW to enable changing the
-+            // permission.
-+            if (mContentSettingException[type] == null) {
-+                mContentSettingException[type] =
-+                        new ContentSettingException(ContentSettingsType.JAVASCRIPT,
-+                                getAddress().getOrigin(), ContentSettingValues.ALLOW, "");
-+            }
-         } else if (type == ContentSettingException.Type.SOUND) {
-             // It is possible to set the permission without having an existing exception,
-             // because we always show the sound permission in Site Settings.
-- 
-2.17.1
-
@@ -3,23 +3,25 @@ Date: Wed, 27 Jun 2018 11:02:38 +0200
 Subject: Always use new tab page for default home page

 Ignore any partner-provided home page.
---
- .../chrome/browser/partnercustomizations/HomepageManager.java  | 3 ---
- 1 file changed, 3 deletions(-)

-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java
-@@ -141,9 +141,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ----
+ 1 file changed, 4 deletions(-)
+
+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
+@@ -147,10 +147,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
      *         if the homepage button is force enabled via flag.
      */
-     private static String getDefaultHomepageUri() {
-        if (PartnerBrowserCustomizations.isHomepageProviderAvailableAndEnabled()) {
-            return PartnerBrowserCustomizations.getHomePageUrl();
+     public static String getDefaultHomepageUri() {
+-        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
+-            return PartnerBrowserCustomizations.getInstance().getHomePageUrl().getSpec();
 -        }
-         return UrlConstants.NTP_NON_NATIVE_URL;
-     }
- 
-- 
-2.17.1
-
+-
+         String homepagePartnerDefaultUri;
+         String homepagePartnerDefaultGurlSerialized =
+                 SharedPreferencesManager.getInstance().readString(
+--
+2.25.1
@@ -1,13 +1,15 @@
 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
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 .../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
@@ -30,20 +32,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
-@@ -37,7 +37,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
-@@ -399,7 +399,9 @@ double AudioContext::baseLatency() const {
+@@ -508,7 +508,9 @@ double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
 
@@ -53,7 +58,6 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
 +  return double(l)/100;
 }
 
- MediaElementAudioSourceNode* AudioContext::createMediaElementSource(
-- 
-2.17.1
-
+ double AudioContext::outputLatency() const {
+--
+2.25.1
@@ -3,14 +3,16 @@ Date: Thu, 22 Mar 2018 22:11:57 +0100
 Subject: Battery API: return nothing

 Include @thestinger's fix for correct charging/unknown values
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../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) {
+@@ -77,46 +77,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
 }
 
 bool BatteryManager::charging() {
@@ -19,12 +21,12 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 double BatteryManager::chargingTime() {
-  return battery_status_.charging_time();
+-  return battery_status_.charging_time().InSecondsF();
 +  return 0.0;
 }
 
 double BatteryManager::dischargingTime() {
-  return battery_status_.discharging_time();
+-  return battery_status_.discharging_time().InSecondsF();
 +  return std::numeric_limits<double>::infinity();
 }
 
@@ -37,17 +39,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() == 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));
@@ -60,6 +63,5 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 void BatteryManager::RegisterWithDispatcher() {
-- 
-2.17.1
-
+--
+2.25.1
@@ -0,0 +1,286 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 28 Jul 2020 12:28:58 +0200
+Subject: Block gateway attacks via websockets
+
+This approach is not comprehensive, see also:
+* https://bugs.chromium.org/p/chromium/issues/detail?id=590714
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../execution_context/execution_context.cc    | 16 ++++++++++
+ .../execution_context/execution_context.h     |  1 +
+ .../renderer/core/loader/base_fetch_context.h |  1 +
+ .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
+ .../core/loader/frame_fetch_context.h         |  1 +
+ .../core/loader/worker_fetch_context.cc       | 21 +++++++++++++
+ .../core/loader/worker_fetch_context.h        |  1 +
+ .../background_fetch_manager.cc               | 31 +++++++++++++++++++
+ .../websockets/websocket_channel_impl.cc      |  5 +++
+ .../modules/websockets/websocket_common.cc    | 29 +++++++++++++++++
+ .../modules/websockets/websocket_common.h     |  4 +++
+ 11 files changed, 130 insertions(+)
+
+diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
+--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
+@@ -720,4 +720,20 @@ void ExecutionContext::WriteIntoTrace(
+   proto->set_type(GetContextType(*this));
+ }
+ 
+String ExecutionContext::addressSpaceForBindings() const {
+  switch (AddressSpace()) {
+    case network::mojom::IPAddressSpace::kPublic:
+    case network::mojom::IPAddressSpace::kUnknown:
+      return "public";
+
+    case network::mojom::IPAddressSpace::kPrivate:
+      return "private";
+
+    case network::mojom::IPAddressSpace::kLocal:
+      return "local";
+  }
+  NOTREACHED();
+  return "public";
+}
+
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
+--- a/third_party/blink/renderer/core/execution_context/execution_context.h
+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
+@@ -401,6 +401,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
+ 
+   HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
+  String addressSpaceForBindings() const;
+   unsigned ContextLifecycleStateObserverCountForTesting() const;
+ 
+   // Implementation of WindowOrWorkerGlobalScope.crossOriginIsolated.
+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
+@@ -84,6 +84,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
+@@ -578,6 +578,26 @@ 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).
+  if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
+    requestor_space = network::mojom::IPAddressSpace::kPublic;
+  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
+@@ -168,6 +168,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,
+       network::mojom::blink::IPAddressSpace target_address_space,
+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
+@@ -25,6 +25,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"
+@@ -91,6 +92,26 @@ 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).
+  if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
+    requestor_space = network::mojom::IPAddressSpace::kPublic;
+  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,
+       network::mojom::blink::IPAddressSpace target_address_space,
+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
+@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+          request_url.ProtocolIsInHTTPFamily();
+ }
+ 
+bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
+                               const KURL& request_url) {
+    network::mojom::IPAddressSpace requestor_space =
+        execution_context->AddressSpace();
+    if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
+      requestor_space = network::mojom::IPAddressSpace::kPublic;
+
+    // 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;
+}
+
+ scoped_refptr<BlobDataHandle> ExtractBlobHandle(
+     Request* request,
+     ExceptionState& exception_state) {
+@@ -221,6 +245,13 @@ ScriptPromise BackgroundFetchManager::fetch(
+                                  exception_state);
+     }
+ 
+    if (ShouldBlockGateWayAttacks(execution_context, request_url)) {
+      return RejectWithTypeError(script_state, request_url,
+                                 "Requestor IP address space doesn't match the "
+                                 "target address space.",
+                                 exception_state);
+    }
+
+     kurls.insert(request_url);
+   }
+ 
+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
+@@ -276,6 +276,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
+@@ -125,9 +125,38 @@ 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).
+  if (requestor_space == network::mojom::IPAddressSpace::kUnknown)
+    requestor_space = network::mojom::IPAddressSpace::kPublic;
+  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
+@@ -7,6 +7,8 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_WEBSOCKETS_WEBSOCKET_COMMON_H_
+ #define THIRD_PARTY_BLINK_RENDERER_MODULES_WEBSOCKETS_WEBSOCKET_COMMON_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"
+@@ -54,6 +56,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.25.1
@@ -1,92 +1,100 @@
 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'
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 .../chrome_autocomplete_scheme_classifier.cc  |  1 +
 chrome/browser/history/history_utils.cc       |  1 +
- chrome/browser/ui/singleton_tabs.cc           |  3 +-
- .../omnibox/browser/autocomplete_input.cc     |  7 ++--
+ chrome/browser/ui/singleton_tabs.cc           |  5 ++++
+ .../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        | 30 +++++++++++++++++++
 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 ++
- 14 files changed, 91 insertions(+), 3 deletions(-)
+ 14 files changed, 91 insertions(+), 1 deletion(-)
 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(
+@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
   if (base::IsStringASCII(scheme) &&
       (ProfileIOData::IsHandledProtocol(scheme) ||
-        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
-+       base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) ||
-        base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) ||
-        base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) {
+        base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
+       base::EqualsCaseInsensitiveASCII(scheme, url::kTraceScheme) ||
+        base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) ||
+        base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) {
     return metrics::OmniboxInputType::URL;
 diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
 --- a/chrome/browser/history/history_utils.cc
 +++ b/chrome/browser/history/history_utils.cc
@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
-       url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(content::kChromeUIScheme) ||
+       url.SchemeIs(content::kChromeUIUntrustedScheme) ||
       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
-@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
- 
-     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
-     // removes the "view-source:" scheme which leads to incorrect matching.
-    if (tab_url.SchemeIs(content::kViewSourceScheme))
-+    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
-+        tab_url.SchemeIs(url::kTraceScheme))
+@@ -101,6 +101,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
       continue;
+     }
 
+    // trk: URLs must not be rewritten
+    if (tab_url.SchemeIs(url::kTraceScheme)) {
+      continue;
+    }
+
     GURL rewritten_tab_url = tab_url;
+     content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
+         &rewritten_tab_url, browser->profile());
 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(
+@@ -89,10 +89,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);
+ }
+ 
+@@ -573,7 +578,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
   // For the view-source and blob schemes, we should emphasize the host of the
   // URL qualified by the view-source or blob prefix.
-   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
-       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) &&
-+       base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) ||
-+       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
+   if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
+-       base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme)) &&
+       base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme) ||
+       base::EqualsCaseInsensitiveASCII(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
-@@ -566,6 +566,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -563,6 +563,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
     }
   }
 
@@ -100,31 +108,31 @@ 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
-@@ -620,6 +620,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
- #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
-   RegisterWebSafeScheme(url::kFtpScheme);
-   RegisterWebSafeScheme(url::kDataScheme);
+@@ -756,6 +756,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+   RegisterPseudoScheme(url::kJavaScriptScheme);
+   RegisterPseudoScheme(kViewSourceScheme);
+   RegisterPseudoScheme(kGoogleChromeScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
-   RegisterWebSafeScheme("feed");
+ }
 
-   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
+ ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1075,6 +1075,8 @@ component("net") {
-       "url_request/report_sender.h",
-       "url_request/static_http_user_agent_settings.cc",
-       "url_request/static_http_user_agent_settings.h",
-+      "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",
+@@ -1032,6 +1032,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.
@@ -139,11 +147,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 {
@@ -155,7 +162,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,30 @@
 +// 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.
@@ -164,7 +171,6 @@ new file mode 100644
 +#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
 +
 +#include "base/compiler_specific.h"
-+#include "base/macros.h"
 +#include "net/base/net_export.h"
 +#include "net/url_request/url_request_job_factory.h"
 +
@@ -176,14 +182,12 @@ new file mode 100644
 +class NET_EXPORT TrkProtocolHandler
 +    : public URLRequestJobFactory::ProtocolHandler {
 + public:
-+  TrkProtocolHandler();
-+  URLRequestJob* MaybeCreateJob(
-+      URLRequest* request,
-+      NetworkDelegate* network_delegate) const override;
-+  bool IsSafeRedirectTarget(const GURL& location) const override;
+  TrkProtocolHandler(const TrkProtocolHandler&) = delete;
+  TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
 +
-+ private:
-+  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
+  TrkProtocolHandler();
+  std::unique_ptr<URLRequestJob> CreateJob(URLRequest* request) const override;
+  bool IsSafeRedirectTarget(const GURL& location) const override;
 +};
 +
 +}  // namespace net
@@ -195,20 +199,20 @@ 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"
+@@ -45,6 +46,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 +#include "url/url_constants.h"
 
- using base::Time;
- using std::string;
-@@ -579,6 +581,12 @@ URLRequest::URLRequest(const GURL& url,
+ namespace net {
+ 
+@@ -593,6 +595,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -224,50 +228,49 @@ 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 @@
- #include "net/quic/quic_stream_factory.h"
+@@ -48,6 +48,7 @@
+ #include "net/socket/network_binding_client_socket_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"
-@@ -648,6 +649,9 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
-     }
-     url_request_interceptors_.clear();
+ #include "net/url_request/url_request_job_factory.h"
+ #include "net/url_request/url_request_throttler_manager.h"
+@@ -571,6 +572,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();
+ 
+   context->set_job_factory(std::move(job_factory));
 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
- const char kQuicTransportScheme[] = "quic-transport";
- const char kTelScheme[] = "tel";
+@@ -29,6 +29,7 @@ const char16_t kDataScheme16[] = u"data";
+ const char kFileScheme[] = "file";
+ const char16_t kFileScheme16[] = u"file";
+ const char kFileSystemScheme[] = "filesystem";
 +const char kTraceScheme[] = "trk";
- const char kWsScheme[] = "ws";
- const char kWssScheme[] = "wss";
- 
+ const char16_t kFileSystemScheme16[] = u"filesystem";
+ const char kFtpScheme[] = "ftp";
+ const char16_t kFtpScheme16[] = u"ftp";
 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[];
- COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
- COMPONENT_EXPORT(URL) extern const char kTelScheme[];
+@@ -33,6 +33,7 @@ COMPONENT_EXPORT(URL) extern const char16_t kContentIDScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kDataScheme[];
+ COMPONENT_EXPORT(URL) extern const char16_t kDataScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kFileScheme[];
 +COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
- COMPONENT_EXPORT(URL) extern const char kWsScheme[];
- COMPONENT_EXPORT(URL) extern const char kWssScheme[];
- 
+ COMPONENT_EXPORT(URL) extern const char16_t kFileScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kFileSystemScheme[];
+ COMPONENT_EXPORT(URL) extern const char16_t kFileSystemScheme16[];
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -32,6 +32,7 @@ struct SchemeRegistry {
+@@ -46,6 +46,7 @@ struct SchemeRegistry {
   std::vector<SchemeWithType> standard_schemes = {
       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -275,7 +278,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
-@@ -69,6 +70,7 @@ struct SchemeRegistry {
+@@ -89,6 +90,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -283,6 +286,5 @@ diff --git a/url/url_util.cc b/url/url_util.cc
   };
 
   // Schemes that can be sent CORS requests.
-- 
-2.17.1
-
+--
+2.25.1
@@ -0,0 +1,96 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 Apr 2022 23:01:55 +0200
+Subject: Bookmarks select all menu entry
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../java/res/menu/bookmark_action_bar_menu.xml    |  7 +++++++
+ .../browser/bookmarks/BookmarkActionBar.java      | 15 +++++++++++++++
+ .../ui/android/strings/android_chrome_strings.grd |  3 +++
+ 3 files changed, 25 insertions(+)
+
+diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+--- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+@@ -23,6 +23,13 @@ found in the LICENSE file.
+             android:visible="false"
+             app:showAsAction="ifRoom"
+             app:iconTint="@color/default_icon_color_secondary_tint_list" />
+        <item
+            android:id="@+id/select_all_menu_id"
+            android:icon="@drawable/ic_done_blue"
+            android:title="@string/select_all_bookmarks"
+            android:visible="true"
+            app:showAsAction="ifRoom"
+            app:iconTint="@color/default_icon_color_tint_list" />
+         <item
+             android:id="@+id/import_menu_id"
+             android:icon="@drawable/ic_folder_blue_24dp"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListT
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
+ 
+ import java.util.List;
+import java.util.HashSet;
+ 
+ /**
+  * Main action bar of bookmark UI. It is responsible for displaying title and buttons
+@@ -146,6 +147,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+             }
+             selectionDelegate.clearSelection();
+             return true;
+        } else if (menuItem.getItemId() == R.id.select_all_menu_id) {
+            BookmarkModel bookmarkModel = mDelegate.getModel();
+            if (bookmarkModel.isBookmarkModelLoaded()) {
+                List<BookmarkItem> items = bookmarkModel.getBookmarksForFolder(mCurrentFolder.getId());
+                HashSet<BookmarkId> ids = new HashSet<>(items.size());
+                for (BookmarkItem item : items) {
+                    ids.add(item.getId());
+                }
+                selectionDelegate.setSelectedItems(ids);
+            }
+            return true;
+         }
+ 
+         assert false : "Unhandled menu click.";
+@@ -155,6 +167,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+     void showLoadingUi() {
+         setTitle(null);
+         setNavigationButton(NAVIGATION_BUTTON_NONE);
+        getMenu().findItem(R.id.select_all_menu_id).setVisible(false);
+         getMenu().findItem(R.id.import_menu_id).setVisible(false);
+         getMenu().findItem(R.id.export_menu_id).setVisible(false);
+         getMenu().findItem(R.id.search_menu_id).setVisible(false);
+@@ -166,6 +179,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+         super.showNormalView();
+ 
+         if (mDelegate == null) {
+            getMenu().findItem(R.id.select_all_menu_id).setVisible(false);
+             getMenu().findItem(R.id.import_menu_id).setVisible(false);
+             getMenu().findItem(R.id.export_menu_id).setVisible(false);
+             getMenu().findItem(R.id.search_menu_id).setVisible(false);
+@@ -197,6 +211,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+     @Override
+     public void onFolderStateSet(BookmarkId folder) {
+         mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
+        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
+         getMenu().findItem(R.id.import_menu_id).setVisible(true);
+         getMenu().findItem(R.id.export_menu_id).setVisible(true);
+         getMenu().findItem(R.id.search_menu_id).setVisible(true);
+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
+@@ -243,6 +243,9 @@ CHAR_LIMIT guidelines:
+       <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
+         Sites
+       </message>
+      <message name="IDS_SELECT_ALL_BOOKMARKS" desc="The label for the select all bookmarks button.">
+        Select all
+      </message>
+       <message name="IDS_IMPORT_BOOKMARKS" desc="The label for the import bookmarks button.">
+         Import
+       </message>
+--
+2.25.1
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 8 Jan 2022 19:42:34 +0100
+Subject: Bromite package name
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -47,7 +47,7 @@ chrome_jni_registration_header =
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
+ 
+ if (current_toolchain == default_toolchain) {
+-  _default_package = "org.chromium.chrome"
+  _default_package = "org.bromite.bromite"
+   if (use_stable_package_name_for_trichrome) {
+     _default_package += ".stable"
+   } else if (android_channel != "default" && android_channel != "stable") {
+--
+2.25.1
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 8 Jan 2022 19:42:34 +0100
+Subject: Chromium package name
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -51,7 +51,7 @@ chrome_jni_registration_header =
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
+ 
+ if (current_toolchain == default_toolchain) {
+-  _default_package = "org.chromium.chrome"
+  _default_package = "org.bromite.chromium"
+   if (use_stable_package_name_for_trichrome) {
+     _default_package += ".stable"
+   } else if (android_channel != "default" && android_channel != "stable") {
+--
+2.25.1
@@ -0,0 +1,40 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 3 Oct 2022 09:39:07 +0000
+Subject: Clamp time resolution in requestAnimationFrame
+
+Aligns requestAnimationFrame's WebWorker callback to the W3C specification
+See https://bugs.chromium.org/p/chromium/issues/detail?id=1236113
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../animation_frame/worker_animation_frame_provider.cc    | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+--- a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+++ b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+@@ -7,6 +7,8 @@
+ #include "base/trace_event/trace_event.h"
+ #include "third_party/blink/renderer/core/execution_context/agent.h"
+ #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
+#include "third_party/blink/renderer/core/workers/worker_global_scope.h"
+#include "third_party/blink/renderer/platform/wtf/casting.h"
+ #include "third_party/blink/renderer/core/timing/worker_global_scope_performance.h"
+ #include "third_party/blink/renderer/platform/scheduler/public/event_loop.h"
+ #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
+@@ -63,7 +65,11 @@ void WorkerAnimationFrameProvider::BeginFrame(const viz::BeginFrameArgs& args) {
+             }
+           }
+ 
+-          double time = (args.frame_time - base::TimeTicks()).InMillisecondsF();
+          auto* global_scope = DynamicTo<WorkerGlobalScope>(provider->context_.Get());
+          DCHECK(global_scope);
+          double time = Performance::ClampTimeResolution(
+                          args.frame_time - global_scope->TimeOrigin(),
+                          provider->context_->CrossOriginIsolatedCapability());
+           provider->callback_collection_.ExecuteFrameCallbacks(time, time);
+         }
+         provider->begin_frame_provider_->FinishBeginFrame(args);
+--
+2.25.1
@@ -0,0 +1,139 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 22 Jul 2021 23:10:52 +0200
+Subject: Client hints overrides
+
+Disable critical client hints
+Use Google Chrome branding for client hints
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ components/embedder_support/user_agent_utils.cc              | 4 +---
+ content/browser/client_hints/client_hints.cc                 | 3 ++-
+ content/browser/loader/navigation_url_loader_impl.cc         | 5 +++++
+ content/public/common/content_features.cc                    | 4 ++--
+ services/network/public/cpp/client_hints.cc                  | 1 +
+ services/network/public/cpp/features.cc                      | 2 +-
+ third_party/blink/common/client_hints/client_hints.cc        | 1 +
+ .../blink/common/client_hints/enabled_client_hints.cc        | 4 +++-
+ 8 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
+--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
+@@ -265,9 +265,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+   bool parse_result = base::StringToInt(major_version, &major_version_number);
+   DCHECK(parse_result);
+   absl::optional<std::string> brand;
+-#if !BUILDFLAG(CHROMIUM_BRANDING)
+-  brand = version_info::GetProductName();
+-#endif
+  brand = "Google Chrome";
+   absl::optional<std::string> maybe_brand_override =
+       base::GetFieldTrialParamValueByFeature(features::kGreaseUACH,
+                                              "brand_override");
+diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
+--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
+@@ -478,7 +478,8 @@ void AddPrefersReducedMotionHeader(net::HttpRequestHeaders* headers,
+                         : network::kPrefersReducedMotionNoPreference);
+ }
+ 
+-bool IsValidURLForClientHints(const url::Origin& origin) {
+bool IsValidURLForClientHints(const url::Origin& origin) { // disabled in Bromite
+  if ((true)) return false;
+   return network::IsOriginPotentiallyTrustworthy(origin);
+ }
+ 
+diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
+--- a/content/browser/loader/navigation_url_loader_impl.cc
+++ b/content/browser/loader/navigation_url_loader_impl.cc
+@@ -1024,6 +1024,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+     return;
+   }
+ 
+  if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) {
+    std::move(callback).Run(net::OK);
+    return;
+  }
+
+   LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent);
+ 
+   // Given that this is happening in the middle of navigation, there should
+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
+@@ -257,8 +257,8 @@ BASE_FEATURE(kCrashReporting,
+ // Enables support for the `Critical-CH` response header.
+ // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
+ BASE_FEATURE(kCriticalClientHint,
+-             "CriticalClientHint",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "CriticalClientHint",                  // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
+ 
+ // Enable debugging the issue crbug.com/1201355
+ BASE_FEATURE(kDebugHistoryInterventionNoUserActivation,
+diff --git a/services/network/public/cpp/client_hints.cc b/services/network/public/cpp/client_hints.cc
+--- a/services/network/public/cpp/client_hints.cc
+++ b/services/network/public/cpp/client_hints.cc
+@@ -113,6 +113,7 @@ const DecodeMap& GetDecodeMap() {
+ 
+ absl::optional<std::vector<network::mojom::WebClientHintsType>>
+ ParseClientHintsHeader(const std::string& header) {
+  if ((true)) return absl::nullopt;
+   // Accept-CH is an sh-list of tokens; see:
+   // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1
+   absl::optional<net::structured_headers::List> maybe_list =
+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
+@@ -198,7 +198,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages,
+ // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability.
+ // See:
+ // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3
+-BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_DISABLED_BY_DEFAULT);  // disabled by default in Bromite
+ 
+ BASE_FEATURE(kSCTAuditingRetryReports,
+              "SCTAuditingRetryReports",
+diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
+--- a/third_party/blink/common/client_hints/client_hints.cc
+++ b/third_party/blink/common/client_hints/client_hints.cc
+@@ -105,6 +105,7 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+ }
+ 
+ bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
+  if ((true)) return false;
+   switch (type) {
+     case network::mojom::WebClientHintsType::kSaveData:
+     case network::mojom::WebClientHintsType::kUA:
+diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc
+--- a/third_party/blink/common/client_hints/enabled_client_hints.cc
+++ b/third_party/blink/common/client_hints/enabled_client_hints.cc
+@@ -21,6 +21,7 @@ namespace {
+ using ::network::mojom::WebClientHintsType;
+ 
+ bool IsDisabledByFeature(const WebClientHintsType type) {
+  if ((true)) return true;
+   switch (type) {
+     case WebClientHintsType::kUA:
+     case WebClientHintsType::kUAArch:
+@@ -138,7 +139,7 @@ bool IsOriginTrialEnabled(const GURL& url,
+ }  // namespace
+ 
+ bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const {
+-  return enabled_types_[static_cast<int>(type)];
+  return false;
+ }
+ 
+ void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
+@@ -167,6 +168,7 @@ void EnabledClientHints::SetIsEnabled(
+ 
+ std::vector<WebClientHintsType> EnabledClientHints::GetEnabledHints() const {
+   std::vector<WebClientHintsType> hints;
+  if ((true)) return hints;
+   for (const auto& elem : network::GetClientHintToNameMap()) {
+     const auto& type = elem.first;
+     if (IsEnabled(type))
+--
+2.25.1
@@ -0,0 +1,978 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 19 Mar 2022 10:53:24 +0100
+Subject: Dictionary suggestions for the Omnibox
+
+Revert "Disable Dictionary suggestions for the Omnibox"
+
+This reverts commit d3ec2b2d25066ec089f8351a44b919ded4270e83.
+
+Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/java/res/layout/url_bar.xml    |   1 +
+ .../chrome/browser/omnibox/UrlBar.java        | 931 ++++++++++++++++++
+ .../chrome/browser/omnibox/UrlBar.java        |   3 +-
+ 3 files changed, 933 insertions(+), 2 deletions(-)
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+
+diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
+--- a/chrome/android/java/res/layout/url_bar.xml
+++ b/chrome/android/java/res/layout/url_bar.xml
+@@ -15,5 +15,6 @@ found in the LICENSE file.
+     android:singleLine="true"
+     android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+     android:textSize="@dimen/location_bar_url_text_size"
+    android:inputType="textUri"
+     android:hint="@string/search_or_type_web_address"
+     android:importantForAutofill="no" />
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+@@ -0,0 +1,931 @@
+// 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.omnibox;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.os.Build;
+import android.provider.Settings;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.ReplacementSpan;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.widget.TextView;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.text.BidiFormatter;
+import androidx.core.util.ObjectsCompat;
+import androidx.core.view.inputmethod.EditorInfoCompat;
+
+import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.Callback;
+import org.chromium.base.Log;
+import org.chromium.base.SysUtils;
+import org.chromium.base.ThreadUtils;
+import org.chromium.base.compat.ApiHelperForO;
+import org.chromium.base.metrics.RecordUserAction;
+import org.chromium.ui.KeyboardVisibilityDelegate;
+import org.chromium.ui.base.WindowDelegate;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * The URL text entry view for the Omnibox.
+ */
+public abstract class UrlBar extends AutocompleteEditText {
+    private static final String TAG = "UrlBar";
+
+    private static final boolean DEBUG = false;
+
+    // TextView becomes very slow on long strings, so we limit maximum length
+    // of what is displayed to the user, see limitDisplayableLength().
+    private static final int MAX_DISPLAYABLE_LENGTH = 4000;
+    private static final int MAX_DISPLAYABLE_LENGTH_LOW_END = 1000;
+
+    private boolean mFirstDrawComplete;
+
+    /**
+     * The text direction of the URL or query: LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR, or
+     * LAYOUT_DIRECTION_RTL.
+     * */
+    private int mUrlDirection;
+
+    private UrlBarDelegate mUrlBarDelegate;
+    private UrlTextChangeListener mUrlTextChangeListener;
+    private TextWatcher mTextChangedListener;
+    private UrlBarTextContextMenuDelegate mTextContextMenuDelegate;
+    private Callback<Integer> mUrlDirectionListener;
+
+    /**
+     * The gesture detector is used to detect long presses. Long presses require special treatment
+     * because the URL bar has custom touch event handling. See: {@link #onTouchEvent}.
+     */
+    private final GestureDetector mGestureDetector;
+
+    private final KeyboardHideHelper mKeyboardHideHelper;
+
+    private boolean mFocused;
+    private boolean mSuppressingTouchMoveEventsForThisTouch;
+    private MotionEvent mSuppressedTouchDownEvent;
+    private boolean mAllowFocus = true;
+
+    private boolean mPendingScroll;
+    private int mPreviousWidth;
+
+    @ScrollType
+    private int mPreviousScrollType;
+    private String mPreviousScrollText;
+    private int mPreviousScrollViewWidth;
+    private int mPreviousScrollResultXPosition;
+    private float mPreviousScrollFontSize;
+    private boolean mPreviousScrollWasRtl;
+
+    // Used as a hint to indicate the text may contain an ellipsize span.  This will be true if an
+    // ellispize span was applied the last time the text changed.  A true value here does not
+    // guarantee that the text does contain the span currently as newly set text may have cleared
+    // this (and it the value will only be recalculated after the text has been changed).
+    private boolean mDidEllipsizeTextHint;
+
+    /** A cached point for getting this view's location in the window. */
+    private final int[] mCachedLocation = new int[2];
+
+    /** The location of this view on the last ACTION_DOWN event. */
+    private float mDownEventViewTop;
+
+    /**
+     * The character index in the displayed text where the origin ends. This is required to
+     * ensure that the end of the origin is not scrolled out of view for long hostnames.
+     */
+    private int mOriginEndIndex;
+
+    @ScrollType
+    private int mScrollType;
+
+    /** What scrolling action should be taken after the URL bar text changes. **/
+    @IntDef({ScrollType.NO_SCROLL, ScrollType.SCROLL_TO_TLD, ScrollType.SCROLL_TO_BEGINNING})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ScrollType {
+        int NO_SCROLL = 0;
+        int SCROLL_TO_TLD = 1;
+        int SCROLL_TO_BEGINNING = 2;
+    }
+
+    /**
+     * An optional string to use with AccessibilityNodeInfo to report text content.
+     * This is particularly important for auto-fill applications, such as password managers, that
+     * rely on AccessibilityNodeInfo data to apply related form-fill data.
+     */
+    private CharSequence mTextForAutofillServices;
+    protected boolean mRequestingAutofillStructure;
+
+    /**
+     * Delegate used to communicate with the content side and the parent layout.
+     */
+    public interface UrlBarDelegate {
+        /**
+         * @return The view to be focused on a backward focus traversal.
+         */
+        @Nullable
+        View getViewForUrlBackFocus();
+
+        /**
+         * @return Whether the keyboard should be allowed to learn from the user input.
+         */
+        boolean allowKeyboardLearning();
+
+        /**
+         * Called to notify that back key has been pressed while the URL bar has focus.
+         */
+        void backKeyPressed();
+
+        /**
+         * Called to notify that a tap or long press gesture has been detected.
+         * @param isLongPress Whether or not is a long press gesture.
+         */
+        void gestureDetected(boolean isLongPress);
+    }
+
+    /** Provides updates about the URL text changes. */
+    public interface UrlTextChangeListener {
+        /**
+         * Called when the text state has changed.
+         * @param textWithoutAutocomplete The url bar text without autocompletion.
+         * @param textWithAutocomplete The url bar text with autocompletion.
+         */
+        // TODO(crbug.com/1003080): Consider splitting these into two different callbacks.
+        void onTextChanged(String textWithoutAutocomplete, String textWithAutocomplete);
+    }
+
+    /** Delegate that provides the additional functionality to the textual context menus. */
+    interface UrlBarTextContextMenuDelegate {
+        /** @return The text to be pasted into the UrlBar. */
+        @NonNull
+        String getTextToPaste();
+
+        /**
+         * Gets potential replacement text to be used instead of the current selected text for
+         * cut/copy actions.  If null is returned, the existing text will be cut or copied.
+         *
+         * @param currentText The current displayed text.
+         * @param selectionStart The selection start in the display text.
+         * @param selectionEnd The selection end in the display text.
+         * @return The text to be cut/copied instead of the currently selected text.
+         */
+        @Nullable
+        String getReplacementCutCopyText(String currentText, int selectionStart, int selectionEnd);
+    }
+
+    public UrlBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mUrlDirection = LAYOUT_DIRECTION_LOCALE;
+
+        // The URL Bar is derived from an text edit class, and as such is focusable by
+        // default. This means that if it is created before the first draw of the UI it
+        // will (as the only focusable element of the UI) get focus on the first draw.
+        // We react to this by greying out the tab area and bringing up the keyboard,
+        // which we don't want to do at startup. Prevent this by disabling focus until
+        // the first draw.
+        setFocusable(false);
+        setFocusableInTouchMode(false);
+
+        // The HTC Sense IME will attempt to autocomplete words in the Omnibox when Prediction is
+        // enabled.  We want to disable this feature and rely on the Omnibox's implementation.
+        // Their IME does not respect ~TYPE_TEXT_FLAG_AUTO_COMPLETE nor any of the other InputType
+        // options I tried, but setting the filter variation prevents it.  Sadly, it also removes
+        // the .com button, but the prediction was buggy as it would autocomplete words even when
+        // typing at the beginning of the omnibox text when other content was present (messing up
+        // what was previously there).  See bug: http://b/issue?id=6200071
+        String defaultIme = Settings.Secure.getString(
+                getContext().getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+        if (defaultIme != null && defaultIme.contains("com.htc.android.htcime")) {
+            setInputType(getInputType() | InputType.TYPE_TEXT_VARIATION_FILTER);
+        }
+
+        mGestureDetector =
+                new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
+                    @Override
+                    public void onLongPress(MotionEvent e) {
+                        if (mUrlBarDelegate == null) return;
+                        mUrlBarDelegate.gestureDetected(true);
+                        performLongClick();
+                    }
+
+                    @Override
+                    public boolean onSingleTapUp(MotionEvent e) {
+                        if (mUrlBarDelegate == null) return true;
+                        requestFocus();
+                        mUrlBarDelegate.gestureDetected(false);
+                        return true;
+                    }
+                }, ThreadUtils.getUiThreadHandler());
+        mGestureDetector.setOnDoubleTapListener(null);
+        mKeyboardHideHelper = new KeyboardHideHelper(this, new Runnable() {
+            @Override
+            public void run() {
+                if (mUrlBarDelegate != null) mUrlBarDelegate.backKeyPressed();
+            }
+        });
+
+        ApiCompatibilityUtils.disableSmartSelectionTextClassifier(this);
+    }
+
+    public void destroy() {
+        setAllowFocus(false);
+        mUrlBarDelegate = null;
+        setOnFocusChangeListener(null);
+        mTextContextMenuDelegate = null;
+        mUrlTextChangeListener = null;
+        mTextChangedListener = null;
+    }
+
+    /**
+     * Initialize the delegate that allows interaction with the Window.
+     */
+    public void setWindowDelegate(WindowDelegate windowDelegate) {
+        mKeyboardHideHelper.setWindowDelegate(windowDelegate);
+    }
+
+    /**
+     * Set the delegate to be used for text context menu actions.
+     */
+    public void setTextContextMenuDelegate(UrlBarTextContextMenuDelegate delegate) {
+        mTextContextMenuDelegate = delegate;
+    }
+
+    @Override
+    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        if (KeyEvent.KEYCODE_BACK == keyCode && event.getAction() == KeyEvent.ACTION_UP) {
+            mKeyboardHideHelper.monitorForKeyboardHidden();
+        }
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    /**
+     * See {@link AutocompleteEditText#setIgnoreTextChangesForAutocomplete(boolean)}.
+     * <p>
+     * {@link #setDelegate(UrlBarDelegate)} must be called with a non-null instance prior to
+     * enabling autocomplete.
+     */
+    @Override
+    public void setIgnoreTextChangesForAutocomplete(boolean ignoreAutocomplete) {
+        assert mUrlBarDelegate != null;
+        super.setIgnoreTextChangesForAutocomplete(ignoreAutocomplete);
+    }
+
+    @Override
+    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+        mFocused = focused;
+        super.onFocusChanged(focused, direction, previouslyFocusedRect);
+
+        if (focused) {
+            mPendingScroll = false;
+        }
+        fixupTextDirection();
+    }
+
+    /**
+     * Sets whether this {@link UrlBar} should be focusable.
+     */
+    public void setAllowFocus(boolean allowFocus) {
+        mAllowFocus = allowFocus;
+        setFocusable(allowFocus);
+        setFocusableInTouchMode(allowFocus);
+    }
+
+    /**
+     * Sets the {@link UrlBar}'s text direction based on focus and contents.
+     *
+     * Should be called whenever focus or text contents change.
+     */
+    private void fixupTextDirection() {
+        // When unfocused, force left-to-right rendering at the paragraph level (which is desired
+        // for URLs). Right-to-left runs are still rendered RTL, but will not flip the whole URL
+        // around. This is consistent with OmniboxViewViews on desktop. When focused, render text
+        // normally (to allow users to make non-URL searches and to avoid showing Android's split
+        // insertion point when an RTL user enters RTL text). Also render text normally when the
+        // text field is empty (because then it displays an instruction that is not a URL).
+        if (mFocused || length() == 0) {
+            setTextDirection(TEXT_DIRECTION_INHERIT);
+        } else {
+            setTextDirection(TEXT_DIRECTION_LTR);
+        }
+        // Always align to the same as the paragraph direction (LTR = left, RTL = right).
+        setTextAlignment(TEXT_ALIGNMENT_TEXT_START);
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasWindowFocus) {
+        super.onWindowFocusChanged(hasWindowFocus);
+        if (DEBUG) Log.i(TAG, "onWindowFocusChanged: " + hasWindowFocus);
+        if (hasWindowFocus) {
+            if (isFocused()) {
+                // Without the call to post(..), the keyboard was not getting shown when the
+                // window regained focus despite this being the final call in the view system
+                // flow.
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        KeyboardVisibilityDelegate.getInstance().showKeyboard(UrlBar.this);
+                    }
+                });
+            }
+        }
+    }
+
+    @Override
+    public View focusSearch(int direction) {
+        if (mUrlBarDelegate != null && direction == View.FOCUS_BACKWARD
+                && mUrlBarDelegate.getViewForUrlBackFocus() != null) {
+            return mUrlBarDelegate.getViewForUrlBackFocus();
+        } else {
+            return super.focusSearch(direction);
+        }
+    }
+
+    @Override
+    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        super.onTextChanged(text, start, lengthBefore, lengthAfter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Due to crbug.com/1103555, Autofill had to be disabled on the UrlBar to work around
+            // an issue on Android Q+. With Autofill disabled, the Autofill compat mode no longer
+            // learns of changes to the UrlBar, which prevents it from cancelling the session if
+            // the domain changes. We restore this behavior by mimicking the relevant part of
+            // TextView.notifyListeningManagersAfterTextChanged().
+            // https://cs.android.com/android/platform/superproject/+/5d123b67756dffcfdebdb936ab2de2b29c799321:frameworks/base/core/java/android/widget/TextView.java;l=10618;drc=master;bpv=0
+            ApiHelperForO.notifyValueChangedForAutofill(this);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        // This method contains special logic to enable long presses to be handled correctly.
+
+        // One piece of the logic is to suppress all ACTION_DOWN events received while the UrlBar is
+        // not focused, and only pass them to super.onTouchEvent() if it turns out we're about to
+        // perform a long press. Long pressing will not behave properly without sending this event,
+        // but if we always send it immediately, it will cause the keyboard to show immediately,
+        // whereas we want to wait to show it until after the URL focus animation finishes, to avoid
+        // performance issues on slow devices.
+
+        // The other piece of the logic is to suppress ACTION_MOVE events received after an
+        // ACTION_DOWN received while the UrlBar is not focused. This is because the UrlBar moves to
+        // the side as it's focusing, and a finger held still on the screen would therefore be
+        // interpreted as a drag selection.
+
+        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+            getLocationInWindow(mCachedLocation);
+            mDownEventViewTop = mCachedLocation[1];
+            mSuppressingTouchMoveEventsForThisTouch = !mFocused;
+        }
+
+        if (!mFocused) {
+            if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+                mSuppressedTouchDownEvent = MotionEvent.obtain(event);
+            }
+            mGestureDetector.onTouchEvent(event);
+            return true;
+        }
+
+        if (event.getActionMasked() == MotionEvent.ACTION_UP
+                || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
+            // Minor optimization to avoid unnecessarily holding onto a MotionEvent after the touch
+            // finishes.
+            mSuppressedTouchDownEvent = null;
+        }
+
+        if (mSuppressingTouchMoveEventsForThisTouch
+                && event.getActionMasked() == MotionEvent.ACTION_MOVE) {
+            return true;
+        }
+
+        try {
+            return super.onTouchEvent(event);
+        } catch (NullPointerException e) {
+            // Working around a platform bug (b/25562038) that was fixed in N that can throw an
+            // exception during text selection. We just swallow the exception. The outcome is that
+            // the text selection handle doesn't show.
+
+            // If this happens on N or later, there's a different issue here that we might want to
+            // know about.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) throw e;
+
+            Log.w(TAG, "Ignoring NPE in UrlBar#onTouchEvent.", e);
+            return true;
+        } catch (IndexOutOfBoundsException e) {
+            // Work around crash of unknown origin (https://crbug.com/837419).
+            Log.w(TAG, "Ignoring IndexOutOfBoundsException in UrlBar#onTouchEvent.", e);
+            return true;
+        }
+    }
+
+    @Override
+    public boolean performLongClick() {
+        if (!shouldPerformLongClick()) return false;
+
+        releaseSuppressedTouchDownEvent();
+        return super.performLongClick();
+    }
+
+    /**
+     * @return Whether or not a long click should be performed.
+     */
+    private boolean shouldPerformLongClick() {
+        getLocationInWindow(mCachedLocation);
+
+        // If the view moved between the last down event, block the long-press.
+        return mDownEventViewTop == mCachedLocation[1];
+    }
+
+    private void releaseSuppressedTouchDownEvent() {
+        if (mSuppressedTouchDownEvent != null) {
+            super.onTouchEvent(mSuppressedTouchDownEvent);
+            mSuppressedTouchDownEvent = null;
+        }
+    }
+
+    @Override
+    public void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        if (!mFirstDrawComplete) {
+            mFirstDrawComplete = true;
+
+            // We have now avoided the first draw problem (see the comment in
+            // the constructor) so we want to make the URL bar focusable so that
+            // touches etc. activate it.
+            setFocusable(mAllowFocus);
+            setFocusableInTouchMode(mAllowFocus);
+        }
+
+        // Notify listeners if the URL's direction has changed.
+        updateUrlDirection();
+    }
+
+    /**
+     * If the direction of the URL has changed, update mUrlDirection and notify the
+     * UrlDirectionListeners.
+     */
+    private void updateUrlDirection() {
+        Layout layout = getLayout();
+        if (layout == null) return;
+
+        int urlDirection;
+        if (length() == 0) {
+            urlDirection = LAYOUT_DIRECTION_LOCALE;
+        } else if (layout.getParagraphDirection(0) == Layout.DIR_LEFT_TO_RIGHT) {
+            urlDirection = LAYOUT_DIRECTION_LTR;
+        } else {
+            urlDirection = LAYOUT_DIRECTION_RTL;
+        }
+
+        if (urlDirection != mUrlDirection) {
+            mUrlDirection = urlDirection;
+            if (mUrlDirectionListener != null) {
+                mUrlDirectionListener.onResult(urlDirection);
+            }
+
+            // Ensure the display text is visible after updating the URL direction.
+            scrollDisplayText();
+        }
+    }
+
+    /**
+     * @return The text direction of the URL, e.g. LAYOUT_DIRECTION_LTR.
+     */
+    public int getUrlDirection() {
+        return mUrlDirection;
+    }
+
+    /**
+     * Sets the listener for changes in the url bar's layout direction. Also calls
+     * onUrlDirectionChanged() immediately on the listener.
+     *
+     * @param listener The UrlDirectionListener to receive callbacks when the url direction changes,
+     *     or null to unregister any previously registered listener.
+     */
+    public void setUrlDirectionListener(Callback<Integer> listener) {
+        mUrlDirectionListener = listener;
+        if (mUrlDirectionListener != null) {
+            mUrlDirectionListener.onResult(mUrlDirection);
+        }
+    }
+
+    /**
+     * Set the url delegate to handle communication from the {@link UrlBar} to the rest of the UI.
+     * @param delegate The {@link UrlBarDelegate} to be used.
+     */
+    public void setDelegate(UrlBarDelegate delegate) {
+        mUrlBarDelegate = delegate;
+    }
+
+    /**
+     * Set the listener to be notified when the URL text has changed.
+     * @param listener The listener to be notified.
+     */
+    public void setUrlTextChangeListener(UrlTextChangeListener listener) {
+        mUrlTextChangeListener = listener;
+    }
+
+    /**
+     * Set the listener to be notified when the view's text has changed.
+     * @param textChangedListener The listener to be notified.
+     */
+    public void setTextChangedListener(TextWatcher textChangedListener) {
+        if (ObjectsCompat.equals(mTextChangedListener, textChangedListener)) {
+            return;
+        } else if (mTextChangedListener != null) {
+            removeTextChangedListener(mTextChangedListener);
+        }
+
+        mTextChangedListener = textChangedListener;
+        addTextChangedListener(mTextChangedListener);
+    }
+
+    /**
+     * Set the text to report to Autofill services upon call to onProvideAutofillStructure.
+     */
+    public void setTextForAutofillServices(CharSequence text) {
+        mTextForAutofillServices = text;
+    }
+
+    @Override
+    public boolean onTextContextMenuItem(int id) {
+        if (mTextContextMenuDelegate == null) return super.onTextContextMenuItem(id);
+
+        if (id == android.R.id.paste) {
+            String pasteString = mTextContextMenuDelegate.getTextToPaste();
+            if (pasteString != null) {
+                int min = 0;
+                int max = getText().length();
+
+                if (isFocused()) {
+                    final int selStart = getSelectionStart();
+                    final int selEnd = getSelectionEnd();
+
+                    min = Math.max(0, Math.min(selStart, selEnd));
+                    max = Math.max(0, Math.max(selStart, selEnd));
+                }
+
+                Selection.setSelection(getText(), max);
+                getText().replace(min, max, pasteString);
+                onPaste();
+            }
+            return true;
+        }
+
+        if ((id == android.R.id.cut || id == android.R.id.copy)) {
+            if (id == android.R.id.cut) {
+                RecordUserAction.record("Omnibox.LongPress.Cut");
+            } else {
+                RecordUserAction.record("Omnibox.LongPress.Copy");
+            }
+            String currentText = getText().toString();
+            String replacementCutCopyText = mTextContextMenuDelegate.getReplacementCutCopyText(
+                    currentText, getSelectionStart(), getSelectionEnd());
+            if (replacementCutCopyText == null) return super.onTextContextMenuItem(id);
+
+            setIgnoreTextChangesForAutocomplete(true);
+            setText(replacementCutCopyText);
+            setSelection(0, replacementCutCopyText.length());
+            setIgnoreTextChangesForAutocomplete(false);
+
+            boolean retVal = super.onTextContextMenuItem(id);
+
+            if (TextUtils.equals(getText(), replacementCutCopyText)) {
+                // Restore the old text if the operation did modify the text.
+                setIgnoreTextChangesForAutocomplete(true);
+                setText(currentText);
+
+                // Move the cursor to the end.
+                setSelection(getText().length());
+                setIgnoreTextChangesForAutocomplete(false);
+            }
+
+            return retVal;
+        }
+
+        if (id == android.R.id.shareText) {
+            RecordUserAction.record("Omnibox.LongPress.Share");
+        }
+
+        return super.onTextContextMenuItem(id);
+    }
+
+    /**
+     * Specified how text should be scrolled within the UrlBar.
+     *
+     * @param scrollType What type of scroll should be applied to the text.
+     * @param scrollToIndex The index that should be scrolled to, which only applies to
+     *                      {@link ScrollType#SCROLL_TO_TLD}.
+     */
+    public void setScrollState(@ScrollType int scrollType, int scrollToIndex) {
+        if (scrollType == ScrollType.SCROLL_TO_TLD) {
+            mOriginEndIndex = scrollToIndex;
+        } else {
+            mOriginEndIndex = 0;
+        }
+        mScrollType = scrollType;
+        scrollDisplayText();
+    }
+
+    /**
+     * Scrolls the omnibox text to a position determined by the current scroll type.
+     *
+     * @see #setScrollState(int, int)
+     */
+    private void scrollDisplayText() {
+        if (isLayoutRequested()) {
+            mPendingScroll = mScrollType != ScrollType.NO_SCROLL;
+            return;
+        }
+        scrollDisplayTextInternal(mScrollType);
+    }
+
+    /**
+     * Scrolls the omnibox text to the position specified, based on the {@link ScrollType}.
+     *
+     * @param scrollType What type of scroll to perform.
+     *                   SCROLL_TO_TLD: Scrolls the omnibox text to bring the TLD into view.
+     *                   SCROLL_TO_BEGINNING: Scrolls text that's too long to fit in the omnibox
+     *                                        to the beginning so we can see the first character.
+     */
+    private void scrollDisplayTextInternal(@ScrollType int scrollType) {
+        mPendingScroll = false;
+
+        if (mFocused) return;
+
+        Editable text = getText();
+        if (TextUtils.isEmpty(text)) scrollType = ScrollType.SCROLL_TO_BEGINNING;
+
+        // Ensure any selection from the focus state is cleared.
+        setSelection(0);
+
+        float currentTextSize = getTextSize();
+        boolean currentIsRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
+
+        int measuredWidth = getMeasuredWidth() - (getPaddingLeft() + getPaddingRight());
+        if (scrollType == mPreviousScrollType && TextUtils.equals(text, mPreviousScrollText)
+                && measuredWidth == mPreviousScrollViewWidth
+                // Font size is float but it changes in discrete range (eg small font, big font),
+                // therefore false negative using regular equality is unlikely.
+                && currentTextSize == mPreviousScrollFontSize
+                && currentIsRtl == mPreviousScrollWasRtl) {
+            scrollTo(mPreviousScrollResultXPosition, getScrollY());
+            return;
+        }
+
+        switch (scrollType) {
+            case ScrollType.SCROLL_TO_TLD:
+                scrollToTLD();
+                break;
+            case ScrollType.SCROLL_TO_BEGINNING:
+                scrollToBeginning();
+                break;
+            default:
+                // Intentional return to avoid clearing scroll state when no scroll was applied.
+                return;
+        }
+
+        mPreviousScrollType = scrollType;
+        mPreviousScrollText = text.toString();
+        mPreviousScrollViewWidth = measuredWidth;
+        mPreviousScrollFontSize = currentTextSize;
+        mPreviousScrollResultXPosition = getScrollX();
+        mPreviousScrollWasRtl = currentIsRtl;
+    }
+
+    /**
+     * Scrolls the omnibox text to show the very beginning of the text entered.
+     */
+    private void scrollToBeginning() {
+        Editable text = getText();
+        float scrollPos = 0f;
+        if (TextUtils.isEmpty(text)) {
+            if (getLayoutDirection() == LAYOUT_DIRECTION_RTL
+                    && BidiFormatter.getInstance().isRtl(getHint())) {
+                // Compared to below that uses getPrimaryHorizontal(1) due to 0 returning an
+                // invalid value, if the text is empty, getPrimaryHorizontal(0) returns the actual
+                // max scroll amount.
+                scrollPos = (int) getLayout().getPrimaryHorizontal(0) - getMeasuredWidth();
+            }
+        } else if (BidiFormatter.getInstance().isRtl(text)) {
+            // RTL.
+            float endPointX = getLayout().getPrimaryHorizontal(text.length());
+            int measuredWidth = getMeasuredWidth();
+            float width = getLayout().getPaint().measureText(text.toString());
+            scrollPos = Math.max(0, endPointX - measuredWidth + width);
+        }
+        scrollTo((int) scrollPos, getScrollY());
+    }
+
+    /**
+     * Scrolls the omnibox text to bring the TLD into view.
+     */
+    private void scrollToTLD() {
+        Editable url = getText();
+        int measuredWidth = getMeasuredWidth() - (getPaddingLeft() + getPaddingRight());
+
+        Layout textLayout = getLayout();
+        assert getLayout().getLineCount() == 1;
+        final int originEndIndex = Math.min(mOriginEndIndex, url.length());
+        if (mOriginEndIndex > url.length()) {
+            // If discovered locally, please update crbug.com/859219 with the steps to reproduce.
+            assert false : "Attempting to scroll past the end of the URL: " + url + ", end index: "
+                           + mOriginEndIndex;
+        }
+        float endPointX = textLayout.getPrimaryHorizontal(originEndIndex);
+        // Compare the position offset of the last character and the character prior to determine
+        // the LTR-ness of the final component of the URL.
+        float priorToEndPointX = url.length() == 1
+                ? 0
+                : textLayout.getPrimaryHorizontal(Math.max(0, originEndIndex - 1));
+
+        float scrollPos;
+        if (priorToEndPointX < endPointX) {
+            // LTR
+            scrollPos = Math.max(0, endPointX - measuredWidth);
+        } else {
+            // RTL
+
+            // To handle BiDirectional text, search backward from the two existing offsets to find
+            // the first LTR character.  Ensure the final RTL component of the domain is visible
+            // above any of the prior LTR pieces.
+            int rtlStartIndexForEndingRun = originEndIndex - 1;
+            for (int i = originEndIndex - 2; i >= 0; i--) {
+                float indexOffsetDrawPosition = textLayout.getPrimaryHorizontal(i);
+                if (indexOffsetDrawPosition > endPointX) {
+                    rtlStartIndexForEndingRun = i;
+                } else {
+                    // getPrimaryHorizontal determines the index position for the next character
+                    // based on the previous characters.  In bi-directional text, the first RTL
+                    // character following LTR text will have an LTR-appearing horizontal offset
+                    // as it is based on the preceding LTR text.  Thus, the start of the RTL
+                    // character run will be after and including the first LTR horizontal index.
+                    rtlStartIndexForEndingRun = Math.max(0, rtlStartIndexForEndingRun - 1);
+                    break;
+                }
+            }
+            float width = textLayout.getPaint().measureText(
+                    url.subSequence(rtlStartIndexForEndingRun, originEndIndex).toString());
+            if (width < measuredWidth) {
+                scrollPos = Math.max(0, endPointX + width - measuredWidth);
+            } else {
+                scrollPos = endPointX + measuredWidth;
+            }
+        }
+        scrollTo((int) scrollPos, getScrollY());
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+
+        if (mPendingScroll) {
+            scrollDisplayTextInternal(mScrollType);
+        } else if (mPreviousWidth != (right - left)) {
+            scrollDisplayTextInternal(mScrollType);
+            mPreviousWidth = right - left;
+        }
+    }
+
+    @Override
+    public boolean bringPointIntoView(int offset) {
+        // TextView internally attempts to keep the selection visible, but in the unfocused state
+        // this class ensures that the TLD is visible.
+        if (!mFocused) return false;
+        assert !mPendingScroll;
+
+        return super.bringPointIntoView(offset);
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        InputConnection connection = super.onCreateInputConnection(outAttrs);
+        if (mUrlBarDelegate == null || !mUrlBarDelegate.allowKeyboardLearning()) {
+            outAttrs.imeOptions |= EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING;
+        }
+        return connection;
+    }
+
+    @Override
+    public void setText(CharSequence text, BufferType type) {
+        if (DEBUG) Log.i(TAG, "setText -- text: %s", text);
+        super.setText(text, type);
+        fixupTextDirection();
+    }
+
+    private void limitDisplayableLength() {
+        // To limit displayable length we replace middle portion of the string with ellipsis.
+        // That affects only presentation of the text, and doesn't affect other aspects like
+        // copying to the clipboard, getting text with getText(), etc.
+        final int maxLength =
+                SysUtils.isLowEndDevice() ? MAX_DISPLAYABLE_LENGTH_LOW_END : MAX_DISPLAYABLE_LENGTH;
+
+        Editable text = getText();
+        int textLength = text.length();
+        if (textLength <= maxLength) {
+            if (mDidEllipsizeTextHint) {
+                EllipsisSpan[] spans = text.getSpans(0, textLength, EllipsisSpan.class);
+                if (spans != null && spans.length > 0) {
+                    assert spans.length == 1 : "Should never apply more than a single EllipsisSpan";
+                    for (int i = 0; i < spans.length; i++) {
+                        text.removeSpan(spans[i]);
+                    }
+                }
+            }
+            mDidEllipsizeTextHint = false;
+            return;
+        }
+
+        mDidEllipsizeTextHint = true;
+
+        int spanLeft = text.nextSpanTransition(0, textLength, EllipsisSpan.class);
+        if (spanLeft != textLength) return;
+
+        spanLeft = maxLength / 2;
+        text.setSpan(EllipsisSpan.INSTANCE, spanLeft, textLength - spanLeft,
+                Editable.SPAN_INCLUSIVE_EXCLUSIVE);
+    }
+
+    @Override
+    public Editable getText() {
+        if (mRequestingAutofillStructure) {
+            // crbug.com/1109186: mTextForAutofillServices must not be null here, but Autofill
+            // requests can be triggered before it is initialized.
+            return new SpannableStringBuilder(
+                    mTextForAutofillServices != null ? mTextForAutofillServices : "");
+        }
+        return super.getText();
+    }
+
+    @Override
+    public CharSequence getAccessibilityClassName() {
+        // When UrlBar is used as a read-only TextView, force Talkback to pronounce it like
+        // TextView. Otherwise Talkback will say "Edit box, http://...". crbug.com/636988
+        if (isEnabled()) {
+            return super.getAccessibilityClassName();
+        } else {
+            return TextView.class.getName();
+        }
+    }
+
+    @Override
+    public void replaceAllTextFromAutocomplete(String text) {
+        if (DEBUG) Log.i(TAG, "replaceAllTextFromAutocomplete: " + text);
+        setText(text);
+    }
+
+    @Override
+    public void onAutocompleteTextStateChanged(boolean updateDisplay) {
+        if (DEBUG) {
+            Log.i(TAG, "onAutocompleteTextStateChanged: DIS[%b]", updateDisplay);
+        }
+        if (mUrlTextChangeListener == null) return;
+        if (updateDisplay) limitDisplayableLength();
+        // crbug.com/764749
+        Log.w(TAG, "Text change observed, triggering autocomplete.");
+
+        mUrlTextChangeListener.onTextChanged(
+                getTextWithoutAutocomplete(), getTextWithAutocomplete());
+    }
+
+    /**
+     * Span that displays ellipsis instead of the text. Used to hide portion of
+     * very large string to get decent performance from TextView.
+     */
+    private static class EllipsisSpan extends ReplacementSpan {
+        private static final String ELLIPSIS = "...";
+
+        public static final EllipsisSpan INSTANCE = new EllipsisSpan();
+
+        @Override
+        public int getSize(
+                Paint paint, CharSequence text, int start, int end, Paint.FontMetricsInt fm) {
+            return (int) paint.measureText(ELLIPSIS);
+        }
+
+        @Override
+        public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top,
+                int y, int bottom, Paint paint) {
+            canvas.drawText(ELLIPSIS, x, y, paint);
+        }
+    }
+}
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
+@@ -223,8 +223,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+             setFocusableInTouchMode(mAllowFocus);
+         });
+ 
+-        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI
+-                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);
+ 
+         // The HTC Sense IME will attempt to autocomplete words in the Omnibox when Prediction is
+         // enabled.  We want to disable this feature and rely on the Omnibox's implementation.
+--
+2.25.1
@@ -0,0 +1,306 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Sep 2021 11:17:53 +0200
+Subject: Disable AGSA by default
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/BUILD.gn                       |  3 ---
+ .../org/chromium/chrome/browser/AppHooks.java |  1 -
+ .../chrome/browser/IntentHandler.java         |  5 ----
+ .../chrome/browser/app/ChromeActivity.java    | 27 -------------------
+ .../ChromeContextMenuPopulator.java           |  7 -----
+ ...stomTabActivityClientConnectionKeeper.java |  9 -------
+ .../init/ProcessInitializationHandler.java    |  8 ------
+ .../browser/ntp/search/SearchBoxMediator.java |  1 -
+ .../chrome/browser/share/LensUtils.java       | 12 +--------
+ .../flags/android/chrome_feature_list.cc      |  4 +--
+ chrome/browser/ui/android/omnibox/BUILD.gn    |  2 --
+ .../browser/omnibox/LocationBarMediator.java  |  1 -
+ 12 files changed, 3 insertions(+), 77 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -420,7 +420,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/first_run/android:java",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/history_clusters:java_resources",
+       "//chrome/browser/image_descriptions:java",
+@@ -1015,7 +1014,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/flags:flags_junit_tests",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/image_descriptions:java",
+       "//chrome/browser/image_editor/public:java",
+@@ -1531,7 +1529,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/first_run/android:java",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/image_descriptions:javatests",
+       "//chrome/browser/incognito:incognito_java_tests",
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
+@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.directactions.DirectActionCoordinator;
+ import org.chromium.chrome.browser.feedback.FeedbackReporter;
+ import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
+ import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
+-import org.chromium.chrome.browser.gsa.GSAHelper;
+ import org.chromium.chrome.browser.historyreport.AppIndexingReporter;
+ import org.chromium.chrome.browser.init.ChromeStartupDelegate;
+ import org.chromium.chrome.browser.init.ProcessInitializationHandler;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+@@ -43,7 +43,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+ import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;
+ import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
+ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -267,8 +266,6 @@ public class IntentHandler {
+     private static int sReferrerId;
+     private static String sPendingIncognitoUrl;
+ 
+-    public static final String PACKAGE_GSA = GSAState.PACKAGE_NAME;
+-
+     private static final String PACKAGE_GMAIL = "com.google.android.gm";
+     private static final String PACKAGE_PLUS = "com.google.android.apps.plus";
+     private static final String PACKAGE_HANGOUTS = "com.google.android.talk";
+@@ -498,8 +495,6 @@ public class IntentHandler {
+             return ExternalAppId.LINE;
+         } else if (packageName.equals(PACKAGE_WHATSAPP)) {
+             return ExternalAppId.WHATSAPP;
+-        } else if (packageName.equals(PACKAGE_GSA)) {
+-            return ExternalAppId.GSA;
+         } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) {
+             return ExternalAppId.CHROME;
+         } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {
+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
+@@ -113,10 +113,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
+ import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;
+ import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;
+ import org.chromium.chrome.browser.fullscreen.FullscreenManager;
+-import org.chromium.chrome.browser.gsa.ContextReporter;
+-import org.chromium.chrome.browser.gsa.GSAAccountChangeListener;
+-import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.history.HistoryManagerUtils;
+ import org.chromium.chrome.browser.init.AsyncInitializationActivity;
+ import org.chromium.chrome.browser.init.ProcessInitializationHandler;
+@@ -377,8 +373,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ 
+     private LaunchCauseMetrics mLaunchCauseMetrics;
+ 
+-    private GSAAccountChangeListener mGSAAccountChangeListener;
+-
+     // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.
+     private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =
+             new ArrayList<>();
+@@ -1189,10 +1183,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+ 
+     @Override
+     public void onStopWithNative() {
+-        if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
+-            if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();
+-        }
+-
+         super.onStopWithNative();
+     }
+ 
+@@ -1284,23 +1274,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+                     .recordUserFontPrefOnStartup();
+         });
+ 
+-        // GSA connection is not needed on low-end devices because Icing is disabled.
+-        if (!SysUtils.isLowEndDevice()) {
+-            if (isActivityFinishingOrDestroyed()) return;
+-            DeferredStartupHandler.getInstance().addDeferredTask(() -> {
+-                if (!GSAState.getInstance(this).isGsaAvailable()) {
+-                    ContextReporter.reportStatus(ContextReporter.STATUS_GSA_NOT_AVAILABLE);
+-                    return;
+-                }
+-
+-                if (mGSAAccountChangeListener == null) {
+-                    mGSAAccountChangeListener =
+-                            GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());
+-                }
+-                mGSAAccountChangeListener.connect();
+-            });
+-        }
+-
+         DeferredStartupHandler.getInstance().addDeferredTask(
+                 () -> { MemoryPurgeManager.getInstance().start(); });
+     }
+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
+@@ -37,7 +37,6 @@ import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemTy
+ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
+ import org.chromium.chrome.browser.firstrun.FirstRunStatus;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.lens.LensController;
+ import org.chromium.chrome.browser.lens.LensEntryPoint;
+ import org.chromium.chrome.browser.lens.LensIntentParams;
+@@ -978,12 +977,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+                     LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);
+             return false;
+         }
+-        if (GSAState.getInstance(mContext).isAgsaVersionBelowMinimum(
+-                    versionName, LensUtils.getMinimumAgsaVersionForLensSupport())) {
+-            LensMetrics.recordLensSupportStatus(
+-                    LENS_SUPPORT_STATUS_HISTOGRAM_NAME, LensMetrics.LensSupportStatus.OUT_OF_DATE);
+-            return false;
+-        }
+ 
+         if (LensUtils.isDeviceOsBelowMinimum()) {
+             LensMetrics.recordLensSupportStatus(
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityClientConnectionKeeper.java
+@@ -11,7 +11,6 @@ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.chrome.browser.browserservices.intents.BrowserServicesIntentDataProvider;
+ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
+ import org.chromium.chrome.browser.dependency_injection.ActivityScope;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+ import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver;
+ import org.chromium.chrome.browser.tab.Tab;
+@@ -95,13 +94,5 @@ public class CustomTabActivityClientConnectionKeeper implements StartStopWithNat
+             }
+         }
+         assert status >= 0;
+-
+-        if (GSAState.isGsaPackageName(packageName)) {
+-            RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.GSA",
+-                    status, ConnectionStatus.NUM_ENTRIES);
+-        } else {
+-            RecordHistogram.recordEnumeratedHistogram("CustomTabs.ConnectionStatusOnReturn.NonGSA",
+-                    status, ConnectionStatus.NUM_ENTRIES);
+-        }
+     }
+ }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+@@ -356,14 +356,6 @@ public class ProcessInitializationHandler {
+             }
+         });
+ 
+-        deferredStartupHandler.addDeferredTask(new Runnable() {
+-            @Override
+-            public void run() {
+-                // Starts syncing with GSA.
+-                AppHooks.get().createGsaHelper().startSync();
+-            }
+-        });
+-
+         deferredStartupHandler.addDeferredTask(new Runnable() {
+             @Override
+             public void run() {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
+@@ -13,7 +13,6 @@ import android.view.ViewGroup;
+ 
+ import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+ 
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.lens.LensController;
+ import org.chromium.chrome.browser.lens.LensEntryPoint;
+ import org.chromium.chrome.browser.lens.LensIntentParams;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
+@@ -10,7 +10,6 @@ import android.text.TextUtils;
+ 
+ import org.chromium.chrome.browser.IntentHandler;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.lens.LensController;
+ import org.chromium.components.externalauth.ExternalAuthUtils;
+ 
+@@ -57,12 +56,7 @@ public class LensUtils {
+             if (context == null) {
+                 return "";
+             }
+-            String agsaVersion = GSAState.getInstance(context).getAgsaVersionName();
+-            if (agsaVersion == null) {
+                 return "";
+-            } else {
+-                return agsaVersion;
+-            }
+         }
+     }
+ 
+@@ -114,11 +108,7 @@ public class LensUtils {
+      * @return Whether the package is valid.
+      */
+     public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) {
+-        if (sFakePassableLensEnvironmentForTesting) {
+-            return true;
+-        }
+-
+-        return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA);
+        return false;
+     }
+ 
+     /**
+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
+@@ -750,8 +750,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kExperimentsForAgsa,
+-             "ExperimentsForAgsa",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "ExperimentsForAgsa",                 // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite
+ 
+ BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
+--- a/chrome/browser/ui/android/omnibox/BUILD.gn
+++ b/chrome/browser/ui/android/omnibox/BUILD.gn
+@@ -146,7 +146,6 @@ android_library("java") {
+     "//chrome/browser/device:java",
+     "//chrome/browser/feature_engagement:java",
+     "//chrome/browser/flags:java",
+-    "//chrome/browser/gsa:java",
+     "//chrome/browser/history_clusters:java",
+     "//chrome/browser/language/android:java",
+     "//chrome/browser/lens:java",
+@@ -441,7 +440,6 @@ robolectric_library("junit") {
+     "//chrome/browser/commerce/merchant_viewer/android:java",
+     "//chrome/browser/device:java",
+     "//chrome/browser/flags:java",
+-    "//chrome/browser/gsa:java",
+     "//chrome/browser/lens:java",
+     "//chrome/browser/locale:java",
+     "//chrome/browser/preferences:java",
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.back_press.BackPressManager;
+ import org.chromium.chrome.browser.device.DeviceClassManager;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.flags.ChromeSwitches;
+-import org.chromium.chrome.browser.gsa.GSAState;
+ import org.chromium.chrome.browser.lens.LensController;
+ import org.chromium.chrome.browser.lens.LensEntryPoint;
+ import org.chromium.chrome.browser.lens.LensIntentParams;
+--
+2.25.1
@@ -1,102 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 20 Feb 2020 22:44:06 +0100
-Subject: Disable AImageReader for ARM64/P and ARM64/Q
-
---
- chrome/browser/android/chrome_startup_flags.cc | 9 +++++++++
- gpu/config/gpu_finch_features.cc               | 4 ++++
- gpu/config/gpu_util.cc                         | 8 ++++++++
- media/base/media_switches.cc                   | 4 ++++
- 4 files changed, 25 insertions(+)
-
-diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
--- a/chrome/browser/android/chrome_startup_flags.cc
-+++ b/chrome/browser/android/chrome_startup_flags.cc
-@@ -6,6 +6,7 @@
- 
- #include "chrome/browser/android/chrome_startup_flags.h"
- 
-+#include "base/android/build_info.h"
- #include "base/android/jni_android.h"
- #include "base/android/jni_string.h"
- #include "base/android/scoped_java_ref.h"
-@@ -16,6 +17,7 @@
- #include "chrome/common/chrome_switches.h"
- #include "components/browser_sync/browser_sync_switches.h"
- #include "components/dom_distiller/core/dom_distiller_switches.h"
-+#include "content/public/common/content_switches.h"
- #include "media/base/media_switches.h"
- 
- namespace {
-@@ -40,6 +42,13 @@ void SetChromeSpecificCommandLineFlags() {
-   if (base::SysInfo::IsLowEndDevice())
-     SetCommandLineSwitchASCII(switches::kDisableSyncTypes, "Favicon Images");
- 
-+#ifdef ARCH_CPU_ARM64
-+  // workaround for Android 9/10 crashes on ARM64 CPUs
-+  if (base::android::BuildInfo::GetInstance()->sdk_int() >= base::android::SDK_VERSION_P) {
-+    SetCommandLineSwitchASCII("disable_aimagereader", "1");
-+  }
-+#endif
-+
-   // Enable DOM Distiller backend.
-   SetCommandLineSwitch(switches::kEnableDomDistiller);
- }
-diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
--- a/gpu/config/gpu_finch_features.cc
-+++ b/gpu/config/gpu_finch_features.cc
-@@ -15,7 +15,11 @@ namespace features {
- #if defined(OS_ANDROID)
- // Use android AImageReader when playing videos with MediaPlayer.
- const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
-+#ifdef ARCH_CPU_ARM64
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
-+#else
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
-+#endif
- 
- // Used only by webview to disable SurfaceControl.
- const base::Feature kDisableSurfaceControlForWebview{
-diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
--- a/gpu/config/gpu_util.cc
-+++ b/gpu/config/gpu_util.cc
-@@ -47,6 +47,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
- #if !defined(OS_ANDROID)
-   return kGpuFeatureStatusDisabled;
- #else
-+  if (blacklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
-+    return kGpuFeatureStatusBlacklisted;
-+
-   if (!gpu_preferences.enable_android_surface_control)
-     return kGpuFeatureStatusDisabled;
- 
-@@ -288,6 +291,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
-     gpu_feature_info->status_values[GPU_FEATURE_TYPE_ACCELERATED_WEBGL2] =
-         kGpuFeatureStatusBlacklisted;
-   }
-+
-+  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
-+    gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
-+        kGpuFeatureStatusBlacklisted;
-+  }
- }
- 
- GPUInfo* g_gpu_info_cache = nullptr;
-diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc
-+++ b/media/base/media_switches.cc
-@@ -500,7 +500,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
- 
- // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
- const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
-+#ifdef ARCH_CPU_ARM64
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
-+#else
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
-+#endif
- 
- // Prevents using SurfaceLayer for videos. This is meant to be used by embedders
- // that cannot support SurfaceLayer at the moment.
-- 
-2.17.1
-
@@ -0,0 +1,74 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 8 Nov 2021 09:47:23 +0000
+Subject: Disable Accessibility service by default
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../browser/ui/android/strings/android_chrome_strings.grd   | 6 ++++++
+ .../android/java/res/xml/accessibility_preferences.xml      | 5 +++++
+ .../browser_ui/accessibility/AccessibilitySettings.java     | 3 +++
+ .../browser/accessibility/WebContentsAccessibilityImpl.java | 5 +++++
+ 4 files changed, 19 insertions(+)
+
+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
+@@ -1500,6 +1500,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_SAFETY_CHECK_BUTTON" desc="Text for the button to start Safety check.">
+         Check now
+       </message>
+      <message name="IDS_ENABLE_ACCESSIBILITY_TITLE" desc="Title of enable accessibility settings, which allows the user to enable service. [CHAR_LIMIT=32]">
+        Enable Accessibility Service
+      </message>
+      <message name="IDS_ENABLE_ACCESSIBILITY_SUMMARY" desc="Summary of enable accessibility settings.">
+        Activates or deactivates the communication of all user activities in ui to the Accessibility provider
+      </message>
+       <message name="IDS_SAFETY_CHECK_ERROR" desc="A generic error state.">
+         An error occurred.
+       </message>
+diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+--- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
+@@ -7,6 +7,11 @@ found in the LICENSE file.
+ 
+ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ 
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+        android:key="enable_accessibility"
+        android:summary="@string/enable_accessibility_summary"
+        android:title="@string/enable_accessibility_title" />
+
+     <org.chromium.components.browser_ui.accessibility.TextScalePreference
+         android:key="text_scale"
+         android:title="@string/font_size"
+diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+--- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
+@@ -18,6 +18,9 @@ import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
+ import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+ import org.chromium.components.browser_ui.settings.SettingsUtils;
+ 
+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+
+ /**
+  * Fragment to keep track of all the accessibility related preferences.
+  */
+diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
+--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
+@@ -900,6 +900,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+             structure.setChildCount(0);
+             return;
+         }
+        // Do not collect accessibility tree if disabled
+        if (!ContextUtils.getAppSharedPreferences().getBoolean("enable_accessibility", false)) {
+            structure.setChildCount(0);
+            return;
+        }
+         structure.setChildCount(1);
+         final ViewStructure viewRoot = structure.asyncNewChild(0);
+         viewRoot.setClassName("");
+--
+2.25.1
@@ -0,0 +1,33 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 26 Mar 2022 16:41:55 +0100
+Subject: Disable AsyncDNS by default
+
+This feature is detrimental to privacy, see also:
+* https://bugs.chromium.org/p/chromium/issues/detail?id=805020
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/common/chrome_features.cc | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
+@@ -98,13 +98,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior,
+ 
+ // Enables the built-in DNS resolver.
+ BASE_FEATURE(kAsyncDns,
+-             "AsyncDns",
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || \
+-    BUILDFLAG(IS_WIN)
+-             base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+-             base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
+             "AsyncDns",                                // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT           // in Bromite
+ );
+ 
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+--
+2.25.1
@@ -2,22 +2,24 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Fri, 24 Jan 2020 09:46:48 +0100
 Subject: Disable DRM media origin IDs preprovisioning

+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/base/media_switches.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ media/base/media_switches.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -489,7 +489,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -851,8 +851,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
 // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
 // which will trigger provisioning process after MediaDrmBridge is created.
- const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kMediaDrmPreprovisioning,
+-             "MediaDrmPreprovisioning",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "MediaDrmPreprovisioning",             // must be disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
 
 // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
 // IDs at startup (whenever a profile is loaded). Also used by tests that
-- 
-2.17.1
-
+--
+2.25.1
@@ -0,0 +1,251 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 13 Nov 2021 09:17:06 +0000
+Subject: Disable FLoC and privacy sandbox
+
+Remove UI from the settings and set the flags to inactive
+Permanently removes FLoC support, disabling the download of LSH clusters,
+the marking the history navigation and the javascript API and permission policies.
+Also added the disabling of blink features through the DisabledForBromite tag
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../java/res/xml/privacy_preferences.xml      |  4 ---
+ .../privacy/settings/PrivacySettings.java     | 23 ------------
+ .../browser/chrome_content_browser_client.cc  |  3 ++
+ .../history/core/browser/history_backend.cc   | 13 +------
+ .../privacy_sandbox/privacy_sandbox_prefs.cc  |  2 +-
+ .../privacy_sandbox_settings.cc               | 35 +++++++++++--------
+ .../privacy_sandbox_settings.h                |  1 -
+ 7 files changed, 25 insertions(+), 56 deletions(-)
+
+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
+@@ -68,10 +68,6 @@ found in the LICENSE file.
+         android:title="@string/open_external_links_incognito_title"
+         android:summary="@string/open_external_links_incognito_summary"
+         android:defaultValue="false" />
+-    <Preference
+-        android:key="privacy_sandbox"
+-        android:title="@string/prefs_privacy_sandbox"
+-        android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"/>
+     <PreferenceCategory
+         android:key="services_category"
+         android:title="@string/services_category_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
+@@ -58,8 +58,6 @@ public class PrivacySettings
+     private static final String PREF_SECURE_DNS = "secure_dns";
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+-    private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
+-    private static final String PREF_PROXY_OPTIONS = "proxy";
+     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
+     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
+ 
+@@ -86,21 +84,6 @@ public class PrivacySettings
+         SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
+         getActivity().setTitle(R.string.prefs_privacy_security);
+ 
+-        Preference sandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
+-        // Hide the Privacy Sandbox if it is restricted.
+-        if (PrivacySandboxBridge.isPrivacySandboxRestricted()) {
+-            getPreferenceScreen().removePreference(sandboxPreference);
+-        } else {
+-            sandboxPreference.setSummary(
+-                    PrivacySandboxSettingsFragment.getStatusString(getContext()));
+-            // Overwrite the click listener to pass a correct referrer to the fragment.
+-            sandboxPreference.setOnPreferenceClickListener(preference -> {
+-                PrivacySandboxSettingsFragmentV3.launchPrivacySandboxSettings(getContext(),
+-                        new SettingsLauncherImpl(), PrivacySandboxReferrer.PRIVACY_SETTINGS);
+-                return true;
+-            });
+-        }
+-
+         Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
+         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_GUIDE)) {
+             getPreferenceScreen().removePreference(privacyGuidePreference);
+@@ -220,12 +203,6 @@ public class PrivacySettings
+             secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
+         }
+ 
+-        Preference privacySandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
+-        if (privacySandboxPreference != null) {
+-            privacySandboxPreference.setSummary(
+-                    PrivacySandboxSettingsFragment.getStatusString(getContext()));
+-        }
+-
+         mIncognitoLockSettings.updateIncognitoReauthPreferenceIfNeeded(getActivity());
+     }
+ 
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -3231,6 +3231,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+     const url::Origin* source_origin,
+     const url::Origin* destination_origin,
+     const url::Origin* reporting_origin) {
+  // make sure that this is always disabled in Bromite even if privacy sandbox is already disabled in the prefs
+  if ((true))
+    return false;
+   Profile* profile = Profile::FromBrowserContext(browser_context);
+ 
+   auto* privacy_sandbox_settings =
+diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
+--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
+@@ -517,18 +517,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
+   if (!visit_id)
+     return;
+ 
+-  // Only add to the annotations table if the visit_id exists in the visits
+-  // table.
+-  VisitContentAnnotations annotations;
+-  if (db_->GetContentAnnotationsForVisit(visit_id, &annotations)) {
+-    annotations.annotation_flags |=
+-        VisitContentAnnotationFlag::kBrowsingTopicsEligible;
+-    db_->UpdateContentAnnotationsForVisit(visit_id, annotations);
+-  } else {
+-    annotations.annotation_flags |=
+-        VisitContentAnnotationFlag::kBrowsingTopicsEligible;
+-    db_->AddContentAnnotationsForVisit(visit_id, annotations);
+-  }
+  // in Bromite disallow marking anything in history related to topics
+   ScheduleCommit();
+ }
+ 
+diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
+--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
+@@ -66,7 +66,7 @@ namespace privacy_sandbox {
+ 
+ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+   registry->RegisterBooleanPref(
+-      prefs::kPrivacySandboxApisEnabled, true,
+      prefs::kPrivacySandboxApisEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
+   registry->RegisterBooleanPref(
+diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components/privacy_sandbox/privacy_sandbox_settings.cc
+--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
+@@ -68,8 +68,7 @@ PrivacySandboxSettings::PrivacySandboxSettings(
+     : delegate_(std::move(delegate)),
+       host_content_settings_map_(host_content_settings_map),
+       cookie_settings_(cookie_settings),
+-      pref_service_(pref_service),
+-      incognito_profile_(incognito_profile) {
+      pref_service_(pref_service) {
+   DCHECK(pref_service_);
+   DCHECK(host_content_settings_map_);
+   DCHECK(cookie_settings_);
+@@ -94,7 +93,8 @@ PrivacySandboxSettings::PrivacySandboxSettings(
+ 
+ PrivacySandboxSettings::~PrivacySandboxSettings() = default;
+ 
+-bool PrivacySandboxSettings::IsTopicsAllowed() const {
+bool PrivacySandboxSettings::IsTopicsAllowed() const { // disabled in Bromite
+  if ((true)) return false;
+   // Topics API calculation should be prevented if the user has blocked 3PC
+   // cookies, as there will be no context specific check.
+   const auto cookie_controls_mode =
+@@ -119,7 +119,8 @@ bool PrivacySandboxSettings::IsTopicsAllowedForContext(
+          IsPrivacySandboxEnabledForContext(url, top_frame_origin);
+ }
+ 
+-bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) {
+bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
+  if ((true)) return false;
+   const auto& blocked_topics =
+       pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
+ 
+@@ -187,9 +188,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
+ 
+ bool PrivacySandboxSettings::IsAttributionReportingAllowed(
+     const url::Origin& top_frame_origin,
+-    const url::Origin& reporting_origin) const {
+-  return IsPrivacySandboxEnabledForContext(reporting_origin.GetURL(),
+-                                           top_frame_origin);
+    const url::Origin& reporting_origin) const { // disabled in Bromite
+  return false;
+ }
+ 
+ bool PrivacySandboxSettings::MaySendAttributionReport(
+@@ -278,7 +278,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
+ }
+ 
+ bool PrivacySandboxSettings::IsFledgeJoiningAllowed(
+-    const url::Origin& top_frame_origin) const {
+    const url::Origin& top_frame_origin) const { // disabled in Bromite
+  if ((true)) return false;
+   ScopedDictPrefUpdate scoped_pref_update(
+       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
+   auto& pref_data = scoped_pref_update.Get();
+@@ -334,7 +335,9 @@ bool PrivacySandboxSettings::IsPrivateAggregationAllowed(
+                                            top_frame_origin);
+ }
+ 
+-bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const { // disabled in Bromite
+  if ((true))
+    return false;
+   // If the delegate is restricting access the Privacy Sandbox is disabled.
+   if (delegate_->IsPrivacySandboxRestricted())
+     return false;
+@@ -349,7 +352,7 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+   // settings is available.
+   if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
+     // For Privacy Sandbox Settings 3, APIs are disabled in incognito.
+-    if (incognito_profile_)
+    if ((true))
+       return false;
+ 
+     if (should_override_setting_for_local_testing) {
+@@ -367,7 +370,8 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+   return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
+ }
+ 
+-void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) { // disabled in Bromite
+  enabled = false;
+   // Only apply the decision to the appropriate preference.
+   if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
+     pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
+@@ -376,7 +380,8 @@ void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+   }
+ }
+ 
+-bool PrivacySandboxSettings::IsTrustTokensAllowed() {
+bool PrivacySandboxSettings::IsTrustTokensAllowed() { // disabled in Bromite
+  if ((true)) return false;
+   // The PrivacySandboxSettings is only involved in Trust Token access
+   // decisions when the Release 3 flag is enabled.
+   if (!base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3))
+@@ -441,9 +446,9 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
+       content_settings::CookieSettings::QueryReason::kPrivacySandbox);
+ }
+ 
+-void PrivacySandboxSettings::SetTopicsDataAccessibleFromNow() const {
+-  pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
+-                         base::Time::Now());
+void PrivacySandboxSettings::SetTopicsDataAccessibleFromNow() const { // disabled in Bromite
+  pref_service_->ClearPref(prefs::kPrivacySandboxTopicsDataAccessibleSince);
+  if ((true)) return;
+ 
+   for (auto& observer : observers_)
+     observer.OnTopicsDataAccessibleSinceUpdated();
+diff --git a/components/privacy_sandbox/privacy_sandbox_settings.h b/components/privacy_sandbox/privacy_sandbox_settings.h
+--- a/components/privacy_sandbox/privacy_sandbox_settings.h
+++ b/components/privacy_sandbox/privacy_sandbox_settings.h
+@@ -227,7 +227,6 @@ class PrivacySandboxSettings : public KeyedService {
+   scoped_refptr<content_settings::CookieSettings> cookie_settings_;
+   raw_ptr<PrefService, DanglingUntriaged> pref_service_;
+   PrefChangeRegistrar pref_change_registrar_;
+-  bool incognito_profile_;
+ };
+ 
+ }  // namespace privacy_sandbox
+--
+2.25.1
@@ -1,54 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 27 Oct 2019 10:21:19 +0100
-Subject: Disable HEAD requests for single-word Omnibar searches
-
-Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
---
- .../ui/omnibox/chrome_omnibox_navigation_observer.cc      | 8 ++++----
- .../ui/omnibox/chrome_omnibox_navigation_observer.h       | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
-+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
-@@ -86,8 +86,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
-       shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
-       load_state_(LOAD_NOT_SEEN),
-       fetch_state_(FETCH_NOT_COMPLETE) {
-  if (alternate_nav_match_.destination_url.is_valid())
-    CreateLoader(alternate_nav_match_.destination_url);
-+//  if (alternate_nav_match_.destination_url.is_valid())
-+//    CreateLoader(alternate_nav_match_.destination_url);
- 
-   // We need to start by listening to AllSources, since we don't know which tab
-   // the navigation might occur in.
-@@ -287,7 +287,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
-   delete this;
- }
- 
-void ChromeOmniboxNavigationObserver::CreateLoader(
-+/*void ChromeOmniboxNavigationObserver::CreateLoader(
-     const GURL& destination_url) {
-   net::NetworkTrafficAnnotationTag traffic_annotation =
-       net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
-@@ -328,4 +328,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
-   loader_->SetAllowHttpErrorResults(true);
-   loader_->SetOnRedirectCallback(base::BindRepeating(
-       &ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
-}
-+}*/
-diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
-+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
-@@ -127,7 +127,7 @@ class ChromeOmniboxNavigationObserver : public OmniboxNavigationObserver,
- 
-   // Creates a URL loader for |destination_url| and stores it in |loader_|.
-   // Does not start the loader.
-  void CreateLoader(const GURL& destination_url);
-+  //void CreateLoader(const GURL& destination_url);
- 
-   const base::string16 text_;
-   const AutocompleteMatch match_;
-- 
-2.17.1
-
@@ -2,46 +2,50 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Thu, 12 Oct 2017 08:15:17 +0200
 Subject: Disable NTP remote suggestions by default

+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/ntp_snippets/features.cc                           | 4 ++--
- .../remote/remote_suggestions_status_service_impl.cc          | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ components/feed/core/shared_prefs/pref_names.cc | 4 ++--
+ components/ntp_snippets/features.cc             | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 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
-@@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -39,8 +39,8 @@ const base::Feature* const kAllFeatures[] = {
     &kOptionalImagesEnabledFeature};
 
- const base::Feature kArticleSuggestionsFeature{
-    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kArticleSuggestionsFeature,
+-             "NTPArticleSuggestions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "NTPArticleSuggestions",                            // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
 
- const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
-     "RemoteSuggestionsEmulateM58FetchingSchedule",
-@@ -69,7 +69,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
+ BASE_FEATURE(kRemoteSuggestionsEmulateM58FetchingSchedule,
+              "RemoteSuggestionsEmulateM58FetchingSchedule",
+@@ -71,8 +71,8 @@ const char kNotificationsDailyLimit[] = "daily_limit";
 const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
 
- const base::Feature kKeepPrefetchedContentSuggestions{
-    "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kKeepPrefetchedContentSuggestions,
+-             "KeepPrefetchedContentSuggestions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "KeepPrefetchedContentSuggestions",                // disabled by default
+             base::FEATURE_DISABLED_BY_DEFAULT);                // in Bromite
 
- 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
-
+ BASE_FEATURE(kOptionalImagesEnabledFeature,
+              "NTPRemoteSuggestionsOptionalImages",
+--
+2.25.1
@@ -1,37 +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 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -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() { }
- 
-- 
-2.17.1
-
@@ -0,0 +1,40 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 31 Jul 2022 22:13:11 +0200
+Subject: Disable PrivacyGuide
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/common/chrome_features.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
+--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
+@@ -505,8 +505,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
+ 
+ // Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
+ BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide,
+-             "HappinessTrackingSurveysForDesktopPrivacyGuide",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
+             "HappinessTrackingSurveysForDesktopPrivacyGuide",                      // must be disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);                                    // in Bromite
+ const base::FeatureParam<base::TimeDelta>
+     kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
+         &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
+@@ -915,11 +915,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect,
+              "PrerenderFallbackToPreconnect",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+-BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_ENABLED_BY_DEFAULT);
+BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_DISABLED_BY_DEFAULT); // always disabled in Bromite
+ 
+ BASE_FEATURE(kPrivacyGuideAndroid,
+-             "PrivacyGuideAndroid",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
+             "PrivacyGuideAndroid",               // always disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
+ 
+ // Enables or disables push subscriptions keeping Chrome running in the
+ // background when closed.
+--
+2.25.1
--- a/Show More
+++ b/Show More