apply suggestions

remove aqs and some other parameters from search urls
2020-09-06 16:53:29 +02:00 · 2020-09-06 14:10:21 +02:00
272 changed files with 33208 additions and 96989 deletions
@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a Bromite bug report
+
+---
+
+<!-- Welcome! Thanks for taking time to submit a bug report.
+Have you read the README? https://github.com/bromite/bromite/blob/master/README.md
+Have you searched the issue tracker? https://github.com/bromite/bromite/issues
+Are you sure this is not a Chromium bug? You have to test with Chromium before submitting a bug.
+Are you using the latest version of Bromite?
+-->
+
+### Bromite version
+
+Version: `83.0...`
+Arch: `arm` or `arm64` or `x86`
+Android version: (example: `9.0`)
+Device model: (example: `SM-G960UZKABST`)
+
+### Is this bug about the SystemWebView?
+Yes/No
+
+<!-- No support for SystemWebView installations is provided. -->
+
+### Is the bug reproducible with latest version?
+
+<!-- Do not report bugs which are not reproducible with latest version. -->
+
+### Can the bug be reproduced with corresponding Chromium version?
+
+<!--
+Please pick the same version of Chromium as Bromite from here: https://github.com/bromite/chromium/releases
+If the bug is reproducible then it might be a configuration issue or an upstream bug. Upstream bugs can be reported on the [Chromium issue tracker](https://bugs.chromium.org/p/chromium/issues/list) and do not forget to read [Chromium project bug reporting guidelines](https://www.chromium.org/for-testers/bug-reporting-guidelines) first.
+-->
+
+### Is the bug a crash?
+
+<!--
+If yes then individuate and post the logcat dump (remove privacy sensitive information, if any), otherwise remove this section.
+-->
+
+### Describe the bug
+
+<!-- Write here a clear and concise description of the bug. -->
+
+### Steps to reproduce the bug
+
+Steps to reproduce the bug:
+1. Go to '...'
+2. Click on '...'
+3. Scroll down to '...'
+4. See error
+
+### Expected behavior
+
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Screenshots
+
+<!-- If applicable, add screenshots to help explain your problem. Otherwise remove this section. -->
@@ -1,209 +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 you are looking for a place to ask a question to the Bromite 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
-
-  - 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:
-        - 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
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: Suggest a privacy-related idea for this project
+
+---
+
+<!-- Welcome! Thanks for taking time to submit a feature request.
+Have you searched the issue tracker? https://github.com/bromite/bromite/issues
+Have you read the F.A.Q.s? https://github.com/bromite/bromite/blob/master/FAQ.md
+Have you read the README? https://github.com/bromite/bromite/blob/master/README.md
+Have you read the Wiki? https://github.com/bromite/bromite/wiki
+-->
+
+<!-- Do not submit feature requests for extensions support or adding a search engine. -->
+
+### Is your feature request related to privacy?
+
+<!-- Features that are not related to privacy are not considered. -->
+
+### Is there a patch available for this feature somewhere?
+
+<!-- If yes then provide URL and license information. -->
+
+### Describe the solution you would like
+
+<!-- A clear and concise description of what you want to happen.
+
+Do not ask "I would like feature X which is available in browser Y"; such issues are closed immediately. -->
+
+### Describe alternatives you have considered
+
+<!-- A clear and concise description of any alternative solutions or features you have considered. -->
@@ -1,65 +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 you are looking for a place to ask a question to the Bromite 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
-
-  - 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
@@ -1,407 +1,3 @@
-# 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
@@ -487,7 +83,6 @@
 * 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)
