303 changed files with 121168 additions and 118510 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,4 +0,0 @@
-# These are supported funding model platforms
-
-patreon: csagan5
-custom: https://www.bromite.org/#donate
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a Bromite bug report
+
+---
+
+**Bromite version**
+
+Version: `69.0...`
+Arch: `arm` or `arm64` or `x86`
+Android version: ... (example: `lollipop`)
+
+**Is the bug reproducible with latest version?**
+`Bug must be reproducible with latest version`
+
+**Can the bug be reproduced with corresponding [Chromium](https://github.com/bromite/chromium/releases) version?**
+`Bug must NOT be reproducible with Chromium to be qualified as a Bromite bug`
+If yes then report it upstream on [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first; all Chromium issues reported here will be closed as `invalid`.
+
+**Is the bug a crash?**
+If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+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.
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,213 +0,0 @@
-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
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest a privacy-related idea for this project
+
+---
+
+**Is your feature request related to privacy?**
+Only privacy-related feature requests are considered.
+
+**Is there a patch available for this feature somewhere?**
+...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -1,68 +0,0 @@
-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
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,15 +0,0 @@
-## 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,946 +1,3 @@
-# 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
-
-# 81.0.4044.70
-* backport surface control fix (fixes https://github.com/bromite/bromite/issues/445)
-
-# 81.0.4044.63
-* use upstream fix for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485)
-* do not compile QR code sharing
-* remove obsolete patch for GCM experiment status
-* drop 2 patches for AImageReader crash fix (upstream has the same revert patches)
-
-# 80.0.3987.118
-* disable AImageReader for all ARM64 devices (fixes https://github.com/bromite/bromite/issues/497)
-* use upstream possible workaround for SD card not found issue (fixes https://github.com/bromite/bromite/issues/485)
-
-# 80.0.3987.109
-* restored GPU workaround for the ARM/ARM64 AImageReader crash (https://github.com/bromite/bromite/issues/445)
-
-# 80.0.3987.95
-* enable user-agent freeze (fixes https://github.com/bromite/bromite/issues/483)
-* fix issue with AMP (fixes https://github.com/bromite/bromite/issues/488)
-* fix crash on home page (fixes https://github.com/bromite/bromite/issues/484)
-
-# 80.0.3987.78
-* removed ungoogled-chromium patch for non-remote developer tools resources
-* removed patch for 64-bit webview (it is now a default from upstream)
-* removed patch for enabling dark mode menu entry by default (it is now a default from upstream)
-* removed patch for enabling download rename by default (it is now a default from upstream)
-* removed some redundant Iridium safe browsing patches
-
-# 79.0.3945.139
-* remove patch to automatically disable video decoding acceleration on Android 10+ and arm64
-* fix referral headers bug in non-DoH requests (fixes https://github.com/bromite/bromite/issues/470)
-* disable smart selection by default, enable web search in incognito mode
-* disable DRM media pre-provisioning (fixes https://github.com/bromite/bromite/issues/471)
-
-# 79.0.3945.123
-* updated User-agent version
-* increase minimum DoH timeout to 400ms (fixes https://github.com/bromite/bromite/issues/437)
-
-# 79.0.3945.111
-* automatically disable video decoding acceleration on Android 10+ and arm64
-* restore enable-horizontal-tab-switcher flag
-* remove non-working contextual search settings
-* disable QUIC by default
-* remove logging for DoH timeouts
-
-# 79.0.3945.107
-* always show cookies, javascript and ads site settings (fixes https://github.com/bromite/bromite/issues/133)
-* remove global ads and javascript menu options
-
-# 79.0.3945.100
-* log timeout values for DoH
-* enable DFM (fixes https://github.com/bromite/bromite/issues/441)
-* updated User-agent version
-
-# 79.0.3945.94
-* removed patches which do not apply anymore (Widevine version punting, always show homepage settings, network errors UMA recording)
-* removed split APKs support (Play integration)
-* disabled password reuse functionality (Play integration)
-* re-introduced minimal headers for DoH
-* removed Startpage
-* disable feed support
-* updated User-agent version
-
-# 78.0.3904.130
-* support user-specified subresources filter URL (fixes https://github.com/bromite/bromite/issues/2)
-* revert removal of flag for disabling pull-to-refresh effect
-* fix crash when entering no DoH URL (fixes https://github.com/bromite/bromite/issues/430)
-* added Peter Lowe's Ad and tracking server list (fixes https://github.com/bromite/bromite/issues/423)
-* enabled dav1d_decoder
-
-# 78.0.3904.119
-* replace fixed DNS-over-HTTPS feature flag with user-customizable option
-* fix background playback issue (fixes https://github.com/bromite/bromite/issues/424)
-
-# 78.0.3904.105
-* add flag to disable WebGL (fixes https://github.com/bromite/bromite/issues/411)
-* more selective AMP sanitization (fixes https://github.com/bromite/bromite/issues/410)
-* build optimizations to disable debug information
-
-# 78.0.3904.93
-* introduce flags to disable browser fingerprinting capabilities (fixes https://github.com/bromite/bromite/issues/402)
-* major enhancements to AMP sanitization for news/images
-* remove duplicate network predictions privacy setting
-* disable some signed exchanges features
-* ungoogled-chromium-android: patches to block all GCM/GMS/PlayServices integrations
-* ungoogled-chromium: block all connection requests to substituted domains
-* disable GVR services build flag
-* disable HEAD requests for single words typed and clicked in Omnibar
-* increase number of autocomplete matches from 5 to 10
-* replace DoH probe domain with RIPE domain
-* merged fixes for adblock/javascript menu text (https://github.com/bromite/bromite/pull/398)
-* updated User-agent phone model and version
-
-# 78.0.3904.72
-* updated User-agent phone model and version
-* fix network predictions bug (fixes https://github.com/bromite/bromite/issues/387)
-* fix crash in settings (fixes https://github.com/bromite/bromite/issues/388)
-
-# 78.0.3904.63
-* replace Beta DoH service URL for Google (https://developers.google.com/speed/public-dns/docs/doh/migration)
-* disable AImageReaderMediaPlayer until upstream bug is fixed (https://bugs.chromium.org/p/chromium/issues/detail?id=977583)
-* disabled face detection provider
-* removed non-working SystemWebView adblock patch (not working since v77)
-* bring back some privacy options which upstream moved to Sync settings (fixes https://github.com/bromite/bromite/issues/383)
-
-# 77.0.3865.104
-* revert upstream commit for search privacy options and related translations removal (fixes https://github.com/bromite/bromite/issues/375)
-* remove unused patch for enabling subresource filter on all sites
-
-# 77.0.3865.95
-
-# 77.0.3865.81
-* use native subresource filtering instead of Bromite engine
-* introduce Bromite AdBlockUpdate service
-* keep using Bromite engine for SystemWebView
-* enable subresource filter for all sites
-* disable subresource filter popup
-* enable IPv6 probing by default
-* drop DnsTransaction default security level patch
-* drop patch to visualize all type of extensions
-* drop patches for Network Service
-* enable CFI for all architectures except x86
-
-# 76.0.3809.129
-* disable CFI to fix x86 crashes (fixes https://github.com/bromite/bromite/issues/357)
-
-# 76.0.3809.115
-* disable search-ready omnibox by default
-* disable unified consent
-
-# 76.0.3809.100
-* use default feature flags for autofill (fixes https://github.com/bromite/bromite/issues/348)
-
-# 76.0.3809.91
-
-# 76.0.3809.85
-* add flag to toggle Network Service
-* disable Network Service by default
-* do not record UMA for network errors
-* use fixed User Agent and Android OS version
-* dropped patch for history requirement of user gesture
-
-# 75.0.3770.139
-* disable media router and remoting by default (fixes https://github.com/bromite/bromite/issues/281)
-* enable CFI in GN build flags
-
-# 75.0.3770.132
-
-# 75.0.3770.109
-* disable payment support by default
-* disable background sync by default
-* better patch from GrapheneOS/Vanadium for disabling sensors access (fixes https://github.com/bromite/bromite/issues/319)
-* use new patch for content settings sensors allow/block (fixes https://github.com/bromite/bromite/issues/319)
-* fix impossible values in Battery Status API (fixes https://github.com/bromite/bromite/issues/322)
-
-# 75.0.3770.86
-
-# 75.0.3770.82
-
-# 75.0.3770.70
-* enable changing default downloads storage location by default
-* enable download rename option by default
-* disable offline pages in the downloads home to be opened in CCT by default
-* increase minimum SDK from 17 to 19 (fixes https://github.com/bromite/bromite/issues/310)
-* prefs: disable SigninAllowed by default
-* prefs: always prompt for download directory by default
-* build: remove calling untrusted hooks
-
-# 75.0.3770.53
-* fix crash when downloading or from browser-initiated requests (fixes https://github.com/bromite/bromite/issues/309)
-
-# 75.0.3770.50
-* disable dynamic module loading
-* more fixes to allow building for SDK 17
-
-# 74.0.3729.162
-* remove recent tabs signin
-
-# 74.0.3729.154
-
-# 74.0.3729.141
-
-# 74.0.3729.122
-* remove more unnecessary permissions
-
-# 74.0.3729.106
-* remove account/sync menu entries (fixes https://github.com/bromite/bromite/issues/285)
-* fix failed debug builds
-
-# 74.0.3729.86
-* enable dark mode settings entry by default
-* fix permission request for Play services on reboot (fixes https://github.com/bromite/bromite/issues/281)
-
-# 74.0.3729.80
-* increase minimum SDK version to 17 (Jelly Bean 4.2)
-* dropped obsolete patch for hyperlink auditing disable
-
-# 73.0.3683.107
-* dropped patch to disable smooth scrolling
-* fixed custom tab intents issue (fixes https://github.com/bromite/bromite/issues/279)
-
-# 73.0.3683.105
-* removed Fanboy's Annoyance List and Peter Lowe's adservers list from filters
-
-# 73.0.3683.97 
-* dropped redundant patch to hide NTP tiles (use home page + about:blank)
-
-# 73.0.3683.88
-* add option to use home page as NTP
-
-# 73.0.3683.82
-* remove force home page button flag
-* enable site per process isolation for devices with memory > 1GB
-* use 64-bit processes for SystemWebView
-* disable local field trials seed (redundant)
-* fix patch for classic new tab page (redundant)
-
-# 73.0.3683.79
-* add missing Qwant engine from default engines list (fixes https://github.com/bromite/bromite/issues/262)
-* DoH: include upstream patch for DNS secure mode
-* DoH: enable DNS secure mode by default
-
-# 73.0.3683.70
-
-# 73.0.3683.61
-* drop patches with functionality now available from upstream (DuckDuckGo and Qwant search engines, TLS 1.3 final)
-* add only DuckDuckGo Lite search engine
-* provide image URL for Qwant
-* disable safe browsing subresource filter by default
-* fix PAC URL support in proxy configuration
-
-# 72.0.3626.120
-* add support for resource type in adblock engine (fixes https://github.com/bromite/bromite/issues/115)
-* adblock engine speed optimizations
-* use adblock engine also in SystemWebView
-* add back uBlock Origin and EasyList filters
-* added Fanboy's Annoyance List
-* remove AdGuard filters
-
-# 72.0.3626.119
-* use AdGuard filters
-* fixes for new tile rows usage
-* re-introduce patch to hide NTP tiles
-* disable NTP tile metrics collection
-
-# 72.0.3626.114
-* use 4 tile rows instead of 2 in the new tab page
-* do not grant geolocation permission to default search engine (fixes https://github.com/bromite/bromite/issues/250)
-
-# 72.0.3626.108
-
-# 72.0.3626.99
-
-# 72.0.3626.87
-* update bookmarks view after import
-
-# 72.0.3626.81
-* serve empty content for blocked scripts/images (fixes https://github.com/bromite/bromite/issues/238)
-* keep support of Jelly Bean (workaround for upstream https://bugs.chromium.org/p/chromium/issues/detail?id=923477)
-
-# 72.0.3626.73
-
-# 72.0.3626.68
-* do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
-* remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903)
-* AV1 codec support
-
-# 71.0.3578.132
-* add patches from AndroidHardening project (fixes https://github.com/bromite/bromite/issues/226)
-
-# 71.0.3578.123
-* disable jumbo builds (fixes https://github.com/bromite/bromite/issues/216 and https://github.com/bromite/bromite/issues/219)
-* disable preview fetching
-* do not consider Android Jelly Bean unsupported
-
-# 71.0.3578.120
-* fix breakage of translate quick answers by anti-AMP (fixes https://github.com/bromite/bromite/issues/210)
-
-# 71.0.3578.115
-* add AdGuard DNS-over-HTTPS option
-* use green icon for SystemWebView
-
-# 71.0.3578.110
-
-# 71.0.3578.104
-* fix AMP links sanitisation; have it working for news as well (fixes https://github.com/bromite/bromite/issues/202)
-* revert upstream patch responsible for the broken save dialog prompt (upstream: https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
-
-# 71.0.3578.101
-
-# 71.0.3578.98
-* do not ask permissions for camera when importing bookmarks (fixes https://github.com/bromite/bromite/issues/200)
-
-# 71.0.3578.88
-* add proxy configuration page (see https://github.com/bromite/bromite/wiki/ProxyConfiguration)
-* use more recent versions in User-Agent (fixes https://github.com/bromite/bromite/issues/156)
-
-# 71.0.3578.85
-* fix blurry adaptive icon (fixes https://github.com/bromite/bromite/issues/197)
-
-# 71.0.3578.76
-
-# 71.0.3578.72
-* add flag to disable IPv6 probes
-
-# 70.0.3538.107
-* added adaptive icon (fixes https://github.com/bromite/bromite/issues/181)
-* do not change randomisation at each call (fixes https://github.com/bromite/bromite/issues/177)
-* do not enable #enable-scroll-anchor-serialization by default
-
-# 70.0.3538.102
-* do not grant notifications to default search engine
-* remove all promos from bookmark manager page
-* re-introduced various patches to eradicate binary blob dependencies (only Cast left)
-* remove contacts picker permission
-
-# 70.0.3538.95
-* fix crash on bookmark edit activity (fixes https://github.com/bromite/bromite/issues/172)
-* fix slow chrome://flags (fixes https://github.com/bromite/bromite/issues/173)
-* enable TLS 1.3 final support by default (fixes https://github.com/bromite/bromite/issues/174)
-* dropped some patches related to GCM/GMS on suspicion of being related to random crashes
-
-# 70.0.3538.87
-* enable history requirement of user gesture (fixes https://github.com/bromite/bromite/issues/171)
-* enable serialization of scroll position changes while loading (fixes https://github.com/bromite/bromite/issues/171)
-* remove passwords keyboard accessory option (fixes https://github.com/bromite/bromite/issues/171)
-* some improvements to bookmark import/export interaction
-* add flag to disable orientation API, disabled by default
-* disable device motion API by default (fixes https://github.com/bromite/bromite/issues/171)
-
-# 70.0.3538.83
-* fix keep session cookies option showing on all site settings views
-* fix blank site settings entry showing (fixes https://github.com/bromite/bromite/issues/166)
-* offer builtin autocomplete for chrome://flags quick access
-
-# 70.0.3538.80
-* add flag to disable video resume functionality, allowing to not pause video playback on tab switch (fixes https://github.com/bromite/bromite/issues/108)
-* prevent "are you there" prompts from appearing when playing videos
-* completely disable update scheduler checks to fix a related crash
-
-# 70.0.3538.77
-* disable generic sensor APIs by default (fixes https://github.com/bromite/bromite/issues/160)
-* introduce flag to disable device motion API (fixes https://github.com/bromite/bromite/issues/160)
-* add Quad9 as a DNS-over-HTTPS (DoH) option (fixes https://github.com/bromite/bromite/issues/140)
-
-# 70.0.3538.71
-* fix bug with canvas fingerprinting (fixes https://github.com/bromite/bromite/issues/154)
-
-# 70.0.3538.67
-* re-enabled DNS-over-HTTPS (DoH) flag (fixes https://github.com/bromite/bromite/issues/139)
-* dropped GCM removal patch
-* disable kSigninAllowedOnNextStartup by default
-* permanently disable query-in-omnibox (fixes https://github.com/bromite/bromite/issues/143)
-
 # 69.0.3497.113
 * disabled DNS-over-HTTPS (DoH) flag, not working since 69.0.3497.73 (see https://github.com/bromite/bromite/issues/139)

--- a/FAQ.md
+++ b/FAQ.md
@ -1,95 +0,0 @@
-# Frequently Asked Questions
-
-## Does Google Sync/Translate/Data saver work?
-No.
-This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
-
-Additionally, these features would not be privacy-friendly.
-
-## Does Bromite require root?
-No.
-
-## Is Bromite de-googled?
-
-Yes, although this has not been verified (and hardly can be) under all situations; if you were to find connections to cloud-based services please report them via the issue tracker.
-Bromite uses [ungoogled-chromium's python script](https://github.com/Eloston/ungoogled-chromium/blob/master/utils/domain_substitution.py) to disable URLs in the codebase since version `78.0.3904.93`.
-
-Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset).
-
-## Does Bromite support DRM media?
-
-Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium).
-This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization
-To disable this functionality you should disable protected content playback from Site settings -> 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.
-
-See also [the wiki page](https://github.com/bromite/bromite/wiki/Installing-SystemWebView) for community-contributed installation instructions.
-
-Ad-blocking was present and always enabled in the SystemWebView from version `72.0.3626.120` till version `77.0.3865.104`, when it stopped working due to [upstream NetworkService changes](https://docs.google.com/document/d/1TZEuPvr2KAbP4_TZpuuwtEEArQsyAkc2HDu68l66YwU/edit?ts=598244df#heading=h.ougoi5i6508y).
-
-## How to enable DNS-over-HTTPS?
-
-See [this 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 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.
-
-## Is Bromite on F-Droid?
-It is not on the official F-Droid repository and there are no (more) plans to submit it.
-
-You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
-
-## Does Bromite support WebRTC?
-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.
-
-For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/).
-
-## Does Bromite support extensions?
-No; Bromite will support extensions only if upstream (Chromium) does, or similarly another project maintains the patch and functionality.
-
-## Why do push notifications not work on this website?
-
-The [Chromium Blink engine](https://www.chromium.org/blink) uses [GCM](https://en.wikipedia.org/wiki/Google_Cloud_Messaging) to deliver messages
-when websites use the [Push API](https://w3c.github.io/push-api/); this will not work in Bromite because cloud integrations are disabled (GCM in this case).
-
-[ServiceWorker notifications](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerRegistration/showNotification) do work instead since they use
-[android.app.Notification](https://developer.android.com/guide/topics/ui/notifiers/notifications).
-
-## Can PWAs be installed?
-
-PWAs are only supported as home shortcuts; WebAPKs will not work because they are generated server-side on googleapis.com (which is not allowed in Bromite).
-
-## 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.
--- a/README.md
+++ b/README.md
@ -1,24 +1,14 @@
-[![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>

-Bromite is a [Chromium](https://www.chromium.org/Home) fork with support for ad blocking and enhanced privacy.
+<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 only available for Android Marshmallow (v6.0, API level 23) and above.
+<img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />

-<img src="https://fdroid.bromite.org/fdroid/bromite_bromite_gh_downloads.svg" alt="Downloads on Github" title="Downloads on Github" />
+Bromite is [Chromium](https://www.chromium.org/Home) plus some patches for ad blocking and enhanced privacy.

-For the Frequently Asked Questions see [F.A.Q.](./FAQ.md).
+Bromite is only available for Android v4.1 and above.

-For documentation see the [wiki](https://github.com/bromite/bromite/wiki).
+<img src="https://www.bromite.org/bromite_bromite_gh_downloads.svg" alt="downloads on Github" title="downloads on Github" />

 # Goals

@ -29,161 +19,82 @@ 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
+Support development with a donation of 3 EUR: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)

-Patreon: https://www.patreon.com/csagan5
+Support development with a free amount donation: [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=LC7Q6A3UAQPY8)

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

-ETH donations address: `0x5d392F8FBf3465afe05B1Adc575e248D33B891F6`
+ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`
+
+# F.A.Q.
+
+## Does Google Sync/Translate/Data saver work?
+No.
+This is not a limitation of Bromite but of all Chromium-based projects in general, as general public is not allowed to use Google's APIs for free unless when using Chrome.
+
+Additionally, these features would not be privacy-friendly.
+
+## Does Bromite require root?
+No.
+
+## 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.
+
+## How to enable DNS-over-HTTPS?
+
+See [this wiki page](https://github.com/bromite/bromite/wiki/Enabling-DNS-over-HTTPS).
+
+## Can you add dark mode/some cool themes?
+No.
+Bromite is about privacy and adblocking.
+
+## Can you add HTTPS everywhere?
+No.
+We cannot add add-ons to Bromite (merely some features).
+
+## Is Bromite on Play Store?
+No, and this is unlikely to change. Many limitations apply for submissions there, including which ads are allowed to be blocked.
+
+Bromite favors user freedom in software choice: the device is yours so you get to choose which software to run on it, end of the story.
+
+## Is Bromite on F-Droid?
+It is not on the official F-Droid repository and there are no (more) plans to submit it.
+
+You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
+
+## Does Bromite support WebRTC?
+Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.

 # Features

-* customizable adblock filters via user-provided URL (see https://www.bromite.org/custom-filters)
-* automatically updated adblock filters
+* baked-in adblock engine with filters from EasyList, EasyPrivacy and others
 * remove click-tracking and AMP from search results
-* DNS-over-HTTPS support with any valid IETF DoH endpoint
+* DNS-over-HTTPS support via Google/CloudFlare servers
+* [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines
+* chrome flags to disable custom intents and clear session on exit
 * always-incognito mode
-* disable all field trials permanently
-* disable smart search by default, allow web search from incognito mode
-* 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
-* 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
+* completely removed safe browsing and other privacy-unfriendly features
 * 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
+* canvas, audio and other anti-fingerprinting mitigations

 ## 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
+* allow playing videos in background
 * all codecs included (proprietary, open H.264 etc.)
-* [AV1 codec support](https://github.com/bromite/bromite/wiki/AV1-support)
-* [dav1d](https://code.videolan.org/videolan/dav1d) decoder enabled by default
 * built with official speed optimizations
-* increase number of autocomplete matches from 5 to 10
-* allow changing default download storage location
-* do not ignore save prompt for users without SD cards
-* disable articles and increase number of icons on new tab page
-* 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).
-
-### Flags
-
-Flags which have been retired from upstream Chromium but are still available in Bromite.
-
-* `#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
-
-Bromite's privacy features, including anti-fingerprinting mitigations (which are not comprehensive), **are not to be considered useful for journalists and people living in countries with freedom limitations**, please look at [Tor Browser](https://www.torproject.org/download/) in such cases.
+You can inspect all functionality/privacy changes by reading the patches: https://github.com/bromite/bromite/tree/master/patches

 # Releases

-All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically highlight the one apt for your device (or none otherwise).
+All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise).

 Each tag corresponds to a Chromium Stable release tag.

-Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK version 23+; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK23+).
+Bromite is currently built for ARM, ARM64 and x86 and for the Android SDK versions 16 and 21; [Bromite SystemWebView](https://www.bromite.org/system_web_view) is provided as well (SDK21+).
 For every Bromite build you can always find a matching [vanilla Chromium](https://www.bromite.org/chromium) build which is used for example to verify which issues are specific to Bromite or not.

-You 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
@ -196,6 +107,8 @@ arm64_ChromePublic.apk: OK
 arm64_ChromeModernPublic.apk: OK
 ```

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

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

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

 The [Bromite main repository](https://github.com/bromite/bromite) contains tags for each corresponding Chromium release (see https://chromium.googlesource.com/chromium/src.git).

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

-The Chromium version tag used as base for the patches is available here: [RELEASE](./build/RELEASE); this is always corresponding to the git tag for every release.
-The GN args used to build Bromite are available here: [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
 * [Iridium project](https://github.com/iridium-browser) for some patches
 * [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) for some patches
-* [ungoogled-chromium-android](https://github.com/ungoogled-software/ungoogled-chromium-android) for some patches
-* [GrapheneOS](https://github.com/GrapheneOS) for some security patches
 * [Inox patchset](https://github.com/gcarq/inox-patchset) for some patches (via ungoogled-chromium)
-* [Brave Browser](https://github.com/brave/brave-core) for some patches
-* [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo
-
-# Filters credits
-* [EasyList](https://easylist.to/#easylist)
-* [EasyPrivacy](https://easylist.to/#easyprivacy)
-* [uBlock Origin](https://github.com/uBlockOrigin)
-* [Peter Lowe's Ad and tracking server list](https://pgl.yoyo.org/adservers/)
-
-The URLs of the lists used are available at: https://github.com/bromite/filters/blob/master/lists.txt
+* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
+* nochromo for the original adblock patch
+* [AdBlock Plus](https://adblockplus.org/), [uBlock Origin](https://github.com/uBlockOrigin), [Peter Lowe's adservers list](https://pgl.yoyo.org/adservers/), [EasyList and EasyPrivacy](https://easylist.to/) for the filters included

 # License

--- a/banner2-direct.svg
+++ b/banner2-direct.svg
@ -1,64 +0,0 @@
-<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>
--- a/build/LASTCHANGE
+++ b/build/LASTCHANGE
@ -1 +0,0 @@
-56775bdf8d12f9d3e1a99fcf1dde6a7417522963-
--- a/build/RELEASE
+++ b/build/RELEASE
@ -1 +0,0 @@
-108.0.5359.156
--- a/build/RELEASE_COMMIT
+++ b/build/RELEASE_COMMIT
@ -1 +0,0 @@
-1b133d62395a6ad11c65997a1c24acffb3f73d9e
--- a/build/bromite.gn_args
+++ b/build/bromite.gn_args
@ -1,48 +0,0 @@
-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=false
-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=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_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
--- a/build/bromite_patches_list.txt
+++ b/build/bromite_patches_list.txt
@ -1,204 +0,0 @@
-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
-disable-battery-status-updater.patch
-Battery-API-return-nothing.patch
-updater-disable-updater-pings.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
-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.patch
-ungoogled-chromium-Disable-intranet-detector.patch
-ungoogled-chromium-no-special-hosts-domains.patch
-ungoogled-chromium-Disable-Gaia.patch
-ungoogled-chromium-Disable-Network-Time-Tracker.patch
-Disable-all-promo-dialogs.patch
-Disable-update-scheduler.patch
-Add-English-only-search-engine.patch
-Add-DuckDuckGo-Lite-search-engine.patch
-openH264-enable-ARM-ARM64-optimizations.patch
-build-remove-calling-untrusted-hooks.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
-Add-exit-menu-item.patch
-Remove-help-menu-item.patch
-AudioBuffer-AnalyserNode-fp-mitigations.patch
-Multiple-fingerprinting-mitigations.patch
-Add-flag-to-configure-maximum-connections-per-host.patch
-Do-not-ignore-download-location-prompt-setting.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-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
-Restore-Search-Ready-Omnibox-flag.patch
-disable-AdsBlockedInfoBar.patch
-Bromite-subresource-adblocker.patch
-Bromite-auto-updater.patch
-Replace-DoH-probe-domain-with-RIPE-domain.patch
-Increase-number-of-autocomplete-matches-to-10.patch
-Disable-requests-for-single-word-Omnibar-searches.patch
-Disable-some-signed-exchange-features.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-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
-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
--- a/build/chromium.gn_args
+++ b/build/chromium.gn_args
@ -1,48 +0,0 @@
-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
--- a/build/chromium_patches_list.txt
+++ b/build/chromium_patches_list.txt
@ -1,10 +0,0 @@
-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
-enable-ftrivial-auto-var-init-zero.patch
-Disable-feeds-support-by-default.patch
-Chromium-package-name.patch
--- a/build/patches/AImageReader-CFI-crash-mitigations.patch
+++ b/build/patches/AImageReader-CFI-crash-mitigations.patch
@ -1,258 +0,0 @@
-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
-@@ -2501,9 +2501,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
-@@ -750,6 +750,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
-@@ -232,6 +232,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
--- a/build/patches/Add-AllowUserCertificates-flag.patch
+++ b/build/patches/Add-AllowUserCertificates-flag.patch
@ -1,180 +0,0 @@
-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 +
- .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +
- .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++
- net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++
- 10 files changed, 31 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;
-@@ -951,6 +952,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
-@@ -78,6 +78,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
-@@ -8830,6 +8830,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
-@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &feed::kFeedNoViewCache,
-     &feed::kFeedReplaceAll,
-     &feed::kInterestFeedContentSuggestions,
-+    &kAllowUserCertificates,
-     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
-     &feed::kInterestFeedV2,
-     &feed::kInterestFeedV2Autoplay,
-@@ -468,6 +469,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/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -50,6 +50,7 @@ public class CachedFeatureFlags {
-             ImmutableMap.<String, Boolean>builder()
-                     .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true)
-                     .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)
-+                    .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)
-                     .put(ChromeFeatureList.BACK_GESTURE_REFACTOR, false)
-                     .put(ChromeFeatureList.CCT_BRAND_TRANSPARENCY, false)
-                     .put(ChromeFeatureList.CCT_INCOGNITO, true)
-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
-@@ -193,6 +193,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 =
-@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList {
-     public static final String FEED_REPLACE_ALL = "FeedReplaceAll";
- 
-     /* 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
--- a/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch
+++ b/build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch
@ -1,23 +0,0 @@
-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
--- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
+++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch
@ -1,954 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 11:06:18 +0200
-Subject: Add DuckDuckGo Lite search engine
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../search_engines/prepopulated_engines.json  |  10 +
- .../search_engines/search_engine_type.h       |   1 +
- .../template_url_prepopulate_data.cc          | 202 +++++++++---------
- 3 files changed, 112 insertions(+), 101 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
-@@ -102,6 +102,16 @@
-       "id": 92
-     },
- 
-+    "duckduckgo_light": {
-+      "name": "DuckDuckGo Light",
-+      "keyword": "duckduckgo.com/lite",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
-+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
-+      "id": 12
-+    },
-+
-     "ecosia": {
-       "name": "Ecosia",
-       "keyword": "ecosia.org",
-diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
--- a/components/search_engines/search_engine_type.h
-+++ b/components/search_engines/search_engine_type.h
-@@ -79,6 +79,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_STARTER_PACK_HISTORY = 62,
-   SEARCH_ENGINE_STARTER_PACK_TABS = 63,
-   SEARCH_ENGINE_GOOGLE_EN = 64,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 65,
- 
-   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
- };
-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
-@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_AE[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -51,7 +51,7 @@ const PrepopulatedEngine* const engines_AL[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_ar,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -68,7 +68,7 @@ const PrepopulatedEngine* const engines_AR[] = {
- const PrepopulatedEngine* const engines_AT[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo_at,
-     &ecosia,
- };
-@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AU[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_au,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_BA[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = {
-     &bing,
-     &yahoo,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Bulgaria
-@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BI[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BN[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_br,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -160,7 +160,7 @@ const PrepopulatedEngine* const engines_BY[] = {
-     &yandex_by,
-     &mail_ru,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Belize
-@@ -168,7 +168,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CA[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_ca,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -185,7 +185,7 @@ const PrepopulatedEngine* const engines_CA[] = {
- const PrepopulatedEngine* const engines_CH[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
-     &yahoo_ch,
- };
-@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CL[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_cl,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CO[] = {
-     &bing,
-     &yahoo_co,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Costa Rica
-@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -232,7 +232,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
-     &seznam_cz,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Germany
-@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_DE[] = {
-     &googleen, &google,
-     &bing,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo_de,
- };
- 
-@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DK[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_dk,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -268,7 +268,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
-     &bing,
-     &yahoo_fr,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Ecuador
-@@ -277,7 +277,7 @@ const PrepopulatedEngine* const engines_EC[] = {
-     &bing,
-     &yahoo,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Estonia
-@@ -285,7 +285,7 @@ const PrepopulatedEngine* const engines_EE[] = {
-     &googleen, &google,
-     &bing,
-     &yandex_ru,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
- };
- 
-@@ -295,7 +295,7 @@ const PrepopulatedEngine* const engines_EG[] = {
-     &bing,
-     &yahoo,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Spain
-@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_ES[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_FI[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_fi,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -321,7 +321,7 @@ const PrepopulatedEngine* const engines_FO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_dk,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_GB[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_uk,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GT[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -367,7 +367,7 @@ const PrepopulatedEngine* const engines_HK[] = {
-     &yahoo_hk,
-     &bing,
-     &baidu,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Honduras
-@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HN[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -384,7 +384,7 @@ const PrepopulatedEngine* const engines_HR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HU[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_ID[] = {
-     &yahoo_id,
-     &bing,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Ireland
-@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IE[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_uk,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IL[] = {
-     &bing,
-     &yandex_ru,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // India
-@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IN[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_in,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &info_com,
- };
- 
-@@ -439,7 +439,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
-     &bing,
-     &yahoo,
-     &yandex_tr,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Iran
-@@ -448,14 +448,14 @@ const PrepopulatedEngine* const engines_IR[] = {
-     &bing,
-     &yahoo,
-     &ask,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Iceland
- const PrepopulatedEngine* const engines_IS[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
-     &ecosia,
- };
-@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IT[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_JM[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_JO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JP[] = {
-     &googleen, &google,
-     &yahoo_jp,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &baidu,
- };
- 
-@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_KE[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_KW[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -529,7 +529,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
-     &yandex_kz,
-     &mail_ru,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Lebanon
-@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_LB[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -545,7 +545,7 @@ const PrepopulatedEngine* const engines_LB[] = {
- const PrepopulatedEngine* const engines_LI[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
-     &ecosia,
- };
-@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LT[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_LT[] = {
- const PrepopulatedEngine* const engines_LU[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
-     &ecosia,
- };
-@@ -574,7 +574,7 @@ const PrepopulatedEngine* const engines_LV[] = {
-     &bing,
-     &yandex_ru,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Libya
-@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_LY[] = {
-     &bing,
-     &yahoo,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Morocco
-@@ -592,14 +592,14 @@ const PrepopulatedEngine* const engines_MA[] = {
-     &bing,
-     &yahoo_fr,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Monaco
- const PrepopulatedEngine* const engines_MC[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo_fr,
-     &ecosia,
- };
-@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_ME[] = {
-     &bing,
-     &yahoo,
-     &yandex_ru,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Macedonia
-@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_MK[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MX[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_mx,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MY[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_my,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_NI[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -663,7 +663,7 @@ const PrepopulatedEngine* const engines_NL[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_nl,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_NO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -681,7 +681,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_nz,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_OM[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &petal_search,
- };
- 
-@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_PA[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PE[] = {
-     &bing,
-     &yahoo_pe,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Philippines
-@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PH[] = {
-     &bing,
-     &yahoo,
-     &ecosia,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Pakistan
-@@ -726,7 +726,7 @@ const PrepopulatedEngine* const engines_PK[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -735,7 +735,7 @@ const PrepopulatedEngine* const engines_PL[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_PR[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -753,7 +753,7 @@ const PrepopulatedEngine* const engines_PT[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_PY[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_QA[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_tr,
- };
- 
-@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_RO[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_tr,
- };
- 
-@@ -789,7 +789,7 @@ const PrepopulatedEngine* const engines_RS[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_ru,
- };
- 
-@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RU[] = {
-     &yandex_ru,
-     &mail_ru,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Rwanda
-@@ -807,7 +807,7 @@ const PrepopulatedEngine* const engines_RW[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_SA[] = {
-     &bing,
-     &yahoo,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Sweden
-@@ -825,7 +825,7 @@ const PrepopulatedEngine* const engines_SE[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_se,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_SG[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_sg,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &baidu,
- };
- 
-@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_SG[] = {
- const PrepopulatedEngine* const engines_SI[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
-     &yandex_com,
- };
-@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_SI[] = {
- const PrepopulatedEngine* const engines_SK[] = {
-     &googleen, &google,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
-     &yandex_com,
- };
-@@ -861,7 +861,7 @@ const PrepopulatedEngine* const engines_SV[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SY[] = {
-     &bing,
-     &yahoo,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Thailand
-@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_TN[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_fr,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yandex_com,
- };
- 
-@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TR[] = {
-     &yandex_tr,
-     &yahoo_tr,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Trinidad and Tobago
-@@ -906,7 +906,7 @@ const PrepopulatedEngine* const engines_TT[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -916,7 +916,7 @@ const PrepopulatedEngine* const engines_TW[] = {
-     &yahoo_tw,
-     &bing,
-     &baidu,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // Tanzania
-@@ -924,7 +924,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &baidu,
- };
- 
-@@ -933,7 +933,7 @@ const PrepopulatedEngine* const engines_UA[] = {
-     &googleen, &google,
-     &yandex_ua,
-     &bing,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &yahoo,
- };
- 
-@@ -942,7 +942,7 @@ const PrepopulatedEngine* const engines_US[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -951,7 +951,7 @@ const PrepopulatedEngine* const engines_UY[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -960,7 +960,7 @@ const PrepopulatedEngine* const engines_VE[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo_es,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -979,7 +979,7 @@ const PrepopulatedEngine* const engines_YE[] = {
-     &bing,
-     &yahoo,
-     &yandex_com,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
- };
- 
- // South Africa
-@@ -987,7 +987,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
-@@ -996,7 +996,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
-     &googleen, &google,
-     &bing,
-     &yahoo,
-    &duckduckgo,
-+    &duckduckgo, &duckduckgo_light,
-     &ecosia,
- };
- 
--
-2.25.1
--- a/build/patches/Add-English-only-search-engine.patch
+++ b/build/patches/Add-English-only-search-engine.patch
--- a/build/patches/Add-IsCleartextPermitted-flag.patch
+++ b/build/patches/Add-IsCleartextPermitted-flag.patch
@ -1,98 +0,0 @@
-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
-@@ -9070,6 +9070,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
-@@ -1710,6 +1710,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
-@@ -960,6 +960,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
--- a/build/patches/Add-a-proxy-configuration-page.patch
+++ b/build/patches/Add-a-proxy-configuration-page.patch
--- a/build/patches/Add-an-always-incognito-mode.patch
+++ b/build/patches/Add-an-always-incognito-mode.patch
--- a/build/patches/Add-bookmark-import-export-actions.patch
+++ b/build/patches/Add-bookmark-import-export-actions.patch
--- a/build/patches/Add-custom-tab-intents-privacy-option.patch
+++ b/build/patches/Add-custom-tab-intents-privacy-option.patch
@ -1,222 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 29 Aug 2018 11:03:44 +0200
-Subject: Add custom tab intents privacy option
-
-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/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
-@@ -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.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="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
-@@ -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.tab.TabLaunchType;
- import org.chromium.chrome.browser.translate.TranslateIntentHandler;
- import org.chromium.chrome.browser.util.AndroidTaskUtils;
- import org.chromium.chrome.browser.vr.VrModuleProvider;
-@@ -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))
-+            return false;
-         if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
-                 || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
-             return false;
-@@ -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());
-@@ -433,6 +443,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;
- 
-+    private ChromeSwitchPreference allowCustomTabIntentsPref;
-+    private ChromeSwitchPreference openExternalLinksPref;
-+
-     @Override
-     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         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_OPEN_EXTERNAL_LINKS_INCOGNITO.equals(key)) {
-+            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
-+            sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
-+            sharedPreferencesEditor.apply();
-         }
-         return true;
-     }
-@@ -173,6 +187,16 @@ public class PrivacySettings
-             canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
-         }
- 
-+        allowCustomTabIntentsPref =
-+                (ChromeSwitchPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
-+        allowCustomTabIntentsPref.setOnPreferenceChangeListener(this);
-+        allowCustomTabIntentsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-+
-+        openExternalLinksPref =
-+                (ChromeSwitchPreference) findPreference(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO);
-+        openExternalLinksPref.setOnPreferenceChangeListener(this);
-+        openExternalLinksPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-+
-         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
-         if (doNotTrackPref != null) {
-             doNotTrackPref.setSummary(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
-@@ -4788,6 +4788,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>
-+      <!-- Allow custom tab intents -->
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_TITLE" desc="Text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow custom tab intents
-+      </message>
-+      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
-+        Allow applications to open custom tab intents, similar to webview.
-+      </message>
-+
-+      <!-- 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 -->
-       <!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
--
-2.25.1
--- a/build/patches/Add-exit-menu-item.patch
+++ b/build/patches/Add-exit-menu-item.patch
@ -1,133 +0,0 @@
-From: Serg <serg.zhukovsky@gmail.com>
-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                  | 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 +++
- 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
-@@ -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:icon="@drawable/ic_exit_to_app_white_24dp" />
-     </group>
- 
-     <!-- Items shown only in the tab switcher -->
-@@ -190,6 +193,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
-@@ -224,6 +224,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.
-@@ -2188,6 +2190,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.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;
-@@ -2292,6 +2293,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
-@@ -82,7 +82,11 @@ class ChromeLifetimeController implements ApplicationLifetime.Observer,
- 
-         // Kick off a timer to kill the process after a delay, which fires only if the Activities
-         // take too long to be finished.
-        mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
-+        if (restart) {
-+            mHandler.postDelayed(mRestartRunnable, WATCHDOG_DELAY_MS);
-+        } else {
-+            fireBrowserRestartActivityIntent();
-+        }
-     }
- 
-     @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
-@@ -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_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.25.1
--- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
+++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch
@ -1,140 +0,0 @@
-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
-@@ -525,6 +525,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[] = {
-@@ -4371,7 +4387,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"
-@@ -338,6 +340,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"
-@@ -677,6 +678,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
--- a/build/patches/Add-flag-for-save-data-header.patch
+++ b/build/patches/Add-flag-for-save-data-header.patch
@ -1,112 +0,0 @@
-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
-@@ -4981,7 +4981,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
-@@ -1261,6 +1261,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
-@@ -662,6 +662,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
--- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch
+++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch
@ -1,76 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 25 Oct 2018 23:13:34 +0200
-Subject: Add flag to control video playback resume feature
-
-Disable it by default on Android as it is everywhere else
-
-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        | 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
-@@ -3661,6 +3661,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)},
-     {"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
-@@ -1363,6 +1363,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[] =
-+    "Resume background video playback when tab re-gains focus; additionally, "
-+    "it will pause video playback every single time you switch tabs.";
-+
- const char kEnablePixelCanvasRecordingName[] = "Enable pixel canvas recording";
- const char kEnablePixelCanvasRecordingDescription[] =
-     "Pixel canvas recording allows the compositor to raster contents aligned "
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -744,6 +744,9 @@ extern const char kEnablePortalsDescription[];
- extern const char kEnablePortalsCrossOriginName[];
- extern const char kEnablePortalsCrossOriginDescription[];
- 
-+extern const char kResumeBackgroundVideoName[];
-+extern const char kResumeBackgroundVideoDescription[];
-+
- extern const char kEnablePixelCanvasRecordingName[];
- extern const char kEnablePixelCanvasRecordingDescription[];
- 
-diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc
-+++ b/media/base/media_switches.cc
-@@ -302,12 +302,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad,
- // Let videos be resumed via remote controls (for example, the notification)
- // when in background.
- BASE_FEATURE(kResumeBackgroundVideo,
-             "resume-background-video",
-#if BUILDFLAG(IS_ANDROID)
-             base::FEATURE_ENABLED_BY_DEFAULT
-#else
-             base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-+             "resume-background-video",           // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT    // in Bromite
- );
- 
- // When enabled, MediaCapabilities will check with GPU Video Accelerator
--
-2.25.1
--- a/build/patches/Add-flag-to-disable-IPv6-probes.patch
+++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch
@ -1,155 +0,0 @@
-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                            | 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                  | 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
-@@ -6036,6 +6036,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)},
- #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
-@@ -3578,6 +3578,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
-     "Enables sending real-time engagement signals (e.g. scroll) through "
-     "CustomTabsCallback.";
- 
-+const char kIPv6ProbingName[] = "Enable IPv6 probing.";
-+const char kIPv6ProbingDescription[] =
-+    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
-+
- 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
-@@ -807,6 +807,9 @@ extern const char kEnableWasmLazyCompilationName[];
- extern const char kEnableWasmLazyCompilationDescription[];
- 
- extern const char kEnableWasmTieringName[];
-+extern const char kIPv6ProbingName[];
-+extern const char kIPv6ProbingDescription[];
-+
- extern const char kEnableWasmTieringDescription[];
- 
- extern const char kEvDetailsInPageInfoName[];
-diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresource_filter/tools/BUILD.gn
--- a/components/subresource_filter/tools/BUILD.gn
-+++ b/components/subresource_filter/tools/BUILD.gn
-@@ -50,6 +50,8 @@ if (!is_ios) {
-     deps = [
-       ":tools_lib",
-       "//base",
-+      "//components/network_session_configurator/common",
-+      "//services/network/public/cpp"
-     ]
-   }
- 
-@@ -61,6 +63,8 @@ if (!is_ios) {
-       ":tools_lib",
-       "../core/common",
-       "//base",
-+      "//components/network_session_configurator/common",
-+      "//services/network/public/cpp",
-     ]
-   }
- 
-@@ -70,6 +74,8 @@ if (!is_ios) {
-       "ruleset_converter:support",
-       "//base",
-       "//third_party/protobuf:protobuf_lite",
-+      "//components/network_session_configurator/common",
-+      "//services/network/public/cpp"
-     ]
-   }
- 
-diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
--- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
-+++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
-@@ -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) {
-     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
-@@ -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"
-@@ -3727,8 +3728,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)) {
-+      // pretend IPv6 connectivy probe is successful when probing is disabled
-+      SetLastIPv6ProbeResult(true);
-+    } else {
-+      SetLastIPv6ProbeResult(
-         IsGloballyReachable(IPAddress(kIPv6ProbeAddress), net_log));
-+    }
-     cached = false;
-   }
-   net_log.AddEvent(
-diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
--- a/services/network/public/cpp/features.cc
-+++ b/services/network/public/cpp/features.cc
-@@ -38,6 +38,11 @@ BASE_FEATURE(kThrottleDelayable,
-              "ThrottleDelayable",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
-+// Enable IPv6 ping probes to RIPE DNS.
-+BASE_FEATURE(kIPv6Probing,
-+             "IPv6Probing",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
- // When kPriorityRequestsDelayableOnSlowConnections is enabled, HTTP
- // requests fetched from a SPDY/QUIC/H2 proxies can be delayed by the
- // ResourceScheduler just as HTTP/1.1 resources are. However, requests from such
-diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
--- a/services/network/public/cpp/features.h
-+++ b/services/network/public/cpp/features.h
-@@ -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)
- BASE_DECLARE_FEATURE(kDelayRequestsOnMultiplexedConnections);
- COMPONENT_EXPORT(NETWORK_CPP)
--
-2.25.1
--- a/build/patches/Add-flag-to-disable-external-intent-requests.patch
+++ b/build/patches/Add-flag-to-disable-external-intent-requests.patch
@ -1,58 +0,0 @@
-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
-@@ -3621,6 +3621,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
-@@ -3966,6 +3966,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
-@@ -2274,6 +2274,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
--- a/build/patches/Add-flag-to-disable-vibration.patch
+++ b/build/patches/Add-flag-to-disable-vibration.patch
@ -1,156 +0,0 @@
-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
-@@ -7467,6 +7467,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
-@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
- 
- #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
-@@ -3938,6 +3938,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
-@@ -101,6 +101,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
-@@ -130,6 +130,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
-@@ -1827,6 +1827,10 @@
-       name: "OrientationEvent",
-       status: {"Android": "stable"},
-     },
-+    {
-+      name: "Vibration",
-+      status: "stable",
-+    },
-     {
-       name: "OriginIsolationHeader",
-       status: "stable",
--
-2.25.1
--- a/build/patches/Add-lifetime-options-for-permissions.patch
+++ b/build/patches/Add-lifetime-options-for-permissions.patch
--- a/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+++ b/build/patches/Add-menu-item-to-bookmark-all-tabs.patch
@ -1,699 +0,0 @@
-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;
-@@ -2203,6 +2204,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(),
-@@ -2255,6 +2258,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;
-@@ -86,6 +91,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;
-@@ -393,6 +400,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.
-      */
-@@ -1030,6 +1047,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.
-@@ -1327,6 +1387,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
-@@ -437,6 +437,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());
-@@ -484,6 +489,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(),
-   };
-@@ -536,6 +542,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
-@@ -121,6 +121,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
-@@ -3606,6 +3606,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
-       <message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]">
-         Track prices
-       </message>
-+      <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item to bookmark all tabs. [CHAR-LIMIT=27]">
-+        Bookmark all tabs
-+      </message>
-       <message name="IDS_MENU_GET_IMAGE_DESCRIPTIONS" desc="Menu item to start getting alt text accessibility image labels/descriptions [CHAR_LIMIT=27]">
-         Get image descriptions
-       </message>
-diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_strings.grdp
--- a/components/bookmark_bar_strings.grdp
-+++ b/components/bookmark_bar_strings.grdp
-@@ -20,6 +20,9 @@
-     <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="Name shown in the tree for the mobile bookmarks folder">
-       Mobile bookmarks
-     </message>
-+    <message name="IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME" desc="Name shown in the tree for the tabs collection bookmarks folder">
-+      Tabs collection
-+    </message>
-     <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder">
-       Other bookmarks
-     </message>
-@@ -34,6 +37,9 @@
-     <message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the mobile bookmarks folder">
-       Mobile Bookmarks
-     </message>
-+    <message name="IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME" desc="Name shown in the tree for the tabs collection bookmarks folder">
-+      Tabs Collection
-+    </message>
-     <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder">
-       Other Bookmarks
-     </message>
-diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
--- a/components/bookmarks/browser/bookmark_codec.cc
-+++ b/components/bookmarks/browser/bookmark_codec.cc
-@@ -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_); }
-@@ -110,6 +111,7 @@ class BookmarkLoadDetails {
-   raw_ptr<BookmarkPermanentNode> bb_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> other_folder_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> mobile_folder_node_ = nullptr;
-+  BookmarkPermanentNode* tabs_collection_folder_node_ = nullptr;
-   LoadManagedNodeCallback load_managed_node_callback_;
-   std::unique_ptr<TitledUrlIndex> index_;
-   BookmarkNode::MetaInfoMap model_meta_info_map_;
-diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
--- a/components/bookmarks/browser/bookmark_model.cc
-+++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -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_;
-@@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider,
-   raw_ptr<BookmarkPermanentNode> bookmark_bar_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> other_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> 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
--- a/build/patches/Add-menu-item-to-view-source.patch
+++ b/build/patches/Add-menu-item-to-view-source.patch
@ -1,130 +0,0 @@
-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
-@@ -2229,6 +2229,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
-@@ -2445,6 +2445,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
-@@ -543,6 +543,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);
- 
-@@ -1242,6 +1243,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
--- a/build/patches/Add-option-to-force-tablet-UI.patch
+++ b/build/patches/Add-option-to-force-tablet-UI.patch
@ -1,252 +0,0 @@
-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
-@@ -430,6 +430,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
-@@ -671,7 +671,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_
-   }
-@@ -950,7 +950,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;
-@@ -105,6 +107,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);
-@@ -153,6 +161,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
-@@ -374,6 +374,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
--- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
@ -1,122 +0,0 @@
-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
---
- .../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/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
-@@ -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: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
-@@ -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());
- 
-+            String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
-             boolean noRestoreState =
-                    CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE);
-+                CommandLine.getInstance().hasSwitch(ChromeSwitches.NO_RESTORE_STATE) ||
-+                ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
-             if (noRestoreState) {
-                 // Clear the state files because they are inconsistent and useless from now on.
-                 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.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.chrome.R;
- import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -67,6 +70,8 @@ public class PrivacySettings
-             SharedPreferencesManager.getInstance();
-     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
- 
-+    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()));
-         }
- 
-+        ChromeSwitchPreference closeTabsOnExitPref =
-+                (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
-+        closeTabsOnExitPref.setOnPreferenceChangeListener(this);
-+        closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
-+
-         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
-@@ -4420,6 +4420,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>
-+      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
-+        Close all open tabs on exit
-+      </message>
-+      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
-+        Don't persist tabs between browsing sessions
-+      </message>
-       <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.25.1
--- a/build/patches/Add-option-to-use-home-page-as-NTP.patch
+++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch
@ -1,207 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 20 Nov 2021 15:36:54 +0000
-Subject: Add option to use home page as NTP
-
-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 +++++
- .../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
-@@ -14,6 +14,11 @@ found in the LICENSE file.
-         android:summaryOn="@string/text_on"
-         android:summaryOff="@string/text_off" />
- 
-+    <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.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();
-     }
- 
-+    /**
-+     * Returns the user preference for whether the New Tab Page is the homepage or not.
-+     *
-+     */
-+    public boolean getPrefNTPIsHomepageEnabled() {
-+        return mSharedPreferencesManager.readBoolean(ChromePreferenceKeys.HOMEPAGE_NTP_IS_HOMEPAGE, false);
-+    }
-+
-+    /**
-+     * Sets the user preference for whether the new tab page is the homepage or not.
-+     */
-+    public void setPrefNTPIsHomepageEnabled(boolean 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/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_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}
-@@ -72,6 +75,15 @@ public class HomepageSettings extends PreferenceFragmentCompat {
-         });
-         mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
- 
-+        ChromeSwitchPreference mNTPIsHomepageSwitch =
-+                (ChromeSwitchPreference) findPreference(PREF_NTP_HOMEPAGE_SWITCH);
-+        boolean isHomepageNTPEnabled = mHomepageManager.getPrefNTPIsHomepageEnabled();
-+        mNTPIsHomepageSwitch.setChecked(isHomepageNTPEnabled);
-+        mNTPIsHomepageSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
-+            mHomepageManager.setPrefNTPIsHomepageEnabled((boolean) newValue);
-+            return true;
-+        });
-+
-         RecordUserAction.record("Settings.Homepage.Opened");
-     }
- 
-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;
-@@ -297,6 +298,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
-@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys {
-     public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
-             "Chrome.Homepage.PartnerCustomizedDefaultGurl";
- 
-+    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
-@@ -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>
-+      <message name="IDS_OPTIONS_NTP_IS_HOMEPAGE_LABEL" desc="The label for switch that allows the user to toggle whether opening a new tab leads to the new tab page or the home page.">
-+        Use for new tabs
-+      </message>
-       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_24_HOURS" desc="The option to delete browsing data from the last 24 hours.">
-         Last 24 hours
-       </message>
-diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
--- a/chrome/browser/ui/browser_ui_prefs.cc
-+++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -65,6 +65,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
-   registry->RegisterBooleanPref(prefs::kShowHomeButton, false,
-                                 GetHomeButtonAndHomePageIsNewTabPageFlags());
-+  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
-+                                GetHomeButtonAndHomePageIsNewTabPageFlags());
- 
-   registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
-   bool reset_check_default = false;
-diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
-+++ b/chrome/common/pref_names.cc
-@@ -60,6 +60,10 @@ const char kForceEphemeralProfiles[] = "profile.ephemeral_mode";
- // A boolean specifying whether the New Tab page is the home page or not.
- const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
- 
-+// A boolean specifying whether opening a new tab should open the Home page
-+// instead of the New Tab page.
-+const char kNewTabPageIsHomePage[] = "newtabpage_is_homepage";
-+
- // This is the URL of the page to load when opening new tabs.
- const char kHomePage[] = "homepage";
- 
-diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
-+++ b/chrome/common/pref_names.h
-@@ -388,6 +388,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[];
- extern const char kForceGoogleSafeSearch[];
--
-2.25.1
--- a/build/patches/Add-site-engagement-flag.patch
+++ b/build/patches/Add-site-engagement-flag.patch
@ -1,186 +0,0 @@
-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
-@@ -142,6 +142,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"
-@@ -9174,6 +9175,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
-@@ -3461,6 +3461,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
-@@ -1975,6 +1975,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
--- a/build/patches/Add-support-for-ISupportHelpAndFeedback.patch
+++ b/build/patches/Add-support-for-ISupportHelpAndFeedback.patch
@ -1,53 +0,0 @@
-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;
-@@ -329,9 +330,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
--- a/build/patches/Add-support-for-writing-URIs.patch
+++ b/build/patches/Add-support-for-writing-URIs.patch
@ -1,100 +0,0 @@
-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
--- a/build/patches/Add-webGL-site-setting.patch
+++ b/build/patches/Add-webGL-site-setting.patch
@ -1,505 +0,0 @@
-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
-@@ -669,6 +669,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
-@@ -206,7 +206,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(
-@@ -218,6 +219,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
-@@ -65,6 +65,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
-@@ -96,6 +96,7 @@ class SecurityOrigin;
- class ScriptState;
- class ScriptWrappable;
- class TrustedTypePolicyFactory;
-+class WebContentSettingsClient;
- 
- enum ReasonForCallingCanExecuteScripts {
-   kAboutToExecuteScript,
-@@ -104,6 +105,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('.');
-@@ -578,6 +566,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
--- a/build/patches/Add-webRTC-site-settings.patch
+++ b/build/patches/Add-webRTC-site-settings.patch
@ -1,401 +0,0 @@
-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
-@@ -683,6 +683,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
-@@ -207,7 +207,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(
-@@ -220,6 +221,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"
-@@ -765,6 +766,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
--- a/build/patches/Allow-building-without-enable_reporting.patch
+++ b/build/patches/Allow-building-without-enable_reporting.patch
@ -1,440 +0,0 @@
-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
-@@ -12373,12 +12373,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
-@@ -127,6 +127,7 @@ bool ShouldDowngradeReport(const char* result_string,
- void ReportResult(int frame_tree_node_id,
-                   network::mojom::SignedExchangeReportPtr report,
-                   const net::NetworkAnonymizationKey& network_isolation_key) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-   FrameTreeNode* frame_tree_node =
-       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
-   if (!frame_tree_node)
-@@ -141,6 +142,7 @@ void ReportResult(int frame_tree_node_id,
-   DCHECK(partition);
-   partition->GetNetworkContext()->QueueSignedExchangeReport(
-       std::move(report), network_isolation_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
-@@ -461,10 +461,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
-@@ -1120,7 +1120,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
-@@ -1064,6 +1064,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,
-@@ -1077,6 +1078,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"
-@@ -2307,9 +2308,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"
-@@ -593,9 +593,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
--- a/build/patches/Allow-building-without-supervised-users.patch
+++ b/build/patches/Allow-building-without-supervised-users.patch
@ -1,53 +0,0 @@
-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
--- a/build/patches/Allow-playing-audio-in-background.patch
+++ b/build/patches/Allow-playing-audio-in-background.patch
@ -1,54 +0,0 @@
-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
---
- .../renderer/platform/media/web_media_player_impl.cc | 12 +++++++++++-
- .../renderer/platform/media/web_media_player_impl.h  |  3 +++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-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
-@@ -1226,6 +1226,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
-   return pipeline_metadata_.has_audio;
- }
- 
-+bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
-+  DCHECK(main_task_runner_->BelongsToCurrentThread());
-+
-+  return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
-+}
-+
- void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
-   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3627,7 +3633,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
-   // Audio only stream is allowed to play when in background.
-   // TODO: We should check IsBackgroundOptimizationCandidate here. But we need
-   // to move the logic of checking video frames out of that function.
-  if (!HasVideo())
-+
-+  //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
-+  //see media/base/pipeline_metadata.h. This is a workaround to allow audio
-+  //streams be played in background.
-+  if (!HasVideoNonEmptySize())
-     return false;
- 
-   if (using_media_player_renderer_ &&
-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
-@@ -195,6 +195,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 WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
-   void SelectedVideoTrackChanged(
--
-2.25.1
--- a/build/patches/Always-use-new-tab-page-for-default-home-page.patch
+++ b/build/patches/Always-use-new-tab-page-for-default-home-page.patch
@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-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.
-
-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.
-      */
-     public static String getDefaultHomepageUri() {
-        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
-            return PartnerBrowserCustomizations.getInstance().getHomePageUrl().getSpec();
-        }
-
-         String homepagePartnerDefaultUri;
-         String homepagePartnerDefaultGurlSerialized =
-                 SharedPreferencesManager.getInstance().readString(
--
-2.25.1
--- a/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
+++ b/build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch
@ -1,63 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 25 Mar 2018 21:49:37 +0200
-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      | 6 ------
- .../blink/renderer/modules/webaudio/audio_context.cc      | 4 +++-
- 3 files changed, 7 insertions(+), 11 deletions(-)
-
-diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
--- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-+++ b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
-@@ -40,10 +40,10 @@
- 
-     // Copies the current frequency data into the passed array.
-     // If the array has fewer elements than the frequencyBinCount, the excess elements will be dropped.
-    [HighEntropy, Measure] void getFloatFrequencyData(Float32Array array);
-    [HighEntropy, Measure] void getByteFrequencyData(Uint8Array array);
-+    //[HighEntropy, Measure] void getFloatFrequencyData(Float32Array array);
-+    //[HighEntropy, Measure] void getByteFrequencyData(Uint8Array array);
- 
-     // Real-time waveform data
-    [HighEntropy, Measure] void getFloatTimeDomainData(Float32Array array);
-    [HighEntropy, Measure] void getByteTimeDomainData(Uint8Array array);
-+    //[HighEntropy, Measure] void getFloatTimeDomainData(Float32Array array);
-+    //[HighEntropy, Measure] void getByteTimeDomainData(Uint8Array array);
- };
-diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
--- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-+++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-@@ -37,12 +37,6 @@
- 
-     // Channel access
-     readonly attribute unsigned long numberOfChannels;
-    [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
-@@ -508,7 +508,9 @@ double AudioContext::baseLatency() const {
-   DCHECK(IsMainThread());
-   DCHECK(destination());
- 
-  return base_latency_;
-+  // remove precision past two decimal digits
-+  int l = base_latency_ * 100;
-+  return double(l)/100;
- }
- 
- double AudioContext::outputLatency() const {
--
-2.25.1
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
--- a/build/patches/Battery-API-return-nothing.patch
+++ b/build/patches/Battery-API-return-nothing.patch
@ -1,67 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 22 Mar 2018 22:11:57 +0100
-Subject: Battery API: return nothing
-
-Include @thestinger's fix for correct charging/unknown values
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../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
-@@ -77,46 +77,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
- }
- 
- bool BatteryManager::charging() {
-  return battery_status_.Charging();
-+  return true;
- }
- 
- double BatteryManager::chargingTime() {
-  return battery_status_.charging_time().InSecondsF();
-+  return 0.0;
- }
- 
- double BatteryManager::dischargingTime() {
-  return battery_status_.discharging_time().InSecondsF();
-+  return std::numeric_limits<double>::infinity();
- }
- 
- double BatteryManager::level() {
-  return battery_status_.Level();
-+  return 1.0;
- }
- 
- void BatteryManager::DidUpdateData() {
-   DCHECK(battery_property_);
- 
-  BatteryStatus old_status = battery_status_;
-  battery_status_ = *battery_dispatcher_->LatestData();
-
-   if (battery_property_->GetState() == BatteryProperty::kPending) {
-     battery_property_->Resolve(this);
-     return;
-   }
-
-  DCHECK(GetExecutionContext());
-  if (GetExecutionContext()->IsContextPaused() ||
-      GetExecutionContext()->IsContextDestroyed()) {
-    return;
-  }
-
-  if (battery_status_.Charging() != old_status.Charging())
-    DispatchEvent(*Event::Create(event_type_names::kChargingchange));
-  if (battery_status_.charging_time() != old_status.charging_time())
-    DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
-  if (battery_status_.discharging_time() != old_status.discharging_time())
-    DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
-  if (battery_status_.Level() != old_status.Level())
-    DispatchEvent(*Event::Create(event_type_names::kLevelchange));
- }
- 
- void BatteryManager::RegisterWithDispatcher() {
--
-2.25.1
--- a/build/patches/Block-gateway-attacks-via-websockets.patch
+++ b/build/patches/Block-gateway-attacks-via-websockets.patch
@ -1,286 +0,0 @@
-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
-@@ -693,4 +693,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
-   return require_safe_types_;
- }
- 
-+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
-@@ -396,6 +396,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
-@@ -552,6 +552,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
--- a/build/patches/Block-qjz9zk-or-trk-requests.patch
+++ b/build/patches/Block-qjz9zk-or-trk-requests.patch
@ -1,290 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 30 Oct 2019 11:50:13 +0100
-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           |  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       | 25 ++++++++++++++++
- net/url_request/trk_protocol_handler.h        | 30 +++++++++++++++++++
- net/url_request/url_request.cc                |  8 +++++
- .../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(+), 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
-@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
-   if (base::IsStringASCII(scheme) &&
-       (ProfileIOData::IsHandledProtocol(scheme) ||
-        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::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))
-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
-@@ -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
-@@ -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::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.
-     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
-@@ -563,6 +563,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
-     }
-   }
- 
-+  if (scheme == url::kTraceScheme) {
-+    return GURL();
-+  }
-+
-   // We handle the file scheme separately.
-   if (scheme == url::kFileScheme)
-     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
-diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
--- a/content/browser/child_process_security_policy_impl.cc
-+++ b/content/browser/child_process_security_policy_impl.cc
-@@ -756,6 +756,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
-   RegisterPseudoScheme(url::kJavaScriptScheme);
-   RegisterPseudoScheme(kViewSourceScheme);
-   RegisterPseudoScheme(kGoogleChromeScheme);
-+  RegisterWebSafeScheme(url::kTraceScheme);
- }
- 
- ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
-diff --git a/net/BUILD.gn b/net/BUILD.gn
--- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1030,6 +1030,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,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.
-+
-+#include "net/url_request/trk_protocol_handler.h"
-+
-+#include "base/logging.h"
-+#include "net/base/net_errors.h"
-+#include "net/url_request/url_request_error_job.h"
-+
-+namespace net {
-+
-+TrkProtocolHandler::TrkProtocolHandler() = default;
-+
-+std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
-+    URLRequest* request) const {
-+  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
-+  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
-+}
-+
-+bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
-+  return true;
-+}
-+
-+}  // namespace net
-diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protocol_handler.h
-new file mode 100644
--- /dev/null
-+++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,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.
-+
-+#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "net/base/net_export.h"
-+#include "net/url_request/url_request_job_factory.h"
-+
-+namespace net {
-+
-+class URLRequestJob;
-+
-+// Implements a ProtocolHandler for Trk jobs.
-+class NET_EXPORT TrkProtocolHandler
-+    : public URLRequestJobFactory::ProtocolHandler {
-+ public:
-+  TrkProtocolHandler(const TrkProtocolHandler&) = delete;
-+  TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
-+
-+  TrkProtocolHandler();
-+  std::unique_ptr<URLRequestJob> CreateJob(URLRequest* request) const override;
-+  bool IsSafeRedirectTarget(const GURL& location) const override;
-+};
-+
-+}  // namespace net
-+
-+#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
--- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -13,6 +13,7 @@
- #include "base/metrics/histogram_macros.h"
- #include "base/rand_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"
- #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;
-@@ -597,6 +599,12 @@ URLRequest::URLRequest(const GURL& url,
-   // Sanity check out environment.
-   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
- 
-+  if (!url.SchemeIs(url::kTraceScheme) &&
-+      base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
-+    LOG(ERROR) << "Block URL in URLRequest: " << url;
-+    url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
-+  }
-+
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
-     return NetLogURLRequestConstructorParams(url, priority_,
-diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
--- a/net/url_request/url_request_context_builder.cc
-+++ b/net/url_request/url_request_context_builder.cc
-@@ -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_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>());
-   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
-@@ -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 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
-@@ -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 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
-@@ -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},
-+      {kTraceScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
-       // Yes, file URLs can have a hostname, so file URLs should be handled as
-       // "standard". File URLs never have a port as specified by the SchemeType
-       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -89,6 +90,7 @@ struct SchemeRegistry {
-       kAboutScheme,
-       kJavaScriptScheme,
-       kDataScheme,
-+      kTraceScheme,
-   };
- 
-   // Schemes that can be sent CORS requests.
--
-2.25.1
--- a/build/patches/Bookmarks-select-all-menu-entry.patch
+++ b/build/patches/Bookmarks-select-all-menu-entry.patch
@ -1,96 +0,0 @@
-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
-@@ -132,6 +133,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
-                     /*openInNewTab=*/true, /*incognito=*/true);
-             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.";
-@@ -141,6 +153,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);
-@@ -152,6 +165,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);
-@@ -183,6 +197,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
--- a/build/patches/Bromite-auto-updater.patch
+++ b/build/patches/Bromite-auto-updater.patch
--- a/build/patches/Bromite-package-name.patch
+++ b/build/patches/Bromite-package-name.patch
@ -1,23 +0,0 @@
-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
--- a/build/patches/Bromite-subresource-adblocker.patch
+++ b/build/patches/Bromite-subresource-adblocker.patch
--- a/build/patches/Chromium-package-name.patch
+++ b/build/patches/Chromium-package-name.patch
@ -1,23 +0,0 @@
-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
--- a/build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch
+++ b/build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch
@ -1,40 +0,0 @@
-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
--- a/build/patches/Client-hints-overrides.patch
+++ b/build/patches/Client-hints-overrides.patch
@ -1,139 +0,0 @@
-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
-@@ -247,8 +247,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
-@@ -105,6 +105,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
-@@ -197,7 +197,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
-@@ -113,6 +113,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount =
-     std::size(kWebEffectiveConnectionTypeMapping);
- 
- 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
--- a/build/patches/Content-settings-infrastructure.patch
+++ b/build/patches/Content-settings-infrastructure.patch
--- a/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
+++ b/build/patches/Dictionary-suggestions-for-the-Omnibox.patch
@ -1,978 +0,0 @@
-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
-@@ -222,8 +222,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
--- a/build/patches/Disable-AGSA-by-default.patch
+++ b/build/patches/Disable-AGSA-by-default.patch
@ -1,319 +0,0 @@
-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 +--
- .../browser/flags/CachedFeatureFlags.java     |  2 +-
- chrome/browser/ui/android/omnibox/BUILD.gn    |  2 --
- .../browser/omnibox/LocationBarMediator.java  |  1 -
- 13 files changed, 4 insertions(+), 78 deletions(-)
-
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -408,7 +408,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",
-@@ -1002,7 +1001,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",
-@@ -1517,7 +1515,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
-@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabsConnection;
- 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.gsa.GSAState;
- import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
- import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
- import org.chromium.chrome.browser.profiles.Profile;
-@@ -265,8 +264,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";
-@@ -496,8 +493,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
-@@ -112,10 +112,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;
-@@ -374,8 +370,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<>();
-@@ -1172,10 +1166,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();
-     }
- 
-@@ -1267,23 +1257,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;
-@@ -987,12 +986,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
-@@ -360,14 +360,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/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -72,7 +72,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true)
-                     .put(ChromeFeatureList.ELASTIC_OVERSCROLL, true)
-                     .put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true)
-                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true)
-+                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false)
-                     .put(ChromeFeatureList.FEED_LOADING_PLACEHOLDER, false)
-                     .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, true)
-                     .put(ChromeFeatureList.IMMERSIVE_UI_MODE, false)
-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",
-@@ -440,7 +439,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
--- a/build/patches/Disable-Accessibility-service-by-default.patch
+++ b/build/patches/Disable-Accessibility-service-by-default.patch
@ -1,74 +0,0 @@
-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
-@@ -899,6 +899,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
--- a/build/patches/Disable-AsyncDNS-by-default.patch
+++ b/build/patches/Disable-AsyncDNS-by-default.patch
@ -1,32 +0,0 @@
-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 | 8 ++------
- 1 file changed, 2 insertions(+), 6 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,12 +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)
-             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
--- a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
+++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch
@ -1,25 +0,0 @@
-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 | 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
-@@ -843,8 +843,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
- // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
- // which will trigger provisioning process after MediaDrmBridge is created.
- 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.25.1
--- a/build/patches/Disable-FLoC-and-privacy-sandbox.patch
+++ b/build/patches/Disable-FLoC-and-privacy-sandbox.patch
@ -1,251 +0,0 @@
-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
-@@ -3091,6 +3091,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
-@@ -495,18 +495,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> pref_service_;
-   PrefChangeRegistrar pref_change_registrar_;
-  bool incognito_profile_;
- };
- 
- }  // namespace privacy_sandbox
--
-2.25.1
--- a/build/patches/Disable-NTP-remote-suggestions-by-default.patch
+++ b/build/patches/Disable-NTP-remote-suggestions-by-default.patch
@ -1,51 +0,0 @@
-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/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,8 +39,8 @@ const base::Feature* const kAllFeatures[] = {
-     &kOptionalImagesEnabledFeature};
- 
- BASE_FEATURE(kArticleSuggestionsFeature,
-             "NTPArticleSuggestions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "NTPArticleSuggestions",                            // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
- 
- BASE_FEATURE(kRemoteSuggestionsEmulateM58FetchingSchedule,
-              "RemoteSuggestionsEmulateM58FetchingSchedule",
-@@ -71,8 +71,8 @@ const char kNotificationsDailyLimit[] = "daily_limit";
- const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
- 
- BASE_FEATURE(kKeepPrefetchedContentSuggestions,
-             "KeepPrefetchedContentSuggestions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "KeepPrefetchedContentSuggestions",                // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                // in Bromite
- 
- BASE_FEATURE(kOptionalImagesEnabledFeature,
-              "NTPRemoteSuggestionsOptionalImages",
--
-2.25.1
--- a/build/patches/Disable-PrivacyGuide.patch
+++ b/build/patches/Disable-PrivacyGuide.patch
@ -1,40 +0,0 @@
-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
-@@ -500,8 +500,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",
-@@ -910,11 +910,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/build/patches/Disable-StartSurface-feature.patch
+++ b/build/patches/Disable-StartSurface-feature.patch
@ -1,27 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 16 Nov 2022 11:18:07 +0100
-Subject: Disable StartSurface feature
-
-This feature would normally show a search box but leads to crashes.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1081,8 +1081,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kStartSurfaceAndroid,
-             "StartSurfaceAndroid",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "StartSurfaceAndroid",                 // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- BASE_FEATURE(kFeedPositionAndroid,
-              "FeedPositionAndroid",
--
-2.25.1
--- a/build/patches/Disable-TLS-resumption.patch
+++ b/build/patches/Disable-TLS-resumption.patch
@ -1,297 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Thu, 24 Mar 2022 10:08:00 +0000
-Subject: Disable TLS resumption
-
-Disable resumption feature for all HTTPS and QUIC connections;
-the feature could be used to track users even without cookies.
-
-Sessions are not currently saved to disk in Chromium (although
-there is support for it) but are long enough to constitute a
-privacy risk (2h for TLS 1.2 and 7 days for TLS 1.3) if user
-does not frequently close the browser.
-
-Since session information is not kept in the HTTP cache it is
-not cleared when deleting navigation data (although it is possible
-to clear it by selecting "passwords").
-
-Two new user configurable flags are introduced:
-* kDisableTLSResumption, active by default
-* kLogTLSResumption, that would allow to find in logcat reused
-  sessions in lines matching "SSL Log:"
-
-See also:
-* https://arxiv.org/abs/1810.07304
-
-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  |  8 ++++
- chrome/browser/flag_descriptions.h   |  6 +++
- net/base/features.cc                 |  8 ++++
- net/base/features.h                  |  6 +++
- net/http/http_network_session.cc     |  1 +
- net/quic/quic_stream_factory.cc      | 35 ++++++++++++++++-
- net/socket/ssl_client_socket_impl.cc | 59 ++++++++++++++++++++++++++++
- net/socket/ssl_client_socket_impl.h  |  2 +
- 9 files changed, 130 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
-@@ -5016,6 +5016,12 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
-      flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
-      FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
-+    {"disable-tls-resumption", flag_descriptions::kDisableTLSResumptionName,
-+     flag_descriptions::kDisableTLSResumptionDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(net::features::kDisableTLSResumption)},
-+    {"log-tls-resumption", flag_descriptions::kLogTLSResumptionName,
-+     flag_descriptions::kLogTLSResumptionDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(net::features::kLogTLSResumption)},
-     {"post-quantum-cecpq2", flag_descriptions::kPostQuantumCECPQ2Name,
-      flag_descriptions::kPostQuantumCECPQ2Description, kOsAll,
-      FEATURE_VALUE_TYPE(net::features::kPostQuantumCECPQ2)},
-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
-@@ -1036,6 +1036,14 @@ const char kEnableTLS13EarlyDataDescription[] =
-     "during the handshake when resuming a connection to a compatible TLS 1.3 "
-     "server.";
- 
-+const char kDisableTLSResumptionName[] = "Disable TLS Session Resumption";
-+const char kDisableTLSResumptionDescription[] =
-+    "Disable TLS session resumption.";
-+
-+const char kLogTLSResumptionName[] = "Log TLS Session Resumption";
-+const char kLogTLSResumptionDescription[] =
-+    "Log TLS session resumption";
-+
- const char kEnhancedNetworkVoicesName[] = "Enhanced network voices";
- const char kEnhancedNetworkVoicesDescription[] =
-     "This option enables high-quality, network-based voices in "
-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
-@@ -595,6 +595,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
- extern const char kEnableTLS13EarlyDataName[];
- extern const char kEnableTLS13EarlyDataDescription[];
- 
-+extern const char kDisableTLSResumptionName[];
-+extern const char kDisableTLSResumptionDescription[];
-+
-+extern const char kLogTLSResumptionName[];
-+extern const char kLogTLSResumptionDescription[];
-+
- extern const char kEnhancedNetworkVoicesName[];
- extern const char kEnhancedNetworkVoicesDescription[];
- 
-diff --git a/net/base/features.cc b/net/base/features.cc
--- a/net/base/features.cc
-+++ b/net/base/features.cc
-@@ -61,6 +61,14 @@ const base::FeatureParam<base::TimeDelta> kUseDnsHttpsSvcbSecureExtraTimeMin{
-     &kUseDnsHttpsSvcb, "UseDnsHttpsSvcbSecureExtraTimeMin",
-     base::Milliseconds(5)};
- 
-+BASE_FEATURE(kDisableTLSResumption,
-+             "DisableTLSResumption",
-+             base::FEATURE_ENABLED_BY_DEFAULT);
-+
-+BASE_FEATURE(kLogTLSResumption,
-+             "LogTLSResumption",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kUseDnsHttpsSvcbAlpn,
-              "UseDnsHttpsSvcbAlpn",
-              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
-@@ -91,6 +91,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUseDnsHttpsSvcbAlpn);
- // Enables TLS 1.3 early data.
- NET_EXPORT BASE_DECLARE_FEATURE(kEnableTLS13EarlyData);
- 
-+// Disables TLS resumption.
-+NET_EXPORT BASE_DECLARE_FEATURE(kDisableTLSResumption);
-+
-+// Log TLS resumption.
-+NET_EXPORT BASE_DECLARE_FEATURE(kLogTLSResumption);
-+
- // Enables the TLS Encrypted ClientHello feature.
- // https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13
- NET_EXPORT BASE_DECLARE_FEATURE(kEncryptedClientHello);
-diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
--- a/net/http/http_network_session.cc
-+++ b/net/http/http_network_session.cc
-@@ -212,6 +212,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
- 
-   next_protos_.push_back(kProtoHTTP11);
- 
-+  DCHECK(context.quic_context->params()->max_server_configs_stored_in_properties == 0);
-   http_server_properties_->SetMaxServerConfigsStoredInProperties(
-       context.quic_context->params()->max_server_configs_stored_in_properties);
-   http_server_properties_->SetBrokenAlternativeServicesDelayParams(
-diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
--- a/net/quic/quic_stream_factory.cc
-+++ b/net/quic/quic_stream_factory.cc
-@@ -72,6 +72,7 @@
- #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h"
- #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
- #include "third_party/boringssl/src/include/openssl/aead.h"
-+#include "third_party/boringssl/src/include/openssl/ssl.h"
- #include "url/gurl.h"
- #include "url/scheme_host_port.h"
- #include "url/url_constants.h"
-@@ -245,6 +246,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
- 
- }  // namespace
- 
-+class BromiteSessionCache : public quic::QuicClientSessionCache {
-+ public:
-+  BromiteSessionCache() = default;
-+  ~BromiteSessionCache() override = default;
-+
-+  void Insert(const quic::QuicServerId& server_id,
-+              bssl::UniquePtr<SSL_SESSION> session,
-+              const quic::TransportParameters& params,
-+              const quic::ApplicationState* application_state) override {
-+    if (base::FeatureList::IsEnabled(net::features::kDisableTLSResumption))
-+      SSL_SESSION_set_timeout(session.get(), 0);
-+    if (base::FeatureList::IsEnabled(net::features::kLogTLSResumption)) {
-+      LOG(INFO) << "SSL Log: new quic session created "
-+                << server_id.host();
-+    }
-+    quic::QuicClientSessionCache::Insert(server_id,
-+      std::move(session), params, application_state);
-+  }
-+
-+  std::unique_ptr<quic::QuicResumptionState> Lookup(
-+        const quic::QuicServerId& server_id, quic::QuicWallTime now,
-+        const SSL_CTX* ctx) override {
-+    auto value = quic::QuicClientSessionCache::Lookup(server_id, now, ctx);
-+    if (value != nullptr &&
-+        base::FeatureList::IsEnabled(net::features::kLogTLSResumption)) {
-+      LOG(INFO) << "SSL Log: QUIC session resumed "
-+                << server_id.host();
-+    }
-+    return value;
-+  }
-+};
-+
- // Refcounted class that owns quic::QuicCryptoClientConfig and tracks how many
- // consumers are using it currently. When the last reference is freed, the
- // QuicCryptoClientConfigHandle informs the owning QuicStreamFactory, moves it
-@@ -2249,7 +2282,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
-               sct_auditing_delegate_,
-               HostsFromOrigins(params_.origins_to_force_quic_on),
-               actual_network_anonymization_key),
-          std::make_unique<quic::QuicClientSessionCache>(), this);
-+          std::make_unique<BromiteSessionCache>(), this);
- 
-   quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config();
-   crypto_config->set_user_agent_id(params_.user_agent_id);
-diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
--- a/net/socket/ssl_client_socket_impl.cc
-+++ b/net/socket/ssl_client_socket_impl.cc
-@@ -392,7 +392,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
-   CHECK(context_);
- }
- 
-+void SSLClientSocketImpl::Log_ssl_session_data(const std::string& tag, SSL_SESSION* session) {
-+  if (session == NULL) {
-+    LOG(INFO) << "SSL Log: "
-+              << tag
-+              << " host: " << host_and_port_.ToString()
-+              << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString();
-+    return;
-+  }
-+
-+  unsigned len;
-+  auto* session_id = SSL_SESSION_get_id(session, &len);
-+
-+  const uint8_t *ticket;
-+  size_t ticklen;
-+  SSL_SESSION_get0_ticket(session, &ticket, &ticklen);
-+
-+  LOG(INFO) << "SSL Log: "
-+            << tag
-+            << " host: " << host_and_port_.ToString()
-+            << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString()
-+            << " sessionid: " << base::HexEncode(session_id, len)
-+            << (ticklen > 0 ? " ticket:" + base::HexEncode(ticket, ticklen) : "");
-+}
-+
- SSLClientSocketImpl::~SSLClientSocketImpl() {
-+  if (base::FeatureList::IsEnabled(net::features::kLogTLSResumption))
-+    Log_ssl_session_data("Disconnect", NULL);
-   Disconnect();
- }
- 
-@@ -786,6 +812,8 @@ int SSLClientSocketImpl::Init() {
-     }
-     if (session)
-       SSL_set_session(ssl_.get(), session.get());
-+    if (session && base::FeatureList::IsEnabled(net::features::kLogTLSResumption))
-+      Log_ssl_session_data("Old session resumed", session.get());
-   }
- 
-   transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -1074,6 +1102,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
-                     : SSLHandshakeDetails::kTLS13Full;
-     }
-   }
-+  if (base::FeatureList::IsEnabled(net::features::kLogTLSResumption)) {
-+    switch(details)
-+    {
-+      case SSLHandshakeDetails::kTLS13Early:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS13Early mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS13ResumeWithHelloRetryRequest:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS13ResumeWithHelloRetryRequest mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS13Resume:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS13Resume mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS12Resume:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS12Resume mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS12Full:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS12Full mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS12FalseStart:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS12FalseStart mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS13Full:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS13Full mode", NULL);
-+        break;
-+      case SSLHandshakeDetails::kTLS13FullWithHelloRetryRequest:
-+        Log_ssl_session_data("SSL Log: session reused: kTLS13FullWithHelloRetryRequest mode", NULL);
-+        break;
-+    }
-+  }
-   UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
- 
-   // Measure TLS connections that implement the renegotiation_info extension.
-@@ -1746,6 +1803,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
- }
- 
- bool SSLClientSocketImpl::IsCachingEnabled() const {
-+  if (base::FeatureList::IsEnabled(net::features::kDisableTLSResumption))
-+    return false;
-   return context_->ssl_client_session_cache() != nullptr;
- }
- 
-diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
--- a/net/socket/ssl_client_socket_impl.h
-+++ b/net/socket/ssl_client_socket_impl.h
-@@ -127,6 +127,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
-   friend class SSLClientSocket;
-   friend class SSLContext;
- 
-+  void Log_ssl_session_data(const std::string& tag, SSL_SESSION* session);
-+
-   int Init();
-   void DoReadCallback(int result);
-   void DoWriteCallback(int result);
--
-2.25.1
--- a/build/patches/Disable-UA-full-version.patch
+++ b/build/patches/Disable-UA-full-version.patch
@ -1,61 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Wed, 16 Feb 2022 14:28:58 +0000
-Subject: Disable UA full version
-
-getHighEntropyValues will return only the major version
-
-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
---
- .../renderer/core/frame/navigator_ua_data.cc     | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
--- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-+++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -6,6 +6,8 @@
- 
- #include "base/compiler_specific.h"
- #include "base/task/single_thread_task_runner.h"
-+#include "base/version.h"
-+#include "base/strings/strcat.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
- #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
-@@ -39,6 +41,16 @@ void MaybeRecordMetric(bool record_identifiability,
-       .Record(execution_context->UkmRecorder());
- }
- 
-+const String GetReducedVersionNumber(const std::string& fullVersion) {
-+  base::Version version(fullVersion);
-+  std::string version_str;
-+  const std::vector<uint32_t>& components = version.components();
-+  if (components.size() > 0) {
-+    version_str = base::StrCat({base::NumberToString(components[0]), ".0.0.0"});
-+  }
-+  return String::FromUTF8(version_str);
-+}
-+
- }  // namespace
- 
- NavigatorUAData::NavigatorUAData(ExecutionContext* context)
-@@ -77,7 +89,7 @@ void NavigatorUAData::SetFullVersionList(
-     const UserAgentBrandList& full_version_list) {
-   for (const auto& brand_version : full_version_list) {
-     AddBrandFullVersion(String::FromUTF8(brand_version.brand),
-                        String::FromUTF8(brand_version.version));
-+        GetReducedVersionNumber(brand_version.version));
-   }
- }
- 
-@@ -99,7 +111,7 @@ void NavigatorUAData::SetModel(const String& model) {
- }
- 
- void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {
-  ua_full_version_ = ua_full_version;
-+  ua_full_version_ = GetReducedVersionNumber(ua_full_version.Ascii());
- }
- 
- void NavigatorUAData::SetBitness(const String& bitness) {
--
-2.25.1
--- a/build/patches/Disable-add-to-home-screen-prompt.patch
+++ b/build/patches/Disable-add-to-home-screen-prompt.patch
@ -1,26 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 28 Sep 2022 00:54:10 +0200
-Subject: Disable add to home screen prompt
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../webapps/AddToHomescreenMostVisitedTileClickObserver.java | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenMostVisitedTileClickObserver.java
-@@ -43,10 +43,7 @@ public class AddToHomescreenMostVisitedTileClickObserver implements MostVisitedT
-                     ntp.addMostVisitedTileClickObserver(
-                             AddToHomescreenMostVisitedTileClickObserver.this);
-                 } else {
-                    // If it is a regular web page, and started from a most visited tile, show IPH.
-                    if (url.getOrigin().equals(mLastClickedMostVisitedTileUrl)) {
-                        addToHomescreenIPHController.showAddToHomescreenIPH(tab);
-                    }
-+                    // do not show any add to home screen IPH in Bromite
-                     removeObserver(tab);
-                 }
-                 mLastClickedMostVisitedTileUrl = null;
--
-2.25.1
--- a/build/patches/Disable-all-predictors-code.patch
+++ b/build/patches/Disable-all-predictors-code.patch
@ -1,298 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 25 Jan 2022 12:22:52 +0000
-Subject: Disable all predictors code
-
-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_hints_manager.cc                   |  1 +
- .../optimization_guide_keyed_service.cc       |  1 -
- chrome/common/chrome_features.cc              |  8 ++--
- .../optimization_guide/core/hints_fetcher.cc  |  1 +
- .../optimization_guide/core/hints_manager.cc  |  5 +++
- .../core/optimization_guide_features.cc       | 38 +++++++++----------
- .../core/prediction_model_download_manager.cc |  6 ++-
- .../core/prediction_model_fetcher_impl.cc     |  1 +
- components/optimization_guide/features.gni    |  4 +-
- components/permissions/features.cc            |  8 ++--
- third_party/blink/common/features.cc          |  8 +---
- 11 files changed, 40 insertions(+), 41 deletions(-)
-
-diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc
--- a/chrome/browser/optimization_guide/chrome_hints_manager.cc
-+++ b/chrome/browser/optimization_guide/chrome_hints_manager.cc
-@@ -26,6 +26,7 @@ bool IsAllowedToFetchForNavigationPrediction(
-     const absl::optional<NavigationPredictorKeyedService::Prediction>
-         prediction) {
-   DCHECK(prediction);
-+  if ((true)) return false;
- 
-   if (prediction->prediction_source() !=
-       NavigationPredictorKeyedService::PredictionSource::
-diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
--- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-+++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -320,7 +320,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
- void OptimizationGuideKeyedService::RegisterOptimizationTypes(
-     const std::vector<optimization_guide::proto::OptimizationType>&
-         optimization_types) {
-  hints_manager_->RegisterOptimizationTypes(optimization_types);
- }
- 
- optimization_guide::OptimizationGuideDecision
-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
-@@ -883,8 +883,8 @@ BASE_FEATURE(kPermissionAuditing,
- // Enables using the prediction service for permission prompts. We will keep
- // this feature in order to allow us to update the holdback chance via finch.
- BASE_FEATURE(kPermissionPredictions,
-             "PermissionPredictions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PermissionPredictions",               // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- // The holdback chance is 30% but it can also be configured/updated
- // through finch if needed.
-@@ -895,8 +895,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
- 
- // Enables using the prediction service for geolocation permission prompts.
- BASE_FEATURE(kPermissionGeolocationPredictions,
-             "PermissionGeolocationPredictions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PermissionGeolocationPredictions",        // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
- 
- const base::FeatureParam<double>
-     kPermissionGeolocationPredictionsHoldbackChance(
-diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
--- a/components/optimization_guide/core/hints_fetcher.cc
-+++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -174,6 +174,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
-     optimization_guide::proto::RequestContext request_context,
-     const std::string& locale,
-     HintsFetchedCallback hints_fetched_callback) {
-+  if ((true)) return false;
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK_GT(optimization_types.size(), 0u);
-   request_context_ = request_context;
-diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
--- a/components/optimization_guide/core/hints_manager.cc
-+++ b/components/optimization_guide/core/hints_manager.cc
-@@ -352,6 +352,7 @@ void HintsManager::Shutdown() {
- OptimizationGuideDecision
- HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
-     OptimizationTypeDecision optimization_type_decision) {
-+  if ((true)) return OptimizationGuideDecision::kFalse;
-   switch (optimization_type_decision) {
-     case OptimizationTypeDecision::kAllowedByOptimizationFilter:
-     case OptimizationTypeDecision::kAllowedByHint:
-@@ -1056,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-   // TODO(crbug/1275612): Check whether we have consent to fetch.
-+  if ((true)) return; // no consent on bromite
- 
-   // This set contains URLs that require some information to be fetched, whether
-   // that be a URL-keyed hint or a host-keyed hint.
-@@ -1263,6 +1265,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
-     proto::OptimizationType optimization_type,
-     OptimizationMetadata* optimization_metadata) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-+  if ((true)) {
-+    return OptimizationTypeDecision::kNoHintAvailable;
-+  }
- 
-   ScopedCanApplyOptimizationLogger scoped_logger(
-       optimization_type, navigation_url, optimization_guide_logger_);
-diff --git a/components/optimization_guide/core/optimization_guide_features.cc b/components/optimization_guide/core/optimization_guide_features.cc
--- a/components/optimization_guide/core/optimization_guide_features.cc
-+++ b/components/optimization_guide/core/optimization_guide_features.cc
-@@ -78,17 +78,17 @@ bool IsSupportedLocaleForFeature(const std::string locale,
- // Enables the syncing of the Optimization Hints component, which provides
- // hints for what optimizations can be applied on a page load.
- BASE_FEATURE(kOptimizationHints,
-             "OptimizationHints",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OptimizationHints",                   // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- // Enables fetching from a remote Optimization Guide Service.
- BASE_FEATURE(kRemoteOptimizationGuideFetching,
-             "OptimizationHintsFetching",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OptimizationHintsFetching",           // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- BASE_FEATURE(kRemoteOptimizationGuideFetchingAnonymousDataConsent,
-             "OptimizationHintsFetchingAnonymousDataConsent",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OptimizationHintsFetchingAnonymousDataConsent",        // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                     // in Bromite
- 
- // Enables performance info in the context menu and fetching from a remote
- // Optimization Guide Service.
-@@ -98,17 +98,13 @@ BASE_FEATURE(kContextMenuPerformanceInfoAndRemoteHintFetching,
- 
- // Enables the prediction of optimization targets.
- BASE_FEATURE(kOptimizationTargetPrediction,
-             "OptimizationTargetPrediction",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OptimizationTargetPrediction",                         // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                     // in Bromite
- 
- // Enables the downloading of models.
- BASE_FEATURE(kOptimizationGuideModelDownloading,
-             "OptimizationGuideModelDownloading",
-#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-             base::FEATURE_ENABLED_BY_DEFAULT
-#else   // BUILD_WITH_TFLITE_LIB
-             base::FEATURE_DISABLED_BY_DEFAULT
-#endif  // !BUILD_WITH_TFLITE_LIB
-+             "OptimizationGuideModelDownloading",                    // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT                       // in Bromite
- );
- 
- // Enables page content to be annotated.
-@@ -143,8 +139,8 @@ BASE_FEATURE(kPageEntitiesModelResetOnShutdown,
- 
- // Enables push notification of hints.
- BASE_FEATURE(kPushNotifications,
-             "OptimizationGuidePushNotifications",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "OptimizationGuidePushNotifications",    // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);      // in Bromite
- 
- // This feature flag does not turn off any behavior, it is only used for
- // experiment parameters.
-@@ -158,15 +154,15 @@ BASE_FEATURE(kOptimizationGuideMetadataValidation,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kPageTopicsBatchAnnotations,
-             "PageTopicsBatchAnnotations",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PageTopicsBatchAnnotations",             // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);       // in Bromite
- BASE_FEATURE(kPageVisibilityBatchAnnotations,
-              "PageVisibilityBatchAnnotations",
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kUseLocalPageEntitiesMetadataProvider,
-             "UseLocalPageEntitiesMetadataProvider",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "UseLocalPageEntitiesMetadataProvider",   // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);       // in Bromite
- 
- BASE_FEATURE(kPageContentAnnotationsValidation,
-              "PageContentAnnotationsValidation",
-@@ -408,7 +404,7 @@ size_t MaxURLKeyedHintCacheSize() {
- 
- bool ShouldPersistHintsToDisk() {
-   return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
-                                           "persist_hints_to_disk", true);
-+                                           "persist_hints_to_disk", false);
- }
- 
- bool ShouldOverrideOptimizationTargetDecisionForMetricsPurposes(
-diff --git a/components/optimization_guide/core/prediction_model_download_manager.cc b/components/optimization_guide/core/prediction_model_download_manager.cc
--- a/components/optimization_guide/core/prediction_model_download_manager.cc
-+++ b/components/optimization_guide/core/prediction_model_download_manager.cc
-@@ -46,7 +46,7 @@ constexpr char kGoogApiKey[] = "X-Goog-Api-Key";
- // we require models to come from.
- constexpr uint8_t kPublisherKeyHash[] = {
-     0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
-    0xa3, 0x70, 0x71, 0x42, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
-+    0x01, 0x02, 0x03, 0x04, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
-     0x5c, 0x7f, 0xd0, 0x0c, 0xa1, 0x6e, 0xef, 0xdd, 0x63, 0x7a};
- const net::NetworkTrafficAnnotationTag
-     kOptimizationGuidePredictionModelsTrafficAnnotation =
-@@ -99,7 +99,7 @@ PredictionModelDownloadManager::PredictionModelDownloadManager(
-     const base::FilePath& models_dir_path,
-     scoped_refptr<base::SequencedTaskRunner> background_task_runner)
-     : download_service_(download_service),
-      is_available_for_downloads_(true),
-+      is_available_for_downloads_(false),
-       api_key_(features::GetOptimizationGuideServiceAPIKey()),
-       models_dir_path_(models_dir_path),
-       background_task_runner_(background_task_runner) {}
-@@ -114,6 +114,7 @@ base::FilePath::StringType PredictionModelDownloadManager::ModelInfoFileName() {
- void PredictionModelDownloadManager::StartDownload(
-     const GURL& download_url,
-     proto::OptimizationTarget optimization_target) {
-+  if ((true)) return;
-   download::DownloadParams download_params;
-   download_params.client =
-       download::DownloadClient::OPTIMIZATION_GUIDE_PREDICTION_MODELS;
-@@ -250,6 +251,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
- absl::optional<std::pair<base::FilePath, base::FilePath>>
- PredictionModelDownloadManager::VerifyDownload(const base::FilePath& file_path,
-                                                bool delete_file_on_error) {
-+  if ((true)) return absl::nullopt;
-   if (!switches::ShouldSkipModelDownloadVerificationForTesting()) {
-     // Verify that the |file_path| contains a valid CRX file.
-     std::string public_key;
-diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
--- a/components/optimization_guide/core/prediction_model_fetcher_impl.cc
-+++ b/components/optimization_guide/core/prediction_model_fetcher_impl.cc
-@@ -50,6 +50,7 @@ bool PredictionModelFetcherImpl::FetchOptimizationGuideServiceModels(
-     proto::RequestContext request_context,
-     const std::string& locale,
-     ModelsFetchedCallback models_fetched_callback) {
-+  if ((true)) return false;
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- 
-   if (url_loader_)
-diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni
--- a/components/optimization_guide/features.gni
-+++ b/components/optimization_guide/features.gni
-@@ -10,9 +10,7 @@ if (is_android) {
- declare_args() {
-   # This enables build with TFLite library.
-   # Currently only available for Desktop and Android.
-  build_with_tflite_lib =
-      is_android || (is_win && target_cpu != "arm64") || is_linux || is_mac ||
-      is_chromeos || is_fuchsia || is_ios
-+  build_with_tflite_lib = false
- 
-   # You can set the variable 'build_with_internal_optimization_guide' to true
-   # even in a developer build in args.gn.  Setting this variable explicitly to true will
-diff --git a/components/permissions/features.cc b/components/permissions/features.cc
--- a/components/permissions/features.cc
-+++ b/components/permissions/features.cc
-@@ -85,12 +85,12 @@ BASE_FEATURE(kPermissionChipRequestTypeSensitive,
- // When enabled, use the value of the `service_url` FeatureParam as the url
- // for the Web Permission Predictions Service.
- BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride,
-             "kPermissionPredictionServiceUseUrlOverride",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "kPermissionPredictionServiceUseUrlOverride",       // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
- 
- BASE_FEATURE(kPermissionOnDeviceNotificationPredictions,
-             "PermissionOnDeviceNotificationPredictions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PermissionOnDeviceNotificationPredictions",        // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
- 
- BASE_FEATURE(kPermissionOnDeviceGeolocationPredictions,
-              "PermissionOnDeviceGeolocationPredictions",
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -214,12 +214,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
- // predictor may preconnect/prefetch to resources/origins to make the
- // future navigations faster.
- BASE_FEATURE(kNavigationPredictor,
-             "NavigationPredictor",
-#if BUILDFLAG(IS_ANDROID)
-             base::FEATURE_ENABLED_BY_DEFAULT
-#else
-             base::FEATURE_DISABLED_BY_DEFAULT
-#endif
-+             "NavigationPredictor",                // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT     // in Bromite
- );
- 
- // Anchor Element Interaction
--
-2.25.1
--- a/build/patches/Disable-all-promo-dialogs.patch
+++ b/build/patches/Disable-all-promo-dialogs.patch
@ -1,34 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 12 Jun 2018 15:09:26 +0200
-Subject: Disable all promo dialogs
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -851,7 +851,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
-      * displayed.
-      */
-     private boolean triggerPromo(boolean intentWithEffect) {
-        try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
-+        /*try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
-             if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
-                 return false;
-             }
-@@ -886,8 +886,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
-                 preferenceManager.writeBoolean(
-                         ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
-             }
-            return isShowingPromo;
-        }
-+            return isShowingPromo;        } */
-+            return false;
-     }
- 
-     @VisibleForTesting
--
-2.25.1
--- a/build/patches/Disable-conversion-measurement-api.patch
+++ b/build/patches/Disable-conversion-measurement-api.patch
@ -1,231 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 15 Nov 2021 09:43:29 +0000
-Subject: Disable conversion measurement api
-
-Disable Conversion Measurement API by disabling the flag and removing
-support for the AttributionReporting provider. it also removes
-the handling of attributions via intents between apps.
-This patch enforces the deactivation by preventing the report from
-being sent and being saved to disk, although it is currently in uncalled code.
-
-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/flags/android/chrome_feature_list.cc  |  4 ++--
- .../embedder_support/origin_trials/features.cc    |  8 ++++----
- .../render_view_context_menu_base.cc              |  3 ---
- .../aggregatable_report_sender.cc                 | 15 +++++++--------
- .../attribution_reporting/attribution_host.cc     |  1 +
- .../attribution_report_network_sender.cc          | 15 ++++++++-------
- .../attribution_storage_sql.cc                    |  8 +++++---
- content/browser/storage_partition_impl.cc         |  7 +------
- content/public/browser/navigation_controller.cc   |  1 -
- third_party/blink/common/features.cc              |  4 ++--
- .../platform/runtime_enabled_features.json5       |  7 +++++++
- 11 files changed, 37 insertions(+), 36 deletions(-)
-
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -521,8 +521,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kAppToWebAttribution,
-             "AppToWebAttribution",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "AppToWebAttribution",               // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- 
- BASE_FEATURE(kBackgroundThreadPool,
-              "BackgroundThreadPool",
-diff --git a/components/embedder_support/origin_trials/features.cc b/components/embedder_support/origin_trials/features.cc
--- a/components/embedder_support/origin_trials/features.cc
-+++ b/components/embedder_support/origin_trials/features.cc
-@@ -14,11 +14,11 @@ namespace embedder_support {
- // Users from control group will have the feature disabled, excluding them
- // from the origin trial.
- BASE_FEATURE(kOriginTrialsSampleAPIThirdPartyAlternativeUsage,
-             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",   // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
- 
- BASE_FEATURE(kConversionMeasurementAPIAlternativeUsage,
-             "ConversionMeasurementAPIAlternativeUsage",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ConversionMeasurementAPIAlternativeUsage",          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
- 
- }  // namespace embedder_support
-diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
--- a/components/renderer_context_menu/render_view_context_menu_base.cc
-+++ b/components/renderer_context_menu/render_view_context_menu_base.cc
-@@ -486,9 +486,6 @@ void RenderViewContextMenuBase::OpenURLWithExtraHeaders(
- 
-   open_url_params.source_site_instance = site_instance_;
- 
-  if (disposition != WindowOpenDisposition::OFF_THE_RECORD)
-    open_url_params.impression = params_.impression;
-
-   source_web_contents_->OpenURL(open_url_params);
- }
- 
-diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b/content/browser/aggregation_service/aggregatable_report_sender.cc
--- a/content/browser/aggregation_service/aggregatable_report_sender.cc
-+++ b/content/browser/aggregation_service/aggregatable_report_sender.cc
-@@ -136,19 +136,18 @@ void AggregatableReportSender::SendReport(const GURL& url,
-   // Allow bodies of non-2xx responses to be returned.
-   simple_url_loader_ptr->SetAllowHttpErrorResults(true);
- 
-  // Unretained is safe because the URLLoader is owned by `this` and will be
-  // deleted before `this`.
-  simple_url_loader_ptr->DownloadHeadersOnly(
-      url_loader_factory_.get(),
-      base::BindOnce(&AggregatableReportSender::OnReportSent,
-                     base::Unretained(this), std::move(it),
-                     std::move(callback)));
-+  // this is never called on Bromite but nothing would be sent if it were
-+  OnReportSent(std::move(it), std::move(callback), nullptr);
- }
- 
- void AggregatableReportSender::OnReportSent(
-     UrlLoaderList::iterator it,
-     ReportSentCallback callback,
-    scoped_refptr<net::HttpResponseHeaders> headers) {
-+    scoped_refptr<net::HttpResponseHeaders> headers) { // disable in Bromite
-+  if ((true)) {
-+    std::move(callback).Run(RequestStatus::kOk);
-+    return;
-+  }
-   RequestStatus status;
- 
-   absl::optional<int> http_response_code;
-diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
--- a/content/browser/attribution_reporting/attribution_host.cc
-+++ b/content/browser/attribution_reporting/attribution_host.cc
-@@ -124,6 +124,7 @@ void AttributionHost::DidRedirectNavigation(
-     return;
-   }
- 
-+  if ((true)) return;
-   AttributionManager* attribution_manager =
-       AttributionManager::FromWebContents(web_contents());
-   if (!attribution_manager)
-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
-@@ -110,13 +110,8 @@ void AttributionReportNetworkSender::SendReport(
-                    network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED;
-   simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode);
- 
-  // Unretained is safe because the URLLoader is owned by |this| and will be
-  // deleted before |this|.
-  simple_url_loader_ptr->DownloadHeadersOnly(
-      url_loader_factory_.get(),
-      base::BindOnce(&AttributionReportNetworkSender::OnReportSent,
-                     base::Unretained(this), std::move(it), std::move(report),
-                     is_debug_report, std::move(sent_callback)));
-+  // 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);
- }
- 
- void AttributionReportNetworkSender::OnReportSent(
-@@ -125,6 +120,12 @@ void AttributionReportNetworkSender::OnReportSent(
-     bool is_debug_report,
-     ReportSentCallback sent_callback,
-     scoped_refptr<net::HttpResponseHeaders> headers) {
-+  if ((true)) {
-+    std::move(sent_callback)
-+        .Run(std::move(report),
-+           SendResult(SendResult::Status::kSent, headers ? headers->response_code() : 200));
-+    return;
-+  }
-   network::SimpleURLLoader* loader = it->get();
- 
-   // Consider a non-200 HTTP code as a non-internal error.
-diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
--- a/content/browser/attribution_reporting/attribution_storage_sql.cc
-+++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
-@@ -422,6 +422,8 @@ DestinationLimitResult GetDestinationLimitResult(
-   }
- }
- 
-+bool g_run_in_memory = true;
-+
- }  // namespace
- 
- // static
-@@ -433,9 +435,9 @@ bool AttributionStorageSql::DeleteStorageForTesting(
- AttributionStorageSql::AttributionStorageSql(
-     const base::FilePath& user_data_directory,
-     std::unique_ptr<AttributionStorageDelegate> delegate)
-    : path_to_database_(user_data_directory.empty()
-                            ? base::FilePath()
-                            : DatabasePath(user_data_directory)),
-+    : path_to_database_(user_data_directory.empty() || g_run_in_memory
-+                             ? base::FilePath()
-+                             : DatabasePath(user_data_directory)),
-       delegate_(std::move(delegate)),
-       rate_limit_table_(delegate_.get()) {
-   DCHECK(delegate_);
-diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
--- a/content/browser/storage_partition_impl.cc
-+++ b/content/browser/storage_partition_impl.cc
-@@ -1353,12 +1353,7 @@ void StoragePartitionImpl::Initialize(
- 
-   bucket_manager_ = std::make_unique<BucketManager>(this);
- 
-  // The Conversion Measurement API is not available in Incognito mode.
-  if (!is_in_memory() &&
-      base::FeatureList::IsEnabled(blink::features::kConversionMeasurement)) {
-    attribution_manager_ = std::make_unique<AttributionManagerImpl>(
-        this, path, special_storage_policy_);
-  }
-+  // The Conversion Measurement API is not available in Bromite.
- 
-   if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
-     // Auction worklets on non-Android use dedicated processes; on Android due
-diff --git a/content/public/browser/navigation_controller.cc b/content/public/browser/navigation_controller.cc
--- a/content/public/browser/navigation_controller.cc
-+++ b/content/public/browser/navigation_controller.cc
-@@ -39,7 +39,6 @@ NavigationController::LoadURLParams::LoadURLParams(const OpenURLParams& input)
-       blob_url_loader_factory(input.blob_url_loader_factory),
-       href_translate(input.href_translate),
-       reload_type(input.reload_type),
-      impression(input.impression),
-       is_pdf(input.is_pdf) {
- #if DCHECK_IS_ON()
-   DCHECK(input.Valid());
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -105,8 +105,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation,
- 
- // Controls whether the Conversion Measurement API infrastructure is enabled.
- BASE_FEATURE(kConversionMeasurement,
-             "ConversionMeasurement",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ConversionMeasurement",                 // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);      // in Bromite
- 
- // Controls whether LCP calculations should exclude low-entropy images. If
- // enabled, then the associated parameter sets the cutoff, expressed as the
-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
-@@ -176,6 +176,13 @@
-   },
- 
-   data: [
-+    {
-+      // disable by default features by marking as
-+      // depends_on: ["DisabledForBromite"]
-+      // to work is needed to remove "origin_trial_feature_name"
-+      // and "origin_trial_allows_third_party"
-+      name: "DisabledForBromite",
-+    },
-     {
-       name: "AbortSignalThrowIfAborted",
-       status: "stable",
--
-2.25.1
--- a/build/patches/Disable-crash-reporting.patch
+++ b/build/patches/Disable-crash-reporting.patch
@ -1,25 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 9 Apr 2022 21:43:35 +0200
-Subject: Disable crash reporting
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- content/public/common/content_features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -241,8 +241,8 @@ BASE_FEATURE(kCooperativeScheduling,
- // Enables crash reporting via Reporting API.
- // https://www.w3.org/TR/reporting/#crash-report
- BASE_FEATURE(kCrashReporting,
-             "CrashReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "CrashReporting",                      // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
- 
- // Enables support for the `Critical-CH` response header.
- // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
--
-2.25.1
--- a/build/patches/Disable-feeds-support-by-default.patch
+++ b/build/patches/Disable-feeds-support-by-default.patch
@ -1,65 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 19 Dec 2019 22:52:53 +0100
-Subject: Disable feeds support by default
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------
- .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
- components/feed/feed_feature_list.cc                      | 8 ++++----
- 3 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
-+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
-@@ -50,13 +50,7 @@ public final class FeedFeatures {
-      *         the user is signed in and confirms it's not a child profile.
-      */
-     public static boolean isWebFeedUIEnabled() {
-        // TODO(b/197354832, b/188188861): change consent check to SIGNIN.
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)
-                && IdentityServicesProvider.get()
-                           .getSigninManager(Profile.getLastUsedRegularProfile())
-                           .getIdentityManager()
-                           .hasPrimaryAccount(ConsentLevel.SYNC)
-                && !Profile.getLastUsedRegularProfile().isChild();
-+        return false;
-     }
- 
-     public static boolean shouldUseWebFeedAwarenessIPH() {
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -78,7 +78,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false)
-                     .put(ChromeFeatureList.INSTANCE_SWITCHER, true)
-                     .put(ChromeFeatureList.INSTANT_START, false)
-                    .put(ChromeFeatureList.INTEREST_FEED_V2, true)
-+                    .put(ChromeFeatureList.INTEREST_FEED_V2, false)
-                     .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false)
-                     .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)
-                     .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false)
-diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
--- a/components/feed/feed_feature_list.cc
-+++ b/components/feed/feed_feature_list.cc
-@@ -17,14 +17,14 @@
- namespace feed {
- 
- BASE_FEATURE(kInterestFeedContentSuggestions,
-             "InterestFeedContentSuggestions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "InterestFeedContentSuggestions",          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
- // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
- // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
- // changed, please update the cached one's default value in CachedFeatureFlags.
- BASE_FEATURE(kInterestFeedV2,
-             "InterestFeedV2",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "InterestFeedV2",                          // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
- 
- BASE_FEATURE(kInterestFeedV2Autoplay,
-              "InterestFeedV2Autoplay",
--
-2.25.1
--- a/build/patches/Disable-fetching-of-all-field-trials.patch
+++ b/build/patches/Disable-fetching-of-all-field-trials.patch
@ -1,236 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 8 Jul 2018 18:16:34 +0200
-Subject: Disable fetching of all field trials
-
-Disable seed-based field trials.
-Disable reporting of Omnibox suggestions header.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- android_webview/nonembedded/BUILD.gn          |  2 --
- .../services/VariationsSeedServer.java        |  2 --
- .../metrics/chrome_browser_sampling_trials.cc |  4 +++
- components/ukm/ukm_recorder_impl.cc           |  3 +++
- .../firstrun/VariationsSeedBridge.java        |  2 +-
- .../firstrun/VariationsSeedFetcher.java       | 26 ++++---------------
- .../variations/net/omnibox_http_headers.cc    |  4 +--
- .../variations/net/variations_http_headers.cc |  3 +++
- .../service/variations_field_trial_creator.cc |  3 ++-
- .../variations/service/variations_service.cc  | 15 +++--------
- .../renderer/core/loader/document_loader.cc   |  7 -----
- 11 files changed, 23 insertions(+), 48 deletions(-)
-
-diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
--- a/android_webview/nonembedded/BUILD.gn
-+++ b/android_webview/nonembedded/BUILD.gn
-@@ -106,7 +106,6 @@ android_library("services_java") {
-   sources = [
-     "java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
-     "java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
-    "java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java",
-     "java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java",
-     "java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java",
-     "java/src/org/chromium/android_webview/services/ComponentsProviderService.java",
-@@ -119,7 +118,6 @@ android_library("services_java") {
-     "java/src/org/chromium/android_webview/services/SafeModeService.java",
-     "java/src/org/chromium/android_webview/services/ServicesStatsHelper.java",
-     "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java",
-    "java/src/org/chromium/android_webview/services/VariationsSeedHolder.java",
-     "java/src/org/chromium/android_webview/services/VariationsSeedServer.java",
-   ]
-   deps = [
-diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
--- a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
-+++ b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/VariationsSeedServer.java
-@@ -31,8 +31,6 @@ public class VariationsSeedServer extends Service {
-         @Override
-         public void getSeed(ParcelFileDescriptor newSeedFile, long oldSeedDate,
-                 IVariationsSeedServerCallback callback) {
-            maybeReportMetrics(callback);
-            VariationsSeedHolder.getInstance().writeSeedIfNewer(newSeedFile, oldSeedDate);
-         }
-     };
- 
-diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
--- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-+++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-@@ -54,6 +54,8 @@ void CreateFallbackSamplingTrial(
-     const std::string& feature_name,
-     const int sampled_in_rate_per_mille,
-     base::FeatureList* feature_list) {
-+  if ((true))
-+    return;
-   scoped_refptr<base::FieldTrial> trial(
-       base::FieldTrialList::FactoryGetFieldTrial(
-           trial_name, /*total_probability=*/1000, "Default", entropy_provider));
-@@ -93,6 +95,8 @@ void CreateFallbackUkmSamplingTrial(
-     const base::FieldTrial::EntropyProvider& entropy_provider,
-     bool is_stable_channel,
-     base::FeatureList* feature_list) {
-+  if ((true))
-+    return;
-   static const char kSampledGroup_Stable[] = "Sampled_NoSeed_Stable";
-   static const char kSampledGroup_Other[] = "Sampled_NoSeed_Other";
-   const char* sampled_group = kSampledGroup_Other;
-diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc
--- a/components/ukm/ukm_recorder_impl.cc
-+++ b/components/ukm/ukm_recorder_impl.cc
-@@ -206,6 +206,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map,
- 
- UkmRecorderImpl::UkmRecorderImpl()
-     : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
-+  if ((true))
-+    return;
-+
-   max_kept_sources_ =
-       static_cast<size_t>(base::GetFieldTrialParamByFeatureAsInt(
-           kUkmFeature, "MaxKeptSources", max_kept_sources_));
-diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java
--- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java
-+++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedBridge.java
-@@ -51,7 +51,7 @@ public class VariationsSeedBridge {
-     }
- 
-     @CalledByNative
-    private static void clearFirstRunPrefs() {
-+    public static void clearFirstRunPrefs() {
-         ContextUtils.getAppSharedPreferences()
-                 .edit()
-                 .remove(VARIATIONS_FIRST_RUN_SEED_BASE64)
-diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
--- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
-+++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
-@@ -340,29 +340,13 @@ public class VariationsSeedFetcher {
-      */
-     public void fetchSeed(String restrictMode, String milestone, String channel) {
-         assert !ThreadUtils.runningOnUiThread();
-        // Prevent multiple simultaneous fetches
-        synchronized (sLock) {
-            SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
-            // Early return if an attempt has already been made to fetch the seed, even if it
-            // failed. Only attempt to get the initial Java seed once, since a failure probably
-            // indicates a network problem that is unlikely to be resolved by a second attempt.
-            // Note that VariationsSeedBridge.hasNativePref() is a pure Java function, reading an
-            // Android preference that is set when the seed is fetched by the native code.
-            if (prefs.getBoolean(VARIATIONS_INITIALIZED_PREF, false)
-                    || VariationsSeedBridge.hasNativePref()) {
-                return;
-            }
-+         synchronized (sLock) {
-+            VariationsSeedBridge.clearFirstRunPrefs();
- 
-            SeedFetchInfo fetchInfo = downloadContent(
-                    VariationsPlatform.ANDROID, restrictMode, milestone, channel, null);
-            if (fetchInfo.seedInfo != null) {
-                SeedInfo info = fetchInfo.seedInfo;
-                VariationsSeedBridge.setVariationsFirstRunSeed(info.seedData, info.signature,
-                        info.country, info.date, info.isGzipCompressed);
-            }
-+            SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
-             // VARIATIONS_INITIALIZED_PREF should still be set to true when exceptions occur
-             prefs.edit().putBoolean(VARIATIONS_INITIALIZED_PREF, true).apply();
-        }
-+         }
-     }
- 
-     private void recordFetchResultOrCode(int resultOrCode) {
-@@ -405,7 +389,7 @@ public class VariationsSeedFetcher {
-      * @param curSeedInfo optional currently saved seed info to set the `If-None-Match` header.
-      * @return the object holds the request result and seed data with its related header fields.
-      */
-    public SeedFetchInfo downloadContent(@VariationsPlatform int platform, String restrictMode,
-+    private SeedFetchInfo downloadContent(@VariationsPlatform int platform, String restrictMode,
-             String milestone, String channel, @Nullable SeedInfo curSeedInfo) {
-         SeedFetchInfo fetchInfo = new SeedFetchInfo();
-         HttpURLConnection connection = null;
-diff --git a/components/variations/net/omnibox_http_headers.cc b/components/variations/net/omnibox_http_headers.cc
--- a/components/variations/net/omnibox_http_headers.cc
-+++ b/components/variations/net/omnibox_http_headers.cc
-@@ -21,8 +21,8 @@ const char kOmniboxOnDeviceSuggestionsHeader[] =
- // Whether to enable reporting the header. Included as a quick escape hatch in
- // case of crashes.
- BASE_FEATURE(kReportOmniboxOnDeviceSuggestionsHeader,
-             "ReportOmniboxOnDeviceSuggestionsHeader",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "ReportOmniboxOnDeviceSuggestionsHeader",  // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
- 
- std::string GetHeaderValue() {
-   const std::string group =
-diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc
--- a/components/variations/net/variations_http_headers.cc
-+++ b/components/variations/net/variations_http_headers.cc
-@@ -257,6 +257,9 @@ class VariationsHeaderHelper {
-   VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
- 
-   bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
-+    if((true))
-+      return false;
-+
-     AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
- 
-     // Note the criteria for attaching client experiment headers:
-diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
--- a/components/variations/service/variations_field_trial_creator.cc
-+++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -161,7 +161,8 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
- // "--variations-server-url" switches are passed. It is however possible to
- // apply the testing config as well as specify additional field trials (using
- // "--force-fieldtrials") by using the "--enable-field-trial-config" switch.
-bool ShouldUseFieldTrialTestingConfig(const base::CommandLine* command_line) {
-+bool ShouldUseFieldTrialTestingConfig(const base::CommandLine* command_line) { // disabled in Bromite
-+  if ((true)) return false;
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-   return command_line->HasSwitch(switches::kEnableFieldTrialTestingConfig);
- #else
-diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
--- a/components/variations/service/variations_service.cc
-+++ b/components/variations/service/variations_service.cc
-@@ -220,17 +220,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
- // Variations seed fetching is only enabled in official Chrome builds, if a URL
- // is specified on the command line, and for testing.
- bool IsFetchingEnabled() {
-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kVariationsServerURL) &&
-      !g_should_fetch_for_testing) {
-    DVLOG(1)
-        << "Not performing repeated fetching in unofficial build without --"
-        << switches::kVariationsServerURL << " specified.";
-    return false;
-  }
-#endif
-  return true;
-+  // set to false even if not used on Android
-+  return false;
- }
- 
- // Returns the already downloaded first run seed, and clear the seed from the
-@@ -589,7 +580,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
-   // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
-   // had a chance to run yet from the previous request. In this case, don't
-   // start a new request and just let the previous one finish.
-  if (pending_seed_request_)
-+  if ((true) || pending_seed_request_)
-     return false;
- 
-   last_request_was_http_retry_ = is_http_retry;
-diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
--- a/third_party/blink/renderer/core/loader/document_loader.cc
-+++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -173,13 +173,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
- WebVector<int> CopyInitiatorOriginTrials(
-     const Vector<OriginTrialFeature>& initiator_origin_trial_features) {
-   WebVector<int> result;
-  for (auto feature : initiator_origin_trial_features) {
-    // Convert from OriginTrialFeature to int. These values are passed between
-    // blink navigations. OriginTrialFeature isn't visible outside of blink (and
-    // doesn't need to be) so the values are transferred outside of blink as
-    // ints and casted to OriginTrialFeature once being processed in blink.
-    result.emplace_back(static_cast<int>(feature));
-  }
-   return result;
- }
- 
--
-2.25.1
--- a/build/patches/Disable-idle-detection.patch
+++ b/build/patches/Disable-idle-detection.patch
@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 19 Feb 2022 12:01:33 +0100
-Subject: Disable idle detection
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- content/public/common/content_features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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
-@@ -479,7 +479,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
- // This is intended as a kill switch for the Idle Detection feature. To enable
- // this feature, the experimental web platform features flag should be set,
- // or the site should obtain an Origin Trial token.
-BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_DISABLED_BY_DEFAULT);
- 
- // A feature flag for the memory-backed code cache.
- BASE_FEATURE(kInMemoryCodeCache,
--
-2.25.1
--- a/build/patches/Disable-lock-icon-in-address-bar-by-default.patch
+++ b/build/patches/Disable-lock-icon-in-address-bar-by-default.patch
@ -1,25 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 8 Oct 2021 00:30:26 +0200
-Subject: Disable lock icon in address bar by default
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- components/omnibox/common/omnibox_features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
--- a/components/omnibox/common/omnibox_features.cc
-+++ b/components/omnibox/common/omnibox_features.cc
-@@ -433,8 +433,8 @@ BASE_FEATURE(kSiteSearchStarterPack,
- 
- // Experiment to introduce new security indicators for HTTPS.
- BASE_FEATURE(kUpdatedConnectionSecurityIndicators,
-             "OmniboxUpdatedConnectionSecurityIndicators",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-+             "OmniboxUpdatedConnectionSecurityIndicators",    // enabled by default
-+             base::FEATURE_ENABLED_BY_DEFAULT);               // in Bromite
- 
- // Feature used to default typed navigations to use HTTPS instead of HTTP.
- // This only applies to navigations that don't have a scheme such as
--
-2.25.1
--- a/build/patches/Disable-media-router-and-remoting-by-default.patch
+++ b/build/patches/Disable-media-router-and-remoting-by-default.patch
@ -1,79 +0,0 @@
-From: Daniel Micay <danielmicay@gmail.com>
-Date: Thu, 4 Jul 2019 19:08:52 -0400
-Subject: Disable media router and remoting by default
-
-Original License: MIT - https://spdx.org/licenses/MIT.html
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../media/router/media_router_feature.cc      | 27 ++++++-------------
- chrome/browser/profiles/profile_impl.cc       |  2 +-
- 2 files changed, 9 insertions(+), 20 deletions(-)
-
-diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
--- a/chrome/browser/media/router/media_router_feature.cc
-+++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -59,26 +59,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
- 
- #endif  // !BUILDFLAG(IS_ANDROID)
- 
-namespace {
-const PrefService::Preference* GetMediaRouterPref(
-    content::BrowserContext* context) {
-  return user_prefs::UserPrefs::Get(context)->FindPreference(
-      ::prefs::kEnableMediaRouter);
-}
-
-base::flat_map<content::BrowserContext*, bool>& GetStoredPrefValues() {
-  static base::NoDestructor<base::flat_map<content::BrowserContext*, bool>>
-      stored_pref_values;
-
-  return *stored_pref_values;
-}
-}  // namespace
-
-void ClearMediaRouterStoredPrefsForTesting() {
-+/*void ClearMediaRouterStoredPrefsForTesting() {
-   GetStoredPrefValues().clear();
-}
-+}*/
- 
- bool MediaRouterEnabled(content::BrowserContext* context) {
-+  return false;
-+}
-+
-+/*
- #if !BUILDFLAG(IS_ANDROID)
-   if (!base::FeatureList::IsEnabled(kMediaRouter))
-     return false;
-@@ -106,7 +95,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
-     return allowed;
-   }
-   return true;
-}
-+}*/
- 
- #if !BUILDFLAG(IS_ANDROID)
- void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-@@ -119,7 +108,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-                                PrefRegistry::PUBLIC);
- 
-   registry->RegisterBooleanPref(
-      media_router::prefs::kMediaRouterMediaRemotingEnabled, true);
-+      media_router::prefs::kMediaRouterMediaRemotingEnabled, false); // disabled in Bromite
-   registry->RegisterListPref(
-       media_router::prefs::kMediaRouterTabMirroringSources);
- 
-diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
-+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -411,7 +411,7 @@ void ProfileImpl::RegisterProfilePrefs(
- #endif
- 
-   registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
-  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, true);
-+  registry->RegisterBooleanPref(prefs::kEnableMediaRouter, false);
- #if !BUILDFLAG(IS_ANDROID)
-   registry->RegisterBooleanPref(prefs::kShowCastIconInToolbar, false);
- #endif  // !BUILDFLAG(IS_ANDROID)
--
-2.25.1
--- a/build/patches/Disable-minidump-upload-scheduling.patch
+++ b/build/patches/Disable-minidump-upload-scheduling.patch
@ -1,39 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 27 Feb 2022 23:58:22 +0100
-Subject: Disable minidump upload scheduling
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- components/endpoint_fetcher/endpoint_fetcher.cc              | 2 +-
- .../minidump_uploader/MinidumpUploadJobService.java          | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
--- a/components/endpoint_fetcher/endpoint_fetcher.cc
-+++ b/components/endpoint_fetcher/endpoint_fetcher.cc
-@@ -340,7 +340,7 @@ void EndpointFetcher::OnResponseFetched(
-     }
-   } else {
-     std::string net_error = net::ErrorToString(net_error_code);
-    VLOG(1) << __func__ << " with response error: " << net_error;
-+    LOG(ERROR) << __func__ << " with response error: " << net_error;
-     response->response = "There was a response error";
-     std::move(endpoint_fetcher_callback).Run(std::move(response));
-   }
-diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
--- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
-+++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
-@@ -45,7 +45,10 @@ public abstract class MinidumpUploadJobService extends JobService {
-      *     to build an upload job for scheduling.
-      */
-     public static void scheduleUpload(JobInfo.Builder jobInfoBuilder) {
-        Log.i(TAG, "Scheduling upload of all pending minidumps.");
-+        Log.i(TAG, "Scheduling upload of all pending minidumps is disabled.");
-+        if ((true)) {
-+           return;
-+        }
-         JobScheduler scheduler =
-                 (JobScheduler) ContextUtils.getApplicationContext().getSystemService(
-                         Context.JOB_SCHEDULER_SERVICE);
--
-2.25.1
--- a/build/patches/Disable-offline-pages-in-CCT.patch
+++ b/build/patches/Disable-offline-pages-in-CCT.patch
@ -1,25 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 30 May 2019 03:37:45 +0200
-Subject: Disable offline pages in CCT
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- components/offline_pages/core/offline_page_feature.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
--- a/components/offline_pages/core/offline_page_feature.cc
-+++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -41,8 +41,8 @@ BASE_FEATURE(kOfflinePagesDescriptivePendingStatusFeature,
-              base::FEATURE_ENABLED_BY_DEFAULT);
- 
- BASE_FEATURE(kOfflinePagesInDownloadHomeOpenInCctFeature,
-             "OfflinePagesInDownloadHomeOpenInCct",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "OfflinePagesInDownloadHomeOpenInCct",       // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
- 
- BASE_FEATURE(kOfflineIndicatorFeature,
-              "OfflineIndicator",
--
-2.25.1
--- a/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
+++ b/build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
@ -1,49 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 11 Oct 2017 23:24:58 +0200
-Subject: Disable omission of URL elements in Omnibox
-
-Disable all omissions because they are used throughout the code without
-a corresponding user option to individually disable their usage.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../toolbar/chrome_location_bar_model_delegate.cc  |  2 +-
- components/url_formatter/url_formatter.cc          | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-@@ -305,5 +305,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
- // static
- void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
-+  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
- }
-diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
--- a/components/url_formatter/url_formatter.cc
-+++ b/components/url_formatter/url_formatter.cc
-@@ -533,13 +533,13 @@ bool HasTwoViewSourceSchemes(base::StringPiece spec) {
- }  // namespace
- 
- const FormatUrlType kFormatUrlOmitNothing = 0;
-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
-+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
-+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
-+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
-+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
-+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
-+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
-+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
- const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
- const FormatUrlType kFormatUrlOmitMobilePrefix = 1 << 9;
- 
--
-2.25.1
--- a/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch
+++ b/build/patches/Disable-requests-for-single-word-Omnibar-searches.patch
@ -1,30 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 27 Oct 2019 10:21:19 +0100
-Subject: Disable requests for single-word Omnibar searches
-
-Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../ui/omnibox/chrome_omnibox_navigation_observer.cc       | 7 -------
- 1 file changed, 7 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
-@@ -251,13 +251,6 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
-       profile_(profile),
-       show_infobar_(std::move(show_infobar)) {
-   NavigationUserData::CreateForNavigationHandle(navigation, this);
-  if (alternative_nav_match_.destination_url.is_valid()) {
-    loader_ = std::make_unique<AlternativeNavigationURLLoader>(
-        alternative_nav_match.destination_url, this,
-        base::BindOnce(
-            &ChromeOmniboxNavigationObserver::OnAlternativeLoaderDone, this),
-        GetURLLoaderFactory(loader_factory, profile));
-  }
- }
- 
- ChromeOmniboxNavigationObserver::~ChromeOmniboxNavigationObserver() {
--
-2.25.1
--- a/build/patches/Disable-safe-browsing.patch
+++ b/build/patches/Disable-safe-browsing.patch
--- a/build/patches/Disable-safety-check.patch
+++ b/build/patches/Disable-safety-check.patch
@ -1,97 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 6 Mar 2022 17:39:15 +0100
-Subject: Disable safety check
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- chrome/android/BUILD.gn                                   | 5 -----
- chrome/android/chrome_java_sources.gni                    | 1 -
- .../browser/app/omnibox/OmniboxPedalDelegateImpl.java     | 8 --------
- chrome/browser/BUILD.gn                                   | 1 -
- 4 files changed, 15 deletions(-)
-
-diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
-+++ b/chrome/android/BUILD.gn
-@@ -442,7 +442,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/privacy_sandbox/android:java",
-       "//chrome/browser/profiles/android:java",
-       "//chrome/browser/safe_browsing/android:java",
-      "//chrome/browser/safety_check/android:java",
-       "//chrome/browser/search_engines/android:java",
-       "//chrome/browser/search_resumption:java",
-       "//chrome/browser/segmentation_platform:factory_java",
-@@ -1032,8 +1031,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/privacy_guide/android:java",
-       "//chrome/browser/privacy_guide/android:junit",
-       "//chrome/browser/profiles/android:java",
-      "//chrome/browser/safety_check/android:java",
-      "//chrome/browser/safety_check/android:junit",
-       "//chrome/browser/search_engines/android:java",
-       "//chrome/browser/search_resumption:junit",
-       "//chrome/browser/segmentation_platform:factory_java",
-@@ -1556,8 +1553,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/profiles/android:java",
-       "//chrome/browser/safe_browsing/android:java",
-       "//chrome/browser/safe_browsing/android:javatests",
-      "//chrome/browser/safety_check/android:java",
-      "//chrome/browser/safety_check/android:javatests",
-       "//chrome/browser/search_engines/android:java",
-       "//chrome/browser/selection/android:javatests",
-       "//chrome/browser/settings: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
-@@ -946,7 +946,6 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
-   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
-   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
-  "java/src/org/chromium/chrome/browser/safety_check/SafetyCheckUpdatesDelegateImpl.java",
-   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java",
-   "java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",
-   "java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
-@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.SuggestionsMetrics;
- import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionViewProperties.PedalIcon;
- import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
- import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
-import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
- import org.chromium.components.browser_ui.settings.SettingsLauncher;
-@@ -96,12 +95,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate {
-                     startActivity(intent);
-                 }
-                 break;
-            case OmniboxPedalType.RUN_CHROME_SAFETY_CHECK:
-                settingsLauncher.launchSettingsActivity(mActivity,
-                        SafetyCheckSettingsFragment.class,
-                        SafetyCheckSettingsFragment.createBundle(
-                                /*runSafetyCheckImmediately=*/true));
-                break;
-             case OmniboxPedalType.MANAGE_SITE_SETTINGS:
-                 settingsLauncher.launchSettingsActivity(mActivity, SiteSettings.class);
-                 break;
-@@ -198,7 +191,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate {
-             case OmniboxPedalType.MANAGE_PASSWORDS:
-             case OmniboxPedalType.UPDATE_CREDIT_CARD:
-             case OmniboxPedalType.LAUNCH_INCOGNITO:
-            case OmniboxPedalType.RUN_CHROME_SAFETY_CHECK:
-             case OmniboxPedalType.MANAGE_SITE_SETTINGS:
-             case OmniboxPedalType.MANAGE_CHROME_SETTINGS:
-             case OmniboxPedalType.VIEW_CHROME_HISTORY:
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -3346,7 +3346,6 @@ static_library("browser") {
-       "//chrome/browser/privacy_sandbox/android:jni_headers",
-       "//chrome/browser/reading_list/android",
-       "//chrome/browser/safe_browsing/android:safe_browsing_enums",
-      "//chrome/browser/safety_check/android",
-       "//chrome/browser/search_resumption:jni_headers",
-       "//chrome/browser/share/android:jni_headers",
-       "//chrome/browser/share/core/crow:crow_configuration",
--
-2.25.1
--- a/build/patches/Disable-smart-selection-by-default.patch
+++ b/build/patches/Disable-smart-selection-by-default.patch
@ -1,124 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 24 Jan 2020 19:17:22 +0100
-Subject: Disable smart selection by default
-
-Allow web search in incognito mode; Smart Selection still
-disabled in incognito as per upstream.
-
-Partial revert of da1d809c003749846cb4ade8c11b6d038e44416b to restore
-the ChromeSmartSelection feature flag.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../contextualsearch/SelectionClientManager.java  |  4 +++-
- .../browser/flags/android/chrome_feature_list.cc  |  5 +++++
- .../browser/flags/android/chrome_feature_list.h   |  1 +
- .../chrome/browser/flags/ChromeFeatureList.java   |  1 +
- .../selection/SelectionPopupControllerImpl.java   |  2 +-
- testing/variations/fieldtrial_testing_config.json | 15 +++++++++++++++
- 6 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
-@@ -10,6 +10,7 @@ import android.view.textclassifier.TextClassifier;
- import androidx.annotation.Nullable;
- import androidx.annotation.VisibleForTesting;
- 
-+import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.content_public.browser.SelectAroundCaretResult;
- import org.chromium.content_public.browser.SelectionClient;
- import org.chromium.content_public.browser.SelectionEventProcessor;
-@@ -45,7 +46,8 @@ public class SelectionClientManager {
-      * @param webContents The {@link WebContents} that will show popups for this client.
-      */
-     SelectionClientManager(WebContents webContents) {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
-+        if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_SMART_SELECTION)
-+                && Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
-             assert webContents != null;
-             mOptionalSelectionClient = SelectionClient.createSmartSelectionClient(webContents);
-             SelectionPopupController controller =
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -188,6 +188,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kCCTBrandTransparency,
-     &kCCTClientDataHeader,
-     &kCCTIncognito,
-+    &kChromeSmartSelection,
-     &kCCTIncognitoAvailableToThirdParty,
-     &kCCTNewDownloadTab,
-     &kCCTPackageNameRecording,
-@@ -996,6 +997,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
-              "DiscoverFeedMultiColumn",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+BASE_FEATURE(kChromeSmartSelection,
-+             "ChromeSmartSelection",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- BASE_FEATURE(kTabStripRedesign,
-              "TabStripRedesign",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -62,6 +62,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
- BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
- BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
- BASE_DECLARE_FEATURE(kChromeShareLongScreenshot);
-+BASE_DECLARE_FEATURE(kChromeSmartSelection);
- BASE_DECLARE_FEATURE(kChromeShareScreenshot);
- BASE_DECLARE_FEATURE(kChromeSharingHub);
- BASE_DECLARE_FEATURE(kChromeSharingHubLaunchAdjacent);
-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
-@@ -255,6 +255,7 @@ public abstract class ChromeFeatureList {
-     public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI";
-     public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals";
-     public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
-+    public static final String CHROME_SMART_SELECTION = "ChromeSmartSelection";
-     public static final String CCT_REMOVE_REMOTE_VIEW_IDS = "CCTRemoveRemoteViewIds";
-     public static final String CCT_RESIZABLE_90_MAXIMUM_HEIGHT = "CCTResizable90MaximumHeight";
-     public static final String CCT_RESIZABLE_ALLOW_RESIZE_BY_USER_GESTURE =
-diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
-+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
-@@ -822,7 +822,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
-             menu.removeItem(R.id.select_action_menu_share);
-         }
- 
-        if (isFocusedNodeEditable() || isIncognito()
-+        if (isFocusedNodeEditable()
-                 || !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) {
-             menu.removeItem(R.id.select_action_menu_web_search);
-         }
-diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
-+++ b/testing/variations/fieldtrial_testing_config.json
-@@ -3045,6 +3045,21 @@
-             ]
-         }
-     ],
-+    "ChromeSmartSelection": [
-+        {
-+            "platforms": [
-+                "android"
-+            ],
-+            "experiments": [
-+                {
-+                    "name": "Enabled_Launch",
-+                    "enable_features": [
-+                        "ChromeSmartSelection"
-+                    ]
-+                }
-+            ]
-+        }
-+    ],
-     "CommerceHintAndroid": [
-         {
-             "platforms": [
--
-2.25.1
--- a/build/patches/Disable-some-signed-exchange-features.patch
+++ b/build/patches/Disable-some-signed-exchange-features.patch
@ -1,33 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 2 Nov 2019 16:22:56 +0100
-Subject: Disable some signed exchange features
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- content/public/common/content_features.cc | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
--- a/content/public/common/content_features.cc
-+++ b/content/public/common/content_features.cc
-@@ -999,14 +999,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop,
- // Signed Exchange Reporting for distributors
- // https://www.chromestatus.com/feature/5687904902840320
- BASE_FEATURE(kSignedExchangeReportingForDistributors,
-             "SignedExchangeReportingForDistributors",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "SignedExchangeReportingForDistributors",    // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
- 
- // Origin-Signed HTTP Exchanges (for WebPackage Loading)
- // https://www.chromestatus.com/feature/5745285984681984
- BASE_FEATURE(kSignedHTTPExchange,
-             "SignedHTTPExchange",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "SignedHTTPExchange",                        // must be disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
- 
- // Delays RenderProcessHost shutdown by a few seconds to allow the subframe's
- // process to be potentially reused. This aims to reduce process churn in
--
-2.25.1
--- a/build/patches/Disable-support-for-RAR-files-inspection.patch
+++ b/build/patches/Disable-support-for-RAR-files-inspection.patch
@ -1,97 +0,0 @@
-From: Michael Gilbert <mgilbert@debian.org>
-Date: Wed, 21 Nov 2018 02:37:35 +0000
-Subject: Disable support for RAR files inspection
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../download_protection/file_analyzer.cc      |  2 +-
- chrome/common/safe_browsing/BUILD.gn          | 33 -------------------
- .../file_util/safe_archive_analyzer.cc        |  4 +--
- 3 files changed, 2 insertions(+), 37 deletions(-)
-
-diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
-   if (inspection_type == DownloadFileType::ZIP) {
-     StartExtractZipFeatures();
-   } else if (inspection_type == DownloadFileType::RAR) {
-    StartExtractRarFeatures();
-+    LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build";
- #if BUILDFLAG(IS_MAC)
-   } else if (inspection_type == DownloadFileType::DMG) {
-     StartExtractDmgFeatures();
-diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
--- a/chrome/common/safe_browsing/BUILD.gn
-+++ b/chrome/common/safe_browsing/BUILD.gn
-@@ -56,38 +56,6 @@ if (safe_browsing_mode == 1) {
-     public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
-   }
- 
-  source_set("rar_analyzer") {
-    sources = [
-      "rar_analyzer.cc",
-      "rar_analyzer.h",
-    ]
-
-    deps = [
-      ":archive_analyzer_results",
-      ":download_type_util",
-      "//base",
-      "//base:i18n",
-      "//components/safe_browsing/core/common",
-      "//third_party/unrar:unrar",
-    ]
-
-    defines = [
-      "_FILE_OFFSET_BITS=64",
-      "LARGEFILE_SOURCE",
-      "RAR_SMP",
-      "SILENT",
-
-      # The following is set to disable certain macro definitions in the unrar
-      # source code.
-      "CHROMIUM_UNRAR",
-
-      # Disables exceptions in unrar, replaces them with process termination.
-      "UNRAR_NO_EXCEPTIONS",
-    ]
-
-    public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
-  }
-
-   if (is_linux || is_win) {
-     source_set("document_analyzer") {
-       sources = [
-@@ -184,7 +152,6 @@ source_set("safe_browsing") {
-       ":archive_analyzer_results",
-       ":binary_feature_extractor",
-       ":download_type_util",
-      ":rar_analyzer",
-       "//components/safe_browsing/core/common",
-       "//third_party/lzma_sdk/google:seven_zip_reader",
-     ]
-diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
--- a/chrome/services/file_util/safe_archive_analyzer.cc
-+++ b/chrome/services/file_util/safe_archive_analyzer.cc
-@@ -6,7 +6,6 @@
- 
- #include "build/build_config.h"
- #include "chrome/common/safe_browsing/archive_analyzer_results.h"
-#include "chrome/common/safe_browsing/rar_analyzer.h"
- #include "chrome/common/safe_browsing/seven_zip_analyzer.h"
- #include "chrome/common/safe_browsing/zip_analyzer.h"
- 
-@@ -47,9 +46,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
-                                          AnalyzeRarFileCallback callback) {
-   DCHECK(rar_file.IsValid());
- 
-+  LOG(FATAL) << "AnalyzeRarFile is disabled in this build";
-   safe_browsing::ArchiveAnalyzerResults results;
-  safe_browsing::rar_analyzer::AnalyzeRarFile(
-      std::move(rar_file), std::move(temporary_file), &results);
-   std::move(callback).Run(results);
- }
- 
--
-2.25.1
--- a/build/patches/Disable-text-fragments-by-default.patch
+++ b/build/patches/Disable-text-fragments-by-default.patch
@ -1,163 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 22 Aug 2020 12:46:20 +0200
-Subject: Disable text fragments by default
-
-Revert "[Text Fragment] Unflag fragment directive removal."
-
-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/browser/about_flags.cc                                | 5 +++++
- chrome/browser/flag-metadata.json                            | 5 +++++
- chrome/browser/flag_descriptions.cc                          | 4 ++++
- chrome/browser/flag_descriptions.h                           | 3 +++
- chrome/browser/ui/prefs/prefs_tab_helper.cc                  | 2 +-
- content/child/runtime_features.cc                            | 1 +
- third_party/blink/common/features.cc                         | 5 +++++
- third_party/blink/public/common/features.h                   | 1 +
- third_party/blink/renderer/core/dom/document.cc              | 5 +++++
- .../blink/renderer/platform/runtime_enabled_features.json5   | 5 ++---
- 10 files changed, 32 insertions(+), 4 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -6275,6 +6275,11 @@ const FeatureEntry kFeatureEntries[] = {
-          "")},
- #endif
- 
-+    {"enable-text-fragment-anchor",
-+     flag_descriptions::kEnableTextFragmentAnchorName,
-+     flag_descriptions::kEnableTextFragmentAnchorDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(blink::features::kTextFragmentAnchor)},
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"enable-web-authentication-chromeos-authenticator",
-      flag_descriptions::kEnableWebAuthenticationChromeOSAuthenticatorName,
-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
-@@ -2706,6 +2706,11 @@
-     "owners": [ "robsc", "napper", "alanlxl" ],
-     "expiry_milestone": 130
-   },
-+  {
-+    "name": "enable-text-fragment-anchor",
-+    "owners": [ "bokan", "input-dev" ],
-+    "expiry_milestone": -1
-+  },
-   {
-     "name": "enable-neural-stylus-palm-rejection",
-     "owners": [ "robsc", "napper", "adlr" ],
-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
-@@ -1387,6 +1387,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] =
-     "intentionally interact with elements on that page. By dropping the events "
-     "we prevent accidental interaction with a page the user has not seen yet.";
- 
-+const char kEnableTextFragmentAnchorName[] = "Enable Text Fragment Anchor.";
-+const char kEnableTextFragmentAnchorDescription[] =
-+    "Enables scrolling to text specified in URL's fragment.";
-+
- const char kEnableCssSelectorFragmentAnchorName[] =
-     "Enables CSS selector fragment anchors";
- const char kEnableCssSelectorFragmentAnchorDescription[] =
-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
-@@ -767,6 +767,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[];
- 
- extern const char kRetailCouponsName[];
- extern const char kRetailCouponsDescription[];
-+extern const char kEnableTextFragmentAnchorName[];
-+extern const char kEnableTextFragmentAnchorDescription[];
-+
- 
- extern const char kDropInputEventsBeforeFirstPaintName[];
- extern const char kDropInputEventsBeforeFirstPaintDescription[];
-diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
-+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
-@@ -361,7 +361,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
-       prefs::kEnableReferrers,
-       !base::FeatureList::IsEnabled(features::kNoReferrers));
-   registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true);
-  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true);
-+  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false);
- #if BUILDFLAG(IS_ANDROID)
-   registry->RegisterDoublePref(browser_ui::prefs::kWebKitFontScaleFactor, 1.0);
-   registry->RegisterBooleanPref(browser_ui::prefs::kWebKitForceEnableZoom,
-diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc
-+++ b/content/child/runtime_features.cc
-@@ -270,6 +270,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
-      features::kSharedArrayBufferOnDesktop},
-     {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill},
-     {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
-+    {wf::EnableTextFragmentIdentifiers, blink::features::kTextFragmentAnchor},
-     {wf::EnableUserActivationSameOriginVisibility,
-      features::kUserActivationSameOriginVisibility},
-     {wf::EnableVideoPlaybackQuality, features::kVideoPlaybackQuality},
-diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
-+++ b/third_party/blink/common/features.cc
-@@ -496,6 +496,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint,
-              "DropInputEventsBeforeFirstPaint",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+// Enable text snippets in URL fragments. https://crbug.com/919204.
-+BASE_FEATURE(kTextFragmentAnchor,
-+             "TextFragmentAnchor",
-+             base::FEATURE_DISABLED_BY_DEFAULT);
-+
- // File handling icons. https://crbug.com/1218213
- BASE_FEATURE(kFileHandlingIcons,
-              "FileHandlingIcons",
-diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h
-+++ b/third_party/blink/public/common/features.h
-@@ -224,6 +224,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV);
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV);
- 
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption);
-+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kTextFragmentAnchor);
- 
- BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioWorkletThreadRealtimePriority);
- 
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4262,9 +4262,14 @@ void Document::SetURL(const KURL& url) {
-   TRACE_EVENT1("navigation", "Document::SetURL", "url",
-                new_url.GetString().Utf8());
- 
-+  // If text fragment identifiers are enabled, we strip the fragment directive
-+  // from the URL fragment.
-+  // E.g. "#id:~:text=a" --> "#id"
-+  if (RuntimeEnabledFeatures::TextFragmentIdentifiersEnabled(domWindow())) {
-   // Strip the fragment directive from the URL fragment. E.g. "#id:~:text=a"
-   // --> "#id". See https://github.com/WICG/scroll-to-text-fragment.
-   new_url = fragment_directive_->ConsumeFragmentDirective(new_url);
-+  }
- 
-   url_ = new_url;
-   UpdateBaseURL();
-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
-@@ -2583,10 +2583,9 @@
-     },
-     {
-       name: "TextFragmentIdentifiers",
-      origin_trial_feature_name: "TextFragmentIdentifiers",
-       public: true,
-      status: "stable",
-      base_feature: "TextFragmentAnchor",
-+      status: "test",
-+      origin_trial_feature_name: "TextFragmentIdentifiers"
-     },
-     {
-       name: "TextFragmentTapOpensContextMenu",
--
-2.25.1
--- a/build/patches/Disable-the-DIAL-repeating-discovery.patch
+++ b/build/patches/Disable-the-DIAL-repeating-discovery.patch
@ -1,36 +0,0 @@
-From: Blaise <BlaiseD@GMail.com>
-Date: Sun, 23 Aug 2020 14:32:55 -0500
-Subject: Disable the DIAL repeating discovery
-
-This causes unnecessary SSDP network spam
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- chrome/browser/media/router/discovery/dial/dial_registry.cc | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrome/browser/media/router/discovery/dial/dial_registry.cc
--- a/chrome/browser/media/router/discovery/dial/dial_registry.cc
-+++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
-@@ -154,10 +154,6 @@ void DialRegistry::StartPeriodicDiscovery() {
-     return;
- 
-   dial_ = CreateDialService();
-  DoDiscovery();
-  repeating_timer_ = std::make_unique<base::RepeatingTimer>();
-  repeating_timer_->Start(FROM_HERE, refresh_interval_delta_, this,
-                          &DialRegistry::DoDiscovery);
-   // Always send the current device list with the next discovery request.  This
-   // may not be necessary, but is done to match previous behavior.
-   ++registry_generation_;
-@@ -174,8 +170,6 @@ void DialRegistry::StopPeriodicDiscovery() {
-   if (!dial_)
-     return;
- 
-  repeating_timer_->Stop();
-  repeating_timer_.reset();
-   ClearDialService();
- }
- 
--
-2.25.1
--- a/build/patches/Disable-third-party-origin-trials.patch
+++ b/build/patches/Disable-third-party-origin-trials.patch
@ -1,241 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 4 Nov 2021 09:19:24 +0100
-Subject: Disable third-party origin trials
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../origin_trials/origin_trial_policy_impl.cc   |  7 ++++---
- .../origin_trials/origin_trial_policy_impl.h    |  2 +-
- .../browser/renderer_host/navigation_request.cc |  1 -
- content/renderer/render_frame_impl.cc           | 17 +----------------
- .../shell/common/shell_origin_trial_policy.cc   | 10 ++++------
- .../origin_trials/trial_token_validator.cc      |  1 +
- .../renderer/core/loader/document_loader.cc     | 17 -----------------
- .../blink/renderer/core/loader/http_equiv.cc    |  2 +-
- .../core/origin_trials/origin_trial_context.cc  |  5 +++--
- 9 files changed, 15 insertions(+), 47 deletions(-)
-
-diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
-+++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.cc
-@@ -20,10 +20,10 @@
- 
- namespace embedder_support {
- 
-// This is the default public key used for validating signatures.
-+// This is an invalid public key that will match no origin trial signature
- static const blink::OriginTrialPublicKey kDefaultPublicKey = {
-     0x7c, 0xc4, 0xb8, 0x9a, 0x93, 0xba, 0x6e, 0xe2, 0xd0, 0xfd, 0x03,
-    0x1d, 0xfb, 0x32, 0x66, 0xc7, 0x3b, 0x72, 0xfd, 0x54, 0x3a, 0x07,
-+    0x1d, 0xfb, 0x32, 0x66, 0x00, 0x01, 0x02, 0xfd, 0x54, 0x3a, 0x07,
-     0x51, 0x14, 0x66, 0xaa, 0x02, 0x53, 0x4e, 0x33, 0xa1, 0x15,
- };
- 
-@@ -54,7 +54,8 @@ OriginTrialPolicyImpl::OriginTrialPolicyImpl() {
- OriginTrialPolicyImpl::~OriginTrialPolicyImpl() = default;
- 
- bool OriginTrialPolicyImpl::IsOriginTrialsSupported() const {
-  return true;
-+  // third-party origin trials are always disabled
-+  return false;
- }
- 
- const std::vector<blink::OriginTrialPublicKey>&
-diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.h b/components/embedder_support/origin_trials/origin_trial_policy_impl.h
--- a/components/embedder_support/origin_trials/origin_trial_policy_impl.h
-+++ b/components/embedder_support/origin_trials/origin_trial_policy_impl.h
-@@ -34,11 +34,11 @@ class OriginTrialPolicyImpl : public blink::OriginTrialPolicy {
-   bool IsTokenDisabled(base::StringPiece token_signature) const override;
-   bool IsOriginSecure(const GURL& url) const override;
- 
-+ private:
-   bool SetPublicKeysFromASCIIString(const std::string& ascii_public_key);
-   bool SetDisabledFeatures(const std::string& disabled_feature_list);
-   bool SetDisabledTokens(const std::string& disabled_token_list);
- 
- private:
-   std::vector<blink::OriginTrialPublicKey> public_keys_;
-   std::set<std::string> disabled_features_;
-   std::set<std::string> disabled_tokens_;
-diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
--- a/content/browser/renderer_host/navigation_request.cc
-+++ b/content/browser/renderer_host/navigation_request.cc
-@@ -7455,7 +7455,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
- void NavigationRequest::ForceEnableOriginTrials(
-     const std::vector<std::string>& trials) {
-   DCHECK(!HasCommitted());
-  commit_params_->force_enabled_origin_trials = trials;
- }
- 
- network::CrossOriginEmbedderPolicy
-diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
--- a/content/renderer/render_frame_impl.cc
-+++ b/content/renderer/render_frame_impl.cc
-@@ -475,10 +475,6 @@ void FillNavigationParamsRequest(
-         common_params.initiator_origin.value();
-   }
- 
-  navigation_params->initiator_origin_trial_features = {
-      common_params.initiator_origin_trial_features.begin(),
-      common_params.initiator_origin_trial_features.end()};
-
-   navigation_params->was_discarded = commit_params.was_discarded;
-   navigation_params->document_ukm_source_id =
-       commit_params.document_ukm_source_id;
-@@ -511,12 +507,6 @@ void FillNavigationParamsRequest(
-   navigation_params->web_bundle_claimed_url =
-       commit_params.web_bundle_claimed_url;
- 
-  WebVector<WebString> web_origin_trials;
-  web_origin_trials.reserve(commit_params.force_enabled_origin_trials.size());
-  for (const auto& trial : commit_params.force_enabled_origin_trials)
-    web_origin_trials.emplace_back(WebString::FromASCII(trial));
-  navigation_params->force_enabled_origin_trials = web_origin_trials;
-
-   if (!commit_params.early_hints_preloaded_resources.empty()) {
-     navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
-     for (const auto& resource : commit_params.early_hints_preloaded_resources) {
-@@ -570,11 +560,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
-           info->url_request.GetURLRequestExtraData().get());
-   DCHECK(url_request_extra_data);
- 
-  // Convert from WebVector<int> to std::vector<int>.
-  std::vector<int> initiator_origin_trial_features(
-      info->initiator_origin_trial_features.begin(),
-      info->initiator_origin_trial_features.end());
-
-   blink::NavigationDownloadPolicy download_policy;
-   download_policy.ApplyDownloadFramePolicy(
-       info->is_opener_navigation, info->url_request.HasUserGesture(),
-@@ -592,7 +577,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
-       info->url_request.HasUserGesture(),
-       info->url_request.HasTextFragmentToken(),
-       info->should_check_main_world_content_security_policy,
-      initiator_origin_trial_features, info->href_translate.Latin1(),
-+      /*initiator_origin_trial_features*/std::vector<int>(), info->href_translate.Latin1(),
-       is_history_navigation_in_new_child_frame, info->input_start,
-       request_destination);
- }
-diff --git a/content/shell/common/shell_origin_trial_policy.cc b/content/shell/common/shell_origin_trial_policy.cc
--- a/content/shell/common/shell_origin_trial_policy.cc
-+++ b/content/shell/common/shell_origin_trial_policy.cc
-@@ -13,13 +13,10 @@ namespace content {
- 
- namespace {
- 
-// This is the public key which the content shell will use to enable origin
-// trial features. Trial tokens for use in web tests can be created with the
-// tool in /tools/origin_trials/generate_token.py, using the private key
-// contained in /tools/origin_trials/eftest.key.
-+// This is an invalid public key that does not allow any origin trial verification
- static const blink::OriginTrialPublicKey kOriginTrialPublicKey = {
-     0x75, 0x10, 0xac, 0xf9, 0x3a, 0x1c, 0xb8, 0xa9, 0x28, 0x70, 0xd2,
-    0x9a, 0xd0, 0x0b, 0x59, 0xe1, 0xac, 0x2b, 0xb7, 0xd5, 0xca, 0x1f,
-+    0x9a, 0xd0, 0x00, 0x01, 0x02, 0xac, 0x2b, 0xb7, 0xd5, 0xca, 0x1f,
-     0x64, 0x90, 0x08, 0x8e, 0xa8, 0xe0, 0x56, 0x3a, 0x04, 0xd0,
- };
- 
-@@ -32,7 +29,8 @@ ShellOriginTrialPolicy::ShellOriginTrialPolicy() {
- ShellOriginTrialPolicy::~ShellOriginTrialPolicy() {}
- 
- bool ShellOriginTrialPolicy::IsOriginTrialsSupported() const {
-  return true;
-+  // third-party origin trials are always disabled
-+  return false;
- }
- 
- const std::vector<blink::OriginTrialPublicKey>&
-diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/third_party/blink/common/origin_trials/trial_token_validator.cc
--- a/third_party/blink/common/origin_trials/trial_token_validator.cc
-+++ b/third_party/blink/common/origin_trials/trial_token_validator.cc
-@@ -401,6 +401,7 @@ TrialTokenValidator::GetValidTokens(const url::Origin& origin,
- 
- // static
- bool TrialTokenValidator::IsTrialPossibleOnOrigin(const GURL& url) {
-+  if ((true)) return false;
-   OriginTrialPolicy* policy = PolicyGetter().Run();
-   return policy && policy->IsOriginTrialsSupported() &&
-          policy->IsOriginSecure(url);
-diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
--- a/third_party/blink/renderer/core/loader/document_loader.cc
-+++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -160,13 +160,6 @@ namespace {
- Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
-     const WebVector<int>& initiator_origin_trial_features) {
-   Vector<OriginTrialFeature> result;
-  for (auto feature : initiator_origin_trial_features) {
-    // Convert from int to OriginTrialFeature. These values are passed between
-    // blink navigations. OriginTrialFeature isn't visible outside of blink (and
-    // doesn't need to be) so the values are transferred outside of blink as
-    // ints and casted to OriginTrialFeature once being processed in blink.
-    result.push_back(static_cast<OriginTrialFeature>(feature));
-  }
-   return result;
- }
- 
-@@ -179,18 +172,12 @@ WebVector<int> CopyInitiatorOriginTrials(
- Vector<String> CopyForceEnabledOriginTrials(
-     const WebVector<WebString>& force_enabled_origin_trials) {
-   Vector<String> result;
-  result.ReserveInitialCapacity(
-      base::checked_cast<wtf_size_t>(force_enabled_origin_trials.size()));
-  for (const auto& trial : force_enabled_origin_trials)
-    result.push_back(trial);
-   return result;
- }
- 
- WebVector<WebString> CopyForceEnabledOriginTrials(
-     const Vector<String>& force_enabled_origin_trials) {
-   WebVector<String> result;
-  for (const auto& trial : force_enabled_origin_trials)
-    result.emplace_back(trial);
-   return result;
- }
- 
-@@ -2663,10 +2650,6 @@ void DocumentLoader::CreateParserPostCommit() {
-           OriginTrialFeature::kTouchEventFeatureDetection);
-     }
- 
-    // Enable any origin trials that have been force enabled for this commit.
-    window->GetOriginTrialContext()->AddForceEnabledTrials(
-        force_enabled_origin_trials_);
-
-     OriginTrialContext::ActivateNavigationFeaturesFromInitiator(
-         window, &initiator_origin_trial_features_);
-   }
-diff --git a/third_party/blink/renderer/core/loader/http_equiv.cc b/third_party/blink/renderer/core/loader/http_equiv.cc
--- a/third_party/blink/renderer/core/loader/http_equiv.cc
-+++ b/third_party/blink/renderer/core/loader/http_equiv.cc
-@@ -108,7 +108,7 @@ void HttpEquiv::ProcessHttpEquivDefaultStyle(Document& document,
- 
- void HttpEquiv::ProcessHttpEquivOriginTrial(LocalDOMWindow* window,
-                                             const AtomicString& content) {
-  if (!window)
-+  if ((true))
-     return;
-   // For meta tags injected by script, process the token with the origin of the
-   // external script, if available. Get the top 3 script urls from the stack, as
-diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
--- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-+++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-@@ -314,6 +314,9 @@ void OriginTrialContext::AddToken(const String& token) {
- void OriginTrialContext::AddTokenFromExternalScript(
-     const String& token,
-     const Vector<scoped_refptr<SecurityOrigin>>& external_origins) {
-+  if ((true)) {
-+    return;
-+  }
-   Vector<OriginInfo> script_origins;
-   for (const scoped_refptr<SecurityOrigin>& origin : external_origins) {
-     OriginInfo origin_info = {.origin = origin,
-@@ -441,8 +444,6 @@ bool OriginTrialContext::InstallSettingFeature(
- }
- 
- void OriginTrialContext::AddFeature(OriginTrialFeature feature) {
-  enabled_features_.insert(feature);
-  InitializePendingFeatures();
- }
- 
- bool OriginTrialContext::IsFeatureEnabled(OriginTrialFeature feature) const {
--
-2.25.1
--- a/build/patches/Disable-update-scheduler.patch
+++ b/build/patches/Disable-update-scheduler.patch
@ -1,25 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 27 Oct 2018 17:54:01 +0200
-Subject: Disable update scheduler
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../components/component_updater/UpdateScheduler.java         | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
--- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
-+++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
-@@ -33,9 +33,7 @@ public class UpdateScheduler {
- 
-     @CalledByNative
-     /* package */ static boolean isAvailable() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-                || ChromiumPlayServicesAvailability.isGooglePlayServicesAvailable(
-                        ContextUtils.getApplicationContext());
-+        return false;
-     }
- 
-     /* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
--
-2.25.1
--- a/build/patches/Disable-various-metrics.patch
+++ b/build/patches/Disable-various-metrics.patch
@ -1,210 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 25 Apr 2018 10:23:51 +0200
-Subject: Disable various metrics
-
-Disable metrics on all I/O threads
-Set initial metrics opt-out
-Disable metrics collection for NTP tiles
-Fix startup crash for debug builds (uazo)
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../browser/firstrun/FirstRunActivityBase.java  |  2 +-
- .../android/ntp/most_visited_sites_bridge.cc    | 17 -----------------
- chrome/browser/browser_process_impl.cc          |  2 +-
- chrome/browser/chrome_content_browser_client.cc | 15 ---------------
- .../chrome_metrics_services_manager_client.cc   |  8 ++++----
- components/ntp_tiles/BUILD.gn                   |  3 ---
- components/ntp_tiles/most_visited_sites.cc      |  2 --
- services/metrics/public/cpp/ukm_recorder.cc     |  2 +-
- 8 files changed, 7 insertions(+), 44 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
-@@ -48,7 +48,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
-     static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
-     static final String SHOW_SYNC_CONSENT_PAGE = "ShowSyncConsent";
- 
-    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
-+    public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
- 
-     private static PolicyLoadListenerFactory sPolicyLoadListenerFactory;
- 
-diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
-+++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
-@@ -26,7 +26,6 @@
- #include "chrome/browser/profiles/profile_android.h"
- #include "components/favicon_base/favicon_types.h"
- #include "components/history/core/browser/history_service.h"
-#include "components/ntp_tiles/metrics.h"
- #include "components/ntp_tiles/most_visited_sites.h"
- #include "components/ntp_tiles/section_type.h"
- #include "ui/gfx/android/java_bitmap.h"
-@@ -46,7 +45,6 @@ using ntp_tiles::NTPTilesVector;
- using ntp_tiles::SectionType;
- using ntp_tiles::TileTitleSource;
- using ntp_tiles::TileSource;
-using ntp_tiles::TileVisualType;
- 
- namespace {
- 
-@@ -233,7 +231,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
-     JNIEnv* env,
-     const JavaParamRef<jobject>& obj,
-     jint jtiles_count) {
-  ntp_tiles::metrics::RecordPageImpression(jtiles_count);
- }
- 
- void MostVisitedSitesBridge::RecordTileImpression(
-@@ -245,15 +242,6 @@ void MostVisitedSitesBridge::RecordTileImpression(
-     jint jtitle_source,
-     jint jsource,
-     const JavaParamRef<jobject>& jurl) {
-  std::unique_ptr<GURL> url = url::GURLAndroid::ToNativeGURL(env, jurl);
-  TileTitleSource title_source = static_cast<TileTitleSource>(jtitle_source);
-  TileSource source = static_cast<TileSource>(jsource);
-  TileVisualType visual_type = static_cast<TileVisualType>(jvisual_type);
-  favicon_base::IconType icon_type =
-      static_cast<favicon_base::IconType>(jicon_type);
-
-  ntp_tiles::metrics::RecordTileImpression(ntp_tiles::NTPTileImpression(
-      jindex, source, title_source, visual_type, icon_type, *url));
- }
- 
- void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
-@@ -263,11 +251,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
-     jint tile_type,
-     jint title_source,
-     jint source) {
-  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
-      index, static_cast<TileSource>(source),
-      static_cast<TileTitleSource>(title_source),
-      static_cast<TileVisualType>(tile_type), favicon_base::IconType::kInvalid,
-      /*url_for_rappor=*/GURL()));
- }
- 
- static jlong JNI_MostVisitedSitesBridge_Init(
-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
-@@ -991,7 +991,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
-   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
-                                GoogleUpdateSettings::GetCollectStatsConsent());
-+                                false);
-   registry->RegisterBooleanPref(prefs::kDevToolsRemoteDebuggingAllowed, true);
- }
- 
-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
-@@ -66,7 +66,6 @@
- #include "chrome/browser/hid/chrome_hid_delegate.h"
- #include "chrome/browser/interstitials/enterprise_util.h"
- #include "chrome/browser/lifetime/browser_shutdown.h"
-#include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
- #include "chrome/browser/media/audio_service_util.h"
- #include "chrome/browser/media/router/media_router_feature.h"
- #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
-@@ -4509,16 +4508,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-     content::NavigationHandle* handle) {
-   std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
- 
-  // MetricsNavigationThrottle requires that it runs before NavigationThrottles
-  // that may delay or cancel navigations, so only NavigationThrottles that
-  // don't delay or cancel navigations (e.g. throttles that are only observing
-  // callbacks without affecting navigation behavior) should be added before
-  // MetricsNavigationThrottle.
-  if (handle->IsInMainFrame()) {
-    throttles.push_back(
-        page_load_metrics::MetricsNavigationThrottle::Create(handle));
-  }
-
- #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-   MaybeAddThrottle(
-       SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle),
-@@ -4603,10 +4592,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
-     throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
-   }
- 
-  MaybeAddThrottle(
-      LookalikeUrlNavigationThrottle::MaybeCreateNavigationThrottle(handle),
-      &throttles);
-
-   MaybeAddThrottle(PDFIFrameNavigationThrottle::MaybeCreateThrottleFor(handle),
-                    &throttles);
- #if BUILDFLAG(ENABLE_PDF)
-diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-@@ -73,8 +73,8 @@ namespace internal {
- // recording and reporting are enabled. If the feature is enabled, but no
- // consent is given, then there will be no recording or reporting.
- BASE_FEATURE(kMetricsReportingFeature,
-             "MetricsReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "MetricsReporting",                  // disabled by default
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- 
- #if BUILDFLAG(IS_ANDROID)
- // Same as |kMetricsReportingFeature|, but this feature is associated with a
-@@ -83,8 +83,8 @@ BASE_FEATURE(kMetricsReportingFeature,
- // the fix to not affect the overall sampling rate, this new feature was
- // created. See crbug/1306481.
- BASE_FEATURE(kPostFREFixMetricsReportingFeature,
-             "PostFREFixMetricsReporting",
-             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "PostFREFixMetricsReporting",        // disabled by deault
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- // Name of the variations param that defines the sampling rate.
-diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
--- a/components/ntp_tiles/BUILD.gn
-+++ b/components/ntp_tiles/BUILD.gn
-@@ -23,8 +23,6 @@ static_library("ntp_tiles") {
-     "icon_cacher.h",
-     "icon_cacher_impl.cc",
-     "icon_cacher_impl.h",
-    "metrics.cc",
-    "metrics.h",
-     "most_visited_sites.cc",
-     "most_visited_sites.h",
-     "ntp_tile.cc",
-@@ -92,7 +90,6 @@ source_set("unit_tests") {
-     "custom_links_manager_impl_unittest.cc",
-     "custom_links_store_unittest.cc",
-     "icon_cacher_impl_unittest.cc",
-    "metrics_unittest.cc",
-     "most_visited_sites_unittest.cc",
-     "popular_sites_impl_unittest.cc",
-   ]
-diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc
--- a/components/ntp_tiles/most_visited_sites.cc
-+++ b/components/ntp_tiles/most_visited_sites.cc
-@@ -730,8 +730,6 @@ void MostVisitedSites::SaveTilesAndNotify(
-                                    : new_tiles;
- 
-   if (fixed_tiles.size() != new_tiles.size()) {
-    metrics::RecordsMigratedDefaultAppDeleted(
-        DeletedTileType::kMostVisitedSite);
-   }
-   if (!current_tiles_.has_value() || (*current_tiles_ != fixed_tiles)) {
-     current_tiles_.emplace(std::move(fixed_tiles));
-diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/public/cpp/ukm_recorder.cc
--- a/services/metrics/public/cpp/ukm_recorder.cc
-+++ b/services/metrics/public/cpp/ukm_recorder.cc
-@@ -13,7 +13,7 @@
- 
- namespace ukm {
- 
-BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_DISABLED_BY_DEFAULT); // disabled in Bromite
- 
- UkmRecorder::UkmRecorder() = default;
- 
--
-2.25.1
--- a/build/patches/Do-not-build-API-keys-infobar.patch
+++ b/build/patches/Do-not-build-API-keys-infobar.patch
@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 23 Jul 2021 15:05:19 +0200
-Subject: Do not build API keys infobar
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- chrome/browser/ui/BUILD.gn | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
-+++ b/chrome/browser/ui/BUILD.gn
-@@ -1304,8 +1304,6 @@ static_library("ui") {
-       "singleton_tabs.h",
-       "startup/automation_infobar_delegate.cc",
-       "startup/automation_infobar_delegate.h",
-      "startup/google_api_keys_infobar_delegate.cc",
-      "startup/google_api_keys_infobar_delegate.h",
-       "startup/infobar_utils.cc",
-       "startup/infobar_utils.h",
-       "startup/launch_mode_recorder.cc",
--
-2.25.1
--- a/build/patches/Do-not-compile-QR-code-sharing.patch
+++ b/build/patches/Do-not-compile-QR-code-sharing.patch
@ -1,343 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 27 Feb 2020 23:23:59 +0100
-Subject: Do not compile QR code sharing
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- .../chrome/browser/ui/RootUiCoordinator.java  |  5 --
- .../ChromeProvidedSharingOptionsProvider.java | 19 -----
- chrome/browser/share/android/java_sources.gni | 18 ----
- .../AssistantQrCodeCameraCallbacks.java       | 69 ---------------
- .../AssistantQrCodeImagePickerCallbacks.java  | 85 -------------------
- 5 files changed, 196 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -99,7 +99,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
- import org.chromium.chrome.browser.share.ShareDelegate;
- import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
- import org.chromium.chrome.browser.share.ShareUtils;
-import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
- import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
- import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
- import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -498,10 +497,6 @@ public class RootUiCoordinator
-     }
- 
-     public void onAttachFragment(Fragment fragment) {
-        if (fragment instanceof QrCodeDialog) {
-            QrCodeDialog qrCodeDialog = (QrCodeDialog) fragment;
-            qrCodeDialog.setWindowAndroid(mWindowAndroid);
-        }
-     }
- 
-     @Override
-diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
-+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ChromeProvidedSharingOptionsProvider.java
-@@ -31,7 +31,6 @@ import org.chromium.chrome.browser.share.ChromeShareExtras.DetailedContentType;
- import org.chromium.chrome.browser.share.SaveBitmapDelegate;
- import org.chromium.chrome.browser.share.link_to_text.LinkToTextCoordinator.LinkGeneration;
- import org.chromium.chrome.browser.share.long_screenshots.LongScreenshotsCoordinator;
-import org.chromium.chrome.browser.share.qrcode.QrCodeCoordinator;
- import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
- import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
- import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
-@@ -311,9 +310,6 @@ public class ChromeProvidedSharingOptionsProvider {
-                 || !ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO)) {
-             mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption());
-         }
-        if (!mIsIncognito) {
-            mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
-        }
-         if (mTabProvider.hasValue() && UserPrefs.get(mProfile).getBoolean(Pref.PRINTING_ENABLED)) {
-             mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
-         }
-@@ -456,21 +452,6 @@ public class ChromeProvidedSharingOptionsProvider {
-                 .build();
-     }
- 
-    private FirstPartyOption createQrCodeFirstPartyOption() {
-        return new FirstPartyOptionBuilder(
-                ContentType.LINK_PAGE_VISIBLE, ContentType.LINK_PAGE_NOT_VISIBLE, ContentType.IMAGE)
-                .setDetailedContentTypesToDisableFor(
-                        DetailedContentType.LIGHTWEIGHT_REACTION, DetailedContentType.WEB_NOTES)
-                .setIcon(R.drawable.qr_code, R.string.qr_code_share_icon_label)
-                .setFeatureNameForMetrics("SharingHubAndroid.QRCodeSelected")
-                .setOnClickCallback((view) -> {
-                    QrCodeCoordinator qrCodeCoordinator =
-                            new QrCodeCoordinator(mActivity, mUrl, mShareParams.getWindow());
-                    qrCodeCoordinator.show();
-                })
-                .build();
-    }
-
-     private FirstPartyOption createPrintingFirstPartyOption() {
-         return new FirstPartyOptionBuilder(ContentType.LINK_PAGE_VISIBLE)
-                 .setIcon(R.drawable.sharing_print, R.string.print_share_activity_title)
-diff --git a/chrome/browser/share/android/java_sources.gni b/chrome/browser/share/android/java_sources.gni
--- a/chrome/browser/share/android/java_sources.gni
-+++ b/chrome/browser/share/android/java_sources.gni
-@@ -27,24 +27,6 @@ share_java_sources = [
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/ScreenshotBoundsManager.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QRCodeGenerationRequest.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeCoordinator.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialog.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/TabLayoutPageListener.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreviewOverlay.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareMediator.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewBinder.java",
-  "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareViewProperties.java",
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotSource.java",
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/EditorScreenshotTask.java",
-   "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotCoordinator.java",
-diff --git a/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/camera_scan/AssistantQrCodeCameraCallbacks.java b/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/camera_scan/AssistantQrCodeCameraCallbacks.java
--- a/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/camera_scan/AssistantQrCodeCameraCallbacks.java
-+++ b/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/camera_scan/AssistantQrCodeCameraCallbacks.java
-@@ -9,10 +9,6 @@ import android.graphics.ImageFormat;
- import android.hardware.Camera;
- import android.util.SparseArray;
- 
-import com.google.android.gms.vision.Frame;
-import com.google.android.gms.vision.barcode.Barcode;
-import com.google.android.gms.vision.barcode.BarcodeDetector;
-
- import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.PostTask;
- import org.chromium.components.autofill_assistant.guided_browsing.qr_code.AssistantQrCodeDelegate;
-@@ -29,8 +25,6 @@ public class AssistantQrCodeCameraCallbacks
-     private final AssistantQrCodeCameraScanModel mCameraScanModel;
-     private final AssistantQrCodeCameraScanCoordinator.DialogCallbacks mDialogCallbacks;
- 
-    private BarcodeDetector mDetector;
-
-     /**
-      * The AssistantQrCodeCameraCallbacks constructor.
-      */
-@@ -39,10 +33,6 @@ public class AssistantQrCodeCameraCallbacks
-         mContext = context;
-         mCameraScanModel = cameraScanModel;
-         mDialogCallbacks = dialogCallbacks;
-
-        // Set detector to null until it gets initialized asynchronously.
-        mDetector = null;
-        initBarcodeDetectorAsync();
-     }
- 
-     /**
-@@ -53,39 +43,6 @@ public class AssistantQrCodeCameraCallbacks
-      */
-     @Override
-     public void onPreviewFrame(byte[] data, Camera camera) {
-        if (mDetector == null) {
-            return;
-        }
-
-        ByteBuffer buffer = ByteBuffer.allocate(data.length);
-        buffer.put(data);
-        Frame frame =
-                new Frame.Builder()
-                        .setImageData(buffer, camera.getParameters().getPreviewSize().width,
-                                camera.getParameters().getPreviewSize().height, ImageFormat.NV21)
-                        .build();
-        SparseArray<Barcode> barcodes = mDetector.detect(frame);
-        if (!mCameraScanModel.get(AssistantQrCodeCameraScanModel.IS_ON_FOREGROUND)) {
-            return;
-        }
-        if (barcodes.size() == 0 || barcodes.valueAt(0).rawValue.isEmpty()) {
-            camera.setOneShotPreviewCallback(this);
-            return;
-        }
-
-        Barcode firstCode = barcodes.valueAt(0);
-        PostTask.postTask(UiThreadTaskTraits.DEFAULT, new Runnable() {
-            @Override
-            public void run() {
-                AssistantQrCodeDelegate delegate =
-                        mCameraScanModel.get(AssistantQrCodeCameraScanModel.DELEGATE);
-                if (delegate != null) {
-                    delegate.onScanResult(firstCode.rawValue);
-                }
-            }
-        });
-        // Dismiss the QR Code scan UI dialog.
-        mDialogCallbacks.dismiss();
-     }
- 
-     /**
-@@ -94,31 +51,5 @@ public class AssistantQrCodeCameraCallbacks
-      */
-     @Override
-     public void onError(int error, Camera camera) {
-        PostTask.postTask(UiThreadTaskTraits.DEFAULT, new Runnable() {
-            @Override
-            public void run() {
-                AssistantQrCodeDelegate delegate =
-                        mCameraScanModel.get(AssistantQrCodeCameraScanModel.DELEGATE);
-                if (delegate != null) {
-                    delegate.onCameraError();
-                }
-            }
-        });
-        // Dismiss the QR Code scan UI dialog.
-        mDialogCallbacks.dismiss();
-    }
-
-    private void initBarcodeDetectorAsync() {
-        new AsyncTask<BarcodeDetector>() {
-            @Override
-            protected BarcodeDetector doInBackground() {
-                return new BarcodeDetector.Builder(mContext).build();
-            }
-
-            @Override
-            protected void onPostExecute(BarcodeDetector detector) {
-                mDetector = detector;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-     }
- }
-diff --git a/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/image_picker/AssistantQrCodeImagePickerCallbacks.java b/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/image_picker/AssistantQrCodeImagePickerCallbacks.java
--- a/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/image_picker/AssistantQrCodeImagePickerCallbacks.java
-+++ b/components/autofill_assistant/guided_browsing/android/java/src/org/chromium/components/autofill_assistant/guided_browsing/qr_code/image_picker/AssistantQrCodeImagePickerCallbacks.java
-@@ -12,10 +12,6 @@ import android.net.Uri;
- import android.provider.MediaStore;
- import android.util.SparseArray;
- 
-import com.google.android.gms.vision.Frame;
-import com.google.android.gms.vision.barcode.Barcode;
-import com.google.android.gms.vision.barcode.BarcodeDetector;
-
- import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.PostTask;
- import org.chromium.components.autofill_assistant.guided_browsing.qr_code.AssistantQrCodeDelegate;
-@@ -33,8 +29,6 @@ public class AssistantQrCodeImagePickerCallbacks implements IntentCallback {
-     private final AssistantQrCodeImagePickerModel mImagePickerModel;
-     private final AssistantQrCodeImagePickerCoordinator.DialogCallbacks mDialogCallbacks;
- 
-    private BarcodeDetector mDetector;
-
-     /**
-      * The AssistantQrCodeImagePickerCallbacks constructor.
-      */
-@@ -44,10 +38,6 @@ public class AssistantQrCodeImagePickerCallbacks implements IntentCallback {
-         mContext = context;
-         mImagePickerModel = imagePickerModel;
-         mDialogCallbacks = dialogCallbacks;
-
-        // Set detector to null until it gets initialized asynchronously.
-        mDetector = null;
-        initBarcodeDetectorAsync();
-     }
- 
-     /**
-@@ -57,43 +47,6 @@ public class AssistantQrCodeImagePickerCallbacks implements IntentCallback {
-      */
-     @Override
-     public void onIntentCompleted(int resultCode, Intent data) {
-        // When the user presses back button, the resultCode will not be RESULT_OK.
-        if (resultCode != Activity.RESULT_OK) {
-            onQrCodeScanCancel();
-            return;
-        }
-        if (data == null || mDetector == null) {
-            onQrCodeScanFailure();
-            return;
-        }
-
-        Uri imageUri = data.getData();
-        try {
-            Bitmap bitmap =
-                    MediaStore.Images.Media.getBitmap(mContext.getContentResolver(), imageUri);
-            Frame frame = new Frame.Builder().setBitmap(bitmap).build();
-            SparseArray<Barcode> barcodes = mDetector.detect(frame);
-            if (barcodes.size() == 0 || barcodes.valueAt(0).rawValue.isEmpty()) {
-                onQrCodeScanFailure();
-                return;
-            }
-            Barcode firstCode = barcodes.valueAt(0);
-            PostTask.postTask(UiThreadTaskTraits.DEFAULT, new Runnable() {
-                @Override
-                public void run() {
-                    AssistantQrCodeDelegate delegate =
-                            mImagePickerModel.get(AssistantQrCodeImagePickerModel.DELEGATE);
-                    if (delegate != null) {
-                        delegate.onScanResult(firstCode.rawValue);
-                    }
-                }
-            });
-            // Dismiss the QR Code scan UI dialog.
-            mDialogCallbacks.dismiss();
-        } catch (IOException e) {
-            onQrCodeScanFailure();
-            return;
-        }
-     }
- 
-     /**
-@@ -101,18 +54,6 @@ public class AssistantQrCodeImagePickerCallbacks implements IntentCallback {
-      * Image Picker dialog UI.
-      */
-     private void onQrCodeScanCancel() {
-        PostTask.postTask(UiThreadTaskTraits.DEFAULT, new Runnable() {
-            @Override
-            public void run() {
-                AssistantQrCodeDelegate delegate =
-                        mImagePickerModel.get(AssistantQrCodeImagePickerModel.DELEGATE);
-                if (delegate != null) {
-                    delegate.onScanCancelled();
-                }
-            }
-        });
-        // Dismiss the QR Code scan UI dialog.
-        mDialogCallbacks.dismiss();
-     }
- 
-     /**
-@@ -120,31 +61,5 @@ public class AssistantQrCodeImagePickerCallbacks implements IntentCallback {
-      * Code Image Picker dialog UI.
-      */
-     private void onQrCodeScanFailure() {
-        PostTask.postTask(UiThreadTaskTraits.DEFAULT, new Runnable() {
-            @Override
-            public void run() {
-                AssistantQrCodeDelegate delegate =
-                        mImagePickerModel.get(AssistantQrCodeImagePickerModel.DELEGATE);
-                if (delegate != null) {
-                    delegate.onScanFailure();
-                }
-            }
-        });
-        // Dismiss the QR Code scan UI dialog.
-        mDialogCallbacks.dismiss();
-    }
-
-    private void initBarcodeDetectorAsync() {
-        new AsyncTask<BarcodeDetector>() {
-            @Override
-            protected BarcodeDetector doInBackground() {
-                return new BarcodeDetector.Builder(mContext).build();
-            }
-
-            @Override
-            protected void onPostExecute(BarcodeDetector detector) {
-                mDetector = detector;
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-     }
- }
--
-2.25.1
--- a/build/patches/Do-not-hide-component-extensions.patch
+++ b/build/patches/Do-not-hide-component-extensions.patch
@ -1,26 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Thu, 12 Oct 2017 08:09:24 +0200
-Subject: Do not hide component extensions
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
- extensions/common/extension.cc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
--- a/extensions/common/extension.cc
-+++ b/extensions/common/extension.cc
-@@ -465,9 +465,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
- }
- 
- bool Extension::ShouldExposeViaManagementAPI() const {
-  // Hide component extensions because they are only extensions as an
-  // implementation detail of Chrome.
-  return !extensions::Manifest::IsComponentLocation(location());
-+  // do not hide component extensions
-+  return true;
- }
- 
- Extension::ManifestData* Extension::GetManifestData(const std::string& key)
--
-2.25.1
--- a/Show more
+++ b/Show more