Use helper macros to define base::Features

see https://bugs.chromium.org/p/chromium/issues/detail?id=1364289

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-liberapay: csagan5
+patreon: csagan5
 custom: https://www.bromite.org/#donate

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -26,7 +26,7 @@ body:
           required: true
         - label: "I have updated Bromite to the latest version. The bug is reproducible on this latest version."
           required: true
-        - label: "This is a bug report about the Bromite browser; not the website nor F-Droid nor anything else."
+        - label: "This is a bug report about the Bromite browser (not about the website, building Bromite, F-Droid or anything else)."
           required: true
 
   - type: dropdown
@@ -76,6 +76,7 @@ body:
       multiple: false
       description: What version of Android are you running?
       options:
+        - 13
         - 12.1
         - 12.0
         - 11

CHANGELOG.md

@@ -1,3 +1,40 @@
+# 108.0.5359.156
+
+# 108.0.5359.109
+* reintroduce adaptive-button-in-top-toolbar-customization flag
+
+# 108.0.5359.106
+* fix crash when using always incognito (fixes https://github.com/bromite/bromite/issues/2482)
+* enable third-party storage partitioning (fixes https://github.com/bromite/bromite/issues/2337)
+* disable features ExperimentsForAgsa, KeepPrefetchedContentSuggestions, CriticalClientHint, AcceptCHFrame (accidentally enabled but not effective in 108.0.5359.75)
+
+# 108.0.5359.75
+* drop patch to mark all favicons ON_DEMAND (fixed by upstream, see https://bugs.chromium.org/p/chromium/issues/detail?id=1096660)
+* enable AutomaticLazyFrameLoadingToAds and AutomaticLazyFrameLoadingToEmbeds features
+* drop patch for SDK21 to prevent crashes on download
+* fix patch to ignore enterprise policies for secure DNS (fixes https://github.com/bromite/bromite/issues/2463)
+* stop using SM-G960U as model provided via client hints and Javascript (fixes https://github.com/bromite/bromite/issues/2465)
+* temptative fix for OfflinePageModelFactory crash (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2419)
+* fix fingerprinting vector via Window.requestAnimationFrame() (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2370)
+* remove patch for offline measurements background task (fixes https://github.com/bromite/bromite/issues/2468)
+* enable PermuteTLSExtensions (fixes https://github.com/bromite/bromite/issues/2467)
+* hide "turn on enhanced protection" in security interstitials
+
+# 107.0.5304.114
+* fix for drag selection not working with bottom toolbar (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2411)
+* fix for navbar color not matching site color (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2416)
+* clamp time resolution in WebWorkers' requestAnimationFrame (thanks to @uazo)
+* drop patch for AV1 codec support (already in upstream)
+
+# 107.0.5304.96
+* bottom toolbar: fix for white strip at top in tab view (thanks to @uazo, fixes https://github.com/bromite/bromite/issues/2407)
+* reverse tab order from top to bottom when using bottom toolbar (thanks to @uazo)
+* dropped patches already merged upstream (partition DNS requests by top frame NIK, clipboard user gesture requirement removal)
+* disable StartSurface feature
+
+# 106.0.5249.163
+* enable ECH (Encrypted ClientHello) by default
+
 # 106.0.5249.72
 * dropped patches already merged upstream
 

README.md

@@ -1,3 +1,5 @@
+[![Stand With Ukraine](./banner2-direct.svg)](https://stand-with-ukraine.pp.ua/)
+
 # Bromite - Take back your browser
 <a href="https://github.com/bromite/bromite/releases/latest">
   <img src="https://www.bromite.org/release.svg" alt="current Bromite release" title="current Bromite release" /> </a>
@@ -27,7 +29,9 @@ Minimal UI changes are applied to help curbing the idea of "browser as an advert
 
 Please donate to support development of Bromite and the costs for the build system.
 
-[&rarr; Support development with a donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2): [![paypal](https://www.bromite.org/assets/img/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JP3XTQPVRNET2)
+## &rarr; Support development with a donation
+
+Patreon: https://www.patreon.com/csagan5
 
 <a href="bitcoin:bc1qlx7h0lj9z88g2xfeuwsrtfs77sxuhrxf2t28sw">BTC donations address</a>: `bc1qlx7h0lj9z88g2xfeuwsrtfs77sxuhrxf2t28sw`
 
@@ -153,6 +157,8 @@ New flags:
 * `#certificate-transparency-enabled`, enabled by default; see https://chromium.googlesource.com/chromium/src/+/master/net/docs/certificate-transparency.md
 * `#move-top-toolbar-to-bottom`, disabled by default
 * `#site-engagement`, enabled by default
+* `#offline-pages-auto-save`, disabled by default, allows auto-saving of pages when device goes offline
+* `#adaptive-button-in-top-toolbar-customization`, disabled by default, allows having a new tab or share button on the address bar
 
 ### Site settings
 
@@ -210,6 +216,8 @@ The Chromium version tag used as base for the patches is available here: [RELEAS
 The GN args used to build Bromite are available here: [bromite.gn_args](./build/bromite.gn_args).
 The patches are to be applied second the order specified in the `bromite_patches_list.txt` file (you can use `git am`).
 
+NOTE: no official support is provided for builds.
+
 ## How to build the filters
 
 See upstream documentation: https://github.com/chromium/chromium/blob/master/components/subresource_filter/FILTER_LIST_GENERATION.md

banner2-direct.svg

@@ -0,0 +1,64 @@
+<svg viewBox="0 0 1040 200" xmlns="http://www.w3.org/2000/svg">
+  <style>
+@namespace svg url(http://www.w3.org/2000/svg);
+
+svg {
+  font-family: Helvetica, Arial, sans-serif;
+  text-rendering: geometricPrecision;
+}
+svg|a:link, svg|a:visited {
+  cursor: pointer;
+}
+.flag-blue {
+  fill: #0057b7;
+}
+.flag-yellow {
+  fill: #ffd700;
+}
+.message {
+  fill: white;
+  font-size: 20px;
+}
+.call {
+  fill: black;
+  font-size: 32px;
+}
+.mobile-only {
+  display: none;
+}
+.arrow {
+  font-size: 24px;
+}
+@media (max-width: 770px) {
+  .message {
+    display: none;
+    font-size: 29px;
+  }
+  .mobile-only {
+    display: inherit;
+  }
+  .call {
+    font-size: 36px;
+  }
+}
+  </style>
+
+  <a href="https://stand-with-ukraine.pp.ua">
+    <rect x="0" y="0" width="100%" height="100%" class="flag-yellow"/>
+    <rect x="0" y="0" width="100%" height="110px" class="flag-blue"/>
+
+    <text x="0" y="25" class="message">
+      <tspan x="25" dy="1.15em">Russia has invaded Ukraine and already killed tens of thousands of civilians, with many more raped or tortured.</tspan>
+      <tspan x="25" dy="1.35em">The death toll keeps climbing. It's a <tspan font-weight="bold">genocide</tspan>. We need your help. Let's fight back against the Russian regime.</tspan>
+    </text>
+    <text x="0" y="25" class="message mobile-only">
+      <tspan x="25" dy=".7em">Russia has invaded Ukraine and already killed tens of thousands of civilians,</tspan>
+      <tspan x="25" dy="1.2em">with many more raped or tortured. It's a <tspan font-weight="bold">genocide</tspan>. We need your help.</tspan>
+    </text>
+
+    <text x="50%" y="78.5%" dominant-baseline="middle" text-anchor="middle" class="call">
+      Help Ukraine Now <tspan dominant-baseline="middle" class="arrow">➔</tspan>
+    </text>
+  </a>
+
+</svg>

build/LASTCHANGE

@@ -1 +1 @@
-25d529f97d15fcc222fcc6ebf047045fdc3c844c-
+56775bdf8d12f9d3e1a99fcf1dde6a7417522963-

build/RELEASE

@@ -1 +1 @@
-106.0.5249.72
+108.0.5359.156

build/RELEASE_COMMIT

@@ -1 +1 @@
-49e8f8fad2cf71c2fde1d1a9ecf68d04e4a6263b
+1b133d62395a6ad11c65997a1c24acffb3f73d9e

build/bromite.gn_args

@@ -43,5 +43,6 @@ use_errorprone_java_compiler=false
 use_gnome_keyring=false
 use_official_google_api_keys=false
 use_rtti=false
+use_stable_package_name_for_trichrome=false
 use_sysroot=false
 webview_includes_weblayer=false

build/bromite_patches_list.txt

@@ -3,8 +3,26 @@ 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
-Fix-segmentation-platform-build-error.patch
-AV1-codec-support.patch
+Disable-safe-browsing.patch
+Remove-signin-and-sync-integrations.patch
+Move-some-account-settings-back-to-privacy-settings.patch
+Remove-contextual-search-manager.patch
+kill-Vision.patch
+kill-Location-fall-back-to-system.patch
+kill-Auth.patch
+Remove-binary-blob-integrations.patch
+Remove-SMS-integration.patch
+Remove-price-shopping-commerce-integrations.patch
+Remove-voice-recognition-integration.patch
+Do-not-compile-QR-code-sharing.patch
+Timezone-customization.patch
+Revert-the-removal-of-an-option-to-block-autoplay.patch
+Add-support-for-ISupportHelpAndFeedback.patch
+JIT-site-settings.patch
+Site-setting-for-images.patch
+Content-settings-infrastructure.patch
+Add-webGL-site-setting.patch
+Add-webRTC-site-settings.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 Bromite-package-name.patch
@@ -29,9 +47,7 @@ ungoogled-chromium-Disable-intranet-detector.patch
 ungoogled-chromium-no-special-hosts-domains.patch
 ungoogled-chromium-Disable-Gaia.patch
 ungoogled-chromium-Disable-Network-Time-Tracker.patch
-Disable-safe-browsing.patch
 Disable-all-promo-dialogs.patch
-Remove-signin-and-sync-integrations.patch
 Disable-update-scheduler.patch
 Add-English-only-search-engine.patch
 Add-DuckDuckGo-Lite-search-engine.patch
@@ -53,8 +69,6 @@ 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
@@ -69,14 +83,6 @@ autofill-miscellaneous.patch
 Enable-native-Android-autofill.patch
 first_run-deactivate-autoupdate-globally.patch
 translate-disable-fetching-of-languages-from-server.patch
-kill-Vision.patch
-kill-Location-fall-back-to-system.patch
-kill-Auth.patch
-Remove-binary-blob-integrations.patch
-Remove-SMS-integration.patch
-Remove-price-shopping-commerce-integrations.patch
-Remove-voice-recognition-integration.patch
-Do-not-compile-QR-code-sharing.patch
 Offer-builtin-autocomplete-for-chrome-flags.patch
 Use-4-tile-rows-never-show-logo.patch
 Disable-various-metrics.patch
@@ -88,7 +94,8 @@ Disable-offline-pages-in-CCT.patch
 Disable-media-router-and-remoting-by-default.patch
 Restore-Search-Ready-Omnibox-flag.patch
 disable-AdsBlockedInfoBar.patch
-Bromite-AdBlockUpdaterService.patch
+Bromite-subresource-adblocker.patch
+Bromite-auto-updater.patch
 Replace-DoH-probe-domain-with-RIPE-domain.patch
 Increase-number-of-autocomplete-matches-to-10.patch
 Disable-requests-for-single-word-Omnibar-searches.patch
@@ -101,7 +108,7 @@ Disable-feeds-support-by-default.patch
 Show-site-settings-for-cookies-javascript-and-ads.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
-Enable-user-agent-freeze-by-default.patch
+Guard-for-user-agent-reduction.patch
 AImageReader-CFI-crash-mitigations.patch
 Add-menu-item-to-view-source.patch
 Revert-removal-of-execution-context-address-space.patch
@@ -114,10 +121,8 @@ 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
 Enable-network-isolation-features.patch
@@ -125,32 +130,24 @@ 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
+Re-introduce-modal-dialog-flag-to-close-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
 Revert-Delete-block-external-form-redirects.patch
-Enable-IntentBlockExternalFormRedirectsNoGesture.patch
 Add-flag-to-disable-external-intent-requests.patch
+Enable-share-intent.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
@@ -177,14 +174,10 @@ 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-Certificate-Transparency.patch
 Invalidate-components-public-key.patch
 Improve-plain-text-rendering-on-mobile.patch
@@ -195,13 +188,17 @@ Remove-preload-of-com.google.android.gms.fonts.patch
 Partition-Blink-memory-cache.patch
 Remove-navigator.connection-info.patch
 Disable-PrivacyGuide.patch
-Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
 sharing-hub-always-use-visible-URL.patch
 Re-introduce-kWebAuthCable.patch
-Revert-clipboard-user-gesture-requirement-removal.patch
 Enable-HEVC-by-default.patch
 Partition-blobs-by-top-frame-URL.patch
 Override-Navigator-Language.patch
 Disable-add-to-home-screen-prompt.patch
 Remove-HTTP-referrals-in-cross-origin-navigation.patch
+Enable-ECH-by-default.patch
+Disable-StartSurface-feature.patch
+Clamp-time-resolution-in-requestAnimationFrame.patch
+Enable-PermuteTLSExtensions-by-default.patch
+Enable-third-party-storage-partitioning.patch
+Restore-adaptive-button-in-top-toolbar-customization.patch
 Automated-domain-substitution.patch

build/chromium.gn_args

@@ -43,5 +43,6 @@ use_errorprone_java_compiler=false
 use_gnome_keyring=false
 use_official_google_api_keys=false
 use_rtti=false
+use_stable_package_name_for_trichrome=false
 use_sysroot=false
 webview_includes_weblayer=false

build/chromium_patches_list.txt

@@ -1,4 +1,3 @@
-AV1-codec-support.patch
 exit-on-failure-of-inclusion.patch
 Reintroduce-override_build_timestamp.patch
 do-not-hide-.orig-files.patch
@@ -9,4 +8,3 @@ Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
 enable-ftrivial-auto-var-init-zero.patch
 Disable-feeds-support-by-default.patch
 Chromium-package-name.patch
-Fix-segmentation-platform-build-error.patch

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -30,9 +30,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  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.cc                |  5 +++++
  media/base/media_switches.h                 |  1 +
- 12 files changed, 65 insertions(+), 5 deletions(-)
+ 12 files changed, 66 insertions(+), 5 deletions(-)
 
 diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
 --- a/base/android/android_image_reader_compat.cc
@@ -84,8 +84,8 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 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
-@@ -2367,9 +2367,9 @@
-     "expiry_milestone": 106
+@@ -2501,9 +2501,9 @@
+     "expiry_milestone": 115
    },
    {
 -    "name": "enable-image-reader",
@@ -126,9 +126,9 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 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
-@@ -63,6 +63,11 @@ const base::Feature kUseGles2ForOopR {
+@@ -64,6 +64,11 @@ BASE_FEATURE(kUseGles2ForOopR,
  #endif
- };
+ );
  
 +
 +// Use android AImageReader when playing videos with MediaPlayer.
@@ -142,17 +142,17 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 --- a/gpu/config/gpu_finch_features.h
 +++ b/gpu/config/gpu_finch_features.h
 @@ -17,6 +17,7 @@ namespace features {
- GPU_EXPORT extern const base::Feature kUseGles2ForOopR;
+ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
  
  // All features in alphabetical order. The features should be documented
 +GPU_EXPORT extern const base::Feature kAImageReaderMediaPlayer;
  // alongside the definition of their values in the .cc file.
  #if BUILDFLAG(IS_ANDROID)
- GPU_EXPORT extern const base::Feature kAndroidSurfaceControl;
+ GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -122,6 +122,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -121,6 +121,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !BUILDFLAG(IS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -162,7 +162,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -345,6 +348,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
+@@ -344,6 +347,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info) {
      gpu_feature_info->status_values[GPU_FEATURE_TYPE_CANVAS_OOP_RASTERIZATION] =
          kGpuFeatureStatusBlocklisted;
    }
@@ -177,18 +177,18 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 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
-@@ -16,6 +16,7 @@ decode_encode_srgb_for_generatemipmap
+@@ -15,6 +15,7 @@ decode_encode_srgb_for_generatemipmap
  depth_stencil_renderbuffer_resize_emulation
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
 +disable_aimagereader
+ disable_accelerated_av1_encode
  disable_accelerated_h264_encode
  disable_accelerated_hevc_decode
- 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
-@@ -624,6 +624,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -626,6 +626,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  
@@ -231,27 +231,28 @@ diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_
 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
-@@ -754,6 +754,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};
+@@ -750,6 +750,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,
+ // Allows automatically disabling hardware secure Content Decryption Module
+ // (CDM) after failures or crashes to fallback to software secure CDMs. If this
+ // feature is disabled, the fallback will never happen and users could be stuck
 +// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
-+const base::Feature kAImageReaderVideoOutput{"AImageReaderVideoOutput",
-+                                             base::FEATURE_ENABLED_BY_DEFAULT};
++BASE_FEATURE(kAImageReaderVideoOutput,
++             "AImageReaderVideoOutput",
++             base::FEATURE_ENABLED_BY_DEFAULT);
 +
- 
- // Enable picture in picture web api for android.
- const base::Feature kPictureInPictureAPI{"PictureInPictureAPI",
+ // in playback failures.
+ BASE_FEATURE(kHardwareSecureDecryptionFallback,
+              "HardwareSecureDecryptionFallback",
 diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -233,6 +233,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;
+@@ -232,6 +232,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp8TemporalLayerHWEncoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVp9kSVCHWEncoding);
+ #endif  // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_CHROMEOS)
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);
++MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVp9kSVCHWDecoding);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kWakeLockOptimisationHiddenMuted);
+ MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebContentsCaptureHiDpi);
 --
 2.25.1

build/patches/API-level-21-prevent-crash-on-download.patch

@@ -1,47 +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
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../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

build/patches/AV1-codec-support.patch

@@ -1,60 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Sun, 16 Dec 2018 15:24:19 +0100
-Subject: AV1 codec support
-
-libaom build fixes (requires -fPIC)
-Report AV1 as playable on Android
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- third_party/libaom/BUILD.gn        | 6 ++++--
- third_party/libaom/libaom_srcs.gni | 5 +++++
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-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
-     }
--    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" ]
-     }
-     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" ]
-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
-@@ -666,6 +666,11 @@ aom_rc_interface_sources = [
-   "//third_party/libaom/source/libaom/test/yuv_video_source.h",
- ]
- 
-+aom_ports_arm_sources = [
-+  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",
-+  "//third_party/libaom/source/libaom/aom_ports/arm.h",
-+ ]
-+
- aom_rtcd_sources = [
-   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c",
-   "//third_party/libaom/source/libaom/aom_scale/aom_scale_rtcd.c",
---
-2.25.1

build/patches/Add-AllowUserCertificates-flag.patch

@@ -5,22 +5,22 @@ Subject: Add AllowUserCertificates flag
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 3 +++
- .../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    | 3 +++
- net/android/java/src/org/chromium/net/X509Util.java         | 5 +++++
- 10 files changed, 31 insertions(+), 1 deletion(-)
+ .../src/org/chromium/chrome/browser/app/ChromeActivity.java  | 3 +++
+ .../chromium/chrome/browser/app/flags/ChromeCachedFlags.java | 1 +
+ chrome/browser/about_flags.cc                                | 4 ++++
+ chrome/browser/flag_descriptions.cc                          | 5 +++++
+ chrome/browser/flag_descriptions.h                           | 3 +++
+ chrome/browser/flags/android/chrome_feature_list.cc          | 5 +++++
+ chrome/browser/flags/android/chrome_feature_list.h           | 1 +
+ .../chromium/chrome/browser/flags/CachedFeatureFlags.java    | 1 +
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 3 +++
+ net/android/java/src/org/chromium/net/X509Util.java          | 5 +++++
+ 10 files changed, 31 insertions(+)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -226,6 +226,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -945,6 +946,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -951,6 +952,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
          UpdateMenuItemHelper.getInstance().onStart();
          ChromeActivitySessionTracker.getInstance().onStartWithNative();
          ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
-@@ -77,6 +77,7 @@ public class ChromeCachedFlags {
+@@ -78,6 +78,7 @@ public class ChromeCachedFlags {
                  add(ChromeFeatureList.sAndroidAuxiliarySearch);
                  add(ChromeFeatureList.sAnonymousUpdateChecks);
                  add(ChromeFeatureList.sAppMenuMobileSiteOption);
@@ -51,19 +51,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom
 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
-@@ -3466,7 +3466,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
+@@ -8830,6 +8830,10 @@ const FeatureEntry kFeatureEntries[] = {
+      FEATURE_VALUE_TYPE(features::kWin10TabSearchCaptionButton)},
+ #endif  // BUILDFLAG(IS_WIN)
+ 
 +    {"allow-user-certificates",
 +     flag_descriptions::kAllowUserCertificatesName,
 +     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,
 +     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},
-     {"osk-resizes-visual-viewport",
-      flag_descriptions::kEnableOskResizesVisualViewportName,
-      flag_descriptions::kEnableOskResizesVisualViewportDescription, kOsAndroid,
+     {"omnibox-updated-connection-security-indicators",
+      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,
+      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsDescription,
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
@@ -103,27 +101,28 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
      &feed::kInterestFeedV2,
      &feed::kInterestFeedV2Autoplay,
-@@ -440,6 +441,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
-     "AdaptiveButtonInTopToolbarCustomizationV2",
-     base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -468,6 +469,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
+              "AllowNewIncognitoTabIntents",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
-+const base::Feature kAllowUserCertificates = {
-+    "AllowUserCertificates", base::FEATURE_DISABLED_BY_DEFAULT};
++BASE_FEATURE(kAllowUserCertificates,
++             "AllowUserCertificates",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
- const base::Feature kAddToHomescreenIPH{"AddToHomescreenIPH",
-                                         base::FEATURE_ENABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents,
+              "FocusOmniboxInIncognitoTabIntents",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -12,6 +12,7 @@
- namespace chrome {
- namespace android {
- 
-+extern const base::Feature kAllowUserCertificates;
- // Alphabetical:
- extern const base::Feature kAdaptiveButtonInTopToolbar;
- extern const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2;
+@@ -17,6 +17,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);
+ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);
+ BASE_DECLARE_FEATURE(kAddToHomescreenIPH);
+ BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);
++BASE_DECLARE_FEATURE(kAllowUserCertificates);
+ BASE_DECLARE_FEATURE(kAndroidScrollOptimizations);
+ BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);
+ BASE_DECLARE_FEATURE(kAssistantConsentModal);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -146,7 +145,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ABOUT_THIS_SITE_BANNER = "AboutThisSiteBanner";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
-@@ -612,6 +613,8 @@ public abstract class ChromeFeatureList {
+@@ -648,6 +649,8 @@ public abstract class ChromeFeatureList {
      public static final String FEED_REPLACE_ALL = "FeedReplaceAll";
  
      /* Alphabetical: */

build/patches/Add-DuckDuckGo-Lite-search-engine.patch

@@ -43,7 +43,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -41,7 +41,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_AE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -52,7 +52,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+@@ -51,7 +51,7 @@ const PrepopulatedEngine* const engines_AL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -61,7 +61,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -59,7 +59,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -60,7 +60,7 @@ const PrepopulatedEngine* const engines_AR[] = {
      &googleen, &google,
      &bing,
      &yahoo_ar,
@@ -70,7 +70,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -67,7 +67,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -68,7 +68,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  const PrepopulatedEngine* const engines_AT[] = {
      &googleen, &google,
      &bing,
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_at,
      &ecosia,
  };
-@@ -77,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -78,7 +78,7 @@ const PrepopulatedEngine* const engines_AU[] = {
      &googleen, &google,
      &bing,
      &yahoo_au,
@@ -88,7 +88,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -86,7 +86,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -87,7 +87,7 @@ const PrepopulatedEngine* const engines_BA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -97,7 +97,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -96,7 +96,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -106,7 +106,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Bulgaria
-@@ -104,7 +104,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -115,7 +115,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -124,7 +124,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -123,7 +123,7 @@ const PrepopulatedEngine* const engines_BI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -133,7 +133,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -131,7 +131,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -132,7 +132,7 @@ const PrepopulatedEngine* const engines_BN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -142,7 +142,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -140,7 +140,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -141,7 +141,7 @@ const PrepopulatedEngine* const engines_BO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -151,7 +151,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -149,7 +149,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -150,7 +150,7 @@ const PrepopulatedEngine* const engines_BR[] = {
      &googleen, &google,
      &bing,
      &yahoo_br,
@@ -160,7 +160,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -159,7 +159,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -160,7 +160,7 @@ const PrepopulatedEngine* const engines_BY[] = {
      &yandex_by,
      &mail_ru,
      &bing,
@@ -169,7 +169,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Belize
-@@ -167,7 +167,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+@@ -168,7 +168,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -178,7 +178,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -176,7 +176,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CA[] = {
      &googleen, &google,
      &bing,
      &yahoo_ca,
@@ -187,7 +187,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -184,7 +184,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -185,7 +185,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  const PrepopulatedEngine* const engines_CH[] = {
      &googleen, &google,
      &bing,
@@ -196,7 +196,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
      &yahoo_ch,
  };
-@@ -194,7 +194,7 @@ const PrepopulatedEngine* const engines_CL[] = {
+@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CL[] = {
      &googleen, &google,
      &bing,
      &yahoo_cl,
@@ -205,7 +205,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -213,7 +213,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CO[] = {
      &bing,
      &yahoo_co,
      &ecosia,
@@ -214,7 +214,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Costa Rica
-@@ -221,7 +221,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_CR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -223,7 +223,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -231,7 +231,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -232,7 +232,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
      &seznam_cz,
      &bing,
      &yahoo,
@@ -232,7 +232,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Germany
-@@ -239,7 +239,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -240,7 +240,7 @@ const PrepopulatedEngine* const engines_DE[] = {
      &googleen, &google,
      &bing,
      &ecosia,
@@ -241,7 +241,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_de,
  };
  
-@@ -248,7 +248,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -249,7 +249,7 @@ const PrepopulatedEngine* const engines_DK[] = {
      &googleen, &google,
      &bing,
      &yahoo_dk,
@@ -250,7 +250,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -257,7 +257,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -258,7 +258,7 @@ const PrepopulatedEngine* const engines_DO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -259,7 +259,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -268,7 +268,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -268,7 +268,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Ecuador
-@@ -276,7 +276,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+@@ -277,7 +277,7 @@ const PrepopulatedEngine* const engines_EC[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -277,7 +277,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Estonia
-@@ -284,7 +284,7 @@ const PrepopulatedEngine* const engines_EE[] = {
+@@ -285,7 +285,7 @@ const PrepopulatedEngine* const engines_EE[] = {
      &googleen, &google,
      &bing,
      &yandex_ru,
@@ -286,7 +286,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -295,7 +295,7 @@ const PrepopulatedEngine* const engines_EG[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -295,7 +295,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Spain
-@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -303,7 +303,7 @@ const PrepopulatedEngine* const engines_ES[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -304,7 +304,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -311,7 +311,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -312,7 +312,7 @@ const PrepopulatedEngine* const engines_FI[] = {
      &googleen, &google,
      &bing,
      &yahoo_fi,
@@ -313,7 +313,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -320,7 +320,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+@@ -321,7 +321,7 @@ const PrepopulatedEngine* const engines_FO[] = {
      &googleen, &google,
      &bing,
      &yahoo_dk,
@@ -322,7 +322,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -338,7 +338,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_GB[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -331,7 +331,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -348,7 +348,7 @@ const PrepopulatedEngine* const engines_GR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -340,7 +340,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -356,7 +356,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -357,7 +357,7 @@ const PrepopulatedEngine* const engines_GT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -349,7 +349,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -367,7 +367,7 @@ const PrepopulatedEngine* const engines_HK[] = {
      &yahoo_hk,
      &bing,
      &baidu,
@@ -358,7 +358,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Honduras
-@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -375,7 +375,7 @@ const PrepopulatedEngine* const engines_HN[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -367,7 +367,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -383,7 +383,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+@@ -384,7 +384,7 @@ const PrepopulatedEngine* const engines_HR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -376,7 +376,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -392,7 +392,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -393,7 +393,7 @@ const PrepopulatedEngine* const engines_HU[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -385,7 +385,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -402,7 +402,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -403,7 +403,7 @@ const PrepopulatedEngine* const engines_ID[] = {
      &yahoo_id,
      &bing,
      &yandex_com,
@@ -394,7 +394,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Ireland
-@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -411,7 +411,7 @@ const PrepopulatedEngine* const engines_IE[] = {
      &googleen, &google,
      &bing,
      &yahoo_uk,
@@ -403,7 +403,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -420,7 +420,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IL[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -412,7 +412,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // India
-@@ -428,7 +428,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_IN[] = {
      &googleen, &google,
      &bing,
      &yahoo_in,
@@ -421,7 +421,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &info_com,
  };
  
-@@ -438,7 +438,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -439,7 +439,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
      &bing,
      &yahoo,
      &yandex_tr,
@@ -430,7 +430,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Iran
-@@ -447,14 +447,14 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -448,14 +448,14 @@ const PrepopulatedEngine* const engines_IR[] = {
      &bing,
      &yahoo,
      &ask,
@@ -447,7 +447,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -464,7 +464,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -465,7 +465,7 @@ const PrepopulatedEngine* const engines_IT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -456,7 +456,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -473,7 +473,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_JM[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -465,7 +465,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -483,7 +483,7 @@ const PrepopulatedEngine* const engines_JO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -474,7 +474,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -491,7 +491,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -492,7 +492,7 @@ const PrepopulatedEngine* const engines_JP[] = {
      &googleen, &google,
      &yahoo_jp,
      &bing,
@@ -483,7 +483,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -500,7 +500,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -501,7 +501,7 @@ const PrepopulatedEngine* const engines_KE[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -492,7 +492,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -518,7 +518,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_KW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -501,7 +501,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -528,7 +528,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -529,7 +529,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
      &yandex_kz,
      &mail_ru,
      &bing,
@@ -510,7 +510,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Lebanon
-@@ -536,7 +536,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -537,7 +537,7 @@ const PrepopulatedEngine* const engines_LB[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -519,7 +519,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -544,7 +544,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -545,7 +545,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  const PrepopulatedEngine* const engines_LI[] = {
      &googleen, &google,
      &bing,
@@ -528,7 +528,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -555,7 +555,7 @@ const PrepopulatedEngine* const engines_LT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -537,7 +537,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -563,7 +563,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  const PrepopulatedEngine* const engines_LU[] = {
      &googleen, &google,
      &bing,
@@ -546,7 +546,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &ecosia,
  };
-@@ -573,7 +573,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -574,7 +574,7 @@ const PrepopulatedEngine* const engines_LV[] = {
      &bing,
      &yandex_ru,
      &yahoo,
@@ -555,7 +555,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Libya
-@@ -582,7 +582,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_LY[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -564,7 +564,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Morocco
-@@ -591,14 +591,14 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -592,14 +592,14 @@ const PrepopulatedEngine* const engines_MA[] = {
      &bing,
      &yahoo_fr,
      &yandex_com,
@@ -581,7 +581,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_fr,
      &ecosia,
  };
-@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -619,7 +619,7 @@ const PrepopulatedEngine* const engines_ME[] = {
      &bing,
      &yahoo,
      &yandex_ru,
@@ -590,7 +590,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Macedonia
-@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -627,7 +627,7 @@ const PrepopulatedEngine* const engines_MK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -599,7 +599,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -635,7 +635,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -636,7 +636,7 @@ const PrepopulatedEngine* const engines_MX[] = {
      &googleen, &google,
      &bing,
      &yahoo_mx,
@@ -608,7 +608,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -644,7 +644,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -645,7 +645,7 @@ const PrepopulatedEngine* const engines_MY[] = {
      &googleen, &google,
      &bing,
      &yahoo_my,
@@ -617,7 +617,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -653,7 +653,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -654,7 +654,7 @@ const PrepopulatedEngine* const engines_NI[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -626,7 +626,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -662,7 +662,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -663,7 +663,7 @@ const PrepopulatedEngine* const engines_NL[] = {
      &googleen, &google,
      &bing,
      &yahoo_nl,
@@ -635,7 +635,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -671,7 +671,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_NO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -644,7 +644,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -681,7 +681,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
      &googleen, &google,
      &bing,
      &yahoo_nz,
@@ -653,7 +653,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -689,7 +689,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_OM[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -662,7 +662,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &petal_search,
  };
  
-@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -699,7 +699,7 @@ const PrepopulatedEngine* const engines_PA[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -671,7 +671,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -708,7 +708,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -709,7 +709,7 @@ const PrepopulatedEngine* const engines_PE[] = {
      &bing,
      &yahoo_pe,
      &ecosia,
@@ -680,7 +680,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Philippines
-@@ -717,7 +717,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -718,7 +718,7 @@ const PrepopulatedEngine* const engines_PH[] = {
      &bing,
      &yahoo,
      &ecosia,
@@ -689,7 +689,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Pakistan
-@@ -725,7 +725,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -726,7 +726,7 @@ const PrepopulatedEngine* const engines_PK[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -698,7 +698,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -734,7 +734,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -735,7 +735,7 @@ const PrepopulatedEngine* const engines_PL[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -707,7 +707,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -743,7 +743,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_PR[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -716,7 +716,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -753,7 +753,7 @@ const PrepopulatedEngine* const engines_PT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -725,7 +725,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -761,7 +761,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_PY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -734,7 +734,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -771,7 +771,7 @@ const PrepopulatedEngine* const engines_QA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -743,7 +743,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -779,7 +779,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -780,7 +780,7 @@ const PrepopulatedEngine* const engines_RO[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -752,7 +752,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
  };
  
-@@ -788,7 +788,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -789,7 +789,7 @@ const PrepopulatedEngine* const engines_RS[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -761,7 +761,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
  };
  
-@@ -798,7 +798,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -799,7 +799,7 @@ const PrepopulatedEngine* const engines_RU[] = {
      &yandex_ru,
      &mail_ru,
      &bing,
@@ -770,7 +770,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Rwanda
-@@ -806,7 +806,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -807,7 +807,7 @@ const PrepopulatedEngine* const engines_RW[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -779,7 +779,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -816,7 +816,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -817,7 +817,7 @@ const PrepopulatedEngine* const engines_SA[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -788,7 +788,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Sweden
-@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -825,7 +825,7 @@ const PrepopulatedEngine* const engines_SE[] = {
      &googleen, &google,
      &bing,
      &yahoo_se,
@@ -797,7 +797,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -833,7 +833,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_SG[] = {
      &googleen, &google,
      &bing,
      &yahoo_sg,
@@ -806,7 +806,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -841,7 +841,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  const PrepopulatedEngine* const engines_SI[] = {
      &googleen, &google,
      &bing,
@@ -815,7 +815,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_com,
  };
-@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -851,7 +851,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  const PrepopulatedEngine* const engines_SK[] = {
      &googleen, &google,
      &bing,
@@ -824,7 +824,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
      &yandex_com,
  };
-@@ -860,7 +860,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -861,7 +861,7 @@ const PrepopulatedEngine* const engines_SV[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -833,7 +833,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -870,7 +870,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -871,7 +871,7 @@ const PrepopulatedEngine* const engines_SY[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -842,7 +842,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Thailand
-@@ -887,7 +887,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_TN[] = {
      &googleen, &google,
      &bing,
      &yahoo_fr,
@@ -851,7 +851,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_com,
  };
  
-@@ -897,7 +897,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -898,7 +898,7 @@ const PrepopulatedEngine* const engines_TR[] = {
      &yandex_tr,
      &yahoo_tr,
      &bing,
@@ -860,7 +860,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Trinidad and Tobago
-@@ -905,7 +905,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -906,7 +906,7 @@ const PrepopulatedEngine* const engines_TT[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -869,7 +869,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -915,7 +915,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -916,7 +916,7 @@ const PrepopulatedEngine* const engines_TW[] = {
      &yahoo_tw,
      &bing,
      &baidu,
@@ -878,7 +878,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // Tanzania
-@@ -923,7 +923,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -924,7 +924,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -887,7 +887,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &baidu,
  };
  
-@@ -932,7 +932,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -933,7 +933,7 @@ const PrepopulatedEngine* const engines_UA[] = {
      &googleen, &google,
      &yandex_ua,
      &bing,
@@ -896,7 +896,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo,
  };
  
-@@ -941,7 +941,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -942,7 +942,7 @@ const PrepopulatedEngine* const engines_US[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -905,7 +905,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -950,7 +950,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -951,7 +951,7 @@ const PrepopulatedEngine* const engines_UY[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -914,7 +914,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -959,7 +959,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -960,7 +960,7 @@ const PrepopulatedEngine* const engines_VE[] = {
      &googleen, &google,
      &bing,
      &yahoo_es,
@@ -923,7 +923,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -978,7 +978,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -979,7 +979,7 @@ const PrepopulatedEngine* const engines_YE[] = {
      &bing,
      &yahoo,
      &yandex_com,
@@ -932,7 +932,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  };
  
  // South Africa
-@@ -986,7 +986,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -987,7 +987,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
      &googleen, &google,
      &bing,
      &yahoo,
@@ -941,7 +941,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &ecosia,
  };
  
-@@ -995,7 +995,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
+@@ -996,7 +996,7 @@ const PrepopulatedEngine* const engines_ZW[] = {
      &googleen, &google,
      &bing,
      &yahoo,

build/patches/Add-English-only-search-engine.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
-@@ -135,6 +135,27 @@
+@@ -137,6 +137,27 @@
        "id": 1
      },
  
@@ -57,7 +57,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -28,7 +28,7 @@ namespace {
+@@ -29,7 +29,7 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {
@@ -66,7 +66,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
  };
-@@ -38,7 +38,7 @@ const PrepopulatedEngine* const engines_default[] = {
+@@ -39,7 +39,7 @@ const PrepopulatedEngine* const engines_default[] = {
  // clang-format off
  // United Arab Emirates
  const PrepopulatedEngine* const engines_AE[] = {
@@ -75,7 +75,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -47,7 +47,7 @@ const PrepopulatedEngine* const engines_AE[] = {
+@@ -48,7 +48,7 @@ const PrepopulatedEngine* const engines_AE[] = {
  
  // Albania
  const PrepopulatedEngine* const engines_AL[] = {
@@ -84,7 +84,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -56,7 +56,7 @@ const PrepopulatedEngine* const engines_AL[] = {
+@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = {
  
  // Argentina
  const PrepopulatedEngine* const engines_AR[] = {
@@ -93,7 +93,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ar,
      &duckduckgo,
-@@ -65,7 +65,7 @@ const PrepopulatedEngine* const engines_AR[] = {
+@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = {
  
  // Austria
  const PrepopulatedEngine* const engines_AT[] = {
@@ -102,7 +102,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_at,
-@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = {
+@@ -75,7 +75,7 @@ const PrepopulatedEngine* const engines_AT[] = {
  
  // Australia
  const PrepopulatedEngine* const engines_AU[] = {
@@ -111,7 +111,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_au,
      &duckduckgo,
-@@ -83,7 +83,7 @@ const PrepopulatedEngine* const engines_AU[] = {
+@@ -84,7 +84,7 @@ const PrepopulatedEngine* const engines_AU[] = {
  
  // Bosnia and Herzegovina
  const PrepopulatedEngine* const engines_BA[] = {
@@ -120,7 +120,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -92,7 +92,7 @@ const PrepopulatedEngine* const engines_BA[] = {
+@@ -93,7 +93,7 @@ const PrepopulatedEngine* const engines_BA[] = {
  
  // Belgium
  const PrepopulatedEngine* const engines_BE[] = {
@@ -129,7 +129,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -101,7 +101,7 @@ const PrepopulatedEngine* const engines_BE[] = {
+@@ -102,7 +102,7 @@ const PrepopulatedEngine* const engines_BE[] = {
  
  // Bulgaria
  const PrepopulatedEngine* const engines_BG[] = {
@@ -138,7 +138,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -110,7 +110,7 @@ const PrepopulatedEngine* const engines_BG[] = {
+@@ -111,7 +111,7 @@ const PrepopulatedEngine* const engines_BG[] = {
  
  // Bahrain
  const PrepopulatedEngine* const engines_BH[] = {
@@ -147,7 +147,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -119,7 +119,7 @@ const PrepopulatedEngine* const engines_BH[] = {
+@@ -120,7 +120,7 @@ const PrepopulatedEngine* const engines_BH[] = {
  
  // Burundi
  const PrepopulatedEngine* const engines_BI[] = {
@@ -156,7 +156,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -128,7 +128,7 @@ const PrepopulatedEngine* const engines_BI[] = {
+@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BI[] = {
  
  // Brunei
  const PrepopulatedEngine* const engines_BN[] = {
@@ -165,7 +165,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -137,7 +137,7 @@ const PrepopulatedEngine* const engines_BN[] = {
+@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BN[] = {
  
  // Bolivia
  const PrepopulatedEngine* const engines_BO[] = {
@@ -174,7 +174,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BO[] = {
+@@ -147,7 +147,7 @@ const PrepopulatedEngine* const engines_BO[] = {
  
  // Brazil
  const PrepopulatedEngine* const engines_BR[] = {
@@ -183,7 +183,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_br,
      &duckduckgo,
-@@ -155,7 +155,7 @@ const PrepopulatedEngine* const engines_BR[] = {
+@@ -156,7 +156,7 @@ const PrepopulatedEngine* const engines_BR[] = {
  
  // Belarus
  const PrepopulatedEngine* const engines_BY[] = {
@@ -192,7 +192,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_by,
      &mail_ru,
      &bing,
-@@ -164,7 +164,7 @@ const PrepopulatedEngine* const engines_BY[] = {
+@@ -165,7 +165,7 @@ const PrepopulatedEngine* const engines_BY[] = {
  
  // Belize
  const PrepopulatedEngine* const engines_BZ[] = {
@@ -201,7 +201,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -173,7 +173,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
+@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_BZ[] = {
  
  // Canada
  const PrepopulatedEngine* const engines_CA[] = {
@@ -210,7 +210,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_ca,
      &duckduckgo,
-@@ -182,7 +182,7 @@ const PrepopulatedEngine* const engines_CA[] = {
+@@ -183,7 +183,7 @@ const PrepopulatedEngine* const engines_CA[] = {
  
  // Switzerland
  const PrepopulatedEngine* const engines_CH[] = {
@@ -219,7 +219,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &ecosia,
-@@ -191,7 +191,7 @@ const PrepopulatedEngine* const engines_CH[] = {
+@@ -192,7 +192,7 @@ const PrepopulatedEngine* const engines_CH[] = {
  
  // Chile
  const PrepopulatedEngine* const engines_CL[] = {
@@ -228,7 +228,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_cl,
      &duckduckgo,
-@@ -203,13 +203,13 @@ const PrepopulatedEngine* const engines_CN[] = {
+@@ -204,13 +204,13 @@ const PrepopulatedEngine* const engines_CN[] = {
      &sogou,
      &baidu,
      &bing,
@@ -244,7 +244,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_co,
      &ecosia,
-@@ -218,7 +218,7 @@ const PrepopulatedEngine* const engines_CO[] = {
+@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_CO[] = {
  
  // Costa Rica
  const PrepopulatedEngine* const engines_CR[] = {
@@ -253,7 +253,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -227,7 +227,7 @@ const PrepopulatedEngine* const engines_CR[] = {
+@@ -228,7 +228,7 @@ const PrepopulatedEngine* const engines_CR[] = {
  
  // Czech Republic
  const PrepopulatedEngine* const engines_CZ[] = {
@@ -262,7 +262,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &seznam_cz,
      &bing,
      &yahoo,
-@@ -236,7 +236,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
+@@ -237,7 +237,7 @@ const PrepopulatedEngine* const engines_CZ[] = {
  
  // Germany
  const PrepopulatedEngine* const engines_DE[] = {
@@ -271,7 +271,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &ecosia,
      &duckduckgo,
-@@ -245,7 +245,7 @@ const PrepopulatedEngine* const engines_DE[] = {
+@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DE[] = {
  
  // Denmark
  const PrepopulatedEngine* const engines_DK[] = {
@@ -280,7 +280,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_dk,
      &duckduckgo,
-@@ -254,7 +254,7 @@ const PrepopulatedEngine* const engines_DK[] = {
+@@ -255,7 +255,7 @@ const PrepopulatedEngine* const engines_DK[] = {
  
  // Dominican Republic
  const PrepopulatedEngine* const engines_DO[] = {
@@ -289,7 +289,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -263,7 +263,7 @@ const PrepopulatedEngine* const engines_DO[] = {
+@@ -264,7 +264,7 @@ const PrepopulatedEngine* const engines_DO[] = {
  
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
@@ -298,7 +298,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -272,7 +272,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
+@@ -273,7 +273,7 @@ const PrepopulatedEngine* const engines_DZ[] = {
  
  // Ecuador
  const PrepopulatedEngine* const engines_EC[] = {
@@ -307,7 +307,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -281,7 +281,7 @@ const PrepopulatedEngine* const engines_EC[] = {
+@@ -282,7 +282,7 @@ const PrepopulatedEngine* const engines_EC[] = {
  
  // Estonia
  const PrepopulatedEngine* const engines_EE[] = {
@@ -316,7 +316,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &duckduckgo,
-@@ -290,7 +290,7 @@ const PrepopulatedEngine* const engines_EE[] = {
+@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_EE[] = {
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
@@ -325,7 +325,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -299,7 +299,7 @@ const PrepopulatedEngine* const engines_EG[] = {
+@@ -300,7 +300,7 @@ const PrepopulatedEngine* const engines_EG[] = {
  
  // Spain
  const PrepopulatedEngine* const engines_ES[] = {
@@ -334,7 +334,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -308,7 +308,7 @@ const PrepopulatedEngine* const engines_ES[] = {
+@@ -309,7 +309,7 @@ const PrepopulatedEngine* const engines_ES[] = {
  
  // Finland
  const PrepopulatedEngine* const engines_FI[] = {
@@ -343,7 +343,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fi,
      &duckduckgo,
-@@ -317,7 +317,7 @@ const PrepopulatedEngine* const engines_FI[] = {
+@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_FI[] = {
  
  // Faroe Islands
  const PrepopulatedEngine* const engines_FO[] = {
@@ -352,7 +352,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_dk,
      &duckduckgo,
-@@ -326,7 +326,7 @@ const PrepopulatedEngine* const engines_FO[] = {
+@@ -327,7 +327,7 @@ const PrepopulatedEngine* const engines_FO[] = {
  
  // France
  const PrepopulatedEngine* const engines_FR[] = {
@@ -361,7 +361,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &qwant,
-@@ -335,7 +335,7 @@ const PrepopulatedEngine* const engines_FR[] = {
+@@ -336,7 +336,7 @@ const PrepopulatedEngine* const engines_FR[] = {
  
  // United Kingdom
  const PrepopulatedEngine* const engines_GB[] = {
@@ -370,7 +370,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -344,7 +344,7 @@ const PrepopulatedEngine* const engines_GB[] = {
+@@ -345,7 +345,7 @@ const PrepopulatedEngine* const engines_GB[] = {
  
  // Greece
  const PrepopulatedEngine* const engines_GR[] = {
@@ -379,7 +379,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -353,7 +353,7 @@ const PrepopulatedEngine* const engines_GR[] = {
+@@ -354,7 +354,7 @@ const PrepopulatedEngine* const engines_GR[] = {
  
  // Guatemala
  const PrepopulatedEngine* const engines_GT[] = {
@@ -388,7 +388,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -362,7 +362,7 @@ const PrepopulatedEngine* const engines_GT[] = {
+@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_GT[] = {
  
  // Hong Kong
  const PrepopulatedEngine* const engines_HK[] = {
@@ -397,7 +397,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_hk,
      &bing,
      &baidu,
-@@ -371,7 +371,7 @@ const PrepopulatedEngine* const engines_HK[] = {
+@@ -372,7 +372,7 @@ const PrepopulatedEngine* const engines_HK[] = {
  
  // Honduras
  const PrepopulatedEngine* const engines_HN[] = {
@@ -406,7 +406,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -380,7 +380,7 @@ const PrepopulatedEngine* const engines_HN[] = {
+@@ -381,7 +381,7 @@ const PrepopulatedEngine* const engines_HN[] = {
  
  // Croatia
  const PrepopulatedEngine* const engines_HR[] = {
@@ -415,7 +415,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -389,7 +389,7 @@ const PrepopulatedEngine* const engines_HR[] = {
+@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_HR[] = {
  
  // Hungary
  const PrepopulatedEngine* const engines_HU[] = {
@@ -424,7 +424,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -398,7 +398,7 @@ const PrepopulatedEngine* const engines_HU[] = {
+@@ -399,7 +399,7 @@ const PrepopulatedEngine* const engines_HU[] = {
  
  // Indonesia
  const PrepopulatedEngine* const engines_ID[] = {
@@ -433,7 +433,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_id,
      &bing,
      &yandex_com,
-@@ -407,7 +407,7 @@ const PrepopulatedEngine* const engines_ID[] = {
+@@ -408,7 +408,7 @@ const PrepopulatedEngine* const engines_ID[] = {
  
  // Ireland
  const PrepopulatedEngine* const engines_IE[] = {
@@ -442,7 +442,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_uk,
      &duckduckgo,
-@@ -416,7 +416,7 @@ const PrepopulatedEngine* const engines_IE[] = {
+@@ -417,7 +417,7 @@ const PrepopulatedEngine* const engines_IE[] = {
  
  // Israel
  const PrepopulatedEngine* const engines_IL[] = {
@@ -451,7 +451,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -425,7 +425,7 @@ const PrepopulatedEngine* const engines_IL[] = {
+@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_IL[] = {
  
  // India
  const PrepopulatedEngine* const engines_IN[] = {
@@ -460,7 +460,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_in,
      &duckduckgo,
-@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_IN[] = {
+@@ -435,7 +435,7 @@ const PrepopulatedEngine* const engines_IN[] = {
  
  // Iraq
  const PrepopulatedEngine* const engines_IQ[] = {
@@ -469,7 +469,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_tr,
-@@ -443,7 +443,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
+@@ -444,7 +444,7 @@ const PrepopulatedEngine* const engines_IQ[] = {
  
  // Iran
  const PrepopulatedEngine* const engines_IR[] = {
@@ -478,7 +478,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ask,
-@@ -452,7 +452,7 @@ const PrepopulatedEngine* const engines_IR[] = {
+@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_IR[] = {
  
  // Iceland
  const PrepopulatedEngine* const engines_IS[] = {
@@ -487,7 +487,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -461,7 +461,7 @@ const PrepopulatedEngine* const engines_IS[] = {
+@@ -462,7 +462,7 @@ const PrepopulatedEngine* const engines_IS[] = {
  
  // Italy
  const PrepopulatedEngine* const engines_IT[] = {
@@ -496,7 +496,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -470,7 +470,7 @@ const PrepopulatedEngine* const engines_IT[] = {
+@@ -471,7 +471,7 @@ const PrepopulatedEngine* const engines_IT[] = {
  
  // Jamaica
  const PrepopulatedEngine* const engines_JM[] = {
@@ -505,7 +505,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -479,7 +479,7 @@ const PrepopulatedEngine* const engines_JM[] = {
+@@ -480,7 +480,7 @@ const PrepopulatedEngine* const engines_JM[] = {
  
  // Jordan
  const PrepopulatedEngine* const engines_JO[] = {
@@ -514,7 +514,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -488,7 +488,7 @@ const PrepopulatedEngine* const engines_JO[] = {
+@@ -489,7 +489,7 @@ const PrepopulatedEngine* const engines_JO[] = {
  
  // Japan
  const PrepopulatedEngine* const engines_JP[] = {
@@ -523,7 +523,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_jp,
      &bing,
      &duckduckgo,
-@@ -497,7 +497,7 @@ const PrepopulatedEngine* const engines_JP[] = {
+@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_JP[] = {
  
  // Kenya
  const PrepopulatedEngine* const engines_KE[] = {
@@ -532,7 +532,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_KE[] = {
+@@ -507,7 +507,7 @@ const PrepopulatedEngine* const engines_KE[] = {
  
  // South Korea
  const PrepopulatedEngine* const engines_KR[] = {
@@ -541,7 +541,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &naver,
      &daum,
      &bing,
-@@ -515,7 +515,7 @@ const PrepopulatedEngine* const engines_KR[] = {
+@@ -516,7 +516,7 @@ const PrepopulatedEngine* const engines_KR[] = {
  
  // Kuwait
  const PrepopulatedEngine* const engines_KW[] = {
@@ -550,7 +550,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -524,7 +524,7 @@ const PrepopulatedEngine* const engines_KW[] = {
+@@ -525,7 +525,7 @@ const PrepopulatedEngine* const engines_KW[] = {
  
  // Kazakhstan
  const PrepopulatedEngine* const engines_KZ[] = {
@@ -559,7 +559,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_kz,
      &mail_ru,
      &bing,
-@@ -533,7 +533,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
+@@ -534,7 +534,7 @@ const PrepopulatedEngine* const engines_KZ[] = {
  
  // Lebanon
  const PrepopulatedEngine* const engines_LB[] = {
@@ -568,7 +568,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -542,7 +542,7 @@ const PrepopulatedEngine* const engines_LB[] = {
+@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_LB[] = {
  
  // Liechtenstein
  const PrepopulatedEngine* const engines_LI[] = {
@@ -577,7 +577,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -551,7 +551,7 @@ const PrepopulatedEngine* const engines_LI[] = {
+@@ -552,7 +552,7 @@ const PrepopulatedEngine* const engines_LI[] = {
  
  // Lithuania
  const PrepopulatedEngine* const engines_LT[] = {
@@ -586,7 +586,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -560,7 +560,7 @@ const PrepopulatedEngine* const engines_LT[] = {
+@@ -561,7 +561,7 @@ const PrepopulatedEngine* const engines_LT[] = {
  
  // Luxembourg
  const PrepopulatedEngine* const engines_LU[] = {
@@ -595,7 +595,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -569,7 +569,7 @@ const PrepopulatedEngine* const engines_LU[] = {
+@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_LU[] = {
  
  // Latvia
  const PrepopulatedEngine* const engines_LV[] = {
@@ -604,7 +604,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yandex_ru,
      &yahoo,
-@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_LV[] = {
+@@ -579,7 +579,7 @@ const PrepopulatedEngine* const engines_LV[] = {
  
  // Libya
  const PrepopulatedEngine* const engines_LY[] = {
@@ -613,7 +613,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -587,7 +587,7 @@ const PrepopulatedEngine* const engines_LY[] = {
+@@ -588,7 +588,7 @@ const PrepopulatedEngine* const engines_LY[] = {
  
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
@@ -622,7 +622,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &yandex_com,
-@@ -596,7 +596,7 @@ const PrepopulatedEngine* const engines_MA[] = {
+@@ -597,7 +597,7 @@ const PrepopulatedEngine* const engines_MA[] = {
  
  // Monaco
  const PrepopulatedEngine* const engines_MC[] = {
@@ -631,7 +631,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo_fr,
-@@ -605,7 +605,7 @@ const PrepopulatedEngine* const engines_MC[] = {
+@@ -606,7 +606,7 @@ const PrepopulatedEngine* const engines_MC[] = {
  
  // Moldova
  const PrepopulatedEngine* const engines_MD[] = {
@@ -640,7 +640,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &bing,
      &mail_ru,
-@@ -614,7 +614,7 @@ const PrepopulatedEngine* const engines_MD[] = {
+@@ -615,7 +615,7 @@ const PrepopulatedEngine* const engines_MD[] = {
  
  // Montenegro
  const PrepopulatedEngine* const engines_ME[] = {
@@ -649,7 +649,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_ru,
-@@ -623,7 +623,7 @@ const PrepopulatedEngine* const engines_ME[] = {
+@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_ME[] = {
  
  // Macedonia
  const PrepopulatedEngine* const engines_MK[] = {
@@ -658,7 +658,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -632,7 +632,7 @@ const PrepopulatedEngine* const engines_MK[] = {
+@@ -633,7 +633,7 @@ const PrepopulatedEngine* const engines_MK[] = {
  
  // Mexico
  const PrepopulatedEngine* const engines_MX[] = {
@@ -667,7 +667,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_mx,
      &duckduckgo,
-@@ -641,7 +641,7 @@ const PrepopulatedEngine* const engines_MX[] = {
+@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_MX[] = {
  
  // Malaysia
  const PrepopulatedEngine* const engines_MY[] = {
@@ -676,7 +676,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_my,
      &duckduckgo,
-@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_MY[] = {
+@@ -651,7 +651,7 @@ const PrepopulatedEngine* const engines_MY[] = {
  
  // Nicaragua
  const PrepopulatedEngine* const engines_NI[] = {
@@ -685,7 +685,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -659,7 +659,7 @@ const PrepopulatedEngine* const engines_NI[] = {
+@@ -660,7 +660,7 @@ const PrepopulatedEngine* const engines_NI[] = {
  
  // Netherlands
  const PrepopulatedEngine* const engines_NL[] = {
@@ -694,7 +694,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nl,
      &duckduckgo,
-@@ -668,7 +668,7 @@ const PrepopulatedEngine* const engines_NL[] = {
+@@ -669,7 +669,7 @@ const PrepopulatedEngine* const engines_NL[] = {
  
  // Norway
  const PrepopulatedEngine* const engines_NO[] = {
@@ -703,7 +703,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -677,7 +677,7 @@ const PrepopulatedEngine* const engines_NO[] = {
+@@ -678,7 +678,7 @@ const PrepopulatedEngine* const engines_NO[] = {
  
  // New Zealand
  const PrepopulatedEngine* const engines_NZ[] = {
@@ -712,7 +712,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_nz,
      &duckduckgo,
-@@ -686,7 +686,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
+@@ -687,7 +687,7 @@ const PrepopulatedEngine* const engines_NZ[] = {
  
  // Oman
  const PrepopulatedEngine* const engines_OM[] = {
@@ -721,7 +721,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -695,7 +695,7 @@ const PrepopulatedEngine* const engines_OM[] = {
+@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_OM[] = {
  
  // Panama
  const PrepopulatedEngine* const engines_PA[] = {
@@ -730,7 +730,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -704,7 +704,7 @@ const PrepopulatedEngine* const engines_PA[] = {
+@@ -705,7 +705,7 @@ const PrepopulatedEngine* const engines_PA[] = {
  
  // Peru
  const PrepopulatedEngine* const engines_PE[] = {
@@ -739,7 +739,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_pe,
      &ecosia,
-@@ -713,7 +713,7 @@ const PrepopulatedEngine* const engines_PE[] = {
+@@ -714,7 +714,7 @@ const PrepopulatedEngine* const engines_PE[] = {
  
  // Philippines
  const PrepopulatedEngine* const engines_PH[] = {
@@ -748,7 +748,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &ecosia,
-@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_PH[] = {
+@@ -723,7 +723,7 @@ const PrepopulatedEngine* const engines_PH[] = {
  
  // Pakistan
  const PrepopulatedEngine* const engines_PK[] = {
@@ -757,7 +757,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -731,7 +731,7 @@ const PrepopulatedEngine* const engines_PK[] = {
+@@ -732,7 +732,7 @@ const PrepopulatedEngine* const engines_PK[] = {
  
  // Poland
  const PrepopulatedEngine* const engines_PL[] = {
@@ -766,7 +766,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -740,7 +740,7 @@ const PrepopulatedEngine* const engines_PL[] = {
+@@ -741,7 +741,7 @@ const PrepopulatedEngine* const engines_PL[] = {
  
  // Puerto Rico
  const PrepopulatedEngine* const engines_PR[] = {
@@ -775,7 +775,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -749,7 +749,7 @@ const PrepopulatedEngine* const engines_PR[] = {
+@@ -750,7 +750,7 @@ const PrepopulatedEngine* const engines_PR[] = {
  
  // Portugal
  const PrepopulatedEngine* const engines_PT[] = {
@@ -784,7 +784,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -758,7 +758,7 @@ const PrepopulatedEngine* const engines_PT[] = {
+@@ -759,7 +759,7 @@ const PrepopulatedEngine* const engines_PT[] = {
  
  // Paraguay
  const PrepopulatedEngine* const engines_PY[] = {
@@ -793,7 +793,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -767,7 +767,7 @@ const PrepopulatedEngine* const engines_PY[] = {
+@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_PY[] = {
  
  // Qatar
  const PrepopulatedEngine* const engines_QA[] = {
@@ -802,7 +802,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -776,7 +776,7 @@ const PrepopulatedEngine* const engines_QA[] = {
+@@ -777,7 +777,7 @@ const PrepopulatedEngine* const engines_QA[] = {
  
  // Romania
  const PrepopulatedEngine* const engines_RO[] = {
@@ -811,7 +811,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -785,7 +785,7 @@ const PrepopulatedEngine* const engines_RO[] = {
+@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_RO[] = {
  
  // Serbia
  const PrepopulatedEngine* const engines_RS[] = {
@@ -820,7 +820,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_RS[] = {
+@@ -795,7 +795,7 @@ const PrepopulatedEngine* const engines_RS[] = {
  
  // Russia
  const PrepopulatedEngine* const engines_RU[] = {
@@ -829,7 +829,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ru,
      &mail_ru,
      &bing,
-@@ -803,7 +803,7 @@ const PrepopulatedEngine* const engines_RU[] = {
+@@ -804,7 +804,7 @@ const PrepopulatedEngine* const engines_RU[] = {
  
  // Rwanda
  const PrepopulatedEngine* const engines_RW[] = {
@@ -838,7 +838,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -812,7 +812,7 @@ const PrepopulatedEngine* const engines_RW[] = {
+@@ -813,7 +813,7 @@ const PrepopulatedEngine* const engines_RW[] = {
  
  // Saudi Arabia
  const PrepopulatedEngine* const engines_SA[] = {
@@ -847,7 +847,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -821,7 +821,7 @@ const PrepopulatedEngine* const engines_SA[] = {
+@@ -822,7 +822,7 @@ const PrepopulatedEngine* const engines_SA[] = {
  
  // Sweden
  const PrepopulatedEngine* const engines_SE[] = {
@@ -856,7 +856,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_se,
      &duckduckgo,
-@@ -830,7 +830,7 @@ const PrepopulatedEngine* const engines_SE[] = {
+@@ -831,7 +831,7 @@ const PrepopulatedEngine* const engines_SE[] = {
  
  // Singapore
  const PrepopulatedEngine* const engines_SG[] = {
@@ -865,7 +865,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_sg,
      &duckduckgo,
-@@ -839,7 +839,7 @@ const PrepopulatedEngine* const engines_SG[] = {
+@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_SG[] = {
  
  // Slovenia
  const PrepopulatedEngine* const engines_SI[] = {
@@ -874,7 +874,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -848,7 +848,7 @@ const PrepopulatedEngine* const engines_SI[] = {
+@@ -849,7 +849,7 @@ const PrepopulatedEngine* const engines_SI[] = {
  
  // Slovakia
  const PrepopulatedEngine* const engines_SK[] = {
@@ -883,7 +883,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &duckduckgo,
      &yahoo,
-@@ -857,7 +857,7 @@ const PrepopulatedEngine* const engines_SK[] = {
+@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_SK[] = {
  
  // El Salvador
  const PrepopulatedEngine* const engines_SV[] = {
@@ -892,7 +892,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_SV[] = {
+@@ -867,7 +867,7 @@ const PrepopulatedEngine* const engines_SV[] = {
  
  // Syria
  const PrepopulatedEngine* const engines_SY[] = {
@@ -901,7 +901,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -875,7 +875,7 @@ const PrepopulatedEngine* const engines_SY[] = {
+@@ -876,7 +876,7 @@ const PrepopulatedEngine* const engines_SY[] = {
  
  // Thailand
  const PrepopulatedEngine* const engines_TH[] = {
@@ -910,7 +910,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_th,
      &yandex_ru,
-@@ -884,7 +884,7 @@ const PrepopulatedEngine* const engines_TH[] = {
+@@ -885,7 +885,7 @@ const PrepopulatedEngine* const engines_TH[] = {
  
  // Tunisia
  const PrepopulatedEngine* const engines_TN[] = {
@@ -919,7 +919,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_fr,
      &duckduckgo,
-@@ -893,7 +893,7 @@ const PrepopulatedEngine* const engines_TN[] = {
+@@ -894,7 +894,7 @@ const PrepopulatedEngine* const engines_TN[] = {
  
  // Turkey
  const PrepopulatedEngine* const engines_TR[] = {
@@ -928,7 +928,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_tr,
      &yahoo_tr,
      &bing,
-@@ -902,7 +902,7 @@ const PrepopulatedEngine* const engines_TR[] = {
+@@ -903,7 +903,7 @@ const PrepopulatedEngine* const engines_TR[] = {
  
  // Trinidad and Tobago
  const PrepopulatedEngine* const engines_TT[] = {
@@ -937,7 +937,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -911,7 +911,7 @@ const PrepopulatedEngine* const engines_TT[] = {
+@@ -912,7 +912,7 @@ const PrepopulatedEngine* const engines_TT[] = {
  
  // Taiwan
  const PrepopulatedEngine* const engines_TW[] = {
@@ -946,7 +946,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yahoo_tw,
      &bing,
      &baidu,
-@@ -920,7 +920,7 @@ const PrepopulatedEngine* const engines_TW[] = {
+@@ -921,7 +921,7 @@ const PrepopulatedEngine* const engines_TW[] = {
  
  // Tanzania
  const PrepopulatedEngine* const engines_TZ[] = {
@@ -955,7 +955,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -929,7 +929,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
+@@ -930,7 +930,7 @@ const PrepopulatedEngine* const engines_TZ[] = {
  
  // Ukraine
  const PrepopulatedEngine* const engines_UA[] = {
@@ -964,7 +964,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &yandex_ua,
      &bing,
      &duckduckgo,
-@@ -938,7 +938,7 @@ const PrepopulatedEngine* const engines_UA[] = {
+@@ -939,7 +939,7 @@ const PrepopulatedEngine* const engines_UA[] = {
  
  // United States
  const PrepopulatedEngine* const engines_US[] = {
@@ -973,7 +973,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -947,7 +947,7 @@ const PrepopulatedEngine* const engines_US[] = {
+@@ -948,7 +948,7 @@ const PrepopulatedEngine* const engines_US[] = {
  
  // Uruguay
  const PrepopulatedEngine* const engines_UY[] = {
@@ -982,7 +982,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -956,7 +956,7 @@ const PrepopulatedEngine* const engines_UY[] = {
+@@ -957,7 +957,7 @@ const PrepopulatedEngine* const engines_UY[] = {
  
  // Venezuela
  const PrepopulatedEngine* const engines_VE[] = {
@@ -991,7 +991,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo_es,
      &duckduckgo,
-@@ -965,7 +965,7 @@ const PrepopulatedEngine* const engines_VE[] = {
+@@ -966,7 +966,7 @@ const PrepopulatedEngine* const engines_VE[] = {
  
  // Vietnam
  const PrepopulatedEngine* const engines_VN[] = {
@@ -1000,7 +1000,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &coccoc,
      &yahoo,
      &bing,
-@@ -974,7 +974,7 @@ const PrepopulatedEngine* const engines_VN[] = {
+@@ -975,7 +975,7 @@ const PrepopulatedEngine* const engines_VN[] = {
  
  // Yemen
  const PrepopulatedEngine* const engines_YE[] = {
@@ -1009,7 +1009,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &yandex_com,
-@@ -983,7 +983,7 @@ const PrepopulatedEngine* const engines_YE[] = {
+@@ -984,7 +984,7 @@ const PrepopulatedEngine* const engines_YE[] = {
  
  // South Africa
  const PrepopulatedEngine* const engines_ZA[] = {
@@ -1018,7 +1018,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      &bing,
      &yahoo,
      &duckduckgo,
-@@ -992,7 +992,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
+@@ -993,7 +993,7 @@ const PrepopulatedEngine* const engines_ZA[] = {
  
  // Zimbabwe
  const PrepopulatedEngine* const engines_ZW[] = {

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -8,15 +8,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/about_flags.cc           | 4 ++++
  chrome/browser/flag_descriptions.cc     | 4 ++++
  chrome/browser/flag_descriptions.h      | 3 +++
- net/base/features.cc                    | 3 +++
+ net/base/features.cc                    | 4 ++++
  net/base/features.h                     | 2 ++
  net/url_request/url_request_http_job.cc | 4 ++++
- 6 files changed, 20 insertions(+)
+ 6 files changed, 21 insertions(+)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -8660,6 +8660,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9070,6 +9070,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kRequestDesktopSiteExceptionsName,
       flag_descriptions::kRequestDesktopSiteExceptionsDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1647,6 +1647,10 @@ const char kHttpsOnlyModeDescription[] =
+@@ -1710,6 +1710,10 @@ const char kHttpsOnlyModeDescription[] =
      "Adds a setting under chrome://settings/security to opt-in to HTTPS-First "
      "Mode.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -925,6 +925,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
+@@ -960,6 +960,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
  extern const char kHttpsOnlyModeName[];
  extern const char kHttpsOnlyModeDescription[];
  
@@ -57,32 +57,33 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -111,6 +111,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -113,6 +113,10 @@ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey,
+              "PartitionNelAndReportingByNetworkIsolationKey",         // must be enabled
+              base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
-+const base::Feature kIsCleartextPermitted{"IsCleartextPermitted",
-+                                      base::FEATURE_ENABLED_BY_DEFAULT};
++BASE_FEATURE(kIsCleartextPermitted,
++             "IsCleartextPermitted",
++             base::FEATURE_ENABLED_BY_DEFAULT);
 +
- const base::Feature kNetworkQualityEstimator{"NetworkQualityEstimator",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey,
+              "EnableDoubleKeyNetworkAnonymizationKey",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -29,6 +29,8 @@ NET_EXPORT extern const base::Feature kAvoidH2Reprioritization;
+@@ -29,6 +29,8 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAvoidH2Reprioritization);
  // origin requests are restricted to contain at most the source origin.
- NET_EXPORT extern const base::Feature kCapReferrerToOriginOnCrossOrigin;
+ NET_EXPORT BASE_DECLARE_FEATURE(kCapReferrerToOriginOnCrossOrigin);
  
-+NET_EXPORT extern const base::Feature kIsCleartextPermitted;
++NET_EXPORT BASE_DECLARE_FEATURE(kIsCleartextPermitted);
 +
  // Support for altering the parameters used for DNS transaction timeout. See
  // ResolveContext::SecureTransactionTimeout().
- NET_EXPORT extern const base::Feature kDnsTransactionDynamicTimeouts;
+ NET_EXPORT BASE_DECLARE_FEATURE(kDnsTransactionDynamicTimeouts);
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -211,6 +211,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -212,6 +212,10 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
      }
  
  #if BUILDFLAG(IS_ANDROID)

build/patches/Add-a-proxy-configuration-page.patch

@@ -3,11 +3,15 @@ Date: Thu, 29 Mar 2018 00:43:32 +0200
 Subject: Add a proxy configuration page
 
 Accessible from proxy settings and chrome://proxy
-Allows to use a PAC script URL, automatic configuration and explicit proxy
-settings.
+Allows to use a PAC script URL, automatic configuration and explicit proxy settings.
 Offer auto-complete for the proxy page URL.
-Store proxy settings in LocalState instead of Profile, so that proxy is used
-for SimpleURLLoaders as well.
+Store proxy settings in LocalState instead of Profile, so that proxy is used for SimpleURLLoaders as well;
+this implementation is the same as the one in ChromeOS which gets proxy information from the LocalState
+for the system network context; this is strictly not correct on Android because the network context is
+never connected to any user profile and only gets proxy information from the system.
+Existing settings on Profile are migrated to LocalState on startup.
+
+Credits to @uazo for the LocalState integration.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
@@ -21,8 +25,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  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.html    |  78 ++++
+ chrome/browser/resources/proxy_config.js      | 267 +++++++++++
  chrome/browser/ui/BUILD.gn                    |   2 +
  .../webui/chrome_web_ui_controller_factory.cc |   3 +
  chrome/browser/ui/webui/proxy_config_ui.cc    | 418 ++++++++++++++++++
@@ -45,7 +49,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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 @@
+@@ -27,6 +27,9 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
@@ -58,7 +62,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -6,6 +6,10 @@
+@@ -8,6 +8,10 @@ found in the LICENSE file.
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
  
@@ -72,18 +76,18 @@ 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/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
-@@ -57,6 +57,7 @@ public class PrivacySettings
+@@ -59,6 +59,7 @@ public class PrivacySettings
+     private static final String PREF_DO_NOT_TRACK = "do_not_track";
+     private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
++    private static final String PREF_PROXY_OPTIONS = "proxy";
      private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
      private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
  
-+    private static final String PREF_PROXY_OPTIONS = "proxy";
-     private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
- 
-     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 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() {
+@@ -284,6 +284,8 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(
        base::ASCIIToUTF16(chrome::kChromeUISettingsURL));
  #endif
@@ -95,8 +99,8 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 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
-@@ -76,6 +76,12 @@
-         <include name="IDR_CONTACT_CENTER_INSIGHTS_MANIFEST" file="resources\chromeos\contact_center_insights\manifest.json" type="BINDATA" />
+@@ -81,6 +81,12 @@
+         <include name="IDR_DESK_API_MANIFEST" file="resources\chromeos\desk_api\manifest.json" type="BINDATA" />
        </if>
  
 +      <!-- Bromite Proxy Configuration UI -->
@@ -136,12 +140,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 -  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);
++    const base::Value::Dict& dict =
++        profile_prefs->GetDict(proxy_config::prefs::kProxy);
 +
 +    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";
 +
-+    const base::Value /*ProxyConfigDictionary*/ proxy_dict(dict->Clone());
++    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);
@@ -183,16 +187,16 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 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
-@@ -162,6 +162,8 @@
- #include "printing/buildflags/buildflags.h"
+@@ -165,6 +165,8 @@
  #include "rlz/buildflags/buildflags.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
  
 +#include "chrome/browser/net/proxy_service_factory.h"
 +
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1014,6 +1016,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1013,6 +1015,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    chrome::enterprise_util::RegisterLocalStatePrefs(registry);
    component_updater::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -204,13 +208,13 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 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
-@@ -162,7 +162,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
-     SetValue(
-         proxy_config::prefs::kProxy,
-         std::make_unique<base::Value>(ProxyConfigDictionary::CreateFixedServers(
--            proxy_server, bypass_list)),
-+            proxy_server, bypass_list, false)),
-         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+@@ -159,7 +159,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
+     SetValue(proxy_config::prefs::kProxy,
+              base::Value(ProxyConfigDictionary::CreateFixedServers(
+-                 proxy_server, bypass_list)),
++                 proxy_server, bypass_list, false)),
+              WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
    }
  }
 diff --git a/chrome/browser/resources/proxy_config.css b/chrome/browser/resources/proxy_config.css
@@ -283,7 +287,7 @@ diff --git a/chrome/browser/resources/proxy_config.html b/chrome/browser/resourc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/resources/proxy_config.html
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,78 @@
 +<!doctype html>
 +<html>
 +<head>
@@ -297,8 +301,7 @@ 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://resources/js/assert.js"></script>
 +<script type="module" src="chrome://proxy/proxy_config.js"></script>
 +<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 +<link rel="stylesheet" href="proxy_config.css">
@@ -367,7 +370,7 @@ diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/resources/proxy_config.js
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,267 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -385,6 +388,7 @@ new file mode 100644
 +    along with Bromite. If not, see <https://www.gnu.org/licenses/>.
 +*/
 +
++import {$} from 'chrome://resources/js/util.js';
 +import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
 +
 +/**
@@ -637,8 +641,8 @@ 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
-@@ -282,6 +282,8 @@ static_library("ui") {
-     "webui/metrics_handler.h",
+@@ -285,6 +285,8 @@ static_library("ui") {
+     "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
 +    "webui/proxy_config_ui.cc",
@@ -649,7 +653,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
  #include "chrome/browser/ui/webui/ntp_tiles_internals_ui.h"
  #include "chrome/browser/ui/webui/omnibox/omnibox_ui.h"
  #include "chrome/browser/ui/webui/policy/policy_ui.h"
@@ -657,8 +661,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "chrome/browser/ui/webui/predictors/predictors_ui.h"
  #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_ui.h"
  #include "chrome/browser/ui/webui/signin_internals_ui.h"
-@@ -781,6 +782,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
-     return &NewWebUI<MemoryInternalsUI>;
+@@ -795,6 +796,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+     return &NewWebUI<MetricsInternalsUI>;
    if (url.host_piece() == chrome::kChromeUINetExportHost)
      return &NewWebUI<NetExportUI>;
 +  if (url.host_piece() == chrome::kChromeUIProxyConfigHost)
@@ -930,9 +934,9 @@ 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);
-+  ProxyConfigDictionary proxy_dict(dict->Clone());
++  const PrefService::Preference* const pref =
++      pref_service_->FindPreference(proxy_config::prefs::kProxy);
++  ProxyConfigDictionary proxy_dict(pref->GetValue()->GetDict().Clone());
 +  ProxyPrefs::ProxyMode mode;
 +  if (!proxy_dict.GetMode(&mode) || mode == ProxyPrefs::MODE_SYSTEM) {
 +    availability = net::ProxyConfigService::CONFIG_UNSET;
@@ -944,8 +948,8 @@ new file mode 100644
 +void ProxyConfigMessageHandler::OnClear(const base::Value::List& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  const base::Value cfg = ProxyConfigDictionary::CreateSystem();
-+  pref_service_->Set(proxy_config::prefs::kProxy, cfg);
++  const base::Value::Dict cfg = ProxyConfigDictionary::CreateSystem();
++  pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  pref_service_->CommitPendingWrite();
 +  OnEnableNotifyUIWithState(list);
 +}
@@ -1056,22 +1060,22 @@ 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);
++    const base::Value::Dict cfg = ProxyConfigDictionary::CreateAutoDetect();
++    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else if (proxyConfig.has_pac_url()) {
-+    const base::Value cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
++    const base::Value::Dict cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
++    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {
-+    const base::Value cfg = ProxyConfigDictionary::CreateDirect();
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
++    const base::Value::Dict cfg = ProxyConfigDictionary::CreateDirect();
++    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else {
 +    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
 +    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
 +
 +    // fixed servers
-+    const base::Value cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
++    const base::Value::Dict cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
 +                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
-+    pref_service_->Set(proxy_config::prefs::kProxy, cfg);
++    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  }
 +  pref_service_->CommitPendingWrite();
 +
@@ -1128,7 +1132,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -46,6 +46,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
+@@ -47,6 +47,8 @@ const char kChromeUICertificateViewerHost[] = "view-cert";
  const char kChromeUICertificateViewerURL[] = "chrome://view-cert/";
  const char kChromeUIChromeSigninHost[] = "chrome-signin";
  const char kChromeUIChromeSigninURL[] = "chrome://chrome-signin/";
@@ -1137,7 +1141,7 @@ 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";
-@@ -437,6 +439,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
+@@ -439,6 +441,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
      kChromeUILockScreenNetworkHost,
      kChromeUILockScreenStartReauthHost,
      kChromeUIMobileSetupHost,
@@ -1145,7 +1149,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
      kChromeUIMultiDeviceSetupHost,
      kChromeUINetworkHost,
      kChromeUINotificationTesterHost,
-@@ -701,6 +704,7 @@ const char* const kChromeHostURLs[] = {
+@@ -704,6 +707,7 @@ const char* const kChromeHostURLs[] = {
  #if !BUILDFLAG(IS_ANDROID)
  #if !BUILDFLAG(IS_CHROMEOS_ASH)
      kChromeUIAppLauncherPageHost,
@@ -1156,7 +1160,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -133,6 +133,8 @@ extern const char kChromeUIMemoryInternalsHost[];
+@@ -134,6 +134,8 @@ extern const char kChromeUIMetricsInternalsHost[];
  extern const char kChromeUINTPTilesInternalsHost[];
  extern const char kChromeUINaClHost[];
  extern const char kChromeUINetExportHost[];
@@ -1188,46 +1192,47 @@ 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);
+@@ -76,6 +78,14 @@ bool ProxyConfigDictionary::HasBypassList() const {
+   return dict_.Find(kProxyBypassList);
  }
  
 +bool ProxyConfigDictionary::HasReverseBypass() const {
-+  const base::Value* value = dict_.FindKey(kProxyReverseBypass);
++  const base::Value* value = dict_.Find(kProxyReverseBypass);
 +  if (!value || !value->is_bool()) {
 +    return false;
 +  }
 +  return value->GetBool();
 +}
 +
- const base::Value& ProxyConfigDictionary::GetDictionary() const {
+ const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
    return dict_;
  }
-@@ -85,29 +95,30 @@ const base::Value& ProxyConfigDictionary::GetDictionary() const {
+@@ -83,13 +93,13 @@ const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
  // static
- base::Value ProxyConfigDictionary::CreateDirect() {
+ base::Value::Dict ProxyConfigDictionary::CreateDirect() {
    return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
  }
  
  // static
- base::Value ProxyConfigDictionary::CreateAutoDetect() {
+ base::Value::Dict ProxyConfigDictionary::CreateAutoDetect() {
    return CreateDictionary(ProxyPrefs::MODE_AUTO_DETECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
  }
  
  // static
- base::Value ProxyConfigDictionary::CreatePacScript(const std::string& pac_url,
-                                                    bool pac_mandatory) {
+@@ -97,16 +107,17 @@ base::Value::Dict ProxyConfigDictionary::CreatePacScript(
+     const std::string& pac_url,
+     bool pac_mandatory) {
    return CreateDictionary(ProxyPrefs::MODE_PAC_SCRIPT, pac_url, pac_mandatory,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
  }
  
  // static
- base::Value ProxyConfigDictionary::CreateFixedServers(
+ base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
      const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
@@ -1239,33 +1244,33 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
    } else {
      return CreateDirect();
    }
-@@ -116,7 +127,7 @@ base::Value ProxyConfigDictionary::CreateFixedServers(
+@@ -115,7 +126,7 @@ base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
  // static
- base::Value ProxyConfigDictionary::CreateSystem() {
+ base::Value::Dict ProxyConfigDictionary::CreateSystem() {
    return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
  }
  
  // static
-@@ -125,7 +136,8 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -124,7 +135,8 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
      const std::string& pac_url,
      bool pac_mandatory,
      const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
 +    bool reverse_bypass) {
-   base::Value dict(base::Value::Type::DICTIONARY);
-   dict.SetKey(kProxyMode, base::Value(ProxyModeToString(mode)));
+   base::Value::Dict dict;
+   dict.Set(kProxyMode, base::Value(ProxyModeToString(mode)));
    if (!pac_url.empty()) {
-@@ -134,8 +146,10 @@ base::Value ProxyConfigDictionary::CreateDictionary(
+@@ -133,8 +145,10 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
    }
    if (!proxy_server.empty())
-     dict.SetKey(kProxyServer, base::Value(proxy_server));
+     dict.Set(kProxyServer, base::Value(proxy_server));
 -  if (!bypass_list.empty())
 +  if (!bypass_list.empty()) {
-     dict.SetKey(kProxyBypassList, base::Value(bypass_list));
-+    dict.SetKey(kProxyReverseBypass, base::Value(reverse_bypass));
+     dict.Set(kProxyBypassList, base::Value(bypass_list));
++    dict.Set(kProxyReverseBypass, base::Value(reverse_bypass));
 +  }
    return dict;
  }
@@ -1279,37 +1284,37 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
    bool HasBypassList() const;
 +  bool HasReverseBypass() const;
  
-   const base::Value& GetDictionary() const;
+   const base::Value::Dict& GetDictionary() const;
  
 @@ -50,7 +51,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-   static base::Value CreatePacScript(const std::string& pac_url,
-                                      bool pac_mandatory);
-   static base::Value CreateFixedServers(const std::string& proxy_server,
--                                        const std::string& bypass_list);
-+                                        const std::string& bypass_list,
-+                                        bool reverse_bypass);
-   static base::Value CreateSystem();
+   static base::Value::Dict CreatePacScript(const std::string& pac_url,
+                                            bool pac_mandatory);
+   static base::Value::Dict CreateFixedServers(const std::string& proxy_server,
+-                                              const std::string& bypass_list);
++                                              const std::string& bypass_list,
++                                              bool reverse_bypass);
+   static base::Value::Dict CreateSystem();
  
    // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
 @@ -66,7 +68,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-                                       const std::string& pac_url,
-                                       bool pac_mandatory,
-                                       const std::string& proxy_server,
--                                      const std::string& bypass_list);
-+                                      const std::string& bypass_list,
-+                                      bool reverse_bypass);
+                                             const std::string& pac_url,
+                                             bool pac_mandatory,
+                                             const std::string& proxy_server,
+-                                            const std::string& bypass_list);
++                                            const std::string& bypass_list,
++                                            bool reverse_bypass);
  
-   base::Value dict_;
+   base::Value::Dict dict_;
  };
 diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
 --- a/components/proxy_config/proxy_policy_handler.cc
 +++ b/components/proxy_config/proxy_policy_handler.cc
-@@ -260,7 +260,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));
+@@ -263,7 +263,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
+             server->GetString(), bypass_list && bypass_list->is_string()
+                                      ? bypass_list->GetString()
+-                                     : std::string()));
++                                     : std::string(), false));
        }
        break;
      }

build/patches/Add-bookmark-import-export-actions.patch

@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../DownloadLocationDialogCoordinator.java    |   8 +-
  chrome/browser/flag_descriptions.cc           |   5 +
  chrome/browser/flag_descriptions.h            |   3 +
- .../flags/android/chrome_feature_list.cc      |   5 +
+ .../flags/android/chrome_feature_list.cc      |   6 +
  .../flags/android/chrome_feature_list.h       |   1 +
  .../browser/flags/ChromeFeatureList.java      |   1 +
  chrome/browser/importer/profile_writer.cc     |  12 +
@@ -45,12 +45,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog.h         |   2 +
  .../select_file_dialog_android.cc             |   6 +
  ui/shell_dialogs/select_file_dialog_android.h |   2 +
- 35 files changed, 847 insertions(+), 29 deletions(-)
+ 35 files changed, 848 insertions(+), 29 deletions(-)
 
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -59,7 +59,6 @@ by a child template that "extends" this file.
+@@ -61,7 +61,6 @@ by a child template that "extends" this file.
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_SCAN"
                              android:usesPermissionFlags="neverForLocation"/>
  
@@ -61,7 +61,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 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,20 @@
+@@ -23,6 +23,20 @@ found in the LICENSE file.
              android:visible="false"
              app:showAsAction="ifRoom"
              app:iconTint="@color/default_icon_color_secondary_tint_list" />
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
 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
-@@ -89,6 +89,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -84,6 +84,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          } else if (menuItem.getItemId() == R.id.search_menu_id) {
              mDelegate.openSearchUI();
              return true;
@@ -198,7 +198,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          }
  
          SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
-@@ -140,6 +146,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -135,6 +141,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      void showLoadingUi() {
          setTitle(null);
          setNavigationButton(NAVIGATION_BUTTON_NONE);
@@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          getMenu().findItem(R.id.search_menu_id).setVisible(false);
          getMenu().findItem(R.id.edit_menu_id).setVisible(false);
      }
-@@ -149,6 +157,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -144,6 +152,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          super.showNormalView();
  
          if (mDelegate == null) {
@@ -216,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
              getMenu().findItem(R.id.search_menu_id).setVisible(false);
              getMenu().findItem(R.id.edit_menu_id).setVisible(false);
          }
-@@ -178,6 +188,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -173,6 +183,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      @Override
      public void onFolderStateSet(BookmarkId folder) {
          mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
@@ -249,7 +249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import android.text.TextUtils;
  import android.util.Pair;
  
-@@ -46,6 +59,32 @@ import java.util.HashMap;
+@@ -42,6 +55,32 @@ import java.util.HashMap;
  import java.util.HashSet;
  import java.util.List;
  
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  /**
   * Provides the communication channel for Android to fetch and manipulate the
   * bookmark model stored in native.
-@@ -737,6 +776,209 @@ public class BookmarkBridge {
+@@ -442,6 +481,209 @@ class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
      }
  
@@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       * @param query Keyword used for searching bookmarks.
-@@ -1285,6 +1527,39 @@ public class BookmarkBridge {
+@@ -990,6 +1232,39 @@ class BookmarkBridge {
          depthList.add(depth);
      }
  
@@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
          List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
          for (int i = 0; i < left.length; i++) {
-@@ -1356,6 +1631,9 @@ public class BookmarkBridge {
+@@ -1061,6 +1336,9 @@ class BookmarkBridge {
          int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
          void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
                  List<BookmarkId> bookmarksList);
@@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
-@@ -66,6 +66,16 @@ public interface BookmarkDelegate {
+@@ -79,6 +79,16 @@ public interface BookmarkDelegate {
       */
      void openSearchUI();
  
@@ -574,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
  import org.chromium.components.favicon.LargeIconBridge;
  import org.chromium.url.GURL;
-@@ -58,6 +60,8 @@ public class BookmarkManager
+@@ -59,6 +61,8 @@ public class BookmarkManager
      private ComponentName mOpenBookmarkComponentName;
      private ViewGroup mMainView;
      private BookmarkModel mBookmarkModel;
@@ -583,7 +583,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      private BookmarkUndoController mUndoController;
      private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
      private BasicNativePage mNativePage;
-@@ -352,6 +356,14 @@ public class BookmarkManager
+@@ -344,6 +348,14 @@ public class BookmarkManager
          mNativePage = nativePage;
      }
  
@@ -598,7 +598,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * @return Current URL representing the UI state of bookmark manager. If no state has been shown
       *         yet in this session, on phone return last used state stored in preference; on tablet
-@@ -532,6 +544,16 @@ public class BookmarkManager
+@@ -540,6 +552,16 @@ public class BookmarkManager
          }
      }
  
@@ -704,7 +704,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1863,6 +1863,13 @@ static_library("browser") {
+@@ -1887,6 +1887,13 @@ static_library("browser") {
      ]
    }
  
@@ -718,7 +718,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -2885,6 +2892,8 @@ static_library("browser") {
+@@ -2904,6 +2911,8 @@ static_library("browser") {
        "autofill/manual_filling_controller.h",
        "autofill/manual_filling_controller_impl.cc",
        "autofill/manual_filling_controller_impl.h",
@@ -727,7 +727,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "autofill/manual_filling_utils.cc",
        "autofill/manual_filling_utils.h",
        "autofill/manual_filling_view_interface.h",
-@@ -3558,8 +3567,6 @@ static_library("browser") {
+@@ -3583,8 +3592,6 @@ static_library("browser") {
        "badging/badge_manager_factory.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -739,7 +739,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 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
-@@ -8654,6 +8654,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9039,6 +9039,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
  #endif
  
@@ -755,7 +755,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -59,6 +59,25 @@
+@@ -60,6 +60,25 @@
  #include "content/public/browser/browser_thread.h"
  #include "content/public/browser/web_contents.h"
  
@@ -781,7 +781,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  using base::android::AttachCurrentThread;
  using base::android::ConvertUTF16ToJavaString;
  using base::android::ConvertUTF8ToJavaString;
-@@ -76,8 +95,92 @@ using bookmarks::android::JavaBookmarkIdGetType;
+@@ -77,8 +96,92 @@ using bookmarks::android::JavaBookmarkIdGetType;
  using content::BrowserThread;
  using power_bookmarks::PowerBookmarkMeta;
  
@@ -874,7 +874,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  class BookmarkTitleComparer {
   public:
    explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -163,6 +266,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -164,6 +267,10 @@ BookmarkBridge::~BookmarkBridge() {
    if (partner_bookmarks_shim_)
      partner_bookmarks_shim_->RemoveObserver(this);
    reading_list_manager_->RemoveObserver(this);
@@ -885,7 +885,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv*, const JavaParamRef<jobject>&) {
-@@ -573,6 +680,182 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -574,6 +681,182 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -1128,7 +1128,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    void SetBookmarkTitle(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          jlong id,
-@@ -371,12 +391,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -372,12 +392,16 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    void DestroyJavaObject();
  
    raw_ptr<Profile> profile_;
@@ -1145,7 +1145,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
  
    // Information about the Partner bookmarks (must check for IsLoaded()).
    // This is owned by profile.
-@@ -388,6 +412,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
+@@ -389,6 +413,10 @@ class BookmarkBridge : public bookmarks::BaseBookmarkModelObserver,
    // Observes the profile destruction and creation.
    base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this};
  
@@ -1251,7 +1251,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 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
-@@ -6458,6 +6458,11 @@ const char kDisableLacrosTtsSupportDescription[] =
+@@ -6836,6 +6836,11 @@ const char kVcControlsUiDescription[] =
  
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -1266,9 +1266,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
-@@ -3734,6 +3734,9 @@ extern const char kDisableLacrosTtsSupportName[];
- extern const char kDisableLacrosTtsSupportDescription[];
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -3942,6 +3942,9 @@ extern const char kDisableLacrosTtsSupportDescription[];
+ extern const char kVcControlsUiName[];
+ extern const char kVcControlsUiDescription[];
  
 +extern const char kBookmarksExportUseSafName[];
 +extern const char kBookmarksExportUseSafDescription[];
@@ -1279,7 +1279,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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
-@@ -183,6 +183,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCastDeviceFilter,
      &kClearOmniboxFocusAfterNavigation,
      &kCloseTabSuggestions,
@@ -1287,13 +1287,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCriticalPersistedTabData,
      &kCommerceCoupons,
      &kCCTBackgroundTab,
-@@ -948,6 +949,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService",
- const base::Feature kWebApkTrampolineOnInitialIntent{
-     "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -1114,6 +1115,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
+              "WebApkTrampolineOnInitialIntent",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +// disabled by default because of an issue on Android 6.0
-+const base::Feature kBookmarksExportUseSaf{"BookmarksExportUseSaf",
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
++BASE_FEATURE(kBookmarksExportUseSaf,
++             "BookmarksExportUseSaf",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
  static jboolean JNI_ChromeFeatureList_IsEnabled(
      JNIEnv* env,
@@ -1301,20 +1302,20 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 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
-@@ -161,6 +161,7 @@ extern const base::Feature kTabReparenting;
- extern const base::Feature kTabSelectionEditorV2;
- extern const base::Feature kTabStripImprovements;
- extern const base::Feature kTabSwitcherOnReturn;
-+extern const base::Feature kBookmarksExportUseSaf;
- extern const base::Feature kTabToGTSAnimation;
- extern const base::Feature kTestDefaultDisabled;
- extern const base::Feature kTestDefaultEnabled;
+@@ -161,6 +161,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
+ BASE_DECLARE_FEATURE(kTabStripRedesign);
+ BASE_DECLARE_FEATURE(kTabSwitcherOnReturn);
+ BASE_DECLARE_FEATURE(kTabToGTSAnimation);
++BASE_DECLARE_FEATURE(kBookmarksExportUseSaf);
+ BASE_DECLARE_FEATURE(kTestDefaultDisabled);
+ BASE_DECLARE_FEATURE(kTestDefaultEnabled);
+ BASE_DECLARE_FEATURE(kToolbarMicIphAndroid);
 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
-@@ -587,6 +587,7 @@ public abstract class ChromeFeatureList {
-     public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk";
-     public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH";
+@@ -620,6 +620,7 @@ public abstract class ChromeFeatureList {
+     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
+             "UseLibunwindstackNativeUnwinderAndroid";
      public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
      public static final String VOICE_BUTTON_IN_TOP_TOOLBAR = "VoiceButtonInTopToolbar";
@@ -1323,7 +1324,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
 --- a/chrome/browser/importer/profile_writer.cc
 +++ b/chrome/browser/importer/profile_writer.cc
-@@ -105,12 +105,14 @@ void ProfileWriter::AddHistoryPage(const history::URLRows& page,
+@@ -106,12 +106,14 @@ void ProfileWriter::AddHistoryPage(const history::URLRows& page,
      HistoryServiceFactory::GetForProfile(profile_,
                                           ServiceAccessType::EXPLICIT_ACCESS)
          ->AddPagesWithDetails(page, visit_source);
@@ -1338,7 +1339,7 @@ diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer
  }
  
  void ProfileWriter::AddHomepage(const GURL& home_page) {
-@@ -131,6 +133,16 @@ void ProfileWriter::AddBookmarks(
+@@ -132,6 +134,16 @@ void ProfileWriter::AddBookmarks(
      return;
  
    BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -1381,7 +1382,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 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
-@@ -99,6 +99,8 @@ public final class ChromePreferenceKeys {
+@@ -113,6 +113,8 @@ public final class ChromePreferenceKeys {
      public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url";
      public static final String BOOKMARKS_LAST_USED_PARENT =
              "enhanced_bookmark_last_used_parent_folder";
@@ -1390,8 +1391,8 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /**
       * Whether Chrome is set as the default browser.
-@@ -1001,6 +1003,7 @@ public final class ChromePreferenceKeys {
-                 ASSISTANT_VOICE_SEARCH_ENABLED,
+@@ -1049,6 +1051,7 @@ public final class ChromePreferenceKeys {
+                 AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
 +                BOOKMARKS_LAST_EXPORT_URI,
@@ -1429,7 +1430,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -404,6 +404,9 @@ static_library("common_lib") {
+@@ -401,6 +401,9 @@ static_library("common_lib") {
      sources += [
        "media/chrome_media_drm_bridge_client.cc",
        "media/chrome_media_drm_bridge_client.h",
@@ -1656,8 +1657,8 @@ diff --git a/ui/android/java/strings/android_ui_strings.grd b/ui/android/java/st
 diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
 --- a/ui/shell_dialogs/select_file_dialog.h
 +++ b/ui/shell_dialogs/select_file_dialog.h
-@@ -205,6 +205,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
-                   void* params);
+@@ -210,6 +210,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
+                   const GURL* caller = nullptr);
    bool HasMultipleFileTypeChoices();
  
 +  virtual void ShowToast(const std::string& message) = 0;
@@ -1668,7 +1669,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil
 diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
 --- a/ui/shell_dialogs/select_file_dialog_android.cc
 +++ b/ui/shell_dialogs/select_file_dialog_android.cc
-@@ -140,6 +140,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+@@ -142,6 +142,12 @@ void SelectFileDialogImpl::SelectFileImpl(
                                     owning_window->GetJavaObject());
  }
  
@@ -1684,9 +1685,9 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/s
 diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
 --- a/ui/shell_dialogs/select_file_dialog_android.h
 +++ b/ui/shell_dialogs/select_file_dialog_android.h
-@@ -57,6 +57,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
-                       gfx::NativeWindow owning_window,
-                       void* params) override;
+@@ -58,6 +58,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
+                       void* params,
+                       const GURL* caller) override;
  
 +  void ShowToast(const std::string& message) override;
 +

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -56,6 +56,16 @@
+@@ -58,6 +58,16 @@ found in the LICENSE file.
          android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings"
          android:key="do_not_track"
          android:title="@string/do_not_track_title"/>
@@ -42,7 +42,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/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;
+@@ -45,6 +45,7 @@ import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  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;
+@@ -58,6 +59,8 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  /**
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
-@@ -267,6 +270,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -268,6 +271,9 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          if (CustomTabsIntent.shouldAlwaysUseBrowserUI(intent)
                  || !intent.hasExtra(CustomTabsIntent.EXTRA_SESSION)) {
              return false;
-@@ -286,6 +292,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -287,6 +293,10 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
          newIntent.setData(uri);
          newIntent.setClassName(context, CustomTabActivity.class.getName());
  
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          // Since configureIntentForResizableCustomTab() might change the componenet/class
          // associated with the passed intent, it needs to be called after #setClassName(context,
          // CustomTabActivity.class.getName());
-@@ -421,6 +431,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -433,6 +443,18 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAsso
 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
-@@ -4800,6 +4800,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4788,6 +4788,21 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_NEAR_OOM_REDUCTION_DECLINE" desc="The text of the button letting the user decline the browser's intervention, so that the page can be reloaded.">
           Show original
        </message>

build/patches/Add-exit-menu-item.patch

@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -159,6 +159,9 @@
+@@ -161,6 +161,9 @@ found in the LICENSE file.
          <item android:id="@+id/managed_by_menu_id"
              android:title="@string/managed_browser"
              android:icon="@drawable/ic_business" />
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only in the tab switcher -->
-@@ -185,6 +188,9 @@
+@@ -190,6 +193,9 @@ found in the LICENSE file.
          <item android:id="@id/preferences_id"
              android:title="@string/menu_settings"
              android:icon="@drawable/settings_cog" />
@@ -59,7 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ApplicationLife
 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
-@@ -222,6 +222,8 @@ import java.util.HashSet;
+@@ -224,6 +224,8 @@ import java.util.HashSet;
  import java.util.List;
  import java.util.Locale;
  
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  /**
   * 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.
-@@ -2174,6 +2176,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2188,6 +2190,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          } else if (id == R.id.close_tab) {
              getCurrentTabModel().closeTab(currentTab, true, false, true);
              RecordUserAction.record("MobileTabClosed");
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 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
-@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
  import org.chromium.chrome.browser.AppHooks;
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2322,6 +2323,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2292,6 +2293,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -119,7 +119,7 @@ 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
-@@ -3511,6 +3511,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3470,6 +3470,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
          Dark theme
        </message>

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -519,6 +519,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
+@@ -525,6 +525,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_ANDROID)
@@ -40,8 +40,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = {
      {"mode", "always-none"}};
  const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNewTab[] = {
-@@ -4174,7 +4190,11 @@ const FeatureEntry kFeatureEntries[] = {
-      kOsMac | kOsLinux | kOsLacros | kOsWin,
+@@ -4371,7 +4387,11 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsMac | kOsLinux | kOsWin,
       FEATURE_VALUE_TYPE(features::kSystemNotifications)},
  #endif  // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH)
 -#if BUILDFLAG(IS_ANDROID)
@@ -65,7 +65,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/metrics/histogram_functions.h"
-@@ -318,6 +320,15 @@ AutocompleteController::AutocompleteController(
+@@ -338,6 +340,15 @@ AutocompleteController::AutocompleteController(
        is_cros_launcher_(is_cros_launcher),
        search_service_worker_signal_sent_(false),
        template_url_service_(provider_client_->GetTemplateURLService()) {
@@ -84,7 +84,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 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
-@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -475,6 +475,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
    if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
      matches_.push_back(what_you_typed_match);
  
@@ -105,7 +105,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
  #include "base/feature_list.h"
  #include "base/i18n/break_iterator.h"
  #include "base/i18n/case_conversion.h"
-@@ -680,6 +681,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -677,6 +678,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -118,16 +118,16 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 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>
+@@ -7,6 +7,8 @@
+ #include <stddef.h>
  
  #include "base/check_op.h"
 +#include "base/containers/contains.h"
 +#include "base/command_line.h"
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
- #include "base/ranges/algorithm.h"
-@@ -607,6 +609,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+ #include "base/i18n/char_iterator.h"
+@@ -608,6 +610,8 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
      if (chrome_url && !parts.host.is_valid())

build/patches/Add-flag-for-save-data-header.patch

@@ -9,13 +9,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  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(-)
+ services/network/public/cpp/features.h                    | 2 +-
+ 6 files changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4771,7 +4771,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4981,7 +4981,10 @@ const FeatureEntry kFeatureEntries[] = {
      {"force-text-direction", flag_descriptions::kForceTextDirectionName,
       flag_descriptions::kForceTextDirectionDescription, kOsAll,
       MULTI_VALUE_TYPE(kForceTextDirectionChoices)},
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1227,6 +1227,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
+@@ -1261,6 +1261,10 @@ const char kDeprecateAltBasedSixPackDescription[] =
      "Show deprecation notifications and disable functionality for Alt based "
      "six pack deprecations. The Search based versions continue to work.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -647,6 +647,9 @@ extern const char kDeprecateAltClickDescription[];
+@@ -662,6 +662,9 @@ extern const char kDeprecateAltClickDescription[];
  extern const char kDeprecateAltBasedSixPackName[];
  extern const char kDeprecateAltBasedSixPackDescription[];
  
@@ -84,30 +84,29 @@ diff --git a/content/browser/loader/browser_initiated_resource_request.cc b/cont
 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};
+@@ -20,6 +20,11 @@ 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};
++BASE_FEATURE(kEnableSaveDataHeader,
++             "EnableSaveDataHeader",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
- const base::Feature kNetworkErrorLogging{"NetworkErrorLogging",
-                                          base::FEATURE_ENABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kNetworkErrorLogging,
+              "NetworkErrorLogging",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -45,7 +45,8 @@ COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kMdnsResponderGeneratedNameListing;
+@@ -50,7 +50,7 @@ extern const base::FeatureParam<TrustTokenOriginTrialSpec>
+     kTrustTokenOperationsRequiringOriginTrial;
  COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kOpaqueResponseBlockingV01;
+ extern const base::FeatureParam<bool> kPlatformProvidedTrustTokenIssuance;
 -
-+COMPONENT_EXPORT(NETWORK_CPP)
-+extern const base::Feature kEnableSaveDataHeader;
++COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kEnableSaveDataHeader);
  COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kTrustTokens;
+ BASE_DECLARE_FEATURE(kWebSocketReassembleShortMessages);
  
 --
 2.25.1

build/patches/Add-flag-to-configure-maximum-connections-per-host.patch

@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1018,6 +1018,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
+@@ -1040,6 +1040,11 @@ const FeatureEntry::Choice kForceColorProfileChoices[] = {
       switches::kForceDisplayColorProfile, "hdr10"},
  };
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  const FeatureEntry::Choice kMemlogModeChoices[] = {
      {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
      {flag_descriptions::kMemlogModeMinimal, heap_profiling::kMemlogMode,
-@@ -4695,6 +4700,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4884,6 +4889,9 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kAndroidPictureInPictureAPIName,
       flag_descriptions::kAndroidPictureInPictureAPIDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(media::kPictureInPictureAPI)},
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1794,6 +1794,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
+@@ -1875,6 +1875,10 @@ const char kUnthrottledNestedTimeoutDescription[] =
      "websites abusing the API will still eventually have their setTimeouts "
      "clamped.";
  
@@ -60,7 +60,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
-@@ -1009,6 +1009,9 @@ extern const char kLogJsConsoleMessagesDescription[];
+@@ -1050,6 +1050,9 @@ extern const char kLogJsConsoleMessagesDescription[];
  extern const char kUnthrottledNestedTimeoutName[];
  extern const char kUnthrottledNestedTimeoutDescription[];
  

build/patches/Add-flag-to-control-video-playback-resume-feature.patch

@@ -9,27 +9,27 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/about_flags.cc       | 4 ++++
  chrome/browser/flag_descriptions.cc | 5 +++++
  chrome/browser/flag_descriptions.h  | 3 +++
- media/base/media_switches.cc        | 4 ----
- 4 files changed, 12 insertions(+), 4 deletions(-)
+ media/base/media_switches.cc        | 8 ++------
+ 4 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3396,6 +3396,10 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWebRtcRemoteEventLogName,
-      flag_descriptions::kWebRtcRemoteEventLogDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kWebRtcRemoteEventLog)},
+@@ -3661,6 +3661,10 @@ const FeatureEntry kFeatureEntries[] = {
+      SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
+ #endif  // ENABLE_EXTENSIONS
+ #if BUILDFLAG(IS_ANDROID)
 +    {"resume-background-video",
 +     flag_descriptions::kResumeBackgroundVideoName,
 +     flag_descriptions::kResumeBackgroundVideoDescription, kOsAll,
 +     FEATURE_VALUE_TYPE(media::kResumeBackgroundVideo)},
- #endif
-     {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName,
-      flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll,
+     {"osk-resizes-visual-viewport-by-default",
+      flag_descriptions::kEnableOskResizesVisualViewportByDefaultName,
+      flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1318,6 +1318,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
+@@ -1363,6 +1363,11 @@ const char kEnablePenetratingImageSelectionDescription[] =
      "Enables image options to be surfaced in the context menu for nodes "
      "covered by transparent overlays.";
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -726,6 +726,9 @@ extern const char kEnablePortalsDescription[];
+@@ -744,6 +744,9 @@ extern const char kEnablePortalsDescription[];
  extern const char kEnablePortalsCrossOriginName[];
  extern const char kEnablePortalsCrossOriginDescription[];
  
@@ -57,16 +57,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
-@@ -287,11 +287,7 @@ const base::Feature kPreloadMetadataLazyLoad{"PreloadMetadataLazyLoad",
+@@ -302,12 +302,8 @@ BASE_FEATURE(kPreloadMetadataLazyLoad,
+ // Let videos be resumed via remote controls (for example, the notification)
  // when in background.
- const base::Feature kResumeBackgroundVideo {
-   "resume-background-video",
+ BASE_FEATURE(kResumeBackgroundVideo,
+-             "resume-background-video",
 -#if BUILDFLAG(IS_ANDROID)
--      base::FEATURE_ENABLED_BY_DEFAULT
+-             base::FEATURE_ENABLED_BY_DEFAULT
 -#else
-       base::FEATURE_DISABLED_BY_DEFAULT
+-             base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
- };
++             "resume-background-video",           // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT    // in Bromite
+ );
  
  // When enabled, MediaCapabilities will check with GPU Video Accelerator
 --

build/patches/Add-flag-to-disable-IPv6-probes.patch

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/subresource_filter/tools/BUILD.gn             | 6 ++++++
  .../url_formatter/spoof_checks/top_domains/BUILD.gn      | 3 ++-
  net/dns/host_resolver_manager.cc                         | 9 ++++++++-
- services/network/public/cpp/features.cc                  | 4 ++++
- services/network/public/cpp/features.h                   | 2 ++
+ services/network/public/cpp/features.cc                  | 5 +++++
+ services/network/public/cpp/features.h                   | 1 +
  8 files changed, 33 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5729,6 +5729,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6036,6 +6036,10 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-reader-mode-in-cct", flag_descriptions::kReaderModeInCCTName,
       flag_descriptions::kReaderModeInCCTDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)},
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3373,6 +3373,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
+@@ -3578,6 +3578,10 @@ const char kCCTRealTimeEngagementSignalsDescription[] =
      "Enables sending real-time engagement signals (e.g. scroll) through "
      "CustomTabsCallback.";
  
@@ -45,7 +45,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
-@@ -792,6 +792,9 @@ extern const char kEnableWasmLazyCompilationName[];
+@@ -807,6 +807,9 @@ extern const char kEnableWasmLazyCompilationName[];
  extern const char kEnableWasmLazyCompilationDescription[];
  
  extern const char kEnableWasmTieringName[];
@@ -109,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"
-@@ -4074,8 +4075,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
+@@ -3727,8 +3728,14 @@ bool HostResolverManager::IsIPv6Reachable(const NetLogWithSource& net_log) {
    if (last_ipv6_probe_time_.is_null() ||
        (tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
            kIPv6ProbePeriodMs) {
@@ -128,13 +128,14 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -36,6 +36,10 @@ const base::Feature kReporting{"Reporting", base::FEATURE_ENABLED_BY_DEFAULT};
- const base::Feature kThrottleDelayable{"ThrottleDelayable",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -38,6 +38,11 @@ BASE_FEATURE(kThrottleDelayable,
+              "ThrottleDelayable",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +// Enable IPv6 ping probes to RIPE DNS.
-+const base::Feature kIPv6Probing{"IPv6Probing",
-+                                       base::FEATURE_ENABLED_BY_DEFAULT};
++BASE_FEATURE(kIPv6Probing,
++             "IPv6Probing",
++             base::FEATURE_ENABLED_BY_DEFAULT);
 +
  // When kPriorityRequestsDelayableOnSlowConnections is enabled, HTTP
  // requests fetched from a SPDY/QUIC/H2 proxies can be delayed by the
@@ -142,14 +143,13 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -18,6 +18,8 @@ extern const base::Feature kExpectCTReporting;
+@@ -17,6 +17,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kExpectCTReporting);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNetworkErrorLogging);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kReporting);
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kThrottleDelayable);
++COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kIPv6Probing);
  COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kNetworkErrorLogging;
+ BASE_DECLARE_FEATURE(kDelayRequestsOnMultiplexedConnections);
  COMPONENT_EXPORT(NETWORK_CPP)
-+extern const base::Feature kIPv6Probing;
-+COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kReporting;
- COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kThrottleDelayable;
 --
 2.25.1

build/patches/Add-flag-to-disable-external-intent-requests.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -3389,6 +3389,9 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3621,6 +3621,9 @@ const FeatureEntry kFeatureEntries[] = {
      {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
       flag_descriptions::kUiPartialSwapDescription, kOsAll,
       SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@@ -28,7 +28,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3735,6 +3735,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
+@@ -3966,6 +3966,12 @@ const char kPhotoPickerVideoSupportName[] = "Photo Picker Video Support";
  const char kPhotoPickerVideoSupportDescription[] =
      "Enables video files to be shown in the Photo Picker dialog";
  
@@ -44,9 +44,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
-@@ -2137,6 +2137,9 @@ extern const char kQueryTilesDescription[];
- extern const char kQueryTilesNTPName[];
- extern const char kQueryTilesNTPDescription[];
+@@ -2274,6 +2274,9 @@ extern const char kQueryTilesNTPDescription[];
+ extern const char kQueryTilesOnStartName[];
+ extern const char kQueryTilesOnStartDescription[];
  extern const char kQueryTilesSingleTierName[];
 +extern const char kDisableExternalIntentRequestsName[];
 +extern const char kDisableExternalIntentRequestsDescription[];

build/patches/Add-flag-to-disable-vibration.patch

@@ -4,22 +4,22 @@ Subject: Add flag to disable vibration
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/about_flags.cc                                 | 4 ++++
- chrome/browser/flag_descriptions.cc                           | 3 +++
- chrome/browser/flag_descriptions.h                            | 2 ++
- content/child/runtime_features.cc                             | 1 +
- content/public/common/content_features.cc                     | 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(+)
+ chrome/browser/about_flags.cc                                | 4 ++++
+ chrome/browser/flag_descriptions.cc                          | 3 +++
+ chrome/browser/flag_descriptions.h                           | 2 ++
+ content/child/runtime_features.cc                            | 1 +
+ content/public/common/content_features.cc                    | 5 +++++
+ content/public/common/content_features.h                     | 2 ++
+ third_party/blink/public/platform/web_runtime_features.h     | 1 +
+ .../blink/renderer/modules/vibration/vibration_controller.cc | 3 +++
+ .../blink/renderer/platform/exported/web_runtime_features.cc | 4 ++++
+ .../blink/renderer/platform/runtime_enabled_features.json5   | 4 ++++
+ 10 files changed, 29 insertions(+)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -7096,6 +7096,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7467,6 +7467,10 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
  #endif
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -6104,6 +6104,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
+@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
  
  #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)
  
@@ -46,7 +46,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
-@@ -3727,6 +3727,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+@@ -3938,6 +3938,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
  extern const char kWebUITabStripTabDragIntegrationDescription[];
  #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -69,13 +69,14 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -121,6 +121,10 @@ const base::Feature kBackForwardCacheMemoryControls {
+@@ -130,6 +130,11 @@ 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};
++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.
@@ -83,38 +84,38 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -332,6 +332,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
+@@ -322,6 +322,8 @@ CONTENT_EXPORT extern const base::FeatureParam<base::TimeDelta>
      kCompositorLockTimeout;
  
  #endif  // BUILDFLAG(IS_ANDROID)
-+CONTENT_EXPORT extern const base::Feature kVibration;
++CONTENT_EXPORT BASE_DECLARE_FEATURE(kVibration);
 +
  
  #if BUILDFLAG(IS_MAC)
- CONTENT_EXPORT extern const base::Feature kDeviceMonitorMac;
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kDeviceMonitorMac);
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -88,6 +88,7 @@ class WebRuntimeFeatures {
-   BLINK_PLATFORM_EXPORT static void EnableBlockingFocusWithoutUserActivation(
-       bool);
-   BLINK_PLATFORM_EXPORT static void EnableClickPointerEvent(bool enable);
-+  BLINK_PLATFORM_EXPORT static void EnableVibration(bool);
-   BLINK_PLATFORM_EXPORT static void EnableCompositeBGColorAnimation(
-       bool enable);
-   BLINK_PLATFORM_EXPORT static void EnableCanvas2dImageChromium(bool);
+@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+   static void EnableFingerprintingCanvasMeasureTextNoise(bool);
+   static void EnableFingerprintingCanvasImageDataNoise(bool);
+   static void EnableFluentScrollbars(bool);
++  static void EnableVibration(bool);
+ 
+   WebRuntimeFeatures() = delete;
+ };
 diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
-@@ -30,6 +30,7 @@
+@@ -29,6 +29,7 @@
+ #include "third_party/blink/renderer/core/frame/local_frame.h"
  #include "third_party/blink/renderer/core/frame/navigator.h"
  #include "third_party/blink/renderer/core/page/page.h"
- #include "third_party/blink/renderer/platform/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;
-@@ -153,6 +154,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -152,6 +153,8 @@ bool VibrationController::vibrate(Navigator& navigator,
    // reference to |window| or |navigator| was retained in another window.
    if (!navigator.DomWindow())
      return false;
@@ -126,21 +127,21 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
 diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.cc b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 --- a/third_party/blink/renderer/platform/exported/web_runtime_features.cc
 +++ b/third_party/blink/renderer/platform/exported/web_runtime_features.cc
-@@ -160,6 +160,10 @@ void WebRuntimeFeatures::EnableScrollTopLeftInterop(bool enable) {
-   RuntimeEnabledFeatures::SetScrollTopLeftInteropEnabled(enable);
+@@ -52,6 +52,10 @@ void WebRuntimeFeatures::EnableTestOnlyFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetTestFeaturesEnabled(enable);
  }
  
 +void WebRuntimeFeatures::EnableVibration(bool enable) {
 +  RuntimeEnabledFeatures::SetVibrationEnabled(enable);
 +}
 +
- void WebRuntimeFeatures::EnableKeyboardAccessibleTooltip(bool enable) {
-   RuntimeEnabledFeatures::SetKeyboardAccessibleTooltipEnabled(enable);
+ void WebRuntimeFeatures::EnableOriginTrialControlledFeatures(bool enable) {
+   RuntimeEnabledFeatures::SetOriginTrialControlledFeaturesEnabled(enable);
  }
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1569,6 +1569,10 @@
+@@ -1827,6 +1827,10 @@
        name: "OrientationEvent",
        status: {"Android": "stable"},
      },

build/patches/Add-lifetime-options-for-permissions.patch

@@ -65,9 +65,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/content_settings/android/BUILD.gn  |  1 +
  .../core/browser/content_settings_utils.cc    | 29 +++++++
  .../core/browser/content_settings_utils.h     |  6 ++
- .../core/browser/host_content_settings_map.cc |  2 +-
- .../core/common/content_settings.cc           |  7 +-
- .../core/common/content_settings.h            |  4 +-
  .../common/content_settings_constraints.h     | 11 +++
  .../page_info/PageInfoController.java         |  4 +-
  .../PermissionParamsListBuilder.java          | 13 ++-
@@ -90,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/permissions/permission_request.h   | 17 +++-
  .../permissions/permission_request_manager.cc | 37 ++++++---
  .../permissions/permission_request_manager.h  | 11 ++-
- 38 files changed, 481 insertions(+), 60 deletions(-)
+ 35 files changed, 472 insertions(+), 56 deletions(-)
 
 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -184,7 +181,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -407,10 +407,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -411,10 +411,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    LacrosFirstRunServiceFactory::GetInstance();
  #endif
    LanguageModelManagerFactory::GetInstance();
@@ -199,9 +196,9 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -484,6 +484,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
-         web_contents);
-   }
+@@ -491,6 +491,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+   PolicyAuditorBridge::CreateForWebContents(web_contents);
+   PluginObserverAndroid::CreateForWebContents(web_contents);
    video_tutorials::VideoTutorialTabHelper::CreateForWebContents(web_contents);
 +  LastTabStandingTrackerTabHelper::CreateForWebContents(web_contents);
  #else
@@ -253,15 +250,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -34,6 +34,7 @@ import org.chromium.components.browser_ui.settings.ManagedPreferencesUtils;
- import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -35,6 +35,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+ import org.chromium.components.browser_ui.settings.TextMessagePreference;
  import org.chromium.components.content_settings.ContentSettingValues;
  import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.components.content_settings.SessionModel;
  import org.chromium.components.embedder_support.util.Origin;
  import org.chromium.content_public.browser.BrowserContextHandle;
- 
-@@ -523,6 +524,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+ import org.chromium.content_public.browser.ContentFeatureList;
+@@ -539,6 +540,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
      }
  
@@ -273,7 +270,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      private void setUpClearDataPreference() {
          ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
          long usage = mSite.getTotalUsage();
-@@ -915,6 +921,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -963,6 +969,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          if (contentType == mHighlightedPermission) {
              switchPreference.setBackgroundColor(mHighlightColor);
          }
@@ -295,7 +292,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  import org.chromium.components.location.LocationUtils;
  import org.chromium.content_public.browser.BrowserContextHandle;
  import org.chromium.url.GURL;
-@@ -54,7 +55,8 @@ public class WebsitePreferenceBridge {
+@@ -55,7 +56,8 @@ public class WebsitePreferenceBridge {
  
      @CalledByNative
      private static void insertPermissionInfoIntoList(@ContentSettingsType int type,
@@ -305,7 +302,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (type == ContentSettingsType.MEDIASTREAM_CAMERA
                  || type == ContentSettingsType.MEDIASTREAM_MIC) {
              for (PermissionInfo info : list) {
-@@ -63,7 +65,7 @@ public class WebsitePreferenceBridge {
+@@ -64,7 +66,7 @@ public class WebsitePreferenceBridge {
                  }
              }
          }
@@ -317,7 +314,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
 --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
 +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
-@@ -120,7 +120,8 @@ typedef void (*InfoListInsertionFunction)(
+@@ -122,7 +122,8 @@ typedef void (*InfoListInsertionFunction)(
      const base::android::JavaRef<jobject>&,
      const base::android::JavaRef<jstring>&,
      const base::android::JavaRef<jstring>&,
@@ -327,16 +324,16 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
  
  void GetOrigins(JNIEnv* env,
                  const JavaParamRef<jobject>& jbrowser_context_handle,
-@@ -162,7 +163,7 @@ void GetOrigins(JNIEnv* env,
+@@ -164,7 +165,7 @@ void GetOrigins(JNIEnv* env,
      seen_origins.push_back(origin);
      insertionFunc(env, static_cast<int>(content_type), list,
                    ConvertOriginToJavaString(env, origin), jembedder,
 -                  /*is_embargoed=*/false);
-+                  /*is_embargoed=*/false, static_cast<int>(settings_it.session_model));
++                  /*is_embargoed=*/false, static_cast<int>(settings_it.metadata.session_model));
    }
  
    // Add any origins which have a default content setting value (thus skipped
-@@ -184,7 +185,7 @@ void GetOrigins(JNIEnv* env,
+@@ -186,7 +187,7 @@ void GetOrigins(JNIEnv* env,
        seen_origins.push_back(origin);
        insertionFunc(env, static_cast<int>(content_type), list,
                      ConvertOriginToJavaString(env, origin), jembedder,
@@ -348,7 +345,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
 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
-@@ -600,6 +600,11 @@
+@@ -608,6 +608,11 @@
        <message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
          URL truncated
        </message>
@@ -374,7 +371,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
 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
-@@ -184,4 +184,33 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
+@@ -189,6 +189,35 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration) {
    return base::Time::Now() + duration;
  }
  
@@ -392,13 +389,13 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 +
 +bool IsConstraintSessionExpiration(const ContentSettingPatternSource& source,
 +                                   LifetimeMode lifetime_mode) {
-+  if (source.session_model != content_settings::SessionModel::UserSession)
++  if (source.metadata.session_model != content_settings::SessionModel::UserSession)
 +    return false;
 +
 +  LifetimeMode type;
-+  if (source.expiration == base::Time()) {
++  if (source.metadata.expiration == base::Time()) {
 +    type = LifetimeMode::UntilBrowserClosed;
-+  } else if (source.expiration == (base::Time() + base::Hours(1))) {
++  } else if (source.metadata.expiration == (base::Time() + base::Hours(1))) {
 +    type = LifetimeMode::OnlyThisTime;
 +  } else {
 +    type = LifetimeMode::UntilOriginClosed;
@@ -407,13 +404,15 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 +  return lifetime_mode == type;
 +}
 +
- }  // namespace content_settings
+ bool CanTrackLastVisit(ContentSettingsType type) {
+ #if BUILDFLAG(IS_ANDROID)
+   // The notification provider on Android does not support last visit tracking.
 diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
 --- a/components/content_settings/core/browser/content_settings_utils.h
 +++ b/components/content_settings/core/browser/content_settings_utils.h
-@@ -73,6 +73,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
- // Returns the expiration time for a supplied |duration|.
- base::Time GetConstraintExpiration(const base::TimeDelta duration);
+@@ -76,6 +76,12 @@ base::Time GetConstraintExpiration(const base::TimeDelta duration);
+ // Returns whether the given type supports tracking last_visit timestamps.
+ bool CanTrackLastVisit(ContentSettingsType type);
  
 +ContentSettingConstraints GetConstraintSessionExpiration(LifetimeMode lifetime_mode);
 +
@@ -421,71 +420,9 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b
 +    const ContentSettingPatternSource& source,
 +    LifetimeMode lifetime_mode);
 +
- }  // namespace content_settings
+ // Get a timestamp with week-precision.
+ base::Time GetCoarseTime(base::Time time);
  
- #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_UTILS_H_
-diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
---- a/components/content_settings/core/browser/host_content_settings_map.cc
-+++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -847,7 +847,7 @@ void HostContentSettingsMap::AddSettingsForOneType(
-     settings->emplace_back(rule.primary_pattern, rule.secondary_pattern,
-                            std::move(value),
-                            kProviderNamesSourceMap[provider_type].provider_name,
--                           incognito, rule.expiration);
-+                           incognito, rule.expiration, rule.session_model);
-   }
- }
- 
-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
-@@ -158,13 +158,15 @@ ContentSettingPatternSource::ContentSettingPatternSource(
-     base::Value setting_value,
-     const std::string& source,
-     bool incognito,
--    base::Time expiration)
-+    base::Time expiration,
-+    content_settings::SessionModel session_model)
-     : primary_pattern(primary_pattern),
-       secondary_pattern(secondary_pattern),
-       setting_value(std::move(setting_value)),
-       expiration(expiration),
-       source(source),
--      incognito(incognito) {}
-+      incognito(incognito),
-+      session_model(session_model) {}
- 
- ContentSettingPatternSource::ContentSettingPatternSource() : incognito(false) {}
- 
-@@ -181,6 +183,7 @@ ContentSettingPatternSource& ContentSettingPatternSource::operator=(
-   expiration = other.expiration;
-   source = other.source;
-   incognito = other.incognito;
-+  session_model = other.session_model;
-   return *this;
- }
- 
-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
-@@ -49,7 +49,8 @@ struct ContentSettingPatternSource {
-                               base::Value setting_value,
-                               const std::string& source,
-                               bool incognito,
--                              base::Time expiration = base::Time());
-+                              base::Time expiration = base::Time(),
-+                              content_settings::SessionModel session_model = content_settings::SessionModel::Durable);
-   ContentSettingPatternSource(const ContentSettingPatternSource& other);
-   ContentSettingPatternSource();
-   ContentSettingPatternSource& operator=(
-@@ -64,6 +65,7 @@ struct ContentSettingPatternSource {
-   base::Time expiration;
-   std::string source;
-   bool incognito;
-+  content_settings::SessionModel session_model;
- };
- 
- typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
 diff --git a/components/content_settings/core/common/content_settings_constraints.h b/components/content_settings/core/common/content_settings_constraints.h
 --- a/components/content_settings/core/common/content_settings_constraints.h
 +++ b/components/content_settings/core/common/content_settings_constraints.h
@@ -555,7 +492,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
              }
          }
  
-@@ -123,13 +128,15 @@ public class PermissionParamsListBuilder {
+@@ -124,13 +129,15 @@ public class PermissionParamsListBuilder {
          public final String nameMidSentence;
          public final int type;
          public final @ContentSettingValues int setting;
@@ -575,7 +512,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
 --- a/components/page_info/android/page_info_controller_android.cc
 +++ b/components/page_info/android/page_info_controller_android.cc
-@@ -162,6 +162,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -171,6 +171,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
@@ -584,7 +521,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
  
    for (const auto& permission : permission_info_list) {
      if (base::Contains(permissions_to_display, permission.type)) {
-@@ -170,6 +172,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -179,6 +181,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
        if (setting_to_display) {
          user_specified_settings_to_display[permission.type] =
              *setting_to_display;
@@ -593,7 +530,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
        }
      }
    }
-@@ -186,7 +190,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -195,7 +199,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
@@ -603,7 +540,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
      }
    }
  
-@@ -199,7 +204,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -208,7 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
          env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
          ConvertUTF16ToJavaString(env, object_title),
          static_cast<jint>(chosen_object->ui_info.content_settings_type),
@@ -616,19 +553,19 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1084,6 +1084,8 @@ void PageInfo::PresentSitePermissions() {
+@@ -1189,6 +1189,8 @@ void PageInfo::PresentSitePermissions() {
      permission_info.source = info.source;
-     permission_info.is_one_time =
-         (info.session_model == content_settings::SessionModel::OneTime);
+     permission_info.is_one_time = (info.metadata.session_model ==
+                                    content_settings::SessionModel::OneTime);
 +    permission_info.is_user_session =
-+        (info.session_model == content_settings::SessionModel::UserSession);
++        (info.metadata.session_model == content_settings::SessionModel::UserSession);
  
      if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
          info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
 diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
-@@ -178,6 +178,7 @@ class PageInfo {
+@@ -180,6 +180,7 @@ class PageInfo : private content_settings::CookieControlsView {
      content_settings::SettingSource source =
          content_settings::SETTING_SOURCE_NONE;
      bool is_one_time = false;
@@ -834,7 +771,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.cc b/components/permissions/android/permission_prompt/permission_prompt_android.cc
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.cc
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.cc
-@@ -40,6 +40,14 @@ void PermissionPromptAndroid::Accept() {
+@@ -41,6 +41,14 @@ void PermissionPromptAndroid::Accept() {
    delegate_->Accept();
  }
  
@@ -1021,7 +958,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -250,6 +250,20 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -226,6 +226,20 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(delete_callback));
  }
  
@@ -1042,7 +979,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  PermissionResult PermissionContextBase::GetPermissionStatus(
      content::RenderFrameHost* render_frame_host,
      const GURL& requesting_origin,
-@@ -441,7 +455,8 @@ void PermissionContextBase::PermissionDecided(
+@@ -405,7 +419,8 @@ void PermissionContextBase::PermissionDecided(
      const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      ContentSetting content_setting,
@@ -1052,7 +989,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
           content_setting == CONTENT_SETTING_BLOCK ||
           content_setting == CONTENT_SETTING_DEFAULT);
-@@ -449,9 +464,9 @@ void PermissionContextBase::PermissionDecided(
+@@ -413,9 +428,9 @@ void PermissionContextBase::PermissionDecided(
                               content_setting);
  
    bool persist = content_setting != CONTENT_SETTING_DEFAULT;
@@ -1064,7 +1001,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  }
  
  content::BrowserContext* PermissionContextBase::browser_context() const {
-@@ -501,11 +516,26 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -465,11 +480,26 @@ void PermissionContextBase::NotifyPermissionSet(
      bool persist,
      ContentSetting content_setting,
      bool is_one_time) {
@@ -1092,7 +1029,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  
    UpdateTabContext(id, requesting_origin,
-@@ -526,6 +556,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -490,6 +520,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                   const GURL& embedding_origin,
                                                   ContentSetting content_setting,
                                                   bool is_one_time) {
@@ -1108,7 +1045,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
    DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
    DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-@@ -534,6 +573,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -498,6 +537,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
    content_settings::ContentSettingConstraints constraints = {
        base::Time(), is_one_time ? content_settings::SessionModel::OneTime
                                  : content_settings::SessionModel::Durable};
@@ -1120,7 +1057,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
 --- a/components/permissions/permission_context_base.h
 +++ b/components/permissions/permission_context_base.h
-@@ -141,6 +141,14 @@ class PermissionContextBase : public KeyedService,
+@@ -139,6 +139,14 @@ class PermissionContextBase : public content_settings::Observer {
  
    // Updates stored content setting if persist is set, updates tab indicators
    // and runs the callback to finish the request.
@@ -1135,7 +1072,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    virtual void NotifyPermissionSet(const PermissionRequestID& id,
                                     const GURL& requesting_origin,
                                     const GURL& embedding_origin,
-@@ -161,6 +169,11 @@ class PermissionContextBase : public KeyedService,
+@@ -159,6 +167,11 @@ class PermissionContextBase : public content_settings::Observer {
    // Store the decided permission as a content setting.
    // virtual since the permission might be stored with different restrictions
    // (for example for desktop notifications).
@@ -1147,7 +1084,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    virtual void UpdateContentSetting(const GURL& requesting_origin,
                                      const GURL& embedding_origin,
                                      ContentSetting content_setting,
-@@ -193,6 +206,14 @@ class PermissionContextBase : public KeyedService,
+@@ -191,6 +204,14 @@ class PermissionContextBase : public content_settings::Observer {
        PermissionRequest::PermissionDecidedCallback permission_decided_callback,
        base::OnceClosure delete_callback) const;
  
@@ -1162,7 +1099,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    ContentSettingsType content_settings_type() const {
      return content_settings_type_;
    }
-@@ -219,7 +240,8 @@ class PermissionContextBase : public KeyedService,
+@@ -217,7 +238,8 @@ class PermissionContextBase : public content_settings::Observer {
                           const GURL& embedding_origin,
                           BrowserPermissionCallback callback,
                           ContentSetting content_setting,
@@ -1189,7 +1126,7 @@ diff --git a/components/permissions/permission_prompt.h b/components/permissions
 diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc
 --- a/components/permissions/permission_request.cc
 +++ b/components/permissions/permission_request.cc
-@@ -30,6 +30,18 @@ PermissionRequest::PermissionRequest(
+@@ -31,6 +31,18 @@ PermissionRequest::PermissionRequest(
        permission_decided_callback_(std::move(permission_decided_callback)),
        delete_callback_(std::move(delete_callback)) {}
  
@@ -1208,7 +1145,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    DCHECK(delete_callback_.is_null());
  }
-@@ -237,17 +249,35 @@ std::u16string PermissionRequest::GetMessageTextFragment() const {
+@@ -235,17 +247,35 @@ std::u16string PermissionRequest::GetMessageTextFragment() const {
  }
  #endif
  
@@ -1273,7 +1210,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    PermissionRequest(const PermissionRequest&) = delete;
    PermissionRequest& operator=(const PermissionRequest&) = delete;
  
-@@ -97,10 +107,10 @@ class PermissionRequest {
+@@ -106,10 +116,10 @@ class PermissionRequest {
    // If |is_one_time| is true the permission will last until all tabs of
    // |origin| are closed or navigated away from, and then the permission will
    // automatically expire after 1 day.
@@ -1286,7 +1223,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
  
    // Called when the user has cancelled the permission request. This
    // corresponds to a denial, but is segregated in case the context needs to
-@@ -138,6 +148,9 @@ class PermissionRequest {
+@@ -147,6 +157,9 @@ class PermissionRequest {
    // Called once a decision is made about the permission.
    PermissionDecidedCallback permission_decided_callback_;
  
@@ -1299,7 +1236,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -152,7 +152,7 @@ void PermissionRequestManager::AddRequest(
+@@ -148,7 +148,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1308,7 +1245,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      request->RequestFinished();
      return;
    }
-@@ -228,7 +228,7 @@ void PermissionRequestManager::AddRequest(
+@@ -224,7 +224,7 @@ void PermissionRequestManager::AddRequest(
    if (auto_approval_origin) {
      if (url::Origin::Create(request->requesting_origin()) ==
          auto_approval_origin.value()) {
@@ -1317,14 +1254,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      }
      request->RequestFinished();
      return;
-@@ -487,12 +487,13 @@ void PermissionRequestManager::Accept() {
-   for (requests_iter = requests_.begin(); requests_iter != requests_.end();
-        requests_iter++) {
+@@ -541,14 +541,15 @@ void PermissionRequestManager::Accept() {
+                                 (*requests_iter)->request_type(),
+                                 PermissionAction::GRANTED);
      PermissionGrantedIncludingDuplicates(*requests_iter,
 -                                         /*is_one_time=*/false);
 +                                         /*is_one_time=*/false,
 +                                         content_settings::LifetimeMode::Always);
    }
+ 
+   NotifyRequestDecided(PermissionAction::GRANTED);
    FinalizeCurrentRequests(PermissionAction::GRANTED);
  }
  
@@ -1333,15 +1272,17 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -500,12 +501,22 @@ void PermissionRequestManager::AcceptThisTime() {
-   for (requests_iter = requests_.begin(); requests_iter != requests_.end();
-        requests_iter++) {
+@@ -559,7 +560,8 @@ void PermissionRequestManager::AcceptThisTime() {
+                                 (*requests_iter)->request_type(),
+                                 PermissionAction::GRANTED_ONCE);
      PermissionGrantedIncludingDuplicates(*requests_iter,
 -                                         /*is_one_time=*/true);
 +                                         /*is_one_time=*/true,
 +                                         mode);
    }
-   FinalizeCurrentRequests(PermissionAction::GRANTED_ONCE);
+ 
+   NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
+@@ -567,6 +569,15 @@ void PermissionRequestManager::AcceptThisTime() {
  }
  
  void PermissionRequestManager::Deny() {
@@ -1357,16 +1298,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -527,7 +538,7 @@ void PermissionRequestManager::Deny() {
-   std::vector<PermissionRequest*>::iterator requests_iter;
-   for (requests_iter = requests_.begin(); requests_iter != requests_.end();
-        requests_iter++) {
+@@ -589,7 +600,7 @@ void PermissionRequestManager::Deny() {
+     StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
+                                 (*requests_iter)->request_type(),
+                                 PermissionAction::DENIED);
 -    PermissionDeniedIncludingDuplicates(*requests_iter);
 +    PermissionDeniedIncludingDuplicates(*requests_iter, is_one_time, lifetime_option);
    }
-   FinalizeCurrentRequests(PermissionAction::DENIED);
- }
-@@ -892,25 +903,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
+ 
+   NotifyRequestDecided(PermissionAction::DENIED);
+@@ -967,25 +978,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1398,7 +1339,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  }
  
  void PermissionRequestManager::CancelledIncludingDuplicates(
-@@ -1090,7 +1101,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
+@@ -1187,7 +1198,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
  void PermissionRequestManager::DoAutoResponseForTesting() {
    switch (auto_response_for_test_) {
      case ACCEPT_ONCE:
@@ -1410,7 +1351,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h
 --- a/components/permissions/permission_request_manager.h
 +++ b/components/permissions/permission_request_manager.h
-@@ -134,8 +134,10 @@ class PermissionRequestManager
+@@ -141,8 +141,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1422,7 +1363,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    bool WasCurrentRequestAlreadyDisplayed() override;
-@@ -272,9 +274,12 @@ class PermissionRequestManager
+@@ -303,9 +305,12 @@ class PermissionRequestManager
  
    // Calls PermissionGranted on a request and all its duplicates.
    void PermissionGrantedIncludingDuplicates(PermissionRequest* request,

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

@@ -5,8 +5,8 @@ Subject: Add menu item to bookmark all tabs
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/menu/main_menu.xml    |  7 +++
- .../chrome/browser/ChromeTabbedActivity.java  | 26 ++++++++
- .../browser/bookmarks/BookmarkBridge.java     | 60 +++++++++++++++++++
+ .../chrome/browser/ChromeTabbedActivity.java  | 24 ++++++++
+ .../browser/bookmarks/BookmarkBridge.java     | 61 +++++++++++++++++++
  .../browser/bookmarks/BookmarkUtils.java      |  4 ++
  .../bookmarks/android/bookmark_bridge.cc      | 17 ++++++
  .../bookmarks/android/bookmark_bridge.h       |  4 ++
@@ -25,12 +25,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  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(-)
+ 21 files changed, 201 insertions(+), 10 deletions(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -64,6 +64,10 @@
+@@ -66,6 +66,10 @@ found in the LICENSE file.
          <item android:id="@+id/all_bookmarks_menu_id"
              android:title="@string/menu_bookmarks"
              android:icon="@drawable/btn_star_filled" />
@@ -41,29 +41,28 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/recent_tabs_menu_id"
              android:title="@string/menu_recent_tabs"
              android:icon="@drawable/devices_black_24dp" />
-@@ -182,6 +186,9 @@
+@@ -184,6 +188,9 @@ found in the LICENSE file.
          <item android:id="@+id/menu_group_tabs"
              android:title="@string/menu_group_tabs"
              android:icon="@drawable/ic_widgets" />
 +        <item android:id="@+id/bookmark_all_tabs_menu_id"
 +            android:title="@string/menu_bookmark_all_tabs"
 +            android:icon="@drawable/ic_folder_blue_24dp" />
-         <item android:id="@+id/track_prices_row_menu_id"
-             android:title="@string/menu_track_prices"
-             android:icon="@drawable/ic_trending_down_black" />
+         <item android:id="@+id/menu_select_tabs"
+             android:title="@string/menu_select_tabs"
+             android:icon="@drawable/ic_select_tabs" />
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -75,6 +75,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
+@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 +import org.chromium.chrome.browser.bookmarks.BookmarkModel;
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -2188,6 +2190,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2203,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
                      () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -72,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              // Close only incognito tabs
              CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
-@@ -2240,6 +2244,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2255,6 +2258,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          mTabModalHandler.onOmniboxFocusChanged(hasFocus);
      }
  
@@ -84,17 +83,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +            return;
 +        }
 +
-+        final BookmarkBridge bridge = mBookmarkBridgeSupplier.get();
-+        final BookmarkModel bookmarkModel = new BookmarkModel();
++        final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();
 +        bookmarkModel.finishLoadingBookmarkModel(() -> {
 +            for (int i = 0; i < tabModel.getCount(); i++) {
 +                Tab tab = tabModel.getTabAt(i);
 +                if (tab.isNativePage()) {
 +                    continue;
 +                }
-+                bridge.addToTabsCollection(this, tab);
++                bookmarkModel.addToTabsCollection(this, tab);
 +            }
-+            bridge.finishedAddingToTabsCollection(this, getSnackbarManager());
++            bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager());
 +        });
 +    }
 +
@@ -121,17 +119,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
 +import org.chromium.chrome.R;
  import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkItem;
  import org.chromium.components.bookmarks.BookmarkType;
- import org.chromium.components.commerce.PriceTracking.ProductPrice;
-@@ -87,6 +92,7 @@ import java.io.File;
+@@ -86,6 +91,8 @@ import java.io.File;
   * bookmark model stored in native.
   */
- public class BookmarkBridge {
+ class BookmarkBridge {
 +    private static final String TAG = "BookmarkBridge";
++
      private final Profile mProfile;
      private boolean mIsDestroyed;
      private boolean mIsDoingExtensiveChanges;
-@@ -604,6 +610,16 @@ public class BookmarkBridge {
+@@ -393,6 +400,16 @@ class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this);
      }
  
@@ -148,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * @return Id representing the special "other" folder from bookmark model.
       */
-@@ -1241,6 +1257,49 @@ public class BookmarkBridge {
+@@ -1030,6 +1047,49 @@ class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this, title, url);
      }
  
@@ -198,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /**
       * @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.
-@@ -1538,6 +1597,7 @@ public class BookmarkBridge {
+@@ -1327,6 +1387,7 @@ class BookmarkBridge {
          void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
                  List<BookmarkId> folderList, List<Integer> depthList);
          BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
@@ -209,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/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
-@@ -616,6 +616,7 @@ public class BookmarkUtils {
+@@ -648,6 +648,7 @@ public class BookmarkUtils {
          List<BookmarkId> topLevelFolders = new ArrayList<>();
          BookmarkId desktopNodeId = bookmarkModel.getDesktopFolderId();
          BookmarkId mobileNodeId = bookmarkModel.getMobileFolderId();
@@ -217,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          BookmarkId othersNodeId = bookmarkModel.getOtherFolderId();
  
          List<BookmarkId> specialFoldersIds =
-@@ -641,6 +642,9 @@ public class BookmarkUtils {
+@@ -673,6 +674,9 @@ public class BookmarkUtils {
          if (bookmarkModel.isFolderVisible(mobileNodeId)) {
              topLevelFolders.add(mobileNodeId);
          }
@@ -230,7 +229,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -436,6 +436,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
+@@ -437,6 +437,11 @@ void BookmarkBridge::GetTopLevelFolderIDs(
          top_level_folders.push_back(node.get());
      }
  
@@ -242,7 +241,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
      for (const auto& node : bookmark_model_->bookmark_bar_node()->children()) {
        if (node->is_folder())
          top_level_folders.push_back(node.get());
-@@ -483,6 +488,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -484,6 +489,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
    // Vector to temporarily contain all child bookmarks at same level for sorting
    std::vector<const BookmarkNode*> bookmarks = {
        bookmark_model_->mobile_node(),
@@ -250,7 +249,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -535,6 +541,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
+@@ -536,6 +542,17 @@ ScopedJavaLocalRef<jobject> BookmarkBridge::GetMobileFolderId(
    return folder_id_obj;
  }
  
@@ -317,7 +316,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
 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(
+@@ -144,6 +144,8 @@ bool ChromeBookmarkClient::IsPermanentNodeVisibleWhenEmpty(
        return !is_mobile;
      case bookmarks::BookmarkNode::MOBILE:
        return is_mobile;
@@ -350,7 +349,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 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
-@@ -3600,6 +3600,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3606,6 +3606,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_TRACK_PRICES" desc="Menu item for tracking prices on tabs. [CHAR_LIMIT=27]">
          Track prices
        </message>
@@ -386,7 +385,7 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
 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";
+@@ -35,6 +35,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
  const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
  // The value is left as 'synced' for historical reasons.
  const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
@@ -394,33 +393,33 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  const char BookmarkCodec::kVersionKey[] = "version";
  const char BookmarkCodec::kChecksumKey[] = "checksum";
  const char BookmarkCodec::kIdKey[] = "id";
-@@ -76,7 +77,8 @@ BookmarkCodec::~BookmarkCodec() = default;
+@@ -78,7 +79,8 @@ BookmarkCodec::~BookmarkCodec() = default;
  base::Value BookmarkCodec::Encode(BookmarkModel* model,
                                    std::string sync_metadata_str) {
    return Encode(model->bookmark_bar_node(), model->other_node(),
 -                model->mobile_node(), model->root_node()->GetMetaInfoMap(),
 +                model->mobile_node(), model->tabs_collection_node(),
 +                model->root_node()->GetMetaInfoMap(),
+                 model->root_node()->GetUnsyncedMetaInfoMap(),
                  std::move(sync_metadata_str));
  }
- 
-@@ -84,6 +86,7 @@ base::Value BookmarkCodec::Encode(
+@@ -87,6 +89,7 @@ base::Value BookmarkCodec::Encode(
      const BookmarkNode* bookmark_bar_node,
      const BookmarkNode* other_folder_node,
      const BookmarkNode* mobile_folder_node,
 +    const BookmarkNode* tabs_folder_node,
      const BookmarkNode::MetaInfoMap* model_meta_info_map,
+     const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
      std::string sync_metadata_str) {
-   ids_reassigned_ = false;
-@@ -105,6 +108,7 @@ base::Value BookmarkCodec::Encode(
+@@ -109,6 +112,7 @@ base::Value BookmarkCodec::Encode(
    roots.SetKey(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
    roots.SetKey(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
    roots.SetKey(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
 +  roots.SetKey(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
    if (model_meta_info_map)
      roots.SetKey(kMetaInfo, EncodeMetaInfo(*model_meta_info_map));
-   FinalizeChecksum();
-@@ -121,6 +125,7 @@ bool BookmarkCodec::Decode(const base::Value& value,
+   if (model_unsynced_meta_info_map) {
+@@ -130,6 +134,7 @@ bool BookmarkCodec::Decode(const base::Value& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
@@ -428,7 +427,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                             int64_t* max_id,
                             std::string* sync_metadata_str) {
    ids_.clear();
-@@ -128,7 +133,8 @@ bool BookmarkCodec::Decode(const base::Value& value,
+@@ -137,7 +142,8 @@ bool BookmarkCodec::Decode(const base::Value& value,
              base::GUID::ParseLowercase(BookmarkNode::kBookmarkBarNodeGuid),
              base::GUID::ParseLowercase(BookmarkNode::kOtherBookmarksNodeGuid),
              base::GUID::ParseLowercase(BookmarkNode::kMobileBookmarksNodeGuid),
@@ -438,7 +437,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    ids_reassigned_ = false;
    guids_reassigned_ = false;
    ids_valid_ = true;
-@@ -136,12 +142,13 @@ bool BookmarkCodec::Decode(const base::Value& value,
+@@ -145,12 +151,13 @@ bool BookmarkCodec::Decode(const base::Value& value,
    stored_checksum_.clear();
    InitializeChecksum();
    bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
@@ -453,7 +452,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    *max_id = maximum_id_ + 1;
    return success;
  }
-@@ -194,6 +201,7 @@ base::Value BookmarkCodec::EncodeMetaInfo(
+@@ -207,6 +214,7 @@ base::Value BookmarkCodec::EncodeMetaInfo(
  bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                   BookmarkNode* other_folder_node,
                                   BookmarkNode* mobile_folder_node,
@@ -461,7 +460,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                                   const base::Value& value,
                                   std::string* sync_metadata_str) {
    if (!value.is_dict())
-@@ -225,6 +233,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -238,6 +246,12 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
      return false;
  
    DecodeNode(*bb_value, nullptr, bb_node);
@@ -474,7 +473,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    DecodeNode(*other_folder_value, nullptr, other_folder_node);
    DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
  
-@@ -470,11 +484,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+@@ -508,11 +522,13 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,
@@ -492,15 +491,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 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 {
+@@ -49,6 +49,7 @@ class BookmarkCodec {
+       const BookmarkNode* bookmark_bar_node,
+       const BookmarkNode* other_folder_node,
+       const BookmarkNode* mobile_folder_node,
++      const BookmarkNode* tabs_folder_node,
+       const BookmarkNode::MetaInfoMap* model_meta_info_map,
+       const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
+       std::string sync_metadata_str);
+@@ -62,6 +63,7 @@ class BookmarkCodec {
                BookmarkNode* bb_node,
                BookmarkNode* other_folder_node,
                BookmarkNode* mobile_folder_node,
@@ -508,7 +507,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -105,6 +107,7 @@ class BookmarkCodec {
+@@ -113,6 +115,7 @@ class BookmarkCodec {
    // Allows the BookmarkClient to read and a write a string blob from the JSON
    // file. That string captures the bookmarks sync metadata.
    static const char kSyncMetadata[];
@@ -516,7 +515,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
    static const char kDateLastUsed[];
  
    // Possible values for kTypeKey.
-@@ -122,6 +125,7 @@ class BookmarkCodec {
+@@ -130,6 +133,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -524,7 +523,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value& value,
                      std::string* sync_metadata_str);
  
-@@ -133,7 +137,8 @@ class BookmarkCodec {
+@@ -141,7 +145,8 @@ class BookmarkCodec {
    // Reassigns bookmark IDs for all nodes.
    void ReassignIDs(BookmarkNode* bb_node,
                     BookmarkNode* other_node,
@@ -559,7 +558,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
  
    TitledUrlIndex* index() { return index_.get(); }
    std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); }
-@@ -103,6 +104,7 @@ class BookmarkLoadDetails {
+@@ -110,6 +111,7 @@ class BookmarkLoadDetails {
    raw_ptr<BookmarkPermanentNode> bb_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> other_folder_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> mobile_folder_node_ = nullptr;
@@ -570,7 +569,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 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
-@@ -618,7 +618,7 @@ bool BookmarkModel::HasBookmarks() {
+@@ -670,7 +670,7 @@ bool BookmarkModel::HasBookmarks() {
  bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    return bookmark_bar_node_->children().empty() &&
@@ -579,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) {
-@@ -871,6 +871,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -926,6 +926,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
    bookmark_bar_node_ = details->bb_node();
    other_node_ = details->other_folder_node();
    mobile_node_ = details->mobile_folder_node();
@@ -590,7 +589,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 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,
+@@ -122,6 +122,12 @@ class BookmarkModel : public BookmarkUndoProvider,
      return mobile_node_;
    }
  
@@ -603,7 +602,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
    bool is_root_node(const BookmarkNode* node) const {
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
      return node == root_;
-@@ -426,6 +432,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -445,6 +451,7 @@ class BookmarkModel : public BookmarkUndoProvider,
    raw_ptr<BookmarkPermanentNode> bookmark_bar_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> other_node_ = nullptr;
    raw_ptr<BookmarkPermanentNode> mobile_node_ = nullptr;
@@ -625,7 +624,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmark
  // static
  const char BookmarkNode::kManagedNodeGuid[] =
      "323123f4-9381-5aee-80e6-ea5fca2f7672";
-@@ -225,6 +229,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
+@@ -275,6 +279,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
        visible_when_empty));
  }
  
@@ -662,7 +661,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
    static const char kManagedNodeGuid[];
  
    // A bug in sync caused some problematic GUIDs to be produced.
-@@ -256,6 +258,9 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -270,6 +272,9 @@ class BookmarkPermanentNode : public BookmarkNode {
    static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
        int64_t id,
        bool visible_when_empty);
@@ -675,7 +674,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
 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
-@@ -57,7 +57,8 @@ void LoadBookmarks(const base::FilePath& path,
+@@ -58,7 +58,8 @@ void LoadBookmarks(const base::FilePath& path,
        std::string sync_metadata_str;
        BookmarkCodec codec;
        codec.Decode(*root, details->bb_node(), details->other_folder_node(),
@@ -688,7 +687,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
 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
-@@ -441,6 +441,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+@@ -446,6 +446,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
      case bookmarks::BookmarkNode::BOOKMARK_BAR:
      case bookmarks::BookmarkNode::OTHER_NODE:
      case bookmarks::BookmarkNode::MOBILE:

build/patches/Add-menu-item-to-view-source.patch

@@ -4,19 +4,19 @@ Subject: Add menu item to view source
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/custom_tabs_menu.xml  |  3 +++
- chrome/android/java/res/menu/main_menu.xml         |  3 +++
- .../chrome/browser/ChromeTabbedActivity.java       |  2 ++
- .../chrome/browser/app/ChromeActivity.java         |  5 +++++
- .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java        |  1 +
- .../ui/android/strings/android_chrome_strings.grd  |  4 ++++
- 7 files changed, 32 insertions(+)
+ .../android/java/res/menu/custom_tabs_menu.xml |  3 +++
+ chrome/android/java/res/menu/main_menu.xml     |  3 +++
+ .../chrome/browser/ChromeTabbedActivity.java   |  2 ++
+ .../chrome/browser/app/ChromeActivity.java     |  5 +++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java | 18 ++++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java    |  1 +
+ .../android/strings/android_chrome_strings.grd |  4 ++++
+ 7 files changed, 36 insertions(+)
 
 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
 +++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -46,6 +46,9 @@
+@@ -51,6 +51,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:orderInCategory="2" />
@@ -29,7 +29,7 @@ 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 @@
+@@ -108,6 +108,9 @@ found in the LICENSE file.
          <item android:id="@+id/add_to_homescreen_id"
              android:title="@string/menu_add_to_homescreen"
              android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -2214,6 +2214,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2229,6 +2229,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 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
-@@ -2428,6 +2428,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2445,6 +2445,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 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
-@@ -540,6 +540,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -543,6 +543,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                          isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
  
          updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  
          updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
  
-@@ -1170,6 +1171,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1242,6 +1243,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          stopPriceTrackingMenuItem.setVisible(false);
      }
  
@@ -90,8 +90,12 @@ 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();
-+        viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:"));
++        boolean visible = false;
++        if (currentTab != null) {
++                String url = currentTab.getUrl().getSpec();
++                visible = !url.isEmpty() && !url.startsWith("view-source:");
++        }
++        viewSourceMenuItem.setVisible(visible);
 +    }
 +
      /**
@@ -100,7 +104,7 @@ 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
-@@ -220,6 +220,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -228,6 +228,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  
              updateRequestDesktopSiteMenuItem(
                      menu, currentTab, requestDesktopSiteVisible, isChromeScheme);

build/patches/Add-option-to-force-tablet-UI.patch

@@ -50,7 +50,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 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
-@@ -390,6 +390,7 @@ public final class ChromePreferenceKeys {
+@@ -430,6 +430,7 @@ public final class ChromePreferenceKeys {
              AccessibilityConstants.FONT_USER_SET_FORCE_ENABLE_ZOOM;
  
      public static final String HISTORY_SHOW_HISTORY_INFO = "history_home_show_info";
@@ -61,7 +61,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 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
-@@ -66,6 +66,7 @@ public class LegacyChromePreferenceKeys {
+@@ -67,6 +67,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.FLAGS_CACHED_SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,
                  ChromePreferenceKeys.FLAGS_CACHED_TAB_GROUPS_ANDROID_ENABLED,
                  ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 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
-@@ -355,7 +355,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -376,7 +376,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
      // OmniboxSuggestionsDropdownEmbedder implementation
      @Override
      public boolean isTablet() {
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 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
-@@ -1433,6 +1433,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1439,6 +1439,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_PRIVACY_GUIDE_SB_ENHANCED_ITEM_SEVEN" desc="Seventh bullet point that describes the details of the Safe Browsing control.">
          Temporarily links this data to your Google Account when you’re signed in, to protect you across Google apps
        </message>
@@ -100,10 +100,10 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -119,22 +119,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
-         mToolbar = toolbar;
-         mToolbarContainer.setPostInitializationDependencies(
-                 mToolbar, constraintsSupplier, tabSupplier);
+@@ -138,22 +138,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
+         mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier,
+                 tabSupplier, compositorInMotionSupplier,
+                 browserStateBrowserControlsVisibilityDelegate, isVisible);
 -
 -        View toolbarView = findViewById(R.id.toolbar);
 -        assert toolbarView != null;
@@ -135,7 +135,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
    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
-@@ -667,7 +667,7 @@ test("components_unittests") {
+@@ -671,7 +671,7 @@ test("components_unittests") {
    # On other platforms, no components should depend on Chrome.
    # Since //chrome depends on //extensions, we also only assert_no_deps on
    # extensions targets for non-lacros builds.
@@ -144,7 +144,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
      assert_no_deps = [ "//chrome/*" ]
      assert_no_deps += disallowed_extension_deps_
    }
-@@ -955,7 +955,7 @@ if (!is_ios) {
+@@ -950,7 +950,7 @@ if (!is_ios) {
      # dependency. On other platforms, no components should depend on Chrome.
      # Since //chrome depends on //extensions, we also only assert_no_deps on
      # extensions targets for non-lacros builds.
@@ -156,7 +156,7 @@ diff --git a/components/BUILD.gn b/components/BUILD.gn
 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
-@@ -34,6 +34,11 @@
+@@ -36,6 +36,11 @@ found in the LICENSE file.
          android:summary="@string/accessibility_tab_switcher_summary"
          android:title="@string/accessibility_tab_switcher_title" />
  
@@ -217,7 +217,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
 --- a/ui/android/BUILD.gn
 +++ b/ui/android/BUILD.gn
-@@ -370,6 +370,8 @@ android_library("ui_no_recycler_view_java") {
+@@ -374,6 +374,8 @@ android_library("ui_no_recycler_view_java") {
    deps = [
      ":ui_java_resources",
      ":ui_utils_java",

build/patches/Add-option-to-not-persist-tabs-across-sessions.patch

@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -43,6 +43,11 @@
+@@ -45,6 +45,11 @@ found in the LICENSE file.
          android:title="@string/incognito_settings_title"
          android:summary="@string/incognito_settings_summary"
          android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,15 +28,15 @@ 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
-@@ -38,6 +38,7 @@ import androidx.lifecycle.LifecycleRegistry;
- 
+@@ -40,6 +40,7 @@ import androidx.lifecycle.LifecycleRegistry;
+ import org.chromium.base.BuildInfo;
  import org.chromium.base.CallbackController;
  import org.chromium.base.CommandLine;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.IntentUtils;
  import org.chromium.base.Log;
  import org.chromium.base.MemoryPressureListener;
-@@ -1312,8 +1313,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1322,8 +1323,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -68,16 +68,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -54,6 +57,8 @@ public class PrivacySettings
-     private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
-     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
+@@ -67,6 +70,8 @@ public class PrivacySettings
+             SharedPreferencesManager.getInstance();
+     private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
  
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
 +
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
      private IncognitoLockSettings mIncognitoLockSettings;
  
-@@ -115,7 +120,11 @@ public class PrivacySettings
+@@ -132,7 +137,11 @@ public class PrivacySettings
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
              UserPrefs.get(Profile.getLastUsedRegularProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
-@@ -156,6 +165,11 @@ public class PrivacySettings
+@@ -176,6 +185,11 @@ public class PrivacySettings
                      PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
          }
  
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
-@@ -4475,6 +4475,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4420,6 +4420,12 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>

build/patches/Add-option-to-use-home-page-as-NTP.patch

@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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 @@
+@@ -14,6 +14,11 @@ found in the LICENSE file.
          android:summaryOn="@string/text_on"
          android:summaryOff="@string/text_off" />
  
@@ -134,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 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
-@@ -401,6 +401,7 @@ public final class ChromePreferenceKeys {
+@@ -441,6 +441,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_PARTNER_CUSTOMIZED_DEFAULT_GURL =
              "Chrome.Homepage.PartnerCustomizedDefaultGurl";
  
@@ -145,18 +145,18 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 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
-@@ -71,6 +71,7 @@ public class LegacyChromePreferenceKeys {
+@@ -72,6 +72,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.HOMEPAGE_CUSTOM_URI,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
                  ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
 +                ChromePreferenceKeys.HOMEPAGE_NTP_IS_HOMEPAGE,
                  ChromePreferenceKeys.INCOGNITO_SHORTCUT_ADDED,
                  ChromePreferenceKeys.LATEST_UNSUPPORTED_VERSION,
-                 ChromePreferenceKeys.LOCALE_MANAGER_AUTO_SWITCH,
+                 ChromePreferenceKeys.LEGACY_FIRST_RUN_AND_BACKUP_SIGNIN_COMPLETE,
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1248,6 +1248,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1254,6 +1254,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
          Last hour
        </message>
@@ -195,7 +195,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -380,6 +380,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
+@@ -388,6 +388,7 @@ extern const char kRestrictedManagedGuestSessionExtensionCleanupExemptList[];
  extern const char kUsedPolicyCertificates[];
  #endif  // BUILDFLAG(IS_CHROMEOS)
  extern const char kShowHomeButton[];

build/patches/Add-site-engagement-flag.patch

@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -138,6 +138,7 @@
+@@ -142,6 +142,7 @@
  #include "components/segmentation_platform/public/features.h"
  #include "components/send_tab_to_self/features.h"
  #include "components/services/heap_profiling/public/cpp/switches.h"
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #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"
-@@ -8768,6 +8769,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9174,6 +9175,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSearchReadyOmniboxDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(chrome::android::kSearchReadyOmniboxFeature)},
  
@@ -44,7 +44,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -3283,6 +3283,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
+@@ -3461,6 +3461,11 @@ const char kSkipServiceWorkerFetchHandlerDescription[] =
      "Skips starting the service worker and run the fetch handler if the fetch "
      "handler is recognized as skippable.";
  
@@ -59,7 +59,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
-@@ -1862,6 +1862,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
+@@ -1975,6 +1975,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
  extern const char kSkipServiceWorkerFetchHandlerName[];
  extern const char kSkipServiceWorkerFetchHandlerDescription[];
  

build/patches/Add-support-for-ISupportHelpAndFeedback.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -67,6 +67,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto
+@@ -66,6 +66,7 @@ import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFacto
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.components.browser_ui.settings.FragmentSettingsLauncher;
  import org.chromium.components.browser_ui.settings.SettingsLauncher;
@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  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
+@@ -329,9 +330,13 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              finish();
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {

build/patches/Add-webGL-site-setting.patch

@@ -38,7 +38,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -82,6 +82,9 @@ android_library("java") {
+@@ -92,6 +92,9 @@ android_library("java") {
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java",
    ]
@@ -183,7 +183,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
        <part file="site_settings.grdp" />
 +      <part file="webgl.grdp" />
  
-       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message">
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
          Got it
 diff --git a/components/browser_ui/strings/android/webgl.grdp b/components/browser_ui/strings/android/webgl.grdp
 new file mode 100644
@@ -214,15 +214,15 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 @@ -338,6 +338,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" />
  
++      <part file="browser_ui/strings/android/webgl.grdp" />
        <if expr="not is_ios">
          <part file="history_clusters_strings.grdp" />
+       </if>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -682,6 +682,20 @@ void ContentSettingsRegistry::Init() {
+@@ -669,6 +669,20 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             ContentSettingsInfo::PERSISTENT,
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -246,7 +246,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 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,
+@@ -156,6 +156,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
    std::string timezone;
    map->GetTimezoneOverrideValue(timezone);
    rules->timezone_override_value = timezone;
@@ -279,7 +279,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 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 {
+@@ -96,6 +96,7 @@ struct RendererContentSettingRules {
    ContentSettingsForOneType auto_dark_content_rules;
    ContentSettingsForOneType timezone_override_rules;
    std::string timezone_override_value;
@@ -299,7 +299,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 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,
+@@ -105,7 +105,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           data.ReadMixedContentRules(&out->mixed_content_rules) &&
           data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
           data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
@@ -327,7 +327,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 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
-@@ -280,6 +280,8 @@ enum class ContentSettingsType : int32_t {
+@@ -277,6 +277,8 @@ enum class ContentSettingsType : int32_t {
    // site instead of the mobile one.
    REQUEST_DESKTOP_SITE,
  
@@ -414,7 +414,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 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;
+@@ -96,6 +96,7 @@ class SecurityOrigin;
  class ScriptState;
  class ScriptWrappable;
  class TrustedTypePolicyFactory;
@@ -422,7 +422,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
  
  enum ReasonForCallingCanExecuteScripts {
    kAboutToExecuteScript,
-@@ -105,6 +106,10 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -104,6 +105,10 @@ enum ReasonForCallingCanExecuteScripts {
  
  enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
  
@@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 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
-@@ -244,6 +244,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -246,6 +246,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
    }
  }
  
@@ -450,7 +450,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
  unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
    base::AutoLock locker(WebGLContextLimitLock());
    DCHECK(webgl_context_limits_initialized_);
-@@ -490,25 +497,6 @@ static String ExtractWebGLContextCreationError(
+@@ -492,25 +499,6 @@ static String ExtractWebGLContextCreationError(
      const Platform::GraphicsInfo& info) {
    StringBuilder builder;
    builder.Append("Could not create a WebGL context");
@@ -476,7 +476,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
    FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                            builder);
    builder.Append('.');
-@@ -576,6 +564,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -578,6 +566,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
      const CanvasContextCreationAttributesCore& attributes,
      Platform::ContextType context_type,
      Platform::GraphicsInfo* graphics_info) {

build/patches/Add-webRTC-site-settings.patch

@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -85,6 +85,9 @@ android_library("java") {
+@@ -95,6 +95,9 @@ android_library("java") {
    sources += [
      "java/src/org/chromium/components/browser_ui/site_settings/BromiteWebGLContentSetting.java",
    ]
@@ -179,7 +179,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
        <part file="webgl.grdp" />
 +      <part file="webrtc.grdp" />
  
-       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message">
+       <message name="IDS_GOT_IT" desc="Button for the user to accept a disclosure/message" formatter_data="android_java">
          Got it
 diff --git a/components/browser_ui/strings/android/webrtc.grdp b/components/browser_ui/strings/android/webrtc.grdp
 new file mode 100644
@@ -209,16 +209,16 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 +++ b/components/components_strings.grd
 @@ -339,6 +339,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="history_clusters_strings.grdp" />
+       </if>
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -696,6 +696,20 @@ void ContentSettingsRegistry::Init() {
+@@ -683,6 +683,20 @@ void ContentSettingsRegistry::Init() {
             /*show_into_info_page*/ true,
             /*permission_type_ui*/ IDS_SITE_SETTINGS_TYPE_WEBGL,
             /*permission_type_ui_mid_sentence*/ IDS_SITE_SETTINGS_TYPE_WEBGL_MID_SENTENCE);
@@ -242,7 +242,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 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,
+@@ -158,6 +158,8 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map,
    rules->timezone_override_value = timezone;
    map->GetSettingsForOneType(ContentSettingsType::WEBGL,
                               &(rules->webgl_rules));
@@ -275,7 +275,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
 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 {
+@@ -97,6 +97,7 @@ struct RendererContentSettingRules {
    ContentSettingsForOneType timezone_override_rules;
    std::string timezone_override_value;
    ContentSettingsForOneType webgl_rules;
@@ -295,7 +295,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 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,
+@@ -106,7 +106,8 @@ bool StructTraits<content_settings::mojom::RendererContentSettingRulesDataView,
           data.ReadAutoDarkContentRules(&out->auto_dark_content_rules) &&
           data.ReadTimezoneOverrideRules(&out->timezone_override_rules) &&
           data.ReadTimezoneOverrideValue(&out->timezone_override_value) &&
@@ -323,7 +323,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 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
-@@ -282,6 +282,8 @@ enum class ContentSettingsType : int32_t {
+@@ -279,6 +279,8 @@ enum class ContentSettingsType : int32_t {
  
    WEBGL,
  
@@ -385,7 +385,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -767,6 +768,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -765,6 +766,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // origin.
        WebRTCIPHandlingPolicy policy =
            GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);

build/patches/Allow-building-without-enable_reporting.patch

@@ -5,9 +5,9 @@ Subject: Allow building without enable_reporting
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../browser/devtools/protocol/network_handler.cc |  2 ++
- .../net/cross_origin_embedder_policy_reporter.cc |  4 +++-
- .../net/cross_origin_opener_policy_reporter.cc   | 16 +++++++---------
- content/browser/net/reporting_service_proxy.cc   |  3 +++
+ .../cross_origin_embedder_policy_reporter.cc     |  7 +++++--
+ .../cross_origin_opener_policy_reporter.cc       | 16 +++++++---------
+ .../browser/network/reporting_service_proxy.cc   |  3 +++
  .../renderer_host/render_frame_host_impl.cc      |  6 ------
  .../web_package/signed_exchange_reporter.cc      |  2 ++
  ...content_switch_dependent_feature_overrides.cc |  1 +
@@ -19,12 +19,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../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, 48 insertions(+), 24 deletions(-)
+ 15 files changed, 50 insertions(+), 25 deletions(-)
 
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1289,6 +1289,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1291,6 +1291,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
@@ -32,7 +32,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
  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) {
+@@ -1308,6 +1309,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
    }
    return urls;
  }
@@ -40,38 +40,48 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
  
  }  // 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
+diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/content/browser/network/cross_origin_embedder_policy_reporter.cc
+--- a/content/browser/network/cross_origin_embedder_policy_reporter.cc
++++ b/content/browser/network/cross_origin_embedder_policy_reporter.cc
 @@ -4,6 +4,7 @@
  
- #include "content/browser/net/cross_origin_embedder_policy_reporter.h"
+ #include "content/browser/network/cross_origin_embedder_policy_reporter.h"
  
 +#include "net/base/features.h"
  #include "base/strings/string_piece.h"
  #include "base/values.h"
  #include "content/public/browser/storage_partition.h"
-@@ -112,6 +113,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+@@ -95,8 +96,6 @@ void CrossOriginEmbedderPolicyReporter::Clone(
+ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+     std::initializer_list<std::pair<base::StringPiece, base::StringPiece>> body,
+     bool report_only) {
+-  const absl::optional<std::string>& endpoint =
+-      report_only ? report_only_endpoint_ : endpoint_;
+   const char* const disposition = report_only ? "reporting" : "enforce";
+   if (observer_) {
+     std::vector<blink::mojom::ReportBodyElementPtr> list;
+@@ -111,6 +110,9 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
+     observer_->Notify(blink::mojom::Report::New(
          kType, context_url_, blink::mojom::ReportBody::New(std::move(list))));
    }
-   if (endpoint) {
 +#if BUILDFLAG(ENABLE_REPORTING)
++  const absl::optional<std::string>& endpoint =
++      report_only ? report_only_endpoint_ : endpoint_;
+   if (endpoint) {
      base::Value::Dict body_to_pass;
      for (const auto& pair : body) {
-       body_to_pass.Set(pair.first, pair.second);
-@@ -123,7 +125,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
-           kType, *endpoint, context_url_, reporting_source_,
-           network_isolation_key_,
+@@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
            /*user_agent=*/absl::nullopt, std::move(body_to_pass));
--    }
-+#endif
+     }
    }
++#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 @@
+ }  // namespace content
+diff --git a/content/browser/network/cross_origin_opener_policy_reporter.cc b/content/browser/network/cross_origin_opener_policy_reporter.cc
+--- a/content/browser/network/cross_origin_opener_policy_reporter.cc
++++ b/content/browser/network/cross_origin_opener_policy_reporter.cc
+@@ -18,25 +18,17 @@
  #include "services/network/public/mojom/network_context.mojom.h"
  #include "services/network/public/mojom/source_location.mojom.h"
  #include "url/origin.h"
@@ -98,7 +108,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
  constexpr char kType[] = "type";
  
  // Report attribute values:
-@@ -44,6 +36,7 @@ constexpr char kDispositionReporting[] = "reporting";
+@@ -45,6 +37,7 @@ constexpr char kDispositionReporting[] = "reporting";
  constexpr char kTypeFromResponse[] = "navigation-from-response";
  constexpr char kTypeToResponse[] = "navigation-to-response";
  
@@ -106,7 +116,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
  std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
    switch (coop_value) {
      case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone:
-@@ -61,6 +54,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
+@@ -62,6 +55,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
        return "restrict-properties-plus-coep";
    }
  }
@@ -114,7 +124,7 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
  
  FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
    FrameTreeNode* opener =
-@@ -232,6 +226,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -233,6 +227,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
      network::mojom::SourceLocationPtr source_location,
      const std::string& reported_window_url,
      const std::string& initial_popup_url) const {
@@ -122,10 +132,10 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
    // Cross-Origin-Opener-Policy-Report-Only is not required to provide
    // endpoints.
    if (!coop_.report_only_reporting_endpoint)
-@@ -279,12 +274,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -280,12 +275,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
    storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
-       absl::nullopt, std::move(body));
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_, absl::nullopt, std::move(body));
 +#endif
  }
  
@@ -137,17 +147,17 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
    body.Set(kDisposition,
             is_report_only ? kDispositionReporting : kDispositionEnforce);
    body.Set(kEffectivePolicy,
-@@ -292,6 +289,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
-   storage_partition_->GetNetworkContext()->QueueReport(
-       "coop", endpoint, context_url_, reporting_source_, network_isolation_key_,
+@@ -294,6 +291,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+       "coop", endpoint, context_url_, reporting_source_,
+       network_anonymization_key_,
        /*user_agent=*/absl::nullopt, std::move(body));
 +#endif
  }
  
  }  // namespace content
-diff --git a/content/browser/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
+diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browser/network/reporting_service_proxy.cc
+--- a/content/browser/network/reporting_service_proxy.cc
++++ b/content/browser/network/reporting_service_proxy.cc
 @@ -11,6 +11,7 @@
  #include "base/memory/ref_counted.h"
  #include "base/unguessable_token.h"
@@ -165,7 +175,7 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne
      if (!rph)
        return;
      rph->GetStoragePartition()->GetNetworkContext()->QueueReport(
-         type, group, url, reporting_source_, network_isolation_key_,
+         type, group, url, reporting_source_, network_anonymization_key_,
          /*user_agent=*/absl::nullopt, std::move(body));
 +#endif
    }
@@ -174,7 +184,7 @@ diff --git a/content/browser/net/reporting_service_proxy.cc b/content/browser/ne
 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
-@@ -12143,12 +12143,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -12373,12 +12373,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
    base::Value::Dict body;
    if (!reason.empty())
      body.Set("reason", reason);
@@ -182,7 +192,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 -  // Send the crash report to the Reporting API.
 -  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
 -      /*type=*/"crash", /*group=*/"default", last_committed_url_,
--      GetReportingSource(), isolation_info_.network_isolation_key(),
+-      GetReportingSource(), isolation_info_.network_anonymization_key(),
 -      absl::nullopt /* user_agent */, std::move(body));
  }
  
@@ -193,7 +203,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b
 @@ -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) {
+                   const net::NetworkAnonymizationKey& network_isolation_key) {
 +#if BUILDFLAG(ENABLE_REPORTING)
    FrameTreeNode* frame_tree_node =
        FrameTreeNode::GloballyFindByID(frame_tree_node_id);
@@ -209,7 +219,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b
 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 @@
+@@ -8,6 +8,7 @@
  #include "content/public/common/content_features.h"
  #include "content/public/common/content_switches.h"
  #include "net/base/features.h"
@@ -220,7 +230,7 @@ diff --git a/content/public/common/content_switch_dependent_feature_overrides.cc
 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
-@@ -208,6 +208,12 @@ class ReportingServiceImpl : public ReportingService {
+@@ -211,6 +211,12 @@ class ReportingServiceImpl : public ReportingService {
        base::Value::Dict body,
        int depth,
        base::TimeTicks queued_ticks) {
@@ -232,27 +242,27 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 +#endif
      DCHECK(initialized_);
      context_->cache()->AddReport(
-         reporting_source, network_isolation_key, sanitized_url, user_agent,
+         reporting_source, network_anonymization_key, sanitized_url, user_agent,
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -459,10 +459,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -461,10 +461,10 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
        const absl::optional<base::UnguessableToken>& reporting_source,
-       const net::NetworkIsolationKey& network_isolation_key,
+       const net::NetworkAnonymizationKey& network_anonymization_key,
        const absl::optional<std::string>& user_agent,
 -      base::Value::Dict body) override;
 +      base::Value::Dict body);
    void QueueSignedExchangeReport(
        mojom::SignedExchangeReportPtr report,
--      const net::NetworkIsolationKey& network_isolation_key) override;
-+      const net::NetworkIsolationKey& network_isolation_key);
+-      const net::NetworkAnonymizationKey& network_anonymization_key) override;
++      const net::NetworkAnonymizationKey& network_anonymization_key);
    void AddDomainReliabilityContextForTesting(
        const url::Origin& origin,
        const GURL& upload_url,
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1011,7 +1011,6 @@ mojom("mojom") {
+@@ -1120,7 +1120,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -263,7 +273,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 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
-@@ -1062,6 +1062,7 @@ interface NetworkContext {
+@@ -1064,6 +1064,7 @@ interface NetworkContext {
    // provided |network_isolation_key|.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -271,13 +281,13 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1075,6 +1076,7 @@ interface NetworkContext {
+@@ -1077,6 +1078,7 @@ interface NetworkContext {
    // Note that this queued report will never be delivered if no reporting
    // endpoint matching is registered for with the provided
    // |network_isolation_key|.
 +  [EnableIf=enable_reporting]
    QueueSignedExchangeReport(SignedExchangeReport report,
-                             NetworkIsolationKey network_isolation_key);
+                             NetworkAnonymizationKey network_anonymization_key);
  
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
@@ -290,7 +300,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  #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"
-@@ -2359,9 +2360,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
+@@ -2307,9 +2308,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
    return base::UnguessableToken::Null();
  }
  
@@ -316,7 +326,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #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"
-@@ -585,9 +585,9 @@ class CORE_EXPORT LocalFrame final
+@@ -593,9 +593,9 @@ class CORE_EXPORT LocalFrame final
    }
  
    SmoothScrollSequencer& GetSmoothScrollSequencer();

build/patches/Allow-playing-audio-in-background.patch

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1218,6 +1218,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1226,6 +1226,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3612,7 +3618,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3627,7 +3633,11 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
    // Audio only stream is allowed to play when in background.
    // TODO: We should check IsBackgroundOptimizationCandidate here. But we need
    // to move the logic of checking video frames out of that function.
@@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 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
-@@ -192,6 +192,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -195,6 +195,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
    bool HasVideo() const override;
    bool HasAudio() const override;
  

build/patches/Ask-user-before-closing-all-tabs.patch

@@ -1,25 +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
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
---- a/chrome/browser/flags/android/chrome_feature_list.cc
-+++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -501,8 +501,8 @@ const base::Feature kCastDeviceFilter{"CastDeviceFilter",
- const base::Feature kClearOmniboxFocusAfterNavigation{
-     "ClearOmniboxFocusAfterNavigation", base::FEATURE_DISABLED_BY_DEFAULT};
- 
--const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",
--                                         base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature kCloseTabSuggestions{"CloseTabSuggestions",               // Enabled by default in Bromite
-+                                         base::FEATURE_ENABLED_BY_DEFAULT};   // ^
- 
- const base::Feature kCriticalPersistedTabData{
-     "CriticalPersistedTabData", base::FEATURE_DISABLED_BY_DEFAULT};
---
-2.25.1

build/patches/AudioBuffer-AnalyserNode-fp-mitigations.patch

@@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.idl b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -497,7 +497,9 @@ double AudioContext::baseLatency() const {
+@@ -508,7 +508,9 @@ double AudioContext::baseLatency() const {
    DCHECK(IsMainThread());
    DCHECK(destination());
  

build/patches/Block-gateway-attacks-via-websockets.patch

@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -674,4 +674,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
+@@ -693,4 +693,20 @@ bool ExecutionContext::RequireTrustedTypes() const {
    return require_safe_types_;
  }
  
@@ -47,7 +47,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 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
-@@ -392,6 +392,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -396,6 +396,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverSet<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -69,7 +69,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
-@@ -548,6 +548,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -552,6 +552,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -148,7 +148,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 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
-@@ -61,6 +61,7 @@ class WorkerFetchContext final : public BaseFetchContext {
+@@ -62,6 +62,7 @@ class WorkerFetchContext final : public BaseFetchContext {
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;
@@ -159,7 +159,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.h b/thi
 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) {
+@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
           request_url.ProtocolIsInHTTPFamily();
  }
  
@@ -190,7 +190,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
  scoped_refptr<BlobDataHandle> ExtractBlobHandle(
      Request* request,
      ExceptionState& exception_state) {
-@@ -220,6 +244,13 @@ ScriptPromise BackgroundFetchManager::fetch(
+@@ -221,6 +245,13 @@ ScriptPromise BackgroundFetchManager::fetch(
                                   exception_state);
      }
  
@@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 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) {
+@@ -276,6 +276,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
      return false;
    }
  

build/patches/Block-qjz9zk-or-trk-requests.patch

@@ -39,9 +39,9 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.c
 diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
 --- a/chrome/browser/history/history_utils.cc
 +++ b/chrome/browser/history/history_utils.cc
-@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url) {
-       url.SchemeIs(content::kChromeDevToolsScheme) ||
+@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
        url.SchemeIs(content::kChromeUIScheme) ||
+       url.SchemeIs(content::kChromeUIUntrustedScheme) ||
        url.SchemeIs(content::kViewSourceScheme) ||
 +      url.SchemeIs(url::kTraceScheme) ||
        url.SchemeIs(chrome::kChromeNativeScheme) ||
@@ -81,7 +81,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
    return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
  }
  
-@@ -571,7 +576,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -573,7 +578,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
    // For the view-source and blob schemes, we should emphasize the host of the
    // URL qualified by the view-source or blob prefix.
    if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -94,7 +94,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
+@@ -563,6 +563,10 @@ GURL FixupURL(const std::string& text, const std::string& desired_tld) {
      }
    }
  
@@ -119,7 +119,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1025,6 +1025,8 @@ component("net") {
+@@ -1030,6 +1030,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -212,7 +212,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  using base::Time;
  using std::string;
-@@ -587,6 +589,12 @@ URLRequest::URLRequest(const GURL& url,
+@@ -597,6 +599,12 @@ URLRequest::URLRequest(const GURL& url,
    // Sanity check out environment.
    DCHECK(base::ThreadTaskRunnerHandle::IsSet());
  
@@ -228,15 +228,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 @@
+@@ -48,6 +48,7 @@
  #include "net/socket/network_binding_client_socket_factory.h"
  #include "net/ssl/ssl_config_service_defaults.h"
  #include "net/url_request/static_http_user_agent_settings.h"
 +#include "net/url_request/trk_protocol_handler.h"
  #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_context_storage.h"
  #include "net/url_request/url_request_job_factory.h"
-@@ -631,6 +632,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+ #include "net/url_request/url_request_throttler_manager.h"
+@@ -571,6 +572,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }
@@ -244,7 +244,7 @@ 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));
+   context->set_job_factory(std::move(job_factory));
 diff --git a/url/url_constants.cc b/url/url_constants.cc
 --- a/url/url_constants.cc
 +++ b/url/url_constants.cc
@@ -270,7 +270,7 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -45,6 +45,7 @@ struct SchemeRegistry {
+@@ -46,6 +46,7 @@ struct SchemeRegistry {
    std::vector<SchemeWithType> standard_schemes = {
        {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
        {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -278,7 +278,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
        // Yes, file URLs can have a hostname, so file URLs should be handled as
        // "standard". File URLs never have a port as specified by the SchemeType
        // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -88,6 +89,7 @@ struct SchemeRegistry {
+@@ -89,6 +90,7 @@ struct SchemeRegistry {
        kAboutScheme,
        kJavaScriptScheme,
        kDataScheme,

build/patches/Bookmarks-select-all-menu-entry.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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 @@
+@@ -23,6 +23,13 @@ found in the LICENSE file.
              android:visible="false"
              app:showAsAction="ifRoom"
              app:iconTint="@color/default_icon_color_secondary_tint_list" />
@@ -29,16 +29,16 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
 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
-@@ -32,6 +32,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.url.GURL;
+@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListT
+ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
  
  import java.util.List;
 +import java.util.HashSet;
  
  /**
   * Main action bar of bookmark UI. It is responsible for displaying title and buttons
-@@ -137,6 +138,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
-                     new TabDelegate(true), mDelegate.getModel());
+@@ -132,6 +133,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+                     /*openInNewTab=*/true, /*incognito=*/true);
              selectionDelegate.clearSelection();
              return true;
 +        } else if (menuItem.getItemId() == R.id.select_all_menu_id) {
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          }
  
          assert false : "Unhandled menu click.";
-@@ -146,6 +158,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -141,6 +153,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      void showLoadingUi() {
          setTitle(null);
          setNavigationButton(NAVIGATION_BUTTON_NONE);
@@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          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);
-@@ -157,6 +170,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -152,6 +165,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
          super.showNormalView();
  
          if (mDelegate == null) {
@@ -71,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
              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);
-@@ -188,6 +202,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
+@@ -183,6 +197,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
      @Override
      public void onFolderStateSet(BookmarkId folder) {
          mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);

build/patches/Bromite-auto-updater.patch

@@ -3,6 +3,7 @@ Date: Thu, 7 Oct 2021 14:27:12 +0000
 Subject: Bromite auto updater
 
 Enable checking for new versions, with notifications and proxy support.
+Restore InlineUpdateFlow feature.
 Some parts authored by csagan5.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
@@ -24,13 +25,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../endpoint_fetcher_android.cc               |  52 +++-
  .../endpoint_fetcher/EndpointFetcher.java     |  22 +-
  .../EndpointHeaderResponse.java               |  31 +++
- .../flags/android/chrome_feature_list.cc      |   4 +
+ .../flags/android/chrome_feature_list.cc      |   5 +
  .../flags/android/chrome_feature_list.h       |   1 +
  .../browser/flags/ChromeFeatureList.java      |   1 +
  .../strings/android_chrome_strings.grd        |  23 +-
  .../endpoint_fetcher/endpoint_fetcher.cc      | 102 +++++++-
  .../endpoint_fetcher/endpoint_fetcher.h       |  22 +-
- 23 files changed, 896 insertions(+), 53 deletions(-)
+ 23 files changed, 897 insertions(+), 53 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
@@ -49,7 +50,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -2182,6 +2182,9 @@ if (enable_java_templates) {
+@@ -2242,6 +2242,9 @@ if (enable_java_templates) {
        if (defined(testonly) && testonly) {
          defines += [ "_IS_FOR_TEST" ]
        }
@@ -62,7 +63,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 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
-@@ -809,6 +809,9 @@ chrome_java_sources = [
+@@ -812,6 +812,9 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
    "java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
    "java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
@@ -75,7 +76,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml
 --- a/chrome/android/java/res/xml/about_chrome_preferences.xml
 +++ b/chrome/android/java/res/xml/about_chrome_preferences.xml
-@@ -7,6 +7,11 @@
+@@ -9,6 +9,11 @@ found in the LICENSE file.
      <Preference
          android:key="application_version"
          android:title="@string/application_version_title" />
@@ -1250,7 +1251,7 @@ new file mode 100644
 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
-@@ -253,6 +253,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -251,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kNewWindowAppMenu,
      &kNotificationPermissionVariant,
      &kPageAnnotationsService,
@@ -1258,31 +1259,32 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kBookmarksImprovedSaveFlow,
      &kBookmarksRefresh,
      &kBackGestureRefactorAndroid,
-@@ -676,6 +677,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{
- const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -693,6 +694,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens,
+              "ContextMenuTranslateWithGoogleLens",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
-+const base::Feature kInlineUpdateFlow{"InlineUpdateFlow",
-+                                      base::FEATURE_ENABLED_BY_DEFAULT};
++BASE_FEATURE(kInlineUpdateFlow,
++             "InlineUpdateFlow",
++             base::FEATURE_ENABLED_BY_DEFAULT);
 +
- const base::Feature kInfobarScrollOptimization{
-     "InfobarScrollOptimization", base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kLensCameraAssistedSearch,
+              "LensCameraAssistedSearch",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -92,6 +92,7 @@ extern const base::Feature kGridTabSwitcherForTablets;
- extern const base::Feature kHandleMediaIntents;
- extern const base::Feature kImmersiveUiMode;
- extern const base::Feature kIncognitoReauthenticationForAndroid;
-+extern const base::Feature kInlineUpdateFlow;
- extern const base::Feature kIncognitoScreenshot;
- extern const base::Feature kInfobarScrollOptimization;
- extern const base::Feature kImprovedA2HS;
+@@ -91,6 +91,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets);
+ BASE_DECLARE_FEATURE(kHandleMediaIntents);
+ BASE_DECLARE_FEATURE(kImmersiveUiMode);
+ BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid);
++BASE_DECLARE_FEATURE(kInlineUpdateFlow);
+ BASE_DECLARE_FEATURE(kIncognitoScreenshot);
+ BASE_DECLARE_FEATURE(kInfobarScrollOptimization);
+ BASE_DECLARE_FEATURE(kImprovedA2HS);
 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
-@@ -379,6 +379,7 @@ public abstract class ChromeFeatureList {
+@@ -385,6 +385,7 @@ public abstract class ChromeFeatureList {
              "IncognitoReauthenticationForAndroid";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
      public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization";
@@ -1293,7 +1295,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 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
-@@ -1887,6 +1887,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1837,6 +1837,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
          Chrome updates are no longer supported for this version of Android
        </message>
@@ -1306,7 +1308,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Account management UI strings. -->
        <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
-@@ -3519,7 +3525,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3453,7 +3459,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- Main menu items -->
        <message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1318,7 +1320,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
          Newer version is available
-@@ -3530,6 +3539,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3464,6 +3473,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
          Android version is unsupported
        </message>

build/patches/Bromite-package-name.patch

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -46,7 +46,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
-   assert(current_toolchain != android_secondary_abi_toolchain)
- }
+@@ -47,7 +47,7 @@ chrome_jni_registration_header =
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
  
--_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
+ if (current_toolchain == default_toolchain) {
+-  _default_package = "org.chromium.chrome"
++  _default_package = "org.bromite.bromite"
+   if (use_stable_package_name_for_trichrome) {
+     _default_package += ".stable"
+   } else if (android_channel != "default" && android_channel != "stable") {
 --
 2.25.1

build/patches/Bromite-subresource-adblocker.patch

@@ -1,6 +1,6 @@
 From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sat, 14 Sep 2019 10:20:08 +0200
-Subject: Bromite AdBlockUpdaterService
+Subject: Bromite subresource adblocker
 
 Add option to configure the ad blocker filters URL
 Disable look-alike, metrics, ablation and navigation throttles
@@ -8,6 +8,7 @@ Do not use experiments to enable/disable presets
 Always enable ad filtering
 Download filters by checking Last-Modified header first
 Fix RestoreForeignSessionTab by recreating the tab (issue #681)
+Enable AutomaticLazyFrameLoadingToAds and AutomaticLazyFrameLoadingToEmbeds features
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
@@ -49,7 +50,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/subresource_filter_features.cc    | 116 +-------
  .../core/common/indexed_ruleset.cc            |   5 +-
  .../navigation_throttle_runner.cc             |   5 -
- 38 files changed, 1160 insertions(+), 129 deletions(-)
+ third_party/blink/common/features.cc          |  12 +-
+ 39 files changed, 1166 insertions(+), 135 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
@@ -62,26 +64,26 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -371,6 +371,7 @@ android_library("chrome_java") {
-     "//chrome/browser/download/android:java",
-     "//chrome/browser/download/android:java_resources",
-     "//chrome/browser/enterprise/util:java",
-+    "//chrome/browser/endpoint_fetcher:java",
-     "//chrome/browser/feature_engagement:java",
-     "//chrome/browser/feature_guide/notifications:java",
-     "//chrome/browser/feed/android:java",
+@@ -372,6 +372,7 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/android/modules/image_editor/provider:java",
+       "//chrome/android/modules/stack_unwinder/provider:java",
+       "//chrome/android/webapk/libs/client:client_java",
++      "//chrome/browser/endpoint_fetcher:java",
+       "//chrome/android/webapk/libs/common:common_java",
+       "//chrome/android/webapk/libs/common:splash_java",
+       "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_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
-@@ -452,6 +452,7 @@ chrome_java_resources = [
+@@ -447,6 +447,7 @@ chrome_java_resources = [
    "java/res/layout/account_chooser_dialog_title.xml",
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
-+   "java/res/layout/adblock_editor.xml",
++  "java/res/layout/adblock_editor.xml",
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_unmask_prompt.xml",
-@@ -647,6 +648,7 @@ chrome_java_resources = [
+@@ -641,6 +642,7 @@ chrome_java_resources = [
    "java/res/values/values.xml",
    "java/res/xml/about_chrome_preferences.xml",
    "java/res/xml/account_management_preferences.xml",
@@ -92,15 +94,15 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 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
-@@ -903,6 +903,8 @@ chrome_java_sources = [
+@@ -907,6 +907,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.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/policy/PolicyAuditor.java",
+   "java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java",
    "java/src/org/chromium/chrome/browser/prerender/ChromePrerenderServiceImpl.java",
-   "java/src/org/chromium/chrome/browser/printing/TabPrinter.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
@@ -176,7 +178,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -178,6 +178,24 @@
+@@ -180,6 +180,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -204,7 +206,7 @@ diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res
 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,8 @@
+@@ -27,6 +27,8 @@ found in the LICENSE file.
      <!-- Compositor Tab Title Text -->
      <bool name="compositor_tab_title_fake_bold_text">true</bool>
  
@@ -246,7 +248,7 @@ new file mode 100644
 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
-@@ -42,6 +42,11 @@
+@@ -44,6 +44,11 @@ found in the LICENSE file.
          android:key="privacy"
          android:order="10"
          android:title="@string/prefs_privacy_security"/>
@@ -435,7 +437,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 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
-@@ -12179,6 +12179,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -12468,6 +12468,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -506,7 +508,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1078,6 +1078,26 @@ BrowserProcessImpl::component_updater() {
+@@ -1071,6 +1071,26 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -555,16 +557,16 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -1728,6 +1728,9 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
-   // will be initialized when the app enters foreground mode.
-   variations_service->set_policy_pref_service(profile->GetPrefs());
+@@ -415,6 +415,9 @@ StartupProfileInfo CreateInitialProfile(
+   // missing code in the above test.
+   CHECK(profile_info.profile) << "Cannot get default profile.";
  
 +  // force AdBlock updater initialisation
 +  g_browser_process->adblock_updater();
 +
  #else
-   // We are in regular browser boot sequence. Open initial tabs and enter the
-   // main message loop.
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+   // Lacros has a special "primary" profile that is tied to the active ChromeOS
 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
@@ -593,7 +595,7 @@ diff --git a/chrome/browser/flags/android/cached_feature_flags.cc b/chrome/brows
 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
-@@ -271,6 +271,14 @@ public class CachedFeatureFlags {
+@@ -278,6 +278,14 @@ public class CachedFeatureFlags {
                  ChromeFeatureList.isEnabled(ChromeFeatureList.BACKGROUND_THREAD_POOL));
      }
  
@@ -608,7 +610,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      /**
       * Caches flags that must take effect on startup but are set via native code.
       */
-@@ -517,5 +525,7 @@ public class CachedFeatureFlags {
+@@ -524,5 +532,7 @@ public class CachedFeatureFlags {
      @NativeMethods
      interface Natives {
          boolean isNetworkServiceWarmUpEnabled();
@@ -619,7 +621,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 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
-@@ -454,6 +454,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
+@@ -421,6 +421,8 @@ SystemNetworkContextManager::SystemNetworkContextManager(
        ssl_config_service_manager_(local_state_),
        proxy_config_monitor_(local_state_),
        stub_resolver_config_reader_(local_state_) {
@@ -628,7 +630,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
  #if !BUILDFLAG(IS_ANDROID)
    // QuicAllowed was not part of Android policy.
    const base::Value* value =
-@@ -532,6 +534,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
+@@ -499,6 +501,8 @@ SystemNetworkContextManager::~SystemNetworkContextManager() {
  void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
  
@@ -678,7 +680,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -2338,6 +2338,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2383,6 +2383,9 @@ const char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  // capture devices without prompt.
  const char kAudioCaptureAllowedUrls[] = "hardware.audio_capture_allowed_urls";
  
@@ -702,7 +704,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -271,8 +271,8 @@
+@@ -303,8 +303,8 @@
    <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
      This site shows intrusive or misleading ads
    </message>
@@ -1155,8 +1157,8 @@ new file mode 100644
 +
 +namespace adblock_updater {
 +
-+// maximum 10MB for the filters file
-+const int kMaxBodySize = 1024 * 1024 * 10;
++// maximum 20MB for the filters file
++const int kMaxBodySize = 1024 * 1024 * 20;
 +
 +const int kMaxRetriesOnNetworkChange = 3;
 +
@@ -1680,7 +1682,7 @@ diff --git a/components/subresource_filter/content/browser/verified_ruleset_deal
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,72 +55,7 @@ class CommaSeparatedStrings {
+@@ -54,72 +54,7 @@ class CommaSeparatedStrings {
    const std::vector<base::StringPiece> pieces_;
  };
  
@@ -1754,7 +1756,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
    // If ad tagging is enabled, turn on the dryrun automatically.
    bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
    const struct {
-@@ -128,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -127,23 +62,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
      bool enabled_by_default;
      Configuration (*factory_method)();
    } kAvailablePresetConfigurations[] = {
@@ -1780,7 +1782,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
        enabled_configurations.push_back(available_preset.factory_method());
      }
    }
-@@ -152,46 +80,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -151,46 +79,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
    return enabled_configurations;
  }
  
@@ -1866,5 +1868,41 @@ diff --git a/content/browser/renderer_host/navigation_throttle_runner.cc b/conte
  }
  
  NavigationThrottle* NavigationThrottleRunner::GetDeferringThrottle() const {
+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
+@@ -28,8 +28,8 @@ BASE_FEATURE(kAnonymousIframeOriginTrial,
+ // Apply lazy-loading to ad frames which have embeds likely impacting Core Web
+ // Vitals.
+ BASE_FEATURE(kAutomaticLazyFrameLoadingToAds,
+-             "AutomaticLazyFrameLoadingToAds",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "AutomaticLazyFrameLoadingToAds",       // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
+ 
+ // The timeout value that forces loading iframes that are lazy loaded by
+ // LazyAds. After this timeout, the frame loading is triggered even when the
+@@ -49,8 +49,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyAds(
+ // Apply lazy-loading to frames which have embeds likely impacting Core Web
+ // Vitals.
+ BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbeds,
+-             "AutomaticLazyFrameLoadingToEmbeds",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "AutomaticLazyFrameLoadingToEmbeds",    // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
+ 
+ // The timeout value that forces loading iframes that are lazy loaded by
+ // LazyEmbeds. After this timeout, the frame loading is triggered even when the
+@@ -72,8 +72,8 @@ const base::FeatureParam<int> kSkipFrameCountForLazyEmbeds(
+ // to gather Blink.AutomaticLazyLoadFrame.LazyEmbedFrameCount UKM data even when
+ // kAutomaticLazyFrameLoadingToEmbeds is disabled.
+ BASE_FEATURE(kAutomaticLazyFrameLoadingToEmbedUrls,
+-             "AutomaticLazyFrameLoadingToEmbedUrls",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "AutomaticLazyFrameLoadingToEmbedUrls",    // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
+ 
+ // Define the strategy for LazyEmbeds to decide which frames we apply
+ // lazy-loading or not. If the loading strategy is kAllowList, the detection
 --
 2.25.1

build/patches/Chromium-package-name.patch

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -46,7 +46,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
-   assert(current_toolchain != android_secondary_abi_toolchain)
- }
+@@ -51,7 +51,7 @@ chrome_jni_registration_header =
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
  
--_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
+ if (current_toolchain == default_toolchain) {
+-  _default_package = "org.chromium.chrome"
++  _default_package = "org.bromite.chromium"
+   if (use_stable_package_name_for_trichrome) {
+     _default_package += ".stable"
+   } else if (android_channel != "default" && android_channel != "stable") {
 --
 2.25.1

build/patches/Clamp-time-resolution-in-requestAnimationFrame.patch

@@ -0,0 +1,40 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 3 Oct 2022 09:39:07 +0000
+Subject: Clamp time resolution in requestAnimationFrame
+
+Aligns requestAnimationFrame's WebWorker callback to the W3C specification
+See https://bugs.chromium.org/p/chromium/issues/detail?id=1236113
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../animation_frame/worker_animation_frame_provider.cc    | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+--- a/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
++++ b/third_party/blink/renderer/core/animation_frame/worker_animation_frame_provider.cc
+@@ -7,6 +7,8 @@
+ #include "base/trace_event/trace_event.h"
+ #include "third_party/blink/renderer/core/execution_context/agent.h"
+ #include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
++#include "third_party/blink/renderer/core/workers/worker_global_scope.h"
++#include "third_party/blink/renderer/platform/wtf/casting.h"
+ #include "third_party/blink/renderer/core/timing/worker_global_scope_performance.h"
+ #include "third_party/blink/renderer/platform/scheduler/public/event_loop.h"
+ #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h"
+@@ -63,7 +65,11 @@ void WorkerAnimationFrameProvider::BeginFrame(const viz::BeginFrameArgs& args) {
+             }
+           }
+ 
+-          double time = (args.frame_time - base::TimeTicks()).InMillisecondsF();
++          auto* global_scope = DynamicTo<WorkerGlobalScope>(provider->context_.Get());
++          DCHECK(global_scope);
++          double time = Performance::ClampTimeResolution(
++                          args.frame_time - global_scope->TimeOrigin(),
++                          provider->context_->CrossOriginIsolatedCapability());
+           provider->callback_collection_.ExecuteFrameCallbacks(time, time);
+         }
+         provider->begin_frame_provider_->FinishBeginFrame(args);
+--
+2.25.1

build/patches/Client-hints-overrides.patch

@@ -3,22 +3,19 @@ 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
+Use Google Chrome branding for client hints
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/embedder_support/user_agent_utils.cc          | 4 +---
- content/browser/client_hints/client_hints.cc             | 3 ++-
- content/browser/loader/navigation_url_loader_impl.cc     | 5 +++++
- content/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 ++--
- 10 files changed, 19 insertions(+), 18 deletions(-)
+ components/embedder_support/user_agent_utils.cc              | 4 +---
+ content/browser/client_hints/client_hints.cc                 | 3 ++-
+ content/browser/loader/navigation_url_loader_impl.cc         | 5 +++++
+ content/public/common/content_features.cc                    | 4 ++--
+ services/network/public/cpp/client_hints.cc                  | 1 +
+ services/network/public/cpp/features.cc                      | 2 +-
+ third_party/blink/common/client_hints/client_hints.cc        | 1 +
+ .../blink/common/client_hints/enabled_client_hints.cc        | 4 +++-
+ 8 files changed, 16 insertions(+), 8 deletions(-)
 
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
 --- a/components/embedder_support/user_agent_utils.cc
@@ -37,8 +34,8 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 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
-@@ -435,7 +435,8 @@ void AddPrefersColorSchemeHeader(net::HttpRequestHeaders* headers,
-                     is_dark_mode ? "dark" : "light");
+@@ -478,7 +478,8 @@ void AddPrefersReducedMotionHeader(net::HttpRequestHeaders* headers,
+                         : network::kPrefersReducedMotionNoPreference);
  }
  
 -bool IsValidURLForClientHints(const url::Origin& origin) {
@@ -50,7 +47,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 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
-@@ -1030,6 +1030,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1024,6 +1024,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -62,41 +59,24 @@ diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/brow
    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
-@@ -323,14 +323,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
-@@ -233,7 +233,7 @@ const base::Feature kCrashReporting{"CrashReporting",
+@@ -247,8 +247,8 @@ BASE_FEATURE(kCrashReporting,
  // Enables support for the `Critical-CH` response header.
  // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch
- const base::Feature kCriticalClientHint{"CriticalClientHint",
--                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kCriticalClientHint,
+-             "CriticalClientHint",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "CriticalClientHint",                  // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
  // Enable debugging the issue crbug.com/1201355
- const base::Feature kDebugHistoryInterventionNoUserActivation{
+ 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
-@@ -97,6 +97,7 @@ const DecodeMap& GetDecodeMap() {
+@@ -105,6 +105,7 @@ const DecodeMap& GetDecodeMap() {
  
  absl::optional<std::vector<network::mojom::WebClientHintsType>>
  ParseClientHintsHeader(const std::string& header) {
@@ -107,21 +87,19 @@ diff --git a/services/network/public/cpp/client_hints.cc b/services/network/publ
 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
-@@ -179,8 +179,8 @@ const base::Feature kWebSocketReassembleShortMessages{
+@@ -197,7 +197,7 @@ BASE_FEATURE(kWebSocketReassembleShortMessages,
  // Enable support for ACCEPT_CH H2/3 frame as part of Client Hint Reliability.
  // See:
  // https://tools.ietf.org/html/draft-davidben-http-client-hint-reliability-02#section-4.3
--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
+-BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kAcceptCHFrame, "AcceptCHFrame", base::FEATURE_DISABLED_BY_DEFAULT);  // disabled by default in Bromite
  
- const base::Feature kSCTAuditingRetryReports{"SCTAuditingRetryReports",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kSCTAuditingRetryReports,
+              "SCTAuditingRetryReports",
 diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc
 --- a/third_party/blink/common/client_hints/client_hints.cc
 +++ b/third_party/blink/common/client_hints/client_hints.cc
-@@ -111,6 +111,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount =
+@@ -113,6 +113,7 @@ const size_t kWebEffectiveConnectionTypeMappingCount =
      std::size(kWebEffectiveConnectionTypeMapping);
  
  bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
@@ -140,7 +118,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi
    switch (type) {
      case WebClientHintsType::kUA:
      case WebClientHintsType::kUAArch:
-@@ -127,7 +128,7 @@ bool IsOriginTrialEnabled(const GURL& url,
+@@ -138,7 +139,7 @@ bool IsOriginTrialEnabled(const GURL& url,
  }  // namespace
  
  bool EnabledClientHints::IsEnabled(const WebClientHintsType type) const {
@@ -149,7 +127,7 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi
  }
  
  void EnabledClientHints::SetIsEnabled(const WebClientHintsType type,
-@@ -156,6 +157,7 @@ void EnabledClientHints::SetIsEnabled(
+@@ -167,6 +168,7 @@ void EnabledClientHints::SetIsEnabled(
  
  std::vector<WebClientHintsType> EnabledClientHints::GetEnabledHints() const {
    std::vector<WebClientHintsType> hints;
@@ -157,26 +135,5 @@ diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/thi
    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
-@@ -222,7 +222,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent",
- 
- // Enables User-Agent Client Hints
- const base::Feature kUserAgentClientHint{"UserAgentClientHint",
--                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};
- 
- // Handle prefers-color-scheme user preference media feature via client hints.
- const base::Feature kPrefersColorSchemeClientHintHeader{
-@@ -606,7 +606,7 @@ const base::Feature kAudioWorkletThreadRealtimePriority{
- const base::Feature kLightweightNoStatePrefetch {
-   "LightweightNoStatePrefetch",
- #if BUILDFLAG(IS_ANDROID)
--      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
- #endif
 --
 2.25.1

build/patches/Content-settings-infrastructure.patch

@@ -41,8 +41,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -78,6 +78,10 @@ android_library("java") {
-     "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java",
+@@ -88,6 +88,10 @@ android_library("java") {
+     "java/src/org/chromium/components/browser_ui/site_settings/WebsiteRowPreference.java",
      "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java"
    ]
 +  sources += [
@@ -655,7 +655,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      /**
-@@ -564,6 +567,8 @@ public class ContentSettingsResources {
+@@ -570,6 +573,8 @@ public class ContentSettingsResources {
       *         Blocked states, in that order.
       */
      public static int[] getTriStateSettingDescriptionIDs(int contentType) {
@@ -667,7 +667,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -236,6 +236,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -247,6 +247,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          @ContentSettingValues
          Integer contentSetting = website.site().getContentSetting(
                  browserContextHandle, mCategory.getContentSettingsType());
@@ -678,15 +678,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (contentSetting != null) {
              if (mCategory.getContentSettingsType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
                  return ContentSettingValues.ALLOW != contentSetting;
-@@ -391,6 +395,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -402,6 +406,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                  ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS))
                  : null;
  
 +        BromiteCustomContentSettingImpl.onActivityCreated(this);
          configureGlobalToggles();
- 
-         setHasOptionsMenu(true);
-@@ -490,6 +495,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+         if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
+             RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
+@@ -508,6 +513,11 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          BrowserContextHandle browserContextHandle =
                  getSiteSettingsDelegate().getBrowserContextHandle();
          PrefService prefService = UserPrefs.get(browserContextHandle);
@@ -698,7 +698,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (BINARY_TOGGLE_KEY.equals(preference.getKey())) {
              assert !mCategory.isManaged();
  
-@@ -645,6 +655,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -672,6 +682,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              resource = R.string.website_settings_category_timezone_override_allowed;
          }
@@ -707,7 +707,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          assert resource > 0;
          return getString(resource);
      }
-@@ -757,6 +769,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -790,6 +802,9 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              allowSpecifyingExceptions = true;
          } else if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              allowSpecifyingExceptions = true;
@@ -717,7 +717,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
          if (allowSpecifyingExceptions) {
              getPreferenceScreen().addPreference(new AddExceptionPreference(getStyledContext(),
-@@ -928,6 +943,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -961,6 +976,10 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
              TriStateSiteSettingsPreference triStateToggle =
                      (TriStateSiteSettingsPreference) getPreferenceScreen().findPreference(
                              TRI_STATE_TOGGLE_KEY);
@@ -728,7 +728,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (triStateToggle != null)
                return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
  
-@@ -1006,6 +1025,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1039,6 +1058,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          if (mCategory.getType() != SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
              screen.removePreference(screen.findPreference(TIMEOVERRIDE_INFO_TEXT));
          }
@@ -736,7 +736,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
          if (permissionBlockedByOs) {
              maybeShowOsWarning(screen);
-@@ -1132,7 +1152,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1170,7 +1190,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
                  getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
          int[] descriptionIds =
                  ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@@ -745,7 +745,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private void configureTimeOverrideStateToggle(
-@@ -1243,6 +1263,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
+@@ -1281,6 +1301,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
          @ContentSettingValues
          Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
  
@@ -758,12 +758,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +        }
 +
          CharSequence[] descriptions = new String[2];
-         descriptions[0] =
-                 getString(ContentSettingsResources.getSiteSummary(contentSettingsType,
+         descriptions[0] = getString(ContentSettingsResources.getSiteSummary(
+                 ContentSettingValues.ALLOW, contentSettingsType));
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -41,6 +41,7 @@ import org.chromium.content_public.browser.BrowserContextHandle;
+@@ -42,6 +42,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.Map;
@@ -771,7 +771,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
  /**
   * Shows the permissions and other settings for a particular website.
-@@ -168,7 +169,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -171,7 +172,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
              case ContentSettingsType.CLIPBOARD_READ_WRITE:
                  return "clipboard_permission_list";
              default:
@@ -780,7 +780,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
      }
  
-@@ -493,7 +494,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -504,7 +505,8 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
  
      private void setupContentSettingsPreferences() {
          mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder();
@@ -790,7 +790,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              Preference preference = new ChromeSwitchPreference(getStyledContext());
              preference.setKey(getPreferenceKey(type));
  
-@@ -905,16 +907,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -945,16 +947,22 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
  
      private void setupContentSettingsPreference(Preference preference,
              @ContentSettingValues @Nullable Integer value, boolean isEmbargoed) {
@@ -818,7 +818,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          switchPreference.setOnPreferenceChangeListener(this);
          @ContentSettingsType
          int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
-@@ -1163,7 +1171,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -1206,7 +1214,7 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
  
          mSite.setContentSetting(browserContextHandle, type, permission);
@@ -929,7 +929,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -265,6 +265,10 @@ public final class Website implements Serializable {
+@@ -277,6 +277,10 @@ public final class Website implements WebsiteEntry {
                          /*isEmbargoed=*/false);
                  setContentSettingException(type, exception);
              }
@@ -943,7 +943,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
-@@ -89,7 +89,7 @@ public class WebsitePermissionsFetcher {
+@@ -92,7 +92,7 @@ public class WebsitePermissionsFetcher {
              case ContentSettingsType.USB_GUARD:
                  return WebsitePermissionsType.CHOSEN_OBJECT_INFO;
              default:
@@ -955,7 +955,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
-@@ -227,7 +227,7 @@ public class WebsitePreferenceBridge {
+@@ -246,7 +246,7 @@ public class WebsitePreferenceBridge {
              case ContentSettingsType.TIMEZONE_OVERRIDE:
                  return true;
              default:
@@ -976,7 +976,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
  
  #if BUILDFLAG(IS_ANDROID)
  #include "media/base/android/media_drm_bridge.h"
-@@ -693,7 +695,10 @@ void ContentSettingsRegistry::Register(
+@@ -680,7 +682,10 @@ void ContentSettingsRegistry::Register(
      Platforms platforms,
      ContentSettingsInfo::IncognitoBehavior incognito_behavior,
      ContentSettingsInfo::StorageBehavior storage_behavior,
@@ -988,7 +988,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
    // Ensure that nothing has been registered yet for the given type.
    DCHECK(!website_settings_registry_->Get(type));
  
-@@ -702,7 +707,9 @@ void ContentSettingsRegistry::Register(
+@@ -689,7 +694,9 @@ void ContentSettingsRegistry::Register(
        website_settings_registry_->Register(
            type, name, std::move(default_value), sync_status,
            WebsiteSettingsInfo::NOT_LOSSY, scoping_type, platforms,
@@ -1120,7 +1120,7 @@ diff --git a/components/content_settings/core/browser/website_settings_registry.
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
-@@ -109,6 +109,7 @@ public class PermissionParamsListBuilder {
+@@ -104,6 +104,7 @@ public class PermissionParamsListBuilder {
                  permissionParams.allowed = true;
                  break;
              case ContentSettingValues.BLOCK:
@@ -1153,8 +1153,8 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 +
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
-   std::map<ContentSettingsType, bool>
-@@ -242,6 +251,15 @@ absl::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
+ 
+@@ -236,6 +245,15 @@ absl::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
      // The images content setting should show up if it is blocked globally
      // to give users an easy way to create exceptions.
      return permission.default_setting;
@@ -1173,15 +1173,15 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -23,6 +23,7 @@
+@@ -24,6 +24,7 @@
  #include "components/browser_ui/util/android/url_constants.h"
  #include "components/browsing_data/content/local_storage_helper.h"
  #include "components/content_settings/browser/page_specific_content_settings.h"
 +#include "components/content_settings/core/browser/website_settings_registry.h"
+ #include "components/content_settings/browser/ui/cookie_controls_controller.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/content_settings_utils.h"
- #include "components/content_settings/core/browser/host_content_settings_map.h"
-@@ -163,6 +164,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
+@@ -167,6 +168,15 @@ bool ShouldShowPermission(const PageInfo::PermissionInfo& info,
      return true;
    }
  
@@ -1197,7 +1197,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
    const bool is_incognito = web_contents->GetBrowserContext()->IsOffTheRecord();
  #if BUILDFLAG(IS_ANDROID)
    // Special geolocation DSE settings apply only on Android, so make sure it
-@@ -1066,7 +1076,18 @@ void PageInfo::PresentSitePermissions() {
+@@ -1150,7 +1160,18 @@ void PageInfo::PresentSitePermissions() {
    PermissionInfo permission_info;
    HostContentSettingsMap* content_settings = GetContentSettings();
    DCHECK(web_contents_);
@@ -1228,7 +1228,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
  #include "components/omnibox/common/omnibox_features.h"
  #include "components/page_info/core/features.h"
  #include "components/page_info/page_info_ui_delegate.h"
-@@ -569,6 +570,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -572,6 +573,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id);
    }
@@ -1241,7 +1241,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    NOTREACHED();
    return std::u16string();
  }
-@@ -580,6 +587,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
+@@ -583,6 +590,12 @@ std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
    }
@@ -1254,7 +1254,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    NOTREACHED();
    return std::u16string();
  }
-@@ -967,6 +980,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -970,6 +983,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
      if (info.type == type)
        return true;
    }

build/patches/Dictionary-suggestions-for-the-Omnibox.patch

@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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 @@
+@@ -15,5 +15,6 @@ found in the LICENSE file.
      android:singleLine="true"
      android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
      android:textSize="@dimen/location_bar_url_text_size"
@@ -964,10 +964,10 @@ new file mode 100644
 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
-@@ -215,8 +215,7 @@ public abstract class UrlBar extends AutocompleteEditText {
-         // the first draw.
-         setFocusable(false);
-         setFocusableInTouchMode(false);
+@@ -222,8 +222,7 @@ public abstract class UrlBar extends AutocompleteEditText {
+             setFocusableInTouchMode(mAllowFocus);
+         });
+ 
 -        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI
 -                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
 +        setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI);

build/patches/Disable-AGSA-by-default.patch

@@ -13,39 +13,39 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../init/ProcessInitializationHandler.java    |  8 ------
  .../browser/ntp/search/SearchBoxMediator.java |  1 -
  .../chrome/browser/share/LensUtils.java       | 12 +--------
- .../flags/android/chrome_feature_list.cc      |  2 +-
+ .../flags/android/chrome_feature_list.cc      |  4 +--
  .../browser/flags/CachedFeatureFlags.java     |  2 +-
  chrome/browser/ui/android/omnibox/BUILD.gn    |  2 --
  .../browser/omnibox/LocationBarMediator.java  |  1 -
- 13 files changed, 3 insertions(+), 77 deletions(-)
+ 13 files changed, 4 insertions(+), 78 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -379,7 +379,6 @@ android_library("chrome_java") {
-     "//chrome/browser/first_run/android:java",
-     "//chrome/browser/flags:java",
-     "//chrome/browser/fullscreen/android:java",
--    "//chrome/browser/gsa:java",
-     "//chrome/browser/history_clusters:java",
-     "//chrome/browser/history_clusters:java_resources",
-     "//chrome/browser/image_descriptions:java",
-@@ -1010,7 +1009,6 @@ robolectric_binary("chrome_junit_tests") {
-     "//chrome/browser/flags:flags_junit_tests",
-     "//chrome/browser/flags:java",
-     "//chrome/browser/fullscreen/android:java",
--    "//chrome/browser/gsa:java",
-     "//chrome/browser/history_clusters:java",
-     "//chrome/browser/image_descriptions:java",
-     "//chrome/browser/image_editor/public:java",
-@@ -1529,7 +1527,6 @@ android_library("chrome_test_java") {
-     "//chrome/browser/first_run/android:java",
-     "//chrome/browser/flags:java",
-     "//chrome/browser/fullscreen/android:java",
--    "//chrome/browser/gsa:java",
-     "//chrome/browser/history_clusters:java",
-     "//chrome/browser/image_descriptions:javatests",
-     "//chrome/browser/incognito:incognito_java_tests",
+@@ -408,7 +408,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/first_run/android:java",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/history_clusters:java_resources",
+       "//chrome/browser/image_descriptions:java",
+@@ -1002,7 +1001,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/flags:flags_junit_tests",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/image_descriptions:java",
+       "//chrome/browser/image_editor/public:java",
+@@ -1517,7 +1515,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/first_run/android:java",
+       "//chrome/browser/flags:java",
+       "//chrome/browser/fullscreen/android:java",
+-      "//chrome/browser/gsa:java",
+       "//chrome/browser/history_clusters:java",
+       "//chrome/browser/image_descriptions:javatests",
+       "//chrome/browser/incognito:incognito_java_tests",
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -255,8 +254,6 @@ public class IntentHandler {
+@@ -265,8 +264,6 @@ public class IntentHandler {
      private static int sReferrerId;
      private static String sPendingIncognitoUrl;
  
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
      private static final String PACKAGE_GMAIL = "com.google.android.gm";
      private static final String PACKAGE_PLUS = "com.google.android.apps.plus";
      private static final String PACKAGE_HANGOUTS = "com.google.android.talk";
-@@ -486,8 +483,6 @@ public class IntentHandler {
+@@ -496,8 +493,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 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
-@@ -111,10 +111,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
+@@ -112,10 +112,6 @@ import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
  import org.chromium.chrome.browser.fullscreen.BrowserControlsManagerSupplier;
  import org.chromium.chrome.browser.fullscreen.FullscreenBackPressHandler;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -100,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.history.HistoryManagerUtils;
  import org.chromium.chrome.browser.init.AsyncInitializationActivity;
  import org.chromium.chrome.browser.init.ProcessInitializationHandler;
-@@ -371,8 +367,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -374,8 +370,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
      private LaunchCauseMetrics mLaunchCauseMetrics;
  
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
      // TODO(972867): Pull MenuOrKeyboardActionController out of ChromeActivity.
      private List<MenuOrKeyboardActionController.MenuOrKeyboardActionHandler> mMenuActionHandlers =
              new ArrayList<>();
-@@ -1166,10 +1160,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
      @Override
      public void onStopWithNative() {
@@ -120,11 +120,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          super.onStopWithNative();
      }
  
-@@ -1260,23 +1250,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
-             FontSizePrefs.getInstance(Profile.getLastUsedRegularProfile())
+@@ -1267,23 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      .recordUserFontPrefOnStartup();
          });
--
+ 
 -        // GSA connection is not needed on low-end devices because Icing is disabled.
 -        if (!SysUtils.isLowEndDevice()) {
 -            if (isActivityFinishingOrDestroyed()) return;
@@ -141,9 +140,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 -                mGSAAccountChangeListener.connect();
 -            });
 -        }
+-
+         DeferredStartupHandler.getInstance().addDeferredTask(
+                 () -> { MemoryPurgeManager.getInstance().start(); });
      }
- 
-     /**
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -155,7 +155,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  import org.chromium.chrome.browser.lens.LensController;
  import org.chromium.chrome.browser.lens.LensEntryPoint;
  import org.chromium.chrome.browser.lens.LensIntentParams;
-@@ -997,12 +996,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -987,12 +986,6 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                      LensMetrics.LensSupportStatus.ACTIVITY_NOT_ACCESSIBLE);
              return false;
          }
@@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-@@ -358,14 +358,6 @@ public class ProcessInitializationHandler {
+@@ -360,14 +360,6 @@ public class ProcessInitializationHandler {
              }
          });
  
@@ -262,31 +262,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
 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
-@@ -655,7 +655,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{
-     "DuetTabStripIntegrationAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -750,8 +750,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
- const base::Feature kExperimentsForAgsa{"ExperimentsForAgsa",
--                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kExperimentsForAgsa,
+-             "ExperimentsForAgsa",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "ExperimentsForAgsa",                 // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);   // in Bromite
+ 
+ BASE_FEATURE(kExploreSites, "ExploreSites", base::FEATURE_DISABLED_BY_DEFAULT);
  
- 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
-@@ -71,7 +71,7 @@ public class CachedFeatureFlags {
+@@ -72,7 +72,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.EARLY_LIBRARY_LOAD, true)
                      .put(ChromeFeatureList.ELASTIC_OVERSCROLL, true)
                      .put(ChromeFeatureList.ELIDE_PRIORITIZATION_OF_PRE_NATIVE_BOOTSTRAP_TASKS, true)
 -                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, true)
 +                    .put(ChromeFeatureList.EXPERIMENTS_FOR_AGSA, false)
                      .put(ChromeFeatureList.FEED_LOADING_PLACEHOLDER, false)
-                     .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, false)
+                     .put(ChromeFeatureList.GRID_TAB_SWITCHER_FOR_TABLETS, true)
                      .put(ChromeFeatureList.IMMERSIVE_UI_MODE, false)
 diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
 --- a/chrome/browser/ui/android/omnibox/BUILD.gn
 +++ b/chrome/browser/ui/android/omnibox/BUILD.gn
-@@ -142,7 +142,6 @@ android_library("java") {
+@@ -146,7 +146,6 @@ android_library("java") {
      "//chrome/browser/device:java",
      "//chrome/browser/feature_engagement:java",
      "//chrome/browser/flags:java",
@@ -294,7 +296,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
      "//chrome/browser/history_clusters:java",
      "//chrome/browser/language/android:java",
      "//chrome/browser/lens:java",
-@@ -428,7 +427,6 @@ robolectric_library("junit") {
+@@ -440,7 +439,6 @@ robolectric_library("junit") {
      "//chrome/browser/commerce/merchant_viewer/android:java",
      "//chrome/browser/device:java",
      "//chrome/browser/flags:java",

build/patches/Disable-Accessibility-service-by-default.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1494,6 +1494,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1500,6 +1500,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_SAFETY_CHECK_BUTTON" desc="Text for the button to start Safety check.">
          Check now
        </message>
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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 @@
+@@ -7,6 +7,11 @@ found in the LICENSE file.
  
  <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
  
@@ -58,7 +58,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 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
-@@ -829,6 +829,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -899,6 +899,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

build/patches/Disable-AsyncDNS-by-default.patch

@@ -13,19 +13,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -81,12 +81,8 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
+@@ -98,12 +98,8 @@ BASE_FEATURE(kAppShimNewCloseBehavior,
  
  // Enables the built-in DNS resolver.
- const base::Feature kAsyncDns {
--  "AsyncDns",
+ BASE_FEATURE(kAsyncDns,
+-             "AsyncDns",
 -#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
--      base::FEATURE_ENABLED_BY_DEFAULT
+-             base::FEATURE_ENABLED_BY_DEFAULT
 -#else
--      base::FEATURE_DISABLED_BY_DEFAULT
+-             base::FEATURE_DISABLED_BY_DEFAULT
 -#endif
-+  "AsyncDns",                            // Bromite guard for this feature to be always disabled
-+      base::FEATURE_DISABLED_BY_DEFAULT  // ^
- };
++             "AsyncDns",                                // disabled by default
++            base::FEATURE_DISABLED_BY_DEFAULT           // in Bromite
+ );
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
 --

build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch

@@ -4,18 +4,20 @@ Subject: Disable DRM media origin IDs preprovisioning
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/base/media_switches.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ media/base/media_switches.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -746,7 +746,7 @@ const base::Feature kMediaDrmPersistentLicense{
+@@ -843,8 +843,8 @@ BASE_FEATURE(kMediaDrmPersistentLicense,
  // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs
  // which will trigger provisioning process after MediaDrmBridge is created.
- const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning",
--                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kMediaDrmPreprovisioning,
+-             "MediaDrmPreprovisioning",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "MediaDrmPreprovisioning",             // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
  // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin
  // IDs at startup (whenever a profile is loaded). Also used by tests that

build/patches/Disable-FLoC-and-privacy-sandbox.patch

@@ -11,18 +11,18 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../java/res/xml/privacy_preferences.xml      |  4 ---
- .../privacy/settings/PrivacySettings.java     | 22 ------------
+ .../privacy/settings/PrivacySettings.java     | 23 ------------
  .../browser/chrome_content_browser_client.cc  |  3 ++
  .../history/core/browser/history_backend.cc   | 13 +------
  .../privacy_sandbox/privacy_sandbox_prefs.cc  |  2 +-
  .../privacy_sandbox_settings.cc               | 35 +++++++++++--------
  .../privacy_sandbox_settings.h                |  1 -
- 7 files changed, 25 insertions(+), 55 deletions(-)
+ 7 files changed, 25 insertions(+), 56 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -66,10 +66,6 @@
+@@ -68,10 +68,6 @@ found in the LICENSE file.
          android:title="@string/open_external_links_incognito_title"
          android:summary="@string/open_external_links_incognito_summary"
          android:defaultValue="false" />
@@ -36,15 +36,16 @@ 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/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,7 +58,6 @@ public class PrivacySettings
+@@ -58,8 +58,6 @@ public class PrivacySettings
      private static final String PREF_SECURE_DNS = "secure_dns";
      private static final String PREF_DO_NOT_TRACK = "do_not_track";
      private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
 -    private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
+-    private static final String PREF_PROXY_OPTIONS = "proxy";
      private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
      private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
  
-@@ -86,21 +85,6 @@ public class PrivacySettings
+@@ -86,21 +84,6 @@ public class PrivacySettings
          SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
          getActivity().setTitle(R.string.prefs_privacy_security);
  
@@ -66,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
          if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_GUIDE)) {
              getPreferenceScreen().removePreference(privacyGuidePreference);
-@@ -220,12 +204,6 @@ public class PrivacySettings
+@@ -220,12 +203,6 @@ public class PrivacySettings
              secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
          }
  
@@ -82,9 +83,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
-@@ -2982,6 +2982,9 @@ bool ChromeContentBrowserClient::IsConversionMeasurementOperationAllowed(
-     const url::Origin* impression_origin,
-     const url::Origin* conversion_origin,
+@@ -3091,6 +3091,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+     const url::Origin* source_origin,
+     const url::Origin* destination_origin,
      const url::Origin* reporting_origin) {
 +  // make sure that this is always disabled in Bromite even if privacy sandbox is already disabled in the prefs
 +  if ((true))
@@ -95,7 +96,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 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
-@@ -493,18 +493,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
+@@ -495,18 +495,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
    if (!visit_id)
      return;
  
@@ -130,7 +131,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
 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(
+@@ -68,8 +68,7 @@ PrivacySandboxSettings::PrivacySandboxSettings(
      : delegate_(std::move(delegate)),
        host_content_settings_map_(host_content_settings_map),
        cookie_settings_(cookie_settings),
@@ -140,7 +141,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    DCHECK(pref_service_);
    DCHECK(host_content_settings_map_);
    DCHECK(cookie_settings_);
-@@ -88,7 +87,8 @@ PrivacySandboxSettings::PrivacySandboxSettings(
+@@ -94,7 +93,8 @@ PrivacySandboxSettings::PrivacySandboxSettings(
  
  PrivacySandboxSettings::~PrivacySandboxSettings() = default;
  
@@ -150,19 +151,19 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    // 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 =
-@@ -113,7 +113,8 @@ bool PrivacySandboxSettings::IsTopicsAllowedForContext(
+@@ -119,7 +119,8 @@ bool PrivacySandboxSettings::IsTopicsAllowedForContext(
           IsPrivacySandboxEnabledForContext(url, top_frame_origin);
  }
  
 -bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) {
 +bool PrivacySandboxSettings::IsTopicAllowed(const CanonicalTopic& topic) { // disabled in Bromite
 +  if ((true)) return false;
-   auto* blocked_topics =
+   const auto& blocked_topics =
        pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
  
-@@ -181,9 +182,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
+@@ -187,9 +188,8 @@ base::Time PrivacySandboxSettings::TopicsDataAccessibleSince() const {
  
- bool PrivacySandboxSettings::IsConversionMeasurementAllowed(
+ bool PrivacySandboxSettings::IsAttributionReportingAllowed(
      const url::Origin& top_frame_origin,
 -    const url::Origin& reporting_origin) const {
 -  return IsPrivacySandboxEnabledForContext(reporting_origin.GetURL(),
@@ -171,18 +172,18 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
 +  return false;
  }
  
- bool PrivacySandboxSettings::ShouldSendConversionReport(
-@@ -277,7 +277,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
+ bool PrivacySandboxSettings::MaySendAttributionReport(
+@@ -278,7 +278,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
  }
  
  bool PrivacySandboxSettings::IsFledgeJoiningAllowed(
 -    const url::Origin& top_frame_origin) const {
 +    const url::Origin& top_frame_origin) const { // disabled in Bromite
 +  if ((true)) return false;
-   DictionaryPrefUpdate scoped_pref_update(
+   ScopedDictPrefUpdate scoped_pref_update(
        pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
-   auto* pref_data = scoped_pref_update.Get();
-@@ -335,7 +336,9 @@ bool PrivacySandboxSettings::IsPrivateAggregationAllowed(
+   auto& pref_data = scoped_pref_update.Get();
+@@ -334,7 +335,9 @@ bool PrivacySandboxSettings::IsPrivateAggregationAllowed(
                                             top_frame_origin);
  }
  
@@ -193,7 +194,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    // If the delegate is restricting access the Privacy Sandbox is disabled.
    if (delegate_->IsPrivacySandboxRestricted())
      return false;
-@@ -350,7 +353,7 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+@@ -349,7 +352,7 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
    // settings is available.
    if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
      // For Privacy Sandbox Settings 3, APIs are disabled in incognito.
@@ -202,7 +203,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
        return false;
  
      if (should_override_setting_for_local_testing) {
-@@ -368,7 +371,8 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
+@@ -367,7 +370,8 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
    return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
  }
  
@@ -212,7 +213,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    // Only apply the decision to the appropriate preference.
    if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
      pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
-@@ -377,7 +381,8 @@ void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
+@@ -376,7 +380,8 @@ void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
    }
  }
  
@@ -222,7 +223,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    // The PrivacySandboxSettings is only involved in Trust Token access
    // decisions when the Release 3 flag is enabled.
    if (!base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3))
-@@ -432,9 +437,9 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
+@@ -441,9 +446,9 @@ bool PrivacySandboxSettings::IsPrivacySandboxEnabledForContext(
        content_settings::CookieSettings::QueryReason::kPrivacySandbox);
  }
  
@@ -238,7 +239,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
 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
-@@ -221,7 +221,6 @@ class PrivacySandboxSettings : public KeyedService {
+@@ -227,7 +227,6 @@ class PrivacySandboxSettings : public KeyedService {
    scoped_refptr<content_settings::CookieSettings> cookie_settings_;
    raw_ptr<PrefService> pref_service_;
    PrefChangeRegistrar pref_change_registrar_;

build/patches/Disable-NTP-remote-suggestions-by-default.patch

@@ -5,8 +5,8 @@ Subject: Disable NTP remote suggestions by default
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  components/feed/core/shared_prefs/pref_names.cc | 4 ++--
- components/ntp_snippets/features.cc             | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ components/ntp_snippets/features.cc             | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
 --- a/components/feed/core/shared_prefs/pref_names.cc
@@ -25,23 +25,27 @@ diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/c
 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,8 +39,8 @@ const base::Feature* const kAllFeatures[] = {
      &kOptionalImagesEnabledFeature};
  
- const base::Feature kArticleSuggestionsFeature{
--    "NTPArticleSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "NTPArticleSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kArticleSuggestionsFeature,
+-             "NTPArticleSuggestions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "NTPArticleSuggestions",                            // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
  
- const base::Feature kRemoteSuggestionsEmulateM58FetchingSchedule{
-     "RemoteSuggestionsEmulateM58FetchingSchedule",
-@@ -68,7 +68,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
+ BASE_FEATURE(kRemoteSuggestionsEmulateM58FetchingSchedule,
+              "RemoteSuggestionsEmulateM58FetchingSchedule",
+@@ -71,8 +71,8 @@ const char kNotificationsDailyLimit[] = "daily_limit";
  const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
  
- const base::Feature kKeepPrefetchedContentSuggestions{
--    "KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kKeepPrefetchedContentSuggestions,
+-             "KeepPrefetchedContentSuggestions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "KeepPrefetchedContentSuggestions",                // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                // in Bromite
  
- const base::Feature kOptionalImagesEnabledFeature{
-     "NTPRemoteSuggestionsOptionalImages", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kOptionalImagesEnabledFeature,
+              "NTPRemoteSuggestionsOptionalImages",
 --
 2.25.1

build/patches/Disable-PrivacyGuide.patch

@@ -4,36 +4,35 @@ Subject: Disable PrivacyGuide
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/common/chrome_features.cc | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ chrome/common/chrome_features.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -439,8 +439,8 @@ const base::Feature kHaTSDesktopDevToolsIssuesCSP{
+@@ -500,8 +500,8 @@ BASE_FEATURE(kHaTSDesktopDevToolsIssuesCSP,
  
  // Enables or disables the Happiness Tracking System for Desktop Privacy Guide.
- const base::Feature kHappinessTrackingSurveysForDesktopPrivacyGuide{
--    "HappinessTrackingSurveysForDesktopPrivacyGuide",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    "HappinessTrackingSurveysForDesktopPrivacyGuide",                      // must be disabled
-+    base::FEATURE_DISABLED_BY_DEFAULT};                                    // in Bromite
+ BASE_FEATURE(kHappinessTrackingSurveysForDesktopPrivacyGuide,
+-             "HappinessTrackingSurveysForDesktopPrivacyGuide",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "HappinessTrackingSurveysForDesktopPrivacyGuide",                      // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);                                    // in Bromite
  const base::FeatureParam<base::TimeDelta>
      kHappinessTrackingSurveysForDesktopPrivacyGuideTime{
          &kHappinessTrackingSurveysForDesktopPrivacyGuide, "settings-time",
-@@ -761,11 +761,11 @@ const base::Feature kPrefixWebAppWindowsWithAppName{
- const base::Feature kPrerenderFallbackToPreconnect{
-     "PrerenderFallbackToPreconnect", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -910,11 +910,11 @@ BASE_FEATURE(kPrerenderFallbackToPreconnect,
+              "PrerenderFallbackToPreconnect",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
--const base::Feature kPrivacyGuide2{"PrivacyGuide2",
--                                   base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature kPrivacyGuide2{"PrivacyGuide2",                           // always disabled
-+                                   base::FEATURE_DISABLED_BY_DEFAULT};        // in Bromite
+-BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kPrivacyGuide2, "PrivacyGuide2", base::FEATURE_DISABLED_BY_DEFAULT); // always disabled in Bromite
  
--const base::Feature kPrivacyGuideAndroid{"PrivacyGuideAndroid",
--                                         base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature kPrivacyGuideAndroid{"PrivacyGuideAndroid",               // always disabled
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};  // in Bromite
+ BASE_FEATURE(kPrivacyGuideAndroid,
+-             "PrivacyGuideAndroid",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PrivacyGuideAndroid",               // always disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
  
  // Enables or disables push subscriptions keeping Chrome running in the
  // background when closed.

build/patches/Disable-StartSurface-feature.patch

@@ -0,0 +1,27 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Wed, 16 Nov 2022 11:18:07 +0100
+Subject: Disable StartSurface feature
+
+This feature would normally show a search box but leads to crashes.
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/browser/flags/android/chrome_feature_list.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
+--- a/chrome/browser/flags/android/chrome_feature_list.cc
++++ b/chrome/browser/flags/android/chrome_feature_list.cc
+@@ -1081,8 +1081,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kStartSurfaceAndroid,
+-             "StartSurfaceAndroid",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "StartSurfaceAndroid",                 // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
+ 
+ BASE_FEATURE(kFeedPositionAndroid,
+              "FeedPositionAndroid",
+--
+2.25.1

build/patches/Disable-TLS-resumption.patch

@@ -28,18 +28,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/about_flags.cc        |  6 +++
  chrome/browser/flag_descriptions.cc  |  8 ++++
  chrome/browser/flag_descriptions.h   |  6 +++
- net/base/features.cc                 |  6 +++
+ net/base/features.cc                 |  8 ++++
  net/base/features.h                  |  6 +++
  net/http/http_network_session.cc     |  1 +
  net/quic/quic_stream_factory.cc      | 35 ++++++++++++++++-
  net/socket/ssl_client_socket_impl.cc | 59 ++++++++++++++++++++++++++++
  net/socket/ssl_client_socket_impl.h  |  2 +
- 9 files changed, 128 insertions(+), 1 deletion(-)
+ 9 files changed, 130 insertions(+), 1 deletion(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -4806,6 +4806,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5016,6 +5016,12 @@ const FeatureEntry kFeatureEntries[] = {
      {"enable-tls13-early-data", flag_descriptions::kEnableTLS13EarlyDataName,
       flag_descriptions::kEnableTLS13EarlyDataDescription, kOsAll,
       FEATURE_VALUE_TYPE(net::features::kEnableTLS13EarlyData)},
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1035,6 +1035,14 @@ const char kEnableTLS13EarlyDataDescription[] =
+@@ -1036,6 +1036,14 @@ const char kEnableTLS13EarlyDataDescription[] =
      "during the handshake when resuming a connection to a compatible TLS 1.3 "
      "server.";
  
@@ -73,7 +73,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
-@@ -596,6 +596,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
+@@ -595,6 +595,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
  extern const char kEnableTLS13EarlyDataName[];
  extern const char kEnableTLS13EarlyDataDescription[];
  
@@ -89,35 +89,37 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -108,6 +108,12 @@ const base::Feature kUseDnsHttpsSvcbAlpn{"UseDnsHttpsSvcbAlpn",
- const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -61,6 +61,14 @@ const base::FeatureParam<base::TimeDelta> kUseDnsHttpsSvcbSecureExtraTimeMin{
+     &kUseDnsHttpsSvcb, "UseDnsHttpsSvcbSecureExtraTimeMin",
+     base::Milliseconds(5)};
  
-+const base::Feature kDisableTLSResumption{"DisableTLSResumption",
-+                                          base::FEATURE_ENABLED_BY_DEFAULT};
++BASE_FEATURE(kDisableTLSResumption,
++             "DisableTLSResumption",
++             base::FEATURE_ENABLED_BY_DEFAULT);
 +
-+const base::Feature kLogTLSResumption{"LogTLSResumption",
-+                                      base::FEATURE_DISABLED_BY_DEFAULT};
++BASE_FEATURE(kLogTLSResumption,
++             "LogTLSResumption",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kUseDnsHttpsSvcbAlpn,
+              "UseDnsHttpsSvcbAlpn",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -170,6 +170,12 @@ NET_EXPORT extern const base::Feature kUseDnsHttpsSvcbAlpn;
+@@ -91,6 +91,12 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUseDnsHttpsSvcbAlpn);
  // Enables TLS 1.3 early data.
- NET_EXPORT extern const base::Feature kEnableTLS13EarlyData;
+ NET_EXPORT BASE_DECLARE_FEATURE(kEnableTLS13EarlyData);
  
 +// Disables TLS resumption.
-+NET_EXPORT extern const base::Feature kDisableTLSResumption;
++NET_EXPORT BASE_DECLARE_FEATURE(kDisableTLSResumption);
 +
 +// Log TLS resumption.
-+NET_EXPORT extern const base::Feature kLogTLSResumption;
++NET_EXPORT BASE_DECLARE_FEATURE(kLogTLSResumption);
 +
  // Enables the TLS Encrypted ClientHello feature.
  // https://datatracker.ietf.org/doc/html/draft-ietf-tls-esni-13
- NET_EXPORT extern const base::Feature kEncryptedClientHello;
+ NET_EXPORT BASE_DECLARE_FEATURE(kEncryptedClientHello);
 diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 --- a/net/http/http_network_session.cc
 +++ b/net/http/http_network_session.cc
@@ -132,7 +134,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 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
-@@ -74,6 +74,7 @@
+@@ -72,6 +72,7 @@
  #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h"
  #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
  #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -140,7 +142,7 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -247,6 +248,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
+@@ -245,6 +246,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
  
  }  // namespace
  
@@ -179,10 +181,10 @@ diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
  // 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
-@@ -2242,7 +2275,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
+@@ -2249,7 +2282,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
                sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
-               actual_network_isolation_key),
+               actual_network_anonymization_key),
 -          std::make_unique<quic::QuicClientSessionCache>(), this);
 +          std::make_unique<BromiteSessionCache>(), this);
  
@@ -200,7 +202,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +    LOG(INFO) << "SSL Log: "
 +              << tag
 +              << " host: " << host_and_port_.ToString()
-+              << " NIK: " << ssl_config_.network_isolation_key.ToDebugString();
++              << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString();
 +    return;
 +  }
 +
@@ -214,7 +216,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +  LOG(INFO) << "SSL Log: "
 +            << tag
 +            << " host: " << host_and_port_.ToString()
-+            << " NIK: " << ssl_config_.network_isolation_key.ToDebugString()
++            << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString()
 +            << " sessionid: " << base::HexEncode(session_id, len)
 +            << (ticklen > 0 ? " ticket:" + base::HexEncode(ticket, ticklen) : "");
 +}
@@ -225,7 +227,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -787,6 +813,8 @@ int SSLClientSocketImpl::Init() {
+@@ -786,6 +812,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -234,7 +236,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    }
  
    transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -1075,6 +1103,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -1074,6 +1102,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -270,7 +272,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
  
    // Measure TLS connections that implement the renegotiation_info extension.
-@@ -1748,6 +1805,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1746,6 +1803,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {

build/patches/Disable-all-predictors-code.patch

@@ -7,17 +7,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../chrome_hints_manager.cc                   |  1 +
  .../optimization_guide_keyed_service.cc       |  1 -
- chrome/common/chrome_features.cc              |  6 ++---
+ chrome/common/chrome_features.cc              |  8 ++--
  .../optimization_guide/core/hints_fetcher.cc  |  1 +
- .../optimization_guide/core/hints_manager.cc  |  4 ++++
- .../core/optimization_guide_features.cc       | 24 +++++++++----------
- .../core/prediction_model_download_manager.cc |  6 +++--
+ .../optimization_guide/core/hints_manager.cc  |  5 +++
+ .../core/optimization_guide_features.cc       | 38 +++++++++----------
+ .../core/prediction_model_download_manager.cc |  6 ++-
  .../core/prediction_model_fetcher_impl.cc     |  1 +
- components/optimization_guide/features.gni    |  4 +---
- components/permissions/features.cc            |  8 +++----
- .../segmentation_platform/public/features.cc  |  2 +-
- third_party/blink/common/features.cc          |  2 +-
- 12 files changed, 33 insertions(+), 27 deletions(-)
+ components/optimization_guide/features.gni    |  4 +-
+ components/permissions/features.cc            |  8 ++--
+ third_party/blink/common/features.cc          |  8 +---
+ 11 files changed, 40 insertions(+), 41 deletions(-)
 
 diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/browser/optimization_guide/chrome_hints_manager.cc
 --- a/chrome/browser/optimization_guide/chrome_hints_manager.cc
@@ -33,7 +32,7 @@ diff --git a/chrome/browser/optimization_guide/chrome_hints_manager.cc b/chrome/
 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
-@@ -361,7 +361,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -320,7 +320,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  void OptimizationGuideKeyedService::RegisterOptimizationTypes(
      const std::vector<optimization_guide::proto::OptimizationType>&
          optimization_types) {
@@ -44,30 +43,32 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
 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
-@@ -728,8 +728,8 @@ const base::Feature kPermissionAuditing{"PermissionAuditing",
- 
+@@ -883,8 +883,8 @@ BASE_FEATURE(kPermissionAuditing,
  // Enables using the prediction service for permission prompts. We will keep
  // this feature in order to allow us to update the holdback chance via finch.
--const base::Feature kPermissionPredictions{"PermissionPredictions",
--                                           base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kPermissionPredictions{"PermissionPredictions",               // always disabled
-+                                           base::FEATURE_DISABLED_BY_DEFAULT};    // in Bromite
+ BASE_FEATURE(kPermissionPredictions,
+-             "PermissionPredictions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PermissionPredictions",               // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
  // The holdback chance is 30% but it can also be configured/updated
  // through finch if needed.
-@@ -740,7 +740,7 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
+@@ -895,8 +895,8 @@ const base::FeatureParam<double> kPermissionPredictionsHoldbackChance(
  
  // Enables using the prediction service for geolocation permission prompts.
- const base::Feature kPermissionGeolocationPredictions{
--    "PermissionGeolocationPredictions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "PermissionGeolocationPredictions", base::FEATURE_DISABLED_BY_DEFAULT}; // always disabled in Bromite
+ BASE_FEATURE(kPermissionGeolocationPredictions,
+-             "PermissionGeolocationPredictions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PermissionGeolocationPredictions",        // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
  
  const base::FeatureParam<double>
      kPermissionGeolocationPredictionsHoldbackChance(
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -176,6 +176,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -174,6 +174,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
      optimization_guide::proto::RequestContext request_context,
      const std::string& locale,
      HintsFetchedCallback hints_fetched_callback) {
@@ -78,7 +79,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 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
-@@ -361,6 +361,7 @@ void HintsManager::Shutdown() {
+@@ -352,6 +352,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -86,7 +87,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1272,6 +1273,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1056,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ 
+   // TODO(crbug/1275612): Check whether we have consent to fetch.
++  if ((true)) return; // no consent on bromite
+ 
+   // This set contains URLs that require some information to be fetched, whether
+   // that be a URL-keyed hint or a host-keyed hint.
+@@ -1263,6 +1265,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      proto::OptimizationType optimization_type,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -99,72 +108,84 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
 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
-@@ -77,16 +77,16 @@ bool IsSupportedLocaleForFeature(const std::string locale,
- 
+@@ -78,17 +78,17 @@ bool IsSupportedLocaleForFeature(const std::string locale,
  // Enables the syncing of the Optimization Hints component, which provides
  // hints for what optimizations can be applied on a page load.
--const base::Feature kOptimizationHints{"OptimizationHints",
--                                       base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kOptimizationHints{"OptimizationHints",                   // disabled by default
-+                                       base::FEATURE_DISABLED_BY_DEFAULT};    // in Bromite
+ BASE_FEATURE(kOptimizationHints,
+-             "OptimizationHints",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OptimizationHints",                   // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
  // Enables fetching from a remote Optimization Guide Service.
- const base::Feature kRemoteOptimizationGuideFetching{
--    "OptimizationHintsFetching", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "OptimizationHintsFetching", base::FEATURE_DISABLED_BY_DEFAULT};          // disabled by default in Bromite
+ BASE_FEATURE(kRemoteOptimizationGuideFetching,
+-             "OptimizationHintsFetching",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OptimizationHintsFetching",           // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
- const base::Feature kRemoteOptimizationGuideFetchingAnonymousDataConsent{
--    "OptimizationHintsFetchingAnonymousDataConsent",
--    base::FEATURE_ENABLED_BY_DEFAULT};
-+    "OptimizationHintsFetchingAnonymousDataConsent",                          // disabled by default
-+    base::FEATURE_DISABLED_BY_DEFAULT};                                       // in Bromite
+ BASE_FEATURE(kRemoteOptimizationGuideFetchingAnonymousDataConsent,
+-             "OptimizationHintsFetchingAnonymousDataConsent",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OptimizationHintsFetchingAnonymousDataConsent",        // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                     // in Bromite
  
  // Enables performance info in the context menu and fetching from a remote
  // Optimization Guide Service.
-@@ -96,15 +96,15 @@ const base::Feature kContextMenuPerformanceInfoAndRemoteHintFetching{
+@@ -98,17 +98,13 @@ 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};        // disabled by default in Bromite
+ BASE_FEATURE(kOptimizationTargetPrediction,
+-             "OptimizationTargetPrediction",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OptimizationTargetPrediction",                         // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                     // in Bromite
  
  // Enables the downloading of models.
- const base::Feature kOptimizationGuideModelDownloading {
-   "OptimizationGuideModelDownloading",
- #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
--      base::FEATURE_ENABLED_BY_DEFAULT
+ 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
- };
+-             base::FEATURE_DISABLED_BY_DEFAULT
+-#endif  // !BUILD_WITH_TFLITE_LIB
++             "OptimizationGuideModelDownloading",                    // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT                       // in Bromite
+ );
  
-@@ -134,7 +134,7 @@ const base::Feature kPageEntitiesModelResetOnShutdown{
+ // Enables page content to be annotated.
+@@ -143,8 +139,8 @@ 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
+ BASE_FEATURE(kPushNotifications,
+-             "OptimizationGuidePushNotifications",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "OptimizationGuidePushNotifications",    // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);      // in Bromite
  
  // This feature flag does not turn off any behavior, it is only used for
  // experiment parameters.
-@@ -146,12 +146,12 @@ const base::Feature kOptimizationGuideMetadataValidation{
-     "OptimizationGuideMetadataValidation", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -158,15 +154,15 @@ BASE_FEATURE(kOptimizationGuideMetadataValidation,
+              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};
+ BASE_FEATURE(kPageTopicsBatchAnnotations,
+-             "PageTopicsBatchAnnotations",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PageTopicsBatchAnnotations",             // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);       // in Bromite
+ BASE_FEATURE(kPageVisibilityBatchAnnotations,
+              "PageVisibilityBatchAnnotations",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
- const base::Feature kUseLocalPageEntitiesMetadataProvider{
--    "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "UseLocalPageEntitiesMetadataProvider", base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
+ BASE_FEATURE(kUseLocalPageEntitiesMetadataProvider,
+-             "UseLocalPageEntitiesMetadataProvider",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "UseLocalPageEntitiesMetadataProvider",   // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);       // in Bromite
  
- const base::Feature kPageContentAnnotationsValidation{
-     "PageContentAnnotationsValidation", base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -390,7 +390,7 @@ size_t MaxURLKeyedHintCacheSize() {
+ BASE_FEATURE(kPageContentAnnotationsValidation,
+              "PageContentAnnotationsValidation",
+@@ -408,7 +404,7 @@ size_t MaxURLKeyedHintCacheSize() {
  
  bool ShouldPersistHintsToDisk() {
    return GetFieldTrialParamByFeatureAsBool(kOptimizationHints,
@@ -238,46 +259,40 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -60,12 +60,12 @@ const base::Feature kPermissionChipRequestTypeSensitive{
+@@ -85,12 +85,12 @@ BASE_FEATURE(kPermissionChipRequestTypeSensitive,
  // When enabled, use the value of the `service_url` FeatureParam as the url
  // for the Web Permission Predictions Service.
- const base::Feature kPermissionPredictionServiceUseUrlOverride{
--    "kPermissionPredictionServiceUseUrlOverride",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    "kPermissionPredictionServiceUseUrlOverride",           // disabled by default
-+    base::FEATURE_DISABLED_BY_DEFAULT};                     // in Bromite
+ BASE_FEATURE(kPermissionPredictionServiceUseUrlOverride,
+-             "kPermissionPredictionServiceUseUrlOverride",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "kPermissionPredictionServiceUseUrlOverride",       // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
  
- const base::Feature kPermissionOnDeviceNotificationPredictions{
--    "PermissionOnDeviceNotificationPredictions",
--    base::FEATURE_ENABLED_BY_DEFAULT};
-+    "PermissionOnDeviceNotificationPredictions",            // disabled by default
-+    base::FEATURE_DISABLED_BY_DEFAULT};                     // in Bromite
+ BASE_FEATURE(kPermissionOnDeviceNotificationPredictions,
+-             "PermissionOnDeviceNotificationPredictions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PermissionOnDeviceNotificationPredictions",        // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);                 // in Bromite
  
- #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
-@@ -27,7 +27,7 @@ const base::Feature kSegmentationPlatformLowEngagementFeature{
- const base::Feature kSegmentationPlatformFeedSegmentFeature{
-   "SegmentationPlatformFeedSegmentFeature",
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
--      base::FEATURE_ENABLED_BY_DEFAULT
-+      base::FEATURE_DISABLED_BY_DEFAULT
- };
- #else
-       base::FEATURE_DISABLED_BY_DEFAULT
+ BASE_FEATURE(kPermissionOnDeviceGeolocationPredictions,
+              "PermissionOnDeviceGeolocationPredictions",
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -245,7 +245,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
+@@ -214,12 +214,8 @@ BASE_FEATURE(kMixedContentAutoupgrade,
+ // predictor may preconnect/prefetch to resources/origins to make the
+ // future navigations faster.
+ BASE_FEATURE(kNavigationPredictor,
+-             "NavigationPredictor",
+-#if BUILDFLAG(IS_ANDROID)
+-             base::FEATURE_ENABLED_BY_DEFAULT
+-#else
+-             base::FEATURE_DISABLED_BY_DEFAULT
+-#endif
++             "NavigationPredictor",                // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT     // in Bromite
+ );
+ 
+ // Anchor Element Interaction
 --
 2.25.1

build/patches/Disable-all-promo-dialogs.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -873,7 +873,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -851,7 +851,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
       * displayed.
       */
      private boolean triggerPromo(boolean intentWithEffect) {
@@ -19,7 +19,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
              if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
                  return false;
              }
-@@ -908,8 +908,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -886,8 +886,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                  preferenceManager.writeBoolean(
                          ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
              }
@@ -29,6 +29,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 +            return false;
      }
  
-     private boolean maybeShowPromo() {
+     @VisibleForTesting
 --
 2.25.1

build/patches/Disable-conversion-measurement-api.patch

@@ -11,43 +11,50 @@ being sent and being saved to disk, although it is currently in uncalled code.
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../browser/flags/android/chrome_feature_list.cc  |  2 +-
- .../embedder_support/origin_trials/features.cc    |  3 ++-
+ .../browser/flags/android/chrome_feature_list.cc  |  4 ++--
+ .../embedder_support/origin_trials/features.cc    |  8 ++++----
  .../render_view_context_menu_base.cc              |  3 ---
  .../aggregatable_report_sender.cc                 | 15 +++++++--------
  .../attribution_reporting/attribution_host.cc     |  1 +
  .../attribution_report_network_sender.cc          | 15 ++++++++-------
- .../attribution_storage_sql.cc                    |  2 +-
+ .../attribution_storage_sql.cc                    |  8 +++++---
  content/browser/storage_partition_impl.cc         |  7 +------
  content/public/browser/navigation_controller.cc   |  1 -
- third_party/blink/common/features.cc              |  2 +-
+ third_party/blink/common/features.cc              |  4 ++--
  .../platform/runtime_enabled_features.json5       |  7 +++++++
- 11 files changed, 29 insertions(+), 29 deletions(-)
+ 11 files changed, 37 insertions(+), 36 deletions(-)
 
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -489,7 +489,7 @@ const base::Feature kAppMenuMobileSiteOption{"AppMenuMobileSiteOption",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -521,8 +521,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
- const base::Feature kAppToWebAttribution{"AppToWebAttribution",
--                                         base::FEATURE_DISABLED_BY_DEFAULT};
-+                                         base::FEATURE_DISABLED_BY_DEFAULT}; // guard this
+ BASE_FEATURE(kAppToWebAttribution,
+-             "AppToWebAttribution",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "AppToWebAttribution",               // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
  
- const base::Feature kBackgroundThreadPool{"BackgroundThreadPool",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kBackgroundThreadPool,
+              "BackgroundThreadPool",
 diff --git a/components/embedder_support/origin_trials/features.cc b/components/embedder_support/origin_trials/features.cc
 --- a/components/embedder_support/origin_trials/features.cc
 +++ b/components/embedder_support/origin_trials/features.cc
-@@ -17,8 +17,9 @@ const base::Feature kOriginTrialsSampleAPIThirdPartyAlternativeUsage{
-     "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
-     base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -14,11 +14,11 @@ namespace embedder_support {
+ // Users from control group will have the feature disabled, excluding them
+ // from the origin trial.
+ BASE_FEATURE(kOriginTrialsSampleAPIThirdPartyAlternativeUsage,
+-             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OriginTrialsSampleAPIThirdPartyAlternativeUsage",   // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
  
-+// When disabled, the API cannot be enabled by tokens.
- const base::Feature kConversionMeasurementAPIAlternativeUsage{
-     "ConversionMeasurementAPIAlternativeUsage",
--    base::FEATURE_ENABLED_BY_DEFAULT};
-+    base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kConversionMeasurementAPIAlternativeUsage,
+-             "ConversionMeasurementAPIAlternativeUsage",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "ConversionMeasurementAPIAlternativeUsage",          // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);                  // in Bromite
  
  }  // namespace embedder_support
 diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
@@ -107,7 +114,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
 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
-@@ -112,13 +112,8 @@ void AttributionReportNetworkSender::SendReport(
+@@ -110,13 +110,8 @@ void AttributionReportNetworkSender::SendReport(
                     network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED;
    simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode);
  
@@ -123,7 +130,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
  }
  
  void AttributionReportNetworkSender::OnReportSent(
-@@ -127,6 +122,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -125,6 +120,12 @@ void AttributionReportNetworkSender::OnReportSent(
      bool is_debug_report,
      ReportSentCallback sent_callback,
      scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -139,19 +146,32 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 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
-@@ -425,7 +425,7 @@ void AttributionStorageSql::RunInMemoryForTesting() {
+@@ -422,6 +422,8 @@ DestinationLimitResult GetDestinationLimitResult(
+   }
  }
  
- // static
--bool AttributionStorageSql::g_run_in_memory_ = false;
-+bool AttributionStorageSql::g_run_in_memory_ = true;
++bool g_run_in_memory = true;
++
+ }  // namespace
  
  // static
- bool AttributionStorageSql::DeleteStorageForTesting(
+@@ -433,9 +435,9 @@ bool AttributionStorageSql::DeleteStorageForTesting(
+ AttributionStorageSql::AttributionStorageSql(
+     const base::FilePath& user_data_directory,
+     std::unique_ptr<AttributionStorageDelegate> delegate)
+-    : path_to_database_(user_data_directory.empty()
+-                            ? base::FilePath()
+-                            : DatabasePath(user_data_directory)),
++    : path_to_database_(user_data_directory.empty() || g_run_in_memory
++                             ? base::FilePath()
++                             : DatabasePath(user_data_directory)),
+       delegate_(std::move(delegate)),
+       rate_limit_table_(delegate_.get()) {
+   DCHECK(delegate_);
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1317,12 +1317,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1353,12 +1353,7 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -179,19 +199,21 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
 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
-@@ -109,7 +109,7 @@ const base::Feature kCSSContainerQueries{"CSSContainerQueries",
+@@ -105,8 +105,8 @@ BASE_FEATURE(kBlockingDownloadsInAdFrameWithoutUserActivation,
  
  // Controls whether the Conversion Measurement API infrastructure is enabled.
- const base::Feature kConversionMeasurement{"ConversionMeasurement",
--                                           base::FEATURE_ENABLED_BY_DEFAULT};
-+                                           base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kConversionMeasurement,
+-             "ConversionMeasurement",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "ConversionMeasurement",                 // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);      // in Bromite
  
  // Controls whether LCP calculations should exclude low-entropy images. If
  // enabled, then the associated parameter sets the cutoff, expressed as the
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -106,6 +106,13 @@
+@@ -176,6 +176,13 @@
    },
  
    data: [

build/patches/Disable-crash-reporting.patch

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -227,8 +227,8 @@ const base::Feature kCooperativeScheduling{"CooperativeScheduling",
- 
+@@ -241,8 +241,8 @@ BASE_FEATURE(kCooperativeScheduling,
  // 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};    // ^
+ BASE_FEATURE(kCrashReporting,
+-             "CrashReporting",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "CrashReporting",                      // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
  // Enables support for the `Critical-CH` response header.
  // https://github.com/WICG/client-hints-infrastructure/blob/master/reliability.md#critical-ch

build/patches/Disable-feeds-support-by-default.patch

@@ -6,13 +6,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------
  .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
- components/feed/feed_feature_list.cc                      | 4 ++--
- 3 files changed, 4 insertions(+), 10 deletions(-)
+ components/feed/feed_feature_list.cc                      | 8 ++++----
+ 3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
 +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
-@@ -42,13 +42,7 @@ public final class FeedFeatures {
+@@ -50,13 +50,7 @@ public final class FeedFeatures {
       *         the user is signed in and confirms it's not a child profile.
       */
      public static boolean isWebFeedUIEnabled() {
@@ -26,11 +26,11 @@ diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/fe
 +        return false;
      }
  
-     /**
+     public static boolean shouldUseWebFeedAwarenessIPH() {
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
-@@ -77,7 +77,7 @@ public class CachedFeatureFlags {
+@@ -78,7 +78,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false)
                      .put(ChromeFeatureList.INSTANCE_SWITCHER, true)
                      .put(ChromeFeatureList.INSTANT_START, false)
@@ -42,20 +42,24 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 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
-@@ -16,12 +16,12 @@
+@@ -17,14 +17,14 @@
  namespace feed {
  
- const base::Feature kInterestFeedContentSuggestions{
--    "InterestFeedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "InterestFeedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kInterestFeedContentSuggestions,
+-             "InterestFeedContentSuggestions",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "InterestFeedContentSuggestions",          // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
  // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
  // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
  // changed, please update the cached one's default value in CachedFeatureFlags.
- const base::Feature kInterestFeedV2{"InterestFeedV2",
--                                    base::FEATURE_ENABLED_BY_DEFAULT};
-+                                    base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kInterestFeedV2,
+-             "InterestFeedV2",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "InterestFeedV2",                          // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
  
- const base::Feature kInterestFeedV2Autoplay{"InterestFeedV2Autoplay",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kInterestFeedV2Autoplay,
+              "InterestFeedV2Autoplay",
 --
 2.25.1

build/patches/Disable-fetching-of-all-field-trials.patch

@@ -2,7 +2,8 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Sun, 8 Jul 2018 18:16:34 +0200
 Subject: Disable fetching of all field trials
 
-Disable seed-based field trials
+Disable seed-based field trials.
+Disable reporting of Omnibox suggestions header.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
@@ -12,12 +13,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/ukm/ukm_recorder_impl.cc           |  3 +++
  .../firstrun/VariationsSeedBridge.java        |  2 +-
  .../firstrun/VariationsSeedFetcher.java       | 26 ++++---------------
- .../variations/net/omnibox_http_headers.cc    |  2 +-
+ .../variations/net/omnibox_http_headers.cc    |  4 +--
  .../variations/net/variations_http_headers.cc |  3 +++
  .../service/variations_field_trial_creator.cc |  3 ++-
  .../variations/service/variations_service.cc  | 15 +++--------
  .../renderer/core/loader/document_loader.cc   |  7 -----
- 11 files changed, 22 insertions(+), 47 deletions(-)
+ 11 files changed, 23 insertions(+), 48 deletions(-)
 
 diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
 --- a/android_webview/nonembedded/BUILD.gn
@@ -30,10 +31,10 @@ diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/
      "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",
-@@ -118,7 +117,6 @@ android_library("services_java") {
-     "java/src/org/chromium/android_webview/services/SafeModeContentProvider.java",
+@@ -119,7 +118,6 @@ android_library("services_java") {
      "java/src/org/chromium/android_webview/services/SafeModeService.java",
      "java/src/org/chromium/android_webview/services/ServicesStatsHelper.java",
+     "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java",
 -    "java/src/org/chromium/android_webview/services/VariationsSeedHolder.java",
      "java/src/org/chromium/android_webview/services/VariationsSeedServer.java",
    ]
@@ -53,19 +54,19 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s
 diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 --- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 +++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-@@ -51,6 +51,8 @@ void CreateFallbackSamplingTrial(const std::string& trial_name,
-                                  const std::string& feature_name,
-                                  const int sampled_in_rate_per_mille,
-                                  base::FeatureList* feature_list) {
+@@ -54,6 +54,8 @@ void CreateFallbackSamplingTrial(
+     const std::string& feature_name,
+     const int sampled_in_rate_per_mille,
+     base::FeatureList* feature_list) {
 +  if ((true))
 +    return;
    scoped_refptr<base::FieldTrial> trial(
        base::FieldTrialList::FactoryGetFieldTrial(
-           trial_name, /*total_probability=*/1000, "Default",
-@@ -90,6 +92,8 @@ void CreateFallbackSamplingTrial(const std::string& trial_name,
- // field trial controlling the sampling feature.
- void CreateFallbackUkmSamplingTrial(bool is_stable_channel,
-                                     base::FeatureList* feature_list) {
+           trial_name, /*total_probability=*/1000, "Default", entropy_provider));
+@@ -93,6 +95,8 @@ void CreateFallbackUkmSamplingTrial(
+     const base::FieldTrial::EntropyProvider& entropy_provider,
+     bool is_stable_channel,
+     base::FeatureList* feature_list) {
 +  if ((true))
 +    return;
    static const char kSampledGroup_Stable[] = "Sampled_NoSeed_Stable";
@@ -74,7 +75,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
 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
-@@ -210,6 +210,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map,
+@@ -206,6 +206,9 @@ bool HasUnknownMetrics(const builders::DecodeMap& decode_map,
  
  UkmRecorderImpl::UkmRecorderImpl()
      : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -145,12 +146,14 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
 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[] =
+@@ -21,8 +21,8 @@ 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};
+ BASE_FEATURE(kReportOmniboxOnDeviceSuggestionsHeader,
+-             "ReportOmniboxOnDeviceSuggestionsHeader",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "ReportOmniboxOnDeviceSuggestionsHeader",  // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);        // in Bromite
  
  std::string GetHeaderValue() {
    const std::string group =
@@ -183,7 +186,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
 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,
+@@ -220,17 +220,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
@@ -202,8 +205,8 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 +  return false;
  }
  
- std::unique_ptr<SeedResponse> MaybeImportFirstRunSeed(
-@@ -599,7 +590,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+ // Returns the already downloaded first run seed, and clear the seed from the
+@@ -589,7 +580,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
    // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
    // had a chance to run yet from the previous request. In this case, don't
    // start a new request and just let the previous one finish.
@@ -215,7 +218,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -175,13 +175,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
+@@ -173,13 +173,6 @@ Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
  WebVector<int> CopyInitiatorOriginTrials(
      const Vector<OriginTrialFeature>& initiator_origin_trial_features) {
    WebVector<int> result;

build/patches/Disable-idle-detection.patch

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -438,7 +438,7 @@ const base::Feature kIdentityInCanMakePaymentEventFeature{
+@@ -479,7 +479,7 @@ BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
+ // This is intended as a kill switch for the Idle Detection feature. To enable
  // this feature, the experimental web platform features flag should be set,
  // or the site should obtain an Origin Trial token.
- const base::Feature kIdleDetection{"IdleDetection",
--                                   base::FEATURE_ENABLED_BY_DEFAULT};
-+                                   base::FEATURE_DISABLED_BY_DEFAULT};
+-BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kIdleDetection, "IdleDetection", base::FEATURE_DISABLED_BY_DEFAULT);
  
  // A feature flag for the memory-backed code cache.
- const base::Feature kInMemoryCodeCache{"InMemoryCodeCache",
+ BASE_FEATURE(kInMemoryCodeCache,
 --
 2.25.1

build/patches/Disable-lock-icon-in-address-bar-by-default.patch

@@ -4,18 +4,20 @@ Subject: Disable lock icon in address bar by default
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/omnibox/common/omnibox_features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ components/omnibox/common/omnibox_features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
 --- a/components/omnibox/common/omnibox_features.cc
 +++ b/components/omnibox/common/omnibox_features.cc
-@@ -353,7 +353,7 @@ const base::Feature kSiteSearchStarterPack{"OmniboxSiteSearchStarterPack",
+@@ -433,8 +433,8 @@ BASE_FEATURE(kSiteSearchStarterPack,
+ 
  // Experiment to introduce new security indicators for HTTPS.
- const base::Feature kUpdatedConnectionSecurityIndicators{
-     "OmniboxUpdatedConnectionSecurityIndicators",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kUpdatedConnectionSecurityIndicators,
+-             "OmniboxUpdatedConnectionSecurityIndicators",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "OmniboxUpdatedConnectionSecurityIndicators",    // enabled by default
++             base::FEATURE_ENABLED_BY_DEFAULT);               // in Bromite
  
  // Feature used to default typed navigations to use HTTPS instead of HTTP.
  // This only applies to navigations that don't have a scheme such as

build/patches/Disable-media-router-and-remoting-by-default.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -53,26 +53,15 @@ const base::Feature kGlobalMediaControlsCastStartStop{
+@@ -59,26 +59,15 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
  
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
  #if !BUILDFLAG(IS_ANDROID)
    if (!base::FeatureList::IsEnabled(kMediaRouter))
      return false;
-@@ -100,7 +89,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
+@@ -106,7 +95,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
      return allowed;
    }
    return true;
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
  
  #if !BUILDFLAG(IS_ANDROID)
  void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
-@@ -113,7 +102,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -119,7 +108,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
                                 PrefRegistry::PUBLIC);
  
    registry->RegisterBooleanPref(
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 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
-@@ -414,7 +414,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -411,7 +411,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
  
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);

build/patches/Disable-offline-pages-in-CCT.patch

@@ -4,20 +4,22 @@ Subject: Disable offline pages in CCT
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/offline_pages/core/offline_page_feature.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ components/offline_pages/core/offline_page_feature.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
 --- a/components/offline_pages/core/offline_page_feature.cc
 +++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -36,7 +36,7 @@ const base::Feature kOfflinePagesDescriptivePendingStatusFeature{
-     "OfflinePagesDescriptivePendingStatus", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -41,8 +41,8 @@ BASE_FEATURE(kOfflinePagesDescriptivePendingStatusFeature,
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
- const base::Feature kOfflinePagesInDownloadHomeOpenInCctFeature{
--    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "OfflinePagesInDownloadHomeOpenInCct", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kOfflinePagesInDownloadHomeOpenInCctFeature,
+-             "OfflinePagesInDownloadHomeOpenInCct",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "OfflinePagesInDownloadHomeOpenInCct",       // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
  
- const base::Feature kOfflineIndicatorFeature{"OfflineIndicator",
-                                              base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kOfflineIndicatorFeature,
+              "OfflineIndicator",
 --
 2.25.1

build/patches/Disable-plugins-enumeration.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1965,9 +1965,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -1920,9 +1920,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {

build/patches/Disable-safety-check.patch

@@ -13,36 +13,36 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -415,7 +415,6 @@ android_library("chrome_java") {
-     "//chrome/browser/privacy_sandbox/android:java",
-     "//chrome/browser/profiles/android:java",
-     "//chrome/browser/safe_browsing/android:java",
--    "//chrome/browser/safety_check/android:java",
-     "//chrome/browser/search_engines/android:java",
-     "//chrome/browser/search_resumption:java",
-     "//chrome/browser/segmentation_platform:factory_java",
-@@ -1041,8 +1040,6 @@ robolectric_binary("chrome_junit_tests") {
-     "//chrome/browser/preferences:preferences_junit_tests",
-     "//chrome/browser/privacy_guide/android:java",
-     "//chrome/browser/profiles/android:java",
--    "//chrome/browser/safety_check/android:java",
--    "//chrome/browser/safety_check/android:junit",
-     "//chrome/browser/search_engines/android:java",
-     "//chrome/browser/search_resumption:junit",
-     "//chrome/browser/segmentation_platform:factory_java",
-@@ -1570,8 +1567,6 @@ android_library("chrome_test_java") {
-     "//chrome/browser/profiles/android:java",
-     "//chrome/browser/safe_browsing/android:java",
-     "//chrome/browser/safe_browsing/android:javatests",
--    "//chrome/browser/safety_check/android:java",
--    "//chrome/browser/safety_check/android:javatests",
-     "//chrome/browser/search_engines/android:java",
-     "//chrome/browser/selection/android:javatests",
-     "//chrome/browser/settings:java",
+@@ -442,7 +442,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/privacy_sandbox/android:java",
+       "//chrome/browser/profiles/android:java",
+       "//chrome/browser/safe_browsing/android:java",
+-      "//chrome/browser/safety_check/android:java",
+       "//chrome/browser/search_engines/android:java",
+       "//chrome/browser/search_resumption:java",
+       "//chrome/browser/segmentation_platform:factory_java",
+@@ -1032,8 +1031,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/privacy_guide/android:java",
+       "//chrome/browser/privacy_guide/android:junit",
+       "//chrome/browser/profiles/android:java",
+-      "//chrome/browser/safety_check/android:java",
+-      "//chrome/browser/safety_check/android:junit",
+       "//chrome/browser/search_engines/android:java",
+       "//chrome/browser/search_resumption:junit",
+       "//chrome/browser/segmentation_platform:factory_java",
+@@ -1556,8 +1553,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/profiles/android:java",
+       "//chrome/browser/safe_browsing/android:java",
+       "//chrome/browser/safe_browsing/android:javatests",
+-      "//chrome/browser/safety_check/android:java",
+-      "//chrome/browser/safety_check/android:javatests",
+       "//chrome/browser/search_engines/android:java",
+       "//chrome/browser/selection/android:javatests",
+       "//chrome/browser/settings:java",
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -941,7 +941,6 @@ chrome_java_sources = [
+@@ -946,7 +946,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3306,7 +3306,6 @@ static_library("browser") {
+@@ -3346,7 +3346,6 @@ static_library("browser") {
        "//chrome/browser/privacy_sandbox/android:jni_headers",
        "//chrome/browser/reading_list/android",
        "//chrome/browser/safe_browsing/android:safe_browsing_enums",

build/patches/Disable-smart-selection-by-default.patch

@@ -11,12 +11,12 @@ the ChromeSmartSelection feature flag.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../contextualsearch/SelectionClientManager.java  |  4 +++-
- .../browser/flags/android/chrome_feature_list.cc  |  4 ++++
+ .../browser/flags/android/chrome_feature_list.cc  |  5 +++++
  .../browser/flags/android/chrome_feature_list.h   |  1 +
  .../chrome/browser/flags/ChromeFeatureList.java   |  1 +
  .../selection/SelectionPopupControllerImpl.java   |  2 +-
  testing/variations/fieldtrial_testing_config.json | 15 +++++++++++++++
- 6 files changed, 25 insertions(+), 2 deletions(-)
+ 6 files changed, 26 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/SelectionClientManager.java
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
 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
-@@ -189,6 +189,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -188,6 +188,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCCTBrandTransparency,
      &kCCTClientDataHeader,
      &kCCTIncognito,
@@ -50,31 +50,32 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCCTIncognitoAvailableToThirdParty,
      &kCCTNewDownloadTab,
      &kCCTPackageNameRecording,
-@@ -586,6 +587,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{
- const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -996,6 +997,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
+              "DiscoverFeedMultiColumn",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
-+const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
-+                                          base::FEATURE_DISABLED_BY_DEFAULT};
++BASE_FEATURE(kChromeSmartSelection,
++             "ChromeSmartSelection",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
- const base::Feature kCommandLineOnNonRooted{"CommandLineOnNonRooted",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kTabStripRedesign,
+              "TabStripRedesign",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -60,6 +60,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting;
- extern const base::Feature kChromeNewDownloadTab;
- extern const base::Feature kChromeShareLongScreenshot;
- extern const base::Feature kChromeShareScreenshot;
-+extern const base::Feature kChromeSmartSelection;
- extern const base::Feature kChromeSharingHub;
- extern const base::Feature kChromeSharingHubLaunchAdjacent;
- extern const base::Feature kChromeSurveyNextAndroid;
+@@ -62,6 +62,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
+ BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
+ BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
+ BASE_DECLARE_FEATURE(kChromeShareLongScreenshot);
++BASE_DECLARE_FEATURE(kChromeSmartSelection);
+ BASE_DECLARE_FEATURE(kChromeShareScreenshot);
+ BASE_DECLARE_FEATURE(kChromeSharingHub);
+ BASE_DECLARE_FEATURE(kChromeSharingHubLaunchAdjacent);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -258,6 +258,7 @@ public abstract class ChromeFeatureList {
+@@ -255,6 +255,7 @@ public abstract class ChromeFeatureList {
      public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI";
      public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals";
      public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
@@ -85,7 +86,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
-@@ -818,7 +818,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+@@ -822,7 +822,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
              menu.removeItem(R.id.select_action_menu_share);
          }
  
@@ -97,7 +98,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
 --- a/testing/variations/fieldtrial_testing_config.json
 +++ b/testing/variations/fieldtrial_testing_config.json
-@@ -2705,6 +2705,21 @@
+@@ -3045,6 +3045,21 @@
              ]
          }
      ],
@@ -116,7 +117,7 @@ diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variati
 +            ]
 +        }
 +    ],
-     "ChromeStart": [
+     "CommerceHintAndroid": [
          {
              "platforms": [
 --

build/patches/Disable-some-signed-exchange-features.patch

@@ -4,29 +4,30 @@ Subject: Disable some signed exchange features
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- content/public/common/content_features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ content/public/common/content_features.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -883,7 +883,7 @@ const base::Feature kSharedArrayBufferOnDesktop{
+@@ -999,14 +999,14 @@ BASE_FEATURE(kSharedArrayBufferOnDesktop,
  // Signed Exchange Reporting for distributors
  // https://www.chromestatus.com/feature/5687904902840320
- const base::Feature kSignedExchangeReportingForDistributors{
--    "SignedExchangeReportingForDistributors", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "SignedExchangeReportingForDistributors", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kSignedExchangeReportingForDistributors,
+-             "SignedExchangeReportingForDistributors",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "SignedExchangeReportingForDistributors",    // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
  
- // Subresource prefetching+loading via Signed HTTP Exchange
- // https://www.chromestatus.com/feature/5126805474246656
-@@ -893,7 +893,7 @@ const base::Feature kSignedExchangeSubresourcePrefetch{
  // Origin-Signed HTTP Exchanges (for WebPackage Loading)
  // https://www.chromestatus.com/feature/5745285984681984
- const base::Feature kSignedHTTPExchange{"SignedHTTPExchange",
--                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kSignedHTTPExchange,
+-             "SignedHTTPExchange",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "SignedHTTPExchange",                        // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);          // in Bromite
  
- // Whether to send a ping to the inner URL upon navigation or not.
- const base::Feature kSignedHTTPExchangePingValidity{
+ // Delays RenderProcessHost shutdown by a few seconds to allow the subframe's
+ // process to be potentially reused. This aims to reduce process churn in
 --
 2.25.1

build/patches/Disable-support-for-RAR-files-inspection.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
 +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -97,7 +97,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
+@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
    if (inspection_type == DownloadFileType::ZIP) {
      StartExtractZipFeatures();
    } else if (inspection_type == DownloadFileType::RAR) {
@@ -63,14 +63,14 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
    if (is_linux || is_win) {
      source_set("document_analyzer") {
        sources = [
-@@ -182,7 +150,6 @@ source_set("safe_browsing") {
+@@ -184,7 +152,6 @@ source_set("safe_browsing") {
        ":archive_analyzer_results",
        ":binary_feature_extractor",
        ":download_type_util",
 -      ":rar_analyzer",
        "//components/safe_browsing/core/common",
+       "//third_party/lzma_sdk/google:seven_zip_reader",
      ]
- 
 diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
 --- a/chrome/services/file_util/safe_archive_analyzer.cc
 +++ b/chrome/services/file_util/safe_archive_analyzer.cc
@@ -79,10 +79,10 @@ diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/service
  #include "build/build_config.h"
  #include "chrome/common/safe_browsing/archive_analyzer_results.h"
 -#include "chrome/common/safe_browsing/rar_analyzer.h"
+ #include "chrome/common/safe_browsing/seven_zip_analyzer.h"
  #include "chrome/common/safe_browsing/zip_analyzer.h"
  
- #if BUILDFLAG(IS_MAC)
-@@ -46,8 +45,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+@@ -47,9 +46,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
                                           AnalyzeRarFileCallback callback) {
    DCHECK(rar_file.IsValid());
  
@@ -92,5 +92,6 @@ diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/service
 -      std::move(rar_file), std::move(temporary_file), &results);
    std::move(callback).Run(results);
  }
+ 
 --
 2.25.1

build/patches/Disable-text-fragments-by-default.patch

@@ -12,16 +12,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/flag_descriptions.cc                          | 4 ++++
  chrome/browser/flag_descriptions.h                           | 3 +++
  chrome/browser/ui/prefs/prefs_tab_helper.cc                  | 2 +-
- content/child/runtime_features.cc                            | 2 +-
- third_party/blink/common/features.cc                         | 2 +-
+ content/child/runtime_features.cc                            | 1 +
+ third_party/blink/common/features.cc                         | 5 +++++
+ third_party/blink/public/common/features.h                   | 1 +
  third_party/blink/renderer/core/dom/document.cc              | 5 +++++
- .../blink/renderer/platform/runtime_enabled_features.json5   | 3 +--
- 9 files changed, 26 insertions(+), 5 deletions(-)
+ .../blink/renderer/platform/runtime_enabled_features.json5   | 5 ++---
+ 10 files changed, 32 insertions(+), 4 deletions(-)
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -5959,6 +5959,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6275,6 +6275,11 @@ const FeatureEntry kFeatureEntries[] = {
           "")},
  #endif
  
@@ -36,9 +37,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 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
-@@ -2641,6 +2641,11 @@
-     "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"],
-     "expiry_milestone": 105
+@@ -2706,6 +2706,11 @@
+     "owners": [ "robsc", "napper", "alanlxl" ],
+     "expiry_milestone": 130
    },
 +  {
 +    "name": "enable-text-fragment-anchor",
@@ -46,35 +47,35 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
 +  },
    {
-     "name": "enable-payment-request-basic-card",
-     "owners": [ "web-payments-team@google.com" ],
+     "name": "enable-neural-stylus-palm-rejection",
+     "owners": [ "robsc", "napper", "adlr" ],
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
-@@ -1373,6 +1373,10 @@ const char kEnableRestrictedWebApisDescription[] =
-     "Enable the restricted web APIs for dev trial. This will be replaced with "
-     "permission policies to control the capabilities afterwards.";
+@@ -1387,6 +1387,10 @@ extern const char kDropInputEventsBeforeFirstPaintDescription[] =
+     "intentionally interact with elements on that page. By dropping the events "
+     "we prevent accidental interaction with a page the user has not seen yet.";
  
 +const char kEnableTextFragmentAnchorName[] = "Enable Text Fragment Anchor.";
 +const char kEnableTextFragmentAnchorDescription[] =
 +    "Enables scrolling to text specified in URL's fragment.";
 +
- const char kEnableUseZoomForDsfName[] =
-     "Use Blink's zoom for device scale factor.";
- const char kEnableUseZoomForDsfDescription[] =
+ const char kEnableCssSelectorFragmentAnchorName[] =
+     "Enables CSS selector fragment anchors";
+ const char kEnableCssSelectorFragmentAnchorDescription[] =
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
-@@ -764,6 +764,9 @@ extern const char
- extern const char kEnableRestrictedWebApisName[];
- extern const char kEnableRestrictedWebApisDescription[];
+@@ -767,6 +767,9 @@ extern const char kReduceHorizontalFlingVelocityDescription[];
  
+ extern const char kRetailCouponsName[];
+ extern const char kRetailCouponsDescription[];
 +extern const char kEnableTextFragmentAnchorName[];
 +extern const char kEnableTextFragmentAnchorDescription[];
 +
- extern const char kEnableUseZoomForDsfName[];
- extern const char kEnableUseZoomForDsfDescription[];
- extern const char kEnableUseZoomForDsfChoiceDefault[];
+ 
+ extern const char kDropInputEventsBeforeFirstPaintName[];
+ extern const char kDropInputEventsBeforeFirstPaintDescription[];
 diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
 +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -90,31 +91,44 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 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
-@@ -283,7 +283,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
-     {wf::EnableSpeculationRulesPrefetchProxy,
-      blink::features::kSpeculationRulesPrefetchProxy, kSetOnlyIfOverridden},
-     {wf::EnableSubresourceWebBundles, features::kSubresourceWebBundles},
--    {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor},
-+    {wf::EnableTextFragmentAnchor, blink::features::kTextFragmentAnchor}, // will set the TextFragmentIdentifiers runtime feature
+@@ -270,6 +270,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+      features::kSharedArrayBufferOnDesktop},
+     {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill},
      {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
-     {wf::EnableCSSSelectorFragmentAnchor,
-      blink::features::kCssSelectorFragmentAnchor},
++    {wf::EnableTextFragmentIdentifiers, blink::features::kTextFragmentAnchor},
+     {wf::EnableUserActivationSameOriginVisibility,
+      features::kUserActivationSameOriginVisibility},
+     {wf::EnableVideoPlaybackQuality, features::kVideoPlaybackQuality},
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -521,7 +521,7 @@ const base::Feature kStopInBackground {
+@@ -496,6 +496,11 @@ BASE_FEATURE(kDropInputEventsBeforeFirstPaint,
+              "DropInputEventsBeforeFirstPaint",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
- // Enable text snippets in URL fragments. https://crbug.com/919204.
- const base::Feature kTextFragmentAnchor{"TextFragmentAnchor",
--                                        base::FEATURE_ENABLED_BY_DEFAULT};
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};
++// Enable text snippets in URL fragments. https://crbug.com/919204.
++BASE_FEATURE(kTextFragmentAnchor,
++             "TextFragmentAnchor",
++             base::FEATURE_DISABLED_BY_DEFAULT);
++
+ // File handling icons. https://crbug.com/1218213
+ BASE_FEATURE(kFileHandlingIcons,
+              "FileHandlingIcons",
+diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
+--- a/third_party/blink/public/common/features.h
++++ b/third_party/blink/public/common/features.h
+@@ -224,6 +224,7 @@ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeJpeg420ImagesToYUV);
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDecodeLossyWebPImagesToYUV);
+ 
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kWebFontsCacheAwareTimeoutAdaption);
++BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kTextFragmentAnchor);
+ 
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioWorkletThreadRealtimePriority);
  
- // Enables CSS selector fragment anchors. https://crbug.com/1252460
- const base::Feature kCssSelectorFragmentAnchor{
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4241,9 +4241,14 @@ void Document::SetURL(const KURL& url) {
+@@ -4262,9 +4262,14 @@ void Document::SetURL(const KURL& url) {
    TRACE_EVENT1("navigation", "Document::SetURL", "url",
                 new_url.GetString().Utf8());
  
@@ -132,12 +146,15 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 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
-@@ -2243,8 +2243,7 @@
+@@ -2583,10 +2583,9 @@
      },
      {
        name: "TextFragmentIdentifiers",
 -      origin_trial_feature_name: "TextFragmentIdentifiers",
+       public: true,
 -      status: "stable",
+-      base_feature: "TextFragmentAnchor",
++      status: "test",
 +      origin_trial_feature_name: "TextFragmentIdentifiers"
      },
      {

build/patches/Disable-third-party-origin-trials.patch

@@ -60,7 +60,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -7289,7 +7289,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
+@@ -7455,7 +7455,6 @@ void NavigationRequest::RestartBackForwardCachedNavigationImpl() {
  void NavigationRequest::ForceEnableOriginTrials(
      const std::vector<std::string>& trials) {
    DCHECK(!HasCommitted());
@@ -71,7 +71,7 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -476,10 +476,6 @@ void FillNavigationParamsRequest(
+@@ -475,10 +475,6 @@ void FillNavigationParamsRequest(
          common_params.initiator_origin.value();
    }
  
@@ -82,7 +82,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    navigation_params->was_discarded = commit_params.was_discarded;
    navigation_params->document_ukm_source_id =
        commit_params.document_ukm_source_id;
-@@ -512,12 +508,6 @@ void FillNavigationParamsRequest(
+@@ -511,12 +507,6 @@ void FillNavigationParamsRequest(
    navigation_params->web_bundle_claimed_url =
        commit_params.web_bundle_claimed_url;
  
@@ -95,7 +95,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    if (!commit_params.early_hints_preloaded_resources.empty()) {
      navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
      for (const auto& resource : commit_params.early_hints_preloaded_resources) {
-@@ -564,11 +554,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -570,11 +560,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
            info->url_request.GetURLRequestExtraData().get());
    DCHECK(url_request_extra_data);
  
@@ -107,7 +107,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    blink::NavigationDownloadPolicy download_policy;
    download_policy.ApplyDownloadFramePolicy(
        info->is_opener_navigation, info->url_request.HasUserGesture(),
-@@ -586,7 +571,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -592,7 +577,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
        info->url_request.HasUserGesture(),
        info->url_request.HasTextFragmentToken(),
        info->should_check_main_world_content_security_policy,
@@ -159,7 +159,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -162,13 +162,6 @@ constexpr base::FeatureParam<bool> kCacheInlineScriptCodeFixConfiguring{
+@@ -160,13 +160,6 @@ namespace {
  Vector<OriginTrialFeature> CopyInitiatorOriginTrials(
      const WebVector<int>& initiator_origin_trial_features) {
    Vector<OriginTrialFeature> result;
@@ -173,7 +173,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -181,18 +174,12 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -179,18 +172,12 @@ WebVector<int> CopyInitiatorOriginTrials(
  Vector<String> CopyForceEnabledOriginTrials(
      const WebVector<WebString>& force_enabled_origin_trials) {
    Vector<String> result;
@@ -192,7 +192,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -2577,10 +2564,6 @@ void DocumentLoader::CreateParserPostCommit() {
+@@ -2663,10 +2650,6 @@ void DocumentLoader::CreateParserPostCommit() {
            OriginTrialFeature::kTouchEventFeatureDetection);
      }
  

build/patches/Disable-update-scheduler.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
 --- a/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
 +++ b/components/component_updater/android/java/src/org/chromium/components/component_updater/UpdateScheduler.java
-@@ -34,9 +34,7 @@ public class UpdateScheduler {
+@@ -33,9 +33,7 @@ public class UpdateScheduler {
  
      @CalledByNative
      /* package */ static boolean isAvailable() {

build/patches/Disable-various-metrics.patch

@@ -13,11 +13,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/ntp/most_visited_sites_bridge.cc    | 17 -----------------
  chrome/browser/browser_process_impl.cc          |  2 +-
  chrome/browser/chrome_content_browser_client.cc | 15 ---------------
- .../chrome_metrics_services_manager_client.cc   |  4 ++--
+ .../chrome_metrics_services_manager_client.cc   |  8 ++++----
  components/ntp_tiles/BUILD.gn                   |  3 ---
  components/ntp_tiles/most_visited_sites.cc      |  2 --
  services/metrics/public/cpp/ukm_recorder.cc     |  2 +-
- 8 files changed, 5 insertions(+), 42 deletions(-)
+ 8 files changed, 7 insertions(+), 44 deletions(-)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 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
-@@ -998,7 +998,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -991,7 +991,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 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
-@@ -63,7 +63,6 @@
+@@ -66,7 +66,6 @@
  #include "chrome/browser/hid/chrome_hid_delegate.h"
  #include "chrome/browser/interstitials/enterprise_util.h"
  #include "chrome/browser/lifetime/browser_shutdown.h"
@@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/media/audio_service_util.h"
  #include "chrome/browser/media/router/media_router_feature.h"
  #include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
-@@ -4394,16 +4393,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4509,16 +4508,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      content::NavigationHandle* handle) {
    std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
  
@@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
    MaybeAddThrottle(
        SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle),
-@@ -4488,10 +4477,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4603,10 +4592,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
    }
  
@@ -140,21 +140,25 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
-@@ -73,7 +73,7 @@ namespace internal {
+@@ -73,8 +73,8 @@ namespace internal {
  // recording and reporting are enabled. If the feature is enabled, but no
  // consent is given, then there will be no recording or reporting.
- const base::Feature kMetricsReportingFeature{"MetricsReporting",
--                                             base::FEATURE_ENABLED_BY_DEFAULT};
-+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kMetricsReportingFeature,
+-             "MetricsReporting",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "MetricsReporting",                  // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
  
  #if BUILDFLAG(IS_ANDROID)
  // Same as |kMetricsReportingFeature|, but this feature is associated with a
-@@ -82,7 +82,7 @@ const base::Feature kMetricsReportingFeature{"MetricsReporting",
+@@ -83,8 +83,8 @@ BASE_FEATURE(kMetricsReportingFeature,
  // the fix to not affect the overall sampling rate, this new feature was
  // created. See crbug/1306481.
- const base::Feature kPostFREFixMetricsReportingFeature{
--    "PostFREFixMetricsReporting", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "PostFREFixMetricsReporting", base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kPostFREFixMetricsReportingFeature,
+-             "PostFREFixMetricsReporting",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PostFREFixMetricsReporting",        // disabled by deault
++             base::FEATURE_DISABLED_BY_DEFAULT);  // in Bromite
  #endif  // BUILDFLAG(IS_ANDROID)
  
  // Name of the variations param that defines the sampling rate.
@@ -197,8 +201,8 @@ diff --git a/services/metrics/public/cpp/ukm_recorder.cc b/services/metrics/publ
  
  namespace ukm {
  
--const base::Feature kUkmFeature = {"Ukm", base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kUkmFeature = {"Ukm", base::FEATURE_DISABLED_BY_DEFAULT}; // disabled in Bromite
+-BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kUkmFeature, "Ukm", base::FEATURE_DISABLED_BY_DEFAULT); // disabled in Bromite
  
  UkmRecorder::UkmRecorder() = default;
  

build/patches/Do-not-build-API-keys-infobar.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -1286,8 +1286,6 @@ static_library("ui") {
+@@ -1304,8 +1304,6 @@ static_library("ui") {
        "singleton_tabs.h",
        "startup/automation_infobar_delegate.cc",
        "startup/automation_infobar_delegate.h",

build/patches/Do-not-compile-QR-code-sharing.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -96,7 +96,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
+@@ -99,7 +99,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
  import org.chromium.chrome.browser.share.ShareDelegate;
  import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  import org.chromium.chrome.browser.share.ShareUtils;
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -493,10 +492,6 @@ public class RootUiCoordinator
+@@ -498,10 +497,6 @@ public class RootUiCoordinator
      }
  
      public void onAttachFragment(Fragment fragment) {
@@ -44,17 +44,17 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
  import org.chromium.chrome.browser.share.screenshot.ScreenshotCoordinator;
  import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
  import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
-@@ -312,9 +311,6 @@ public class ChromeProvidedSharingOptionsProvider {
+@@ -311,9 +310,6 @@ public class ChromeProvidedSharingOptionsProvider {
                  || !ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO)) {
              mOrderedFirstPartyOptions.add(createSendTabToSelfFirstPartyOption());
          }
 -        if (!mIsIncognito) {
 -            mOrderedFirstPartyOptions.add(createQrCodeFirstPartyOption());
 -        }
-         if (mTabProvider.hasValue() && UserPrefs.get(profile).getBoolean(Pref.PRINTING_ENABLED)) {
+         if (mTabProvider.hasValue() && UserPrefs.get(mProfile).getBoolean(Pref.PRINTING_ENABLED)) {
              mOrderedFirstPartyOptions.add(createPrintingFirstPartyOption());
          }
-@@ -457,21 +453,6 @@ public class ChromeProvidedSharingOptionsProvider {
+@@ -456,21 +452,6 @@ public class ChromeProvidedSharingOptionsProvider {
                  .build();
      }
  

build/patches/Do-not-hide-component-extensions.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -459,9 +459,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
+@@ -465,9 +465,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
  }
  
  bool Extension::ShouldExposeViaManagementAPI() const {

build/patches/Do-not-link-with-libatomic.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1543,7 +1543,7 @@ mixed_component("base") {
+@@ -1561,7 +1561,7 @@ mixed_component("base") {
    # more robust check for this.
    if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
        host_toolchain != "//build/toolchain/cros:host") {

build/patches/DoH-improvements.patch

@@ -82,7 +82,7 @@ diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc
 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
-@@ -3283,6 +3283,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) {
+@@ -2933,6 +2933,7 @@ void HostResolverManager::SetDnsConfigOverrides(DnsConfigOverrides overrides) {
    bool changed = dns_client_->SetConfigOverrides(std::move(overrides));
  
    if (changed) {

build/patches/Enable-Certificate-Transparency.patch

@@ -3,26 +3,28 @@ Date: Fri, 10 Jun 2022 14:20:02 +0200
 Subject: Enable Certificate Transparency
 
 Reporting/auditing functionalities are disabled; a flag is exposed.
+Add guard to make sure that certificate transparency stays enabled
+by default.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/browser/about_flags.cc                         | 5 +++++
- chrome/browser/browser_features.cc                    | 2 +-
+ chrome/browser/browser_features.cc                    | 4 ++--
  chrome/browser/flag_descriptions.cc                   | 4 ++++
  chrome/browser/flag_descriptions.h                    | 3 +++
  chrome/browser/net/system_network_context_manager.cc  | 4 ----
  chrome/browser/ssl/sct_reporting_service.cc           | 5 +++++
- chrome/common/chrome_features.cc                      | 6 +++---
- net/http/transport_security_state.cc                  | 5 +++--
+ chrome/common/chrome_features.cc                      | 6 +-----
+ net/http/transport_security_state.cc                  | 9 +++++----
  net/url_request/report_sender.cc                      | 3 ++-
  services/network/network_context.cc                   | 2 +-
  services/network/sct_auditing/sct_auditing_handler.cc | 2 ++
- 11 files changed, 29 insertions(+), 12 deletions(-)
+ 11 files changed, 30 insertions(+), 17 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
-@@ -8658,6 +8658,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9060,6 +9060,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebMidiDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWebMidi)},
  #if BUILDFLAG(IS_ANDROID)
@@ -37,19 +39,21 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc
 --- a/chrome/browser/browser_features.cc
 +++ b/chrome/browser/browser_features.cc
-@@ -143,7 +143,7 @@ const base::Feature kWebUsbDeviceDetection{"WebUsbDeviceDetection",
+@@ -155,8 +155,8 @@ BASE_FEATURE(kWebUsbDeviceDetection,
  #if BUILDFLAG(IS_ANDROID)
  // Enables Certificate Transparency on Android.
- const base::Feature kCertificateTransparencyAndroid{
--    "CertificateTransparencyAndroid", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "CertificateTransparencyAndroid", base::FEATURE_ENABLED_BY_DEFAULT};  // enabled by default in Bromite
+ BASE_FEATURE(kCertificateTransparencyAndroid,
+-             "CertificateTransparencyAndroid",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "CertificateTransparencyAndroid",         // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);        // in Bromite
  #endif
  
- const base::Feature kLargeFaviconFromGoogle{"LargeFaviconFromGoogle",
+ BASE_FEATURE(kLargeFaviconFromGoogle,
 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
-@@ -6504,6 +6504,10 @@ const char kAutofillCreditCardUploadDescription[] =
+@@ -6874,6 +6874,10 @@ const char kAutofillCreditCardUploadDescription[] =
  #endif  // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@@ -63,7 +67,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
-@@ -3767,6 +3767,9 @@ extern const char kAutofillCreditCardUploadDescription[];
+@@ -3969,6 +3969,9 @@ extern const char kAutofillCreditCardUploadDescription[];
  #endif  // defined(TOOLKIT_VIEWS) || BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID)
@@ -76,7 +80,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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
-@@ -914,7 +914,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
+@@ -851,7 +851,6 @@ void SystemNetworkContextManager::SetEnableCertificateTransparencyForTesting(
  bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
    if (certificate_transparency_enabled_for_testing_.has_value())
      return certificate_transparency_enabled_for_testing_.value();
@@ -84,7 +88,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
  // TODO(carlosil): Figure out if we can/should remove the OFFICIAL_BUILD and
  // GOOGLE_CHROME_BRANDING checks now that enforcement does not rely on build
  // dates, and allow embedders to enforce.
-@@ -928,9 +927,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
+@@ -865,9 +864,6 @@ bool SystemNetworkContextManager::IsCertificateTransparencyEnabled() {
  #else
    return true;
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -112,23 +116,23 @@ diff --git a/chrome/browser/ssl/sct_reporting_service.cc b/chrome/browser/ssl/sc
 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
-@@ -822,9 +822,9 @@ const base::Feature kSchedulerConfiguration{"SchedulerConfiguration",
+@@ -995,11 +995,7 @@ BASE_FEATURE(kSchedulerConfiguration,
  
  // Controls whether SCT audit reports are queued and the rate at which they
  // should be sampled. Default sampling rate is 1/10,000 certificates.
 -#if BUILDFLAG(IS_ANDROID)
--const base::Feature kSCTAuditing{"SCTAuditing",
--                                 base::FEATURE_DISABLED_BY_DEFAULT};
-+#if BUILDFLAG(IS_ANDROID)                                            // SCT auditing
-+const base::Feature kSCTAuditing{"SCTAuditing",                      // must be always
-+                                 base::FEATURE_DISABLED_BY_DEFAULT}; // disabled in Bromite
- #else
- const base::Feature kSCTAuditing{"SCTAuditing",
-                                  base::FEATURE_ENABLED_BY_DEFAULT};
+-BASE_FEATURE(kSCTAuditing, "SCTAuditing", base::FEATURE_DISABLED_BY_DEFAULT);
+-#else
+-BASE_FEATURE(kSCTAuditing, "SCTAuditing", base::FEATURE_ENABLED_BY_DEFAULT);
+-#endif
++BASE_FEATURE(kSCTAuditing, "SCTAuditing", base::FEATURE_DISABLED_BY_DEFAULT); // disabled in Bromite
+ constexpr base::FeatureParam<double> kSCTAuditingSamplingRate{
+     &kSCTAuditing, "sampling_rate", 0.0001};
+ 
 diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
 --- a/net/http/transport_security_state.cc
 +++ b/net/http/transport_security_state.cc
-@@ -338,6 +338,7 @@ class HSTSPreloadDecoder : public net::extras::PreloadDecoder {
+@@ -337,6 +337,7 @@ class HSTSPreloadDecoder : public net::extras::PreloadDecoder {
  
  bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
  #if !BUILDFLAG(INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST)
@@ -136,24 +140,28 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_
    if (g_hsts_source == nullptr)
      return false;
  #endif
-@@ -383,11 +384,11 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
+@@ -382,13 +383,13 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
  
  // static
- const base::Feature TransportSecurityState::kDynamicExpectCTFeature{
--    "DynamicExpectCT", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};                         // disabled in Bromite
+ BASE_FEATURE(kDynamicExpectCTFeature,
+-             "DynamicExpectCT",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "DynamicExpectCT",                               // disabled by default
++             base::FEATURE_DISABLED_BY_DEFAULT);              // in Bromite
  
  // static
- const base::Feature TransportSecurityState::kCertificateTransparencyEnforcement{
--    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};
-+    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};       // always enabled in Bromite
+ BASE_FEATURE(kCertificateTransparencyEnforcement,
+-             "CertificateTransparencyEnforcement",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "CertificateTransparencyEnforcement",            // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);               // in Bromite
  
  void SetTransportSecurityStateSourceForTesting(
      const TransportSecurityStateSource* source) {
 diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
 --- a/net/url_request/report_sender.cc
 +++ b/net/url_request/report_sender.cc
-@@ -86,7 +86,8 @@ void ReportSender::Send(const GURL& report_uri,
+@@ -87,7 +87,8 @@ void ReportSender::Send(
  
    URLRequest* raw_url_request = url_request.get();
    inflight_requests_[raw_url_request] = std::move(url_request);
@@ -166,7 +174,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -2658,7 +2658,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2652,7 +2652,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
    // TransportSecurityState.  Since no requests have been made yet, safe to do
    // this even after the call to Build().
  
@@ -178,7 +186,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
 diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/network/sct_auditing/sct_auditing_handler.cc
 --- a/services/network/sct_auditing/sct_auditing_handler.cc
 +++ b/services/network/sct_auditing/sct_auditing_handler.cc
-@@ -115,6 +115,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
+@@ -113,6 +113,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }
@@ -186,7 +194,7 @@ diff --git a/services/network/sct_auditing/sct_auditing_handler.cc b/services/ne
  
    // Only audit valid SCTs. This ensures that they come from a known log, have
    // a valid signature, and thus are expected to be public certificates. If
-@@ -330,6 +331,7 @@ void SCTAuditingHandler::AddReporter(
+@@ -327,6 +328,7 @@ void SCTAuditingHandler::AddReporter(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }

build/patches/Enable-ECH-by-default.patch

@@ -0,0 +1,25 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Sun, 30 Oct 2022 18:11:19 +0100
+Subject: Enable ECH by default
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ net/base/features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
++++ b/net/base/features.cc
+@@ -76,8 +76,8 @@ BASE_FEATURE(kEnableTLS13EarlyData,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kEncryptedClientHello,
+-             "EncryptedClientHello",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "EncryptedClientHello",                 // enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
+ 
+ BASE_FEATURE(kNetworkQualityEstimator,
+              "NetworkQualityEstimator",
+--
+2.25.1

build/patches/Enable-HEVC-by-default.patch

@@ -2,20 +2,24 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
 Date: Tue, 27 Sep 2022 23:39:54 +0200
 Subject: Enable HEVC by default
 
+Add a guard to avoid setting to be disabled upstream.
+
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- media/base/media_switches.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ media/base/media_switches.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -275,7 +275,7 @@ const base::Feature kPictureInPicture{"PictureInPicture",
+@@ -289,8 +289,8 @@ BASE_FEATURE(kPictureInPicture,
  #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
  // Enables HEVC hardware accelerated decoding.
- const base::Feature kPlatformHEVCDecoderSupport{
--    "PlatformHEVCDecoderSupport", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPlatformHEVCDecoderSupport,
+-             "PlatformHEVCDecoderSupport",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "PlatformHEVCDecoderSupport",         // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);    // in Bromite
  #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
  
  // Only decode preload=metadata elements upon visibility.

build/patches/Enable-IntentBlockExternalFormRedirectsNoGesture.patch

@@ -1,23 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 25 May 2021 19:33:41 +0200
-Subject: Enable IntentBlockExternalFormRedirectsNoGesture
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../external_intents/android/external_intents_features.cc       | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
---- a/components/external_intents/android/external_intents_features.cc
-+++ b/components/external_intents/android/external_intents_features.cc
-@@ -34,7 +34,7 @@ const base::Feature kAutofillAssistantGoogleInitiatorOriginCheck{
- 
- const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
-     "IntentBlockExternalFormRedirectsNoGesture",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
- 
- const base::Feature kScaryExternalNavigationRefactoring{
-     "ScaryExternalNavigationRefactoring", base::FEATURE_ENABLED_BY_DEFAULT};
---
-2.25.1

build/patches/Enable-PermuteTLSExtensions-by-default.patch

@@ -0,0 +1,25 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Fri, 2 Dec 2022 01:18:14 +0100
+Subject: Enable PermuteTLSExtensions by default
+
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ net/base/features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
++++ b/net/base/features.cc
+@@ -154,8 +154,8 @@ BASE_FEATURE(kTLS13KeyUpdate,
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kPermuteTLSExtensions,
+-             "PermuteTLSExtensions",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PermuteTLSExtensions",               // enabled by default
++             base::FEATURE_ENABLED_BY_DEFAULT);    // in Bromite
+ 
+ BASE_FEATURE(kPostQuantumCECPQ2,
+              "PostQuantumCECPQ2",
+--
+2.25.1

build/patches/Enable-SPPI-for-devices-with-enough-memory.patch

@@ -4,34 +4,39 @@ Subject: Enable SPPI for devices with enough memory
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/common/chrome_features.cc      | 4 ----
- components/site_isolation/features.cc | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
+ chrome/common/chrome_features.cc      | 8 ++------
+ components/site_isolation/features.cc | 4 ++--
+ 2 files changed, 4 insertions(+), 8 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
-@@ -873,11 +873,7 @@ const base::Feature kSecurityKeyAttestationPrompt{
+@@ -1045,12 +1045,8 @@ BASE_FEATURE(kSecurityKeyAttestationPrompt,
+ // TODO(alexmos): Move this and the other site isolation features below to
  // browser_features, as they are only used on the browser side.
- const base::Feature kSitePerProcess {
-   "SitePerProcess",
+ BASE_FEATURE(kSitePerProcess,
+-             "SitePerProcess",
 -#if BUILDFLAG(IS_ANDROID)
--      base::FEATURE_DISABLED_BY_DEFAULT
+-             base::FEATURE_DISABLED_BY_DEFAULT
 -#else
-       base::FEATURE_ENABLED_BY_DEFAULT
+-             base::FEATURE_ENABLED_BY_DEFAULT
 -#endif
- };
++             "SitePerProcess",                  // enabled by default
++             base::FEATURE_ENABLED_BY_DEFAULT   // in Bromite
+ );
  
  #if BUILDFLAG(IS_CHROMEOS_ASH)
 diff --git a/components/site_isolation/features.cc b/components/site_isolation/features.cc
 --- a/components/site_isolation/features.cc
 +++ b/components/site_isolation/features.cc
-@@ -63,7 +63,7 @@ const base::Feature kSiteIsolationForOAuthSites{
+@@ -64,8 +64,8 @@ BASE_FEATURE(kSiteIsolationForOAuthSites,
  // kSitePerProcess won't be checked at all, and field trials won't activate
  // either the control or the experiment group.
- const base::Feature kSiteIsolationMemoryThresholds{
--    "SiteIsolationMemoryThresholds", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "SiteIsolationMemoryThresholds", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kSiteIsolationMemoryThresholds,
+-             "SiteIsolationMemoryThresholds",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "SiteIsolationMemoryThresholds",     // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);   // in Bromite
  const char kStrictSiteIsolationMemoryThresholdParamName[] =
      "strict_site_isolation_threshold_mb";
  const char kPartialSiteIsolationMemoryThresholdParamName[] =

build/patches/Enable-StrictOriginIsolation-and-SitePerProcess.patch

@@ -12,13 +12,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/about_flags.cc                      | 3 ---
  chrome/browser/chrome_content_browser_client.cc    | 4 ++--
  components/site_isolation/site_isolation_policy.cc | 2 ++
- content/public/common/content_features.cc          | 2 +-
- 4 files changed, 5 insertions(+), 6 deletions(-)
+ content/public/common/content_features.cc          | 4 ++--
+ 4 files changed, 6 insertions(+), 7 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
-@@ -4348,9 +4348,6 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4560,9 +4560,6 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kSiteIsolationForPasswordSitesDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(
           site_isolation::features::kSiteIsolationForPasswordSites)},
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 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
-@@ -1364,7 +1364,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1425,7 +1425,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
    registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
    registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
    registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
    registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true);
    registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0);
  }
-@@ -1378,7 +1378,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1439,7 +1439,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
    // user policy in addition to the same named ones in Local State (which are
    // used for mapping the command-line flags).
    registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -71,14 +71,16 @@ diff --git a/components/site_isolation/site_isolation_policy.cc b/components/sit
 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
-@@ -988,7 +988,7 @@ const base::Feature kStopVideoCaptureOnScreenLock{
+@@ -1112,8 +1112,8 @@ BASE_FEATURE(kStopVideoCaptureOnScreenLock,
  // Controls whether site isolation should use origins instead of scheme and
  // eTLD+1.
- const base::Feature kStrictOriginIsolation{"StrictOriginIsolation",
--                                           base::FEATURE_DISABLED_BY_DEFAULT};
-+                                           base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kStrictOriginIsolation,
+-             "StrictOriginIsolation",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "StrictOriginIsolation",              // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);    // in Bromite
  
- // Enables subresource loading with Web Bundles.
- const base::Feature kSubresourceWebBundles{"SubresourceWebBundles",
+ // Disallows window.{alert, prompt, confirm} if triggered inside a subframe that
+ // is not same origin with the main frame.
 --
 2.25.1

build/patches/Enable-darken-websites-checkbox-in-themes.patch

@@ -7,14 +7,14 @@ Unexpire #darken-websites-checkbox-in-themes-setting
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/browser/flag-metadata.json                   | 6 +++---
- components/content_settings/core/common/features.cc | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ components/content_settings/core/common/features.cc | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 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
-@@ -1175,9 +1175,9 @@
-     "expiry_milestone": 110
+@@ -1256,9 +1256,9 @@
+     "expiry_milestone": 114
    },
    {
 -    "name": "darken-websites-checkbox-in-themes-setting",
@@ -29,12 +29,14 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
 --- a/components/content_settings/core/common/features.cc
 +++ b/components/content_settings/core/common/features.cc
-@@ -18,7 +18,7 @@ const base::Feature kImprovedCookieControls{"ImprovedCookieControls",
+@@ -19,8 +19,8 @@ BASE_FEATURE(kImprovedCookieControls,
  // Enables auto dark feature in theme settings.
  #if BUILDFLAG(IS_ANDROID)
- const base::Feature kDarkenWebsitesCheckboxInThemesSetting{
--    "DarkenWebsitesCheckboxInThemesSetting", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "DarkenWebsitesCheckboxInThemesSetting", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kDarkenWebsitesCheckboxInThemesSetting,
+-             "DarkenWebsitesCheckboxInThemesSetting",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "DarkenWebsitesCheckboxInThemesSetting",     // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);           // in Bromite
  constexpr base::FeatureParam<bool> kDarkenWebsitesCheckboxOptOut{
      &kDarkenWebsitesCheckboxInThemesSetting, "opt_out", true};
  #endif  // BUILDFLAG(IS_ANDROID)

build/patches/Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -333,6 +333,10 @@ config("compiler") {
+@@ -330,6 +330,10 @@ config("compiler") {
        }
      }