@@ -20,7 +20,7 @@ Projects which follow a strict approach on this are [Iridium](https://iridiumbro

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

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

 ## How to enable DNS-over-HTTPS?

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

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

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

 ## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite?
 In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design.
@@ -72,20 +74,5 @@ PWAs are only supported as home shortcuts; WebAPKs will not work because they ar

 ## 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 sites 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
+No; the only autofill available in Chromium browsers requires integration with the Play Store binary blobs.
+Some apps use accessibility services as a workaround.
@@ -1,18 +1,14 @@
 # Bromite - Take back your browser
-<a href="https://github.com/bromite/bromite/releases/latest">
-  <img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> </a>
-<a href="https://github.com/bromite/bromite/blob/master/LICENSE">
-  <img src="https://www.bromite.org/license.svg" alt="GNU GPL v3" title="GNU VPL v3" />
-</a> <br>
-<a href="https://www.bromite.org">
-  <img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />
-</a>
+
+<img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> <img src="https://www.bromite.org/license.svg" alt="GNU GPL v3" title="GNU VPL v3" />
+
+<img title="Bromite - take back your browser!" src="https://www.bromite.org/android-icon-192x192.png" width="96" alt="Bromite" />

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

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

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

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

@@ -29,23 +25,21 @@ Please donate to support development of Bromite and the costs for the build syst

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

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

-ETH donations address: `0x5d392F8FBf3465afe05B1Adc575e248D33B891F6`
+ETH donations address: `0xf47ff39223d828f99fec5ab53bd068c5c0522042`

 # Features

 * customizable adblock filters via user-provided URL (see https://www.bromite.org/custom-filters)
-* automatically updated adblock filters
 * remove click-tracking and AMP from search results
 * DNS-over-HTTPS support with any valid IETF DoH endpoint
 * always-incognito mode
 * disable all field trials permanently
 * disable smart search by default, allow web search from incognito mode
-* always-visible cookies, javascript and ads site settings from address bar popup
+* always-visible cookies, javascript and ads site settings
 * remove Play integration binary blobs
 * use [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) on all architectures except x86
-* enable trivial auto var init
 * disable media router and remoting by default
 * disable dynamic module loading
 * show warnings for TLSv1.0/TLSv1.1 pages
@@ -58,41 +52,10 @@ ETH donations address: `0x5d392F8FBf3465afe05B1Adc575e248D33B891F6`
 * 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
-* add option to use home page as NTP

 ## 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
+* flag to allow screenshots of incognito tabs
 * allow playing videos in background tabs and disable pause on switching tabs
 * all codecs included (proprietary, open H.264 etc.)
 * [AV1 codec support](https://github.com/bromite/bromite/wiki/AV1-support)
@@ -103,19 +66,6 @@ ETH donations address: `0x5d392F8FBf3465afe05B1Adc575e248D33B891F6`
 * 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

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

@@ -123,44 +73,20 @@ You can inspect all functionality/privacy changes by reading the [patches](https

 Flags which have been retired from upstream Chromium but are still available in Bromite.

+* `#enable-horizontal-tab-switcher`
 * `#pull-to-refresh`
 * `#enable-search-ready-omnibox`
 * `#darken-websites-checkbox-in-themes-setting`
-* `#simplified-ntp`, enabled by default
-* `#enable-text-fragment-anchor`, disabled by default
-* `#num-raster-threads`
-* `#enable-image-reader`, enabled by default
-* `#enable-tab-groups` and `#enable-tab-groups-ui-improvements`
-* `#offline-indicator-v2`

 New flags:

-* `#fingerprinting-canvas-image-data-noise`, `#fingerprinting-client-rects-noise` and `#fingerprinting-canvas-measuretext-noise`, enabled by default
-* `#incognito-screenshot`, disabled by default
+* `#enable-incognito-snapshots-in-android-recents`
 * `#max-connections-per-host`
 * `#resume-background-video`
 * `#ipv6-probing`
+* `#disable-webgl`
 * `#enable-device-motion` and `#enable-device-orientation`
 * `#show-legacy-tls-warnings`
-* `#save-data-header`, disabled by default
-* `#export-bookmarks-use-saf`, disabled by default
-* `#allow-user-certificates`, disabled by default
-* `#cleartext-permitted`, enabled by default, can be used to disable all cleartext-HTTP traffic
-* `#omnibox-autocomplete-filtering`, can be used to restrict omnibox autocomplete results
-* `#disable-external-intent-requests`
-* `#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
-
-### 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

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

 Each tag corresponds to a Chromium Stable release tag.

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

-You 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
@@ -206,7 +130,7 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags
 Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.

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

 ## How to build the filters
@@ -215,14 +139,6 @@ See upstream documentation: https://github.com/chromium/chromium/blob/master/com

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

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

 * [Chromium project](https://www.chromium.org/Home) and developers
@@ -231,7 +147,7 @@ For any usage or development discussion please use GitHub Discussions: https://g
 * [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
+* [Brave Browser](https://github.com/brave/browser-android-tabs) for some patches
 * [Vadim Pleshkov](http://vadimpleshkov.me/) for Bromite's logo

 # Filters credits
@@ -240,8 +156,6 @@ For any usage or development discussion please use GitHub Discussions: https://g
 * [uBlock Origin](https://github.com/uBlockOrigin)
 * [Peter Lowe's Ad and tracking server list](https://pgl.yoyo.org/adservers/)

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

 The patches published as part of the Bromite project are released under [GNU GPL v3](./LICENSE).
@@ -1,14 +1,10 @@
 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
@@ -16,32 +12,27 @@ enable_gvr_services=false
 enable_hangout_services_extension=false
 enable_iterator_debugging=false
 enable_mdns=false
-enable_mse_mpeg2ts_stream_parser=true
+enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true
 enable_nacl=false
+enable_nacl_nonsfi=false
 enable_platform_dolby_vision=true
 enable_platform_hevc=true
 enable_remoting=false
 enable_reporting=true
-enable_supervised_users=false
+enable_resource_whitelist_generation=false
 enable_vr=false
-exclude_unwind_tables=false
-ffmpeg_branding="Chrome"
+fieldtrial_testing_like_official_build=true
 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
+safe_browsing_mode=0
 symbol_level=1
-system_webview_package_name="com.android.webview"
 target_os="android"
-use_cfi_cast=true
 use_debug_fission=true
 use_errorprone_java_compiler=false
-use_gnome_keyring=false
+use_jumbo_build=false
 use_official_google_api_keys=false
-use_rtti=false
+use_openh264=true chrome_pgo_phase=0
 use_sysroot=false
-webview_includes_weblayer=false
@@ -1 +0,0 @@
-d5d96df7c999fb23a203ac332784b203afe8614f-
@@ -1 +1 @@
-102.0.5005.96
+85.0.4183.94
@@ -1 +0,0 @@
-91e2c8c16071b47c9a1d2c1bba592f6a643dd1b1
@@ -1,47 +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_supervised_users=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"
-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_sysroot=false
-webview_includes_weblayer=false
@@ -1,15 +1,9 @@
 Disable-third-party-cookies-by-default.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
-AV1-codec-support.patch
-Switch-to-fstack-protector-strong.patch
-Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
-Bromite-package-name.patch
+Revert-Remove-pre-unified-consent-code.patch
 Restore-classic-new-tab-page.patch
 Always-use-new-tab-page-for-default-home-page.patch
-disable-battery-status-updater.patch
+Always-allow-partner-customisation.patch
+battery_status_service-disable-more-privacy-nightmares.patch
 Battery-API-return-nothing.patch
 updater-disable-updater-pings.patch
 Remove-EV-certificates.patch
@@ -20,25 +14,36 @@ 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
+Change-default-webRTC-policy-to-not-use-any-address.patch
+Never-send-any-crash-upload-data.patch
+Hide-send-reports-checkbox.patch
 Never-fetch-popular-sites.patch
 ungoogled-chromium-Disable-webRTC-log-uploader.patch
 ungoogled-chromium-Disable-untraceable-URLs.patch
 ungoogled-chromium-Disable-translate-integration.patch
 ungoogled-chromium-Disable-profile-avatar.patch
-ungoogled-chromium-Disable-intranet-detector.patch
-ungoogled-chromium-no-special-hosts-domains.patch
+ungoogled-chromium-Disable-intranet-redirect-detector.patch
+ungoogled-chromium-Disable-Google-host-detection.patch
+ungoogled-chromium-Disable-GCM.patch
 ungoogled-chromium-Disable-Gaia.patch
+ungoogled-chromium-Disable-domain-reliability.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
 Disable-safe-browsing.patch
+Skip-the-first-run-and-metrics.patch
 Disable-all-promo-dialogs.patch
-Remove-signin-integrations.patch
+Disable-sync-services-menu-entry.patch
+Remove-signin-and-data-saver-integrations.patch
 Hide-passwords-manager-link.patch
+Disable-Omaha-update-checks.patch
 Disable-update-scheduler.patch
 Add-English-only-search-engine.patch
 Add-DuckDuckGo-Lite-search-engine.patch
+Fix-crash-when-accessing-page-info-site-settings.patch
 openH264-enable-ARM-ARM64-optimizations.patch
+Switch-to-fstack-protector-strong.patch
+Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 build-remove-calling-untrusted-hooks.patch
+AV1-codec-support.patch
 Inject-scripts-for-AMP-tracking-ads-and-video.patch
 Allow-playing-audio-in-background.patch
 Add-flag-to-control-video-playback-resume-feature.patch
@@ -46,48 +51,57 @@ Open-YouTube-links-in-Bromite.patch
 Add-exit-menu-item.patch
 Remove-help-menu-item.patch
 AudioBuffer-AnalyserNode-fp-mitigations.patch
-Multiple-fingerprinting-mitigations.patch
+Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch
+Add-flags-to-disable-device-motion-orientation-APIs.patch
+Disable-metrics-on-all-I-O-threads.patch
+Always-respect-async-dns-flag-regardless-of-SDK-version.patch
 Add-flag-to-configure-maximum-connections-per-host.patch
-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
+Disable-promos-displayed-in-bookmarks-manager.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
-Move-some-account-settings-back-to-privacy-settings.patch
-Remove-contextual-search-manager.patch
 Add-custom-tab-intents-privacy-option.patch
-Disable-FLoC-and-privacy-sandbox.patch
-History-number-of-days-privacy-setting.patch
+Add-option-to-not-persist-tabs-across-sessions.patch
 Disable-fetching-of-all-field-trials.patch
+Disable-seed-based-field-trials.patch
 Disable-plugins-enumeration.patch
-net-cert-increase-default-key-length.patch
+net-cert-increase-default-key-length-for-newly-generated-RSA-keys.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
+profile-resetter-do-not-tick-send-settings-by-default.patch
+browser-ui-disable-warning-about-missing-API-keys.patch
+autofill-disable-autofill-download-manager.patch
 first_run-deactivate-autoupdate-globally.patch
-translate-disable-fetching-of-languages-from-server.patch
+translate-disable-fetching-of-translate-languages-from-server.patch
+kill-TOS-and-metrics-opt-out.patch
+kill-Translate.patch
 kill-Vision.patch
 kill-Location-fall-back-to-system.patch
 kill-Auth.patch
-Remove-binary-blob-integrations.patch
+Remove-dependency-on-com.google.android.gms.auth.patch
+kill-GCM.patch
+Remove-dependency-on-com.google.android.gcm.patch
+Remove-dependency-on-com.google.android.gms.gcm.patch
+Remove-dependency-on-com.google.android.play.patch
+Remove-dependency-on-vision-clearcut-and-phenotype.patch
+Remove-dependency-on-flags-places-and-stats.patch
+Remove-dependency-on-fido-iid-instantapps-location.patch
+Remove-dependency-on-com.google.android.gms.cast.patch
+Remove-dependency-on-auth-signin-dynamic-and-tasks.patch
+Remove-google_services_gcm.patch
 Remove-SMS-integration.patch
 Do-not-compile-QR-code-sharing.patch
 Allow-website-sign-in-without-account-sign-in.patch
 Offer-builtin-autocomplete-for-chrome-flags.patch
+Do-not-grant-notifications-to-default-search-engine.patch
+Add-flag-to-disable-IPv6-probes.patch
+Add-a-proxy-configuration-page.patch
+Do-not-ignore-download-location-prompt-setting.patch
+Disable-previews-by-default.patch
 Use-4-tile-rows-never-show-logo.patch
-Disable-various-metrics.patch
+Disable-metrics-collection-for-NTP-tiles.patch
 Enable-SPPI-for-devices-with-enough-memory.patch
-Enable-StrictOriginIsolation-and-SitePerProcess.patch
-Use-64-bit-WebView-processes.patch
 prefs-disable-signinallowed-by-default.patch
-prefs-always-prompt-for-download-directory.patch
-Disable-offline-pages-in-CCT.patch
+prefs-always-prompt-for-download-directory-by-default.patch
+Disable-offline-pages-in-the-downloads-home-to-be-opened-in-CCT-by-default.patch
 disable-payment-support-by-default.patch
 disable-background-sync-by-default.patch
 disable-sensors-access-site-setting-by-default.patch
@@ -95,105 +109,45 @@ Disable-media-router-and-remoting-by-default.patch
 Restore-Search-Ready-Omnibox-flag.patch
 disable-AdsBlockedInfoBar.patch
 Bromite-AdBlockUpdaterService.patch
+Add-option-to-configure-the-ad-blocker-filters-URL.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
-Increase-number-of-autocomplete-matches-to-10.patch
-Disable-requests-for-single-word-Omnibar-searches.patch
+Increase-number-of-autocomplete-matches-from-5-to-10.patch
+Disable-HEAD-requests-for-single-word-Omnibar-searches.patch
 Disable-some-signed-exchange-features.patch
-DoH-improvements.patch
+Add-flag-to-disable-WebGL.patch
+Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch
 Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch
 Revert-flags-remove-disable-pull-to-refresh-effect.patch
 Use-dummy-DFM-installer.patch
+Disable-password-reuse-detection-on-android.patch
 Disable-feeds-support-by-default.patch
+Disable-autofill-assistant-by-default.patch
 Show-site-settings-for-cookies-javascript-and-ads.patch
+Restore-enable-horizontal-tab-switcher-flag.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
 Enable-user-agent-freeze-by-default.patch
 disable-browser-autologin-by-default.patch
-AImageReader-CFI-crash-mitigations.patch
+Revert-gpu-android-Remove-setup-for-disabling-AImageReader.patch
+Revert-Remove-flags-to-enable-disable-AImageReader.patch
+Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch
+Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch
+Update-i18n-zh_CN-support.patch
+Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
 Add-menu-item-to-view-source.patch
+Enable-legacy-TLS-interstitital-warning.patch
 Block-gateway-attacks-via-websockets.patch
 Enable-prefetch-privacy-changes-by-default.patch
+Enable-reduced-referrer-granularity-by-default.patch
 Disable-support-for-RAR-files-inspection.patch
+Enable-improved-cookie-controls-by-default.patch
+Add-history-support-in-incognito-mode.patch
 Enable-darken-websites-checkbox-in-themes.patch
 Remove-blocklisted-URLs-upon-bookmark-creation.patch
+Disable-scroll-to-text-fragment.patch
+Rollback-dav1d-upgrades-that-break-x86.patch
 Disable-the-DIAL-repeating-discovery.patch
-Block-qjz9zk-or-trk-requests.patch
-Hardening-against-incognito-mode-detection.patch
-Remove-weblayer-dependency-on-Play-Services.patch
 Timezone-customization.patch
-Restore-Simplified-NTP-launch.patch
-Add-option-to-use-home-page-as-NTP.patch
-Revert-the-removal-of-an-option-to-block-autoplay.patch
-Disable-text-fragments-by-default.patch
-disable-WebView-variations-support.patch
-ask-permission-to-play-protected-media-by-default.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
-Ask-user-before-closing-all-tabs.patch
-Add-option-to-force-tablet-UI.patch
-Make-all-favicon-requests-on-demand.patch
-Add-Alt-D-hotkey-to-focus-address-bar.patch
-Remove-offline-measurement-background-task.patch
-User-agent-customization.patch
-Add-AllowUserCertificates-flag.patch
-Add-IsCleartextPermitted-flag.patch
-Unexpire-tab-groups-flags.patch
-Add-flag-for-omnibox-autocomplete-filtering.patch
-Enable-IntentBlockExternalFormRedirectsNoGesture.patch
-Add-flag-to-disable-external-intent-requests.patch
-Logcat-crash-reports-UI.patch
-Add-support-for-ISupportHelpAndFeedback.patch
-JIT-site-settings.patch
-API-level-21-prevent-crash-on-download.patch
-Add-flag-to-disable-vibration.patch
-mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
-Client-hints-overrides.patch
-Disable-AGSA-by-default.patch
-Allow-building-without-enable_reporting.patch
-Disable-lock-icon-in-address-bar-by-default.patch
-Enable-share-intent.patch
-Site-setting-for-images.patch
-Bromite-auto-updater.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
-Reintroduce-override_build_timestamp.patch
-enable-ftrivial-auto-var-init-zero.patch
-disable-appending-variations-header.patch
-Make-HTTPS-only-mode-the-default.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
-Partition-DNS-requests-by-top-frame-NIK.patch
-Remove-mremap-from-seccomp-baseline-policy.patch
-Move-navigation-bar-to-bottom.patch
-Welcome-screen.patch
-Content-settings-infrastructure.patch
-Add-webGL-site-setting.patch
-Add-site-engagement-flag.patch
-Add-webRTC-site-settings.patch
-enable-process-isolated-sandboxed-iframes-by-default.patch
-Enable-Certificate-Transparency.patch
-Invalidate-components-public-key.patch
-Improve-plain-text-rendering-on-mobile.patch
+Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch
 Automated-domain-substitution.patch
+Remove-some-params-from-search-url.patch
@@ -1,12 +1,7 @@
+Revert-Remove-pre-unified-consent-code.patch
 AV1-codec-support.patch
-exit-on-failure-of-inclusion.patch
-Reintroduce-override_build_timestamp.patch
-do-not-hide-.orig-files.patch
-Do-not-link-with-libatomic.patch
-do-not-add-suffix-to-package-name.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
-enable-ftrivial-auto-var-init-zero.patch
+Disable-password-reuse-detection-on-android.patch
 Disable-feeds-support-by-default.patch
-Allow-building-without-supervised-users.patch
-Chromium-package-name.patch
+Rollback-dav1d-upgrades-that-break-x86.patch
@@ -1,255 +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
---
- 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                |  4 ++++
- media/base/media_switches.h                 |  1 +
- 12 files changed, 65 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
-@@ -2243,9 +2243,9 @@
-     "expiry_milestone": 106
-   },
-   {
-    "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
-@@ -52,6 +52,11 @@ bool IsDeviceBlocked(const char* field, const std::string& block_list) {
- 
- }  // namespace
- 
-+
-+// Use android AImageReader when playing videos with MediaPlayer.
-+const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
-+                                  base::FEATURE_ENABLED_BY_DEFAULT};
-+
- #if BUILDFLAG(IS_ANDROID)
- // Used to limit GL version to 2.0 for skia raster on Android.
- const base::Feature kUseGles2ForOopR{"UseGles2ForOopR",
-diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
--- a/gpu/config/gpu_finch_features.h
-+++ b/gpu/config/gpu_finch_features.h
-@@ -17,6 +17,7 @@ namespace features {
- // All features in alphabetical order. The features should be documented
- // alongside the definition of their values in the .cc file.
- #if BUILDFLAG(IS_ANDROID)
-+GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
- GPU_EXPORT extern const base::Feature kUseGles2ForOopR;
- GPU_EXPORT extern const base::Feature kAndroidSurfaceControl;
- GPU_EXPORT extern const base::Feature kWebViewSurfaceControl;
-diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
--- a/gpu/config/gpu_util.cc
-+++ b/gpu/config/gpu_util.cc
-@@ -120,6 +120,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;
- 
-@@ -343,6 +346,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
-@@ -14,6 +14,7 @@ decode_encode_srgb_for_generatemipmap
- depth_stencil_renderbuffer_resize_emulation
- disable_2d_canvas_auto_flush
- disable_accelerated_av1_decode
-+disable_aimagereader
- disable_accelerated_h264_encode
- disable_accelerated_hevc_decode
- disable_accelerated_vp8_decode
-diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
--- a/gpu/ipc/service/gpu_init.cc
-+++ b/gpu/ipc/service/gpu_init.cc
-@@ -580,6 +580,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
-@@ -711,6 +711,10 @@ const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
- // Note: Has no effect if kMediaDrmPreprovisioning feature is disabled.
- const base::Feature kMediaDrmPreprovisioningAtStartup{
-     "MediaDrmPreprovisioningAtStartup", base::FEATURE_ENABLED_BY_DEFAULT};
-+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
-+const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
-+                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+
- 
- // Enable picture in picture web api for android.
- const base::Feature kPictureInPictureAPI{"PictureInPictureAPI",
-diff --git a/media/base/media_switches.h b/media/base/media_switches.h
--- a/media/base/media_switches.h
-+++ b/media/base/media_switches.h
-@@ -223,6 +223,7 @@ MEDIA_EXPORT extern const base::Feature kForceHardwareAudioDecoders;
- MEDIA_EXPORT extern const base::Feature kAllowNonSecureOverlays;
- MEDIA_EXPORT extern const base::Feature kMediaControlsExpandGesture;
- MEDIA_EXPORT extern const base::Feature kMediaDrmPersistentLicense;
-+MEDIA_EXPORT extern const base::Feature kAImageReaderVideoOutput;
- MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioning;
- MEDIA_EXPORT extern const base::Feature kMediaDrmPreprovisioningAtStartup;
- MEDIA_EXPORT extern const base::Feature kCanPlayHls;
--
-2.25.1
@@ -1,45 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 27 Jun 2021 16:53:48 +0200
-Subject: API level 21: prevent crash on download
-
-On Lollipop 5.0.x it is not possible to use the system persistent bundle.
-This patch ignores boolean settings for them and prevents the crash.
-
-See also: https://github.com/bromite/bromite/issues/1184
---
- .../BundleToPersistableBundleConverter.java         | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
--- a/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
-+++ b/components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BundleToPersistableBundleConverter.java
-@@ -4,6 +4,7 @@
- 
- package org.chromium.components.background_task_scheduler.internal;
- 
-+import android.os.Build;
- import android.os.Bundle;
- import android.os.PersistableBundle;
- 
-@@ -82,9 +83,17 @@ class BundleToPersistableBundleConverter {
-             if (obj == null) {
-                 persistableBundle.putString(key, null);
-             } else if (obj instanceof Boolean) {
-                persistableBundle.putBoolean(key, (Boolean) obj);
-+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-+                    failedKeys.add(key);
-+                } else {
-+                    persistableBundle.putBoolean(key, (Boolean) obj);
-+                }
-             } else if (obj instanceof boolean[]) {
-                persistableBundle.putBooleanArray(key, (boolean[]) obj);
-+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
-+                    failedKeys.add(key);
-+                } else {
-+                    persistableBundle.putBooleanArray(key, (boolean[]) obj);
-+                }
-             } else if (obj instanceof Double) {
-                 persistableBundle.putDouble(key, (Double) obj);
-             } else if (obj instanceof double[]) {
--
-2.25.1
@@ -5,6 +5,7 @@ Subject: AV1 codec support
 libaom build fixes (requires -fPIC)
 Report AV1 as playable on Android
 ---
+ media/base/mime_util_internal.cc                            | 6 +++++-
 third_party/libaom/BUILD.gn                                 | 6 ++++--
 third_party/libaom/libaom_srcs.gni                          | 5 +++++
 .../config/linux/arm-neon-cpu-detect/config/aom_config.asm  | 2 +-
@@ -19,44 +20,62 @@ Report AV1 as playable on Android
 .../libaom/source/config/linux/generic/config/aom_config.h  | 2 +-
 .../libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-
 .../libaom/source/config/linux/x64/config/aom_config.h      | 2 +-
- 14 files changed, 21 insertions(+), 14 deletions(-)
+ 15 files changed, 26 insertions(+), 15 deletions(-)

+diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
+--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
+@@ -563,9 +563,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
+     case THEORA:
+       return false;
+ 
+-    // AV1 is not supported on Android yet.
+    // AV1 is supported on Android.
+     case AV1:
+#if BUILDFLAG(ENABLE_AV1_DECODER)
+      return true;
+#else
+       return false;
+#endif
+ 
+     // ----------------------------------------------------------------------
+     // The remaining codecs may be supported depending on platform abilities.
 diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn
 --- a/third_party/libaom/BUILD.gn
 +++ b/third_party/libaom/BUILD.gn
-@@ -81,7 +81,7 @@ if (current_cpu == "x86" || (current_cpu == "x64" && !is_msan)) {
-       sources += aom_dsp_encoder_asm_sse2_x86_64
-       sources += aom_dsp_encoder_asm_ssse3_x86_64
+@@ -81,7 +81,7 @@ if (enable_libaom) {
+         sources += aom_dsp_encoder_asm_sse2_x86_64
+         sources += aom_dsp_encoder_asm_ssse3_x86_64
+       }
+-      defines = [ "CHROMIUM" ]
+      defines = [ "CHROMIUM", "PIC" ]
+       include_dirs = libaom_include_dirs
     }
-    defines = [ "CHROMIUM" ]
-+    defines = [ "CHROMIUM", "PIC" ]
-     include_dirs = libaom_include_dirs
-   }
 
-@@ -193,7 +193,7 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
-     configs += [ "//build/config/compiler:no_chromium_code" ]
-     if (current_cpu == "arm") {
-       configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
-      cflags = [ "-mfpu=neon" ]
-+      cflags = [ "-mfpu=neon", "-fPIC" ]
+@@ -184,7 +184,7 @@ if (enable_libaom) {
+       configs += [ "//build/config/compiler:no_chromium_code" ]
+       if (current_cpu == "arm") {
+         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]
+-        cflags = [ "-mfpu=neon" ]
+        cflags = [ "-mfpu=neon", "-fPIC" ]
+       }
+       configs += [ ":libaom_config" ]
+ 
+@@ -233,6 +233,8 @@ if (enable_libaom) {
+     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
+         cpu_arch_full == "arm-neon-cpu-detect") {
+       deps += [ ":libaom_intrinsics_neon" ]
+      # will detect CPU
+      sources += aom_ports_arm_sources
     }
-     configs += [ ":libaom_config" ]
- 
-@@ -255,6 +255,8 @@ static_library("libaom") {
-   if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
-       cpu_arch_full == "arm-neon-cpu-detect") {
-     deps += [ ":libaom_intrinsics_neon" ]
-+    # will detect CPU
-+    sources += aom_ports_arm_sources
-   }
-   if (is_android) {
-     deps += [ "//third_party/android_ndk:cpu_features" ]
+     if (is_android) {
+       deps += [ "//third_party/android_ndk:cpu_features" ]
 diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni
 --- a/third_party/libaom/libaom_srcs.gni
 +++ b/third_party/libaom/libaom_srcs.gni
-@@ -652,6 +652,11 @@ aom_rc_interface_sources = [
-   "//third_party/libaom/source/libaom/test/yuv_video_source.h",
- ]
+@@ -656,6 +656,11 @@ aom_mem_sources = [
+ 
+ aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]
 
 +aom_ports_arm_sources = [
 +  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
@@ -69,146 +88,147 @@ diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs
 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
-@@ -50,7 +50,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_OPTICAL_FLOW_API equ 0
+@@ -44,7 +44,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NN_V2 equ 0
+ CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OS_SUPPORT equ 1
- CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
- CONFIG_RATECTRL_LOG equ 0
- CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
+ CONFIG_REALTIME_ONLY equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
 diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
-@@ -50,7 +50,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_OPTICAL_FLOW_API equ 0
+@@ -44,7 +44,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NN_V2 equ 0
+ CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OS_SUPPORT equ 1
- CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
- CONFIG_RATECTRL_LOG equ 0
- CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
+ CONFIG_REALTIME_ONLY equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
 diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
-@@ -50,7 +50,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_OPTICAL_FLOW_API equ 0
+@@ -44,7 +44,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NN_V2 equ 0
+ CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OS_SUPPORT equ 1
- CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
- CONFIG_RATECTRL_LOG equ 0
- CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
+ CONFIG_REALTIME_ONLY equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
 diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
-@@ -50,7 +50,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_OPTICAL_FLOW_API equ 0
+@@ -44,7 +44,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NN_V2 equ 0
+ CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OS_SUPPORT equ 1
- CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
- CONFIG_RATECTRL_LOG equ 0
- CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
+ CONFIG_REALTIME_ONLY equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 0
 diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 0
 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
-@@ -50,7 +50,7 @@ CONFIG_NORMAL_TILE_MODE equ 1
- CONFIG_OPTICAL_FLOW_API equ 0
+@@ -44,7 +44,7 @@ CONFIG_MULTITHREAD equ 1
+ CONFIG_NN_V2 equ 0
+ CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OS_SUPPORT equ 1
- CONFIG_PARTITION_SEARCH_ORDER equ 0
 -CONFIG_PIC equ 0
 +CONFIG_PIC equ 1
- CONFIG_RATECTRL_LOG equ 0
- CONFIG_RD_COMMAND equ 0
 CONFIG_RD_DEBUG equ 0
+ CONFIG_REALTIME_ONLY equ 0
+ CONFIG_RUNTIME_CPU_DETECT equ 1
 diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm
 +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
-@@ -40,7 +40,7 @@
- %define CONFIG_OPTICAL_FLOW_API 0
+@@ -34,7 +34,7 @@
+ %define CONFIG_NN_V2 0
+ %define CONFIG_NORMAL_TILE_MODE 1
 %define CONFIG_OS_SUPPORT 1
- %define CONFIG_PARTITION_SEARCH_ORDER 0
 -%define CONFIG_PIC 0
 +%define CONFIG_PIC 1
- %define CONFIG_RATECTRL_LOG 0
- %define CONFIG_RD_COMMAND 0
 %define CONFIG_RD_DEBUG 0
+ %define CONFIG_REALTIME_ONLY 0
+ %define CONFIG_RUNTIME_CPU_DETECT 1
 diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h
 +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h
-@@ -52,7 +52,7 @@
- #define CONFIG_OPTICAL_FLOW_API 0
+@@ -46,7 +46,7 @@
+ #define CONFIG_NN_V2 0
+ #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OS_SUPPORT 1
- #define CONFIG_PARTITION_SEARCH_ORDER 0
 -#define CONFIG_PIC 0
 +#define CONFIG_PIC 1
- #define CONFIG_RATECTRL_LOG 0
- #define CONFIG_RD_COMMAND 0
 #define CONFIG_RD_DEBUG 0
--
-2.25.1
+ #define CONFIG_REALTIME_ONLY 0
+ #define CONFIG_RUNTIME_CPU_DETECT 1
+-- 
+2.17.1
+
@@ -1,170 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 26 Apr 2021 13:28:24 +0000
-Subject: Add AllowUserCertificates flag
-
---
- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 3 +++
- .../chrome/browser/app/flags/ChromeCachedFlags.java         | 1 +
- chrome/browser/about_flags.cc                               | 6 +++++-
- chrome/browser/flag_descriptions.cc                         | 5 +++++
- chrome/browser/flag_descriptions.h                          | 3 +++
- chrome/browser/flags/android/chrome_feature_list.cc         | 4 ++++
- chrome/browser/flags/android/chrome_feature_list.h          | 1 +
- .../chromium/chrome/browser/flags/CachedFeatureFlags.java   | 1 +
- .../chromium/chrome/browser/flags/ChromeFeatureList.java    | 1 +
- net/android/java/src/org/chromium/net/X509Util.java         | 5 +++++
- 10 files changed, 29 insertions(+), 1 deletion(-)
-
-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
-@@ -231,6 +231,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;
-@@ -994,6 +995,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
-@@ -94,6 +94,7 @@ public class ChromeCachedFlags {
-                                 .GIVE_JAVA_UI_THREAD_DEFAULT_TASK_TRAITS_USER_BLOCKING_PRIORITY);
-                 add(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS);
-                 add(ChromeFeatureList.IMMERSIVE_UI_MODE);
-+                add(ChromeFeatureList.ALLOW_USER_CERTIFICATES);
-                 add(ChromeFeatureList.INSTANT_START);
-                 add(ChromeFeatureList.INSTANCE_SWITCHER);
-                 add(ChromeFeatureList.INTEREST_FEED_V2);
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -3220,7 +3220,11 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-container-queries", flag_descriptions::kCSSContainerQueriesName,
-      flag_descriptions::kCSSContainerQueriesDescription, kOsAll,
-      FEATURE_VALUE_TYPE(blink::features::kCSSContainerQueries)},
-#if BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_ANDROID) // Bromite allow user certificates
-+    {"allow-user-certificates",
-+     flag_descriptions::kAllowUserCertificatesName,
-+     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,
-+     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},
-     {"explore-sites", flag_descriptions::kExploreSitesName,
-      flag_descriptions::kExploreSitesDescription, kOsAndroid,
-      FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites,
-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
-@@ -38,6 +38,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
-@@ -144,6 +144,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &feed::kFeedLoadingPlaceholder,
-     &feed::kInterestFeedContentSuggestions,
-     &feed::kInterestFeedSpinnerAlwaysAnimate,
-+    &kAllowUserCertificates,
-     &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
-     &feed::kInterestFeedV2,
-     &feed::kInterestFeedV2Autoplay,
-@@ -399,6 +400,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
-     "AdaptiveButtonInTopToolbarCustomizationV2",
-     base::FEATURE_DISABLED_BY_DEFAULT};
- 
-+const base::Feature kAllowUserCertificates = {
-+    "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT};
-+
- const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
- 
-diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
-+++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -12,6 +12,7 @@
- namespace chrome {
- namespace android {
- 
-+extern const base::Feature kAllowUserCertificates;
- // Alphabetical:
- extern const base::Feature kAdaptiveButtonInTopToolbar;
- extern const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2;
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -51,6 +51,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.ANONYMOUS_UPDATE_CHECKS, true)
-                     .put(ChromeFeatureList.BOOKMARK_BOTTOM_SHEET, false)
-                     .put(ChromeFeatureList.CONDITIONAL_TAB_STRIP_ANDROID, false)
-+                    .put(ChromeFeatureList.ALLOW_USER_CERTIFICATES, false)
-                     .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false)
-                     .put(ChromeFeatureList.SERVICE_MANAGER_FOR_DOWNLOAD, true)
-                     .put(ChromeFeatureList.SERVICE_MANAGER_FOR_BACKGROUND_PREFETCH, 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 =
-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
@@ -1,22 +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
-
---
- .../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
@@ -1,95 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 26 Apr 2021 15:04:11 +0000
-Subject: Add IsCleartextPermitted flag
-
---
- chrome/browser/about_flags.cc           | 4 ++++
- chrome/browser/flag_descriptions.cc     | 4 ++++
- chrome/browser/flag_descriptions.h      | 3 +++
- net/base/features.cc                    | 3 +++
- net/base/features.h                     | 2 ++
- net/url_request/url_request_http_job.cc | 4 ++++
- 6 files changed, 20 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
-@@ -8201,6 +8201,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
-@@ -1477,6 +1477,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
-@@ -834,6 +834,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
-@@ -115,6 +115,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
- 
-+const base::Feature kIsCleartextPermitted{"IsCleartextPermitted",
-+                                      base::FEATURE_ENABLED_BY_DEFAULT};
-+
- const base::Feature kNetworkQualityEstimator{"NetworkQualityEstimator",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
- 
-diff --git a/net/base/features.h b/net/base/features.h
--- a/net/base/features.h
-+++ b/net/base/features.h
-@@ -37,6 +37,8 @@ NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin;
- // Enables the ParsedCookie domain attribute to be the empty string.
- NET_EXPORT extern const base::Feature kCookieDomainAttributeEmptyString;
- 
-+NET_EXPORT extern const base::Feature kIsCleartextPermitted;
-+
- // Support for altering the parameters used for DNS transaction timeout. See
- // ResolveContext::SecureTransactionTimeout().
- NET_EXPORT extern const base::Feature kDnsTransactionDynamicTimeouts;
-diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
--- a/net/url_request/url_request_http_job.cc
-+++ b/net/url_request/url_request_http_job.cc
-@@ -210,6 +210,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
@@ -0,0 +1,101 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 May 2020 08:33:15 +0200
+Subject: Add a flag to allow screenshots in Incognito mode
+
+See also:
+* https://github.com/bromite/bromite/issues/551
+* https://bugs.chromium.org/p/chromium/issues/detail?id=920762
+---
+ chrome/browser/about_flags.cc                               | 6 ++++++
+ chrome/browser/flag_descriptions.cc                         | 5 +++++
+ chrome/browser/flag_descriptions.h                          | 3 +++
+ .../flags/android/java_templates/ChromeSwitches.java.tmpl   | 4 ----
+ chrome/common/chrome_switches.cc                            | 3 +++
+ chrome/common/chrome_switches.h                             | 1 +
+ 6 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -4499,6 +4499,12 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsAll,
+      FEATURE_VALUE_TYPE(features::kEnableAmbientAuthenticationInIncognito)},
+ 
+#if defined(OS_ANDROID)
+    {switches::kEnableIncognitoSnapshotsInAndroidRecents, flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsName,
+     flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsDescription, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kEnableIncognitoSnapshotsInAndroidRecents)},
+#endif
+
+     {"enable-ambient-authentication-in-guest-session",
+      flag_descriptions::kEnableAmbientAuthenticationInGuestSessionName,
+      flag_descriptions::kEnableAmbientAuthenticationInGuestSessionDescription,
+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
+@@ -515,6 +515,11 @@ const char kEnableAmbientAuthenticationInIncognitoDescription[] =
+     "Enables ambient authentication in Incognito mode. This flag may be "
+     "overriden by policies.";
+ 
+const char kEnableIncognitoSnapshotsInAndroidRecentsName[] =
+    "Enable Incognito snapshots in Android Recents";
+const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[] =
+    "Enable the secure flag for Incognito tabs which prevent taking screenshots and seeing snapshots in Android Recents.";
+
+ const char kEnableAmbientAuthenticationInGuestSessionName[] =
+     "Enable Ambient Authentication in Guest session.";
+ const char kEnableAmbientAuthenticationInGuestSessionDescription[] =
+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
+@@ -316,6 +316,9 @@ extern const char kEnableAccessibilityObjectModelDescription[];
+ extern const char kEnableAmbientAuthenticationInIncognitoName[];
+ extern const char kEnableAmbientAuthenticationInIncognitoDescription[];
+ 
+extern const char kEnableIncognitoSnapshotsInAndroidRecentsName[];
+extern const char kEnableIncognitoSnapshotsInAndroidRecentsDescription[];
+
+ extern const char kEnableAmbientAuthenticationInGuestSessionName[];
+ extern const char kEnableAmbientAuthenticationInGuestSessionDescription[];
+ 
+diff --git a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+--- a/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+++ b/chrome/browser/flags/android/java_templates/ChromeSwitches.java.tmpl
+@@ -144,10 +144,6 @@ public abstract class ChromeSwitches {{
+     /** Switch for enabling the Chrome Survey. */
+     public static final String CHROME_FORCE_ENABLE_SURVEY = "force-enable-chrome-survey";
+ 
+-    /** Switch to enable incognito tabs to be seen in Android Recents. */
+-    public static final String ENABLE_INCOGNITO_SNAPSHOTS_IN_ANDROID_RECENTS =
+-            "enable-incognito-snapshots-in-android-recents";
+-
+     /** Open all custom tabs in a new task. Used only for experimental purposes. */
+     public static final String OPEN_CUSTOM_TABS_IN_NEW_TASK = "open-custom-tabs-in-new-task";
+ 
+diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
+--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
+@@ -339,6 +339,9 @@ const char kHomePage[]                      = "homepage";
+ // Causes the browser to launch directly in incognito mode.
+ const char kIncognito[]                     = "incognito";
+ 
+// Allows incognito tabs to be seen in Android Recents and thus user screenshots.
+const char kEnableIncognitoSnapshotsInAndroidRecents[] = "enable-incognito-snapshots-in-android-recents";
+
+ // Installs an autogenerated theme based on the given RGB value.
+ // The format is "r,g,b", where r, g, b are a numeric values from 0 to 255.
+ const char kInstallAutogeneratedTheme[] = "install-autogenerated-theme";
+diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
+--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
+@@ -107,6 +107,7 @@ extern const char kForceFirstRun[];
+ extern const char kForceStackedTabStripLayout[];
+ extern const char kHomePage[];
+ extern const char kIncognito[];
+extern const char kEnableIncognitoSnapshotsInAndroidRecents[];
+ extern const char kInstallAutogeneratedTheme[];
+ extern const char kInstallChromeApp[];
+ extern const char kInstallSupervisedUserWhitelists[];
+-- 
+2.17.1
+
@@ -6,34 +6,27 @@ Accessible from proxy settings and chrome://proxy
 Allows to use a PAC script URL, automatic configuration and explicit proxy
 settings.
 Offer auto-complete for the proxy page URL.
-Store proxy settings in LocalState instead of Profile, so that proxy is used
-for SimpleURLLoaders as well.
 ---
 chrome/android/java/res/values/values.xml     |   3 +
 .../java/res/xml/privacy_preferences.xml      |   4 +
- .../privacy/settings/PrivacySettings.java     |   1 +
 .../chrome_autocomplete_provider_client.cc    |   2 +
 chrome/browser/browser_resources.grd          |   6 +
- chrome/browser/net/proxy_service_factory.cc   |  24 +-
- chrome/browser/net/proxy_service_factory.h    |   3 +
- chrome/browser/prefs/browser_prefs.cc         |   4 +
 .../prefs/chrome_command_line_pref_store.cc   |   2 +-
 chrome/browser/resources/proxy_config.css     |  61 +++
 chrome/browser/resources/proxy_config.html    |  79 ++++
- chrome/browser/resources/proxy_config.js      | 266 +++++++++++
+ chrome/browser/resources/proxy_config.js      | 262 +++++++++++
 chrome/browser/ui/BUILD.gn                    |   2 +
 .../webui/chrome_web_ui_controller_factory.cc |   3 +
- chrome/browser/ui/webui/proxy_config_ui.cc    | 418 ++++++++++++++++++
- chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++
+ chrome/browser/ui/webui/proxy_config_ui.cc    | 413 ++++++++++++++++++
+ chrome/browser/ui/webui/proxy_config_ui.h     |  33 ++
 chrome/common/webui_url_constants.cc          |   4 +
 chrome/common/webui_url_constants.h           |   2 +
- .../pref_proxy_config_tracker_impl.cc         |   1 +
- .../proxy_config/proxy_config_dictionary.cc   |  30 +-
- .../proxy_config/proxy_config_dictionary.h    |   7 +-
- .../proxy_config/proxy_policy_handler.cc      |   2 +-
+ .../core/browser/proxy_policy_handler.cc      |   2 +-
+ .../proxy_config/proxy_config_dictionary.cc   |  22 +-
+ .../proxy_config/proxy_config_dictionary.h    |   6 +-
 net/proxy_resolution/proxy_config.cc          |  52 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 24 files changed, 996 insertions(+), 14 deletions(-)
+ 19 files changed, 948 insertions(+), 13 deletions(-)
 create mode 100644 chrome/browser/resources/proxy_config.css
 create mode 100644 chrome/browser/resources/proxy_config.html
 create mode 100644 chrome/browser/resources/proxy_config.js
@@ -43,16 +36,16 @@ for SimpleURLLoaders as well.
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
-@@ -25,6 +25,9 @@
-     <!-- Compositor Tab Title Text -->
-     <bool name="compositor_tab_title_fake_bold_text">true</bool>
+@@ -66,6 +66,9 @@
+     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
+     <string name="manage_space_activity"></string>
 
 +    <string name="proxy_title">Proxy configuration</string>
 +    <string name="proxy_url">chrome://proxy</string>
 +
     <!-- Download InfoBar animation. -->
-     <integer name="download_infobar_fill_in_delay">1200</integer>
-     <integer name="download_infobar_fill_out_delay">200</integer>
+     <integer name="download_infobar_sweep_up_delay">500</integer>
+     <integer name="download_infobar_sweep_down_delay">800</integer>
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -64,37 +57,26 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 +        android:key="proxy"
 +        android:title="@string/proxy_title"
 +        app:url="@string/proxy_url" />
-     <Preference
-         android:key="clear_browsing_data"
-         android:title="@string/clear_browsing_data_title"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -58,6 +58,7 @@ public class PrivacySettings
-     private static final String PREF_DO_NOT_TRACK = "do_not_track";
-     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
-+    private static final String PREF_PROXY_OPTIONS = "proxy";
-     private static final String PREF_PRIVACY_REVIEW = "privacy_review";
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
-     private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
+     <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+         android:key="search_suggestions"
+         android:title="@string/search_suggestions_title"
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -275,6 +275,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -245,6 +245,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+   std::vector<base::string16> builtins_to_provide;
   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
- #endif
+       base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
 +  builtins_to_provide.push_back(
 +      base::ASCIIToUTF16(chrome::kChromeUIProxyConfigURL));
   builtins_to_provide.push_back(
-       base::ASCIIToUTF16(chrome::kChromeUIVersionURL));
-   return builtins_to_provide;
+       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
+ #if !defined(OS_ANDROID)
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -74,6 +74,12 @@
-         <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
+@@ -111,6 +111,12 @@
+         <include name="IDR_OFFLINE_INTERNALS_BROWSER_PROXY_JS" file="resources\offline_pages\offline_internals_browser_proxy.js" type="BINDATA" />
       </if>
 
 +      <!-- Bromite Proxy Configuration UI -->
@@ -104,105 +86,12 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 +      </if>
 +
       <if expr="not is_android">
-         <!-- Page not available for guest. -->
-         <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />
-diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
--- a/chrome/browser/net/proxy_service_factory.cc
-+++ b/chrome/browser/net/proxy_service_factory.cc
-@@ -6,6 +6,7 @@
- 
- #include <utility>
- 
-+#include "base/logging.h"
- #include "base/threading/thread_task_runner_handle.h"
- #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
-@@ -14,6 +15,9 @@
- #include "content/public/browser/browser_thread.h"
- #include "net/proxy_resolution/configured_proxy_resolution_service.h"
- #include "net/proxy_resolution/proxy_config_service.h"
-+#include "components/proxy_config/proxy_config_pref_names.h"
-+#include "components/prefs/pref_service.h"
-+#include "components/prefs/pref_registry_simple.h"
- 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
- #include "chromeos/network/proxy/proxy_config_service_impl.h"
-@@ -72,7 +76,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
-   return std::make_unique<chromeos::ProxyConfigServiceImpl>(
-       profile_prefs, local_state_prefs, nullptr);
- #else
-  return std::make_unique<PrefProxyConfigTrackerImpl>(profile_prefs, nullptr);
-+  // Migrate from profile_prefs to local_state_prefs
-+  if (local_state_prefs->GetBoolean("proxy_migrated") == false) {
-+    const base::Value* dict =
-+        profile_prefs->GetDictionary(proxy_config::prefs::kProxy);
-+
-+    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";
-+
-+    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict->Clone());
-+    local_state_prefs->Set(proxy_config::prefs::kProxy, proxy_dict);
-+
-+    local_state_prefs->SetBoolean("proxy_migrated", true);
-+    local_state_prefs->CommitPendingWrite();
-+  }
-+  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- }
- 
-@@ -88,3 +105,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
-                                                       nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- }
-+
-+// static
-+void ProxyServiceFactory::RegisterPrefs(PrefRegistrySimple* registry) {
-+  registry->RegisterBooleanPref("proxy_migrated", false);
-+}
-diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/proxy_service_factory.h
--- a/chrome/browser/net/proxy_service_factory.h
-+++ b/chrome/browser/net/proxy_service_factory.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
- 
- #include <memory>
-+#include "components/prefs/pref_registry_simple.h"
- 
- class PrefProxyConfigTracker;
- class PrefService;
-@@ -35,6 +36,8 @@ class ProxyServiceFactory {
-   CreatePrefProxyConfigTrackerOfProfile(PrefService* profile_prefs,
-                                         PrefService* local_state_prefs);
- 
-+  static void RegisterPrefs(PrefRegistrySimple* registry);
-+
-   // Creates a PrefProxyConfigTracker that tracks local state only. This tracker
-   // should be used for the system request context and the signin screen
-   // (ChromeOS only).
-diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
-+++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -161,6 +161,8 @@
- #include "printing/buildflags/buildflags.h"
- #include "rlz/buildflags/buildflags.h"
- 
-+#include "chrome/browser/net/proxy_service_factory.h"
-+
- #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
- #include "chrome/browser/background/background_mode_manager.h"
- #endif
-@@ -994,6 +996,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
-   chrome::enterprise_util::RegisterLocalStatePrefs(registry);
-   component_updater::RegisterPrefs(registry);
-   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
-+  ProxyServiceFactory::RegisterPrefs(registry);
-+
-   enterprise_reporting::RegisterLocalStatePrefs(registry);
-   ExternalProtocolHandler::RegisterPrefs(registry);
-   flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry);
+         <!-- New Tab Page -->
+         <part file="resources/local_ntp/icons.grdp" />
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
     SetValue(
         proxy_config::prefs::kProxy,
         std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
@@ -295,9 +184,9 @@ new file mode 100644
 +<script src="chrome://resources/js/ios/web_ui.js"></script>
 +</if>
 +
-+<script src="chrome://resources/js/assert.js"></script>
 +<script src="chrome://resources/js/util.js"></script>
-+<script type="module" src="chrome://proxy/proxy_config.js"></script>
+<script src="chrome://resources/js/cr.js"></script>
+<script src="chrome://proxy/proxy_config.js"></script>
 +<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 +<link rel="stylesheet" href="proxy_config.css">
 +<title>Proxy configuration</title>
@@ -365,7 +254,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/resources/proxy_config.js
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,262 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -383,8 +272,6 @@ new file mode 100644
 +    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
 +*/
 +
-+import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
-+
 +/**
 + * Main entry point called once the page has loaded.
 + */
@@ -442,8 +329,7 @@ new file mode 100644
 +    chrome.send('enableNotifyUIWithState');
 +  }
 +
-+  addSingletonGetter(ProxyConfigView);
-+  window.ProxyConfigView = ProxyConfigView;
+  cr.addSingletonGetter(ProxyConfigView);
 +
 +  ProxyConfigView.prototype = {
 +    /**
@@ -528,8 +414,7 @@ new file mode 100644
 +        return {
 +          "auto_detect": false,
 +          "pac_url": $(kIdPacURL).value.trim(),
-+          "pac_mandatory": $(kIdPacMandatory).checked,
-+          "rules": {}
+          "pac_mandatory": $(kIdPacMandatory).checked
 +        };
 +      } else if ($(kIdModeUseListPerScheme).checked || $(kIdModeUseSingleList).checked) {
 +        var config = {
@@ -564,14 +449,14 @@ new file mode 100644
 +    renderConfig_: function() {
 +      if (this.currentConfig.auto_detect) {
 +        $(kIdModeAutoDetect).checked = true;
-+      } else if (this.currentConfig.hasOwnProperty('pac_url')) {
-+        $(kIdPacURL).value = this.currentConfig.pac_url;
-+        $(kIdPacMandatory).checked = this.currentConfig.pac_mandatory;
-+        $(kIdModeUsePacURL).checked = true;
 +      } else if (this.currentConfig.rules.type == "none") {
 +        $(kIdModeEmpty).checked = true;
 +      } else if (this.currentConfig.rules.type == "direct") {
 +        $(kIdModeDirect).checked = true;
+      } else if (this.currentConfig.hasOwnProperty('pac_url')) {
+        $(kIdPacURL).value = this.currentConfig.pac_url;
+        $(kIdPacMandatory).checked = this.currentConfig.pac_mandatory;
+        $(kIdModeUsePacURL).checked = true;
 +      } else {
 +        $(kIdBypassRules).value = this.currentConfig.rules.bypass_rules;
 +        $(kIdReverseBypass).checked = this.currentConfig.rules.reverse_bypass;
@@ -635,7 +520,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -281,6 +281,8 @@ static_library("ui") {
+@@ -253,6 +253,8 @@ static_library("ui") {
     "webui/metrics_handler.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -643,19 +528,19 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 +    "webui/proxy_config_ui.h",
     "webui/net_internals/net_internals_ui.cc",
     "webui/net_internals/net_internals_ui.h",
-     "webui/ntp_tiles_internals_ui.cc",
+     "webui/notifications_internals/notifications_internals_ui.cc",
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -56,6 +56,7 @@
- #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
+@@ -62,6 +62,7 @@
 #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
- #include "chrome/browser/ui/webui/policy/policy_ui.h"
-+#include "chrome/browser/ui/webui/proxy_config_ui.h"
+ #include "chrome/browser/ui/webui/policy_ui.h"
 #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
- #include "chrome/browser/ui/webui/profiles/profile_internals_ui.h"
- #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
-@@ -778,6 +779,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+#include "chrome/browser/ui/webui/proxy_config_ui.h"
+ #include "chrome/browser/ui/webui/quota_internals/quota_internals_ui.h"
+ #include "chrome/browser/ui/webui/settings/settings_ui.h"
+ #include "chrome/browser/ui/webui/settings_utils.h"
+@@ -464,6 +465,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<MemoryInternalsUI>;
   if (url.host_piece() == chrome::kChromeUINetExportHost)
     return &NewWebUI<NetExportUI>;
@@ -663,12 +548,12 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
 +    return &NewWebUI<ProxyConfigUI>;
   if (url.host_piece() == chrome::kChromeUINetInternalsHost)
     return &NewWebUI<NetInternalsUI>;
-   if (url.host_piece() == chrome::kChromeUINTPTilesInternalsHost)
+   if (url.host_piece() == chrome::kChromeUINotificationsInternalsHost)
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.cc
-@@ -0,0 +1,418 @@
+@@ -0,0 +1,413 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -697,7 +582,9 @@ new file mode 100644
 +#include "base/bind.h"
 +#include "base/command_line.h"
 +#include "base/lazy_instance.h"
+#include "base/macros.h"
 +#include "base/memory/ref_counted.h"
+#include "base/scoped_observer.h"
 +#include "base/strings/string_util.h"
 +#include "base/strings/utf_string_conversions.h"
 +#include "base/values.h"
@@ -744,8 +631,6 @@ new file mode 100644
 +      public base::SupportsWeakPtr<ProxyConfigMessageHandler>,
 +      public net::ProxyConfigService::Observer {
 + public:
-+  ProxyConfigMessageHandler(const ProxyConfigMessageHandler&) = delete;
-+  ProxyConfigMessageHandler& operator=(const ProxyConfigMessageHandler&) = delete;
 +  // Creates a ProxyConfigMessageHandler that handles message exchanges with the Javascript
 +  // side of the UI and gets proxy settings from the Web UI associated profile to watch for changes.
 +  // The created ProxyConfigMessageHandler must be destroyed before |profile|.
@@ -756,9 +641,9 @@ new file mode 100644
 +  void RegisterMessages() override;
 +
 +  // Messages
-+  void OnEnableNotifyUIWithState(const base::Value::List& args);
-+  void OnApply(const base::Value::List& args);
-+  void OnClear(const base::Value::List& args);
+  void OnEnableNotifyUIWithState(const base::ListValue* list);
+  void OnApply(const base::ListValue* config);
+  void OnClear(const base::ListValue* config);
 +
 +  // net::ProxyConfigService::Observer implementation:
 +  // Calls ProxyConfigView.onProxyConfigChanged JavaScript function in the
@@ -769,7 +654,7 @@ new file mode 100644
 +
 + private:
 +  // Not owned.
-+  PrefService *pref_service_;
+  Profile *profile_;
 +  std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
 +  // Monitors global and Profile prefs related to proxy configuration.
 +  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
@@ -780,6 +665,8 @@ new file mode 100644
 +  void apply(const net::ProxyConfig& config);
 +
 +  base::WeakPtrFactory<ProxyConfigMessageHandler> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProxyConfigMessageHandler);
 +};
 +
 +ProxyConfigMessageHandler::ProxyConfigMessageHandler(Profile *profile)
@@ -787,7 +674,7 @@ new file mode 100644
 +      weak_ptr_factory_(this) {
 +
 +  // used to set new configuration preferences
-+  pref_service_ = g_browser_process->local_state();
+  profile_ = profile->GetOriginalProfile();
 +  // observer is explicitly added only later in enableNotifyUIWithState
 +  is_observing_ = false;
 +
@@ -808,7 +695,7 @@ new file mode 100644
 +  }
 +
 +  proxy_config_service_ = ProxyServiceFactory::CreateProxyConfigService(
-+      pref_proxy_config_tracker_.get(), nullptr);
+      pref_proxy_config_tracker_.get());
 +}
 +
 +void ProxyConfigMessageHandler::OnProxyConfigChanged(
@@ -851,16 +738,12 @@ new file mode 100644
 +
 +  state.SetPath({"config", "auto_detect"}, base::Value(config.auto_detect()));
 +
-+  auto rules = config.proxy_rules();
 +  if (config.has_pac_url()) {
 +    state.SetPath({"config", "pac_url"}, base::Value(config.pac_url().spec()));
 +    state.SetPath({"config", "pac_mandatory"}, base::Value(config.pac_mandatory()));
-+    state.SetPath({"config", "rules", "type"}, base::Value("none"));
-+    state.SetPath({"config", "rules", "bypass_rules"}, base::Value(rules.bypass_rules.ToString()));
-+    state.SetPath({"config", "rules", "reverse_bypass"}, base::Value(rules.reverse_bypass));
-+    return;
 +  }
 +
+  auto rules = config.proxy_rules();
 +  const char *type;
 +  switch (rules.type) {
 +    case net::ProxyConfig::ProxyRules::Type::EMPTY:
@@ -917,7 +800,7 @@ new file mode 100644
 +// The proxy configuration UI is not notified of state changes until this function runs.
 +// After this function, OnProxyConfigChanged() will be called on all proxy state changes.
 +void ProxyConfigMessageHandler::OnEnableNotifyUIWithState(
-+    const base::Value::List& list) {
+    const base::ListValue* list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
 +  if (!is_observing_) {
@@ -928,8 +811,8 @@ new file mode 100644
 +  net::ProxyConfigWithAnnotation config;
 +  auto availability = proxy_config_service_->GetLatestProxyConfig(&config);
 +
-+  const base::Value* dict =
-+      pref_service_->GetDictionary(proxy_config::prefs::kProxy);
+  const base::DictionaryValue* dict =
+      profile_->GetPrefs()->GetDictionary(proxy_config::prefs::kProxy);
 +  ProxyConfigDictionary proxy_dict(dict->Clone());
 +  ProxyPrefs::ProxyMode mode;
 +  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {
@@ -939,24 +822,24 @@ new file mode 100644
 +  OnProxyConfigChanged(config, availability);
 +}
 +
-+void ProxyConfigMessageHandler::OnClear(const base::Value::List& list) {
+void ProxyConfigMessageHandler::OnClear(const base::ListValue* list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
 +  const base::Value cfg = ProxyConfigDictionary::CreateSystem();
-+  pref_service_->Set(proxy_config::prefs::kProxy, cfg);
-+  pref_service_->CommitPendingWrite();
-+  OnEnableNotifyUIWithState(list);
+  profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
+  profile_->GetPrefs()->CommitPendingWrite();
+  OnEnableNotifyUIWithState(nullptr);
 +}
 +
-+void ProxyConfigMessageHandler::OnApply(const base::Value::List& list) {
+void ProxyConfigMessageHandler::OnApply(const base::ListValue* list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  if ((list.size() != 1) || !list[0].is_dict()) {
+  if ((list->GetList().size() != 1) || !list->GetList()[0].is_dict()) {
 +    return;
 +  }
 +
 +  const base::DictionaryValue* config = nullptr;
-+  if (!list[0].GetAsDictionary(&config))
+  if (!list->GetDictionary(0, &config))
 +    return;
 +
 +  const base::Value *autoDetect = config->FindKeyOfType("auto_detect", base::Value::Type::BOOLEAN);
@@ -1026,8 +909,7 @@ new file mode 100644
 +  } else if (t == "direct") {
 +      proxyConfig.proxy_rules().type = net::ProxyConfig::ProxyRules::Type::EMPTY;
 +  } else if (t == "none") {
-+      base::Value::List empty;
-+      OnClear(empty);
+      OnClear(nullptr);
 +      return;
 +  } else {
 +     // invalid type
@@ -1055,13 +937,13 @@ new file mode 100644
 +void ProxyConfigMessageHandler::apply(const net::ProxyConfig& proxyConfig) {
 +  if (proxyConfig.auto_detect()) {
 +    const base::Value cfg = ProxyConfigDictionary::CreateAutoDetect();
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
 +  } else if (proxyConfig.has_pac_url()) {
 +    const base::Value cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
 +  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {
 +    const base::Value cfg = ProxyConfigDictionary::CreateDirect();
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
 +  } else {
 +    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
 +    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
@@ -1069,12 +951,10 @@ new file mode 100644
 +    // fixed servers
 +    const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
 +                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
+    profile_->GetPrefs()->Set(proxy_config::prefs::kProxy, cfg);
 +  }
-+  pref_service_->CommitPendingWrite();
-+
-+  base::Value::List empty;
-+  OnEnableNotifyUIWithState(empty);
+  profile_->GetPrefs()->CommitPendingWrite();
+  OnEnableNotifyUIWithState(nullptr);
 +}
 +
 +}  // namespace
@@ -1091,7 +971,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,33 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1112,21 +992,23 @@ new file mode 100644
 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +
+#include "base/macros.h"
 +#include "content/public/browser/web_ui_controller.h"
 +
 +// The WebUI for chrome://proxy/.
 +class ProxyConfigUI : public content::WebUIController {
 + public:
-+  ProxyConfigUI(const ProxyConfigUI&) = delete;
-+  ProxyConfigUI& operator=(const ProxyConfigUI&) = delete;
 +  explicit ProxyConfigUI(content::WebUI* web_ui);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ProxyConfigUI);
 +};
 +
 +#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -48,6 +48,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+@@ -32,6 +32,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
 const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
 const char kChromeUIChromeSigninHost[] = "chrome-signin";
 const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
@@ -1135,17 +1017,17 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 const char kChromeUIChromeURLsHost[] = "chrome-urls";
 const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
 const char kChromeUIComponentsHost[] = "components";
-@@ -421,6 +423,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
-     kChromeUIMobileSetupHost,
-     kChromeUIMultiDeviceSetupHost,
-     kChromeUINetworkHost,
-+    kChromeUIProxyConfigHost,
-     kChromeUIOobeHost,
-     kChromeUIOSCreditsHost,
-     kChromeUIOSSettingsHost,
-@@ -672,6 +675,7 @@ const char* const kChromeHostURLs[] = {
- #if !BUILDFLAG(IS_ANDROID)
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -301,6 +303,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+       kChromeUIMobileSetupHost,
+       kChromeUIMultiDeviceSetupHost,
+       kChromeUINetworkHost,
+      kChromeUIProxyConfigHost,
+       kChromeUIOobeHost,
+       kChromeUIOSCreditsHost,
+       kChromeUIOSSettingsHost,
+@@ -480,6 +483,7 @@ const char* const kChromeHostURLs[] = {
+ #if !defined(OS_ANDROID)
+ #if !defined(OS_CHROMEOS)
     kChromeUIAppLauncherPageHost,
 +    kChromeUIProxyConfigHost,
 #endif
@@ -1154,7 +1036,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -132,6 +132,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -108,6 +108,8 @@ extern const char kChromeUIMemoryInternalsHost[];
 extern const char kChromeUINTPTilesInternalsHost[];
 extern const char kChromeUINaClHost[];
 extern const char kChromeUINetExportHost[];
@@ -1163,21 +1045,22 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
 extern const char kChromeUINetInternalsHost[];
 extern const char kChromeUINetInternalsURL[];
 extern const char kChromeUINewTabHost[];
-diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
--- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
-+++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
-@@ -381,6 +381,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
-       if (proxy_dict.GetBypassList(&proxy_bypass)) {
-         proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
+diff --git a/components/policy/core/browser/proxy_policy_handler.cc b/components/policy/core/browser/proxy_policy_handler.cc
+--- a/components/policy/core/browser/proxy_policy_handler.cc
+++ b/components/policy/core/browser/proxy_policy_handler.cc
+@@ -200,7 +200,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+           bypass_list->GetAsString(&bypass_list_string);
+         prefs->SetValue(proxy_config::prefs::kProxy,
+                         ProxyConfigDictionary::CreateFixedServers(
+-                            proxy_server, bypass_list_string));
+                            proxy_server, bypass_list_string, false));
       }
-+      proxy_config.proxy_rules().reverse_bypass = proxy_dict.HasReverseBypass();
-       *config = net::ProxyConfigWithAnnotation(
-           proxy_config, kSettingsProxyConfigTrafficAnnotation);
-       return true;
+       break;
+     }
 diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/proxy_config/proxy_config_dictionary.cc
 --- a/components/proxy_config/proxy_config_dictionary.cc
 +++ b/components/proxy_config/proxy_config_dictionary.cc
-@@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
+@@ -28,6 +28,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
 // String containing proxy bypass rules. For a specification of the
 // expected syntax see net::ProxyBypassRules::ParseFromString().
 const char kProxyBypassList[] = "bypass_list";
@@ -1186,22 +1069,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 
 }  // namespace
 
-@@ -78,6 +80,14 @@ bool ProxyConfigDictionary::HasBypassList() const {
-   return dict_.FindKey(kProxyBypassList);
- }
- 
-+bool ProxyConfigDictionary::HasReverseBypass() const {
-+  const base::Value* value = dict_.FindKey(kProxyReverseBypass);
-+  if (!value || !value->is_bool()) {
-+    return false;
-+  }
-+  return value->GetBool();
-+}
-+
- const base::Value& ProxyConfigDictionary::GetDictionary() const {
-   return dict_;
- }
-@@ -85,29 +95,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
+@@ -79,29 +81,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
 // static
 base::Value ProxyConfigDictionary::CreateDirect() {
   return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
@@ -1237,7 +1105,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   } else {
     return CreateDirect();
   }
-@@ -116,7 +127,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
+@@ -110,7 +113,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
 // static
 base::Value ProxyConfigDictionary::CreateSystem() {
   return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
@@ -1246,7 +1114,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 }
 
 // static
-@@ -125,7 +136,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -119,7 +122,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
     const std::string& pac_url,
     bool pac_mandatory,
     const std::string& proxy_server,
@@ -1256,7 +1124,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   base::Value dict(base::Value::Type::DICTIONARY);
   dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode)));
   if (!pac_url.empty()) {
-@@ -134,8 +146,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -128,8 +132,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
   }
   if (!proxy_server.empty())
     dict.SetKey(kProxyServer, base::Value(proxy_server));
@@ -1271,15 +1139,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/proxy_config/proxy_config_dictionary.h
 --- a/components/proxy_config/proxy_config_dictionary.h
 +++ b/components/proxy_config/proxy_config_dictionary.h
-@@ -42,6 +42,7 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-   bool GetProxyServer(std::string* out) const;
-   bool GetBypassList(std::string* out) const;
-   bool HasBypassList() const;
-+  bool HasReverseBypass() const;
- 
-   const base::Value& GetDictionary() const;
- 
-@@ -50,7 +51,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+@@ -46,7 +46,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
   static base::Value CreatePacScript(const std::string& pac_url,
                                      bool pac_mandatory);
   static base::Value CreateFixedServers(const std::string& proxy_server,
@@ -1289,7 +1149,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
   static base::Value CreateSystem();
 
   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
-@@ -66,7 +68,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
+@@ -62,7 +63,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
                                       const std::string& pac_url,
                                       bool pac_mandatory,
                                       const std::string& proxy_server,
@@ -1298,23 +1158,11 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
 +                                      bool reverse_bypass);
 
   base::Value dict_;
- };
-diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
--- a/components/proxy_config/proxy_policy_handler.cc
-+++ b/components/proxy_config/proxy_policy_handler.cc
-@@ -258,7 +258,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
-             ProxyConfigDictionary::CreateFixedServers(
-                 server->GetString(), bypass_list && bypass_list->is_string()
-                                          ? bypass_list->GetString()
-                                         : std::string()));
-+                                         : std::string(), false));
-       }
-       break;
-     }
+ 
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -112,7 +112,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -110,7 +110,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
                                    &single_proxies,
                                    ProxyServer::SCHEME_HTTP);
         type = Type::PROXY_LIST;
@@ -1323,7 +1171,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
       }
 
       // Trim whitespace off the url scheme.
-@@ -143,6 +143,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
+@@ -141,6 +141,56 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
   }
 }
 
@@ -1337,7 +1185,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +    std::string proxy_list;
 +    for (const ProxyServer& proxy_server :
 +         single_proxies.GetAll()) {
-+      proxy_list += ProxyServerToProxyUri(proxy_server) + ";";
+      proxy_list += proxy_server.ToURI() + ";";
 +    }
 +    // remove last semicolon
 +    if (proxy_list.length() != 0 ) {
@@ -1356,19 +1204,19 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +  std::string list;
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_http.GetAll()) {
-+    list += "http=" + ProxyServerToProxyUri(proxy_server) + ";";
+    list += "http=" + proxy_server.ToURI() + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_https.GetAll()) {
-+    list += "https=" + ProxyServerToProxyUri(proxy_server) + ";";
+    list += "https=" + proxy_server.ToURI() + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       proxies_for_ftp.GetAll()) {
-+    list += "ftp=" + ProxyServerToProxyUri(proxy_server) + ";";
+    list += "ftp=" + proxy_server.ToURI() + ";";
 +  }
 +  for (const ProxyServer& proxy_server :
 +       fallback_proxies.GetAll()) {
-+    list += "socks=" + ProxyServerToProxyUri(proxy_server) + ";";
+    list += "socks=" + proxy_server.ToURI() + ";";
 +  }
 +  if (list.length() != 0 ) {
 +    // remove last semicolon
@@ -1393,5 +1241,6 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
 
     // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
     // &fallback_proxies}, or NULL if there is no proxy to use.
--
-2.25.1
+-- 
+2.17.1
+
@@ -2,199 +2,102 @@ 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
 ---
- .../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(-)
+ chrome/android/java/res/values/values.xml             |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml   |  5 +++++
+ .../chrome/browser/LaunchIntentDispatcher.java        |  4 ++++
+ .../browser/privacy/settings/PrivacySettings.java     | 11 +++++++++++
+ .../ui/android/strings/android_chrome_strings.grd     |  7 +++++++
+ 5 files changed, 30 insertions(+)

+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
+@@ -14,6 +14,9 @@
+     <item name="top_controls_show_threshold" format="float" type="dimen">0.5</item>
+     <item name="top_controls_hide_threshold" format="float" type="dimen">0.5</item>
+ 
+    <string name="allow_custom_tab_intents_title">Allow custom tab intents from applications</string>
+    <string name="allow_custom_tab_intents_summary">When disabled, all custom tab intents will be processed as regular navigation instead</string>
+
+     <!-- The number of thumbnails that the thumbnail cache can hold. -->
+     <integer name="default_thumbnail_cache_size">5</integer>
+     <!-- The number of approximation thumbnails that the approximation cache can hold. -->
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -55,6 +55,16 @@
+@@ -29,6 +29,11 @@
         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:title="@string/do_not_track_title" />
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
 +        android:key="allow_custom_tab_intents"
 +        android:title="@string/allow_custom_tab_intents_title"
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
-+    <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"
+     <org.chromium.components.browser_ui.settings.ChromeBasePreference
+         android:key="secure_dns"
+         android:title="@string/settings_secure_dns_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -44,6 +44,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;
-@@ -57,6 +58,8 @@ import java.lang.annotation.Retention;
+@@ -54,6 +54,8 @@ import org.chromium.url.Origin;
+ 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.
-@@ -273,6 +276,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -243,6 +245,8 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
-+        if (!ContextUtils.getAppSharedPreferences()
-+                .getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
+        if (!ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_ALLOW_CUSTOM_TAB_INTENTS, false))
 +            return false;
         if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
                 || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
             return false;
-@@ -292,6 +298,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());
-@@ -411,6 +421,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
-@@ -36,6 +36,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.
-@@ -109,6 +112,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
-     }
- 
-     private static boolean isIntentFromThirdPartyAllowed() {
-+        if (ContextUtils.getAppSharedPreferences()
-+                        .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false))
-+            return true;
-         return CachedFeatureFlags.isEnabled(
-                 ChromeFeatureList.CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY);
-     }
 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
-@@ -83,6 +83,9 @@ public class PrivacySettings
-     private ViewGroup mDialogContainer;
-     private BottomSheetController mBottomSheetController;
+@@ -50,6 +50,8 @@ public class PrivacySettings
 
-+    private ChromeSwitchPreference allowCustomTabIntentsPref;
-+    private ChromeSwitchPreference openExternalLinksPref;
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+ 
+    public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
 +
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-         PrivacyPreferencesManagerImpl privacyPrefManager =
-@@ -154,6 +157,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();
-@@ -170,6 +176,14 @@ public class PrivacySettings
-         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
-             UserPrefs.get(Profile.getLastUsedRegularProfile())
-                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
+         PrivacyPreferencesManager privacyPrefManager = PrivacyPreferencesManager.getInstance();
+@@ -90,6 +92,10 @@ public class PrivacySettings
+                     Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
+         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
+             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);
 +        } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_ALLOW_CUSTOM_TAB_INTENTS, (boolean)newValue);
 +            sharedPreferencesEditor.apply();
-+        } else if (PREF_OPEN_EXTERNAL_LINKS_INCOGNITO.equals(key)) {
-+            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
-+            sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
-+            sharedPreferencesEditor.apply();
+         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
         }
-         return true;
-     }
-@@ -192,6 +206,16 @@ public class PrivacySettings
-             canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
+@@ -125,6 +131,11 @@ public class PrivacySettings
+                     prefServiceBridge.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
-+        allowCustomTabIntentsPref =
-+                (ChromeSwitchPreference) findPreference(PREF_ALLOW_CUSTOM_TAB_INTENTS);
+        ChromeBaseCheckBoxPreference allowCustomTabIntentsPref =
+                (ChromeBaseCheckBoxPreference) 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);
+             doNotTrackPref.setSummary(prefServiceBridge.getBoolean(Pref.ENABLE_DO_NOT_TRACK)
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4626,6 +4626,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3585,6 +3585,13 @@ 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>
@@ -204,17 +107,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      </message>
 +      <message name="IDS_ALLOW_CUSTOM_TAB_INTENTS_SUMMARY" desc="Summary text for 'Allow custom tab intents' settings-privacy option.">
 +        Allow applications to open custom tab intents, similar to webview.
-+      </message>
-+
-+      <!-- Open External Links in Incognito -->
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_TITLE" desc="Text for 'Open external links in incognito' settings-privacy option.">
-+        Open external links in incognito
-+      </message>
-+      <message name="IDS_OPEN_EXTERNAL_LINKS_INCOGNITO_SUMMARY" desc="Summary text for 'Open external links in incognito' settings-privacy option.">
-+        Force the opening of all external links in incognito mode
 +      </message>
 
       <!-- Autofill Assistant preferences -->
-       <!-- TODO(b/168178344): Move to Assistant settings strings section below. -->
--
-2.25.1
+       <message name="IDS_PREFS_AUTOFILL_ASSISTANT_TITLE" desc="Title for the Autofill Assistant preferences screen. [CHAR-LIMIT=32]">
+-- 
+2.17.1
+
@@ -4,90 +4,38 @@ Subject: Add exit menu item

 Corrected Exit functionality
 ---
- 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/android/java/res/menu/main_menu.xml                  | 4 ++++
+ .../src/org/chromium/chrome/browser/ChromeActivity.java     | 5 +++++
 .../chrome/browser/init/ChromeLifetimeController.java       | 6 +++++-
 .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
- 6 files changed, 26 insertions(+), 1 deletion(-)
+ 4 files changed, 17 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
-@@ -158,6 +158,9 @@
-             android:icon="@drawable/ic_business" />
-         <item android:id="@+id/managed_by_menu_id"
-             android:title="@string/managed" />
+@@ -87,6 +87,8 @@
+             android:title="@string/menu_help" />
+         <item android:id="@+id/enter_vr_id"
+             android:title="@string/enter_vr" />
 +        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
+            android:title="@string/menu_exit" />
     </group>
 
     <!-- Items shown only in the tab switcher -->
-@@ -184,6 +187,9 @@
+@@ -104,6 +106,8 @@
+             android:title="@string/menu_group_tabs" />
         <item android:id="@id/preferences_id"
-             android:title="@string/menu_settings"
-             android:icon="@drawable/settings_cog" />
+             android:title="@string/menu_settings" />
 +        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
+            android:title="@string/menu_exit" />
     </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
-@@ -215,6 +215,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.
-@@ -2137,6 +2139,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
-@@ -65,6 +65,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;
-@@ -2393,6 +2394,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             return true;
+     <!-- Items shown only in the tab switcher when start surface is enabled -->
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -1896,6 +1896,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             RecordUserAction.record("MobileMenuSettings");
         }
 
 +        if (id == R.id.exit_id) {
@@ -117,15 +65,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -3341,6 +3341,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
+@@ -2551,6 +2551,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+       <message name="IDS_MENU_SETTINGS" desc="Menu item for opening browser settings. [CHAR-LIMIT=27]">
+         Settings
       </message>
 +      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
 +        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 name="IDS_MENU_CLOSE_ALL_TABS" desc="Menu item for closing all open tabs. [CHAR-LIMIT=27]">
+         Close all tabs
       </message>
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,138 +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.
---
- 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
-@@ -466,6 +466,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[] = {
-@@ -3868,7 +3884,11 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsMac | kOsLinux | kOsLacros | 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.h"
-@@ -292,6 +294,15 @@ AutocompleteController::AutocompleteController(
-       search_service_worker_signal_sent_(false),
-       template_url_service_(provider_client_->GetTemplateURLService()) {
-   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {
-+    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
-+    provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
-+        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
-+    if (!base::Contains(flag_value, "bookmarks"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
-+    if (!base::Contains(flag_value, "chrome"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
-+  }
-   if (provider_types & AutocompleteProvider::TYPE_BOOKMARK)
-     providers_.push_back(new BookmarkProvider(provider_client_.get()));
-   if (provider_types & AutocompleteProvider::TYPE_BUILTIN)
-diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
--- a/components/omnibox/browser/history_url_provider.cc
-+++ b/components/omnibox/browser/history_url_provider.cc
-@@ -472,6 +472,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"
-@@ -646,6 +647,9 @@ void SearchProvider::Run(bool query_is_private) {
- }
- 
- void SearchProvider::DoHistoryQuery(bool minimal_changes) {
-+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering"))
-+    return;
-+
-   // The history query results are synchronous, so if minimal_changes is true,
-   // we still have the last results and don't need to do anything.
-   if (minimal_changes)
-diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
--- a/components/url_formatter/url_fixer.cc
-+++ b/components/url_formatter/url_fixer.cc
-@@ -9,6 +9,8 @@
- #include <algorithm>
- 
- #include "base/check_op.h"
-+#include "base/containers/contains.h"
-+#include "base/command_line.h"
- #include "base/files/file_path.h"
- #include "base/files/file_util.h"
- #include "base/ranges/algorithm.h"
-@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
- 
-     FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
-     if (chrome_url && !parts.host.is_valid())
-+     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
-+         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
-       url.append(kChromeUIDefaultHost);
-     FixupPort(trimmed, parts.port, &url);
-     FixupPath(trimmed, parts.path, &url);
--
-2.25.1
@@ -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
-
---
- 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                    | 3 ++-
- 6 files changed, 26 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
-@@ -4443,7 +4443,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
-@@ -1099,6 +1099,10 @@ const char kDisableKeepaliveFetchDescription[] =
-     "Disable fetch with keepalive set "
-     "(https://fetch.spec.whatwg.org/#request-keepalive-flag).";
- 
-+const char kEnableSaveDataHeaderName[] = "Enable save-data header";
-+const char kEnableSaveDataHeaderDescription[] =
-+    "Enable save-data header without enabling Data Saver.";
-+
- const char kExperimentalAccessibilityLanguageDetectionName[] =
-     "Experimental accessibility language detection";
- const char kExperimentalAccessibilityLanguageDetectionDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -583,6 +583,9 @@ extern const char kDeprecateAltBasedSixPackDescription[];
- extern const char kDisableKeepaliveFetchName[];
- extern const char kDisableKeepaliveFetchDescription[];
- 
-+extern const char kEnableSaveDataHeaderName[];
-+extern const char kEnableSaveDataHeaderDescription[];
-+
- extern const char kMemlogName[];
- extern const char kMemlogDescription[];
- extern const char kMemlogModeMinimal[];
-diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/content/browser/loader/browser_initiated_resource_request.cc
--- a/content/browser/loader/browser_initiated_resource_request.cc
-+++ b/content/browser/loader/browser_initiated_resource_request.cc
-@@ -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 @@ namespace features {
- const base::Feature kExpectCTReporting{"ExpectCTReporting",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
- 
-+
-+// Enable save-data header separately (without enabled data reduction service).
-+const base::Feature kEnableSaveDataHeader{"EnableSaveDataHeader",
-+                                           base::FEATURE_DISABLED_BY_DEFAULT};
-+
- const 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
-@@ -47,7 +47,8 @@ COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kDisableKeepaliveFetch;
- COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kOpaqueResponseBlockingV01;
-
-+COMPONENT_EXPORT(NETWORK_CPP)
-+extern const base::Feature kEnableSaveDataHeader;
- COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kTrustTokens;
- 
--
-2.25.1
@@ -19,8 +19,8 @@ with limited CPU/memory resources and it is disabled by default.
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -882,6 +882,11 @@ const FeatureEntry::FeatureVariation
-          std::size(kIsolatedPrerenderPrefetchLimitFifteen), nullptr},
+@@ -701,6 +701,11 @@ const FeatureEntry::Choice kForceEffectiveConnectionTypeChoices[] = {
+      net::kEffectiveConnectionType4G},
 };
 
 +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
@@ -28,10 +28,10 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 +    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
 +};
 +
- const FeatureEntry::Choice kMemlogModeChoices[] = {
-     {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
-     {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
-@@ -4417,6 +4422,9 @@ const FeatureEntry kFeatureEntries[] = {
+ // Ensure that all effective connection types returned by Network Quality
+ // Estimator (NQE) are also exposed via flags.
+ static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 ==
+@@ -2953,6 +2958,9 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAndroidPictureInPictureAPIName,
      flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)},
@@ -44,9 +44,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1600,6 +1600,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
-     "websites abusing the API will still eventually have their setTimeouts "
-     "clamped.";
+@@ -1298,6 +1298,10 @@ const char kMediaHistoryDescription[] =
+     "Enables Media History which records data around media playbacks on "
+     "websites.";
 
 +const char kMaxConnectionsPerHostName[] = "Maximum connections per host";
 +const char kMaxConnectionsPerHostDescription[] =
@@ -58,9 +58,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -903,6 +903,9 @@ extern const char kLogJsConsoleMessagesDescription[];
- extern const char kUnthrottledNestedTimeoutName[];
- extern const char kUnthrottledNestedTimeoutDescription[];
+@@ -770,6 +770,9 @@ extern const char kMarkHttpAsWarningAndDangerousOnFormEdits[];
+ extern const char kMediaHistoryName[];
+ extern const char kMediaHistoryDescription[];
 
 +extern const char kMaxConnectionsPerHostName[];
 +extern const char kMaxConnectionsPerHostDescription[];
@@ -96,7 +96,7 @@ diff --git a/components/network_session_configurator/common/network_features.h b
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
-@@ -19,6 +19,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
+@@ -22,6 +22,10 @@ NETWORK_SWITCH(kEnableUserAlternateProtocolPorts,
 // Enables the QUIC protocol.  This is a temporary testing flag.
 NETWORK_SWITCH(kEnableQuic, "enable-quic")
 
@@ -110,29 +110,29 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
-@@ -89,6 +89,7 @@ executable("make_top_domain_list_variables") {
+@@ -72,6 +72,7 @@ executable("make_top_domain_list_variables") {
+     "//base",
     "//base:i18n",
-     "//components/url_formatter/spoof_checks/common_words:common",
     "//third_party/icu",
 +    "//components/network_session_configurator/common"
   ]
   if (is_ios) {
-     frameworks = [ "UIKit.framework" ]
+     libs = [ "UIKit.framework" ]
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -19,6 +19,10 @@
- #include "net/socket/client_socket_handle.h"
+@@ -20,6 +20,10 @@
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/connect_job.h"
+ #include "net/ssl/ssl_config.h"
 +#include "components/network_session_configurator/common/network_switches.h"
 +
 +#include "base/command_line.h"
 +#include "base/strings/string_number_conversions.h"
- #include "net/ssl/ssl_config.h"
- #include "third_party/abseil-cpp/absl/types/optional.h"
- #include "url/gurl.h"
-@@ -172,6 +176,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+ 
+ namespace net {
+ 
+@@ -187,6 +191,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
 int ClientSocketPoolManager::max_sockets_per_group(
     HttpNetworkSession::SocketPoolType pool_type) {
   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
@@ -152,5 +152,6 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
   return g_max_sockets_per_group[pool_type];
 }
 
--
-2.25.1
+-- 
+2.17.1
+
@@ -7,29 +7,29 @@ Disable it by default on Android as it is everywhere else
 chrome/browser/about_flags.cc       | 4 ++++
 chrome/browser/flag_descriptions.cc | 5 +++++
 chrome/browser/flag_descriptions.h  | 3 +++
- media/base/media_switches.cc        | 4 ----
- 4 files changed, 12 insertions(+), 4 deletions(-)
+ media/base/media_switches.cc        | 6 +-----
+ 4 files changed, 13 insertions(+), 5 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
-@@ -3168,6 +3168,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWebRtcRemoteEventLogName,
-      flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)},
+@@ -2146,6 +2146,10 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsAura,
+      FEATURE_VALUE_TYPE(features::kOverlayScrollbarFlashWhenMouseEnter)},
+ #endif  // USE_AURA
 +    {"resume-background-video",
 +     flag_descriptions::kResumeBackgroundVideoName,
 +     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
- #endif
-     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
-      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
+     {"enable-quic", flag_descriptions::kQuicName,
+      flag_descriptions::kQuicDescription, kOsAll,
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)},
 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
-@@ -1183,6 +1183,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
-     "Enables image options to be surfaced in the context menu for nodes "
-     "covered by transparent overlays.";
+@@ -912,6 +912,11 @@ const char kMemlogStackModeNative[] = "Native";
+ const char kMemlogStackModeNativeWithThreadNames[] = "Native with thread names";
+ const char kMemlogStackModePseudo[] = "Trace events";
 
 +const char kResumeBackgroundVideoName[] = "Resume background video.";
 +const char kResumeBackgroundVideoDescription[] =
@@ -42,7 +42,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -646,6 +646,9 @@ extern const char kEnablePortalsDescription[];
+@@ -518,6 +518,9 @@ extern const char kEnablePortalsDescription[];
 extern const char kEnablePortalsCrossOriginName[];
 extern const char kEnablePortalsCrossOriginDescription[];
 
@@ -55,17 +55,19 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -276,11 +276,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -232,11 +232,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
 // when in background.
 const base::Feature kResumeBackgroundVideo {
   "resume-background-video",
-#if BUILDFLAG(IS_ANDROID)
+-#if defined(OS_ANDROID)
 -      base::FEATURE_ENABLED_BY_DEFAULT
 -#else
-       base::FEATURE_DISABLED_BY_DEFAULT
+-      base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
+   base::FEATURE_DISABLED_BY_DEFAULT
 };
 
- // Experimental: Try to avoid destroying the media player when transferring a
--
-2.25.1
+ // When enabled, MediaCapabilities will check with GPU Video Accelerator
+-- 
+2.17.1
+
@@ -3,7 +3,7 @@ Date: Sun, 18 Nov 2018 13:06:49 +0100
 Subject: Add flag to disable IPv6 probes

 ---
- chrome/browser/about_flags.cc                            | 4 ++++
+ chrome/browser/about_flags.cc                            | 5 +++++
 chrome/browser/flag_descriptions.cc                      | 4 ++++
 chrome/browser/flag_descriptions.h                       | 3 +++
 components/subresource_filter/tools/BUILD.gn             | 6 ++++++
@@ -11,41 +11,42 @@ Subject: Add flag to disable IPv6 probes
 net/dns/host_resolver_manager.cc                         | 9 ++++++++-
 services/network/public/cpp/features.cc                  | 4 ++++
 services/network/public/cpp/features.h                   | 2 ++
- 8 files changed, 33 insertions(+), 2 deletions(-)
+ 8 files changed, 34 insertions(+), 2 deletions(-)

 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5333,6 +5333,10 @@ const FeatureEntry kFeatureEntries[] = {
-     {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
-      flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
-      FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
+@@ -3770,6 +3770,11 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)},
+ #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
+ 
 +    {"ipv6-probing",
 +     flag_descriptions::kIPv6ProbingName,
 +     flag_descriptions::kIPv6ProbingDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(network::features::kIPv6Probing)},
- #endif  // BUILDFLAG(IS_ANDROID)
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+
+ #if !defined(OS_ANDROID)
+     {"ntp-confirm-suggestion-removals",
+      flag_descriptions::kNtpConfirmSuggestionRemovalsName,
 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
-@@ -3017,6 +3017,10 @@ const char kCCTResizableForThirdPartiesName[] =
- const char kCCTResizableForThirdPartiesDescription[] =
-     "Enable bottom sheet Custom Tabs for third party apps.";
+@@ -2561,6 +2561,10 @@ const char kContextualSearchRankerQueryDescription[] =
 
+ const char kContextualSearchSecondTapName[] =
+     "Contextual Search second tap triggering";
 +const char kIPv6ProbingName[] = "Enable IPv6 probing.";
 +const char kIPv6ProbingDescription[] =
 +    "Send IPv6 probes to a RIPE DNS address to verify IPv6 connectivity.";
 +
- const char kChimeAlwaysShowNotificationDescription[] =
-     "A debug flag to always show Chime notification after receiving a payload.";
- const char kChimeAlwaysShowNotificationName[] =
+ const char kContextualSearchSecondTapDescription[] =
+     "Enables triggering on a second tap gesture even when Ranker would "
+     "normally suppress that tap.";
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -715,6 +715,9 @@ extern const char kEnableWasmLazyCompilationName[];
- extern const char kEnableWasmLazyCompilationDescription[];
+@@ -584,6 +584,9 @@ extern const char kEnableWasmThreadsName[];
+ extern const char kEnableWasmThreadsDescription[];
 
 extern const char kEnableWasmTieringName[];
 +extern const char kIPv6ProbingName[];
@@ -87,20 +88,20 @@ diff --git a/components/subresource_filter/tools/BUILD.gn b/components/subresour
 diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
-@@ -89,7 +89,8 @@ executable("make_top_domain_list_variables") {
+@@ -72,7 +72,8 @@ executable("make_top_domain_list_variables") {
+     "//base",
     "//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" ]
+     libs = [ "UIKit.framework" ]
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -104,6 +104,7 @@
+@@ -93,6 +93,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
@@ -108,7 +109,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/datagram_client_socket.h"
-@@ -4129,8 +4130,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -3583,8 +3584,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
   if (last_ipv6_probe_time_.is_null() ||
       (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
           kIPv6ProbePeriodMs) {
@@ -127,7 +128,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -36,6 +36,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -47,6 +47,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kThrottleDelayable{"ThrottleDelayable",
                                        base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -141,14 +142,15 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -18,6 +18,8 @@ extern const base::Feature kExpectCTReporting;
+@@ -19,6 +19,8 @@ extern const base::Feature kNetworkErrorLogging;
 COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kNetworkErrorLogging;
+ extern const base::Feature kNetworkService;
 COMPONENT_EXPORT(NETWORK_CPP)
 +extern const base::Feature kIPv6Probing;
 +COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kReporting;
+ extern const base::Feature kOutOfBlinkCors;
 COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kThrottleDelayable;
--
-2.25.1
+ extern const base::Feature kReporting;
+-- 
+2.17.1
+
@@ -0,0 +1,53 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 16 Nov 2019 11:18:09 +0100
+Subject: Add flag to disable WebGL
+
+---
+ chrome/browser/about_flags.cc       | 3 +++
+ chrome/browser/flag_descriptions.cc | 4 ++++
+ chrome/browser/flag_descriptions.h  | 3 +++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -1975,6 +1975,9 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kAccelerated2dCanvasName,
+      flag_descriptions::kAccelerated2dCanvasDescription, kOsAll,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
+    {switches::kDisableWebGL, flag_descriptions::kDisableWebGLName,
+     flag_descriptions::kDisableWebGLDescription, kOsAll,
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebGL)},
+     {"composited-layer-borders", flag_descriptions::kCompositedLayerBordersName,
+      flag_descriptions::kCompositedLayerBordersDescription, kOsAll,
+      SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -484,6 +484,10 @@ const char kDeviceDiscoveryNotificationsName[] =
+ const char kDeviceDiscoveryNotificationsDescription[] =
+     "Device discovery notifications on local network.";
+ 
+const char kDisableWebGLName[] = "Disable all versions of WebGL";
+
+const char kDisableWebGLDescription[] = "Disable all versions of WebGL";
+
+ const char kDisableBestEffortTasksName[] = "Skip best effort tasks";
+ const char kDisableBestEffortTasksDescription[] =
+     "With this flag on, tasks of the lowest priority will not be executed "
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -301,6 +301,9 @@ extern const char kDebugShortcutsDescription[];
+ extern const char kDeviceDiscoveryNotificationsName[];
+ extern const char kDeviceDiscoveryNotificationsDescription[];
+ 
+extern const char kDisableWebGLName[];
+extern const char kDisableWebGLDescription[];
+
+ extern const char kDisableBestEffortTasksName[];
+ extern const char kDisableBestEffortTasksDescription[];
+ 
+-- 
+2.17.1
+
@@ -1,54 +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
-
---
- 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
-@@ -3148,6 +3148,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
-@@ -3391,6 +3391,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
-@@ -1938,6 +1938,9 @@ extern const char kQueryTilesDescription[];
- extern const char kQueryTilesNTPName[];
- extern const char kQueryTilesNTPDescription[];
- 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
@@ -1,154 +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
-
---
- 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                     | 4 ++++
- content/public/common/content_features.h                      | 2 ++
- third_party/blink/public/platform/web_runtime_features.h      | 1 +
- .../blink/renderer/modules/vibration/vibration_controller.cc  | 3 +++
- .../blink/renderer/platform/exported/web_runtime_features.cc  | 4 ++++
- .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++++
- 10 files changed, 28 insertions(+)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -6670,6 +6670,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
-@@ -5608,6 +5608,9 @@ const char kDefaultCalculatorWebAppDescription[] =
-     "chrome app.";
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
- 
-+const char kEnableVibrationName[] = "Vibration";
-+const char kEnableVibrationDescription[] = "Enable vibration API; an user gesture will still be needed.";
-+
- #if BUILDFLAG(IS_CHROMEOS)
- const char kDeprecateLowUsageCodecsName[] = "Deprecates low usage media codecs";
- const char kDeprecateLowUsageCodecsDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -3406,6 +3406,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
-@@ -100,6 +100,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
-@@ -121,6 +121,10 @@ const base::Feature kBackForwardCacheMemoryControls {
- #endif
- };
- 
-+// Enables vibration; an user gesture will still be required if enabled.
-+const 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
-@@ -318,6 +318,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
-     kCompositorLockTimeout;
- 
- #endif  // BUILDFLAG(IS_ANDROID)
-+CONTENT_EXPORT extern const base::Feature kVibration;
-+
- 
- #if BUILDFLAG(IS_MAC)
- CONTENT_EXPORT extern const base::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
-@@ -87,6 +87,7 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation(
-       bool);
-   BLINK_PLATFORM_EXPORT static void EnableCacheInlineScriptCode(bool);
-+  BLINK_PLATFORM_EXPORT static void EnableVibration(bool);
-   BLINK_PLATFORM_EXPORT static void EnableCapabilityDelegationPaymentRequest(
-       bool enable);
-   BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable);
-diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
--- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
-+++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
-@@ -30,6 +30,7 @@
- #include "third_party/blink/renderer/core/frame/navigator.h"
- #include "third_party/blink/renderer/core/page/page.h"
- #include "third_party/blink/renderer/platform/mojo/mojo_helper.h"
-+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
- 
- // Maximum number of entries in a vibration pattern.
- const unsigned kVibrationPatternLengthMax = 99;
-@@ -149,6 +150,8 @@ bool VibrationController::vibrate(Navigator& navigator,
-   // reference to |window| or |navigator| was retained in another window.
-   if (!navigator.DomWindow())
-     return false;
-+  if (!RuntimeEnabledFeatures::VibrationEnabled())
-+    return false;
-   return From(navigator).Vibrate(pattern);
- }
- 
-diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
--- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-+++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -164,6 +164,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
-   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
- }
- 
-+void WebRuntimeFeatures::EnableVibration(bool enable) {
-+  RuntimeEnabledFeatures::SetVibrationEnabled(enable);
-+}
-+
- void WebRuntimeFeatures::EnableKeyboardAccessibleTooltip(bool enable) {
-   RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable);
- }
-diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
-+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1668,6 +1668,10 @@
-       name: "OrientationEvent",
-       status: {"Android": "stable"},
-     },
-+    {
-+      name: "Vibration",
-+      status: "stable",
-+    },
-     {
-       name: "OriginIsolationHeader",
-       status: "stable",
--
-2.25.1
@@ -0,0 +1,185 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Mon, 22 Oct 2018 21:29:53 +0200
+Subject: Add flags to disable device motion/orientation APIs
+
+Both flags will be disabled by default and prevent usage of gyroscope and
+legacy acceleration events.
+---
+ chrome/browser/about_flags.cc                          |  6 ++++++
+ chrome/browser/flag_descriptions.cc                    |  8 ++++++++
+ chrome/browser/flag_descriptions.h                     |  6 ++++++
+ content/child/runtime_features.cc                      |  3 +++
+ content/public/common/content_features.cc              | 10 ++++++++++
+ content/public/common/content_features.h               |  2 ++
+ .../blink/public/platform/web_runtime_features.h       |  2 ++
+ .../blink/renderer/modules/modules_initializer.cc      | 10 +++++++---
+ .../renderer/platform/exported/web_runtime_features.cc |  8 ++++++++
+ .../renderer/platform/runtime_enabled_features.json5   |  8 ++++++++
+ 10 files changed, 60 insertions(+), 3 deletions(-)
+
+diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
+--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
+@@ -2199,6 +2199,12 @@ const FeatureEntry kFeatureEntries[] = {
+     {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName,
+      flag_descriptions::kGpuRasterizationDescription, kOsAll,
+      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
+    {"enable-device-motion", flag_descriptions::kEnableDeviceMotionName,
+     flag_descriptions::kEnableDeviceMotionDescription, kOsAll,
+     FEATURE_VALUE_TYPE(features::kDeviceMotion)},
+    {"enable-device-orientation", flag_descriptions::kEnableDeviceOrientationName,
+     flag_descriptions::kEnableDeviceOrientationDescription, kOsAll,
+     FEATURE_VALUE_TYPE(features::kDeviceOrientation)},
+     {"enable-oop-rasterization", flag_descriptions::kOopRasterizationName,
+      flag_descriptions::kOopRasterizationDescription, kOsAll,
+      MULTI_VALUE_TYPE(kEnableOopRasterizationChoices)},
+diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
+--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
+@@ -705,6 +705,14 @@ const char kWinrtSensorsImplementationDescription[] =
+     "Enables usage of the Windows.Devices.Sensors WinRT APIs on Windows for "
+     "sensors";
+ 
+const char kEnableDeviceMotionName[] = "Enable device motion";
+const char kEnableDeviceMotionDescription[] =
+    "Enable device motion API which is used to detect changes in acceleration";
+
+const char kEnableDeviceOrientationName[] = "Enable device orientation";
+const char kEnableDeviceOrientationDescription[] =
+    "Enable device orientation API which is used to detect changes in orientation";
+
+ const char kEnableGenericSensorExtraClassesName[] =
+     "Generic Sensor Extra Classes";
+ const char kEnableGenericSensorExtraClassesDescription[] =
+diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
+--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
+@@ -422,6 +422,12 @@ extern const char kWinrtGeolocationImplementationDescription[];
+ extern const char kWinrtSensorsImplementationName[];
+ extern const char kWinrtSensorsImplementationDescription[];
+ 
+extern const char kEnableDeviceMotionName[];
+extern const char kEnableDeviceMotionDescription[];
+
+extern const char kEnableDeviceOrientationName[];
+extern const char kEnableDeviceOrientationDescription[];
+
+ extern const char kEnableGenericSensorExtraClassesName[];
+ extern const char kEnableGenericSensorExtraClassesDescription[];
+ 
+diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
+--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
+@@ -92,6 +92,9 @@ void SetRuntimeFeatureDefaultsForPlatform(
+       command_line.HasSwitch(
+           blink::switches::kEnableGpuMemoryBufferCompositorResources) &&
+       !command_line.HasSwitch(switches::kDisableWebGLImageChromium) &&
+  WebRuntimeFeatures::EnableDeviceMotion(base::FeatureList::IsEnabled(features::kDeviceMotion));
+  WebRuntimeFeatures::EnableDeviceOrientation(base::FeatureList::IsEnabled(features::kDeviceOrientation));
+
+       !command_line.HasSwitch(switches::kDisableGpu) &&
+       base::FeatureList::IsEnabled(features::kWebGLImageChromium);
+ #else
+diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
+--- a/content/public/common/content_features.cc
+++ b/content/public/common/content_features.cc
+@@ -801,6 +801,16 @@ const base::Feature kWebOtpBackend{"kWebOtpBackend",
+ // TODO(rouslan): Remove this.
+ const base::Feature kWebPayments{"WebPayments",
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+// Enables the device motion API used to track device acceleration;
+// no user authorization or notifications happens when in use.
+const base::Feature kDeviceMotion{"DeviceMotion",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+
+// Enables the device orientation API used to track device orientation;
+// no user authorization or notifications happens when in use.
+const base::Feature kDeviceOrientation{"DeviceOrientation",
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+
+ 
+ // Minimal user interface experience for payments on the web.
+ const base::Feature kWebPaymentsMinimalUI{"WebPaymentsMinimalUI",
+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
+@@ -175,6 +175,8 @@ CONTENT_EXPORT extern const base::Feature kWebXrHitTest;
+ CONTENT_EXPORT extern const base::Feature kWebXrIncubations;
+ CONTENT_EXPORT extern const base::Feature kWebXrPermissionsApi;
+ 
+CONTENT_EXPORT extern const base::Feature kDeviceMotion, kDeviceOrientation;
+
+ #if defined(OS_ANDROID)
+ CONTENT_EXPORT extern const base::Feature kAndroidAutofillAccessibility;
+ CONTENT_EXPORT extern const base::Feature
+diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
+--- a/third_party/blink/public/platform/web_runtime_features.h
+++ b/third_party/blink/public/platform/web_runtime_features.h
+@@ -99,6 +99,8 @@ class WebRuntimeFeatures {
+   BLINK_PLATFORM_EXPORT static void EnableCSSHexAlphaColor(bool);
+   BLINK_PLATFORM_EXPORT static void EnableSameSiteByDefaultCookies(bool);
+   BLINK_PLATFORM_EXPORT static void EnableScrollTopLeftInterop(bool);
+  BLINK_PLATFORM_EXPORT static void EnableDeviceMotion(bool);
+  BLINK_PLATFORM_EXPORT static void EnableDeviceOrientation(bool);
+   BLINK_PLATFORM_EXPORT static void EnableKeyboardFocusableScrollers(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDatabase(bool);
+   BLINK_PLATFORM_EXPORT static void EnableDecodeJpeg420ImagesToYUV(bool);
+diff --git a/third_party/blink/renderer/modules/modules_initializer.cc b/third_party/blink/renderer/modules/modules_initializer.cc
+--- a/third_party/blink/renderer/modules/modules_initializer.cc
+++ b/third_party/blink/renderer/modules/modules_initializer.cc
+@@ -224,9 +224,13 @@ void ModulesInitializer::OnClearWindowObjectInMainWorld(
+     Document& document,
+     const Settings& settings) const {
+   LocalDOMWindow& window = *document.domWindow();
+-  DeviceMotionController::From(window);
+-  DeviceOrientationController::From(window);
+-  DeviceOrientationAbsoluteController::From(window);
+  if (RuntimeEnabledFeatures::DeviceMotionEnabled())
+    DeviceMotionController::From(window);
+  if (RuntimeEnabledFeatures::DeviceOrientationEnabled()) {
+    DeviceOrientationController::From(window);
+    DeviceOrientationAbsoluteController::From(window);
+  }
+
+   NavigatorGamepad::From(*window.navigator());
+ 
+   // TODO(nhiroki): Figure out why ServiceWorkerContainer needs to be eagerly
+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
+@@ -189,6 +189,14 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
+   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
+ }
+ 
+void WebRuntimeFeatures::EnableDeviceMotion(bool enable) {
+  RuntimeEnabledFeatures::SetDeviceMotionEnabled(enable);
+}
+
+void WebRuntimeFeatures::EnableDeviceOrientation(bool enable) {
+  RuntimeEnabledFeatures::SetDeviceOrientationEnabled(enable);
+}
+
+ void WebRuntimeFeatures::EnableKeyboardFocusableScrollers(bool enable) {
+   RuntimeEnabledFeatures::SetKeyboardFocusableScrollersEnabled(enable);
+ }
+diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
+@@ -1256,6 +1256,14 @@
+       name: "OffscreenCanvasCommit",
+       status: "experimental",
+     },
+    {
+      name: "DeviceMotion",
+      status: "stable",
+    },
+    {
+      name: "DeviceOrientation",
+      status: "stable",
+    },
+     {
+       name: "OnDeviceChange",
+       // Android does not yet support SystemMonitor.
+-- 
+2.17.1
+
@@ -0,0 +1,250 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 7 Aug 2020 16:33:47 +0000
+Subject: Add history support in incognito mode
+
+---
+ .../java/res/xml/privacy_preferences.xml       |  5 +++++
+ .../privacy/settings/PrivacySettings.java      | 18 ++++++++++++++++++
+ chrome/browser/history/history_tab_helper.cc   | 16 ++++++++++++++++
+ chrome/browser/history/history_tab_helper.h    |  4 ++++
+ chrome/browser/prefs/browser_prefs.cc          |  2 ++
+ .../android/strings/android_chrome_strings.grd |  6 ++++++
+ .../translations/android_chrome_strings_it.xtb |  2 ++
+ chrome/common/pref_names.cc                    |  5 +++++
+ chrome/common/pref_names.h                     |  4 ++++
+ 9 files changed, 62 insertions(+)
+ mode change 100644 => 100755 chrome/android/java/res/xml/privacy_preferences.xml
+ mode change 100644 => 100755 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+ mode change 100644 => 100755 chrome/browser/history/history_tab_helper.cc
+ mode change 100644 => 100755 chrome/browser/history/history_tab_helper.h
+ mode change 100644 => 100755 chrome/browser/prefs/browser_prefs.cc
+ mode change 100644 => 100755 chrome/browser/ui/android/strings/android_chrome_strings.grd
+ mode change 100644 => 100755 chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+ mode change 100644 => 100755 chrome/common/pref_names.cc
+ mode change 100644 => 100755 chrome/common/pref_names.h
+
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+old mode 100644
+new mode 100755
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -39,6 +39,11 @@
+         android:title="@string/close_tabs_on_exit_title"
+         android:summary="@string/close_tabs_on_exit_summary"
+         android:defaultValue="false" />
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+        android:key="incognito_history_enabled"
+        android:title="@string/incognito_history_enabled_title"
+        android:summary="@string/incognito_history_enabled_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/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+old mode 100644
+new mode 100755
+--- 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
+@@ -38,6 +38,8 @@ import org.chromium.ui.text.SpanApplier;
+ 
+ import java.util.List;
+ 
+import org.chromium.base.Log;
+
+ /**
+  * Fragment to keep track of the all the privacy related preferences.
+  */
+@@ -54,6 +56,7 @@ public class PrivacySettings
+     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+ 
+     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
+    public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_history_enabled";
+ 
+     @Override
+     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+@@ -84,6 +87,11 @@ public class PrivacySettings
+         searchSuggestionsPref.setOnPreferenceChangeListener(this);
+         searchSuggestionsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+ 
+        ChromeBaseCheckBoxPreference historyInIncognitoPref =
+                (ChromeBaseCheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+        historyInIncognitoPref.setOnPreferenceChangeListener(this);
+        historyInIncognitoPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
+         updateSummaries();
+     }
+ 
+@@ -105,6 +113,9 @@ public class PrivacySettings
+             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
+             sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
+             sharedPreferencesEditor.apply();
+        } else if (PREF_INCOGNITO_TAB_HISTORY_ENABLED.equals(key)) {
+            PrefServiceBridge.getInstance().setBoolean(
+                    Pref.INCOGNITO_TAB_HISTORY_ENABLED, (boolean) newValue);
+         }
+ 
+         return true;
+@@ -179,6 +190,13 @@ public class PrivacySettings
+                 (ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+         closeTabsOnExitPref.setOnPreferenceChangeListener(this);
+         closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
+        CheckBoxPreference historyInIncognitoPref =
+                (CheckBoxPreference) findPreference(PREF_INCOGNITO_TAB_HISTORY_ENABLED);
+        if (historyInIncognitoPref != null) {
+            historyInIncognitoPref.setChecked(
+                    prefServiceBridge.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED));
+        }
+     }
+ 
+     private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
+diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
+old mode 100644
+new mode 100755
+--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
+@@ -29,6 +29,9 @@
+ 
+ #if defined(OS_ANDROID)
+ #include "chrome/browser/android/background_tab_manager.h"
+#include "chrome/common/pref_names.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+ #else
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
+@@ -242,6 +245,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+   Profile* profile =
+       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+
+#if defined(OS_ANDROID)
+  if(profile->GetOriginalProfile()->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled)) {
+    return HistoryServiceFactory::GetForProfile(profile, ServiceAccessType::IMPLICIT_ACCESS);
+  } 
+#endif
+
+   if (profile->IsOffTheRecord())
+     return NULL;
+ 
+@@ -249,6 +259,12 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+       profile, ServiceAccessType::IMPLICIT_ACCESS);
+ }
+ 
+// static
+void HistoryTabHelper::RegisterProfilePrefs(PrefRegistrySimple* registry) {
+  registry->RegisterBooleanPref(prefs::kIncognitoTabHistoryEnabled,
+                                /*default_value=*/false);
+}
+
+ void HistoryTabHelper::WebContentsDestroyed() {
+   // We update the history for this URL.
+   WebContents* tab = web_contents();
+diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
+old mode 100644
+new mode 100755
+--- a/chrome/browser/history/history_tab_helper.h
+++ b/chrome/browser/history/history_tab_helper.h
+@@ -10,6 +10,8 @@
+ #include "base/time/time.h"
+ #include "content/public/browser/web_contents_observer.h"
+ #include "content/public/browser/web_contents_user_data.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+ 
+ namespace history {
+ struct HistoryAddPageArgs;
+@@ -34,6 +36,8 @@ class HistoryTabHelper : public content::WebContentsObserver,
+       int nav_entry_id,
+       content::NavigationHandle* navigation_handle);
+ 
+  static void RegisterProfilePrefs(PrefRegistrySimple* registry);
+
+  private:
+   explicit HistoryTabHelper(content::WebContents* web_contents);
+   friend class content::WebContentsUserData<HistoryTabHelper>;
+diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
+old mode 100644
+new mode 100755
+--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
+@@ -233,6 +233,7 @@
+ #include "components/ntp_tiles/popular_sites_impl.h"
+ #include "components/permissions/contexts/geolocation_permission_context_android.h"
+ #include "components/query_tiles/tile_service_prefs.h"
+#include "chrome/browser/history/history_tab_helper.h"
+ #if BUILDFLAG(ENABLE_FEED_IN_CHROME)
+ #include "components/feed/core/common/pref_names.h"
+ #endif  // BUILDFLAG(ENABLE_FEED_IN_CHROME)
+@@ -999,6 +1000,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+   usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
+   variations::VariationsService::RegisterProfilePrefs(registry);
+   feed::prefs::RegisterFeedSharedProfilePrefs(registry);
+  HistoryTabHelper::RegisterProfilePrefs(registry);
+ #if BUILDFLAG(ENABLE_FEED_IN_CHROME)
+   feed::RegisterProfilePrefs(registry);
+ #endif  // BUILDFLAG(ENABLE_FEED_IN_CHROME)
+diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+old mode 100644
+new mode 100755
+--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
+@@ -794,6 +794,12 @@ Your Google account may have other forms of browsing history like searches and a
+       <message name="IDS_ALWAYS_INCOGNITO_SUMMARY" desc="Summary for always incognito mode">
+         Opens links in incognito tabs when you click on new tab or on a link
+       </message>
+			<message name="IDS_INCOGNITO_HISTORY_ENABLED_TITLE" desc="Title for always enable history in incognito mode">
+				Enable history in incognito tabs
+			</message>
+			<message name="IDS_INCOGNITO_HISTORY_ENABLED_SUMMARY" desc="Summary for always enable history in incognito mode">
+				Record history even in incognito mode
+			</message>
+       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SIGNED_IN" desc="A text explaining other forms of activity for signed in users.">
+         Clears history and autocompletions in the address bar. Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
+       </message>
+diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+old mode 100644
+new mode 100755
+--- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_it.xtb
+@@ -1062,4 +1062,6 @@ Ad esempio, alcuni siti web potrebbero rispondere alla richiesta mostrando annun
+ <translation id="666268767214822976">Utilizza un servizio di previsione per visualizzare query correlate e siti web popolari durante la digitazione nella barra degli indirizzi</translation>
+ <translation id="8283853025636624853">Sincronizzazione con <ph name="SYNC_ACCOUNT_USER_NAME" /></translation>
+ <translation id="8981454092730389528">Gestione attività di Google</translation>
+<translation id="7889537574758531583">Abilita la cronologia nelle sessioni in incognito</translation>
+<translation id="5713583121562162330">Abilita la registrazione della navigazione nella cronologia anche per le sessioni in incognito</translation>	
+ </translationbundle>
+diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
+old mode 100644
+new mode 100755
+--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
+@@ -3038,4 +3038,9 @@ const char kMediaFeedsSafeSearchEnabled[] = "media_feeds_safe_search_enabled";
+ // TODO(enne): Remove this once AppCache has been removed.
+ const char kAppCacheForceEnabled[] = "app_cache_force_enabled";
+ 
+#if defined(OS_ANDROID)
+const char kIncognitoTabHistoryEnabled[] =
+    "incognito_tab_history_enabled";
+#endif
+
+ }  // namespace prefs
+diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
+old mode 100644
+new mode 100755
+--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
+@@ -1074,6 +1074,10 @@ extern const char kMediaFeedsSafeSearchEnabled[];
+ 
+ extern const char kAppCacheForceEnabled[];
+ 
+#if defined(OS_ANDROID)
+extern const char kIncognitoTabHistoryEnabled[];
+#endif
+
+ }  // namespace prefs
+ 
+ #endif  // CHROME_COMMON_PREF_NAMES_H_
+-- 
+2.17.1
+
@@ -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
-
---
- chrome/android/java/res/menu/main_menu.xml    |  7 +++
- .../chrome/browser/ChromeTabbedActivity.java  | 26 ++++++++
- .../browser/bookmarks/BookmarkBridge.java     | 60 +++++++++++++++++++
- .../browser/bookmarks/BookmarkUtils.java      |  4 ++
- .../android/bookmarks/bookmark_bridge.cc      | 17 ++++++
- .../android/bookmarks/bookmark_bridge.h       |  4 ++
- .../browser/bookmarks/bookmark_html_writer.cc |  8 ++-
- .../bookmarks/chrome_bookmark_client.cc       |  2 +
- .../dialogs/DownloadLocationCustomView.java   |  4 +-
- .../strings/android_chrome_strings.grd        |  3 +
- components/bookmark_bar_strings.grdp          |  6 ++
- .../bookmarks/browser/bookmark_codec.cc       | 24 ++++++--
- components/bookmarks/browser/bookmark_codec.h |  7 ++-
- .../browser/bookmark_load_details.cc          |  4 ++
- .../bookmarks/browser/bookmark_load_details.h |  2 +
- .../bookmarks/browser/bookmark_model.cc       |  3 +-
- components/bookmarks/browser/bookmark_model.h |  7 +++
- components/bookmarks/browser/bookmark_node.cc | 15 +++++
- components/bookmarks/browser/bookmark_node.h  |  5 ++
- components/bookmarks/browser/model_loader.cc  |  3 +-
- .../bookmark_specifics_conversions.cc         |  1 +
- 21 files changed, 202 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
-@@ -64,6 +64,10 @@
-         <item android:id="@+id/all_bookmarks_menu_id"
-             android:title="@string/menu_bookmarks"
-             android:icon="@drawable/btn_star_filled" />
-+        <item android:id="@+id/bookmark_all_tabs_menu_id"
-+            android:title="@string/menu_bookmark_all_tabs"
-+            android:titleCondensed="@string/menu_bookmark_all_tabs"
-+            android:icon="@drawable/ic_folder_blue_24dp" />
-         <item android:id="@+id/recent_tabs_menu_id"
-             android:title="@string/menu_recent_tabs"
-             android:icon="@drawable/devices_black_24dp" />
-@@ -181,6 +185,9 @@
-         <item android:id="@+id/menu_group_tabs"
-             android:title="@string/menu_group_tabs"
-             android:icon="@drawable/ic_widgets" />
-+        <item android:id="@+id/bookmark_all_tabs_menu_id"
-+            android:title="@string/menu_bookmark_all_tabs"
-+            android:icon="@drawable/ic_folder_blue_24dp" />
-         <item android:id="@+id/track_prices_row_menu_id"
-             android:title="@string/menu_track_prices"
-             android:icon="@drawable/ic_trending_down_black" />
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -69,6 +69,8 @@ import org.chromium.chrome.browser.app.tabmodel.ChromeNextTabPolicySupplier;
- import org.chromium.chrome.browser.app.tabmodel.TabModelOrchestrator;
- import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
- import org.chromium.chrome.browser.app.tabmodel.TabbedModeTabModelOrchestrator;
-+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
- import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
- import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
- import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-@@ -2150,6 +2152,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(),
-@@ -2202,6 +2206,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
-         mTabModalHandler.onOmniboxFocusChanged(hasFocus);
-     }
- 
-+    private void bookmarkAllTabs() {
-+        TabModel tabModel = getTabModelSelector().getCurrentModel();
-+        int count = tabModel.getCount();
-+        Log.i(TAG, "bookmarkAllTabs(): %d tabs to bookmark", count);
-+        if (count == 0) {
-+            return;
-+        }
-+
-+        final BookmarkBridge bridge = mBookmarkBridgeSupplier.get();
-+        final BookmarkModel bookmarkModel = new BookmarkModel();
-+        bookmarkModel.finishLoadingBookmarkModel(() -> {
-+            for (int i = 0; i < tabModel.getCount(); i++) {
-+                Tab tab = tabModel.getTabAt(i);
-+                if (tab.isNativePage()) {
-+                    continue;
-+                }
-+                bridge.addToTabsCollection(this, tab);
-+            }
-+            bridge.finishedAddingToTabsCollection(this, getSnackbarManager());
-+        });
-+    }
-+
-     private void recordLauncherShortcutAction(boolean isIncognito) {
-         if (isIncognito) {
-             RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab");
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -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;
-@@ -46,6 +47,10 @@ import org.chromium.chrome.browser.subscriptions.CommerceSubscription;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
- import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
- import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
-+import org.chromium.chrome.R;
- import org.chromium.components.bookmarks.BookmarkId;
- import org.chromium.components.bookmarks.BookmarkType;
- import org.chromium.components.commerce.PriceTracking.ProductPrice;
-@@ -90,6 +95,7 @@ import java.io.File;
-  * bookmark model stored in native.
-  */
- public class BookmarkBridge {
-+    private static final String TAG = "BookmarkBridge";
-     private final Profile mProfile;
-     private boolean mIsDestroyed;
-     private boolean mIsDoingExtensiveChanges;
-@@ -633,6 +639,16 @@ public class BookmarkBridge {
-                 mNativeBookmarkBridge, BookmarkBridge.this);
-     }
- 
-+    /**
-+     * @return The BookmarkId for the Tabs collecction folder node
-+     */
-+    public BookmarkId getTabsCollectionFolderId() {
-+        ThreadUtils.assertOnUiThread();
-+        assert mIsNativeBookmarkModelLoaded;
-+        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
-+                mNativeBookmarkBridge, BookmarkBridge.this);
-+    }
-+
-     /**
-      * @return Id representing the special "other" folder from bookmark model.
-      */
-@@ -1358,6 +1374,49 @@ public class BookmarkBridge {
-                 mNativeBookmarkBridge, BookmarkBridge.this, title, url);
-     }
- 
-+    // Used to bookmark all tabs in a specific folder, created if not existing
-+    public BookmarkId addToTabsCollection(Context context, Tab tab) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+        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().getSpec());
-+
-+        if (bookmarkId == null) {
-+            Log.e(TAG,
-+                    "Failed to add bookmarks: parentTypeAndId %s", parent);
-+        }
-+        return bookmarkId;
-+     }
-+
-+     public void finishedAddingToTabsCollection(Activity activity, SnackbarManager snackbarManager) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+
-+        BookmarkItem bookmarkItem = getBookmarkById(parent);
-+        String folderName;
-+        if (bookmarkItem != null) {
-+            folderName = bookmarkItem.getTitle();
-+        } else {
-+            folderName = "";
-+        }
-+        SnackbarController snackbarController = new SnackbarController() {
-+            @Override
-+            public void onAction(Object actionData) {
-+            }
-+        };
-+        Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
-+                        Snackbar.UMA_BOOKMARK_ADDED)
-+                        .setTemplateText(activity.getString(R.string.bookmark_page_saved_folder));
-+        snackbarManager.showSnackbar(snackbar);
-+    }
-+
-     /**
-      * @param url The URL of the reading list item.
-      * @return The reading list item with the URL, or null if no such reading list item.
-@@ -1655,6 +1714,7 @@ public class BookmarkBridge {
-         void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
-                 List<BookmarkId> folderList, List<Integer> depthList);
-         BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-+        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-         BookmarkId getMobileFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-         BookmarkId getOtherFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-         BookmarkId getDesktopFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
-@@ -633,6 +633,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 =
-@@ -658,6 +659,9 @@ public class BookmarkUtils {
-         if (bookmarkModel.isFolderVisible(mobileNodeId)) {
-             topLevelFolders.add(mobileNodeId);
-         }
-+        if (bookmarkModel.isFolderVisible(tabsCollectionNodeId)) {
-+            topLevelFolders.add(tabsCollectionNodeId);
-+        }
-         if (bookmarkModel.isFolderVisible(desktopNodeId)) {
-             topLevelFolders.add(desktopNodeId);
-         }
-diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
-+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
-@@ -434,6 +434,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());
-@@ -482,6 +487,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/android/bookmarks/bookmark_bridge.h b/chrome/browser/android/bookmarks/bookmark_bridge.h
--- a/chrome/browser/android/bookmarks/bookmark_bridge.h
-+++ b/chrome/browser/android/bookmarks/bookmark_bridge.h
-@@ -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
-@@ -117,6 +117,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
-@@ -3414,6 +3414,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
-@@ -34,6 +34,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";
-@@ -75,7 +76,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(),
-                 std::move(sync_metadata_str));
- }
- 
-@@ -83,6 +85,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,
-     std::string sync_metadata_str) {
-   ids_reassigned_ = false;
-@@ -104,6 +107,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));
-   FinalizeChecksum();
-@@ -120,6 +124,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();
-@@ -127,7 +132,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;
-@@ -135,12 +141,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;
- }
-@@ -190,6 +197,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())
-@@ -221,6 +229,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);
- 
-@@ -456,11 +470,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
-@@ -48,6 +48,7 @@ class BookmarkCodec {
-   base::Value Encode(const BookmarkNode* bookmark_bar_node,
-                      const BookmarkNode* other_folder_node,
-                      const BookmarkNode* mobile_folder_node,
-+                     const BookmarkNode* tabs_folder_node,
-                      const BookmarkNode::MetaInfoMap* model_meta_info_map,
-                      std::string sync_metadata_str);
- 
-@@ -60,6 +61,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);
- 
-@@ -105,6 +107,7 @@ class BookmarkCodec {
-   // Allows the BookmarkClient to read and a write a string blob from the JSON
-   // file. That string captures the bookmarks sync metadata.
-   static const char kSyncMetadata[];
-+  static const char kTabsBookmarkFolderNameKey[];
- 
-   // Possible values for kTypeKey.
-   static const char kTypeURL[];
-@@ -121,6 +124,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);
- 
-@@ -132,7 +136,8 @@ class BookmarkCodec {
-   // Reassigns bookmark IDs for all nodes.
-   void ReassignIDs(BookmarkNode* bb_node,
-                    BookmarkNode* other_node,
-                   BookmarkNode* mobile_node);
-+                   BookmarkNode* mobile_node,
-+                   BookmarkNode* tabs_folder_node);
- 
-   // Helper to recursively reassign IDs.
-   void ReassignIDsHelper(BookmarkNode* node);
-diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
--- a/components/bookmarks/browser/bookmark_load_details.cc
-+++ b/components/bookmarks/browser/bookmark_load_details.cc
-@@ -36,6 +36,10 @@ BookmarkLoadDetails::BookmarkLoadDetails(BookmarkClient* client)
-       root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks(
-           max_id_++,
-           client->IsPermanentNodeVisibleWhenEmpty(BookmarkNode::MOBILE))));
-+  tabs_collection_folder_node_ = static_cast<BookmarkPermanentNode*>(
-+      root_node_->Add(BookmarkPermanentNode::CreateTabsCollectionBookmarks(
-+          max_id_++,
-+          client->IsPermanentNodeVisibleWhenEmpty(BookmarkNode::TABS_COLLECTION))));
- }
- 
- BookmarkLoadDetails::~BookmarkLoadDetails() = default;
-diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/bookmarks/browser/bookmark_load_details.h
--- a/components/bookmarks/browser/bookmark_load_details.h
-+++ b/components/bookmarks/browser/bookmark_load_details.h
-@@ -43,6 +43,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_); }
-@@ -97,6 +98,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
-@@ -565,7 +565,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) {
-@@ -807,6 +807,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
-@@ -121,6 +121,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_;
-@@ -396,6 +402,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";
-@@ -225,6 +229,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
-       visible_when_empty));
- }
- 
-+// static
-+std::unique_ptr<BookmarkPermanentNode>
-+BookmarkPermanentNode::CreateTabsCollectionBookmarks(int64_t id,
-+                                             bool visible_when_empty) {
-+  // base::WrapUnique() used because the constructor is private.
-+  return base::WrapUnique(new BookmarkPermanentNode(
-+      id, TABS_COLLECTION, base::GUID::ParseLowercase(kTabsCollectionBookmarksNodeGuid),
-+      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME),
-+      visible_when_empty));
-+}
-+
- BookmarkPermanentNode::BookmarkPermanentNode(int64_t id,
-                                              Type type,
-                                              const base::GUID& guid,
-diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h
--- a/components/bookmarks/browser/bookmark_node.h
-+++ b/components/bookmarks/browser/bookmark_node.h
-@@ -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.
-@@ -250,6 +252,9 @@ class BookmarkPermanentNode : public BookmarkNode {
-   static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
-       int64_t id,
-       bool visible_when_empty);
-+  static std::unique_ptr<BookmarkPermanentNode> CreateTabsCollectionBookmarks(
-+      int64_t id,
-+      bool visible_when_empty);
- 
-   // Constructor is private to disallow the construction of permanent nodes
-   // other than the well-known ones, see factory methods.
-diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc
--- a/components/bookmarks/browser/model_loader.cc
-+++ b/components/bookmarks/browser/model_loader.cc
-@@ -54,7 +54,8 @@ void LoadBookmarks(const base::FilePath& path,
-       std::string sync_metadata_str;
-       BookmarkCodec codec;
-       codec.Decode(*root, details->bb_node(), details->other_folder_node(),
-                   details->mobile_folder_node(), &max_node_id,
-+                   details->mobile_folder_node(),
-+                   details->tabs_collection_folder_node(), &max_node_id,
-                    &sync_metadata_str);
-       details->set_sync_metadata_str(std::move(sync_metadata_str));
-       details->set_max_id(std::max(max_node_id, details->max_id()));
-diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
--- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
-+++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
-@@ -419,6 +419,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
@@ -4,13 +4,13 @@ Subject: Add menu item to view source

 ---
 chrome/android/java/res/menu/custom_tabs_menu.xml  |  3 +++
- chrome/android/java/res/menu/main_menu.xml         |  3 +++
+ chrome/android/java/res/menu/main_menu.xml         |  2 ++
+ .../chromium/chrome/browser/ChromeActivity.java    |  2 ++
 .../chrome/browser/ChromeTabbedActivity.java       |  2 ++
- .../chrome/browser/app/ChromeActivity.java         |  5 +++++
 .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
 .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../ui/android/strings/android_chrome_strings.grd  |  4 ++++
- 7 files changed, 32 insertions(+)
+ .../ui/android/strings/android_chrome_strings.grd  |  3 +++
+ 7 files changed, 27 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
@@ -28,56 +28,52 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 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
-@@ -106,6 +106,9 @@
+@@ -66,6 +66,8 @@
+             android:title="@string/menu_find_in_page" />
         <item android:id="@+id/add_to_homescreen_id"
-             android:title="@string/menu_add_to_homescreen"
-             android:icon="@drawable/ic_add_to_home_screen" />
+             android:title="@string/menu_add_to_homescreen" />
 +        <item android:id="@+id/view_source_id"
-+            android:title="@string/view_source"
-+            android:icon="@drawable/ic_drive_document_24dp" />
+            android:title="@string/view_source" />
         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk"
-             android:icon="@drawable/ic_add_to_home_screen" />
+             android:title="@string/menu_open_webapk" />
+         <item android:id="@+id/request_desktop_site_row_menu_id"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+@@ -1984,6 +1984,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+             } catch (ActivityNotFoundException e) {
+                 Toast.makeText(context, R.string.open_webapk_failed, Toast.LENGTH_SHORT).show();
+             }
+        } else if (id == R.id.view_source_id) {
+            currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString()));
+         } else if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) {
+             final boolean reloadOnChange = !currentTab.isNativePage();
+             final boolean usingDesktopUserAgent =
 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
-@@ -2176,6 +2176,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1866,6 +1866,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()));
+            currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString()));
         } 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
-@@ -2518,6 +2518,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();
+             TabModel currentModel = mTabModelSelectorImpl.getCurrentModel();
+             if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
 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
-@@ -507,6 +507,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -287,6 +287,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                         isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
 
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */);
 +        updateViewSourceMenuItem(menu, currentTab);
 
-         updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
- 
-@@ -1153,6 +1154,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         stopPriceTrackingMenuItem.setVisible(priceTrackingEnabled);
+         // Only display reader mode settings menu option if the current page is in reader mode.
+         menu.findItem(R.id.reader_mode_prefs_id).setVisible(shouldShowReaderModePrefs(currentTab));
+@@ -622,6 +623,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+         }
     }
 
 +    /**
@@ -89,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 +    protected void updateViewSourceMenuItem(
 +            Menu menu, Tab currentTab) {
 +        MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
-+        String url = currentTab.getUrl().getSpec();
+        String url = currentTab.getUrlString();
 +        viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:"));
 +    }
 +
@@ -99,10 +95,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 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
-@@ -216,6 +216,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -220,6 +220,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             }
 
-             updateRequestDesktopSiteMenuItem(
-                     menu, currentTab, requestDesktopSiteVisible, isChromeScheme);
+             updateRequestDesktopSiteMenuItem(menu, currentTab, requestDesktopSiteVisible);
 +            updateViewSourceMenuItem(menu, currentTab);
             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
         }
@@ -110,16 +106,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 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
-@@ -306,6 +306,10 @@ CHAR_LIMIT guidelines:
-         Chrome tips
+@@ -307,6 +307,9 @@ CHAR-LIMIT guidelines:
+       <message name="IDS_SERVICES_CATEGORY_TITLE" desc="Title for the group of preferences that control non-personalized Google services. This group contains preferences for data that is not tied to user's Google Account.">
+         Other Google services
       </message>
- 
 +      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">
 +        View source
 +      </message>
-+
-       <message name="IDS_UNSUPPORTED" desc="Message displayed to the user when an attempted action is not supported.">
-         Unsupported
+       <message name="IDS_PREFS_GOOGLE_SERVICES" desc="Title for the group of preferences that control non-personalized Google services. This group contains preferences for data that is not tied to user's Google Account. [CHAR-LIMIT=40]">
+         Google services
       </message>
--
-2.25.1
+-- 
+2.17.1
+
@@ -0,0 +1,533 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 5 Dec 2019 22:41:25 +0100
+Subject: Add option to configure the ad blocker filters URL
+
+---
+ chrome/android/chrome_java_resources.gni      |  2 +
+ chrome/android/chrome_java_sources.gni        |  2 +
+ .../java/res/layout/adblock_editor.xml        | 67 ++++++++++++++
+ chrome/android/java/res/values/values.xml     |  2 +
+ .../java/res/xml/adblock_preferences.xml      | 25 +++++
+ .../android/java/res/xml/main_preferences.xml |  5 +
+ .../browser/settings/AdBlockEditor.java       | 92 +++++++++++++++++++
+ .../browser/settings/AdBlockPreferences.java  | 61 ++++++++++++
+ chrome/app/generated_resources.grd            | 10 ++
+ chrome/browser/browser_process_impl.cc        |  3 +-
+ .../flags/android/cached_feature_flags.cc     |  8 ++
+ .../browser/flags/CachedFeatureFlags.java     | 10 ++
+ .../net/system_network_context_manager.cc     |  4 +
+ .../strings/android_chrome_strings.grd        | 14 +++
+ chrome/common/pref_names.cc                   |  3 +
+ chrome/common/pref_names.h                    |  1 +
+ .../adblock_updater_service.cc                |  6 +-
+ .../adblock_updater_service.h                 |  3 +-
+ 18 files changed, 313 insertions(+), 5 deletions(-)
+ create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
+ create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
+
+diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
+--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
+@@ -815,6 +815,7 @@ chrome_java_resources = [
+   "java/res/layout/account_picker_new_account_row_legacy.xml",
+   "java/res/layout/account_picker_row.xml",
+   "java/res/layout/account_picker_row_legacy.xml",
+  "java/res/layout/adblock_editor.xml",
+   "java/res/layout/add_languages_main.xml",
+   "java/res/layout/add_to_homescreen_dialog.xml",
+   "java/res/layout/auto_sign_in_first_run_dialog.xml",
+@@ -1102,6 +1103,7 @@ chrome_java_resources = [
+   "java/res/xml/about_chrome_preferences.xml",
+   "java/res/xml/accessibility_preferences.xml",
+   "java/res/xml/account_management_preferences.xml",
+  "java/res/xml/adblock_preferences.xml",
+   "java/res/xml/autofill_server_profile_preferences.xml",
+   "java/res/xml/bookmark_widget_info.xml",
+   "java/res/xml/clear_browsing_data_preferences_tab.xml",
+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
+@@ -1318,6 +1318,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/photo_picker/DecodeVideoTask.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceHost.java",
+  "java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/FileEnumWorkerTask.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialog.java",
+   "java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java",
+diff --git a/chrome/android/java/res/layout/adblock_editor.xml b/chrome/android/java/res/layout/adblock_editor.xml
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/res/layout/adblock_editor.xml
+@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scroll_view"
+        android:fillViewport="true" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:focusableInTouchMode="true" >
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/adblock_url"
+                android:paddingTop="16dp"
+                android:paddingStart="@dimen/pref_autofill_content_spacing"
+                android:paddingEnd="@dimen/pref_autofill_content_spacing"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
+                <EditText
+                    tools:ignore="Autofill"
+                    android:id="@+id/adblock_url_edit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textUri"
+                    android:singleLine="true"
+                    android:hint="@string/options_adblock_edit_label" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Space style="@style/ButtonBarTopSpacer" />
+            <View style="@style/ButtonBarTopDivider" />
+
+            <LinearLayout style="@style/ButtonBar" >
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/adblock_reset"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/reset" />
+
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/adblock_cancel"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/cancel" />
+
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/adblock_save"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/save" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/settings_action_bar_shadow"/>
+
+</FrameLayout>
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
+@@ -66,6 +66,8 @@
+     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
+     <string name="manage_space_activity"></string>
+ 
+    <string name="adblock_help_url">https://www.bromite.org/custom-filters</string>
+
+     <string name="proxy_title">Proxy configuration</string>
+     <string name="proxy_url">chrome://proxy</string>
+ 
+diff --git a/chrome/android/java/res/xml/adblock_preferences.xml b/chrome/android/java/res/xml/adblock_preferences.xml
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/res/xml/adblock_preferences.xml
+@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="adblock_switch"
+        android:summaryOn="@string/text_on"
+        android:summaryOff="@string/text_off" />
+
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+        android:key="adblock_help"
+        android:title="@string/adblock_help"
+        app:url="@string/adblock_help_url" />
+
+    <Preference
+        android:key="adblock_edit"
+        android:title="@string/options_adblock_edit_label"
+        android:fragment="org.chromium.chrome.browser.settings.AdBlockEditor" />
+
+</PreferenceScreen>
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -61,6 +61,11 @@
+         android:key="privacy"
+         android:order="14"
+         android:title="@string/prefs_privacy"/>
+    <Preference
+        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
+        android:key="adblock"
+        android:order="13"
+        android:title="@string/prefs_adblock"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.accessibility.settings.AccessibilitySettings"
+         android:key="accessibility"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
+@@ -0,0 +1,92 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.settings;
+
+import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
+import org.chromium.chrome.R;
+import org.chromium.components.url_formatter.UrlFormatter;
+
+/**
+ * Provides the Java-UI for editing AdBlock preferences.
+ */
+public class AdBlockEditor extends Fragment implements TextWatcher {
+    private EditText mAdBlockFiltersUrlEdit;
+    private Button mSaveButton;
+    private Button mResetButton;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.options_adblock_edit_title);
+
+        View v = inflater.inflate(R.layout.adblock_editor, container, false);
+        View scrollView = v.findViewById(R.id.scroll_view);
+        scrollView.getViewTreeObserver().addOnScrollChangedListener(
+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
+        mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);
+        mAdBlockFiltersUrlEdit.setText(CachedFeatureFlags.getAdBlockFiltersURL());
+        mAdBlockFiltersUrlEdit.addTextChangedListener(this);
+        mAdBlockFiltersUrlEdit.requestFocus();
+
+        initializeSaveCancelResetButtons(v);
+        return v;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        mSaveButton.setEnabled(s.length() != 0);
+        mResetButton.setEnabled(true);
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+    }
+
+    private void initializeSaveCancelResetButtons(View v) {
+        mResetButton = (Button) v.findViewById(R.id.adblock_reset);
+        mResetButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAdBlockFiltersUrlEdit.setText(CachedFeatureFlags.getAdBlockFiltersURL());
+                getActivity().finish();
+            }
+        });
+
+        mSaveButton = (Button) v.findViewById(R.id.adblock_save);
+        mSaveButton.setEnabled(false);
+        mSaveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CachedFeatureFlags.setAdBlockFiltersURL(
+                        UrlFormatter.fixupUrl(mAdBlockFiltersUrlEdit.getText().toString()).getSpec());
+                getActivity().finish();
+            }
+        });
+
+        Button button = (Button) v.findViewById(R.id.adblock_cancel);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+    }
+}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
+@@ -0,0 +1,61 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.settings;
+
+import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+
+import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
+import org.chromium.components.browser_ui.site_settings.SiteSettingsPreferenceFragment;
+import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge;
+import org.chromium.components.content_settings.ContentSettingsType;
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
+import androidx.annotation.VisibleForTesting;
+import org.chromium.chrome.R;
+
+/**
+ * Fragment that allows the user to configure AdBlock related preferences.
+ */
+public class AdBlockPreferences extends SiteSettingsPreferenceFragment {
+    @VisibleForTesting
+    public static final String PREF_ADBLOCK_SWITCH = "adblock_switch";
+    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
+
+    private Preference mAdBlockEdit;
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        getActivity().setTitle(R.string.options_adblock_title);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
+
+        BrowserContextHandle browserContextHandle =
+                getSiteSettingsClient().getBrowserContextHandle();
+
+        ChromeSwitchPreference mAdBlockSwitch =
+                (ChromeSwitchPreference) findPreference(PREF_ADBLOCK_SWITCH);
+        boolean isAdBlockEnabled = !WebsitePreferenceBridge.isCategoryEnabled(browserContextHandle, ContentSettingsType.ADS);
+        mAdBlockSwitch.setChecked(isAdBlockEnabled);
+        mAdBlockSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+            WebsitePreferenceBridge.setCategoryEnabled(browserContextHandle, ContentSettingsType.ADS, !(boolean) newValue);
+            return true;
+        });
+
+        mAdBlockEdit = findPreference(PREF_ADBLOCK_EDIT);
+        updateCurrentAdBlockUrl();
+    }
+
+    private void updateCurrentAdBlockUrl() {
+        mAdBlockEdit.setSummary(CachedFeatureFlags.getAdBlockFiltersURL());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateCurrentAdBlockUrl();
+    }
+}
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
+@@ -9883,6 +9883,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+       Never show this again.
+     </message>
+ 
+    <!-- Ad Blocking preferences -->
+    <if expr="is_android">
+      <message name="IDS_OPTIONS_ADBLOCK_TITLE" desc="The title of the Ad Blocking option on Android" formatter_data="android_java">
+        Ad Blocking
+      </message>
+      <message name="IDS_OPTIONS_ADBLOCK_SUMMARY" desc="The title of the Ad Blocking summary on Android" formatter_data="android_java">
+        Configure Ad Blocking and filters URL
+      </message>
+    </if>
+
+     <!-- Ad Blocking UI strings. -->
+     <message name="IDS_ALWAYS_ALLOW_ADS" desc="Explanation associated with a toggle to allow ads after ads have been blocked on the page. To be used on pages where the ad blocking UI is governed by a persistent permissions-based whitelist.">
+       Always allow ads on this site
+diff --git a/chrome/browser/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
+@@ -1075,7 +1075,8 @@ BrowserProcessImpl::adblock_updater() {
+   adblock_updater_ = std::make_unique<adblock_updater::AdBlockUpdaterService>(
+           g_browser_process->system_network_context_manager()->GetSharedURLLoaderFactory(),
+           std::move(scheduler),
+-          g_browser_process->subresource_filter_ruleset_service());
+          g_browser_process->subresource_filter_ruleset_service(),
+          local_state()->GetString(prefs::kAdBlockFiltersURL));
+ 
+   return adblock_updater_.get();
+ }
+diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc
+--- a/chrome/browser/flags/android/cached_feature_flags.cc
+++ b/chrome/browser/flags/android/cached_feature_flags.cc
+@@ -36,6 +36,14 @@ std::string GetReachedCodeProfilerTrialGroup() {
+ }  // namespace android
+ }  // namespace chrome
+ 
+static ScopedJavaLocalRef<jstring> JNI_CachedFeatureFlags_GetAdBlockFiltersURL(JNIEnv* env) {
+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kAdBlockFiltersURL));
+}
+
+static void JNI_CachedFeatureFlags_SetAdBlockFiltersURL(JNIEnv* env, const JavaParamRef<jstring>& url) {
+  g_browser_process->local_state()->SetString(prefs::kAdBlockFiltersURL, base::android::ConvertJavaStringToUTF8(env, url));
+}
+
+ static jboolean JNI_CachedFeatureFlags_IsNetworkServiceWarmUpEnabled(
+     JNIEnv* env) {
+   return content::IsOutOfProcessNetworkService() &&
+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
+@@ -253,6 +253,14 @@ public class CachedFeatureFlags {
+                         ChromeFeatureList.REACHED_CODE_PROFILER, "sampling_interval_us", 0));
+     }
+ 
+     public static void setAdBlockFiltersURL(String url) {
+         CachedFeatureFlagsJni.get().setAdBlockFiltersURL(url);
+     }
+
+     public static String getAdBlockFiltersURL() {
+         return CachedFeatureFlagsJni.get().getAdBlockFiltersURL();
+     }
+
+     /**
+      * Caches flags that must take effect on startup but are set via native code.
+      */
+@@ -405,5 +413,7 @@ public class CachedFeatureFlags {
+     @NativeMethods
+     interface Natives {
+         boolean isNetworkServiceWarmUpEnabled();
+        void setAdBlockFiltersURL(String url);
+        String getAdBlockFiltersURL();
+     }
+ }
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -331,6 +331,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+           SSLConfigServiceManager::CreateDefaultManager(local_state_)),
+       proxy_config_monitor_(local_state_),
+       stub_resolver_config_reader_(local_state_) {
+  local_state_->SetDefaultPrefValue(prefs::kAdBlockFiltersURL,
+                                    base::Value("https://www.bromite.org/filters/filters.dat"));
+ #if !defined(OS_ANDROID)
+   // QuicAllowed was not part of Android policy.
+   const base::Value* value =
+@@ -392,6 +394,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+   StubResolverConfigReader::RegisterPrefs(registry);
+ 
+  registry->RegisterStringPref(prefs::kAdBlockFiltersURL, std::string());
+
+   // Static auth params
+   registry->RegisterStringPref(prefs::kAuthSchemes,
+                                "basic,digest,ntlm,negotiate");
+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
+@@ -1958,6 +1958,20 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+         Work profile
+       </message>
+ 
+      <!-- AdBlock settings -->
+      <message name="IDS_PREFS_ADBLOCK" desc="Title of the AdBlock Settings screen. [CHAR-LIMIT=32]">
+        AdBlock settings
+      </message>
+      <message name="IDS_OPTIONS_ADBLOCK_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used to fetch the ad blocker filters.">
+        Edit filters URL
+      </message>
+      <message name="IDS_OPTIONS_ADBLOCK_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used to fetch the ad blocker filters.">
+        Filters URL
+      </message>
+      <message name="IDS_ADBLOCK_HELP" desc="The title of the hyperlink that allows users to visit the web page with instructions for custom ad blocker filters.">
+        Visit help page
+      </message>
+
+       <!-- Fullscreen -->
+       <message name="IDS_IMMERSIVE_FULLSCREEN_API_NOTIFICATION" desc="Notification message when a site has entered immersive fullscreen and the directions of how to exit.">
+         Drag from top and touch the back button to exit full screen.
+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
+@@ -2069,6 +2069,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+ // capture devices without prompt.
+ const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
+ 
+// Holds the URL to an indexed subresource filters file.
+const char kAdBlockFiltersURL[] = "adblock.filters_url";
+
+ // A pref holding the value of the policy used to explicitly allow or deny
+ // access to video capture devices.  When enabled or not set, the user is
+ // prompted for device access.  When disabled, access to video capture devices
+diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
+--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
+@@ -30,6 +30,7 @@ extern const char kDownloadRestrictions[];
+ extern const char kForceEphemeralProfiles[];
+ extern const char kHomePageIsNewTabPage[];
+ extern const char kHomePage[];
+extern const char kAdBlockFiltersURL[];
+ extern const char kImportantSitesDialogHistory[];
+ extern const char kProfileCreationTime[];
+ #if defined(OS_WIN)
+diff --git a/components/component_updater/adblock_updater_service.cc b/components/component_updater/adblock_updater_service.cc
+--- a/components/component_updater/adblock_updater_service.cc
+++ b/components/component_updater/adblock_updater_service.cc
+@@ -46,12 +46,12 @@ const int initial_check_delay = 5,
+       next_check_delay = 60*60*24*7, // 1 week
+       on_demand_check_delay = 60; // minimum 1 minute between each on-demand check
+ 
+-AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service)
+AdBlockUpdaterService::AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
+   subresource_filter::RulesetService* ruleset_service, std::string filters_url)
+  : ruleset_service_(ruleset_service), shared_url_network_factory_(shared_url_network_factory), scheduler_(std::move(scheduler)) {
+   DCHECK(ruleset_service);
+ 
+-  //TODO: retrieve filters URL from config/prefs
+-  filters_url_ = "https://www.bromite.org/filters/filters.dat";
+  filters_url_ = filters_url;
+ }
+ 
+ AdBlockUpdaterService::~AdBlockUpdaterService() {
+diff --git a/components/component_updater/adblock_updater_service.h b/components/component_updater/adblock_updater_service.h
+--- a/components/component_updater/adblock_updater_service.h
+++ b/components/component_updater/adblock_updater_service.h
+@@ -54,7 +54,8 @@ class Observer {
+ // All methods are safe to call ONLY from the browser's main thread.
+ class AdBlockUpdaterService {
+  public:
+-  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler, subresource_filter::RulesetService* ruleset_service);
+  AdBlockUpdaterService(scoped_refptr<network::SharedURLLoaderFactory> shared_url_network_factory, std::unique_ptr<component_updater::UpdateScheduler> scheduler,
+                        subresource_filter::RulesetService* ruleset_service, std::string filters_url);
+   ~AdBlockUpdaterService();
+ 
+   // Adds an observer for this class. An observer should not be added more
+-- 
+2.17.1
+
@@ -1,208 +0,0 @@
-From: Wengling Chen <feiyu2817@gmail.com>
-Date: Mon, 1 Feb 2021 19:18:55 +0200
-Subject: Add option to force tablet UI
-
---
- .../preferences/ChromePreferenceKeys.java        |  1 +
- .../preferences/LegacyChromePreferenceKeys.java  |  1 +
- .../browser/omnibox/LocationBarCoordinator.java  |  2 +-
- .../android/strings/android_chrome_strings.grd   |  6 ++++++
- .../toolbar/top/ToolbarControlContainer.java     | 16 ----------------
- components/BUILD.gn                              |  6 +++---
- .../java/res/xml/accessibility_preferences.xml   |  5 +++++
- .../accessibility/AccessibilitySettings.java     | 10 ++++++++++
- ui/android/BUILD.gn                              |  2 ++
- .../org/chromium/ui/base/DeviceFormFactor.java   |  5 +++++
- 10 files changed, 34 insertions(+), 20 deletions(-)
-
-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 {
-             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
-@@ -85,6 +85,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
-@@ -365,7 +365,7 @@ public final class LocationBarCoordinator implements LocationBar, NativeInitObse
-     // OmniboxSuggestionsDropdownEmbedder implementation
-     @Override
-     public boolean isTablet() {
-        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid);
-+        return DeviceFormFactor.isWindowOnTablet(mWindowAndroid) || isTabletLayout();
-     }
- 
-     @Override
-diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
-+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1359,6 +1359,12 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_PRIVACY_REVIEW_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
-@@ -106,22 +106,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
-     public void setToolbar(Toolbar toolbar, boolean isIncognito) {
-         mToolbar = toolbar;
-         mToolbarContainer.setToolbar(mToolbar);
-
-        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
-@@ -44,7 +44,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
-@@ -630,7 +630,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_
-   }
-@@ -910,7 +910,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
-@@ -25,6 +25,11 @@
-         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
-@@ -27,6 +27,7 @@ public class AccessibilitySettings
-     public static final String PREF_READER_FOR_ACCESSIBILITY = "reader_for_accessibility";
-     public static final String PREF_CAPTIONS = "captions";
- 
-+    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
-     private TextScalePreference mTextScalePref;
-     private ChromeBaseCheckBoxPreference mForceEnableZoomPref;
-     private boolean mRecordFontSizeChangeOnStop;
-@@ -85,6 +86,12 @@ public class AccessibilitySettings
-             getPreferenceScreen().removePreference(readerForAccessibilityPref);
-         }
- 
-+        ChromeBaseCheckBoxPreference forceTabletUiPref =
-+                (ChromeBaseCheckBoxPreference) findPreference(PREF_FORCE_TABLET_UI);
-+        forceTabletUiPref.setChecked(SharedPreferencesManager.getInstance().readBoolean(
-+                            ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false));
-+        forceTabletUiPref.setOnPreferenceChangeListener(this);
-+
-         ChromeBaseCheckBoxPreference accessibilityTabSwitcherPref =
-                 (ChromeBaseCheckBoxPreference) findPreference(
-                         AccessibilityConstants.ACCESSIBILITY_TAB_SWITCHER);
-@@ -133,6 +140,9 @@ public class AccessibilitySettings
-             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
-         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
-             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
-+        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
-+            SharedPreferencesManager.getInstance().writeBoolean(
-+                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, (Boolean) newValue);
-         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
-             if (mReaderForAccessibilityDelegate != null) {
-                 mReaderForAccessibilityDelegate.setEnabled((Boolean) newValue);
-diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
--- a/ui/android/BUILD.gn
-+++ b/ui/android/BUILD.gn
-@@ -362,6 +362,8 @@ android_library("ui_no_recycler_view_java") {
-     ":ui_java_resources",
-     ":ui_utils_java",
-     "//base:base_java",
-+    # dependency for ui_no_recycler_view_java
-+    "//chrome/browser/preferences:java",
-     "//components/url_formatter/android:url_formatter_java",
-     "//third_party/androidx:androidx_annotation_annotation_java",
-     "//third_party/androidx:androidx_appcompat_appcompat_java",
-diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
--- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
-+++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
-@@ -11,6 +11,8 @@ import androidx.annotation.UiThread;
- import org.chromium.base.ContextUtils;
- import org.chromium.base.ThreadUtils;
- import org.chromium.base.annotations.CalledByNative;
-+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
-+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.ui.R;
- import org.chromium.ui.display.DisplayAndroid;
- import org.chromium.ui.display.DisplayUtil;
-@@ -60,6 +62,9 @@ public class DeviceFormFactor {
-      *         E.g. http://developer.samsung.com/samsung-dex/testing
-      */
-     public static boolean isNonMultiDisplayContextOnTablet(Context context) {
-+        if (SharedPreferencesManager.getInstance().readBoolean(
-+                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false))
-+            return true;
-         return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
-     }
- 
--
-2.25.1
@@ -3,20 +3,34 @@ Date: Sat, 7 Sep 2019 15:07:42 +0200
 Subject: Add option to not persist tabs across sessions

 ---
- .../android/java/res/xml/privacy_preferences.xml |  5 +++++
- .../chrome/browser/ChromeTabbedActivity.java     |  4 +++-
- .../privacy/settings/PrivacySettings.java        | 16 +++++++++++++++-
- .../android/strings/android_chrome_strings.grd   |  6 ++++++
- 4 files changed, 29 insertions(+), 2 deletions(-)
+ chrome/android/java/res/values/values.xml            |  3 +++
+ chrome/android/java/res/xml/privacy_preferences.xml  |  5 +++++
+ .../chrome/browser/ChromeTabbedActivity.java         |  4 +++-
+ .../browser/privacy/settings/PrivacySettings.java    | 12 ++++++++++++
+ .../ui/android/strings/android_chrome_strings.grd    |  6 ++++++
+ 5 files changed, 29 insertions(+), 1 deletion(-)

+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
+@@ -60,6 +60,9 @@
+     <!-- TODO(peconn): Add help section. -->
+     <!-- <string name="help_context_suggestions">mobile_content_suggestions</string> -->
+ 
+    <string name="close_tabs_on_exit_title">Close tabs on exit</string>
+    <string name="close_tabs_on_exit_summary">Don\'t persist tabs between browsing sessions</string>
+
+     <!-- Our manage space activity. Default pre-KitKat to be nothing. -->
+     <string name="manage_space_activity"></string>
+ 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -42,6 +42,11 @@
-         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
+@@ -25,6 +25,11 @@
+         android:title="@string/always_incognito_title"
+         android:summary="@string/always_incognito_summary"
+         android:defaultValue="false" />
+    <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
 +        android:summary="@string/close_tabs_on_exit_summary"
@@ -27,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -1263,8 +1263,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1182,8 +1182,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
             boolean hadCipherData =
                     CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
 
@@ -38,65 +52,61 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +                ContextUtils.getAppSharedPreferences().getBoolean(PREF_CLOSE_TABS_ON_EXIT, false);
             if (noRestoreState) {
                 // Clear the state files because they are inconsistent and useless from now on.
-                 mTabModelOrchestrator.clearState();
+                 mTabModelSelectorImpl.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 @@
+@@ -4,6 +4,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;
-@@ -16,6 +17,8 @@ import androidx.preference.Preference;
+ import android.view.MenuInflater;
+@@ -14,6 +15,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 +import org.chromium.base.ContextUtils;
-+import org.chromium.base.BuildInfo;
+ import org.chromium.base.BuildInfo;
 import org.chromium.chrome.R;
- import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -59,6 +62,8 @@ public class PrivacySettings
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
-     private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
- 
+@@ -41,6 +43,7 @@ import java.util.List;
+  */
+ public class PrivacySettings
+         extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
-+
-     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
-     private IncognitoLockSettings mIncognitoLockSettings;
-     private ViewGroup mDialogContainer;
-@@ -134,7 +139,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)) {
+     private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
+     private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
+     private static final String PREF_NETWORK_PREDICTIONS = "preload_pages";
+@@ -98,6 +101,10 @@ public class PrivacySettings
+             sharedPreferencesEditor.apply();
+         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
+             PrefServiceBridge.getInstance().setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
+        } else if (PREF_CLOSE_TABS_ON_EXIT.equals(key)) {
 +            SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
 +            sharedPreferencesEditor.putBoolean(PREF_CLOSE_TABS_ON_EXIT, (boolean)newValue);
 +            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)) {
-@@ -175,6 +184,11 @@ public class PrivacySettings
-                     PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
         }
 
-+        ChromeSwitchPreference closeTabsOnExitPref =
-+                (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+         return true;
+@@ -167,6 +174,11 @@ public class PrivacySettings
+                         String.format("%s - %s", getString(R.string.text_on), serverName));
+             }
+         }
+
+        ChromeBaseCheckBoxPreference closeTabsOnExitPref =
+                (ChromeBaseCheckBoxPreference) 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()));
+     }
+ 
+     private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4314,6 +4314,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3334,6 +3334,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>
@@ -109,5 +119,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the link.">
         LINK
       </message>
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,205 +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
---
- .../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
-@@ -12,6 +12,11 @@
-         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
-@@ -214,6 +214,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
-@@ -20,6 +20,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.init.StartupTabPreloader;
- import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
- import org.chromium.chrome.browser.ntp.NewTabPageUtils;
-@@ -321,6 +322,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
-@@ -449,6 +449,7 @@ public final class ChromePreferenceKeys {
-     public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
-     public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI =
-             "Chrome.Homepage.PartnerCustomizedDefaultUri";
-+    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
-@@ -90,6 +90,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.LOCALE_MANAGER_AUTO_SWITCH,
-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
-@@ -1174,6 +1174,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
-@@ -368,6 +368,7 @@ extern const char kSettingsShowOSBanner[];
- 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
@@ -1,183 +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.
---
- 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
-@@ -132,6 +132,7 @@
- #include "components/security_state/core/security_state.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"
-@@ -8495,6 +8496,11 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kReduceUserAgentMinorVersionDescription, kOsAll,
-      FEATURE_VALUE_TYPE(blink::features::kReduceUserAgentMinorVersion)},
- 
-+    {"site-engagement",
-+     flag_descriptions::kSiteEngagementName,
-+     flag_descriptions::kSiteEngagementDescription, kOsAll,
-+     FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)},
-+
- #if BUILDFLAG(IS_CHROMEOS_ASH)
-     {"enable-variable-refresh-rate",
-      flag_descriptions::kEnableVariableRefreshRateName,
-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
-@@ -2953,6 +2953,11 @@ const char kReduceUserAgentMinorVersionDescription[] =
-     "The Chrome version in the User-Agent string will be reported as "
-     "Chrome/<major_version>.0.0.0.";
- 
-+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
-@@ -1680,6 +1680,9 @@ extern const char kDurableClientHintsCacheDescription[];
- extern const char kReduceUserAgentMinorVersionName[];
- extern const char kReduceUserAgentMinorVersionDescription[];
- 
-+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"
-@@ -277,6 +278,10 @@ void SiteEngagementScore::Commit() {
-   if (!UpdateScoreDict(score_dict_.get()))
-     return;
- 
-+  if (!base::FeatureList::IsEnabled(features::kSiteEngagement)) {
-+    score_dict_.reset();
-+    return;
-+  }
-   settings_map_->SetWebsiteSettingDefaultScope(
-       origin_, GURL(), ContentSettingsType::SITE_ENGAGEMENT,
-       base::Value::FromUniquePtrValue(std::move(score_dict_)));
-diff --git a/components/site_engagement/core/BUILD.gn b/components/site_engagement/core/BUILD.gn
--- a/components/site_engagement/core/BUILD.gn
-+++ b/components/site_engagement/core/BUILD.gn
-@@ -4,8 +4,14 @@
- 
- static_library("core") {
-   sources = [
-+    "features.cc",
-+    "features.h",
-     "pref_names.cc",
-     "pref_names.h",
-     "site_engagement_score_provider.h",
-   ]
-+
-+  deps = [
-+    "//base",
-+  ]
- }
-diff --git a/components/site_engagement/core/features.cc b/components/site_engagement/core/features.cc
-new file mode 100644
--- /dev/null
-+++ b/components/site_engagement/core/features.cc
-@@ -0,0 +1,29 @@
-+/*
-+    This file is part of Bromite.
-+
-+    Bromite is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    Bromite is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#include "components/site_engagement/core/features.h"
-+
-+#include "base/feature_list.h"
-+
-+namespace site_engagement {
-+namespace features {
-+
-+const base::Feature kSiteEngagement{"SiteEngagement",
-+                                    base::FEATURE_ENABLED_BY_DEFAULT};
-+
-+}  // namespace features
-+}  // namespace site_engagement
-diff --git a/components/site_engagement/core/features.h b/components/site_engagement/core/features.h
-new file mode 100644
--- /dev/null
-+++ b/components/site_engagement/core/features.h
-@@ -0,0 +1,34 @@
-+/*
-+    This file is part of Bromite.
-+
-+    Bromite is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    Bromite is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef SITE_ENGAGEMENT_CORE_FEATURES_H_
-+#define SITE_ENGAGEMENT_CORE_FEATURES_H_
-+
-+#include <string>
-+
-+#include "base/feature_list.h"
-+
-+namespace site_engagement {
-+namespace features {
-+
-+// Enable site engagement
-+extern const base::Feature kSiteEngagement;
-+
-+}  // namespace features
-+}  // namespace site_engagement
-+
-+#endif  // SITE_ENGAGEMENT_CORE_FEATURES_H_
--
-2.25.1
@@ -1,51 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 17 May 2021 12:30:12 +0000
-Subject: Add support for ISupportHelpAndFeedback
-
---
- .../chrome/browser/settings/SettingsActivity.java     | 11 ++++++++---
- .../components/browser_ui/settings/SettingsUtils.java |  4 ++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -69,6 +69,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
- 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;
-@@ -333,9 +334,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
@@ -1,97 +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
---
- 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
@@ -0,0 +1,540 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 23 Nov 2019 10:55:16 +0100
+Subject: Add user setting for DNS-over-HTTPS (DoH) custom URL
+
+---
+ chrome/android/chrome_java_resources.gni      |  2 +
+ chrome/android/chrome_java_sources.gni        |  2 +
+ chrome/android/java/res/layout/doh_editor.xml | 67 ++++++++++++++
+ chrome/android/java/res/values/values.xml     |  2 +
+ .../android/java/res/xml/doh_preferences.xml  | 25 +++++
+ .../java/res/xml/privacy_preferences.xml      |  5 +
+ .../chrome/browser/settings/DoHEditor.java    | 92 +++++++++++++++++++
+ .../browser/settings/DoHPreferences.java      | 54 +++++++++++
+ chrome/app/generated_resources.grd            |  6 ++
+ .../flags/android/cached_feature_flags.cc     | 25 +++++
+ .../browser/flags/CachedFeatureFlags.java     | 24 +++++
+ .../net/stub_resolver_config_reader.cc        | 36 ++------
+ .../strings/android_chrome_strings.grd        | 11 +++
+ chrome/common/chrome_features.cc              |  4 +-
+ 14 files changed, 324 insertions(+), 31 deletions(-)
+ create mode 100644 chrome/android/java/res/layout/doh_editor.xml
+ create mode 100644 chrome/android/java/res/xml/doh_preferences.xml
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
+ create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java
+
+diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
+--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
+@@ -881,6 +881,7 @@ chrome_java_resources = [
+   "java/res/layout/date_view.xml",
+   "java/res/layout/default_search_engine_first_run_fragment.xml",
+   "java/res/layout/device_item_list.xml",
+  "java/res/layout/doh_editor.xml",
+   "java/res/layout/distilled_page_font_family_spinner.xml",
+   "java/res/layout/distilled_page_prefs_view.xml",
+   "java/res/layout/editable_option_editor_footer.xml",
+@@ -1112,6 +1113,7 @@ chrome_java_resources = [
+   "java/res/xml/data_reduction_preferences.xml",
+   "java/res/xml/data_reduction_preferences_off_lite_mode.xml",
+   "java/res/xml/developer_preferences.xml",
+  "java/res/xml/doh_preferences.xml",
+   "java/res/xml/do_not_track_preferences.xml",
+   "java/res/xml/google_services_preferences.xml",
+   "java/res/xml/homepage_preferences.xml",
+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
+@@ -1373,6 +1373,8 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetAdapter.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/DevicePickerBottomSheetContent.java",
+  "java/src/org/chromium/chrome/browser/settings/DoHEditor.java",
+  "java/src/org/chromium/chrome/browser/settings/DoHPreferences.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationManager.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/NotificationSharedPrefManager.java",
+   "java/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfAndroidBridge.java",
+diff --git a/chrome/android/java/res/layout/doh_editor.xml b/chrome/android/java/res/layout/doh_editor.xml
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/res/layout/doh_editor.xml
+@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scroll_view"
+        android:fillViewport="true" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:focusableInTouchMode="true" >
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/doh_url"
+                android:paddingTop="16dp"
+                android:paddingStart="@dimen/pref_autofill_content_spacing"
+                android:paddingEnd="@dimen/pref_autofill_content_spacing"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
+                <EditText
+                    tools:ignore="Autofill"
+                    android:id="@+id/doh_url_edit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textUri"
+                    android:singleLine="true"
+                    android:hint="@string/options_doh_edit_label" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Space style="@style/ButtonBarTopSpacer" />
+            <View style="@style/ButtonBarTopDivider" />
+
+            <LinearLayout style="@style/ButtonBar" >
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/doh_reset"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/reset" />
+
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/doh_cancel"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/cancel" />
+
+                <org.chromium.ui.widget.ButtonCompat
+                    android:id="@+id/doh_save"
+                    style="@style/ButtonBarButton"
+                    android:text="@string/save" />
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/settings_action_bar_shadow"/>
+
+</FrameLayout>
+diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
+--- a/chrome/android/java/res/values/values.xml
+++ b/chrome/android/java/res/values/values.xml
+@@ -80,6 +80,8 @@
+     <integer name="download_infobar_bar_fill_in_delay">400</integer>
+     <integer name="download_infobar_bar_fill_out_delay">200</integer>
+ 
+    <string name="doh_help_url">https://www.bromite.org/doh</string>
+
+     <!-- Bottom navigation bar styling. -->
+     <bool name="window_light_navigation_bar">true</bool>
+ 
+diff --git a/chrome/android/java/res/xml/doh_preferences.xml b/chrome/android/java/res/xml/doh_preferences.xml
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/res/xml/doh_preferences.xml
+@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="doh_switch"
+        android:summaryOn="@string/text_on"
+        android:summaryOff="@string/text_off" />
+
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+        android:key="doh_help"
+        android:title="@string/doh_help"
+        app:url="@string/doh_help_url" />
+
+    <Preference
+        android:key="doh_edit"
+        android:title="@string/options_doh_edit_label"
+        android:fragment="org.chromium.chrome.browser.settings.DoHEditor" />
+
+</PreferenceScreen>
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -19,6 +19,11 @@
+         android:key="can_make_payment"
+         android:title="@string/can_make_payment_title"
+         android:summary="@string/settings_can_make_payment_toggle_label" />
+    <Preference
+        android:fragment="org.chromium.chrome.browser.settings.DoHPreferences"
+        android:key="doh"
+        android:title="@string/options_doh_title"
+        android:summary="@string/options_doh_summary" />
+     <org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
+         android:key="preload_pages"
+         android:title="@string/preload_pages_title"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHEditor.java
+@@ -0,0 +1,92 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.settings;
+
+import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
+import org.chromium.chrome.R;
+import org.chromium.components.url_formatter.UrlFormatter;
+
+/**
+ * Provides the Java-UI for editing the DNS-over-HTTPS (DoH) preference.
+ */
+public class DoHEditor extends Fragment implements TextWatcher {
+    private EditText mDoHUrlEdit;
+    private Button mSaveButton;
+    private Button mResetButton;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getActivity().setTitle(R.string.options_doh_edit_title);
+
+        View v = inflater.inflate(R.layout.doh_editor, container, false);
+        View scrollView = v.findViewById(R.id.scroll_view);
+        scrollView.getViewTreeObserver().addOnScrollChangedListener(
+                SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
+        mDoHUrlEdit = (EditText) v.findViewById(R.id.doh_url_edit);
+        mDoHUrlEdit.setText(CachedFeatureFlags.getDoHTemplates());
+        mDoHUrlEdit.addTextChangedListener(this);
+        mDoHUrlEdit.requestFocus();
+
+        initializeSaveCancelResetButtons(v);
+        return v;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        mSaveButton.setEnabled(s.length() != 0);
+        mResetButton.setEnabled(true);
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+    }
+
+    private void initializeSaveCancelResetButtons(View v) {
+        mResetButton = (Button) v.findViewById(R.id.doh_reset);
+        mResetButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mDoHUrlEdit.setText(CachedFeatureFlags.getDoHTemplates());
+                getActivity().finish();
+            }
+        });
+
+        mSaveButton = (Button) v.findViewById(R.id.doh_save);
+        mSaveButton.setEnabled(false);
+        mSaveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CachedFeatureFlags.setDoHTemplates(
+                        mDoHUrlEdit.getText().toString());
+                getActivity().finish();
+            }
+        });
+
+        Button button = (Button) v.findViewById(R.id.doh_cancel);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+    }
+}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java
+new file mode 100644
+--- /dev/null
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/DoHPreferences.java
+@@ -0,0 +1,54 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.settings;
+
+import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+
+import org.chromium.components.browser_ui.settings.SettingsUtils;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
+import androidx.annotation.VisibleForTesting;
+import org.chromium.chrome.R;
+
+/**
+ * Fragment that allows the user to configure DoH related preferences.
+ */
+public class DoHPreferences extends PreferenceFragmentCompat {
+    @VisibleForTesting
+    public static final String PREF_DOH_SWITCH = "doh_switch";
+    private static final String PREF_DOH_EDIT = "doh_edit";
+
+    private Preference mDoHEdit;
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        getActivity().setTitle(R.string.options_doh_title);
+        SettingsUtils.addPreferencesFromResource(this, R.xml.doh_preferences);
+
+        ChromeSwitchPreference mDoHSwitch =
+                (ChromeSwitchPreference) findPreference(PREF_DOH_SWITCH);
+        boolean isDoHEnabled = CachedFeatureFlags.getDoHEnabled();
+        mDoHSwitch.setChecked(isDoHEnabled);
+        mDoHSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
+            CachedFeatureFlags.setDoHEnabled((boolean) newValue);
+            return true;
+        });
+
+        mDoHEdit = findPreference(PREF_DOH_EDIT);
+        updateCurrentDoHUrl();
+    }
+
+    private void updateCurrentDoHUrl() {
+        mDoHEdit.setSummary(CachedFeatureFlags.getDoHTemplates());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateCurrentDoHUrl();
+    }
+}
+diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
+--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
+@@ -6977,6 +6977,12 @@ the Bookmarks menu.">
+       </if>
+ 
+       <if expr="is_android">
+        <message name="IDS_OPTIONS_DOH_TITLE" desc="The title of the DNS-over-HTTPS option on Android" formatter_data="android_java">
+          Secure DNS
+        </message>
+        <message name="IDS_OPTIONS_DOH_SUMMARY" desc="The title of the DNS-over-HTTPS summary on Android" formatter_data="android_java">
+          Configure DNS-over-HTTPS (DoH) secure DNS
+        </message>
+         <message name="IDS_OPTIONS_HOMEPAGE_TITLE" desc="The title of Chrome's homepage setting screen on Android. " formatter_data="android_java">
+           Homepage
+         </message>
+diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/browser/flags/android/cached_feature_flags.cc
+--- a/chrome/browser/flags/android/cached_feature_flags.cc
+++ b/chrome/browser/flags/android/cached_feature_flags.cc
+@@ -11,6 +11,10 @@
+ #include "content/public/common/content_features.h"
+ #include "content/public/common/network_service_util.h"
+ 
+#include "chrome/browser/browser_process.h"
+#include "components/prefs/pref_service.h"
+#include "chrome/common/pref_names.h"
+
+ using base::android::ConvertJavaStringToUTF8;
+ using base::android::ConvertUTF8ToJavaString;
+ using base::android::JavaParamRef;
+@@ -49,3 +53,24 @@ static jboolean JNI_CachedFeatureFlags_IsNetworkServiceWarmUpEnabled(
+   return content::IsOutOfProcessNetworkService() &&
+          base::FeatureList::IsEnabled(features::kWarmUpNetworkProcess);
+ }
+
+static jboolean JNI_CachedFeatureFlags_GetDoHEnabled(JNIEnv* env) {
+  std::string doh_mode = g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsMode);
+  return ((doh_mode == "secure") || (doh_mode == "auto"))
+         && !g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsTemplates).empty();
+}
+
+static void JNI_CachedFeatureFlags_SetDoHEnabled(JNIEnv* env, jboolean enabled) {
+  if (enabled)
+    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "secure");
+  else
+    g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsMode, "off");
+}
+
+static ScopedJavaLocalRef<jstring> JNI_CachedFeatureFlags_GetDoHTemplates(JNIEnv* env) {
+  return base::android::ConvertUTF8ToJavaString(env, g_browser_process->local_state()->GetString(prefs::kDnsOverHttpsTemplates));
+}
+
+static void JNI_CachedFeatureFlags_SetDoHTemplates(JNIEnv* env, const JavaParamRef<jstring>& templates) {
+  g_browser_process->local_state()->SetString(prefs::kDnsOverHttpsTemplates, base::android::ConvertJavaStringToUTF8(env, templates));
+}
+diff --git a/chrome/browser/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
+@@ -128,6 +128,26 @@ public class CachedFeatureFlags {
+     private static Map<String, String> sOverridesTestFeatures;
+     private static String sReachedCodeProfilerTrialGroup;
+ 
+     /**
+     * Records whether custom URL for DoH is enabled with native-side feature utilities.
+     * @param url Whether custom URL is enabled or not.
+     */
+     public static void setDoHEnabled(boolean enabled) {
+         CachedFeatureFlagsJni.get().setDoHEnabled(enabled);
+     }
+
+     public static boolean getDoHEnabled() {
+         return CachedFeatureFlagsJni.get().getDoHEnabled();
+     }
+
+     public static void setDoHTemplates(String t) {
+         CachedFeatureFlagsJni.get().setDoHTemplates(t);
+     }
+
+     public static String getDoHTemplates() {
+         return CachedFeatureFlagsJni.get().getDoHTemplates();
+     }
+
+     /**
+      * Checks if a cached feature flag is enabled.
+      *
+@@ -412,6 +432,10 @@ public class CachedFeatureFlags {
+ 
+     @NativeMethods
+     interface Natives {
+        void setDoHEnabled(boolean enabled);
+        boolean getDoHEnabled();
+        void setDoHTemplates(String templates);
+        String getDoHTemplates();
+         boolean isNetworkServiceWarmUpEnabled();
+         void setAdBlockFiltersURL(String url);
+         String getAdBlockFiltersURL();
+diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc
+--- a/chrome/browser/net/stub_resolver_config_reader.cc
+++ b/chrome/browser/net/stub_resolver_config_reader.cc
+@@ -141,28 +141,6 @@ StubResolverConfigReader::StubResolverConfigReader(PrefService* local_state,
+         base::Value(SecureDnsConfig::ModeToString(default_secure_dns_mode)));
+     local_state_->SetDefaultPrefValue(prefs::kDnsOverHttpsTemplates,
+                                       base::Value(default_doh_templates));
+-
+-    // If the user has explicitly enabled or disabled the DoH experiment in
+-    // chrome://flags and the DoH UI setting is not visible, store that choice
+-    // in the user prefs so that it can be persisted after the experiment ends.
+-    // Also make sure to remove the stored prefs value if the user has changed
+-    // their chrome://flags selection to the default.
+-    if (!features::kDnsOverHttpsShowUiParam.Get()) {
+-      flags_ui::PrefServiceFlagsStorage flags_storage(local_state_);
+-      std::set<std::string> entries = flags_storage.GetFlags();
+-      if (entries.count("dns-over-https@1")) {
+-        // The user has "Enabled" selected.
+-        local_state_->SetString(prefs::kDnsOverHttpsMode,
+-                                SecureDnsConfig::kModeAutomatic);
+-      } else if (entries.count("dns-over-https@2")) {
+-        // The user has "Disabled" selected.
+-        local_state_->SetString(prefs::kDnsOverHttpsMode,
+-                                SecureDnsConfig::kModeOff);
+-      } else {
+-        // The user has "Default" selected.
+-        local_state_->ClearPref(prefs::kDnsOverHttpsMode);
+-      }
+-    }
+   }
+ 
+   pref_change_registrar_.Add(prefs::kBuiltInDnsClientEnabled, pref_callback);
+@@ -346,21 +324,21 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration(
+     parental_controls_checked_ = true;
+   }
+ 
+-  if (record_metrics) {
+-    UMA_HISTOGRAM_ENUMERATION("Net.DNS.DnsConfig.SecureDnsMode", mode_details);
+-  }
+-
+   std::string doh_templates =
+       local_state_->GetString(prefs::kDnsOverHttpsTemplates);
+-  std::string server_method;
+  if (doh_templates.empty()) {
+    secure_dns_mode = net::DnsConfig::SecureDnsMode::OFF;
+  }
+  LOG(INFO) << "DoH templates: '" << doh_templates << "' with mode " << SecureDnsConfig::ModeToString(secure_dns_mode);
+   std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
+   base::Optional<std::vector<network::mojom::DnsOverHttpsServerPtr>>
+       servers_mojo;
+-  if (!doh_templates.empty() &&
+-      secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
+  if (secure_dns_mode != net::DnsConfig::SecureDnsMode::OFF) {
+    std::string server_method;
+     for (base::StringPiece server_template :
+          chrome_browser_net::secure_dns::SplitGroup(doh_templates)) {
+       if (!net::dns_util::IsValidDohTemplate(server_template, &server_method)) {
+        LOG(WARNING) << "DoH templates: skipping invalid: '" << server_template << "'";
+         continue;
+       }
+ 
+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
+@@ -590,6 +590,17 @@ CHAR-LIMIT guidelines:
+         Chrome Passwords
+       </message>
+ 
+      <!-- DoH preferences -->
+      <message name="IDS_OPTIONS_DOH_EDIT_TITLE" desc="The title of the screen that allows users to change the URL that is used for DNS-over-HTTPS queries.">
+        Edit DoH template URLs
+      </message>
+      <message name="IDS_OPTIONS_DOH_EDIT_LABEL" desc="The label for the edit text field that allows the user to change the URL that is used for DNS-over-HTTPS queries.">
+        DoH template URLs
+      </message>
+      <message name="IDS_DOH_HELP" desc="The title of the hyperlink that allows users to visit the wiki page with instructions for DNS-over-HTTPS configuration.">
+        Visit help page
+      </message>
+
+       <!-- Homepage preferences -->
+       <message name="IDS_OPTIONS_HOMEPAGE_EDIT_HINT" desc="Hint for the text edit on Homepage Preference setting, guiding user to enter their customized homepage setting">
+         Enter custom web address
+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
+@@ -281,12 +281,12 @@ const base::Feature kDesktopPWAsRunOnOsLogin{"DesktopPWAsRunOnOsLogin",
+ 
+ // Enable DNS over HTTPS (DoH).
+ const base::Feature kDnsOverHttps{"DnsOverHttps",
+-                                  base::FEATURE_DISABLED_BY_DEFAULT};
+                                  base::FEATURE_ENABLED_BY_DEFAULT};
+ 
+ // Set whether fallback to insecure DNS is allowed by default. This setting may
+ // be overridden for individual transactions.
+ const base::FeatureParam<bool> kDnsOverHttpsFallbackParam{&kDnsOverHttps,
+-                                                          "Fallback", true};
+                                                          "Fallback", false};
+ 
+ // Supply one or more space-separated DoH server URI templates to use when this
+ // feature is enabled. If no templates are specified, then a hardcoded mapping
+-- 
+2.17.1
+
@@ -1,494 +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
---
- .../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           |  3 +-
- .../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, 196 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
-@@ -72,6 +72,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">
-         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
-@@ -336,6 +336,7 @@
-       <part file="version_ui_strings.grdp" />
-       <part file="webapps_strings.grdp" />
-       <part file="user_scripts/strings/userscripts_strings.grdp" />
-+      <part file="browser_ui/strings/android/webgl.grdp" />
- 
-       <if expr="not is_ios">
-         <part file="management_strings.grdp" />
-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
-@@ -677,6 +677,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::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_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
-@@ -155,6 +155,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
-@@ -204,7 +204,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(
-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 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
-@@ -104,7 +104,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
-@@ -287,6 +287,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
-@@ -455,6 +455,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
-@@ -94,6 +94,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
-@@ -64,6 +64,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
-@@ -97,6 +97,7 @@ class SecurityOrigin;
- class ScriptState;
- class ScriptWrappable;
- class TrustedTypePolicyFactory;
-+class WebContentSettingsClient;
- 
- enum ReasonForCallingCanExecuteScripts {
-   kAboutToExecuteScript,
-@@ -105,6 +106,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
-@@ -242,6 +242,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() {
-   MutexLocker locker(WebGLContextLimitMutex());
-   DCHECK(webgl_context_limits_initialized_);
-@@ -488,25 +495,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('.');
-@@ -574,6 +562,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
-@@ -1771,6 +1771,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
@@ -1,382 +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
---
- .../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           |  3 +-
- .../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     |  5 ++
- 19 files changed, 159 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
-@@ -75,6 +75,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">
-         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
-@@ -337,6 +337,7 @@
-       <part file="webapps_strings.grdp" />
-       <part file="user_scripts/strings/userscripts_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="management_strings.grdp" />
-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
-@@ -691,6 +691,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::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_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
-@@ -157,6 +157,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
-@@ -205,7 +205,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(
-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
-@@ -98,6 +98,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
-@@ -105,7 +105,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
-@@ -289,6 +289,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
-@@ -464,6 +464,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
-@@ -95,6 +95,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
-@@ -762,6 +762,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
@@ -1,433 +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
-
---
- .../browser/devtools/protocol/network_handler.cc |  2 ++
- .../net/cross_origin_embedder_policy_reporter.cc |  4 +++-
- .../net/cross_origin_opener_policy_reporter.cc   | 16 +++++++---------
- content/browser/net/reporting_service_proxy.cc   |  3 +++
- .../renderer_host/render_frame_host_impl.cc      |  2 ++
- .../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(+), 18 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
-@@ -1289,6 +1289,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;
-@@ -1306,6 +1307,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
-   }
-   return urls;
- }
-+#endif  // BUILDFLAG(ENABLE_REPORTING)
- 
- }  // namespace
- 
-diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/content/browser/net/cross_origin_embedder_policy_reporter.cc
--- a/content/browser/net/cross_origin_embedder_policy_reporter.cc
-+++ b/content/browser/net/cross_origin_embedder_policy_reporter.cc
-@@ -4,6 +4,7 @@
- 
- #include "content/browser/net/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"
-@@ -112,6 +113,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-         kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
-   }
-   if (endpoint) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-     base::DictionaryValue body_to_pass;
-     for (const auto& pair : body) {
-       body_to_pass.SetString(pair.first, pair.second);
-@@ -123,7 +125,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-           kType, *endpoint, context_url_, reporting_source_,
-           network_isolation_key_,
-           /*user_agent=*/absl::nullopt, std::move(body_to_pass));
-    }
-+#endif
-   }
- }
- 
-diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/content/browser/net/cross_origin_opener_policy_reporter.cc
--- a/content/browser/net/cross_origin_opener_policy_reporter.cc
-+++ b/content/browser/net/cross_origin_opener_policy_reporter.cc
-@@ -17,25 +17,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:
-@@ -44,6 +36,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:
-@@ -59,6 +52,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
-       return "same-origin-allow-popups-plus-coep";
-   }
- }
-+#endif
- 
- FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
-   FrameTreeNode* opener = frame->original_opener();
-@@ -229,6 +223,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)
-@@ -277,12 +272,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
-   storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
-       absl::nullopt, std::move(body));
-+#endif
- }
- 
- void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
-     base::DictionaryValue body,
-     const std::string& endpoint,
-     bool is_report_only) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-   body.SetString(kDisposition,
-                  is_report_only ? kDispositionReporting : kDispositionEnforce);
-   body.SetString(
-@@ -291,6 +288,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
-   storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
-       /*user_agent=*/absl::nullopt, std::move(body));
-+#endif
- }
- 
- }  // namespace content
-diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/net/reporting_service_proxy.cc
--- a/content/browser/net/reporting_service_proxy.cc
-+++ b/content/browser/net/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"
-@@ -173,6 +174,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
-                    const std::string& group,
-                    const std::string& type,
-                    std::unique_ptr<base::Value> body) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-     auto* rph = RenderProcessHost::FromID(render_process_id_);
-     if (!rph)
-       return;
-@@ -180,6 +182,7 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
-         type, group, url, reporting_source_, network_isolation_key_,
-         /*user_agent=*/absl::nullopt,
-         base::Value::FromUniquePtrValue(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
-@@ -11437,6 +11437,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
- void RenderFrameHostImpl::MaybeGenerateCrashReport(
-     base::TerminationStatus status,
-     int exit_code) {
-+#if BUILDFLAG(ENABLE_REPORTING)
-   if (!last_committed_url_.SchemeIsHTTPOrHTTPS())
-     return;
- 
-@@ -11486,6 +11487,7 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
-       /*type=*/"crash", /*group=*/"default", last_committed_url_,
-       GetReportingSource(), isolation_info_.network_isolation_key(),
-       absl::nullopt /* user_agent */, std::move(body));
-+#endif
- }
- 
- 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::NetworkIsolationKey& 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
-@@ -7,6 +7,7 @@
- #include "content/public/common/content_features.h"
- #include "content/public/common/content_switches.h"
- #include "net/base/features.h"
-+#include "net/net_buildflags.h"
- #include "services/network/public/cpp/features.h"
- #include "services/network/public/cpp/network_switches.h"
- #include "third_party/blink/public/common/features.h"
-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
-@@ -212,6 +212,12 @@ class ReportingServiceImpl : public ReportingService {
-       std::unique_ptr<const base::Value> 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_isolation_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
-@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
-       const absl::optional<base::UnguessableToken>& reporting_source,
-       const net::NetworkIsolationKey& network_isolation_key,
-       const absl::optional<std::string>& user_agent,
-      base::Value body) override;
-+      base::Value body);
-   void QueueSignedExchangeReport(
-       mojom::SignedExchangeReportPtr report,
-      const net::NetworkIsolationKey& network_isolation_key) override;
-+      const net::NetworkIsolationKey& network_isolation_key);
-   void AddDomainReliabilityContextForTesting(
-       const GURL& 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
-@@ -963,7 +963,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
-@@ -1043,6 +1043,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,
-@@ -1056,6 +1057,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,
-                             NetworkIsolationKey network_isolation_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"
-@@ -2334,9 +2335,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"
-@@ -561,9 +561,9 @@ class CORE_EXPORT LocalFrame final
-   }
- 
-   SmoothScrollSequencer& GetSmoothScrollSequencer();
-
-+#if BUILDFLAG(ENABLE_REPORTING)
-   mojom::blink::ReportingServiceProxy* GetReportingService();
-
-+#endif
-   // Returns the frame host ptr. The interface returned is backed by an
-   // associated interface with the legacy Chrome IPC channel.
-   mojom::blink::LocalFrameHost& GetLocalFrameHostRemote() const;
-diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_party/blink/renderer/core/frame/reporting_context.cc
--- a/third_party/blink/renderer/core/frame/reporting_context.cc
-+++ b/third_party/blink/renderer/core/frame/reporting_context.cc
-@@ -4,6 +4,7 @@
- 
- #include "third_party/blink/renderer/core/frame/reporting_context.h"
- 
-+#include "net/net_buildflags.h"
- #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
- #include "third_party/blink/public/platform/platform.h"
- #include "third_party/blink/public/platform/task_type.h"
-@@ -53,7 +54,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
- ReportingContext::ReportingContext(ExecutionContext& context)
-     : Supplement<ExecutionContext>(context),
-       execution_context_(context),
-+#if BUILDFLAG(ENABLE_REPORTING)
-       reporting_service_(&context),
-+#endif
-       receiver_(this, &context) {}
- 
- // static
-@@ -117,7 +120,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
-   visitor->Trace(observers_);
-   visitor->Trace(report_buffer_);
-   visitor->Trace(execution_context_);
-+#if BUILDFLAG(ENABLE_REPORTING)
-   visitor->Trace(reporting_service_);
-+#endif
-   visitor->Trace(receiver_);
-   Supplement<ExecutionContext>::Trace(visitor);
- }
-@@ -139,6 +144,7 @@ void ReportingContext::CountReport(Report* report) {
-   UseCounter::Count(execution_context_, feature);
- }
- 
-+#if BUILDFLAG(ENABLE_REPORTING)
- const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
- ReportingContext::GetReportingService() const {
-   if (!reporting_service_.is_bound()) {
-@@ -148,6 +154,7 @@ ReportingContext::GetReportingService() const {
-   }
-   return reporting_service_;
- }
-+#endif
- 
- void ReportingContext::NotifyInternal(Report* report) {
-   // Buffer the report.
-@@ -170,6 +177,7 @@ void ReportingContext::NotifyInternal(Report* report) {
- 
- void ReportingContext::SendToReportingAPI(Report* report,
-                                           const String& endpoint) const {
-+#if BUILDFLAG(ENABLE_REPORTING)
-   const String& type = report->type();
-   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
-         type == ReportType::kPermissionsPolicyViolation ||
-@@ -227,6 +235,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
-         url, endpoint, body->featureId(), body->disposition(), body->message(),
-         body->sourceFile(), line_number, column_number);
-   }
-+#endif
- }
- 
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_party/blink/renderer/core/frame/reporting_context.h
--- a/third_party/blink/renderer/core/frame/reporting_context.h
-+++ b/third_party/blink/renderer/core/frame/reporting_context.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
- #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
- 
-+#include "net/net_buildflags.h"
- #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
- #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
- #include "third_party/blink/renderer/core/core_export.h"
-@@ -55,10 +56,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
-  private:
-   // Counts the use of a report type via UseCounter.
-   void CountReport(Report*);
-
-+#if BUILDFLAG(ENABLE_REPORTING)
-   const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
-   GetReportingService() const;
-
-+#endif
-   void NotifyInternal(Report* report);
-   // Send |report| via the Reporting API to |endpoint|.
-   void SendToReportingAPI(Report* report, const String& endpoint) const;
-@@ -69,8 +70,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
- 
-   // This is declared mutable so that the service endpoint can be cached by
-   // const methods.
-+#if BUILDFLAG(ENABLE_REPORTING)
-   mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy>
-       reporting_service_;
-+#endif
- 
-   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
- };
--
-2.25.1
@@ -1,66 +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
-
---
- .../browser/childaccounts/ChildAccountService.java    | 11 -----------
- chrome/browser/startup_data.cc                        |  3 ---
- .../child_accounts/child_account_service_android.cc   |  9 ---------
- 3 files changed, 23 deletions(-)
-
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/ChildAccountService.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/childaccounts/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/startup_data.cc b/chrome/browser/startup_data.cc
--- a/chrome/browser/startup_data.cc
-+++ b/chrome/browser/startup_data.cc
-@@ -32,9 +32,6 @@
- #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
- #include "chrome/browser/profiles/pref_service_builder_utils.h"
- #include "chrome/browser/profiles/profile_key.h"
-#include "chrome/browser/supervised_user/supervised_user_pref_store.h"
-#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
-#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
- #include "chrome/common/chrome_constants.h"
- #include "chrome/common/chrome_paths.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
-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
@@ -3,14 +3,14 @@ Date: Thu, 2 Nov 2017 18:21:16 +0200
 Subject: Allow playing audio in background

 ---
- .../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(-)
+ media/blink/webmediaplayer_impl.cc | 12 +++++++++++-
+ media/blink/webmediaplayer_impl.h  |  2 ++
+ 2 files changed, 13 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
-@@ -1214,6 +1214,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
+--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
+@@ -1053,6 +1053,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -21,9 +21,9 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +}
 +
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
+     const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3586,7 +3592,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3469,7 +3475,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.
@@ -36,18 +36,18 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
     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
-@@ -191,6 +191,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
+--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
+@@ -153,6 +153,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
+   // True if the loaded media has a playable video/audio track.
   bool HasVideo() const override;
   bool HasAudio() const override;
- 
 +  // True is has video and it's frame size is not zero
 +  bool HasVideoNonEmptySize() const;
-+
+ 
   void EnabledAudioTracksChanged(
-       const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
-   void SelectedVideoTrackChanged(
--
-2.25.1
+       const blink::WebVector<blink::WebMediaPlayer::TrackId>& enabledTrackIds)
+-- 
+2.17.1
+
@@ -10,14 +10,15 @@ Disable prefs::kSigninAllowedOnNextStartup by default. The setting can be found
 diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
 --- a/chrome/browser/signin/account_consistency_mode_manager.cc
 +++ b/chrome/browser/signin/account_consistency_mode_manager.cc
-@@ -112,7 +112,7 @@ AccountConsistencyModeManager::~AccountConsistencyModeManager() {}
- // static
- void AccountConsistencyModeManager::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
+@@ -97,7 +97,7 @@ void AccountConsistencyModeManager::RegisterProfilePrefs(
+ #if BUILDFLAG(ENABLE_DICE_SUPPORT)
+   registry->RegisterBooleanPref(kDiceMigrationCompletePref, false);
+ #endif
 -  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, true);
 +  registry->RegisterBooleanPref(prefs::kSigninAllowedOnNextStartup, false);
 }
 
 // static
--
-2.25.1
+-- 
+2.17.1
+
@@ -0,0 +1,37 @@
+From: samartnik <artem@brave.com>
+Date: Thu, 14 Dec 2017 16:19:50 +0200
+Subject: Always allow partner customisation
+
+---
+ .../PartnerBrowserCustomizations.java            | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
+@@ -325,14 +325,14 @@ public class PartnerBrowserCustomizations {
+             @Override
+             protected Void doInBackground() {
+                 try {
+-                    boolean systemOrPreStable =
+-                            (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+-                            || !ChromeVersionInfo.isStableBuild();
+-                    if (!systemOrPreStable) {
+-                        // Only allow partner customization if this browser is a system package, or
+-                        // is in pre-stable channels.
+-                        return null;
+-                    }
+                    //boolean systemOrPreStable =
+                    //        (context.getApplicationInfo().flags & ApplicationInfo.FLAG_SYSTEM) == 1
+                    //        || !ChromeVersionInfo.isStableBuild();
+                    //if (!systemOrPreStable) {
+                    //    // Only allow partner customization if this browser is a system package, or
+                    //    // is in pre-stable channels.
+                    //    return null;
+                    //}
+ 
+                     if (isCancelled()) return null;
+                     Provider provider = AppHooks.get().getCustomizationProvider();
+-- 
+2.17.1
+
@@ -0,0 +1,38 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 5 Jun 2018 13:46:40 +0200
+Subject: Always respect async dns flag (regardless of SDK version)
+
+Do not read experiment value for cronet async DNS configuration
+---
+ chrome/browser/net/system_network_context_manager.cc | 2 +-
+ components/cronet/url_request_context_config.cc      | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
+--- a/chrome/browser/net/system_network_context_manager.cc
+++ b/chrome/browser/net/system_network_context_manager.cc
+@@ -150,7 +150,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAuthDynamicParams(
+       local_state->GetBoolean(prefs::kNtlmV2Enabled);
+ #endif  // defined(OS_POSIX)
+ 
+-#if defined(OS_ANDROID)
+#if 0
+   auth_dynamic_params->android_negotiate_account_type =
+       local_state->GetString(prefs::kAuthAndroidNegotiateAccountType);
+ #endif  // defined(OS_ANDROID)
+diff --git a/components/cronet/url_request_context_config.cc b/components/cronet/url_request_context_config.cc
+--- a/components/cronet/url_request_context_config.cc
+++ b/components/cronet/url_request_context_config.cc
+@@ -533,7 +533,8 @@ void URLRequestContextConfig::ParseAndSetExperimentalOptions(
+         effective_experimental_options->Remove(it.key(), nullptr);
+         continue;
+       }
+-      async_dns_args->GetBoolean(kAsyncDnsEnable, &async_dns_enable);
+      bool ignored;
+      async_dns_args->GetBoolean(kAsyncDnsEnable, &ignored);
+     } else if (it.key() == kStaleDnsFieldTrialName) {
+       const base::DictionaryValue* stale_dns_args = nullptr;
+       if (!it.value().GetAsDictionary(&stale_dns_args)) {
+-- 
+2.17.1
+
@@ -10,15 +10,16 @@ Ignore any partner-provided home page.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -146,9 +146,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+@@ -135,9 +135,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();
 -        }
+         return UrlConstants.NTP_NON_NATIVE_URL;
+     }
 
-         String homepagePartnerDefaultUri = SharedPreferencesManager.getInstance().readString(
-                 ChromePreferenceKeys.HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_URI, "");
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,24 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Sat, 20 Nov 2021 17:42:41 +0000
-Subject: Ask user before closing all tabs
-
---
- 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
-@@ -454,8 +454,8 @@ const base::Feature kConditionalTabStripAndroid{
- const base::Feature kCastDeviceFilter{"CastDeviceFilter",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
- 
-const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kCloseAllTabsModalDialog{"CloseAllTabsModalDialog",         // Enabled by default in Bromite
-+                                             base::FEATURE_ENABLED_BY_DEFAULT}; // ^
- 
- const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.25.1
@@ -5,9 +5,9 @@ Subject: AudioBuffer, AnalyserNode: fp mitigations
 Truncate base latency precision to two digits
 ---
 .../blink/renderer/modules/webaudio/analyser_node.idl     | 8 ++++----
- .../blink/renderer/modules/webaudio/audio_buffer.idl      | 6 ------
+ .../blink/renderer/modules/webaudio/audio_buffer.idl      | 4 ++--
 .../blink/renderer/modules/webaudio/audio_context.cc      | 4 +++-
- 3 files changed, 7 insertions(+), 11 deletions(-)
+ 3 files changed, 9 insertions(+), 7 deletions(-)

 diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/third_party/blink/renderer/modules/webaudio/analyser_node.idl
 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.idl
@@ -30,23 +30,25 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.idl b/thi
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.idl
-@@ -37,12 +37,6 @@
+@@ -37,12 +37,12 @@
 
     // 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,
+-    [HighEntropy, Measure, RaisesException] Float32Array getChannelData(
+    /*[HighEntropy, Measure, RaisesException] Float32Array getChannelData(
+         unsigned long channelIndex);
+     [HighEntropy, Measure, RaisesException] void copyFromChannel(
+         Float32Array destination,
+         unsigned long channelNumber,
 -        optional unsigned long bufferOffset = 0);
+        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
-@@ -492,7 +492,9 @@ double AudioContext::baseLatency() const {
+@@ -398,7 +398,9 @@ double AudioContext::baseLatency() const {
   DCHECK(IsMainThread());
   DCHECK(destination());
 
@@ -56,6 +58,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
 +  return double(l)/100;
 }
 
- double AudioContext::outputLatency() const {
--
-2.25.1
+ MediaElementAudioSourceNode* AudioContext::createMediaElementSource(
+-- 
+2.17.1
+
@@ -10,7 +10,7 @@ Include @thestinger's fix for correct charging/unknown values
 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
-@@ -84,46 +84,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+@@ -45,46 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
 }
 
 bool BatteryManager::charging() {
@@ -19,12 +19,12 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 double BatteryManager::chargingTime() {
-  return battery_status_.charging_time().InSecondsF();
+-  return battery_status_.charging_time();
 +  return 0.0;
 }
 
 double BatteryManager::dischargingTime() {
-  return battery_status_.discharging_time().InSecondsF();
+-  return battery_status_.discharging_time();
 +  return std::numeric_limits<double>::infinity();
 }
 
@@ -37,7 +37,7 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
   DCHECK(battery_property_);
 
 -  BatteryStatus old_status = battery_status_;
-  battery_status_ = *battery_dispatcher_->LatestData();
+-  battery_status_ = *BatteryDispatcher::Instance().LatestData();
 -
   if (battery_property_->GetState() == BatteryProperty::kPending) {
     battery_property_->Resolve(this);
@@ -61,5 +61,6 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
 }
 
 void BatteryManager::RegisterWithDispatcher() {
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,32 +1,33 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Wed, 30 Oct 2019 11:50:13 +0100
-Subject: Block 'qjz9zk' or 'trk:' requests
+Subject: Block all connection requests with 'qjz9zk' in the domain name or
+ with a 'trk:' scheme.

 An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
 This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
 ---
 .../chrome_autocomplete_scheme_classifier.cc  |  1 +
 chrome/browser/history/history_utils.cc       |  1 +
- chrome/browser/ui/singleton_tabs.cc           |  5 ++++
- .../omnibox/browser/autocomplete_input.cc     |  8 ++++-
+ chrome/browser/ui/singleton_tabs.cc           |  3 +-
+ .../omnibox/browser/autocomplete_input.cc     |  7 ++--
 components/url_formatter/url_fixer.cc         |  4 +++
 .../child_process_security_policy_impl.cc     |  1 +
 net/BUILD.gn                                  |  2 ++
- net/url_request/trk_protocol_handler.cc       | 25 ++++++++++++++++
- net/url_request/trk_protocol_handler.h        | 30 +++++++++++++++++++
+ net/url_request/trk_protocol_handler.cc       | 26 +++++++++++++++
+ net/url_request/trk_protocol_handler.h        | 33 +++++++++++++++++++
 net/url_request/url_request.cc                |  8 +++++
 .../url_request_context_builder.cc            |  3 ++
 url/url_constants.cc                          |  1 +
 url/url_constants.h                           |  1 +
 url/url_util.cc                               |  2 ++
- 14 files changed, 91 insertions(+), 1 deletion(-)
+ 14 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 net/url_request/trk_protocol_handler.cc
 create mode 100644 net/url_request/trk_protocol_handler.h

 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -55,6 +55,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
   if (base::IsStringASCII(scheme) &&
       (ProfileIOData::IsHandledProtocol(scheme) ||
        base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) ||
@@ -48,38 +49,20 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
 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
-@@ -106,6 +106,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
-       continue;
-     }
+@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+ 
+     // Skip view-source tabs. This is needed because RewriteURLIfNecessary
+     // removes the "view-source:" scheme which leads to incorrect matching.
+-    if (tab_url.SchemeIs(content::kViewSourceScheme))
+    if (tab_url.SchemeIs(content::kViewSourceScheme) ||
+        tab_url.SchemeIs(url::kTraceScheme))
+       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);
- }
- 
-@@ -560,7 +565,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -488,7 +488,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
   // For the view-source and blob schemes, we should emphasize the host of the
   // URL qualified by the view-source or blob prefix.
   if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) ||
@@ -88,11 +71,22 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 +       base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) &&
       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
     // Obtain the URL prefixed by view-source or blob and parse it.
-     std::u16string real_url(text.substr(after_scheme_and_colon));
+     base::string16 real_url(text.substr(after_scheme_and_colon));
+@@ -561,7 +562,9 @@ int AutocompleteInput::NumNonHostComponents(const url::Parsed& parts) {
+ bool AutocompleteInput::HasHTTPScheme(const base::string16& input) {
+   std::string utf8_input(base::UTF16ToUTF8(input));
+   url::Component scheme;
+-  if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
+  if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &scheme)) {
+    return false;
+  } else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) {
+     utf8_input.erase(0, scheme.end() + 1);
+   }
+   return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr);
 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
-@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -557,6 +557,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
     }
   }
 
@@ -106,31 +100,31 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -747,6 +747,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
-   RegisterPseudoScheme(url::kJavaScriptScheme);
-   RegisterPseudoScheme(kViewSourceScheme);
-   RegisterPseudoScheme(kGoogleChromeScheme);
+@@ -634,6 +634,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
+ #endif  // BUILDFLAG(ENABLE_WEBSOCKETS)
+   RegisterWebSafeScheme(url::kFtpScheme);
+   RegisterWebSafeScheme(url::kDataScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
- }
+   RegisterWebSafeScheme("feed");
 
- ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
+   // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1033,6 +1033,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",
+@@ -1083,6 +1083,8 @@ component("net") {
+       "url_request/report_sender.h",
+       "url_request/static_http_user_agent_settings.cc",
+       "url_request/static_http_user_agent_settings.h",
+      "url_request/trk_protocol_handler.cc",
+      "url_request/trk_protocol_handler.h",
+       "url_request/url_fetcher.cc",
+       "url_request/url_fetcher.h",
+       "url_request/url_fetcher_core.cc",
 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 @@
+@@ -0,0 +1,26 @@
 +// 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.
@@ -145,10 +139,11 @@ new file mode 100644
 +
 +TrkProtocolHandler::TrkProtocolHandler() = default;
 +
-+std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
-+    URLRequest* request) const {
+URLRequestJob* TrkProtocolHandler::MaybeCreateJob(
+    URLRequest* request, NetworkDelegate* network_delegate) const {
 +  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
-+  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
+  return new URLRequestErrorJob(
+      request, network_delegate, ERR_BLOCKED_BY_CLIENT);
 +}
 +
 +bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
@@ -160,7 +155,7 @@ diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protoc
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,33 @@
 +// 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.
@@ -169,6 +164,7 @@ new file mode 100644
 +#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
 +
 +#include "base/compiler_specific.h"
+#include "base/macros.h"
 +#include "net/base/net_export.h"
 +#include "net/url_request/url_request_job_factory.h"
 +
@@ -180,12 +176,14 @@ new file mode 100644
 +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;
+  URLRequestJob* MaybeCreateJob(
+      URLRequest* request,
+      NetworkDelegate* network_delegate) const override;
 +  bool IsSafeRedirectTarget(const GURL& location) const override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler);
 +};
 +
 +}  // namespace net
@@ -197,12 +195,12 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
@@ -13,6 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
- #include "base/strings/utf_string_conversions.h"
+ #include "base/stl_util.h"
 +#include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
- #include "base/values.h"
-@@ -45,6 +46,7 @@
+@@ -40,6 +41,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -210,7 +208,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 using base::Time;
 using std::string;
-@@ -609,6 +611,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -562,6 +564,12 @@ URLRequest::URLRequest(const GURL& url,
   // Sanity check out environment.
   DCHECK(base::ThreadTaskRunnerHandle::IsSet());
 
@@ -226,15 +224,15 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -47,6 +47,7 @@
- #include "net/socket/network_binding_client_socket_factory.h"
+@@ -43,6 +43,7 @@
+ #include "net/quic/quic_stream_factory.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
- #include "net/url_request/url_request_job_factory.h"
-@@ -626,6 +627,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+ #include "net/url_request/url_request_job_factory_impl.h"
+@@ -602,6 +603,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     job_factory->SetProtocolHandler(scheme_handler.first,
                                     std::move(scheme_handler.second));
   }
@@ -242,33 +240,33 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 +                                  std::make_unique<TrkProtocolHandler>());
   protocol_handlers_.clear();
 
-   storage->set_job_factory(std::move(job_factory));
+ #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
 diff --git a/url/url_constants.cc b/url/url_constants.cc
 --- a/url/url_constants.cc
 +++ b/url/url_constants.cc
-@@ -29,6 +29,7 @@ const char16_t kDataScheme16[] = u"data";
- const char kFileScheme[] = "file";
- const char16_t kFileScheme16[] = u"file";
- const char kFileSystemScheme[] = "filesystem";
+@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto";
+ // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport
+ const char kQuicTransportScheme[] = "quic-transport";
+ const char kTelScheme[] = "tel";
 +const char kTraceScheme[] = "trk";
- const char16_t kFileSystemScheme16[] = u"filesystem";
- const char kFtpScheme[] = "ftp";
- const char16_t kFtpScheme16[] = u"ftp";
+ const char kWsScheme[] = "ws";
+ const char kWssScheme[] = "wss";
+ 
 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[];
+@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char kJavaScriptScheme[];
+ COMPONENT_EXPORT(URL) extern const char kMailToScheme[];
+ COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[];
+ COMPONENT_EXPORT(URL) extern const char kTelScheme[];
 +COMPONENT_EXPORT(URL) extern const char kTraceScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kFileScheme16[];
- COMPONENT_EXPORT(URL) extern const char kFileSystemScheme[];
- COMPONENT_EXPORT(URL) extern const char16_t kFileSystemScheme16[];
+ COMPONENT_EXPORT(URL) extern const char kWsScheme[];
+ COMPONENT_EXPORT(URL) extern const char kWssScheme[];
+ 
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -35,6 +35,7 @@ struct SchemeRegistry {
+@@ -34,6 +34,7 @@ struct SchemeRegistry {
   std::vector<SchemeWithType> standard_schemes = {
       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -276,7 +274,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
       // Yes, file URLs can have a hostname, so file URLs should be handled as
       // "standard". File URLs never have a port as specified by the SchemeType
       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -78,6 +79,7 @@ struct SchemeRegistry {
+@@ -77,6 +78,7 @@ struct SchemeRegistry {
       kAboutScheme,
       kJavaScriptScheme,
       kDataScheme,
@@ -284,5 +282,6 @@ diff --git a/url/url_util.cc b/url/url_util.cc
   };
 
   // Schemes that can be sent CORS requests.
--
-2.25.1
+-- 
+2.17.1
+
@@ -2,63 +2,37 @@ 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
 ---
- .../execution_context/execution_context.cc    | 16 ++++++++++
- .../execution_context/execution_context.h     |  1 +
+ services/network/public/cpp/features.cc       |  2 +-
 .../renderer/core/loader/base_fetch_context.h |  1 +
- .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
+ .../core/loader/frame_fetch_context.cc        | 18 ++++++++++
 .../core/loader/frame_fetch_context.h         |  1 +
- .../core/loader/worker_fetch_context.cc       | 21 +++++++++++++
+ .../core/loader/worker_fetch_context.cc       | 19 +++++++++++
 .../core/loader/worker_fetch_context.h        |  1 +
- .../background_fetch_manager.cc               | 31 +++++++++++++++++++
+ .../background_fetch_manager.cc               | 34 +++++++++----------
 .../websockets/websocket_channel_impl.cc      |  5 +++
- .../modules/websockets/websocket_common.cc    | 29 +++++++++++++++++
+ .../modules/websockets/websocket_common.cc    | 27 +++++++++++++++
 .../modules/websockets/websocket_common.h     |  4 +++
- 11 files changed, 130 insertions(+)
+ 10 files changed, 93 insertions(+), 19 deletions(-)

-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
-@@ -672,4 +672,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
-          RuntimeEnabledFeatures::TrustedDOMTypesEnabled(this);
- }
- 
-+String ExecutionContext::addressSpaceForBindings() const {
-+  switch (AddressSpace()) {
-+    case network::mojom::IPAddressSpace::kPublic:
-+    case network::mojom::IPAddressSpace::kUnknown:
-+      return "public";
-+
-+    case network::mojom::IPAddressSpace::kPrivate:
-+      return "private";
-+
-+    case network::mojom::IPAddressSpace::kLocal:
-+      return "local";
-+  }
-+  NOTREACHED();
-+  return "public";
-+}
-+
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
--- a/third_party/blink/renderer/core/execution_context/execution_context.h
-+++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -374,6 +374,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
-       const String& message = g_empty_string,
-       const String& source_file = g_empty_string) const {}
- 
-+  String addressSpaceForBindings() const;
-   network::mojom::IPAddressSpace AddressSpace() const;
-   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
+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
+@@ -123,7 +123,7 @@ const base::Feature kCrossOriginEmbedderPolicy{
+ //
+ // https://wicg.github.io/cors-rfc1918/#integration-fetch
+ const base::Feature kBlockNonSecureExternalRequests{
+-    "BlockNonSecureExternalRequests", base::FEATURE_DISABLED_BY_DEFAULT};
+    "BlockNonSecureExternalRequests", base::FEATURE_ENABLED_BY_DEFAULT};
 
+ // Enables or defaults splittup up server (not proxy) entries in the
+ // HttpAuthCache.
 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
-@@ -83,6 +83,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
- 
-   virtual SubresourceFilter* GetSubresourceFilter() const = 0;
+@@ -65,6 +65,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
+   virtual PreviewsResourceLoadingHints* GetPreviewsResourceLoadingHints()
+       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>
@@ -67,7 +41,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 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
-@@ -546,6 +546,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -755,6 +755,24 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -75,8 +49,6 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 +  // 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()))
@@ -93,22 +65,22 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 +
 void FrameFetchContext::DispatchDidBlockRequest(
     const ResourceRequest& resource_request,
-     const ResourceLoaderOptions& options,
+     const FetchInitiatorInfo& fetch_initiator_info,
 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
-@@ -171,6 +171,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -150,6 +150,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
 +  bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL&) const override;
   bool ShouldBlockFetchByMixedContentCheck(
       mojom::blink::RequestContextType request_context,
-       const absl::optional<ResourceRequest::RedirectInfo>& redirect_info,
+       const base::Optional<ResourceRequest::RedirectInfo>& redirect_info,
 diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/third_party/blink/renderer/core/loader/worker_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/worker_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/worker_fetch_context.cc
-@@ -24,6 +24,7 @@
+@@ -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"
@@ -116,7 +88,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "third_party/blink/renderer/platform/supplementable.h"
 #include "third_party/blink/renderer/platform/weborigin/security_policy.h"
-@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -95,6 +96,24 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -124,8 +96,6 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 +  // 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()))
@@ -142,74 +112,70 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 +
 void WorkerFetchContext::DispatchDidBlockRequest(
     const ResourceRequest& resource_request,
-     const ResourceLoaderOptions& options,
+     const FetchInitiatorInfo& fetch_initiator_info,
 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 {
+@@ -59,6 +59,7 @@ class WorkerFetchContext final : public BaseFetchContext {
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
 +  bool ShouldBlockGateWayAttacks(network::mojom::IPAddressSpace requestor_space, const KURL&) const override;
   bool ShouldBlockFetchByMixedContentCheck(
       mojom::blink::RequestContextType request_context,
-       const absl::optional<ResourceRequest::RedirectInfo>& redirect_info,
+       const base::Optional<ResourceRequest::RedirectInfo>& redirect_info,
 diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
-@@ -101,6 +101,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
-          request_url.ProtocolIsInHTTPFamily();
+@@ -106,24 +106,22 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+ 
+ bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
+                                const KURL& request_url) {
+-  if (RuntimeEnabledFeatures::CorsRFC1918Enabled()) {
+-    network::mojom::IPAddressSpace requestor_space =
+-        execution_context->GetSecurityContext().AddressSpace();
+-
+-    // 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;
+-  }
+  network::mojom::IPAddressSpace requestor_space =
+      execution_context->GetSecurityContext().AddressSpace();
+
+  // 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;
 }
- 
-+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) {
-@@ -222,6 +246,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
-@@ -274,6 +274,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -233,6 +233,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
     return false;
   }
 
-+  if (GetBaseFetchContext()->ShouldBlockGateWayAttacks(execution_context_->AddressSpace(), url)) {
+  if (GetBaseFetchContext()->ShouldBlockGateWayAttacks(execution_context_->GetSecurityContext().AddressSpace(), url)) {
 +    has_initiated_opening_handshake_ = false;
 +    return false;
 +  }
@@ -220,19 +186,23 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
-@@ -124,9 +124,38 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -87,6 +87,15 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
     return ConnectResult::kException;
   }
 
 +  network::mojom::IPAddressSpace requestor_space =
-+      execution_context->AddressSpace();
+      execution_context->GetSecurityContext().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.");
+        "Access to this address is not allowed.");
 +    return ConnectResult::kException;
 +  }
 +
+   if (!execution_context->GetContentSecurityPolicyForWorld()
+            ->AllowConnectToSource(url_, url_, RedirectStatus::kNoRedirect)) {
+     state_ = kClosed;
+@@ -135,6 +144,24 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
   return ConnectResult::kSuccess;
 }
 
@@ -240,8 +210,6 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b
 +  // 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()))
@@ -262,16 +230,16 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b
 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_
+@@ -10,6 +10,8 @@
+ #include <memory>
 
+ #include "base/macros.h"
 +#include "services/network/public/mojom/ip_address_space.mojom.h"
 +#include "third_party/blink/renderer/platform/network/network_utils.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
-@@ -54,6 +56,8 @@ class MODULES_EXPORT WebSocketCommon {
+@@ -53,6 +55,8 @@ class MODULES_EXPORT WebSocketCommon {
   void SetState(State state) { state_ = state; }
   const KURL& Url() const { return url_; }
 
@@ -280,5 +248,6 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.h b/
   // The following methods are public for testing.
 
   // Returns true if |protocol| is a valid WebSocket subprotocol name.
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,95 +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
-
---
- .../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
-@@ -21,6 +21,13 @@
-             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
-@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.url.GURL;
- 
- import java.util.List;
-+import java.util.HashSet;
- 
- /**
-  * Main action bar of bookmark UI. It is responsible for displaying title and buttons
-@@ -134,6 +135,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
-                     new TabDelegate(true), mDelegate.getModel());
-             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.";
-@@ -143,6 +155,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);
-@@ -154,6 +167,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);
-@@ -185,6 +199,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
@@ -1,22 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 8 Jan 2022 19:42:34 +0100
-Subject: Bromite package name
-
---
- 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
-@@ -44,7 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
-   assert(current_toolchain != android_secondary_abi_toolchain)
- }
- 
-_default_package = "org.chromium.chrome"
-+_default_package = "org.bromite.bromite"
- if (android_channel != "default" && android_channel != "stable") {
-   # android-binary-size trybot may checks if an internal Chrome variant's
-   # AndroidManifest is as expected by ensuring the differences between its
--
-2.25.1
@@ -0,0 +1,49 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sat, 9 May 2020 14:42:37 +0200
+Subject: Change default webRTC policy to not use any address
+
+This prevents leakage of the local IP address.
+
+See also: https://github.com/bromite/bromite/issues/553
+---
+ chrome/browser/ui/browser_ui_prefs.cc                      | 4 ++--
+ .../peerconnection/peer_connection_dependency_factory.cc   | 7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
+--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
+@@ -87,8 +87,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 false);
+ #endif
+   // TODO(guoweis): Remove next 2 options at M50.
+-  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
+-  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
+  registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, false);
+  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, false);
+   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
+                                blink::kWebRTCIPHandlingDefault);
+   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
+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
+@@ -421,12 +421,13 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+           port_config.enable_nonproxied_udp = false;
+           break;
+         case DEFAULT:
+-          port_config.enable_multiple_routes = true;
+-          port_config.enable_nonproxied_udp = true;
+          port_config.enable_multiple_routes = false;
+          port_config.enable_nonproxied_udp = false;
+          port_config.enable_default_local_candidate = false;
+           break;
+       }
+ 
+-      VLOG(3) << "WebRTC routing preferences: "
+      LOG(INFO) << "WebRTC routing preferences: "
+               << "policy: " << policy
+               << ", multiple_routes: " << port_config.enable_multiple_routes
+               << ", nonproxied_udp: " << port_config.enable_nonproxied_udp
+-- 
+2.17.1
+
@@ -1,22 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 8 Jan 2022 19:42:34 +0100
-Subject: Chromium package name
-
---
- 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
-@@ -44,7 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
-   assert(current_toolchain != android_secondary_abi_toolchain)
- }
- 
-_default_package = "org.chromium.chrome"
-+_default_package = "org.bromite.chromium"
- if (android_channel != "default" && android_channel != "stable") {
-   # android-binary-size trybot may checks if an internal Chrome variant's
-   # AndroidManifest is as expected by ensuring the differences between its
--
-2.25.1
@@ -1,193 +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
-Hard-code model to SAMSUNG SM-G960U
-use Google Chrome branding for client hints
---
- chrome/browser/prefs/browser_prefs.cc                    | 2 +-
- 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/common/user_agent.cc                             | 9 +--------
- content/public/common/content_features.cc                | 2 +-
- services/network/public/cpp/client_hints.cc              | 1 +
- services/network/public/cpp/features.cc                  | 4 ++--
- third_party/blink/common/client_hints/client_hints.cc    | 1 +
- .../blink/common/client_hints/enabled_client_hints.cc    | 4 +++-
- third_party/blink/common/features.cc                     | 4 ++--
- 11 files changed, 20 insertions(+), 19 deletions(-)
-
-diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
-+++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -765,7 +765,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
-   registry->RegisterListPref(prefs::kUsedPolicyCertificates);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
- 
-  registry->RegisterBooleanPref(kUserAgentClientHintsEnabled, true);
-+  registry->RegisterBooleanPref(kUserAgentClientHintsEnabled, false);
- 
-   registry->RegisterBooleanPref(kCloudPolicyOverridesPlatformPolicy, false);
- 
-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
-@@ -226,9 +226,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
-@@ -433,7 +433,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers,
-                     is_dark_mode ? "dark" : "light");
- }
- 
-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
-@@ -988,6 +988,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/common/user_agent.cc b/content/common/user_agent.cc
--- a/content/common/user_agent.cc
-+++ b/content/common/user_agent.cc
-@@ -300,14 +300,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
- }
- 
- std::string BuildModelInfo() {
-  std::string model;
-#if BUILDFLAG(IS_ANDROID)
-  // Only send the model information if on the release build of Android,
-  // matching user agent behaviour.
-  if (base::SysInfo::GetAndroidBuildCodename() == "REL")
-    model = base::SysInfo::HardwareModelName();
-#endif
-  return model;
-+  return "SAMSUNG SM-G960U";
- }
- 
- #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
-@@ -240,7 +240,7 @@ const base::Feature kCrashReporting{"CrashReporting",
- // Enables support for the `Critical-CH` response header.
- // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
- const base::Feature kCriticalClientHint{"CriticalClientHint",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Enable debugging the issue crbug.com/1201355
- const 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
-@@ -98,6 +98,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
-@@ -184,8 +184,8 @@ const 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
-const base::Feature kAcceptCHFrame{"AcceptCHFrame",
-                                   base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kAcceptCHFrame{"AcceptCHFrame",                    // disabled by default
-+                                   base::FEATURE_DISABLED_BY_DEFAULT};  // in Bromite
- 
- const base::Feature kSCTAuditingRetryReports{"SCTAuditingRetryReports",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
-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
-@@ -118,6 +118,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
-@@ -22,6 +22,7 @@ namespace {
- using ::network::mojom::WebClientHintsType;
- 
- bool IsDisabledByFeature(const WebClientHintsType type) {
-+  if ((true)) return true;
-   switch (type) {
-     case WebClientHintsType::kUA:
-     case WebClientHintsType::kUAArch:
-@@ -136,7 +137,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,
-@@ -169,6 +170,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))
-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
-@@ -156,7 +156,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent",
- // An experimental replacement for the `User-Agent` header, defined in
- // https://tools.ietf.org/html/draft-west-ua-client-hints.
- const base::Feature kUserAgentClientHint{"UserAgentClientHint",
-                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Enable `sec-ch-ua-full-version-list` client hint.
- const base::Feature kUserAgentClientHintFullVersionList{
-@@ -767,7 +767,7 @@ const base::Feature kResamplingScrollEvents{"ResamplingScrollEvents",
- const base::Feature kAllowClientHintsToThirdParty {
-   "AllowClientHintsToThirdParty",
- #if BUILDFLAG(IS_ANDROID)
-      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif
--
-2.25.1
@@ -1,975 +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.
---
- 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
-@@ -13,5 +13,6 @@
-     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
-@@ -207,8 +207,7 @@ public abstract class UrlBar extends AutocompleteEditText {
-         // the first draw.
-         setFocusable(false);
-         setFocusableInTouchMode(false);
-        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
@@ -1,35 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 26 Sep 2021 11:17:53 +0200
-Subject: Disable AGSA by default
-
---
- chrome/browser/flags/android/chrome_feature_list.cc             | 2 +-
- .../org/chromium/chrome/browser/flags/CachedFeatureFlags.java   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -636,7 +636,7 @@ const base::Feature kDynamicColorButtonsAndroid{
-     "DynamicColorButtonsAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kExploreSites{"ExploreSites",
-                                   base::FEATURE_DISABLED_BY_DEFAULT};
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -90,7 +90,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.READ_LATER, false)
-                     .put(ChromeFeatureList.CCT_REMOVE_REMOTE_VIEW_IDS, true)
-                     .put(ChromeFeatureList.CCT_INCOGNITO, true)
-                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true)
-+                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false)
-                     .put(ChromeFeatureList.APP_MENU_MOBILE_SITE_OPTION, false)
-                     .put(ChromeFeatureList.OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, false)
-                     .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)
--
-2.25.1
@@ -0,0 +1,42 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 20 Feb 2020 22:44:06 +0100
+Subject: Disable AImageReader for ARM64/P and ARM64/Q
+
+---
+ gpu/config/gpu_finch_features.cc | 4 ++++
+ media/base/media_switches.cc     | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
+--- a/gpu/config/gpu_finch_features.cc
+++ b/gpu/config/gpu_finch_features.cc
+@@ -15,7 +15,11 @@ namespace features {
+ #if defined(OS_ANDROID)
+ // Use android AImageReader when playing videos with MediaPlayer.
+ const base::Feature kAImageReaderMediaPlayer{"AImageReaderMediaPlayer",
+#ifdef ARCH_CPU_ARM64
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+#else
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+#endif
+ 
+ // Used only by webview to disable SurfaceControl.
+ const base::Feature kDisableSurfaceControlForWebview{
+diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
+--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
+@@ -544,7 +544,11 @@ const base::Feature kMediaDrmPreprovisioningAtStartup{
+ 
+ // Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
+ const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
+#ifdef ARCH_CPU_ARM64
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+#else
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
+#endif
+ 
+ // Prevents using SurfaceLayer for videos. This is meant to be used by embedders
+ // that cannot support SurfaceLayer at the moment.
+-- 
+2.17.1
+
@@ -1,72 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 8 Nov 2021 09:47:23 +0000
-Subject: Disable Accessibility service by default
-
---
- .../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
-@@ -1420,6 +1420,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
-@@ -5,6 +5,11 @@
- 
- <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
-@@ -17,6 +17,9 @@ import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePr
- import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
- 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
-@@ -940,6 +940,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
@@ -1,30 +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
---
- 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
-@@ -95,12 +95,8 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow",
- 
- // Enables the built-in DNS resolver.
- const 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",                            // Bromite guard for this feature to be always disabled
-+      base::FEATURE_DISABLED_BY_DEFAULT  // ^
- };
- 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
--
-2.25.1
@@ -9,7 +9,7 @@ Subject: Disable DRM media origin IDs preprovisioning
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -703,7 +703,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -533,7 +533,7 @@ const base::Feature kMediaDrmPersistentLicense{
 // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
 // which will trigger provisioning process after MediaDrmBridge is created.
 const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
@@ -18,5 +18,6 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 
 // 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
+-- 
+2.17.1
+
@@ -1,290 +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
---
- .../java/res/xml/privacy_preferences.xml      |  4 ---
- .../privacy/settings/PrivacySettings.java     | 22 ------------
- .../browser/chrome_content_browser_client.cc  |  3 ++
- .../privacy_sandbox/generated_floc_pref.cc    |  2 +-
- .../history/core/browser/history_backend.cc   | 13 +------
- .../history/core/browser/history_service.cc   |  2 +-
- .../privacy_sandbox/privacy_sandbox_prefs.cc  |  4 +--
- .../privacy_sandbox_settings.cc               | 36 +++++++++++--------
- .../privacy_sandbox_settings.h                |  1 -
- 9 files changed, 29 insertions(+), 58 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
-@@ -65,10 +65,6 @@
-         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
-@@ -62,7 +62,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_REVIEW = "privacy_review";
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
-@@ -93,21 +92,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 privacyReviewPreference = findPreference(PREF_PRIVACY_REVIEW);
-         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_REVIEW)) {
-             getPreferenceScreen().removePreference(privacyReviewPreference);
-@@ -239,12 +223,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
-@@ -2824,6 +2824,9 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed(
-     const url::Origin* impression_origin,
-     const url::Origin* conversion_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/chrome/browser/privacy_sandbox/generated_floc_pref.cc b/chrome/browser/privacy_sandbox/generated_floc_pref.cc
--- a/chrome/browser/privacy_sandbox/generated_floc_pref.cc
-+++ b/chrome/browser/privacy_sandbox/generated_floc_pref.cc
-@@ -35,7 +35,7 @@ extensions::settings_private::SetPrefResult GeneratedFlocPref::SetPref(
-     return extensions::settings_private::SetPrefResult::PREF_NOT_MODIFIABLE;
- 
-   profile_->GetPrefs()->SetBoolean(prefs::kPrivacySandboxFlocEnabled,
-                                   value->GetBool());
-+                                   false);
- 
-   return extensions::settings_private::SetPrefResult::SUCCESS;
- }
-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
-@@ -497,18 +497,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/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
--- a/components/history/core/browser/history_service.cc
-+++ b/components/history/core/browser/history_service.cc
-@@ -394,7 +394,7 @@ void HistoryService::AddPage(const GURL& url,
-   AddPage(HistoryAddPageArgs(
-       url, time, context_id, nav_entry_id, referrer, redirects, transition,
-       !ui::PageTransitionIsMainFrame(transition), visit_source,
-      did_replace_entry, /*consider_for_ntp_most_visited=*/true, floc_allowed));
-+      did_replace_entry, /*consider_for_ntp_most_visited=*/true, /*floc_allowed*/false));
- }
- 
- void HistoryService::AddPage(const GURL& url,
-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
-@@ -71,7 +71,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(prefs::kPrivacySandboxApisEnabledV2Init, false);
-@@ -88,7 +88,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-   registry->RegisterTimePref(prefs::kPrivacySandboxTopicsDataAccessibleSince,
-                              base::Time());
-   registry->RegisterBooleanPref(
-      prefs::kPrivacySandboxFlocEnabled, true,
-+      prefs::kPrivacySandboxFlocEnabled, false,
-       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
-   registry->RegisterListPref(prefs::kPrivacySandboxBlockedTopics);
-   registry->RegisterDictionaryPref(prefs::kPrivacySandboxFledgeJoinBlocked);
-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
-@@ -67,8 +67,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_);
-@@ -88,7 +87,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(
-                                            cookie_settings);
- }
- 
-bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) {
-+bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
-+  if ((true)) return false;
-   auto* blocked_topics =
-       pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
- 
-@@ -187,7 +188,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
- 
- bool PrivacySandboxSettings::IsConversionMeasurementAllowed(
-     const url::Origin& top_frame_origin,
-    const url::Origin& reporting_origin) const {
-+    const url::Origin& reporting_origin) const { // disabled in Bromite
-+  if ((true)) return false;
-   ContentSettingsForOneType cookie_settings;
-   cookie_settings_->GetCookieSettings(&cookie_settings);
- 
-@@ -291,7 +293,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;
-   DictionaryPrefUpdate scoped_pref_update(
-       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
-   auto* pref_data = scoped_pref_update.Get();
-@@ -338,7 +341,8 @@ std::vector<GURL> PrivacySandboxSettings::FilterFledgeAllowedParties(
-   return allowed_parties;
- }
- 
-bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
-+bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const { // disabled in Bromite
-+  if ((true)) return false;
-   // If the delegate is restricting access, or indicates confirmation has not
-   // occurred, the Privacy Sandbox is disabled.
-   if (delegate_->IsPrivacySandboxRestricted() ||
-@@ -356,7 +360,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) {
-@@ -374,7 +378,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);
-@@ -383,7 +388,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))
-@@ -428,8 +434,8 @@ PrivacySandboxSettings::PrivacySandboxSettings() = default;
- bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
-     const GURL& url,
-     const absl::optional<url::Origin>& top_frame_origin,
-    const ContentSettingsForOneType& cookie_settings) const {
-  if (!IsPrivacySandboxEnabled())
-+    const ContentSettingsForOneType& cookie_settings) const { // always disable this in Bromite
-+  if ((true))
-     return false;
- 
-   // Third party cookies must also be available for this context. An empty site
-@@ -438,9 +444,9 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
-                                                      top_frame_origin);
- }
- 
-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
-@@ -217,7 +217,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
@@ -0,0 +1,54 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 27 Oct 2019 10:21:19 +0100
+Subject: Disable HEAD requests for single-word Omnibar searches
+
+Patch from https://github.com/Eloston/ungoogled-chromium/issues/814#issuecomment-526873727
+---
+ .../ui/omnibox/chrome_omnibox_navigation_observer.cc      | 8 ++++----
+ .../ui/omnibox/chrome_omnibox_navigation_observer.h       | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
+@@ -86,8 +86,8 @@ ChromeOmniboxNavigationObserver::ChromeOmniboxNavigationObserver(
+       shortcuts_backend_(ShortcutsBackendFactory::GetForProfile(profile)),
+       load_state_(LOAD_NOT_SEEN),
+       fetch_state_(FETCH_NOT_COMPLETE) {
+-  if (alternate_nav_match_.destination_url.is_valid())
+-    CreateLoader(alternate_nav_match_.destination_url);
+//  if (alternate_nav_match_.destination_url.is_valid())
+//    CreateLoader(alternate_nav_match_.destination_url);
+ 
+   // We need to start by listening to AllSources, since we don't know which tab
+   // the navigation might occur in.
+@@ -287,7 +287,7 @@ void ChromeOmniboxNavigationObserver::OnAllLoadingFinished() {
+   delete this;
+ }
+ 
+-void ChromeOmniboxNavigationObserver::CreateLoader(
+/*void ChromeOmniboxNavigationObserver::CreateLoader(
+     const GURL& destination_url) {
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("omnibox_navigation_observer", R"(
+@@ -328,4 +328,4 @@ void ChromeOmniboxNavigationObserver::CreateLoader(
+   loader_->SetAllowHttpErrorResults(true);
+   loader_->SetOnRedirectCallback(base::BindRepeating(
+       &ChromeOmniboxNavigationObserver::OnURLRedirect, base::Unretained(this)));
+-}
+}*/
+diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+--- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h
+@@ -127,7 +127,7 @@ class ChromeOmniboxNavigationObserver : public OmniboxNavigationObserver,
+ 
+   // Creates a URL loader for |destination_url| and stores it in |loader_|.
+   // Does not start the loader.
+-  void CreateLoader(const GURL& destination_url);
+  //void CreateLoader(const GURL& destination_url);
+ 
+   const base::string16 text_;
+   const AutocompleteMatch match_;
+-- 
+2.17.1
+
@@ -3,59 +3,28 @@ Date: Thu, 12 Oct 2017 08:15:17 +0200
 Subject: Disable NTP remote suggestions by default

 ---
- .../chrome/browser/feed/FeedSurfaceMediator.java    | 13 ++++++++++---
- components/feed/core/shared_prefs/pref_names.cc     |  4 ++--
- components/ntp_snippets/features.cc                 |  4 ++--
- 3 files changed, 14 insertions(+), 7 deletions(-)
+ components/feed/core/shared_prefs/pref_names.cc | 4 ++--
+ components/ntp_snippets/features.cc             | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)

-diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
-+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
-@@ -294,9 +294,13 @@ public class FeedSurfaceMediator
-     /** Update the content based on supervised user or enterprise policy. */
-     void updateContent() {
-         mFeedEnabled = FeedFeatures.isFeedEnabled();
-        if (mFeedEnabled == !mTabToStreamMap.isEmpty()) {
-            return;
-        }
-+        // Bromite needs the next lines removed because mFeedEnabled
-+        // is always false and mTabToStreamMap never empty
-+        //
-+        // addHeaderAndStream is called at least once
-+        // if (mFeedEnabled == !mTabToStreamMap.isEmpty()) {
-+        //     return;
-+        // }
- 
-         RecyclerView recyclerView = mCoordinator.getRecyclerView();
-         if (mSnapScrollHelper != null && recyclerView != null) {
-@@ -450,6 +454,9 @@ public class FeedSurfaceMediator
-     }
- 
-     private void addHeaderAndStream(String headerText, Stream stream) {
-+        // Bromite also needs this early return because
-+        // the first item inserted is the feed setting
-+        if (FeedFeatures.isFeedEnabled() == false) return;
-         int tabId = mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY).size();
-         mTabToStreamMap.put(tabId, stream);
- 
 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";
+@@ -19,8 +19,8 @@ const char kEnableSnippets[] = "ntp_snippets.enable";
+ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
 
 void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
 -  registry->RegisterBooleanPref(kEnableSnippets, true);
 -  registry->RegisterBooleanPref(kArticlesListVisible, true);
 +  registry->RegisterBooleanPref(kEnableSnippets, false);
 +  registry->RegisterBooleanPref(kArticlesListVisible, false);
-   registry->RegisterIntegerPref(kVideoPreviewsType, 1);
 }
 
+ }  // namespace prefs
 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
-@@ -38,7 +38,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -39,7 +39,7 @@ const base::Feature* const kAllFeatures[] = {
     &kOptionalImagesEnabledFeature};
 
 const base::Feature kArticleSuggestionsFeature{
@@ -64,7 +33,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 
 const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
     "RemoteSuggestionsEmulateM58FetchingSchedule",
-@@ -68,7 +68,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
+@@ -69,7 +69,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
 const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
 
 const base::Feature kKeepPrefetchedContentSuggestions{
@@ -73,5 +42,6 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
 
 const base::Feature kOptionalImagesEnabledFeature{
     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
--
-2.25.1
+-- 
+2.17.1
+
@@ -0,0 +1,37 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 26 Nov 2017 23:11:56 +0100
+Subject: Disable Omaha update checks
+
+Do not consider Jelly Bean unsupported
+---
+ .../java/src/org/chromium/chrome/browser/omaha/OmahaBase.java   | 2 +-
+ .../org/chromium/chrome/browser/omaha/VersionNumberGetter.java  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
+@@ -157,7 +157,7 @@ public class OmahaBase {
+ 
+     /** See {@link #sIsDisabled}. */
+     static boolean isDisabled() {
+-        return sIsDisabled;
+        return true;
+     }
+ 
+     /**
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
+@@ -43,7 +43,7 @@ public class VersionNumberGetter {
+     private static VersionNumberGetter sInstanceForTests;
+ 
+     /** If false, OmahaClient will never report that a newer version is available. */
+-    private static boolean sEnableUpdateDetection = true;
+    private static boolean sEnableUpdateDetection = false;
+ 
+     protected VersionNumberGetter() { }
+ 
+-- 
+2.17.1
+
@@ -1,292 +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
---
- chrome/browser/about_flags.cc        |  6 +++
- chrome/browser/flag_descriptions.cc  |  8 ++++
- chrome/browser/flag_descriptions.h   |  6 +++
- net/base/features.cc                 |  6 +++
- 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, 128 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
-@@ -4472,6 +4472,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
-@@ -922,6 +922,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
-@@ -532,6 +532,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
-@@ -112,6 +112,12 @@ const base::FeatureParam<int> kUseDnsHttpsSvcbExtraTimePercent{
- const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
- 
-+const base::Feature kDisableTLSResumption{"DisableTLSResumption",
-+                                          base::FEATURE_ENABLED_BY_DEFAULT};
-+
-+const base::Feature kLogTLSResumption{"LogTLSResumption",
-+                                      base::FEATURE_DISABLED_BY_DEFAULT};
-+
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           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
-@@ -175,6 +175,12 @@ NET_EXPORT extern const base::FeatureParam<int>
- // Enables TLS 1.3 early data.
- NET_EXPORT extern const base::Feature kEnableTLS13EarlyData;
- 
-+// Disables TLS resumption.
-+NET_EXPORT extern const base::Feature kDisableTLSResumption;
-+
-+// Log TLS resumption.
-+NET_EXPORT extern const base::Feature kLogTLSResumption;
-+
- // Enables the TLS Encrypted ClientHello feature.
- // https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13
- NET_EXPORT extern const base::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
-@@ -232,6 +232,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
-@@ -73,6 +73,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"
-@@ -229,6 +230,38 @@ std::set<std::string> HostsFromOrigins(std::set<HostPortPair> origins) {
- 
- }  // 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
-@@ -2209,7 +2242,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
-               sct_auditing_delegate_,
-               HostsFromOrigins(params_.origins_to_force_quic_on),
-               actual_network_isolation_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
-@@ -404,7 +404,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_isolation_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_isolation_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();
- }
- 
-@@ -803,6 +829,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>(
-@@ -1091,6 +1119,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.
-@@ -1764,6 +1821,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
-@@ -130,6 +130,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
@@ -1,58 +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
---
- .../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
@@ -1,256 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Tue, 25 Jan 2022 12:22:52 +0000
-Subject: Disable all predictors code
-
---
- .../chrome_hints_manager.cc                   |  1 +
- .../optimization_guide_keyed_service.cc       |  1 -
- chrome/common/chrome_features.cc              |  4 ++--
- .../optimization_guide/core/hints_fetcher.cc  |  1 +
- .../optimization_guide/core/hints_manager.cc  |  3 +++
- .../core/optimization_guide_features.cc       | 20 +++++++++----------
- .../core/prediction_model_download_manager.cc |  4 +++-
- .../core/prediction_model_fetcher_impl.cc     |  1 +
- components/optimization_guide/features.gni    |  4 +---
- components/permissions/features.cc            |  2 +-
- .../segmentation_platform/public/features.cc  |  2 +-
- third_party/blink/common/features.cc          |  2 +-
- 12 files changed, 25 insertions(+), 20 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
-@@ -29,6 +29,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
-@@ -362,7 +362,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
-@@ -788,7 +788,7 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
- // 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.
- const base::Feature kPermissionPredictions{"PermissionPredictions",
-                                           base::FEATURE_ENABLED_BY_DEFAULT};
-+                                           base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // The holdback chance is 30% but it can also be configured/updated
- // through finch if needed.
-@@ -799,7 +799,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
- 
- // Enables using the prediction service for geolocation permission prompts.
- const base::Feature kPermissionGeolocationPredictions{
-    "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- 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
-@@ -175,6 +175,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
-@@ -1211,6 +1211,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
-@@ -79,7 +79,7 @@ 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.
- const base::Feature kOptimizationHints{"OptimizationHints",
-                                       base::FEATURE_ENABLED_BY_DEFAULT};
-+                                       base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Feature flag that contains a feature param that specifies the field trials
- // that are allowed to be sent up to the Optimization Guide Server.
-@@ -88,12 +88,12 @@ const base::Feature kOptimizationHintsFieldTrials{
- 
- // Enables fetching from a remote Optimization Guide Service.
- const base::Feature kRemoteOptimizationGuideFetching{
-    "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent {
-   "OptimizationHintsFetchingAnonymousDataConsent",
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
-      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else   // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif  // BUILDFLAG(IS_ANDROID)
-@@ -107,15 +107,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{
- 
- // Enables the prediction of optimization targets.
- const base::Feature kOptimizationTargetPrediction{
-    "OptimizationTargetPrediction", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "OptimizationTargetPrediction", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- // Enables the downloading of models.
- const 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
-+#else   // BUILD_WITH_TFLITE_LIB
-+      base::FEATURE_DISABLED_BY_DEFAULT // guard this
- #endif  // !BUILD_WITH_TFLITE_LIB
- };
- 
-@@ -141,7 +141,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{
- 
- // Enables push notification of hints.
- const base::Feature kPushNotifications{"OptimizationGuidePushNotifications",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
-+                                       base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- // This feature flag does not turn off any behavior, it is only used for
- // experiment parameters.
-@@ -153,12 +153,12 @@ const base::Feature kOptimizationGuideMetadataValidation{
-     "OptimizationGuideMetadataValidation", base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kPageTopicsBatchAnnotations{
-    "PageTopicsBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "PageTopicsBatchAnnotations", base::FEATURE_DISABLED_BY_DEFAULT};
- const base::Feature kPageVisibilityBatchAnnotations{
-     "PageVisibilityBatchAnnotations", base::FEATURE_ENABLED_BY_DEFAULT};
- 
- const base::Feature kUseLocalPageEntitiesMetadataProvider{
-    "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- const base::Feature kBatchAnnotationsValidation{
-     "BatchAnnotationsValidation", base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -389,7 +389,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 =
-@@ -106,6 +106,7 @@ PredictionModelDownloadManager::~PredictionModelDownloadManager() = default;
- 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;
-@@ -240,6 +241,7 @@ void PredictionModelDownloadManager::OnDownloadFailed(
- absl::optional<std::pair<base::FilePath, base::FilePath>>
- PredictionModelDownloadManager::ProcessDownload(
-     const base::FilePath& file_path) {
-+  if ((true)) return absl::nullopt;
-   DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
- 
-   if (!switches::ShouldSkipModelDownloadVerificationForTesting()) {
-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
-@@ -51,6 +51,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
-@@ -69,7 +69,7 @@ const base::Feature kPermissionPredictionServiceUseUrlOverride{
- 
- const base::Feature kPermissionOnDeviceNotificationPredictions{
-     "PermissionOnDeviceNotificationPredictions",
-    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- #if BUILDFLAG(IS_ANDROID)
- 
-diff --git a/components/segmentation_platform/public/features.cc b/components/segmentation_platform/public/features.cc
--- a/components/segmentation_platform/public/features.cc
-+++ b/components/segmentation_platform/public/features.cc
-@@ -12,7 +12,7 @@ namespace features {
- const base::Feature kSegmentationPlatformFeature {
-   "SegmentationPlatform",
- #if BUILDFLAG(IS_ANDROID)
-      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif
-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
-@@ -180,7 +180,7 @@ const base::Feature kViewportHeightClientHintHeader{
- const base::Feature kNavigationPredictor {
-   "NavigationPredictor",
- #if BUILDFLAG(IS_ANDROID)
-      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif
--
-2.25.1
@@ -9,16 +9,16 @@ Subject: Disable all promo dialogs
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -863,7 +863,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -307,7 +307,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
      * 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;
-             }
-@@ -898,8 +898,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+             SharedPreferencesManager preferenceManager = SharedPreferencesManager.getInstance();
+             // Promos can only be shown when we start with ACTION_MAIN intent and
+             // after FRE is complete. Native initialization can finish before the FRE flow is
+@@ -338,8 +338,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
                 preferenceManager.writeBoolean(
                         ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
             }
@@ -29,5 +29,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
     }
 
     private boolean maybeShowPromo() {
--
-2.25.1
+-- 
+2.17.1
+
@@ -0,0 +1,23 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Thu, 19 Dec 2019 21:46:10 +0100
+Subject: Disable autofill assistant by default
+
+---
+ .../autofill_assistant/AutofillAssistantPreferencesUtil.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+--- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferencesUtil.java
+@@ -15,7 +15,7 @@ class AutofillAssistantPreferencesUtil {
+     /** Checks whether the Autofill Assistant switch preference in settings is on. */
+     static boolean isAutofillAssistantSwitchOn() {
+         return SharedPreferencesManager.getInstance().readBoolean(
+-                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, true);
+                ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, false);
+     }
+ 
+     /** Checks whether the Autofill Assistant onboarding has been accepted. */
+-- 
+2.17.1
+
@@ -1,222 +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.
---
- .../flags/android/chrome_feature_list.cc        |  2 +-
- .../embedder_support/origin_trials/features.cc  |  3 ++-
- .../render_view_context_menu_base.cc            |  3 ---
- .../aggregatable_report_sender.cc               | 17 ++++++++---------
- .../attribution_reporting/attribution_host.cc   |  1 +
- .../attribution_report_network_sender.cc        | 15 ++++++++-------
- .../attribution_storage_sql.cc                  |  2 +-
- content/browser/storage_partition_impl.cc       |  7 +------
- content/public/browser/navigation_controller.cc |  1 -
- third_party/blink/common/features.cc            |  2 +-
- .../platform/runtime_enabled_features.json5     |  9 ++++++++-
- 11 files changed, 31 insertions(+), 31 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
-@@ -442,7 +442,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kAppToWebAttribution{"AppToWebAttribution",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
- 
- const base::Feature kBackgroundThreadPool{"BackgroundThreadPool",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
-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
-@@ -17,8 +17,9 @@ const base::Feature kOriginTrialsSampleAPIThirdPartyAlternativeUsage{
-     "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
-     base::FEATURE_ENABLED_BY_DEFAULT};
- 
-+// When disabled, the API cannot be enabled by tokens.
- const base::Feature kConversionMeasurementAPIAlternativeUsage{
-     "ConversionMeasurementAPIAlternativeUsage",
-    base::FEATURE_ENABLED_BY_DEFAULT};
-+    base::FEATURE_DISABLED_BY_DEFAULT};
- 
- }  // 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
-@@ -137,19 +137,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;
-@@ -189,4 +188,4 @@ void AggregatableReportSender::OnReportSent(
-   std::move(callback).Run(status);
- }
- 
-}  // namespace content
-\ No newline at end of file
-+}  // namespace content
-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
-@@ -141,6 +141,7 @@ void AttributionHost::DidFinishNavigation(NavigationHandle* navigation_handle) {
-     return;
-   }
- 
-+  if ((true)) return;
-   AttributionManager* attribution_manager =
-       attribution_manager_provider_->GetManager(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
-@@ -118,13 +118,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::SetURLLoaderFactoryForTesting(
-@@ -138,6 +133,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
-@@ -358,7 +358,7 @@ void AttributionStorageSql::RunInMemoryForTesting() {
- }
- 
- // static
-bool AttributionStorageSql::g_run_in_memory_ = false;
-+bool AttributionStorageSql::g_run_in_memory_ = true;
- 
- AttributionStorageSql::AttributionStorageSql(
-     const base::FilePath& path_to_database,
-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
-@@ -1304,12 +1304,7 @@ void StoragePartitionImpl::Initialize(
- 
-   bucket_manager_ = std::make_unique<BucketManager>(quota_manager_proxy);
- 
-  // 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)) {
-     interest_group_manager_ = std::make_unique<InterestGroupManagerImpl>(
-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
-@@ -36,7 +36,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
-@@ -49,7 +49,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries",
- 
- // Controls whether the Conversion Measurement API infrastructure is enabled.
- const base::Feature kConversionMeasurement{"ConversionMeasurement",
-                                           base::FEATURE_ENABLED_BY_DEFAULT};
-+                                           base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // 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
-@@ -106,6 +106,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",
-@@ -482,7 +489,7 @@
-     },
-     {
-       name: "ConversionMeasurement",
-      status: "test",
-+      depends_on: ["DisabledForBromite"],
-     },
-     {
-       name: "CooperativeScheduling"
--
-2.25.1
@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 9 Apr 2022 21:43:35 +0200
-Subject: Disable crash reporting
-
---
- 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
-@@ -234,8 +234,8 @@ const base::Feature kCooperativeScheduling{"CooperativeScheduling",
- 
- // Enables crash reporting via Reporting API.
- // https://www.w3.org/TR/reporting/#crash-report
-const base::Feature kCrashReporting{"CrashReporting",
-                                    base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kCrashReporting{"CrashReporting",                      // disabled by default on Bromite
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};    // ^
- 
- // Enables support for the `Critical-CH` response header.
- // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
--
-2.25.1
@@ -3,58 +3,21 @@ Date: Thu, 19 Dec 2019 22:52:53 +0100
 Subject: Disable feeds support by default

 ---
- .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------
- .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
- components/feed/feed_feature_list.cc                      | 4 ++--
- 3 files changed, 4 insertions(+), 10 deletions(-)
+ components/feed/feed_feature_list.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

-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
-@@ -43,13 +43,7 @@ public final class FeedFeatures {
-      *         the user is signed in and confirms it's not a child profile.
-      */
-     public static boolean isWebFeedUIEnabled() {
-        // TODO(b/197354832, b/188188861): change consent check to SIGNIN.
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)
-                && IdentityServicesProvider.get()
-                           .getSigninManager(Profile.getLastUsedRegularProfile())
-                           .getIdentityManager()
-                           .hasPrimaryAccount(ConsentLevel.SYNC)
-                && !Profile.getLastUsedRegularProfile().isChild();
-+        return false;
-     }
- 
-     /**
-diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -82,7 +82,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true)
-                     .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false)
-                     .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true)
-                    .put(ChromeFeatureList.INTEREST_FEED_V2, true)
-+                    .put(ChromeFeatureList.INTEREST_FEED_V2, false)
-                     .put(ChromeFeatureList.THEME_REFACTOR_ANDROID, true)
-                     .put(ChromeFeatureList.USE_CHIME_ANDROID_SDK, false)
-                     .put(ChromeFeatureList.CCT_INCOGNITO_AVAILABLE_TO_THIRD_PARTY, false)
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -12,12 +12,12 @@
+@@ -7,7 +7,7 @@
 namespace feed {
 
 const base::Feature kInterestFeedContentSuggestions{
 -    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
 // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
- // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
- // changed, please update the cached one's default value in CachedFeatureFlags.
 const base::Feature kInterestFeedV2{"InterestFeedV2",
-                                    base::FEATURE_ENABLED_BY_DEFAULT};
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};
- 
- const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.25.1
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.17.1
+
@@ -2,185 +2,65 @@ 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
 ---
- android_webview/nonembedded/BUILD.gn          |  2 --
- .../services/VariationsSeedServer.java        |  2 --
- .../chrome_metrics_services_manager_client.cc |  2 ++
- components/ukm/ukm_recorder_impl.cc           |  3 ++
- .../firstrun/VariationsSeedBridge.java        |  2 +-
- .../firstrun/VariationsSeedFetcher.java       | 28 ++++---------------
- .../variations/net/omnibox_http_headers.cc    |  2 +-
- .../variations/net/variations_http_headers.cc |  3 ++
- .../service/variations_field_trial_creator.cc |  3 +-
- .../variations/service/variations_service.cc  | 15 ++--------
- 10 files changed, 21 insertions(+), 41 deletions(-)
+ .../browser/flags/ChromeFeatureList.java      | 19 ++++---------------
+ .../variations/service/variations_service.cc  | 12 +-----------
+ 2 files changed, 5 insertions(+), 26 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
-@@ -101,7 +101,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",
-@@ -112,7 +111,6 @@ android_library("services_java") {
-     "java/src/org/chromium/android_webview/services/MetricsUploadService.java",
-     "java/src/org/chromium/android_webview/services/SafeModeContentProvider.java",
-     "java/src/org/chromium/android_webview/services/SafeModeService.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
-@@ -30,8 +30,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_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
-@@ -189,6 +189,8 @@ ChromeMetricsServicesManagerClient::GetMetricsStateManagerForTesting() {
- void ChromeMetricsServicesManagerClient::CreateFallbackSamplingTrial(
-     version_info::Channel channel,
-     base::FeatureList* feature_list) {
-+  if ((true))
-+    return;
-   // The trial name must be kept in sync with the server config controlling
-   // sampling. If they don't match, then clients will be shuffled into different
-   // groups when the server config takes over from the fallback trial.
-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
-@@ -192,6 +192,9 @@ UkmRecorderImpl::~UkmRecorderImpl() = default;
- void UkmRecorderImpl::CreateFallbackSamplingTrial(
-     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/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
-@@ -80,7 +80,7 @@ public class VariationsSeedFetcher {
-     }
- 
-     private static final String VARIATIONS_SERVER_URL =
-            "https://clientservices.googleapis.com/chrome-variations/seed?osname=";
-+            "https://clientservices.9oo91apis.qjz9zk/chrome-variations/seed?osname=";
- 
-     private static final int READ_TIMEOUT = 3000; // time in ms
-     private static final int REQUEST_TIMEOUT = 1000; // time in ms
-@@ -337,29 +337,13 @@ public class VariationsSeedFetcher {
+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
+@@ -122,9 +122,7 @@ public abstract class ChromeFeatureList {
+      *   the specified parameter does not exist.
      */
-     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();
-        }
-+         }
+     public static String getFieldTrialParamByFeature(String featureName, String paramName) {
+-        if (FeatureList.hasTestFeatures()) return "";
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName);
+        return "";
     }
 
-     private void recordFetchResultOrCode(int resultOrCode) {
-@@ -402,7 +386,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.
+     /**
+@@ -141,10 +139,7 @@ public abstract class ChromeFeatureList {
      */
-    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,7 +21,7 @@ const char kOmniboxOnDeviceSuggestionsHeader[] =
- // Whether to enable reporting the header. Included as a quick escape hatch in
- // case of crashes.
- const base::Feature kReportOmniboxOnDeviceSuggestionsHeader{
-    "ReportOmniboxOnDeviceSuggestionsHeader", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "ReportOmniboxOnDeviceSuggestionsHeader", base::FEATURE_DISABLED_BY_DEFAULT};
+     public static int getFieldTrialParamByFeatureAsInt(
+             String featureName, String paramName, int defaultValue) {
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt(
+-                featureName, paramName, defaultValue);
+        return defaultValue;
+     }
 
- 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;
+     /**
+@@ -161,10 +156,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static double getFieldTrialParamByFeatureAsDouble(
+             String featureName, String paramName, double defaultValue) {
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble(
+-                featureName, paramName, defaultValue);
+        return defaultValue;
+     }
 
-   bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
-+    if((true))
-+      return false;
-+
-     AppendOmniboxOnDeviceSuggestionsHeaderIfNeeded(url, resource_request_);
+     /**
+@@ -181,10 +173,7 @@ public abstract class ChromeFeatureList {
+      */
+     public static boolean getFieldTrialParamByFeatureAsBoolean(
+             String featureName, String paramName, boolean defaultValue) {
+-        if (FeatureList.hasTestFeatures()) return defaultValue;
+-        assert FeatureList.isInitialized();
+-        return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean(
+-                featureName, paramName, defaultValue);
+        return defaultValue;
+     }
 
-     // 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
-@@ -159,7 +159,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
+     /** Alphabetical: */
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -235,17 +235,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -243,17 +243,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -195,19 +75,10 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 -  }
 -#endif
 -  return true;
-+  // set to false even if not used on Android
 +  return false;
 }
 
 std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
-@@ -603,7 +594,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
-   // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
-   // had a chance to run yet from the previous request. In this case, don't
-   // start a new request and just let the previous one finish.
-  if (pending_seed_request_)
-+  if ((true) || pending_seed_request_)
-     return false;
- 
-   last_request_was_http_retry_ = is_http_retry;
--
-2.25.1
+-- 
+2.17.1
+
@@ -1,22 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sat, 19 Feb 2022 12:01:33 +0100
-Subject: Disable idle detection
-
---
- 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
-@@ -426,7 +426,7 @@ const base::Feature kGreaseUACH{"GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT};
- // this feature, the experimental web platform features flag should be set,
- // or the site should obtain an Origin Trial token.
- const base::Feature kIdleDetection{"IdleDetection",
-                                   base::FEATURE_ENABLED_BY_DEFAULT};
-+                                   base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Historically most navigations required IPC from browser to renderer and
- // from renderer back to browser. This was done to check for before-unload
--
-2.25.1
@@ -1,20 +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
-
---
- chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-@@ -313,5 +313,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
- void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
-  registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, false);
-+  registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, true);
- }
--
-2.25.1
@@ -3,75 +3,64 @@ Date: Thu, 4 Jul 2019 19:08:52 -0400
 Subject: Disable media router and remoting by default

 ---
- .../media/router/media_router_feature.cc      | 27 ++++++-------------
- chrome/browser/profiles/profile_impl.cc       |  2 +-
- 2 files changed, 9 insertions(+), 20 deletions(-)
+ .../media/router/media_router_feature.cc        | 17 ++++++++---------
+ chrome/browser/profiles/profile.cc              |  2 +-
+ chrome/browser/profiles/profile_impl.cc         |  2 +-
+ 3 files changed, 10 insertions(+), 11 deletions(-)

 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -50,26 +50,15 @@ const 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();
-}
-+}*/
+@@ -50,17 +50,16 @@ const PrefService::Preference* GetMediaRouterPref(
 
 bool MediaRouterEnabled(content::BrowserContext* context) {
-+  return false;
-+}
+ #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
+-  const PrefService::Preference* pref = GetMediaRouterPref(context);
+-  // Only use the pref value if it set from a mandatory policy.
+-  if (pref->IsManaged() && !pref->IsDefaultValue()) {
+-    bool allowed = false;
+-    CHECK(pref->GetValue()->GetAsBoolean(&allowed));
+-    return allowed;
+-  }
+-
+   // The component extension cannot be loaded in guest sessions.
+   // TODO(crbug.com/756243): Figure out why.
+-  return !Profile::FromBrowserContext(context)->IsGuestSession();
+  if (Profile::FromBrowserContext(context)->IsGuestSession()) {
+    return false;
+  }
 +
-+/*
- #if !BUILDFLAG(IS_ANDROID)
-   if (!base::FeatureList::IsEnabled(kMediaRouter))
-     return false;
-@@ -93,7 +82,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
-     return allowed;
-   }
-   return true;
-}
-+}*/
- 
- #if !BUILDFLAG(IS_ANDROID)
- void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-@@ -106,7 +95,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);
+  const PrefService::Preference* pref = GetMediaRouterPref(context);
+  bool allowed = false;
+  pref->GetValue()->GetAsBoolean(&allowed);
+  return allowed;
+ #else   // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))
+   return false;
+ #endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)
+diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
+--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
+@@ -345,7 +345,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
+       prefs::kMediaRouterFirstRunFlowAcknowledged,
+       false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+-  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, true);
+  registry->RegisterBooleanPref(prefs::kMediaRouterMediaRemotingEnabled, false);
+   registry->RegisterListPref(prefs::kMediaRouterTabMirroringSources);
 
+   registry->RegisterDictionaryPref(prefs::kWebShareVisitedTargets);
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -417,7 +417,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -412,7 +412,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
+ #if defined(OS_CHROMEOS)
+   registry->RegisterBooleanPref(
+       prefs::kOobeMarketingOptInScreenFinished, false,
+-- 
+2.17.1
+
@@ -0,0 +1,88 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 20 Feb 2019 21:41:26 +0100
+Subject: Disable metrics collection for NTP tiles
+
+---
+ .../browser/android/ntp/most_visited_sites_bridge.cc  | 11 ++---------
+ components/ntp_tiles/BUILD.gn                         |  3 ---
+ 2 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+--- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
+@@ -25,7 +25,6 @@
+ #include "chrome/browser/profiles/profile_android.h"
+ #include "components/favicon_base/favicon_types.h"
+ #include "components/history/core/browser/history_service.h"
+-#include "components/ntp_tiles/metrics.h"
+ #include "components/ntp_tiles/most_visited_sites.h"
+ #include "components/ntp_tiles/section_type.h"
+ #include "ui/gfx/android/java_bitmap.h"
+@@ -44,7 +43,6 @@ using ntp_tiles::NTPTilesVector;
+ using ntp_tiles::SectionType;
+ using ntp_tiles::TileTitleSource;
+ using ntp_tiles::TileSource;
+-using ntp_tiles::TileVisualType;
+ 
+ namespace {
+ 
+@@ -235,7 +233,6 @@ void MostVisitedSitesBridge::RecordPageImpression(
+     JNIEnv* env,
+     const JavaParamRef<jobject>& obj,
+     jint jtiles_count) {
+-  ntp_tiles::metrics::RecordPageImpression(jtiles_count);
+ }
+ 
+ void MostVisitedSitesBridge::RecordTileImpression(
+@@ -248,6 +245,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+     jint jsource,
+     jlong jdata_generation_time_ms,
+     const JavaParamRef<jstring>& jurl) {
+#if 0
+   GURL url(ConvertJavaStringToUTF8(env, jurl));
+   TileTitleSource title_source = static_cast<TileTitleSource>(jtitle_source);
+   TileSource source = static_cast<TileSource>(jsource);
+@@ -258,6 +256,7 @@ void MostVisitedSitesBridge::RecordTileImpression(
+   ntp_tiles::metrics::RecordTileImpression(ntp_tiles::NTPTileImpression(
+       jindex, source, title_source, visual_type, icon_type,
+       base::Time::FromJavaTime(jdata_generation_time_ms), url));
+#endif
+ }
+ 
+ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+@@ -268,12 +267,6 @@ void MostVisitedSitesBridge::RecordOpenedMostVisitedItem(
+     jint title_source,
+     jint source,
+     jlong jdata_generation_time_ms) {
+-  ntp_tiles::metrics::RecordTileClick(ntp_tiles::NTPTileImpression(
+-      index, static_cast<TileSource>(source),
+-      static_cast<TileTitleSource>(title_source),
+-      static_cast<TileVisualType>(tile_type), favicon_base::IconType::kInvalid,
+-      base::Time::FromJavaTime(jdata_generation_time_ms),
+-      /*url_for_rappor=*/GURL()));
+ }
+ 
+ static jlong JNI_MostVisitedSitesBridge_Init(
+diff --git a/components/ntp_tiles/BUILD.gn b/components/ntp_tiles/BUILD.gn
+--- a/components/ntp_tiles/BUILD.gn
+++ b/components/ntp_tiles/BUILD.gn
+@@ -22,8 +22,6 @@ static_library("ntp_tiles") {
+     "icon_cacher.h",
+     "icon_cacher_impl.cc",
+     "icon_cacher_impl.h",
+-    "metrics.cc",
+-    "metrics.h",
+     "most_visited_sites.cc",
+     "most_visited_sites.h",
+     "ntp_tile.cc",
+@@ -79,7 +77,6 @@ source_set("unit_tests") {
+     "custom_links_manager_impl_unittest.cc",
+     "custom_links_store_unittest.cc",
+     "icon_cacher_impl_unittest.cc",
+-    "metrics_unittest.cc",
+     "most_visited_sites_unittest.cc",
+     "popular_sites_impl_unittest.cc",
+   ]
+-- 
+2.17.1
+
@@ -0,0 +1,36 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 25 Apr 2018 10:23:51 +0200
+Subject: Disable metrics on all I/O threads
+
+---
+ chrome/browser/browser_process_impl.cc     | 2 +-
+ chrome/browser/profiles/profile_io_data.cc | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
+--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
+@@ -944,7 +944,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+ #endif  // defined(OS_CHROMEOS)
+ 
+   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
+-                                GoogleUpdateSettings::GetCollectStatsConsent());
+                                false);
+ 
+ #if defined(OS_ANDROID)
+   registry->RegisterBooleanPref(
+diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
+--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
+@@ -45,8 +45,6 @@
+ #include "components/content_settings/core/browser/host_content_settings_map.h"
+ #include "components/cookie_config/cookie_store_util.h"
+ #include "components/dom_distiller/core/url_constants.h"
+-#include "components/metrics/metrics_pref_names.h"
+-#include "components/metrics/metrics_service.h"
+ #include "components/net_log/chrome_net_log.h"
+ #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
+ #include "components/signin/public/base/signin_pref_names.h"
+-- 
+2.17.1
+
@@ -1,38 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 27 Feb 2022 23:58:22 +0100
-Subject: Disable minidump upload scheduling
-
---
- chrome/browser/endpoint_fetcher/endpoint_fetcher.cc          | 2 +-
- .../minidump_uploader/MinidumpUploadJobService.java          | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
--- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
-+++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
-@@ -337,7 +337,7 @@ void EndpointFetcher::OnResponseFetched(
-     auto response = std::make_unique<EndpointResponse>();
-     // TODO(crbug.com/993393) Add more detailed error messaging
-     std::string net_error = net::ErrorToString(simple_url_loader_->NetError());
-    VLOG(1) << __func__ << " with response error: " << net_error;
-+    LOG(ERROR) << __func__ << " with response error: " << net_error;
-     response->response = "There was a response error";
-     simple_url_loader_.reset();
-     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
-@@ -44,7 +44,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
@@ -1,6 +1,7 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Thu, 30 May 2019 03:37:45 +0200
-Subject: Disable offline pages in CCT
+Subject: Disable offline pages in the downloads home to be opened in CCT by
+ default

 ---
 components/offline_pages/core/offline_page_feature.cc | 2 +-
@@ -9,14 +10,15 @@ Subject: Disable offline pages in CCT
 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
-@@ -39,7 +39,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
+@@ -51,7 +51,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
     "OfflinePagesDescriptivePendingStatus", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kOfflinePagesInDownloadHomeOpenInCctFeature{
 -    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kOfflineIndicatorFeature{"OfflineIndicator",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
--
-2.25.1
+ const base::Feature kOfflinePagesCTSuppressNotificationsFeature{
+     "OfflinePagesCTSuppressNotifications", base::FEATURE_DISABLED_BY_DEFAULT};
+-- 
+2.17.1
+
@@ -5,25 +5,13 @@ 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.
 ---
- .../toolbar/chrome_location_bar_model_delegate.cc  |  2 +-
- components/url_formatter/url_formatter.cc          | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ components/url_formatter/url_formatter.cc | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)

-diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-@@ -312,6 +312,6 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
- // static
- void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
-+  registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
-   registry->RegisterBooleanPref(omnibox::kLockIconInAddressBarEnabled, false);
- }
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -492,13 +492,13 @@ bool HasTwoViewSourceSchemes(base::StringPiece spec) {
+@@ -479,13 +479,13 @@ ComponentResult IDNToUnicodeOneComponent(
 }  // namespace
 
 const FormatUrlType kFormatUrlOmitNothing = 0;
@@ -44,5 +32,6 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
 const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
 
 const FormatUrlType kFormatUrlOmitDefaults =
--
-2.25.1
+-- 
+2.17.1
+
@@ -0,0 +1,117 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 15 Dec 2019 22:39:56 +0100
+Subject: Disable password reuse detection on android
+
+---
+ .../android/password_reuse_controller_android.cc     | 12 ++++++++++++
+ .../password_reuse_dialog_view_android.cc            | 11 +++++++++--
+ components/password_manager/core/browser/BUILD.gn    |  6 +++---
+ 3 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
+--- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
+++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
+@@ -17,17 +17,25 @@ PasswordReuseControllerAndroid::PasswordReuseControllerAndroid(
+     ChromePasswordProtectionService* service,
+     ReusedPasswordAccountType password_type,
+     OnWarningDone done_callback)
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+     : service_(service),
+#else
+    :
+#endif
+       url_(web_contents->GetLastCommittedURL()),
+       password_type_(password_type),
+       window_android_(web_contents->GetTopLevelNativeWindow()),
+       done_callback_(std::move(done_callback)) {
+   modal_construction_start_time_ = base::TimeTicks::Now();
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   service_->AddObserver(this);
+#endif
+ }
+ 
+ PasswordReuseControllerAndroid::~PasswordReuseControllerAndroid() {
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   service_->RemoveObserver(this);
+#endif
+   dialog_view_.reset();
+   LogModalWarningDialogLifetime(modal_construction_start_time_);
+ }
+@@ -48,20 +56,24 @@ base::string16 PasswordReuseControllerAndroid::GetButtonText() const {
+   return l10n_util::GetStringUTF16(IDS_CLOSE);
+ }
+ 
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+ base::string16 PasswordReuseControllerAndroid::GetWarningDetailText(
+     std::vector<size_t>* placeholder_offsets) const {
+   return service_->GetWarningDetailText(password_type_, placeholder_offsets);
+ }
+#endif
+ 
+ base::string16 PasswordReuseControllerAndroid::GetTitle() const {
+   return l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY);
+ }
+ 
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+ const std::vector<base::string16>
+ PasswordReuseControllerAndroid::GetPlaceholdersForSavedPasswordWarningText()
+     const {
+   return service_->GetPlaceholdersForSavedPasswordWarningText();
+ }
+#endif
+ 
+ void PasswordReuseControllerAndroid::OnGaiaPasswordChanged() {
+   delete this;
+diff --git a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+--- a/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+++ b/chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.cc
+@@ -29,6 +29,7 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
+   java_object_.Reset(Java_SafeBrowsingPasswordReuseDialogBridge_create(
+       env, window_android->GetJavaObject(), reinterpret_cast<intptr_t>(this)));
+ 
+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)
+   std::vector<size_t> placeholder_offsets;
+   base::string16 warning_detail_text =
+       controller_->GetWarningDetailText(&placeholder_offsets);
+@@ -50,14 +51,20 @@ void PasswordReuseDialogViewAndroid::Show(ui::WindowAndroid* window_android) {
+       base::android::ToJavaIntArray(env, start_ranges, len);
+   base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
+       base::android::ToJavaIntArray(env, end_ranges, len);
+-
+#else
+  int start_ranges[0], end_ranges[0];
+  base::android::ScopedJavaLocalRef<jintArray> j_start_ranges =
+      base::android::ToJavaIntArray(env, start_ranges, 0);
+  base::android::ScopedJavaLocalRef<jintArray> j_end_ranges =
+      base::android::ToJavaIntArray(env, end_ranges, 0);
+   Java_SafeBrowsingPasswordReuseDialogBridge_showDialog(
+       env, java_object_,
+       base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
+-      base::android::ConvertUTF16ToJavaString(env, warning_detail_text),
+      base::android::ConvertUTF16ToJavaString(env, controller_->GetTitle()),
+       base::android::ConvertUTF16ToJavaString(env,
+                                               controller_->GetButtonText()),
+       j_start_ranges, j_end_ranges);
+#endif
+ }
+ 
+ void PasswordReuseDialogViewAndroid::Close(
+diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
+--- a/components/password_manager/core/browser/BUILD.gn
+++ b/components/password_manager/core/browser/BUILD.gn
+@@ -12,9 +12,9 @@ if (is_android) {
+ 
+ # TODO(crbug.com/1006430): Fix password reuse detection not fully functional on
+ # Android.
+-password_reuse_detection_support = !is_ios
+-password_reuse_warning_support = !is_ios
+-password_on_focus_ping_support = !is_ios
+password_reuse_detection_support = !is_ios && !is_android
+password_reuse_warning_support = !is_ios && !is_android
+password_on_focus_ping_support = !is_ios && !is_android
+ 
+ config("password_reuse_detection_config") {
+   defines = []
+-- 
+2.17.1
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carmelo Messina	9662da1da9	apply suggestions	2020-09-06 16:53:29 +02:00
Carmelo Messina	bdf169a864	remove aqs and some other parameters from search urls	2020-09-06 14:10:21 +02:00