Ported all patches to v108

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

@@ -129,9 +129,8 @@ 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
@@ -143,7 +142,6 @@ Revert-Delete-block-external-form-redirects.patch
 Enable-IntentBlockExternalFormRedirectsNoGesture.patch
 Add-flag-to-disable-external-intent-requests.patch
 Logcat-crash-reports-UI.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
@@ -192,7 +190,6 @@ 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
 Enable-HEVC-by-default.patch

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

@@ -84,7 +84,7 @@ 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
-@@ -2410,9 +2410,9 @@
+@@ -2496,9 +2496,9 @@
      "expiry_milestone": 115
    },
    {
@@ -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,13 +142,13 @@ 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
@@ -177,7 +177,7 @@ 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
@@ -188,7 +188,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
 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
-@@ -640,6 +640,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,27 @@ 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
-@@ -750,6 +750,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,10 @@ 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};
 +
- 
- // 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
-@@ -232,6 +232,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;
+@@ -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 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;
+ 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
-@@ -85,7 +85,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
-   }
- 
-@@ -197,7 +197,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" ]
- 
-@@ -257,6 +257,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 (current_cpu == "arm64" || current_cpu == "arm") {
-     # This is needed by all arm boards due to aom_arm_cpu_caps()
-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
-@@ -635,6 +635,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

@@ -10,17 +10,17 @@ 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 +++
- chrome/browser/flags/android/chrome_feature_list.cc          | 4 ++++
+ 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, 30 insertions(+)
+ 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
-@@ -225,6 +225,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;
-@@ -955,6 +956,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,17 +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
-@@ -3595,6 +3595,10 @@ const FeatureEntry kFeatureEntries[] = {
-      SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
- #endif  // ENABLE_EXTENSIONS
- #if BUILDFLAG(IS_ANDROID)
+@@ -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
@@ -93,7 +93,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
-@@ -149,6 +149,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -148,6 +148,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedNoViewCache,
      &feed::kFeedReplaceAll,
      &feed::kInterestFeedContentSuggestions,
@@ -101,16 +101,17 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
      &feed::kInterestFeedV2,
      &feed::kInterestFeedV2Autoplay,
-@@ -453,6 +454,9 @@ const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2{
-     "AdaptiveButtonInTopToolbarCustomizationV2",
-     base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -467,6 +468,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_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kFocusOmniboxInIncognitoTabIntents,
+              "FocusOmniboxInIncognitoTabIntents",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -120,8 +121,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
  
 +extern const base::Feature kAllowUserCertificates;
  // Alphabetical:
- extern const base::Feature kAdaptiveButtonInTopToolbar;
- extern const base::Feature kAdaptiveButtonInTopToolbarCustomizationV2;
+ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbar);
+ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -144,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 =
-@@ -637,6 +638,8 @@ public abstract class ChromeFeatureList {
+@@ -647,6 +648,8 @@ public abstract class ChromeFeatureList {
      public static final String FEED_REPLACE_ALL = "FeedReplaceAll";
  
      /* Alphabetical: */

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
-@@ -136,6 +136,27 @@
+@@ -137,6 +137,27 @@
        "id": 1
      },
  

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -16,7 +16,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
-@@ -8862,6 +8862,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
-@@ -1661,6 +1661,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
-@@ -927,6 +927,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
+@@ -960,6 +960,9 @@ extern const char kHideShelfControlsInTabletModeDescription[];
  extern const char kHttpsOnlyModeName[];
  extern const char kHttpsOnlyModeDescription[];
  
@@ -57,28 +57,28 @@ 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
-@@ -113,6 +113,9 @@ const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -113,6 +113,9 @@ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey,
+              "PartitionNelAndReportingByNetworkIsolationKey",         // must be enabled
+              base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
 +const 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;
 +
  // 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

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
 ---
@@ -83,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
-@@ -273,6 +273,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 -->
@@ -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
-@@ -1042,6 +1044,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
@@ -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
-@@ -280,6 +280,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"
-@@ -782,6 +783,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)
@@ -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
-@@ -134,6 +134,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,8 +1192,8 @@ 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 {
@@ -1200,34 +1204,35 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 +  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
-@@ -264,7 +264,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-an-always-incognito-mode.patch

@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../java/res/xml/incognito_preferences.xml    |  37 ++++
  .../java/res/xml/privacy_preferences.xml      |   5 +
  .../AlwaysIncognitoLinkInterceptor.java       |  53 ++++++
- .../chrome/browser/ChromeTabbedActivity.java  |   6 +-
+ .../chrome/browser/ChromeTabbedActivity.java  |   9 +-
  .../chrome/browser/app/ChromeActivity.java    |   4 +
  .../AppMenuPropertiesDelegateImpl.java        |  26 ++-
  .../ChromeContextMenuPopulator.java           |   7 +-
@@ -35,19 +35,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/history/HistoryManager.java       |  18 +-
  .../chrome/browser/history/HistoryPage.java   |  16 ++
  .../native_page/NativePageFactory.java        |   4 +-
- .../chrome/browser/ntp/RecentTabsManager.java |   3 +-
+ .../chrome/browser/ntp/RecentTabsManager.java |  28 ++-
  .../privacy/settings/IncognitoSettings.java   | 160 ++++++++++++++++++
  .../browser/settings/SettingsActivity.java    |   4 +
- .../HistoricalTabModelObserver.java           |   8 +-
+ .../HistoricalTabModelObserver.java           |   6 +-
  .../tab/tab_restore/HistoricalTabSaver.java   |   2 +-
- .../tab_restore/HistoricalTabSaverImpl.java   |  16 +-
+ .../tab_restore/HistoricalTabSaverImpl.java   |  17 +-
  .../tabbed_mode/TabbedRootUiCoordinator.java  |   4 +-
  .../browser/tabmodel/ChromeTabCreator.java    |   5 +-
  .../tabmodel/TabModelSelectorImpl.java        |   3 +
  .../browser/tabmodel/TabPersistentStore.java  |   9 +
+ .../browser/toolbar/ToolbarManager.java       |   4 +-
  .../webapps/WebappIntentDataProvider.java     |  14 ++
  chrome/browser/about_flags.cc                 |   4 +
- .../browser/android/historical_tab_saver.cc   |  21 ++-
+ .../browser/android/historical_tab_saver.cc   |  22 ++-
  .../chrome_autocomplete_provider_client.cc    |   7 +
  .../chrome_autocomplete_provider_client.h     |   1 +
  .../host_content_settings_map_factory.cc      |  20 ++-
@@ -56,9 +57,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../flags/android/chrome_feature_list.cc      |   4 +-
  chrome/browser/history/history_tab_helper.cc  |  18 ++
  chrome/browser/history/history_tab_helper.h   |  10 +-
- .../android/offline_page_bridge.cc            |  13 +-
- .../android/offline_page_model_factory.cc     |  21 ++-
- .../android/request_coordinator_factory.cc    |  21 ++-
+ .../android/offline_page_bridge.cc            |  11 +-
+ .../android/offline_page_model_factory.cc     |  20 ++-
+ .../android/request_coordinator_factory.cc    |  27 ++-
  .../offline_page_model_factory.h              |   1 +
  .../offline_pages/recent_tab_helper.cc        |  19 ++-
  .../browser/offline_pages/recent_tab_helper.h |   3 +
@@ -67,6 +68,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/ui/android/native_page/BUILD.gn   |   2 +
  .../browser/ui/native_page/NativePage.java    |  12 +-
  .../strings/android_chrome_strings.grd        |  31 ++++
+ .../browser/toolbar/LocationBarModel.java     |   7 +-
  chrome/browser/ui/messages/android/BUILD.gn   |   1 +
  .../snackbar/INeedSnackbarManager.java        |  27 +++
  chrome/common/pref_names.cc                   |   6 +
@@ -82,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../omnibox/browser/base_search_provider.cc   |   2 +-
  components/omnibox/browser/search_provider.cc |   4 +-
  .../host_content_settings_map_factory.cc      |   1 +
- 63 files changed, 680 insertions(+), 74 deletions(-)
+ 65 files changed, 719 insertions(+), 77 deletions(-)
  create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -91,7 +93,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -654,6 +654,7 @@ chrome_java_resources = [
+@@ -652,6 +652,7 @@ chrome_java_resources = [
    "java/res/xml/main_preferences.xml",
    "java/res/xml/manage_sync_preferences.xml",
    "java/res/xml/phone_as_a_security_key_accessory_filter.xml",
@@ -110,7 +112,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
    "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
    "java/src/org/chromium/chrome/browser/ActivityUtils.java",
-@@ -912,6 +913,7 @@ chrome_java_sources = [
+@@ -915,6 +916,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -236,7 +238,7 @@ new file mode 100644
 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
-@@ -57,6 +57,7 @@ import org.chromium.base.task.PostTask;
+@@ -58,6 +58,7 @@ import org.chromium.base.task.PostTask;
  import org.chromium.build.annotations.UsedByReflection;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
@@ -244,7 +246,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
-@@ -1899,8 +1900,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -578,8 +579,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+             mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager());
+ 
+             // For saving non-incognito tab closures for Recent Tabs.
++            boolean alwaysIncognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
+             mHistoricalTabModelObserver =
+-                    new HistoricalTabModelObserver(mTabModelSelector.getModel(false));
++                    new HistoricalTabModelObserver(mTabModelSelector.getModel(alwaysIncognito));
+ 
+             if (TabUiFeatureUtilities.isTabletGridTabSwitcherEnabled(this)) {
+                 mTabModelSelector.addObserver(new TabModelSelectorObserver() {
+@@ -1904,8 +1906,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          Bundle savedInstanceState = getSavedInstanceState();
  
          // We determine the model as soon as possible so every systems get initialized coherently.
@@ -267,7 +280,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
  import org.chromium.chrome.browser.device.DeviceClassManager;
-@@ -1812,6 +1813,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1808,6 +1809,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -286,9 +299,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.ActivityTabProvider;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.banners.AppMenuVerbiage;
- import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
  import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
-@@ -98,6 +99,10 @@ import java.util.ArrayList;
+ import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+@@ -99,6 +100,10 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.Map;
  
@@ -299,7 +312,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -558,6 +563,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -560,6 +565,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
      }
  
      private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -313,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
          // We have to iterate all menu items since same menu item ID may be associated with more
          // than one menu items.
          boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
-@@ -616,7 +628,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -636,7 +648,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
              }
  
              if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -329,8 +342,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 +                    item.setVisible(!isIncognito);
              }
              if (item.getItemId() == R.id.menu_group_tabs) {
-                 // Disable incognito group tabs when a re-authentication screen is shown.
-@@ -858,7 +878,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+                 item.setVisible(isMenuGroupTabsVisible);
+@@ -876,7 +896,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          //                is not persisted when adding to the homescreen.
          // * If creating shortcuts it not supported by the current home screen.
          return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
@@ -352,7 +365,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
  import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
  import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
-@@ -374,6 +375,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -364,6 +365,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
          boolean hasSaveImage = false;
          mShowEphemeralTabNewLabel = null;
  
@@ -362,7 +375,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
          List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
  
          if (mParams.isAnchor()) {
-@@ -392,6 +396,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -382,6 +386,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                              linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
                          }
                      }
@@ -370,7 +383,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
                      if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
                          linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
                      }
-@@ -416,7 +421,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -406,7 +411,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -382,7 +395,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
-@@ -66,31 +66,6 @@ public class CustomTabActivityLifecycleUmaTracker implements PauseResumeWithNati
+@@ -68,31 +68,6 @@ public class CustomTabActivityLifecycleUmaTracker
      private boolean mIsInitialResume = true;
  
      private void recordIncognitoLaunchReason() {
@@ -424,8 +437,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
- import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
-@@ -172,6 +173,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+ import org.chromium.chrome.browser.app.appmenu.DividerLineMenuItemViewBinder;
+@@ -176,6 +177,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
                  downloadItemVisible = false;
                  openInChromeItemVisible = false;
              }
@@ -448,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
-@@ -847,7 +850,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -855,7 +858,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
  
      @Override
      public boolean isIncognito() {
@@ -500,7 +513,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
-@@ -33,6 +33,7 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
+@@ -35,6 +35,7 @@ import com.google.android.material.tabs.TabLayout.OnTabSelectedListener;
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.base.supplier.ObservableSupplier;
@@ -508,9 +521,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  import org.chromium.base.supplier.ObservableSupplierImpl;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
-@@ -73,6 +74,12 @@ import org.chromium.url.GURL;
- import java.io.Serializable;
+@@ -77,6 +78,12 @@ import java.io.Serializable;
  import java.util.List;
+ import java.util.concurrent.atomic.AtomicReference;
  
 +import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.base.ContextUtils;
@@ -521,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  /**
   * Combines and manages the different UI components of browsing history.
   */
-@@ -504,7 +511,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
+@@ -551,7 +558,16 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
          return mRootView;
      }
  
@@ -603,7 +616,23 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
-@@ -79,7 +79,8 @@ public class RecentTabsManager {
+@@ -21,6 +21,15 @@ import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
+ import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
+ import org.chromium.url.GURL;
+ 
++import android.content.Intent;
++import android.provider.Browser;
++import android.net.Uri;
++import org.chromium.base.ContextUtils;
++import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
++import org.chromium.chrome.browser.IntentHandler;
++import org.chromium.ui.mojom.WindowOpenDisposition;
++import org.chromium.components.embedder_support.util.UrlUtilities;
++
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+@@ -78,7 +87,8 @@ public class RecentTabsManager {
       */
      public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile,
              Context context, Runnable showHistoryManager) {
@@ -613,6 +642,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
          mActiveTab = tab;
          mTabModelSelector = tabModelSelector;
          mShowHistoryManager = showHistoryManager;
+@@ -210,6 +220,22 @@ public class RecentTabsManager {
+      */
+     public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
+         if (mIsDestroyed) return;
++        if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
++            // allow only http/https urls
++            if (!UrlUtilities.isHttpOrHttps(tab.getUrl())) return;
++
++            Context context = ContextUtils.getApplicationContext();
++            Intent intent = new Intent(Intent.ACTION_VIEW,
++                Uri.parse(tab.getUrl().getSpec()));
++            intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
++            if (windowDisposition != WindowOpenDisposition.CURRENT_TAB) {
++                intent.putExtra(Browser.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
++            }
++            intent.setPackage(context.getPackageName());
++            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
++            IntentHandler.startActivityForTrustedIntent(intent);
++            return;
++        }
+         mTabSessionIdsRestored.put(tab.getSessionId(), true);
+         RecordUserAction.record("MobileRecentTabManagerRecentTabOpened");
+         // Window disposition will select which tab to open.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
 new file mode 100644
 --- /dev/null
@@ -802,7 +854,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
-@@ -15,6 +15,8 @@ import java.util.ArrayList;
+@@ -14,6 +14,8 @@ import java.util.ArrayList;
  import java.util.HashMap;
  import java.util.List;
  
@@ -811,7 +863,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
  /**
   * A tab model observer for managing bulk closures.
   */
-@@ -47,7 +49,8 @@ public class HistoricalTabModelObserver implements TabModelObserver {
+@@ -41,7 +43,8 @@ public class HistoricalTabModelObserver implements TabModelObserver {
          if (tabs.isEmpty()) return;
  
          if (tabs.size() == 1) {
@@ -821,17 +873,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
              return;
          }
  
-@@ -59,8 +62,9 @@ public class HistoricalTabModelObserver implements TabModelObserver {
-      * identical to what occurred prior to {@link ChromeFeatureList.BULK_TAB_RESTORE}.
-      */
-     private void legacyCreateHistoricalTabs(List<Tab> tabs) {
-+        boolean is_always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
-         for (Tab tab : tabs) {
--            mHistoricalTabSaver.createHistoricalTab(tab);
-+            mHistoricalTabSaver.createHistoricalTab(tab, is_always_incognito);
+@@ -72,7 +75,6 @@ public class HistoricalTabModelObserver implements TabModelObserver {
+             entries.add(historicalGroup);
+             idToGroup.put(groupId, historicalGroup);
          }
+-
+         mHistoricalTabSaver.createHistoricalBulkClosure(entries);
      }
- 
+ }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaver.java
@@ -847,7 +896,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
-@@ -29,6 +29,8 @@ import java.util.Arrays;
+@@ -27,6 +27,8 @@ import java.util.Arrays;
  import java.util.Collections;
  import java.util.List;
  
@@ -856,7 +905,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
  /**
   * Creates historical entries in TabRestoreService.
   */
-@@ -62,10 +64,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+@@ -60,10 +62,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
  
      // HistoricalTabSaver implementation.
      @Override
@@ -869,7 +918,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
      }
  
      @Override
-@@ -106,7 +108,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+@@ -115,7 +117,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
  
          // If there is only a single valid tab remaining save it individually.
          if (validEntries.size() == 1 && validEntries.get(0).isSingleTab()) {
@@ -878,20 +927,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
              return;
          }
  
-@@ -128,10 +130,10 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
-                 CollectionUtil.integerListToIntArray(perTabGroupId), allTabs.toArray(new Tab[0]));
+@@ -140,11 +142,12 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+                 CollectionUtil.integerListToIntArray(savedStateVersions));
      }
  
 -    private void createHistoricalTabInternal(Tab tab) {
 +    private void createHistoricalTabInternal(Tab tab, boolean is_always_incognito) {
          RecordHistogram.recordEnumeratedHistogram("Tabs.RecentlyClosed.HistoricalSaverCloseType",
                  HistoricalSaverCloseType.TAB, HistoricalSaverCloseType.COUNT);
--        HistoricalTabSaverImplJni.get().createHistoricalTab(tab);
-+        HistoricalTabSaverImplJni.get().createHistoricalTab(tab, is_always_incognito);
+         HistoricalTabSaverImplJni.get().createHistoricalTab(
+-                tab, getWebContentsState(tab).buffer(), getWebContentsState(tab).version());
++                tab, getWebContentsState(tab).buffer(), getWebContentsState(tab).version(),
++                is_always_incognito);
      }
  
      /**
-@@ -139,7 +141,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+@@ -152,7 +155,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
       * internal Chrome scheme, about:blank, or a native page and it cannot be incognito.
       */
      private boolean shouldSave(Tab tab) {
@@ -900,15 +951,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
  
          // {@link GURL#getScheme()} is not available in unit tests.
          if (mIgnoreUrlSchemesForTesting) return true;
-@@ -217,7 +219,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+@@ -225,7 +228,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
  
      @NativeMethods
      interface Natives {
--        void createHistoricalTab(Tab tab);
-+        void createHistoricalTab(Tab tab, boolean is_always_incognito);
-         void createHistoricalGroup(TabModel model, String title, Tab[] tabs);
-         void createHistoricalBulkClosure(
-                 TabModel model, int[] groupIds, String[] titles, int[] perTabGroupId, Tab[] tabs);
+-        void createHistoricalTab(Tab tab, ByteBuffer state, int savedStateVersion);
++        void createHistoricalTab(Tab tab, ByteBuffer state, int savedStateVersion, boolean is_always_incognito);
+         void createHistoricalGroup(TabModel model, String title, Tab[] tabs,
+                 ByteBuffer[] byteBuffers, int[] savedStationsVersions);
+         void createHistoricalBulkClosure(TabModel model, int[] groupIds, String[] titles,
 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
@@ -984,7 +1035,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
  import java.io.BufferedInputStream;
  import java.io.ByteArrayInputStream;
  import java.io.ByteArrayOutputStream;
-@@ -747,6 +749,13 @@ public class TabPersistentStore {
+@@ -757,6 +759,13 @@ public class TabPersistentStore {
                  }
              }
          }
@@ -998,6 +1049,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
          TabModel model = mTabModelSelector.getModel(isIncognito);
  
          if (model.isIncognito() != isIncognito) {
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+@@ -38,6 +38,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.base.supplier.Supplier;
+ import org.chromium.chrome.R;
+ import org.chromium.chrome.browser.ActivityTabProvider;
++import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.IntentHandler;
+ import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
+ import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
+@@ -523,7 +524,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+                         return ret;
+                     }
+                 },
+-                SearchEngineLogoUtils.getInstance());
++                SearchEngineLogoUtils.getInstance(),
++                AlwaysIncognitoLinkInterceptor.isAlwaysIncognito());
+         mControlContainer = controlContainer;
+         assert mControlContainer != null;
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
@@ -1046,7 +1118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
 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
-@@ -4713,6 +4713,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4837,6 +4837,10 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kOfflinePagesLivePageSharingName,
       flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
       FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -1060,7 +1132,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/android/historical_tab_saver.cc
 --- a/chrome/browser/android/historical_tab_saver.cc
 +++ b/chrome/browser/android/historical_tab_saver.cc
-@@ -25,6 +25,11 @@
+@@ -26,6 +26,11 @@
  #include "components/sessions/core/tab_restore_service.h"
  #include "content/public/browser/web_contents.h"
  
@@ -1072,16 +1144,17 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
  using base::android::JavaParamRef;
  using base::android::ScopedJavaLocalRef;
  
-@@ -35,7 +40,7 @@ namespace {
- // Defined in TabGroupModelFilter.java
- constexpr int kInvalidGroupId = -1;
+@@ -38,7 +43,8 @@ constexpr int kInvalidGroupId = -1;
  
--void CreateHistoricalTab(TabAndroid* tab_android) {
-+void CreateHistoricalTab(TabAndroid* tab_android, bool is_always_incognito) {
+ void CreateHistoricalTab(
+     TabAndroid* tab_android,
+-    WebContentsStateByteBuffer web_contents_state_byte_buffer) {
++    WebContentsStateByteBuffer web_contents_state_byte_buffer,
++    bool is_always_incognito) {
    if (!tab_android) {
      return;
    }
-@@ -45,9 +50,14 @@ void CreateHistoricalTab(TabAndroid* tab_android) {
+@@ -49,9 +55,14 @@ void CreateHistoricalTab(
      return;
    }
  
@@ -1098,22 +1171,28 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!service) {
      return;
    }
-@@ -190,8 +200,9 @@ std::unique_ptr<ScopedWebContents> ScopedWebContents::CreateForTab(
- // static
- static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -243,14 +254,15 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
--    const JavaParamRef<jobject>& jtab_android) {
--  CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android));
-+    const JavaParamRef<jobject>& jtab_android,
+     const JavaParamRef<jobject>& jtab_android,
+     const JavaParamRef<jobject>& state,
+-    jint saved_state_version) {
++    jint saved_state_version,
 +    jboolean is_always_incognito) {
-+  CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android), is_always_incognito);
+   void* data = env->GetDirectBufferAddress(state);
+   int size = env->GetDirectBufferCapacity(state);
+ 
+   WebContentsStateByteBuffer web_contents_state =
+       WebContentsStateByteBuffer(data, size, (int)saved_state_version);
+   CreateHistoricalTab(TabAndroid::GetNativeTab(env, jtab_android),
+-                      std::move(web_contents_state));
++                      std::move(web_contents_state), is_always_incognito);
  }
  
  // static
 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
-@@ -299,6 +299,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
+@@ -310,6 +310,13 @@ signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
    return IdentityManagerFactory::GetForProfile(profile_);
  }
  
@@ -1130,7 +1209,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
-@@ -78,6 +78,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
+@@ -80,6 +80,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
        const override;
    signin::IdentityManager* GetIdentityManager() const override;
    bool IsOffTheRecord() const override;
@@ -1187,7 +1266,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 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
-@@ -3758,6 +3758,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
+@@ -3907,6 +3907,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
      "Enables to share current loaded page as offline page by saving as MHTML "
      "first.";
  
@@ -1197,36 +1276,36 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
 +    "Enables autosave of offline page, as automatic switching in case "
 +    "the device goes offline.";
 +
- const char kPageInfoDiscoverabilityTimeoutsName[] =
-     "Page info discoverability timeouts";
- const char kPageInfoDiscoverabilityTimeoutsDescription[] =
+ const char kPageInfoHistoryName[] = "Page info history";
+ const char kPageInfoHistoryDescription[] =
+     "Enable a history sub page to the page info menu, and a button to forget "
 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
-@@ -2141,6 +2141,9 @@ extern const char kNotificationPermissionRationaleDescription[];
+@@ -2227,6 +2227,9 @@ extern const char kNotificationPermissionRationaleDescription[];
  extern const char kOfflinePagesLivePageSharingName[];
  extern const char kOfflinePagesLivePageSharingDescription[];
  
 +extern const char kOfflinePagesAutoSaveFeatureName[];
 +extern const char kOfflinePagesAutoSaveFeatureDescription[];
 +
- extern const char kPageInfoDiscoverabilityTimeoutsName[];
- extern const char kPageInfoDiscoverabilityTimeoutsDescription[];
+ extern const char kPageInfoHistoryName[];
+ extern const char kPageInfoHistoryDescription[];
  
 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
-@@ -535,8 +535,8 @@ const base::Feature kCCTNewDownloadTab{"CCTNewDownloadTab",
- const base::Feature kCCTIncognito{"CCTIncognito",
-                                   base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -561,8 +561,8 @@ BASE_FEATURE(kCCTNewDownloadTab,
+ BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
  
--const base::Feature kCCTIncognitoAvailableToThirdParty{
--    "CCTIncognitoAvailableToThirdParty", base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature kCCTIncognitoAvailableToThirdParty{                     // Enabled by default in Bromite
-+    "CCTIncognitoAvailableToThirdParty", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
+-             "CCTIncognitoAvailableToThirdParty",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "CCTIncognitoAvailableToThirdParty",           // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);             // in Bromite
  
- const base::Feature kCCTPackageNameRecording{"CCTPackageNameRecording",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kCCTPackageNameRecording,
+              "CCTPackageNameRecording",
 diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
@@ -1316,38 +1395,23 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom
  
  using base::android::ConvertJavaStringToUTF8;
  using base::android::ConvertUTF16ToJavaString;
-@@ -156,7 +159,13 @@ void ValidateFileCallback(
-     int64_t offline_id,
-     const GURL& url,
-     const base::FilePath& file_path,
-+    SimpleFactoryKey* key,
-     bool is_trusted) {
-+  // in always incognito, never trust input file (show file name in url)
-+  ProfileKey* profile_key = ProfileKey::FromSimpleFactoryKey(key);
-+  if(profile_key->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled))
-+    is_trusted = false;
-+
-   // If trusted, the launch url will be the http/https url of the offline
-   // page. If the file path is content URI, directly open it. Otherwise, the
-   // launch url will be the file URL pointing to the archive file of the offline
-@@ -787,7 +796,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
+@@ -785,9 +788,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
+   }
+ 
    if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) {
++    bool is_trusted = true;
++    // in always incognito, never trust input file (show file name in url)
++    ProfileKey* profile_key = ProfileKey::FromSimpleFactoryKey(key_);
++    if(profile_key->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled))
++      is_trusted = false;
++
      ValidateFileCallback(launch_location, j_callback_obj,
                           offline_page->offline_id, offline_page->url,
 -                         offline_page->file_path, true /* is_trusted*/);
-+                         offline_page->file_path, key_, true /* is_trusted*/);
++                         offline_page->file_path, is_trusted);
      return;
    }
  
-@@ -797,7 +806,7 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
-                      offline_page->file_size, offline_page->digest),
-       base::BindOnce(&ValidateFileCallback, launch_location, j_callback_obj,
-                      offline_page->offline_id, offline_page->url,
--                     offline_page->file_path));
-+                     offline_page->file_path, key_));
- }
- 
- void OfflinePageBridge::GetSizeAndComputeDigestDone(
 diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
 --- a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
 +++ b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
@@ -1361,15 +1425,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
  
  namespace offline_pages {
  
-@@ -46,6 +49,7 @@ OfflinePageModel* OfflinePageModelFactory::GetForKey(SimpleFactoryKey* key) {
- OfflinePageModel* OfflinePageModelFactory::GetForBrowserContext(
-     content::BrowserContext* browser_context) {
-   Profile* profile = Profile::FromBrowserContext(browser_context);
-+  profile = profile->GetOriginalProfile();
-   return GetForKey(profile->GetProfileKey());
- }
- 
-@@ -54,13 +58,15 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -54,13 +57,15 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
    scoped_refptr<base::SequencedTaskRunner> background_task_runner =
        base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()});
  
@@ -1387,7 +1443,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
    // If base::PathService::Get returns false, the temporary_archives_dir will be
    // empty, and no temporary pages will be saved during this chrome lifecycle.
    base::FilePath temporary_archives_dir;
-@@ -69,7 +75,6 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -69,7 +74,6 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
          temporary_archives_dir.Append(chrome::kOfflinePageArchivesDirname);
    }
  
@@ -1395,7 +1451,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
    auto archive_manager = std::make_unique<DownloadArchiveManager>(
        temporary_archives_dir, persistent_archives_dir,
        DownloadPrefs::GetDefaultDownloadDirectory(), background_task_runner,
-@@ -87,4 +92,14 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -87,4 +91,14 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
    return model;
  }
  
@@ -1443,7 +1499,20 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc
    // Depends on OfflinePageModelFactory in SimpleDependencyManager.
  }
  
-@@ -111,4 +118,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
+@@ -79,6 +86,12 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
+ 
+ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
+     content::BrowserContext* context) const {
++  if (context->IsOffTheRecord() &&
++      Profile::FromBrowserContext(context)->GetOriginalProfile()
++        ->GetPrefs()->GetBoolean(prefs::kIncognitoTabHistoryEnabled) == false) {
++    // do not track history in incognito mode if preference is disabled
++    return nullptr;
++  }
+   std::unique_ptr<OfflinerPolicy> policy(new OfflinerPolicy());
+   std::unique_ptr<Offliner> offliner;
+   OfflinePageModel* model =
+@@ -111,4 +124,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
    return request_coordinator;
  }
  
@@ -1551,7 +1620,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
 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
-@@ -226,6 +226,7 @@
+@@ -229,6 +229,7 @@
  #include "components/feed/core/shared_prefs/pref_names.h"
  
  #if BUILDFLAG(IS_ANDROID)
@@ -1559,7 +1628,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
  #include "chrome/browser/android/explore_sites/history_statistics_reporter.h"
  #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
-@@ -1416,6 +1417,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1390,6 +1391,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    video_tutorials::RegisterPrefs(registry);
@@ -1567,9 +1636,9 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 +  registry->RegisterBooleanPref(prefs::kAlwaysIncognitoEnabled,
 +                              /*default_value=*/false);
 +  HistoryTabHelper::RegisterProfilePrefs(registry);
- #else   // BUILDFLAG(IS_ANDROID)
-   autofill_assistant::AutofillAssistant::RegisterProfilePrefs(registry);
+ #else  // BUILDFLAG(IS_ANDROID)
    AppShortcutManager::RegisterProfilePrefs(registry);
+   browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
 diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
 --- a/chrome/browser/ui/android/native_page/BUILD.gn
 +++ b/chrome/browser/ui/android/native_page/BUILD.gn
@@ -1671,6 +1740,44 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_CLEAR_SEARCH_HISTORY_LINK" desc="Text informing the user that they can clear search history and other data using MyActivity.">
          <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Search history<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>other forms of activity<ph name="END_LINK2">&lt;/link2&gt;</ph> may be saved in your Google Account when you’re signed in. You can delete them anytime.
        </message>
+diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
+--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
+@@ -178,6 +178,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+     protected GURL mVisibleGurl = GURL.emptyGURL();
+     protected String mFormattedFullUrl;
+     protected String mUrlForDisplay;
++    private boolean mIsAlwaysIncognito;
+ 
+     /**
+      * Default constructor for this class.
+@@ -192,7 +193,8 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+     public LocationBarModel(Context context, NewTabPageDelegate newTabPageDelegate,
+             @NonNull UrlFormatter urlFormatter, @NonNull ProfileProvider profileProvider,
+             @NonNull OfflineStatus offlineStatus,
+-            @NonNull SearchEngineLogoUtils searchEngineLogoUtils) {
++            @NonNull SearchEngineLogoUtils searchEngineLogoUtils,
++            boolean isAlwaysIncognito) {
+         mContext = context;
+         mNtpDelegate = newTabPageDelegate;
+         mUrlFormatter = urlFormatter;
+@@ -200,6 +202,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+         mOfflineStatus = offlineStatus;
+         mPrimaryColor = ChromeColors.getDefaultThemeColor(context, false);
+         mSearchEngineLogoUtils = searchEngineLogoUtils;
++        mIsAlwaysIncognito = isAlwaysIncognito;
+     }
+ 
+     /**
+@@ -446,7 +449,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+                     }
+                 }
+             } finally {
+-                if (!mOptimizationsEnabled) {
++                if (!mOptimizationsEnabled || mIsAlwaysIncognito) {
+                     autocompleteSchemeClassifier.destroy();
+                 }
+             }
 diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn
 --- a/chrome/browser/ui/messages/android/BUILD.gn
 +++ b/chrome/browser/ui/messages/android/BUILD.gn
@@ -1717,7 +1824,7 @@ new file mode 100644
 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
-@@ -3437,6 +3437,12 @@ const char kShowCaretBrowsingDialog[] =
+@@ -3458,6 +3458,12 @@ const char kShowCaretBrowsingDialog[] =
  const char kLacrosLaunchSwitch[] = "lacros_launch_switch";
  #endif
  
@@ -1733,7 +1840,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
-@@ -1214,6 +1214,8 @@ extern const char kDiscountConsentShowInterestIn[];
+@@ -1219,6 +1219,8 @@ extern const char kDiscountConsentShowInterestIn[];
  
  #if BUILDFLAG(IS_ANDROID)
  extern const char kWebXRImmersiveArEnabled[];
@@ -1742,7 +1849,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
  #endif
  
  #if !BUILDFLAG(IS_ANDROID)
-@@ -1251,6 +1253,10 @@ extern const char kPrivacyGuideViewed[];
+@@ -1256,6 +1258,10 @@ extern const char kPrivacyGuideViewed[];
  
  extern const char kCorsNonWildcardRequestHeadersSupport[];
  
@@ -1756,7 +1863,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
-@@ -119,10 +119,12 @@ void PrefProvider::RegisterProfilePrefs(
+@@ -122,10 +122,12 @@ void PrefProvider::RegisterProfilePrefs(
  
  PrefProvider::PrefProvider(PrefService* prefs,
                             bool off_the_record,
@@ -1769,7 +1876,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
        store_last_modified_(store_last_modified),
        clock_(base::DefaultClock::GetInstance()) {
    TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
-@@ -156,7 +158,9 @@ PrefProvider::PrefProvider(PrefService* prefs,
+@@ -159,7 +161,9 @@ PrefProvider::PrefProvider(PrefService* prefs,
        content_settings_prefs_.insert(std::make_pair(
            info->type(), std::make_unique<ContentSettingsPref>(
                              info->type(), prefs_, &pref_change_registrar_,
@@ -1850,9 +1957,9 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 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
-@@ -44,6 +44,9 @@ const base::Feature kOfflineIndicatorFeature{"OfflineIndicator",
- const base::Feature kOfflinePagesNetworkStateLikelyUnknown{
-     "OfflinePagesNetworkStateLikelyUnknown", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -52,6 +52,9 @@ BASE_FEATURE(kOfflinePagesNetworkStateLikelyUnknown,
+              "OfflinePagesNetworkStateLikelyUnknown",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +const base::Feature kOfflinePagesAutoSaveFeature{
 +    "OfflinePagesAutoSaveEnabled", base::FEATURE_DISABLED_BY_DEFAULT};
@@ -1863,10 +1970,10 @@ diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/
 diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
 --- a/components/offline_pages/core/offline_page_feature.h
 +++ b/components/offline_pages/core/offline_page_feature.h
-@@ -21,6 +21,7 @@ extern const base::Feature kOfflinePagesDescriptiveFailStatusFeature;
- extern const base::Feature kOfflineIndicatorFeature;
- extern const base::Feature kOnTheFlyMhtmlHashComputationFeature;
- extern const base::Feature kOfflinePagesNetworkStateLikelyUnknown;
+@@ -21,6 +21,7 @@ BASE_DECLARE_FEATURE(kOfflinePagesDescriptiveFailStatusFeature);
+ BASE_DECLARE_FEATURE(kOfflineIndicatorFeature);
+ BASE_DECLARE_FEATURE(kOnTheFlyMhtmlHashComputationFeature);
+ BASE_DECLARE_FEATURE(kOfflinePagesNetworkStateLikelyUnknown);
 +extern const base::Feature kOfflinePagesAutoSaveFeature;
  
  // The parameter name used to find the experiment tag for prefetching offline
@@ -1885,7 +1992,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon
 diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h
 --- a/components/omnibox/browser/autocomplete_provider_client.h
 +++ b/components/omnibox/browser/autocomplete_provider_client.h
-@@ -125,6 +125,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
+@@ -128,6 +128,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
    virtual signin::IdentityManager* GetIdentityManager() const = 0;
  
    virtual bool IsOffTheRecord() const = 0;
@@ -1896,10 +2003,10 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
 diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
 --- a/components/omnibox/browser/base_search_provider.cc
 +++ b/components/omnibox/browser/base_search_provider.cc
-@@ -272,7 +272,7 @@ bool BaseSearchProvider::CanSendRequest(
+@@ -273,7 +273,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest(
    }
  
-   // Don't run if in incognito mode.
+   // Don't make a suggest request if in incognito mode.
 -  if (client->IsOffTheRecord()) {
 +  if (client->IsOffTheRecord() && client->IsAlwaysIncognitoEnabled() == false) {
      return false;
@@ -1908,7 +2015,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
 diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
 --- a/components/omnibox/browser/search_provider.cc
 +++ b/components/omnibox/browser/search_provider.cc
-@@ -836,7 +836,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
+@@ -832,7 +832,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
    // keyword input to a keyword suggest server, if any.)
    const TemplateURL* default_url = providers_.GetDefaultProviderURL();
    const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();

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

@@ -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;
  
-@@ -43,6 +56,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.
-@@ -653,6 +692,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.
-@@ -1201,6 +1443,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++) {
-@@ -1272,6 +1547,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();
  
@@ -565,7 +565,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/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
-@@ -34,6 +34,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
+@@ -37,6 +37,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
  import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
  import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
  import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;
@@ -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;
-@@ -56,6 +58,8 @@ public class BookmarkManager
+@@ -60,6 +62,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;
-@@ -341,6 +345,14 @@ public class BookmarkManager
+@@ -345,6 +349,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
-@@ -521,6 +533,16 @@ public class BookmarkManager
+@@ -541,6 +553,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
-@@ -1875,6 +1875,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",
-@@ -2891,6 +2898,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",
-@@ -3568,8 +3577,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
-@@ -8831,6 +8831,12 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9039,6 +9039,12 @@ const FeatureEntry kFeatureEntries[] = {
       FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
  #endif
  
@@ -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
-@@ -6615,6 +6615,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
-@@ -3821,6 +3821,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,9 +1287,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCriticalPersistedTabData,
      &kCommerceCoupons,
      &kCCTBackgroundTab,
-@@ -951,6 +952,10 @@ const base::Feature kWebApkInstallService{"WebApkInstallService",
- const base::Feature kWebApkTrampolineOnInitialIntent{
-     "WebApkTrampolineOnInitialIntent", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -1114,6 +1115,10 @@ 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",
@@ -1301,20 +1301,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 kTabSelectionEditorV2;
- extern const base::Feature kTabStripImprovements;
- extern const base::Feature kDiscoverFeedMultiColumn;
- extern const base::Feature kTabSwitcherOnReturn;
+@@ -161,6 +161,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
+ BASE_DECLARE_FEATURE(kTabStripRedesign);
+ BASE_DECLARE_FEATURE(kTabSwitcherOnReturn);
+ BASE_DECLARE_FEATURE(kTabToGTSAnimation);
 +extern const base::Feature kBookmarksExportUseSaf;
- extern const base::Feature kTabToGTSAnimation;
- extern const base::Feature kTestDefaultDisabled;
- extern const base::Feature kTestDefaultEnabled;
+ 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
-@@ -612,6 +612,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 +1323,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 +1338,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 +1381,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
-@@ -100,6 +100,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 +1390,8 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /**
       * Whether Chrome is set as the default browser.
-@@ -1027,6 +1029,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 +1429,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
-@@ -402,6 +402,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 +1656,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 +1668,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 +1684,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

@@ -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());
-@@ -431,6 +441,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
-@@ -4818,6 +4818,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

@@ -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 -->
-@@ -187,6 +190,9 @@ found in the LICENSE file.
+@@ -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
-@@ -223,6 +223,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.
-@@ -2183,6 +2185,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
-@@ -62,6 +62,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;
-@@ -2290,6 +2291,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
-@@ -3497,6 +3497,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
-@@ -521,6 +521,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
+@@ -525,6 +525,22 @@ const FeatureEntry::FeatureVariation kReaderModeDiscoverabilityVariations[] = {
  #endif  // BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(IS_ANDROID)
@@ -40,7 +40,7 @@ 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[] = {
-@@ -4265,7 +4281,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4371,7 +4387,11 @@ const FeatureEntry kFeatureEntries[] = {
       kOsMac | kOsLinux | kOsWin,
       FEATURE_VALUE_TYPE(features::kSystemNotifications)},
  #endif  // BUILDFLAG(ENABLE_SYSTEM_NOTIFICATIONS) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -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"
-@@ -327,6 +329,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()) {
@@ -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"
-@@ -681,6 +682,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) {

build/patches/Add-flag-for-save-data-header.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
-@@ -4861,7 +4861,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
-@@ -1230,6 +1230,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
-@@ -644,6 +644,9 @@ extern const char kDeprecateAltClickDescription[];
+@@ -662,6 +662,9 @@ extern const char kDeprecateAltClickDescription[];
  extern const char kDeprecateAltBasedSixPackName[];
  extern const char kDeprecateAltBasedSixPackDescription[];
  
@@ -84,30 +84,30 @@ 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};
 +
- 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;
+@@ -51,7 +51,8 @@ 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)
- 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
-@@ -1010,6 +1010,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,
-@@ -4760,6 +4765,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
-@@ -1815,6 +1815,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
-@@ -1014,6 +1014,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
-@@ -3527,6 +3527,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
-@@ -1332,6 +1332,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
-@@ -729,6 +729,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
-@@ -283,11 +283,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

@@ -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
-@@ -5850,6 +5850,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
-@@ -3438,6 +3438,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
-@@ -795,6 +795,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"
-@@ -4084,8 +4085,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,9 +128,9 @@ 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,10 @@ BASE_FEATURE(kThrottleDelayable,
+              "ThrottleDelayable",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +// Enable IPv6 ping probes to RIPE DNS.
 +const base::Feature kIPv6Probing{"IPv6Probing",
@@ -142,14 +142,14 @@ 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;
- COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kNetworkErrorLogging;
+@@ -18,6 +18,8 @@ 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)
 +extern const base::Feature kIPv6Probing;
 +COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kReporting;
+ BASE_DECLARE_FEATURE(kDelayRequestsOnMultiplexedConnections);
  COMPONENT_EXPORT(NETWORK_CPP)
- extern const base::Feature kThrottleDelayable;
+ BASE_DECLARE_FEATURE(kPauseBrowserInitiatedHeavyTrafficForP2P);
 --
 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
-@@ -3521,6 +3521,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
-@@ -3817,6 +3817,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,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
-@@ -2188,6 +2188,9 @@ extern const char kQueryTilesNTPDescription[];
+@@ -2274,6 +2274,9 @@ extern const char kQueryTilesNTPDescription[];
  extern const char kQueryTilesOnStartName[];
  extern const char kQueryTilesOnStartDescription[];
  extern const char kQueryTilesSingleTierName[];

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

@@ -19,7 +19,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
-@@ -7243,6 +7243,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7463,6 +7463,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
-@@ -6242,6 +6242,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
+@@ -6458,6 +6458,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
-@@ -3814,6 +3814,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
+@@ -3935,6 +3935,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
  extern const char kWebUITabStripTabDragIntegrationDescription[];
  #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -69,9 +69,9 @@ 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,10 @@ BASE_FEATURE(kBackForwardCacheMemoryControls,
  #endif
- };
+ );
  
 +// Enables vibration; an user gesture will still be required if enabled.
 +const base::Feature kVibration{"Vibration",
@@ -83,7 +83,7 @@ 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
-@@ -337,6 +337,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)
@@ -91,7 +91,7 @@ diff --git a/content/public/common/content_features.h b/content/public/common/co
 +
  
  #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
@@ -140,7 +140,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 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
-@@ -1786,6 +1786,10 @@
+@@ -1827,6 +1827,10 @@
        name: "OrientationEvent",
        status: {"Android": "stable"},
      },

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

@@ -181,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
-@@ -410,10 +410,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -411,10 +411,7 @@ void ChromeBrowserMainExtraPartsProfiles::
    LacrosFirstRunServiceFactory::GetInstance();
  #endif
    LanguageModelManagerFactory::GetInstance();
@@ -196,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
-@@ -503,6 +503,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
@@ -250,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;
  import org.chromium.content_public.browser.ContentFeatureList;
-@@ -528,6 +529,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -539,6 +540,11 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          }
      }
  
@@ -270,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();
-@@ -926,6 +932,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
+@@ -963,6 +969,10 @@ public class SingleWebsiteSettings extends SiteSettingsPreferenceFragment
          if (contentType == mHighlightedPermission) {
              switchPreference.setBackgroundColor(mHighlightColor);
          }
@@ -292,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,
@@ -302,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 {
                  }
              }
          }
@@ -314,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>&,
@@ -324,7 +324,7 @@ 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,
@@ -333,7 +333,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
    }
  
    // 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,
@@ -345,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
-@@ -602,6 +602,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>
@@ -553,7 +553,7 @@ 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
-@@ -1151,6 +1151,8 @@ void PageInfo::PresentSitePermissions() {
+@@ -1189,6 +1189,8 @@ void PageInfo::PresentSitePermissions() {
      permission_info.source = info.source;
      permission_info.is_one_time = (info.metadata.session_model ==
                                     content_settings::SessionModel::OneTime);
@@ -771,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();
  }
  
@@ -958,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
-@@ -252,6 +252,20 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -226,6 +226,20 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(delete_callback));
  }
  
@@ -979,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,
-@@ -443,7 +457,8 @@ void PermissionContextBase::PermissionDecided(
+@@ -405,7 +419,8 @@ void PermissionContextBase::PermissionDecided(
      const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      ContentSetting content_setting,
@@ -989,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);
-@@ -451,9 +466,9 @@ void PermissionContextBase::PermissionDecided(
+@@ -413,9 +428,9 @@ void PermissionContextBase::PermissionDecided(
                               content_setting);
  
    bool persist = content_setting != CONTENT_SETTING_DEFAULT;
@@ -1001,7 +1001,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  }
  
  content::BrowserContext* PermissionContextBase::browser_context() const {
-@@ -503,11 +518,26 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -465,11 +480,26 @@ void PermissionContextBase::NotifyPermissionSet(
      bool persist,
      ContentSetting content_setting,
      bool is_one_time) {
@@ -1029,7 +1029,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  
    UpdateTabContext(id, requesting_origin,
-@@ -528,6 +558,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) {
@@ -1045,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 ||
-@@ -536,6 +575,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};
@@ -1057,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.
@@ -1072,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).
@@ -1084,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;
  
@@ -1099,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,
@@ -1126,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)) {}
  
@@ -1145,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
  
@@ -1210,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.
@@ -1223,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_;
  
@@ -1236,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
-@@ -156,7 +156,7 @@ void PermissionRequestManager::AddRequest(
+@@ -148,7 +148,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1245,7 +1245,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      request->RequestFinished();
      return;
    }
-@@ -232,7 +232,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()) {
@@ -1254,14 +1254,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      }
      request->RequestFinished();
      return;
-@@ -491,12 +491,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);
  }
  
@@ -1270,15 +1272,17 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -504,12 +505,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() {
@@ -1294,16 +1298,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_)
      return;
    DCHECK(view_);
-@@ -529,7 +540,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);
- }
-@@ -894,25 +905,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
+ 
+   NotifyRequestDecided(PermissionAction::DENIED);
+@@ -967,25 +978,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1335,7 +1339,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  }
  
  void PermissionRequestManager::CancelledIncludingDuplicates(
-@@ -1092,7 +1103,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:
@@ -1347,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
-@@ -136,8 +136,10 @@ class PermissionRequestManager
+@@ -141,8 +141,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1359,7 +1363,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    bool WasCurrentRequestAlreadyDisplayed() override;
-@@ -274,9 +276,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

@@ -48,13 +48,13 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 +        <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
-@@ -76,6 +76,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
+@@ -77,6 +77,8 @@ 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;
@@ -63,7 +63,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -2197,6 +2199,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2203,6 +2205,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
                      () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -72,7 +72,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(),
-@@ -2249,6 +2253,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2255,6 +2259,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          mTabModalHandler.onOmniboxFocusChanged(hasFocus);
      }
  
@@ -121,17 +121,17 @@ 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;
-  * bookmark model stored in native.
   */
- public class BookmarkBridge {
-+    private static final String TAG = "BookmarkBridge";
+ class BookmarkBridge {
      private final Profile mProfile;
++    private static final String TAG = "BookmarkBridge";
      private boolean mIsDestroyed;
      private boolean mIsDoingExtensiveChanges;
-@@ -604,6 +610,16 @@ public class BookmarkBridge {
+     private long mNativeBookmarkBridge;
+@@ -393,6 +399,16 @@ class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this);
      }
  
@@ -148,7 +148,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 +1046,49 @@ class BookmarkBridge {
                  mNativeBookmarkBridge, BookmarkBridge.this, title, url);
      }
  
@@ -198,7 +198,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 +1386,7 @@ class BookmarkBridge {
          void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
                  List<BookmarkId> folderList, List<Integer> depthList);
          BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
@@ -209,7 +209,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
-@@ -614,6 +614,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 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          BookmarkId othersNodeId = bookmarkModel.getOtherFolderId();
  
          List<BookmarkId> specialFoldersIds =
-@@ -639,6 +640,9 @@ public class BookmarkUtils {
+@@ -673,6 +674,9 @@ public class BookmarkUtils {
          if (bookmarkModel.isFolderVisible(mobileNodeId)) {
              topLevelFolders.add(mobileNodeId);
          }
@@ -350,7 +350,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
-@@ -3609,6 +3609,9 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3585,6 +3585,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>
@@ -570,7 +570,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
-@@ -666,7 +666,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 +579,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) {
-@@ -920,6 +920,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();
@@ -675,7 +675,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(),

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

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -48,6 +48,9 @@ found in the LICENSE file.
+@@ -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" />
@@ -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
-@@ -2223,6 +2223,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
-@@ -2446,6 +2446,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
-@@ -541,6 +541,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);
  
-@@ -1208,6 +1209,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1242,6 +1243,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          stopPriceTrackingMenuItem.setVisible(false);
      }
  
@@ -104,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
-@@ -414,6 +414,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
-@@ -368,7 +368,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -376,7 +376,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
      // OmniboxSuggestionsDropdownEmbedder implementation
      @Override
      public boolean isTablet() {
@@ -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
-@@ -673,7 +673,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_
    }
-@@ -974,7 +974,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.
@@ -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
-@@ -372,6 +372,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

@@ -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
-@@ -39,6 +39,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;
-@@ -1316,8 +1317,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1322,8 +1323,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              boolean hadCipherData =
                      CipherFactory.getInstance().restoreFromBundle(getSavedInstanceState());
  
@@ -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
-@@ -4438,6 +4438,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

@@ -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
-@@ -425,6 +425,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,14 +145,14 @@ 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
@@ -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
-@@ -384,6 +384,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
-@@ -141,6 +141,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"
-@@ -8966,6 +8967,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
-@@ -3320,6 +3320,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
-@@ -1888,6 +1888,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
+@@ -1975,6 +1975,9 @@ extern const char kReduceUserAgentPlatformOsCpuDescription[];
  extern const char kSkipServiceWorkerFetchHandlerName[];
  extern const char kSkipServiceWorkerFetchHandlerDescription[];
  

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     |  3 +++
+ .../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, 48 insertions(+), 23 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,37 @@ 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(
+@@ -111,6 +112,7 @@ 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)
+   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_anonymization_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 +97,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 +105,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 +113,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,7 +121,7 @@ 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_anonymization_key_, absl::nullopt, std::move(body));
@@ -137,7 +136,7 @@ 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,
-@@ -293,6 +290,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+@@ -294,6 +291,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
        "coop", endpoint, context_url_, reporting_source_,
        network_anonymization_key_,
        /*user_agent=*/absl::nullopt, std::move(body));
@@ -145,9 +144,9 @@ diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/conten
  }
  
  }  // 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"
@@ -174,7 +173,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
-@@ -12209,12 +12209,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -12373,12 +12373,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
    base::Value::Dict body;
    if (!reason.empty())
      body.Set("reason", reason);
@@ -209,7 +208,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"
@@ -236,7 +235,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 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
-@@ -462,10 +462,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::NetworkAnonymizationKey& network_anonymization_key,
        const absl::optional<std::string>& user_agent,
@@ -252,7 +251,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 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
-@@ -1096,7 +1096,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 +262,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
-@@ -1065,6 +1065,7 @@ interface NetworkContext {
+@@ -1064,6 +1064,7 @@ interface NetworkContext {
    // provided |network_isolation_key|.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -271,7 +270,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1078,6 +1079,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|.
@@ -290,7 +289,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"
-@@ -2357,9 +2358,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
+@@ -2307,9 +2308,11 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
    return base::UnguessableToken::Null();
  }
  
@@ -316,7 +315,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"
-@@ -590,9 +590,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
-@@ -1215,6 +1215,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());
-@@ -3609,7 +3615,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
-@@ -193,6 +193,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
-@@ -514,8 +514,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
-@@ -507,7 +507,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
-@@ -697,4 +697,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
-@@ -397,6 +397,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
-@@ -275,6 +275,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) ||
@@ -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",
@@ -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

@@ -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-AdBlockUpdaterService.patch

@@ -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,14 +64,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
-@@ -372,6 +372,7 @@ android_library("chrome_java") {
-     "//chrome/browser/download/android:java",
-     "//chrome/browser/download/android:java_resources",
-     "//chrome/browser/enterprise/util: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/browser/feature_engagement:java",
-     "//chrome/browser/feature_guide/notifications:java",
-     "//chrome/browser/feed/android: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
@@ -81,7 +83,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "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",
-@@ -643,6 +644,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,7 +94,7 @@ 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
-@@ -905,6 +905,8 @@ chrome_java_sources = [
+@@ -908,6 +908,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",
@@ -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
-@@ -12253,6 +12253,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>
  
@@ -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
-@@ -1736,6 +1736,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
-@@ -273,6 +273,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.
       */
-@@ -519,5 +527,7 @@ public class CachedFeatureFlags {
+@@ -524,5 +532,7 @@ public class CachedFeatureFlags {
      @NativeMethods
      interface Natives {
          boolean isNetworkServiceWarmUpEnabled();
@@ -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
-@@ -2350,6 +2350,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
-@@ -295,8 +295,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>
@@ -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/Bromite-auto-updater.patch

@@ -49,7 +49,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
-@@ -2183,6 +2183,9 @@ if (enable_java_templates) {
+@@ -2242,6 +2242,9 @@ if (enable_java_templates) {
        if (defined(testonly) && testonly) {
          defines += [ "_IS_FOR_TEST" ]
        }
@@ -62,7 +62,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
-@@ -811,6 +811,9 @@ chrome_java_sources = [
+@@ -814,6 +814,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",
@@ -1258,31 +1258,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kBookmarksImprovedSaveFlow,
      &kBookmarksRefresh,
      &kBackGestureRefactorAndroid,
-@@ -692,6 +693,9 @@ const base::Feature kIncognitoReauthenticationForAndroid{
- const base::Feature kIncognitoScreenshot{"IncognitoScreenshot",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -696,6 +697,9 @@ BASE_FEATURE(kContextMenuSearchWithGoogleLens,
+              "ContextMenuSearchWithGoogleLens",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +const base::Feature kInlineUpdateFlow{"InlineUpdateFlow",
 +                                      base::FEATURE_ENABLED_BY_DEFAULT};
 +
- const base::Feature kInfobarScrollOptimization{
-     "InfobarScrollOptimization", base::FEATURE_DISABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kContextMenuShopWithGoogleLens,
+              "ContextMenuShopWithGoogleLens",
+              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
-@@ -93,6 +93,7 @@ extern const base::Feature kGridTabSwitcherForTablets;
- extern const base::Feature kHandleMediaIntents;
- extern const base::Feature kImmersiveUiMode;
- extern const base::Feature kIncognitoReauthenticationForAndroid;
+@@ -94,6 +94,7 @@ BASE_DECLARE_FEATURE(kGridTabSwitcherForTablets);
+ BASE_DECLARE_FEATURE(kHandleMediaIntents);
+ BASE_DECLARE_FEATURE(kImmersiveUiMode);
+ BASE_DECLARE_FEATURE(kIncognitoReauthenticationForAndroid);
 +extern const base::Feature kInlineUpdateFlow;
- extern const base::Feature kIncognitoScreenshot;
- extern const base::Feature kInfobarScrollOptimization;
- extern const base::Feature kImprovedA2HS;
+ 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
-@@ -383,6 +383,7 @@ public abstract class ChromeFeatureList {
+@@ -388,6 +388,7 @@ public abstract class ChromeFeatureList {
              "IncognitoReauthenticationForAndroid";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
      public static final String INFOBAR_SCROLL_OPTIMIZATION = "InfobarScrollOptimization";
@@ -1293,7 +1293,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
-@@ -1893,6 +1893,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1885,6 +1885,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 +1306,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]">
-@@ -3528,7 +3534,10 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3501,7 +3507,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 +1318,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
-@@ -3539,6 +3548,18 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3512,6 +3521,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

@@ -8,7 +8,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 432569612196b..b75cfc77f4e54 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -47,7 +47,7 @@ chrome_jni_registration_header =
@@ -20,6 +19,5 @@ index 432569612196b..b75cfc77f4e54 100644
    if (use_stable_package_name_for_trichrome) {
      _default_package += ".stable"
    } else if (android_channel != "default" && android_channel != "stable") {
--- 
-2.30.2
-
+--
+2.25.1

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

@@ -14,17 +14,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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,7 +7,9 @@
+@@ -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/timing/worker_global_scope_performance.h"
 +#include "third_party/blink/renderer/core/workers/worker_global_scope.h"
- #include "third_party/blink/renderer/platform/bindings/microtask.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"
- 
- namespace blink {
-@@ -62,7 +64,11 @@ void WorkerAnimationFrameProvider::BeginFrame(const viz::BeginFrameArgs& args) {
+@@ -63,7 +65,11 @@ void WorkerAnimationFrameProvider::BeginFrame(const viz::BeginFrameArgs& args) {
              }
            }
  

build/patches/Client-hints-overrides.patch

@@ -14,10 +14,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  content/common/user_agent.cc                             | 9 +--------
  content/public/common/content_features.cc                | 4 ++--
  services/network/public/cpp/client_hints.cc              | 1 +
- services/network/public/cpp/features.cc                  | 4 ++--
+ 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 +++-
- 9 files changed, 18 insertions(+), 17 deletions(-)
+ 9 files changed, 17 insertions(+), 16 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
@@ -36,8 +36,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
-@@ -462,7 +462,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) {
@@ -49,7 +49,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
-@@ -1025,6 +1025,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1024,6 +1024,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -83,21 +83,21 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
 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
-@@ -229,8 +229,8 @@ 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};
-+const base::Feature kCriticalClientHint{"CriticalClientHint",                 // disabled by default
-+                                        base::FEATURE_DISABLED_BY_DEFAULT};   // on Bromite
+ BASE_FEATURE(kCriticalClientHint,
+-             "CriticalClientHint",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "CriticalClientHint",                  // disabled by default
++             base::FEATURE_ENABLED_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) {
@@ -108,21 +108,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_ENABLED_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) {
@@ -141,7 +139,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 {
@@ -150,7 +148,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;

build/patches/Content-settings-infrastructure.patch

@@ -42,8 +42,8 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
 @@ -88,6 +88,10 @@ android_library("java") {
-     "java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java",
      "java/src/org/chromium/components/browser_ui/site_settings/WebsiteRowPreference.java",
+     "java/src/org/chromium/components/browser_ui/site_settings/TimezoneOverrideSiteSettingsPreference.java"
    ]
 +  sources += [
 +    "java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java",

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
-@@ -380,7 +380,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",
-@@ -1017,7 +1016,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",
-@@ -1542,7 +1540,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;
-@@ -261,8 +260,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";
-@@ -492,8 +489,6 @@ public class IntentHandler {
+@@ -496,8 +493,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -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;
-@@ -373,8 +369,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<>();
-@@ -1176,10 +1170,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1172,10 +1166,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  
      @Override
      public void onStopWithNative() {
@@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
          super.onStopWithNative();
      }
  
-@@ -1271,23 +1261,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1267,23 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      .recordUserFontPrefOnStartup();
          });
  
@@ -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;
          }
@@ -262,15 +262,17 @@ 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
-@@ -671,7 +671,7 @@ const base::Feature kDuetTabStripIntegrationAndroid{
-     "DuetTabStripIntegrationAndroid", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -746,8 +746,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_ENABLED_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
@@ -281,12 +283,12 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 -                    .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",
-@@ -430,7 +429,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

@@ -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
-@@ -86,12 +86,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
-@@ -742,7 +742,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

@@ -82,7 +82,7 @@ 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
-@@ -3060,6 +3060,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -3091,6 +3091,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* source_origin,
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin) {
@@ -95,7 +95,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;
  
@@ -118,7 +118,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
 diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/privacy_sandbox/privacy_sandbox_prefs.cc
 --- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
-@@ -63,7 +63,7 @@ namespace privacy_sandbox {
+@@ -66,7 +66,7 @@ namespace privacy_sandbox {
  
  void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
@@ -130,7 +130,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 +140,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,7 +150,7 @@ 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);
  }
  
@@ -160,7 +160,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
    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::IsAttributionReportingAllowed(
      const url::Origin& top_frame_origin,
@@ -172,17 +172,17 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings.cc b/components
  }
  
  bool PrivacySandboxSettings::MaySendAttributionReport(
-@@ -277,7 +277,8 @@ void PrivacySandboxSettings::ClearFledgeJoiningAllowedSettings(
+@@ -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 +193,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 +202,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 +212,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 +222,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 +238,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
-@@ -220,7 +220,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_ENABLED_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
-@@ -444,8 +444,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",
-@@ -777,11 +777,11 @@ const base::Feature kPredictivePrefetchingAllowedOnAllConnectionTypes{
- 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

@@ -12,16 +12,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -936,8 +936,8 @@ const base::Feature kTrustedWebActivityQualityEnforcementWarning{
- const base::Feature kShowExtendedPreloadingSetting{
-     "ShowExtendedPreloadingSetting", base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -1075,8 +1075,8 @@ BASE_FEATURE(kShowExtendedPreloadingSetting,
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
--const base::Feature kStartSurfaceAndroid{"StartSurfaceAndroid",
--                                         base::FEATURE_ENABLED_BY_DEFAULT};
-+const base::Feature kStartSurfaceAndroid{"StartSurfaceAndroid",                // must be disabled
-+                                         base::FEATURE_DISABLED_BY_DEFAULT};   // in Bromite
+ BASE_FEATURE(kStartSurfaceAndroid,
+-             "StartSurfaceAndroid",
+-             base::FEATURE_ENABLED_BY_DEFAULT);
++             "StartSurfaceAndroid",                 // must be disabled
++             base::FEATURE_DISABLED_BY_DEFAULT);    // in Bromite
  
- const base::Feature kFeedPositionAndroid{"FeedPositionAndroid",
-                                          base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kFeedPositionAndroid,
+              "FeedPositionAndroid",
 --
 2.25.1

build/patches/Disable-TLS-resumption.patch

@@ -39,7 +39,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
-@@ -4896,6 +4896,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
-@@ -1015,6 +1015,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
-@@ -580,6 +580,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
+@@ -595,6 +595,12 @@ extern const char kEnablePreinstalledWebAppDuplicationFixerDescription[];
  extern const char kEnableTLS13EarlyDataName[];
  extern const char kEnableTLS13EarlyDataDescription[];
  
@@ -89,25 +89,25 @@ 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
-@@ -110,6 +110,12 @@ const base::Feature kUseDnsHttpsSvcbAlpn{"UseDnsHttpsSvcbAlpn",
- const base::Feature kEnableTLS13EarlyData{"EnableTLS13EarlyData",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -110,6 +110,12 @@ BASE_FEATURE(kPartitionExpectCTStateByNetworkIsolationKey,
+              base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
+ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey,
 +const base::Feature kDisableTLSResumption{"DisableTLSResumption",
 +                                          base::FEATURE_ENABLED_BY_DEFAULT};
 +
 +const base::Feature kLogTLSResumption{"LogTLSResumption",
 +                                      base::FEATURE_DISABLED_BY_DEFAULT};
 +
- const base::Feature kEncryptedClientHello{"EncryptedClientHello",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+              "PartitionNelAndReportingByNetworkIsolationKey",         // must be enabled
+              base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
 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;
@@ -117,7 +117,7 @@ diff --git a/net/base/features.h b/net/base/features.h
 +
  // 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 +132,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
-@@ -73,6 +73,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 +140,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"
-@@ -246,6 +247,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
+@@ -245,6 +246,38 @@ quic::ParsedQuicVersion SelectQuicVersion(
  
  }  // namespace
  
@@ -179,7 +179,7 @@ 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
-@@ -2254,7 +2287,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
+@@ -2249,7 +2282,7 @@ QuicStreamFactory::CreateCryptoConfigHandle(
                sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
                actual_network_anonymization_key),

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

@@ -6,18 +6,17 @@ 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
 ---
  .../chrome_hints_manager.cc                   |  1 +
- .../optimization_guide_keyed_service.cc       |  5 ----
- chrome/common/chrome_features.cc              |  6 ++---
+ .../optimization_guide_keyed_service.cc       |  4 ++
+ chrome/common/chrome_features.cc              |  8 ++--
  .../optimization_guide/core/hints_fetcher.cc  |  1 +
- .../optimization_guide/core/hints_manager.cc  |  5 ++++
- .../core/optimization_guide_features.cc       | 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, 34 insertions(+), 31 deletions(-)
+ components/optimization_guide/features.gni    |  4 +-
+ components/permissions/features.cc            |  8 ++--
+ third_party/blink/common/features.cc          |  8 +---
+ 11 files changed, 44 insertions(+), 40 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,52 +32,46 @@ 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
-@@ -113,10 +113,6 @@ OptimizationGuideKeyedService::MaybeCreatePushNotificationManager(
+@@ -113,6 +113,10 @@ OptimizationGuideKeyedService::MaybeCreatePushNotificationManager(
    if (optimization_guide::features::IsPushNotificationsEnabled()) {
      auto push_notification_manager =
          std::make_unique<optimization_guide::PushNotificationManager>();
--#if BUILDFLAG(IS_ANDROID)
--    push_notification_manager->AddObserver(
--        PriceTrackingNotificationBridge::GetForBrowserContext(profile));
--#endif
++#if BUILDFLAG(IS_ANDROID)
++    push_notification_manager->AddObserver(
++        PriceTrackingNotificationBridge::GetForBrowserContext(profile));
++#endif
      return push_notification_manager;
    }
    return nullptr;
-@@ -324,7 +320,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
- void OptimizationGuideKeyedService::RegisterOptimizationTypes(
-     const std::vector<optimization_guide::proto::OptimizationType>&
-         optimization_types) {
--  hints_manager_->RegisterOptimizationTypes(optimization_types);
- }
- 
- optimization_guide::OptimizationGuideDecision
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -747,8 +747,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.
-@@ -759,7 +759,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) {
@@ -89,7 +82,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
-@@ -360,6 +360,7 @@ void HintsManager::Shutdown() {
+@@ -352,6 +352,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -97,7 +90,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1064,6 +1065,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1056,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
  
    // TODO(crbug/1275612): Check whether we have consent to fetch.
@@ -105,7 +98,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
  
    // This set contains URLs that require some information to be fetched, whether
    // that be a URL-keyed hint or a host-keyed hint.
-@@ -1271,6 +1273,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1263,6 +1265,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      proto::OptimizationType optimization_type,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -118,72 +111,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,
@@ -257,46 +262,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
-@@ -66,12 +66,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
  
- const base::Feature kPermissionOnDeviceGeolocationPredictions{
-     "PermissionOnDeviceGeolocationPredictions",
-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
-@@ -30,7 +30,7 @@ const base::Feature kShoppingUserSegmentFeature{
- 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
-@@ -206,7 +206,7 @@ const base::Feature kMixedContentAutoupgrade{"AutoupgradeMixedContent",
- 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
-@@ -850,7 +850,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;
              }
-@@ -885,8 +885,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -886,8 +886,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                  preferenceManager.writeBoolean(
                          ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
              }

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

@@ -11,43 +11,51 @@ 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                    |  6 ------
+ .../attribution_storage_sql.h                     |  3 ---
  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(-)
+ 12 files changed, 32 insertions(+), 42 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
-@@ -502,7 +502,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 +115,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 +131,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 +147,36 @@ 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
-@@ -416,7 +416,7 @@ DestinationLimitResult GetDestinationLimitResult(
-   }
- }
- 
--bool g_run_in_memory = false;
-+bool g_run_in_memory = true;
+@@ -424,12 +424,6 @@ DestinationLimitResult GetDestinationLimitResult(
  
  }  // namespace
  
+-// static
+-bool AttributionStorageSql::DeleteStorageForTesting(
+-    const base::FilePath& user_data_directory) {
+-  return sql::Database::Delete(DatabasePath(user_data_directory));
+-}
+-
+ AttributionStorageSql::AttributionStorageSql(
+     const base::FilePath& user_data_directory,
+     std::unique_ptr<AttributionStorageDelegate> delegate)
+diff --git a/content/browser/attribution_reporting/attribution_storage_sql.h b/content/browser/attribution_reporting/attribution_storage_sql.h
+--- a/content/browser/attribution_reporting/attribution_storage_sql.h
++++ b/content/browser/attribution_reporting/attribution_storage_sql.h
+@@ -50,9 +50,6 @@ class CONTENT_EXPORT AttributionStorageSql : public AttributionStorage {
+   static const int kCompatibleVersionNumber;
+   static const int kDeprecatedVersionNumber;
+ 
+-  [[nodiscard]] static bool DeleteStorageForTesting(
+-      const base::FilePath& user_data_directory);
+-
+   // If `user_data_directory` is empty, the DB is created in memory and no data
+   // is persisted to disk.
+   AttributionStorageSql(const base::FilePath& user_data_directory,
 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
-@@ -1315,12 +1315,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1353,12 +1353,7 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -179,12 +204,14 @@ 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
-@@ -107,7 +107,7 @@ const base::Feature kBlockingDownloadsInAdFrameWithoutUserActivation{
+@@ -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

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
-@@ -224,8 +224,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

@@ -10,10 +10,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  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
-index 7b10e5b24a8ba..ab4dd1ccfbff1 100644
 --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
 +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
-@@ -50,13 +50,7 @@ public final class FeedFeatures {
+@@ -48,13 +48,7 @@ public final class FeedFeatures {
       *         the user is signed in and confirms it's not a child profile.
       */
      public static boolean isWebFeedUIEnabled() {
@@ -29,7 +28,6 @@ index 7b10e5b24a8ba..ab4dd1ccfbff1 100644
  
      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
-index a4efd60024847..35b3ca107081d 100644
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
 @@ -78,7 +78,7 @@ public class CachedFeatureFlags {
@@ -42,7 +40,6 @@ index a4efd60024847..35b3ca107081d 100644
                      .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)
                      .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false)
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
-index 198b24c5c9b5d..8e8e69154fd4f 100644
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
 @@ -17,14 +17,14 @@
@@ -64,6 +61,5 @@ index 198b24c5c9b5d..8e8e69154fd4f 100644
  
  BASE_FEATURE(kInterestFeedV2Autoplay,
               "InterestFeedV2Autoplay",
--- 
-2.30.2
-
+--
+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,28 +54,28 @@ 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
-@@ -52,6 +52,8 @@ void CreateFallbackSamplingTrial(const std::string& trial_name,
-                                  const std::string& feature_name,
-                                  const int sampled_in_rate_per_mille,
-                                  base::FeatureList* feature_list) {
+@@ -52,6 +52,8 @@ void CreateFallbackSamplingTrial(
+     const base::FieldTrial::EntropyProvider& entropy_provider,
+     const std::string& trial_name,
+     const std::string& feature_name,
 +  if ((true))
 +    return;
+     const int sampled_in_rate_per_mille,
+     base::FeatureList* feature_list) {
    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,
+@@ -90,6 +92,8 @@ void CreateFallbackSamplingTrial(
+ // variations support. This should only be called when there is no existing
  // field trial controlling the sampling feature.
- void CreateFallbackUkmSamplingTrial(bool is_stable_channel,
-                                     base::FeatureList* feature_list) {
+ void CreateFallbackUkmSamplingTrial(
 +  if ((true))
 +    return;
-   static const char kSampledGroup_Stable[] = "Sampled_NoSeed_Stable";
-   static const char kSampledGroup_Other[] = "Sampled_NoSeed_Other";
-   const char* sampled_group = kSampledGroup_Other;
+     const base::FieldTrial::EntropyProvider& entropy_provider,
+     bool is_stable_channel,
+     base::FeatureList* feature_list) {
 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 =
@@ -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
-@@ -176,13 +176,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
-@@ -444,7 +444,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
-@@ -367,7 +367,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
-@@ -419,7 +419,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-safe-browsing.patch

@@ -98,7 +98,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  86 files changed, 214 insertions(+), 676 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
-index 001ce6c5870c0..b7dcb7bf99ee3 100644
 --- a/chrome/android/java/res/xml/google_services_preferences.xml
 +++ b/chrome/android/java/res/xml/google_services_preferences.xml
 @@ -26,11 +26,6 @@ found in the LICENSE file.
@@ -114,7 +113,6 @@ index 001ce6c5870c0..b7dcb7bf99ee3 100644
          android:key="url_keyed_anonymized_data"
          android:title="@string/url_keyed_anonymized_data_title"
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
-index 231c5c00a8ce6..dfc636f01840e 100644
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
 @@ -62,11 +62,6 @@ found in the LICENSE file.
@@ -130,7 +128,6 @@ index 231c5c00a8ce6..dfc636f01840e 100644
          android:key="notifications"
          android:order="12"
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
-index eadd16fa6c6bf..4afa78d4c548d 100644
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
 @@ -18,11 +18,6 @@ found in the LICENSE file.
@@ -157,7 +154,6 @@ index eadd16fa6c6bf..4afa78d4c548d 100644
          android:key="secure_dns"
          android:title="@string/settings_secure_dns_title"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-index ba173aab43533..bbb81ffa4dd42 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 @@ -27,14 +27,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer;
@@ -235,7 +231,6 @@ index ba173aab43533..bbb81ffa4dd42 100644
          if (privacySandboxPreference != null) {
              privacySandboxPreference.setSummary(
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
-index 237a436423426..cd9b30a269eb6 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java
 @@ -7,11 +7,9 @@ import android.content.Context;
@@ -263,7 +258,6 @@ index 237a436423426..cd9b30a269eb6 100644
      }
  }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java
-index 301cb27c3fbed..16d74aa40b8b7 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/usage_stats/UsageStatsConsentDialog.java
 @@ -48,11 +48,6 @@ public class UsageStatsConsentDialog {
@@ -279,7 +273,6 @@ index 301cb27c3fbed..16d74aa40b8b7 100644
  
          mDialogModel = builder.build();
 diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc
-index 09414997fc9ab..7b5d717752299 100644
 --- a/chrome/app/android/chrome_main_delegate_android.cc
 +++ b/chrome/app/android/chrome_main_delegate_android.cc
 @@ -9,6 +9,7 @@
@@ -291,7 +284,6 @@ index 09414997fc9ab..7b5d717752299 100644
  #include "base/files/file_util.h"
  #include "base/logging.h"
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 6af6b725815f6..1e9f8ec45fbf9 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -338,8 +338,6 @@ static_library("browser") {
@@ -381,7 +373,6 @@ index 6af6b725815f6..1e9f8ec45fbf9 100644
      "//components/search_engines:test_support",
      "//components/security_interstitials/content:security_interstitial_page",
 diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
-index dad392ba81df3..e93b47b9ff435 100644
 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc
 +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
 @@ -35,7 +35,9 @@
@@ -430,7 +421,6 @@ index dad392ba81df3..e93b47b9ff435 100644
  
  void TabWebContentsDelegateAndroid::RunFileChooser(
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
-index f365449df16a8..67ad0df712eb4 100644
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
 @@ -54,10 +54,6 @@ class NetworkQualityTracker;
@@ -455,7 +445,6 @@ index f365449df16a8..67ad0df712eb4 100644
    // Browsing subresource filter.
    virtual subresource_filter::RulesetService*
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
-index a7a2bfe6738c3..dc4dfd0e2d49e 100644
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
 @@ -72,7 +72,6 @@
@@ -523,7 +512,6 @@ index a7a2bfe6738c3..dc4dfd0e2d49e 100644
  
  void BrowserProcessImpl::CreateSubresourceFilterRulesetService() {
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
-index f8a1250d7ba07..b3ec6e6a9ef81 100644
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
 @@ -180,7 +180,6 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -545,7 +533,6 @@ index f8a1250d7ba07..b3ec6e6a9ef81 100644
    std::unique_ptr<subresource_filter::RulesetService>
        subresource_filter_ruleset_service_;
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-index 805ee3318144a..87d1afc5e2042 100644
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 @@ -641,10 +641,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -562,7 +549,6 @@ index 805ee3318144a..87d1afc5e2042 100644
      // Cleared for DATA_TYPE_HISTORY, DATA_TYPE_COOKIES and DATA_TYPE_PASSWORDS.
      browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index 96b42e4e7ffe3..bb81389e0ea17 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
 @@ -113,6 +113,7 @@
@@ -703,7 +689,6 @@ index 96b42e4e7ffe3..bb81389e0ea17 100644
  }
  
 diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
-index 10b5cf030a944..fa2e73f83db9a 100644
 --- a/chrome/browser/chrome_content_browser_client.h
 +++ b/chrome/browser/chrome_content_browser_client.h
 @@ -922,9 +922,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -719,7 +704,6 @@ index 10b5cf030a944..fa2e73f83db9a 100644
    StartupData startup_data_;
  
 diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
-index aadbee3054da5..d4fa4d3b5d4c0 100644
 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
 +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
 @@ -131,6 +131,7 @@
@@ -739,7 +723,6 @@ index aadbee3054da5..d4fa4d3b5d4c0 100644
  // BadgeManager is not used for Android.
  #if !BUILDFLAG(IS_ANDROID)
 diff --git a/chrome/browser/component_updater/file_type_policies_component_installer.cc b/chrome/browser/component_updater/file_type_policies_component_installer.cc
-index a1c5effb8ae80..8937960995706 100644
 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc
 +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
 @@ -19,7 +19,9 @@
@@ -774,7 +757,6 @@ index a1c5effb8ae80..8937960995706 100644
  
  }  // namespace
 diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
-index 95469abf28b7d..cae9d2eaf4eb4 100644
 --- a/chrome/browser/component_updater/registration.cc
 +++ b/chrome/browser/component_updater/registration.cc
 @@ -16,7 +16,6 @@
@@ -813,7 +795,6 @@ index 95469abf28b7d..cae9d2eaf4eb4 100644
    RegisterScreenAIComponent(cus, g_browser_process->local_state());
  #endif  // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
 diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
-index 77b89c1888aea..bf49dd7730247 100644
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
 @@ -42,15 +42,19 @@
@@ -1000,7 +981,6 @@ index 77b89c1888aea..bf49dd7730247 100644
  
  void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
 diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
-index b1dd062155fdc..585f233daccce 100644
 --- a/chrome/browser/download/chrome_download_manager_delegate.h
 +++ b/chrome/browser/download/chrome_download_manager_delegate.h
 @@ -21,8 +21,10 @@
@@ -1051,7 +1031,6 @@ index b1dd062155fdc..585f233daccce 100644
    // Show file picker for |download|.
    virtual void ShowFilePickerForDownload(
 diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
-index 3c4694117117e..841f7b8e0f91f 100644
 --- a/chrome/browser/download/download_item_model.cc
 +++ b/chrome/browser/download/download_item_model.cc
 @@ -35,7 +35,9 @@
@@ -1134,7 +1113,6 @@ index 3c4694117117e..841f7b8e0f91f 100644
      case DownloadCommands::PAUSE:
        return !download_->IsSavePackageDownload() &&
 diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
-index 8fb5ecf3c6253..8e137bf06c7e5 100644
 --- a/chrome/browser/download/download_item_model.h
 +++ b/chrome/browser/download/download_item_model.h
 @@ -14,7 +14,9 @@
@@ -1160,7 +1138,6 @@ index 8fb5ecf3c6253..8e137bf06c7e5 100644
        const override;
    void OpenUsingPlatformHandler() override;
 diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
-index 04d7b8ae25192..23b16a4642eff 100644
 --- a/chrome/browser/download/download_prefs.cc
 +++ b/chrome/browser/download/download_prefs.cc
 @@ -42,7 +42,9 @@
@@ -1211,7 +1188,6 @@ index 04d7b8ae25192..23b16a4642eff 100644
    DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
    extension.erase(0, 1);
 diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download/download_stats.cc
-index 330c4862174e1..051f0839943a2 100644
 --- a/chrome/browser/download/download_stats.cc
 +++ b/chrome/browser/download/download_stats.cc
 @@ -10,7 +10,9 @@
@@ -1252,7 +1228,6 @@ index 330c4862174e1..051f0839943a2 100644
  
  void RecordDownloadOpenButtonPressed(bool is_download_completed) {
 diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
-index 6b6d4fc8354f3..3af5b1447b196 100644
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
 @@ -31,9 +31,11 @@
@@ -1435,7 +1410,6 @@ index 6b6d4fc8354f3..3af5b1447b196 100644
  void DownloadTargetDeterminer::OnDownloadDestroyed(
      DownloadItem* download) {
 diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h
-index bb050f59c63fb..e5c7325fd08f1 100644
 --- a/chrome/browser/download/download_target_determiner.h
 +++ b/chrome/browser/download/download_target_determiner.h
 @@ -20,7 +20,9 @@
@@ -1475,7 +1449,6 @@ index bb050f59c63fb..e5c7325fd08f1 100644
    base::FilePath local_path_;
    base::FilePath intermediate_path_;
 diff --git a/chrome/browser/download/download_target_info.cc b/chrome/browser/download/download_target_info.cc
-index ad088f4e6730f..5e0267df3f9b4 100644
 --- a/chrome/browser/download/download_target_info.cc
 +++ b/chrome/browser/download/download_target_info.cc
 @@ -4,12 +4,16 @@
@@ -1496,7 +1469,6 @@ index ad088f4e6730f..5e0267df3f9b4 100644
        result(download::DOWNLOAD_INTERRUPT_REASON_NONE),
        mixed_content_status(
 diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/download/download_target_info.h
-index 41e568f74657e..0be444b35f36d 100644
 --- a/chrome/browser/download/download_target_info.h
 +++ b/chrome/browser/download/download_target_info.h
 @@ -11,7 +11,9 @@
@@ -1526,7 +1498,6 @@ index 41e568f74657e..0be444b35f36d 100644
    // Suggested intermediate path. The downloaded bytes should be written to this
    // path until all the bytes are available and the user has accepted a
 diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
-index ee27c17a2bbc1..ae74fd3b83873 100644
 --- a/chrome/browser/download/download_ui_model.cc
 +++ b/chrome/browser/download/download_ui_model.cc
 @@ -39,7 +39,9 @@
@@ -1555,7 +1526,6 @@ index ee27c17a2bbc1..ae74fd3b83873 100644
  download::DownloadItem::MixedContentStatus
  DownloadUIModel::GetMixedContentStatus() const {
 diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
-index 3f38bcf8d911e..45a75d7c5c020 100644
 --- a/chrome/browser/download/download_ui_model.h
 +++ b/chrome/browser/download/download_ui_model.h
 @@ -19,7 +19,9 @@
@@ -1585,7 +1555,6 @@ index 3f38bcf8d911e..45a75d7c5c020 100644
    // Return the mixed content status determined during download target
    // determination.
 diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
-index 3390cf2172538..c503f2fc04e7b 100644
 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc
 +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
 @@ -37,7 +37,6 @@
@@ -1651,7 +1620,6 @@ index 3390cf2172538..c503f2fc04e7b 100644
  
  DownloadsShowFunction::DownloadsShowFunction() {}
 diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h
-index 9ad098d656597..9dc64d4771e78 100644
 --- a/chrome/browser/extensions/api/downloads/downloads_api.h
 +++ b/chrome/browser/extensions/api/downloads/downloads_api.h
 @@ -13,7 +13,6 @@
@@ -1691,7 +1659,6 @@ index 9ad098d656597..9dc64d4771e78 100644
  
  class DownloadsShowFunction : public ExtensionFunction {
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-index bfab38fa77399..c6afb607c8047 100644
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 @@ -1277,21 +1277,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() {
@@ -1720,7 +1687,6 @@ index bfab38fa77399..c6afb607c8047 100644
  
  ExtensionFunction::ResponseValue
 diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-index 927169dd05cd7..b7e382a53a700 100644
 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
 @@ -37,8 +37,11 @@
@@ -1808,7 +1774,6 @@ index 927169dd05cd7..b7e382a53a700 100644
    auto result_callback =
        BindResultCallbackToCurrentSequence(std::move(callback));
 diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
-index 9fa06d8701981..f5fbf0f46c29b 100644
 --- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
 +++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
 @@ -19,6 +19,7 @@
@@ -1831,7 +1796,6 @@ index 9fa06d8701981..f5fbf0f46c29b 100644
    bool CanObtainWritePermission(const url::Origin& origin) override;
  
 diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chrome/browser/lookalikes/lookalike_url_controller_client.cc
-index 4f1f07957966a..99b6bdf90cb42 100644
 --- a/chrome/browser/lookalikes/lookalike_url_controller_client.cc
 +++ b/chrome/browser/lookalikes/lookalike_url_controller_client.cc
 @@ -9,7 +9,6 @@
@@ -1852,7 +1816,6 @@ index 4f1f07957966a..99b6bdf90cb42 100644
    Reload();
  }
 diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
-index 160d787d79fbc..c95f7a29cadb2 100644
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
 @@ -895,9 +895,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
@@ -1866,7 +1829,6 @@ index 160d787d79fbc..c95f7a29cadb2 100644
    metrics_service_->RegisterMetricsProvider(
        std::make_unique<UpgradeMetricsProvider>());
 diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
-index 41e4c6fce4ee4..0d8b9e938d4b8 100644
 --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
 +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
 @@ -130,9 +130,6 @@ void TrialComparisonCertVerifierController::SendTrialReport(
@@ -1880,7 +1842,6 @@ index 41e4c6fce4ee4..0d8b9e938d4b8 100644
  
  // static
 diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
-index fae947b020195..79a04fd27f086 100644
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
 @@ -127,10 +127,10 @@
@@ -1963,7 +1924,6 @@ index fae947b020195..79a04fd27f086 100644
    if (log_manager_->IsLoggingActive()) {
      password_manager::BrowserSavePasswordProgressLogger logger(
 diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
-index 6d3f766751ebf..646c9e601a49c 100644
 --- a/chrome/browser/permissions/chrome_permissions_client.cc
 +++ b/chrome/browser/permissions/chrome_permissions_client.cc
 @@ -19,7 +19,6 @@
@@ -1995,7 +1955,6 @@ index 6d3f766751ebf..646c9e601a49c 100644
      content::BrowserContext* browser_context,
      permissions::RequestType request_type,
 diff --git a/chrome/browser/permissions/chrome_permissions_client.h b/chrome/browser/permissions/chrome_permissions_client.h
-index 09176eb28c53b..076fe199e6ef6 100644
 --- a/chrome/browser/permissions/chrome_permissions_client.h
 +++ b/chrome/browser/permissions/chrome_permissions_client.h
 @@ -51,9 +51,6 @@ class ChromePermissionsClient : public permissions::PermissionsClient {
@@ -2009,7 +1968,6 @@ index 09176eb28c53b..076fe199e6ef6 100644
        content::BrowserContext* browser_context,
        permissions::RequestType request_type,
 diff --git a/chrome/browser/permissions/permission_revocation_request.cc b/chrome/browser/permissions/permission_revocation_request.cc
-index 89d678fb08db5..df926d016d821 100644
 --- a/chrome/browser/permissions/permission_revocation_request.cc
 +++ b/chrome/browser/permissions/permission_revocation_request.cc
 @@ -145,6 +145,7 @@ void PermissionRevocationRequest::CheckAndRevokeIfBlocklisted() {
@@ -2047,7 +2005,6 @@ index 89d678fb08db5..df926d016d821 100644
    NotifyCallback(Outcome::PERMISSION_NOT_REVOKED);
  }
 diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc
-index 7efe78ed612b8..aa62e1fdabc0b 100644
 --- a/chrome/browser/permissions/quiet_notification_permission_ui_config.cc
 +++ b/chrome/browser/permissions/quiet_notification_permission_ui_config.cc
 @@ -89,8 +89,8 @@ bool QuietNotificationPermissionUiConfig::IsCrowdDenyTriggeringEnabled() {
@@ -2062,7 +2019,6 @@ index 7efe78ed612b8..aa62e1fdabc0b 100644
  
  // static
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
-index 3eff9bc639bb1..746c4278ebc09 100644
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
 @@ -9,6 +9,7 @@
@@ -2084,7 +2040,6 @@ index 3eff9bc639bb1..746c4278ebc09 100644
    SearchPrefetchService::RegisterProfilePrefs(registry);
    blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
 diff --git a/chrome/browser/privacy_guide/android/BUILD.gn b/chrome/browser/privacy_guide/android/BUILD.gn
-index 991362715acbd..0ea925f49550b 100644
 --- a/chrome/browser/privacy_guide/android/BUILD.gn
 +++ b/chrome/browser/privacy_guide/android/BUILD.gn
 @@ -13,7 +13,6 @@ android_library("java") {
@@ -2104,7 +2059,6 @@ index 991362715acbd..0ea925f49550b 100644
    ]
    deps = [
 diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
-index 2bba95e331ad4..410f7658761fd 100644
 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
 +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideFragment.java
 @@ -122,9 +122,6 @@ public class PrivacyGuideFragment extends Fragment {
@@ -2118,7 +2072,6 @@ index 2bba95e331ad4..410f7658761fd 100644
  
      @Override
 diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
-index a852c5bcce6bf..01900603da718 100644
 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
 +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuidePagerAdapter.java
 @@ -56,8 +56,6 @@ public class PrivacyGuidePagerAdapter extends FragmentStateAdapter {
@@ -2131,7 +2084,6 @@ index a852c5bcce6bf..01900603da718 100644
                  return new CookiesFragment();
          }
 diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
-index 784a335cae5ac..9e12b760a41d8 100644
 --- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
 +++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/StepDisplayHandlerImpl.java
 @@ -19,7 +19,7 @@ class StepDisplayHandlerImpl implements StepDisplayHandler {
@@ -2144,7 +2096,6 @@ index 784a335cae5ac..9e12b760a41d8 100644
  
      @Override
 diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-index 7105c7ad1b4dc..45bcfb7b22996 100644
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 @@ -82,7 +82,6 @@
@@ -2174,7 +2125,6 @@ index 7105c7ad1b4dc..45bcfb7b22996 100644
    TemplateURLServiceFactory::GetInstance();
  #if !BUILDFLAG(IS_ANDROID)
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
-index 2b1fd89740659..69b189cb40d77 100644
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
 @@ -92,7 +92,6 @@
@@ -2203,7 +2153,6 @@ index 2b1fd89740659..69b189cb40d77 100644
        CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
                          profile_policy_connector_->policy_service(),
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
-index 1197ad7d00986..ac63fddb265b4 100644
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
 @@ -7,6 +7,7 @@ import("//components/safe_browsing/buildflags.gni")
@@ -2239,7 +2188,6 @@ index 1197ad7d00986..ac63fddb265b4 100644
        "//components/safe_browsing/core/browser:verdict_cache_manager",
        "//components/safe_browsing/core/browser/db:allowlist_checker_client",
 diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn
-index b32db42643bed..4b05c31d906f0 100644
 --- a/chrome/browser/safe_browsing/android/BUILD.gn
 +++ b/chrome/browser/safe_browsing/android/BUILD.gn
 @@ -36,12 +36,8 @@ source_set("android") {
@@ -2256,7 +2204,6 @@ index b32db42643bed..4b05c31d906f0 100644
    deps = [
      ":java_resources",
 diff --git a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
-index e65e03366a8bb..06494870e1e03 100644
 --- a/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
 +++ b/chrome/browser/safe_browsing/android/java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java
 @@ -14,87 +14,4 @@ import org.chromium.base.annotations.NativeMethods;
@@ -2348,7 +2295,6 @@ index e65e03366a8bb..06494870e1e03 100644
 -    }
  }
 diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc
-index a621de12e0328..e77bd28f9295a 100644
 --- a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc
 +++ b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc
 @@ -33,63 +33,4 @@ PrefService* GetPrefService() {
@@ -2416,7 +2362,6 @@ index a621de12e0328..e77bd28f9295a 100644
 -
  }  // namespace safe_browsing
 diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
-index 99cc8a136bc5d..0ff06be7a0a27 100644
 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
 +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
 @@ -799,11 +799,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) {
@@ -2434,7 +2379,6 @@ index 99cc8a136bc5d..0ff06be7a0a27 100644
  SafeBrowsingNavigationObserverManager*
  DownloadProtectionService::GetNavigationObserverManager(
 diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.h b/chrome/browser/safe_browsing/download_protection/download_protection_service.h
-index b12737cb2630b..5514df2917ea3 100644
 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.h
 +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.h
 @@ -25,7 +25,6 @@
@@ -2460,7 +2404,6 @@ index b12737cb2630b..5514df2917ea3 100644
    // Get the SafeBrowsingNavigationObserverManager for the given |web_contents|.
    SafeBrowsingNavigationObserverManager* GetNavigationObserverManager(
 diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
-index 771ff743ceb39..9777dd31c442c 100644
 --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
 +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
 @@ -56,6 +56,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory()
@@ -2482,7 +2425,6 @@ index 771ff743ceb39..9777dd31c442c 100644
  
  }  // namespace safe_browsing
 diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc
-index 8407d6240d4f2..48b63d0cee632 100644
 --- a/chrome/browser/ssl/sct_reporting_service_factory.cc
 +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
 @@ -7,7 +7,6 @@
@@ -2511,7 +2453,6 @@ index 8407d6240d4f2..48b63d0cee632 100644
  
  // Force this to be created during BrowserContext creation, since we can't
 diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
-index 60a2af2668cc8..1eedff8bf5c5e 100644
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
 @@ -16,7 +16,6 @@
@@ -2554,7 +2495,6 @@ index 60a2af2668cc8..1eedff8bf5c5e 100644
  }
  
 diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
-index 78868d49af3a3..90b4a65e016a3 100644
 --- a/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
 +++ b/chrome/browser/subresource_filter/chrome_content_subresource_filter_web_contents_helper_factory.cc
 @@ -18,10 +18,14 @@ namespace {
@@ -2573,7 +2513,6 @@ index 78868d49af3a3..90b4a65e016a3 100644
  
  }  // namespace
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
-index 847e3c7baf8f4..26f1ba6ca8e04 100644
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
 @@ -553,7 +553,6 @@ static_library("ui") {
@@ -2593,7 +2532,6 @@ index 847e3c7baf8f4..26f1ba6ca8e04 100644
        "views/download/download_in_progress_dialog_view.h",
        "views/download/download_item_view.cc",
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 05a9c512148e7..c5962561f9907 100644
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 @@ -411,12 +411,6 @@ CHAR_LIMIT guidelines:
@@ -2620,7 +2558,6 @@ index 05a9c512148e7..c5962561f9907 100644
         You can see sites you visit in Chrome and set timers for them.\n\nGoogle gets info about the sites you set timers for and how long you visit them. This info is used to make Digital Wellbeing better.
        </message>
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
-index bbaac11c22565..c993ce8c1003c 100644
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
 @@ -61,14 +61,18 @@
@@ -2671,7 +2608,6 @@ index bbaac11c22565..c993ce8c1003c 100644
    SecurityStateTabHelper::CreateForWebContents(web_contents);
    if (site_engagement::SiteEngagementService::IsEnabled()) {
 diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-index 8b4ffda57e737..e742b6241c337 100644
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 @@ -272,6 +272,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) {
@@ -2724,7 +2660,6 @@ index 8b4ffda57e737..e742b6241c337 100644
    } else if (path_without_query == "/supervised_user") {
      html = GetSupervisedUserInterstitialHTML(path);
 diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
-index 6e56a57f56f92..8b4be8e00788b 100644
 --- a/chrome/common/safe_browsing/BUILD.gn
 +++ b/chrome/common/safe_browsing/BUILD.gn
 @@ -21,7 +21,6 @@ if (safe_browsing_mode == 1) {
@@ -2763,7 +2698,6 @@ index 6e56a57f56f92..8b4be8e00788b 100644
      sources = [
        "ipc_protobuf_message_macros.h",
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index 9d935ebc3b4da..2f5818c9371ab 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
 @@ -289,11 +289,6 @@ static_library("renderer") {
@@ -2779,7 +2713,6 @@ index 9d935ebc3b4da..2f5818c9371ab 100644
      deps += [ "//components/feed/content/renderer:feed_renderer" ]
    }
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 2c7ca0d57ec44..d82d3bd0887dc 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -98,7 +98,9 @@
@@ -2806,7 +2739,6 @@ index 2c7ca0d57ec44..d82d3bd0887dc 100644
    blink::WebScriptController::RegisterExtension(
        extensions_v8::LoadTimesExtension::Get());
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index d209ade50507a..cef5cac255f90 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
 @@ -19,7 +19,6 @@
@@ -2827,7 +2759,6 @@ index d209ade50507a..cef5cac255f90 100644
    scoped_refptr<blink::ThreadSafeBrowserInterfaceBrokerProxy>
        browser_interface_broker_;
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1c660e23fbfbe..af383f26eb883 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -931,7 +931,6 @@ if (is_android) {
@@ -2855,7 +2786,6 @@ index 1c660e23fbfbe..af383f26eb883 100644
      "//components/safe_browsing/content/browser/password_protection:mock_password_protection",
      "//components/safe_browsing/content/browser/web_ui",
 diff --git a/components/BUILD.gn b/components/BUILD.gn
-index db434fecec7c3..6a8e40606b02a 100644
 --- a/components/BUILD.gn
 +++ b/components/BUILD.gn
 @@ -641,7 +641,6 @@ test("components_unittests") {
@@ -2867,7 +2797,6 @@ index db434fecec7c3..6a8e40606b02a 100644
    } else if (safe_browsing_mode == 2) {
      deps += [ "//components/safe_browsing/content/browser:unit_tests" ]
 diff --git a/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc b/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc
-index 503b2dca01742..15d5088615347 100644
 --- a/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc
 +++ b/components/autofill_assistant/browser/public/password_change/save_password_leak_detection_delegate.cc
 @@ -65,23 +65,9 @@ void SavePasswordLeakDetectionDelegate::StartLeakCheck(
@@ -2895,7 +2824,6 @@ index 503b2dca01742..15d5088615347 100644
  
  // Url, username and password parameters from the interface are not used.
 diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
-index b569497de0213..c3eeaaca06b2a 100644
 --- a/components/component_updater/installer_policies/BUILD.gn
 +++ b/components/component_updater/installer_policies/BUILD.gn
 @@ -20,8 +20,6 @@ static_library("installer_policies_no_content_deps") {
@@ -2908,7 +2836,6 @@ index b569497de0213..c3eeaaca06b2a 100644
      "trust_token_key_commitments_component_installer_policy.h",
      "url_param_classification_component_installer.cc",
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
-index 26e65ce82cfd8..b1acaf2c4d508 100644
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
 @@ -680,10 +680,7 @@ PermissionRequestManager::PermissionRequestManager(
@@ -2924,7 +2851,6 @@ index 26e65ce82cfd8..b1acaf2c4d508 100644
  void PermissionRequestManager::DequeueRequestIfNeeded() {
    // TODO(olesiamarukhno): Media requests block other media requests from
 diff --git a/components/safe_browsing/content/browser/BUILD.gn b/components/safe_browsing/content/browser/BUILD.gn
-index fcb83633e939c..217aad578dd6b 100644
 --- a/components/safe_browsing/content/browser/BUILD.gn
 +++ b/components/safe_browsing/content/browser/BUILD.gn
 @@ -141,7 +141,6 @@ source_set("unit_tests") {
@@ -2936,7 +2862,6 @@ index fcb83633e939c..217aad578dd6b 100644
      "//base/test:test_support",
      "//components/safe_browsing:buildflags",
 diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/components/safe_browsing/content/common/file_type_policies.cc
-index 7650759d91ddc..ea9a4785ee730 100644
 --- a/components/safe_browsing/content/common/file_type_policies.cc
 +++ b/components/safe_browsing/content/common/file_type_policies.cc
 @@ -87,8 +87,7 @@ FileTypePolicies::~FileTypePolicies() {
@@ -2950,7 +2875,6 @@ index 7650759d91ddc..ea9a4785ee730 100644
  
  void FileTypePolicies::RecordUpdateMetrics(UpdateResult result,
 diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
-index 6a6223be97619..d379883aaf7e0 100644
 --- a/components/safe_browsing/core/common/features.cc
 +++ b/components/safe_browsing/core/common/features.cc
 @@ -200,8 +200,8 @@ BASE_FEATURE(kSevenZipEvaluationEnabled,
@@ -2965,7 +2889,6 @@ index 6a6223be97619..d379883aaf7e0 100644
  BASE_FEATURE(kThreatDomDetailsTagAndAttributeFeature,
               "ThreatDomDetailsTagAttributes",
 diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc
-index 50520bc663d1e..0871d4d86fbcd 100644
 --- a/components/security_interstitials/content/captive_portal_blocking_page.cc
 +++ b/components/security_interstitials/content/captive_portal_blocking_page.cc
 @@ -15,6 +15,7 @@
@@ -3006,7 +2929,6 @@ index 50520bc663d1e..0871d4d86fbcd 100644
      case security_interstitials::CMD_OPEN_LOGIN:
        captive_portal::CaptivePortalMetrics::LogCaptivePortalBlockingPageEvent(
 diff --git a/components/security_interstitials/content/cert_report_helper.cc b/components/security_interstitials/content/cert_report_helper.cc
-index 5054f694d9fee..8cdfec4289260 100644
 --- a/components/security_interstitials/content/cert_report_helper.cc
 +++ b/components/security_interstitials/content/cert_report_helper.cc
 @@ -176,8 +176,6 @@ void CertReportHelper::FinishCertCollection() {
@@ -3019,7 +2941,6 @@ index 5054f694d9fee..8cdfec4289260 100644
  
  bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
 diff --git a/components/unified_consent/unified_consent_service.cc b/components/unified_consent/unified_consent_service.cc
-index 3fa374deabe1b..3a5eb71262f99 100644
 --- a/components/unified_consent/unified_consent_service.cc
 +++ b/components/unified_consent/unified_consent_service.cc
 @@ -57,7 +57,7 @@ void UnifiedConsentService::SetUrlKeyedAnonymizedDataCollectionEnabled(
@@ -3032,7 +2953,6 @@ index 3fa374deabe1b..3a5eb71262f99 100644
  
  void UnifiedConsentService::Shutdown() {
 diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.cc b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
-index 8dfdd33af753f..8cdaf1c23363e 100644
 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc
 +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
 @@ -44,7 +44,6 @@ FileSystemAccessFileWriterImpl::FileSystemAccessFileWriterImpl(
@@ -3053,7 +2973,6 @@ index 8dfdd33af753f..8cdaf1c23363e 100644
    // alive until the operation completes.
    FileSystemAccessSafeMoveHelper* raw_helper =
 diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.h b/content/browser/file_system_access/file_system_access_file_writer_impl.h
-index 2417dfd02e1d4..9684f0123dc25 100644
 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.h
 +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.h
 @@ -123,11 +123,6 @@ class CONTENT_EXPORT FileSystemAccessFileWriterImpl
@@ -3069,7 +2988,6 @@ index 2417dfd02e1d4..9684f0123dc25 100644
    // explicitly closed.
    bool auto_close_ GUARDED_BY_CONTEXT(sequence_checker_) = false;
 diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.cc b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
-index 3b81e728d63df..8d8fbe3701cb1 100644
 --- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
 +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
 @@ -150,8 +150,7 @@ FileSystemAccessSafeMoveHelper::FileSystemAccessSafeMoveHelper(
@@ -3117,7 +3035,6 @@ index 3b81e728d63df..8d8fbe3701cb1 100644
  void FileSystemAccessSafeMoveHelper::DidAfterWriteCheck(
      FileSystemAccessPermissionContext::AfterWriteCheckResult result) {
 diff --git a/content/browser/file_system_access/file_system_access_safe_move_helper.h b/content/browser/file_system_access/file_system_access_safe_move_helper.h
-index c86cd5ed00e61..d522f06868df3 100644
 --- a/content/browser/file_system_access/file_system_access_safe_move_helper.h
 +++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h
 @@ -55,9 +55,6 @@ class CONTENT_EXPORT FileSystemAccessSafeMoveHelper {
@@ -3150,7 +3067,6 @@ index c86cd5ed00e61..d522f06868df3 100644
        GUARDED_BY_CONTEXT(sequence_checker_);
  
 diff --git a/content/public/browser/file_system_access_permission_context.h b/content/public/browser/file_system_access_permission_context.h
-index 1fceadd63069a..3a72603f5b837 100644
 --- a/content/public/browser/file_system_access_permission_context.h
 +++ b/content/public/browser/file_system_access_permission_context.h
 @@ -112,12 +112,6 @@ class FileSystemAccessPermissionContext {
@@ -3167,7 +3083,6 @@ index 1fceadd63069a..3a72603f5b837 100644
    // Returns whether the give |origin| already allows read permission, or it is
    // possible to request one. This is used to block file dialogs from being
 diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
-index d4929edb80cba..586ad695e4faa 100644
 --- a/weblayer/BUILD.gn
 +++ b/weblayer/BUILD.gn
 @@ -477,11 +477,9 @@ source_set("weblayer_lib_base") {
@@ -3192,7 +3107,6 @@ index d4929edb80cba..586ad695e4faa 100644
        "browser/component_updater/registration.h",
        "browser/content_view_render_view.cc",
 diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn
-index b95fa0a0c99b2..7e4f3cea831ce 100644
 --- a/weblayer/test/BUILD.gn
 +++ b/weblayer/test/BUILD.gn
 @@ -251,7 +251,6 @@ test("weblayer_browsertests") {
@@ -3203,6 +3117,5 @@ index b95fa0a0c99b2..7e4f3cea831ce 100644
        "//components/safe_browsing/content/browser/web_ui",
        "//components/safe_browsing/content/common:interfaces",
        "//components/safe_browsing/core/browser:token_fetcher",
--- 
-2.30.2
-
+--
+2.25.1

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
-@@ -416,7 +416,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",
-@@ -1049,8 +1048,6 @@ robolectric_binary("chrome_junit_tests") {
-     "//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",
-@@ -1583,8 +1580,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
-@@ -944,7 +944,6 @@ chrome_java_sources = [
+@@ -947,7 +947,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
-@@ -3331,7 +3331,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

@@ -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
-@@ -190,6 +190,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -188,6 +188,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCCTBrandTransparency,
      &kCCTClientDataHeader,
      &kCCTIncognito,
@@ -50,31 +50,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kCCTIncognitoAvailableToThirdParty,
      &kCCTNewDownloadTab,
      &kCCTPackageNameRecording,
-@@ -605,6 +606,9 @@ const base::Feature kChromeSharingHubLaunchAdjacent{
- const base::Feature kChromeSurveyNextAndroid{"ChromeSurveyNextAndroid",
-                                              base::FEATURE_ENABLED_BY_DEFAULT};
+@@ -603,6 +604,9 @@ BASE_FEATURE(kCCTResizableAlwaysShowNavBarButtons,
  
+ BASE_FEATURE(kCCTResizableForFirstParties,
+              "CCTResizableForFirstParties",
 +const base::Feature kChromeSmartSelection{"ChromeSmartSelection",
 +                                          base::FEATURE_DISABLED_BY_DEFAULT};
 +
- const base::Feature kCommandLineOnNonRooted{"CommandLineOnNonRooted",
-                                             base::FEATURE_DISABLED_BY_DEFAULT};
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
+ BASE_FEATURE(kCCTResizableForThirdParties,
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -62,6 +62,7 @@ extern const base::Feature kCacheDeprecatedSystemLocationSetting;
- extern const base::Feature kChromeNewDownloadTab;
- extern const base::Feature kChromeShareLongScreenshot;
- extern const base::Feature kChromeShareScreenshot;
+@@ -62,6 +62,7 @@ BASE_DECLARE_FEATURE(kDontAutoHideBrowserControls);
+ BASE_DECLARE_FEATURE(kCacheDeprecatedSystemLocationSetting);
+ BASE_DECLARE_FEATURE(kChromeNewDownloadTab);
+ BASE_DECLARE_FEATURE(kChromeShareLongScreenshot);
 +extern const base::Feature kChromeSmartSelection;
- extern const base::Feature kChromeSharingHub;
- extern const base::Feature kChromeSharingHubLaunchAdjacent;
- extern const base::Feature kChromeSurveyNextAndroid;
+ 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 +85,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 +97,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
-@@ -2834,6 +2834,21 @@
+@@ -3045,6 +3045,21 @@
              ]
          }
      ],

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

@@ -4,24 +4,28 @@ 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
-@@ -896,12 +896,12 @@ 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
  
  // 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
  
  // Delays RenderProcessHost shutdown by a few seconds to allow the subframe's
  // process to be potentially reused. This aims to reduce process churn in

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

@@ -22,7 +22,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
-@@ -6080,6 +6080,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6275,6 +6275,11 @@ const FeatureEntry kFeatureEntries[] = {
           "")},
  #endif
  
@@ -37,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
-@@ -2699,6 +2699,11 @@
-     "owners": [ "alionadangla", "bwwilliams", "bling-flags@google.com"],
-     "expiry_milestone": 105
+@@ -2701,6 +2701,11 @@
+     "owners": [ "robsc", "napper", "alanlxl" ],
+     "expiry_milestone": 130
    },
 +  {
 +    "name": "enable-text-fragment-anchor",
@@ -47,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
-@@ -1387,6 +1387,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
-@@ -767,6 +767,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
@@ -94,40 +94,40 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 @@ -270,6 +270,7 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
       features::kSharedArrayBufferOnDesktop},
      {wf::EnableSharedAutofill, autofill::features::kAutofillSharedAutofill},
-     {wf::EnableSubresourceWebBundles, features::kSubresourceWebBundles},
-+    {wf::EnableTextFragmentIdentifiers, blink::features::kTextFragmentAnchor},
      {wf::EnableTouchDragAndContextMenu, features::kTouchDragAndContextMenu},
++    {wf::EnableTextFragmentIdentifiers, blink::features::kTextFragmentAnchor},
      {wf::EnableUserActivationSameOriginVisibility,
       features::kUserActivationSameOriginVisibility},
+     {wf::EnableVideoPlaybackQuality, features::kVideoPlaybackQuality},
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -449,6 +449,10 @@ const base::Feature kStopInBackground {
- const base::Feature kDropInputEventsBeforeFirstPaint{
-     "DropInputEventsBeforeFirstPaint", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -496,6 +496,10 @@ 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_DISABLED_BY_DEFAULT};
 +
  // File handling icons. https://crbug.com/1218213
- const base::Feature kFileHandlingIcons{"FileHandlingIcons",
-                                        base::FEATURE_DISABLED_BY_DEFAULT};
+ 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 extern const base::Feature kResourceLoadViaDataPipe;
- BLINK_COMMON_EXPORT extern const base::Feature kServiceWorkerUpdateDelay;
- BLINK_COMMON_EXPORT extern const base::Feature kStopInBackground;
- BLINK_COMMON_EXPORT extern const base::Feature kDropInputEventsBeforeFirstPaint;
+@@ -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 extern const base::Feature kTextFragmentAnchor;
- BLINK_COMMON_EXPORT extern const base::Feature kFileHandlingIcons;
- BLINK_COMMON_EXPORT extern const base::Feature kAllowSyncXHRInPageDismissal;
- BLINK_COMMON_EXPORT extern const base::Feature kPrefetchPrivacyChanges;
+ 
+ BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAudioWorkletThreadRealtimePriority);
+ 
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4257,9 +4257,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());
  
@@ -145,7 +145,7 @@ 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
-@@ -2545,10 +2545,9 @@
+@@ -2583,10 +2583,9 @@
      },
      {
        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
-@@ -7323,7 +7323,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
-@@ -474,10 +474,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;
-@@ -510,12 +506,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) {
-@@ -562,11 +552,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(),
-@@ -584,7 +569,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
-@@ -163,13 +163,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;
  }
  
-@@ -182,18 +175,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;
  }
  
-@@ -2580,10 +2567,6 @@ void DocumentLoader::CreateParserPostCommit() {
+@@ -2663,10 +2650,6 @@ void DocumentLoader::CreateParserPostCommit() {
            OriginTrialFeature::kTouchEventFeatureDetection);
      }
  

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
@@ -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
-@@ -64,7 +64,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"
-@@ -4479,16 +4478,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),
-@@ -4573,10 +4562,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
-@@ -1295,8 +1295,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/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
-@@ -3293,6 +3293,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

@@ -9,22 +9,22 @@ 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 +++---
+ 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, 31 insertions(+), 14 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
-@@ -8848,6 +8848,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9060,6 +9060,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebMidiDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWebMidi)},
  #if BUILDFLAG(IS_ANDROID)
@@ -39,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
-@@ -6652,6 +6652,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)
@@ -65,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
-@@ -3848,6 +3848,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)
@@ -114,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
-@@ -838,9 +838,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)
@@ -138,20 +140,21 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_
    if (g_hsts_source == nullptr)
      return false;
  #endif
-@@ -382,12 +383,12 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
- }  // namespace
+@@ -382,13 +383,13 @@ bool DecodeHSTSPreload(const std::string& search_hostname, PreloadResult* out) {
  
  // static
--const base::Feature TransportSecurityState::kDynamicExpectCTFeature{
--    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature TransportSecurityState::kDynamicExpectCTFeature{   // must stay disabled
-+    "DynamicExpectCT", base::FEATURE_DISABLED_BY_DEFAULT};             // 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};
-+const base::Feature TransportSecurityState::kCertificateTransparencyEnforcement{   // must stay enabled
-+    "CertificateTransparencyEnforcement", base::FEATURE_ENABLED_BY_DEFAULT};       // 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) {
@@ -171,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
-@@ -2662,7 +2662,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().
  
@@ -183,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
-@@ -114,6 +114,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
+@@ -113,6 +113,7 @@ void SCTAuditingHandler::MaybeEnqueueReport(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }
@@ -191,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
-@@ -329,6 +330,7 @@ void SCTAuditingHandler::AddReporter(
+@@ -327,6 +328,7 @@ void SCTAuditingHandler::AddReporter(
    if (mode_ == mojom::SCTAuditingMode::kDisabled) {
      return;
    }

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

@@ -10,16 +10,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -116,8 +116,8 @@ const base::Feature kDisableTLSResumption{"DisableTLSResumption",
- const base::Feature kLogTLSResumption{"LogTLSResumption",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -70,8 +70,8 @@ BASE_FEATURE(kEnableTLS13EarlyData,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
--const base::Feature kEncryptedClientHello{"EncryptedClientHello",
--                                          base::FEATURE_DISABLED_BY_DEFAULT};
-+const base::Feature kEncryptedClientHello{"EncryptedClientHello",               // enabled by default
-+                                          base::FEATURE_ENABLED_BY_DEFAULT};    // in Bromite
+ BASE_FEATURE(kEncryptedClientHello,
+-             "EncryptedClientHello",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "EncryptedClientHello",                 // enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);      // in Bromite
  
- const base::Feature kIsCleartextPermitted{"IsCleartextPermitted",
-                                       base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kNetworkQualityEstimator,
+              "NetworkQualityEstimator",
 --
 2.25.1

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

@@ -12,14 +12,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -270,8 +270,8 @@ 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_ENABLED_BY_DEFAULT};
-+const base::Feature kPlatformHEVCDecoderSupport{                       // must be enabled
-+    "PlatformHEVCDecoderSupport", base::FEATURE_ENABLED_BY_DEFAULT};   // in Bromite
+ 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

@@ -10,14 +10,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -36,7 +36,7 @@ const base::Feature kExternalNavigationDebugLogs{
+@@ -43,7 +43,7 @@ BASE_FEATURE(kExternalNavigationDebugLogs,
  
  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};
+ static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
+   return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
 --
 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
-@@ -889,11 +889,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",                  // disable 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
-@@ -4445,9 +4445,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
-@@ -1415,7 +1415,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);
  }
-@@ -1429,7 +1429,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
-@@ -1000,7 +1000,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
-@@ -1225,9 +1225,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-native-Android-autofill.patch

@@ -55,14 +55,14 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -461,6 +461,7 @@ android_library("chrome_java") {
-     "//components/autofill_assistant/android:public_dependencies_java",
-     "//components/autofill_assistant/android:public_java",
-     "//components/autofill_assistant/browser:proto_java",
+@@ -461,6 +461,7 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/ui/android/layouts:java",
+       "//chrome/browser/ui/android/layouts/glue:java",
+       "//chrome/browser/ui/android/layouts/third_party/float_property:java",
 +    "//components/android_autofill/browser:java",
-     "//components/background_task_scheduler:background_task_scheduler_java",
-     "//components/background_task_scheduler:background_task_scheduler_task_ids_java",
-     "//components/bookmarks/common/android:bookmarks_java",
+       "//chrome/browser/ui/android/logo:java",
+       "//chrome/browser/ui/android/management:java",
+       "//chrome/browser/ui/android/multiwindow:java",
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -286,9 +286,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
-@@ -32,6 +32,10 @@ import org.chromium.ui.dragdrop.DragAndDropBrowserDelegate;
- import org.chromium.ui.dragdrop.DragStateTracker;
- import org.chromium.ui.dragdrop.DropDataContentProvider;
+@@ -32,6 +32,10 @@ import org.chromium.ui.dragdrop.DragStateTracker;
+ import org.chromium.ui.dragdrop.DropDataProviderImpl;
+ import org.chromium.ui.dragdrop.DropDataProviderUtils;
  
 +import android.util.SparseArray;
 +import android.view.autofill.AutofillValue;
@@ -297,7 +297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
  /**
   * Implementation of the abstract class {@link ViewAndroidDelegate} for Chrome.
   */
-@@ -214,4 +218,14 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate {
+@@ -216,4 +220,14 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate {
              return intent;
          }
      }
@@ -315,7 +315,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2478,6 +2478,13 @@ static_library("browser") {
+@@ -2494,6 +2494,13 @@ static_library("browser") {
      deps += [ "//chrome/browser/error_reporting" ]
    }
  
@@ -410,7 +410,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -172,6 +172,9 @@
+@@ -168,6 +168,9 @@
  #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h"
  #include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h"
  #include "content/public/common/content_features.h"
@@ -420,7 +420,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
  #else
  #include "chrome/browser/accuracy_tips/accuracy_service_factory.h"
  #include "chrome/browser/banners/app_banner_manager_desktop.h"
-@@ -334,7 +337,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -330,7 +333,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
        base::BindRepeating(
            &autofill::BrowserDriverInitHook,
            autofill::ChromeAutofillClient::FromWebContents(web_contents),
@@ -668,7 +668,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
 diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
 --- a/components/autofill/content/renderer/password_autofill_agent.cc
 +++ b/components/autofill/content/renderer/password_autofill_agent.cc
-@@ -793,7 +793,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
+@@ -799,7 +799,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
  
  void PasswordAutofillAgent::TrackAutofilledElement(
      const blink::WebFormControlElement& element) {

build/patches/Enable-network-isolation-features.patch

@@ -9,53 +9,64 @@ PartitionNelAndReportingByNetworkIsolationKey
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- net/base/features.cc | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
+ net/base/features.cc | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -120,14 +120,14 @@ const base::Feature kSplitCacheByIncludeCredentials{
-     "SplitCacheByIncludeCredentials", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -82,36 +82,36 @@ BASE_FEATURE(kSplitCacheByIncludeCredentials,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
- const base::Feature kSplitCacheByNetworkIsolationKey{
--    "SplitCacheByNetworkIsolationKey", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "SplitCacheByNetworkIsolationKey", base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kSplitCacheByNetworkIsolationKey,
+-             "SplitCacheByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "SplitCacheByNetworkIsolationKey",            // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);            // in Bromite
  
- const base::Feature kSplitHostCacheByNetworkIsolationKey{
--    "SplitHostCacheByNetworkIsolationKey", base::FEATURE_DISABLED_BY_DEFAULT};
-+    "SplitHostCacheByNetworkIsolationKey", base::FEATURE_ENABLED_BY_DEFAULT};
+-BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey,
+-             "SplitHostCacheByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++BASE_FEATURE(kSplitHostCacheByNetworkIsolationKey,         // must be enabled
++             "SplitHostCacheByNetworkIsolationKey",        // in Bromite
++             base::FEATURE_ENABLED_BY_DEFAULT);
  
- const base::Feature kPartitionConnectionsByNetworkIsolationKey{
-     "PartitionConnectionsByNetworkIsolationKey",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPartitionConnectionsByNetworkIsolationKey,
+-             "PartitionConnectionsByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PartitionConnectionsByNetworkIsolationKey",  // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);            // in Bromite
  
- const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{
-     "ForceIsolationInfoFrameOriginToTopLevelFrame",
-@@ -135,19 +135,19 @@ const base::Feature kForceIsolationInfoFrameOriginToTopLevelFrame{
+ BASE_FEATURE(kForceIsolationInfoFrameOriginToTopLevelFrame,
+              "ForceIsolationInfoFrameOriginToTopLevelFrame",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
- const base::Feature kPartitionHttpServerPropertiesByNetworkIsolationKey{
-     "PartitionHttpServerPropertiesByNetworkIsolationKey",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+-BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey,
+-             "PartitionHttpServerPropertiesByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++BASE_FEATURE(kPartitionHttpServerPropertiesByNetworkIsolationKey,     // must be enabled
++             "PartitionHttpServerPropertiesByNetworkIsolationKey",    // in Bromite
++             base::FEATURE_ENABLED_BY_DEFAULT);
  
- const base::Feature kPartitionSSLSessionsByNetworkIsolationKey{
-     "PartitionSSLSessionsByNetworkIsolationKey",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPartitionSSLSessionsByNetworkIsolationKey,
+-             "PartitionSSLSessionsByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PartitionSSLSessionsByNetworkIsolationKey",             // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
- const base::Feature kPartitionExpectCTStateByNetworkIsolationKey{
-     "PartitionExpectCTStateByNetworkIsolationKey",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPartitionExpectCTStateByNetworkIsolationKey,
+-             "PartitionExpectCTStateByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PartitionExpectCTStateByNetworkIsolationKey",           // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
- const base::Feature kPartitionNelAndReportingByNetworkIsolationKey{
-     "PartitionNelAndReportingByNetworkIsolationKey",
--    base::FEATURE_DISABLED_BY_DEFAULT};
-+    base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPartitionNelAndReportingByNetworkIsolationKey,
+-             "PartitionNelAndReportingByNetworkIsolationKey",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PartitionNelAndReportingByNetworkIsolationKey",         // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);                       // in Bromite
  
- const base::Feature kEnableDoubleKeyNetworkAnonymizationKey{
-     "EnableDoubleKeyNetworkAnonymizationKey",
+ BASE_FEATURE(kEnableDoubleKeyNetworkAnonymizationKey,
+              "EnableDoubleKeyNetworkAnonymizationKey",
 --
 2.25.1

build/patches/Enable-prefetch-privacy-changes-by-default.patch

@@ -4,18 +4,20 @@ Subject: Enable prefetch-privacy-changes by default
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- third_party/blink/common/features.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ third_party/blink/common/features.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 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
-@@ -460,7 +460,7 @@ const base::Feature kAllowSyncXHRInPageDismissal{
+@@ -509,8 +509,8 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissal,
  // Prefetch request properties are updated to be privacy-preserving. See
  // crbug.com/988956.
- const base::Feature kPrefetchPrivacyChanges{"PrefetchPrivacyChanges",
--                                            base::FEATURE_DISABLED_BY_DEFAULT};
-+                                            base::FEATURE_ENABLED_BY_DEFAULT};
+ BASE_FEATURE(kPrefetchPrivacyChanges,
+-             "PrefetchPrivacyChanges",
+-             base::FEATURE_DISABLED_BY_DEFAULT);
++             "PrefetchPrivacyChanges",            // must be enabled
++             base::FEATURE_ENABLED_BY_DEFAULT);   // in Bromite
  
  // Decodes jpeg 4:2:0 formatted images to YUV instead of RGBX and stores in this
  // format in the image decode cache. See crbug.com/919627 for details on the

build/patches/Enable-share-intent.patch

@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -592,6 +592,7 @@ chrome_java_resources = [
+@@ -590,6 +590,7 @@ chrome_java_resources = [
    "java/res/layout/signin_activity.xml",
    "java/res/layout/status_indicator_container.xml",
    "java/res/layout/suggestions_tile_view_condensed.xml",
@@ -41,7 +41,7 @@ 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
-@@ -966,6 +966,7 @@ chrome_java_sources = [
+@@ -972,6 +972,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
    "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
    "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 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
-@@ -741,6 +741,24 @@ by a child template that "extends" this file.
+@@ -753,6 +753,24 @@ by a child template that "extends" this file.
              android:process=":browser_restart_process">
          </activity>
  
@@ -311,7 +311,7 @@ new file mode 100644
 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
-@@ -6572,6 +6572,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6783,6 +6783,10 @@ const FeatureEntry kFeatureEntries[] = {
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
  #if BUILDFLAG(IS_ANDROID)
@@ -325,7 +325,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
-@@ -2661,6 +2661,11 @@ const char kIsolateOriginsDescription[] =
+@@ -2783,6 +2783,11 @@ const char kIsolateOriginsDescription[] =
      "Requires dedicated processes for an additional set of origins, "
      "specified as a comma-separated list.";
  
@@ -340,7 +340,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
-@@ -1504,6 +1504,9 @@ extern const char kIsolateOriginsDescription[];
+@@ -1576,6 +1576,9 @@ extern const char kIsolateOriginsDescription[];
  
  extern const char kIsolationByDefaultName[];
  extern const char kIsolationByDefaultDescription[];
@@ -353,7 +353,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
-@@ -273,6 +273,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -272,6 +272,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kRelatedSearchesAlternateUx,
      &kRelatedSearchesInBar,
      &kRelatedSearchesSimplifiedUx,
@@ -361,31 +361,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
      &kRelatedSearchesUi,
      &kRequestDesktopSiteDefaults,
      &kRequestDesktopSiteDefaultsControl,
-@@ -724,6 +725,9 @@ const base::Feature kNewInstanceFromDraggedLink{
- const base::Feature kNewTabPageTilesTitleWrapAround{
-     "NewTabPageTilesTitleWrapAround", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -727,6 +728,9 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
  
+ BASE_FEATURE(kDownloadHomeForExternalApp,
+              "DownloadHomeForExternalApp",
 +const base::Feature kSharedIntentUI{
 +    "SharedIntentUI", base::FEATURE_ENABLED_BY_DEFAULT};
 +
- const base::Feature kNewWindowAppMenu{"NewWindowAppMenu",
-                                       base::FEATURE_ENABLED_BY_DEFAULT};
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
+ BASE_FEATURE(kDownloadFileProvider,
 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
-@@ -139,6 +139,7 @@ extern const base::Feature kRequestDesktopSiteDefaultsDowngrade;
- extern const base::Feature kSearchEnginePromoExistingDevice;
- extern const base::Feature kSearchEnginePromoExistingDeviceV2;
- extern const base::Feature kSearchEnginePromoNewDevice;
+@@ -140,6 +140,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2);
+ BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice);
+ BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2);
+ BASE_DECLARE_FEATURE(kShareButtonInTopToolbar);
 +extern const base::Feature kSharedIntentUI;
  extern const base::Feature kSearchReadyOmniboxFeature;
- extern const base::Feature kSearchEnginePromoNewDeviceV2;
- extern const base::Feature kShareButtonInTopToolbar;
+ BASE_DECLARE_FEATURE(kSharingHubLinkToggle);
+ BASE_DECLARE_FEATURE(kShowScrollableMVTOnNTPAndroid);
 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
-@@ -506,6 +506,7 @@ public abstract class ChromeFeatureList {
+@@ -509,6 +509,7 @@ public abstract class ChromeFeatureList {
      public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts";
      public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler";
      public static final String READ_LATER = "ReadLater";
@@ -396,7 +396,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
-@@ -4864,6 +4864,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -4834,6 +4834,19 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Copied to your clipboard
        </message>
  

build/patches/Experimental-user-scripts-support.patch

@@ -27,7 +27,7 @@ Requires patch: Adds-support-for-writing-URIs.patch
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/BUILD.gn                       |   5 +
+ chrome/android/BUILD.gn                       |   4 +
  .../android/java/res/xml/main_preferences.xml |   5 +
  .../browser/download/DownloadUtils.java       |   6 +
  .../init/ProcessInitializationHandler.java    |   3 +
@@ -136,7 +136,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../renderer/web_ui_injection_host.h          |  27 +
  .../strings/userscripts_strings.grdp          |  54 ++
  tools/gritsettings/resource_ids.spec          |   6 +
- 109 files changed, 9450 insertions(+), 2 deletions(-)
+ 109 files changed, 9449 insertions(+), 2 deletions(-)
  create mode 100644 components/user_scripts/README.md
  create mode 100755 components/user_scripts/android/BUILD.gn
  create mode 100644 components/user_scripts/android/java/res/layout/accept_script_item.xml
@@ -226,25 +226,24 @@ 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
-@@ -276,6 +276,10 @@ android_resources("chrome_app_java_resources") {
-     "//third_party/androidx:androidx_gridlayout_gridlayout_java",
-     "//third_party/androidx:androidx_preference_preference_java",
-   ]
-+
-+  # this need to be into android_resources("chrome_app_java_resources") section because
-+  # android:java_resources are packed *_percent.pak and placed in the executable folder
-+  deps += [ "//components/user_scripts/android:java_resources" ]
- }
+@@ -303,6 +303,9 @@ if (current_toolchain == default_toolchain) {
+       "//third_party/androidx:androidx_gridlayout_gridlayout_java",
+       "//third_party/androidx:androidx_preference_preference_java",
+     ]
++    # this need to be into android_resources("chrome_app_java_resources") section because
++    # android:java_resources are packed *_percent.pak and placed in the executable folder
++    deps += [ "//components/user_scripts/android:java_resources" ]
+   }
  
- if (enable_vr) {
-@@ -581,6 +585,7 @@ android_library("chrome_java") {
-     "//components/ukm/android:java",
-     "//components/url_formatter/android:url_formatter_java",
-     "//components/user_prefs/android:java",
-+    "//components/user_scripts/android:java",
-     "//components/variations:variations_java",
-     "//components/variations/android:variations_java",
-     "//components/version_info/android:version_constants_java",
+   if (enable_vr) {
+@@ -607,6 +610,7 @@ if (current_toolchain == default_toolchain) {
+       "//components/ukm/android:java",
+       "//components/url_formatter/android:url_formatter_java",
+       "//components/user_prefs/android:java",
++      "//components/user_scripts/android:java",
+       "//components/variations:variations_java",
+       "//components/variations/android:variations_java",
+       "//components/version_info/android:version_constants_java",
 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
@@ -323,7 +322,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3488,6 +3488,11 @@ static_library("browser") {
+@@ -3503,6 +3503,11 @@ static_library("browser") {
        ]
        deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
      }
@@ -338,7 +337,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
-@@ -155,6 +155,7 @@
+@@ -156,6 +156,7 @@
  #include "components/translate/core/browser/translate_ranker_impl.h"
  #include "components/translate/core/common/translate_util.h"
  #include "components/ui_devtools/switches.h"
@@ -346,7 +345,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #include "components/version_info/version_info.h"
  #include "components/viz/common/features.h"
  #include "components/viz/common/switches.h"
-@@ -7534,6 +7535,10 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7749,6 +7750,10 @@ const FeatureEntry kFeatureEntries[] = {
           chromeos::features::kClipboardHistoryNudgeSessionReset)},
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -360,7 +359,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
-@@ -5049,7 +5049,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
+@@ -5085,7 +5085,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
    chrome::mojom::DynamicParams dynamic_params = {
        profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
        profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
@@ -373,7 +372,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 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
-@@ -6475,6 +6475,11 @@ const char kFollowingFeedSidepanelDescription[] =
+@@ -6697,6 +6697,11 @@ const char kFollowingFeedSidepanelDescription[] =
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS)
  
@@ -388,7 +387,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
-@@ -3717,6 +3717,9 @@ extern const char kQuickCommandsDescription[];
+@@ -3838,6 +3838,9 @@ extern const char kQuickCommandsDescription[];
  #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
          // defined (OS_FUCHSIA)
  
@@ -401,7 +400,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
 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
-@@ -246,6 +246,7 @@
+@@ -251,6 +251,7 @@
  #include "components/ntp_tiles/popular_sites_impl.h"
  #include "components/permissions/contexts/geolocation_permission_context_android.h"
  #include "components/query_tiles/tile_service_prefs.h"
@@ -409,7 +408,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #else  // BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/cart/cart_service.h"
  #include "chrome/browser/device_api/device_service_impl.h"
-@@ -1350,6 +1351,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1323,6 +1324,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    translate::TranslatePrefs::RegisterProfilePrefs(registry);
    omnibox::RegisterProfilePrefs(registry);
    ZeroSuggestProvider::RegisterProfilePrefs(registry);
@@ -431,7 +430,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
 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
-@@ -260,6 +260,8 @@
+@@ -261,6 +261,8 @@
  #include "chrome/browser/enterprise/idle/idle_service_factory.h"
  #endif
  
@@ -440,7 +439,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
  namespace chrome {
  
  void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
-@@ -618,6 +620,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -620,6 +622,7 @@ void ChromeBrowserMainExtraPartsProfiles::
  #endif
    WebDataServiceFactory::GetInstance();
    webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
@@ -451,7 +450,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -115,6 +115,8 @@
+@@ -116,6 +116,8 @@
  #include "extensions/common/manifest.h"
  #endif
  
@@ -460,7 +459,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  #if BUILDFLAG(ENABLE_SESSION_SERVICE)
  #include "chrome/browser/sessions/app_session_service_factory.h"
  #include "chrome/browser/sessions/session_service_factory.h"
-@@ -1696,6 +1698,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
+@@ -1705,6 +1707,13 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
  #endif
  
  #endif
@@ -527,7 +526,7 @@ diff --git a/chrome/browser/profiles/renderer_updater.h b/chrome/browser/profile
 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
-@@ -92,6 +92,7 @@
+@@ -94,6 +94,7 @@
  #include "components/security_interstitials/content/urls.h"
  #include "components/signin/public/base/signin_buildflags.h"
  #include "components/site_engagement/content/site_engagement_service.h"
@@ -535,7 +534,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
  #include "content/public/browser/web_contents.h"
  #include "content/public/browser/web_ui.h"
  #include "content/public/common/content_client.h"
-@@ -821,6 +822,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
+@@ -834,6 +835,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
      return &NewWebUI<UserActionsUI>;
    if (url.host_piece() == chrome::kChromeUIVersionHost)
      return &NewWebUI<VersionUI>;
@@ -555,7 +554,7 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
        "$root_gen_dir/ui/resources/webui_generated_resources.pak",
      ]
      deps = [
-@@ -128,6 +129,7 @@ template("chrome_extra_paks") {
+@@ -129,6 +130,7 @@ template("chrome_extra_paks") {
        "//third_party/blink/public:devtools_inspector_resources",
        "//third_party/blink/public:resources",
        "//ui/resources",
@@ -611,7 +610,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  #if BUILDFLAG(ENABLE_SPELLCHECK)
    if (!spellcheck_)
      InitSpellCheck();
-@@ -576,6 +585,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -587,6 +596,13 @@ void ChromeContentRendererClient::RenderFrameCreated(
        render_frame, registry);
  #endif
  
@@ -625,7 +624,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  #if BUILDFLAG(ENABLE_PPAPI)
    new PepperHelper(render_frame);
  #endif
-@@ -1545,7 +1561,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
+@@ -1556,7 +1572,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentStart(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentStart(
        render_frame);
    // |render_frame| might be dead by now.
@@ -640,7 +639,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  }
  
  void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
-@@ -1554,7 +1577,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
+@@ -1565,7 +1588,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentEnd(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentEnd(
        render_frame);
    // |render_frame| might be dead by now.
@@ -655,7 +654,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  }
  
  void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
-@@ -1563,7 +1593,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
+@@ -1574,7 +1604,14 @@ void ChromeContentRendererClient::RunScriptsAtDocumentIdle(
    ChromeExtensionsRendererClient::GetInstance()->RunScriptsAtDocumentIdle(
        render_frame);
    // |render_frame| might be dead by now.
@@ -673,7 +672,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
 diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc
 --- a/chrome/renderer/chrome_render_thread_observer.cc
 +++ b/chrome/renderer/chrome_render_thread_observer.cc
-@@ -55,6 +55,8 @@
+@@ -57,6 +57,8 @@
  #include "third_party/blink/public/web/web_security_policy.h"
  #include "third_party/blink/public/web/web_view.h"
  
@@ -682,7 +681,7 @@ diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/
  #if BUILDFLAG(ENABLE_EXTENSIONS)
  #include "extensions/renderer/localization_peer.h"
  #endif
-@@ -253,6 +255,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration(
+@@ -259,6 +261,7 @@ void ChromeRenderThreadObserver::SetInitialConfiguration(
  void ChromeRenderThreadObserver::SetConfiguration(
      chrome::mojom::DynamicParamsPtr params) {
    *GetDynamicConfigParams() = std::move(*params);
@@ -2608,10 +2607,9 @@ new file mode 100644
 +js_library("view_script_source") {
 +  deps = [
 +    "//ui/webui/resources/js:cr.m",
-+    "//ui/webui/resources/js:util.m",
++    "//ui/webui/resources/js:util",
 +  ]
 +}
-\ No newline at end of file
 diff --git a/components/user_scripts/browser/resources/user-script-ui/user-scripts-ui.html b/components/user_scripts/browser/resources/user-script-ui/user-scripts-ui.html
 new file mode 100644
 --- /dev/null
@@ -2621,7 +2619,7 @@ new file mode 100644
 +<html lang="en">
 +<head>
 +  <meta charset="utf-8">
-+  <title>Local State Debug Page</title>
++  <title>Userscript View Source</title>
 +  <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
 +  <script type="module" src="user-scripts-ui.js"></script>
 +</head>
@@ -2631,14 +2629,13 @@ new file mode 100644
 +  </pre>
 +</body>
 +</html>
-\ No newline at end of file
 diff --git a/components/user_scripts/browser/resources/user-script-ui/user-scripts-ui.js b/components/user_scripts/browser/resources/user-script-ui/user-scripts-ui.js
 new file mode 100644
 --- /dev/null
 +++ b/components/user_scripts/browser/resources/user-script-ui/user-scripts-ui.js
 @@ -0,0 +1,9 @@
 +import {sendWithPromise} from 'chrome://resources/js/cr.m.js';
-+import {$} from 'chrome://resources/js/util.m.js';
++import {$} from 'chrome://resources/js/util.js';
 +
 +document.addEventListener('DOMContentLoaded', function() {
 +  const urlParams = new URLSearchParams(window.location.search);
@@ -2646,7 +2643,6 @@ new file mode 100644
 +    $('content').textContent = textContent[0].content;
 +  });
 +});
-\ No newline at end of file
 diff --git a/components/user_scripts/browser/ui/user_scripts_ui.cc b/components/user_scripts/browser/ui/user_scripts_ui.cc
 new file mode 100644
 --- /dev/null
@@ -5072,19 +5068,19 @@ new file mode 100755
 +      // Not IPv6 (either IPv4 or just a normal address).
 +      port_separator_pos = host_and_port.find(':');
 +    } else {  // IPv6.
-+      size_t host_end_pos = host_and_port.find(']');
-+      if (host_end_pos == base::StringPiece::npos)
++      size_t ipv6_host_end_pos = host_and_port.find(']');
++      if (ipv6_host_end_pos == base::StringPiece::npos)
 +        return ParseResult::kInvalidHost;
-+      if (host_end_pos == 1)
++      if (ipv6_host_end_pos == 1)
 +        return ParseResult::kEmptyHost;
 +
-+      if (host_end_pos < host_and_port.length() - 1) {
++      if (ipv6_host_end_pos < host_and_port.length() - 1) {
 +        // The host isn't the only component. Check for a port. This would
 +        // require a ':' to follow the closing ']' from the host.
-+        if (host_and_port[host_end_pos + 1] != ':')
++        if (host_and_port[ipv6_host_end_pos + 1] != ':')
 +          return ParseResult::kInvalidHost;
 +
-+        port_separator_pos = host_end_pos + 1;
++        port_separator_pos = ipv6_host_end_pos + 1;
 +      }
 +    }
 +
@@ -10471,7 +10467,7 @@ new file mode 100755
 diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
 --- a/tools/gritsettings/resource_ids.spec
 +++ b/tools/gritsettings/resource_ids.spec
-@@ -732,6 +732,12 @@
+@@ -738,6 +738,12 @@
    "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{
      "includes": [3720]
    },

build/patches/Guard-for-user-agent-reduction.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/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -1205,8 +1205,8 @@ const base::Feature kWindowPlacementFullscreenCompanionWindow{
+@@ -1311,8 +1311,8 @@ BASE_FEATURE(kWindowPlacementFullscreenCompanionWindow,
  const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
      &kReduceUserAgentMinorVersion, "build_version", "0"};
  

build/patches/History-number-of-days-privacy-setting.patch

@@ -162,7 +162,7 @@ diff --git a/chrome/browser/history/history_service_factory.cc b/chrome/browser/
 diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
-@@ -45,6 +45,7 @@ java_cpp_strings("java_pref_names_srcjar") {
+@@ -46,6 +46,7 @@ java_cpp_strings("java_pref_names_srcjar") {
      "//components/safe_browsing/core/common/safe_browsing_prefs.cc",
      "//components/signin/public/base/signin_pref_names.cc",
      "//components/translate/core/browser/translate_pref_names.cc",
@@ -173,7 +173,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 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
-@@ -373,6 +373,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
+@@ -365,6 +365,7 @@ std::unique_ptr<Profile> Profile::CreateProfile(const base::FilePath& path,
  void ProfileImpl::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
@@ -356,7 +356,7 @@ diff --git a/components/history/core/browser/expire_history_backend.h b/componen
 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
-@@ -156,7 +156,7 @@ const int kMaxRedirectCount = 32;
+@@ -158,7 +158,7 @@ const int kMaxRedirectCount = 32;
  
  // The number of days old a history entry can be before it is considered "old"
  // and is deleted.
@@ -365,7 +365,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
  
  // The maximum number of days for which domain visit metrics are computed
  // each time HistoryBackend::GetDomainDiversity() is called.
-@@ -1088,6 +1088,19 @@ void HistoryBackend::InitImpl(
+@@ -1090,6 +1090,19 @@ void HistoryBackend::InitImpl(
    LOCAL_HISTOGRAM_TIMES("History.InitTime", TimeTicks::Now() - beginning_time);
  }
  
@@ -410,7 +410,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
  #include "components/history/core/browser/download_row.h"
  #include "components/history/core/browser/history_backend.h"
  #include "components/history/core/browser/history_backend_client.h"
-@@ -1105,6 +1108,9 @@ void HistoryService::Cleanup() {
+@@ -1126,6 +1129,9 @@ void HistoryService::Cleanup() {
      return;
    }
  
@@ -420,7 +420,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
    NotifyHistoryServiceBeingDeleted();
  
    weak_ptr_factory_.InvalidateWeakPtrs();
-@@ -1169,6 +1175,33 @@ bool HistoryService::Init(
+@@ -1190,6 +1196,33 @@ bool HistoryService::Init(
    return true;
  }
  
@@ -475,7 +475,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist
    // Triggers the backend to load if it hasn't already, and then returns whether
    // it's finished loading.
    // Note: Virtual needed for mocking.
-@@ -1013,6 +1017,10 @@ class HistoryService : public KeyedService {
+@@ -1024,6 +1028,10 @@ class HistoryService : public KeyedService {
  
    base::OnceClosure origin_queried_closure_for_testing_;
  

build/patches/Increase-number-of-autocomplete-matches-to-10.patch

@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/omnibox/browser/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc
 --- a/components/omnibox/browser/autocomplete_result.cc
 +++ b/components/omnibox/browser/autocomplete_result.cc
-@@ -85,6 +85,7 @@ struct MatchGURLHash {
+@@ -78,6 +78,7 @@ constexpr size_t kMaxPedalMatchIndex = std::numeric_limits<size_t>::max();
  // static
  size_t AutocompleteResult::GetMaxMatches(bool is_zero_suggest) {
  #if BUILDFLAG(IS_ANDROID)

build/patches/Inject-scripts-for-AMP-tracking-ads-and-video.patch

@@ -35,7 +35,7 @@ diff --git a/third_party/blink/renderer/core/dom/build.gni b/third_party/blink/r
 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
-@@ -283,6 +283,7 @@
+@@ -284,6 +284,7 @@
  #include "third_party/blink/renderer/core/page/scrolling/root_scroller_controller.h"
  #include "third_party/blink/renderer/core/page/scrolling/scroll_state_callback.h"
  #include "third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.h"
@@ -43,7 +43,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "third_party/blink/renderer/core/page/scrolling/snap_coordinator.h"
  #include "third_party/blink/renderer/core/page/scrolling/top_document_root_scroller_controller.h"
  #include "third_party/blink/renderer/core/page/spatial_navigation_controller.h"
-@@ -355,6 +356,8 @@
+@@ -356,6 +357,8 @@
  #include "third_party/blink/renderer/platform/wtf/text/string_buffer.h"
  #include "third_party/blink/renderer/platform/wtf/text/text_encoding_registry.h"
  
@@ -52,7 +52,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #ifndef NDEBUG
  using WeakDocumentSet = blink::HeapHashSet<blink::WeakMember<blink::Document>>;
  static WeakDocumentSet& LiveDocumentSet();
-@@ -7065,6 +7068,64 @@ void Document::OnPrepareToStopParsing() {
+@@ -7109,6 +7112,64 @@ void Document::OnPrepareToStopParsing() {
        MilestoneForDelayedAsyncScript::kFinishedParsing);
  }
  
@@ -117,9 +117,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  void Document::FinishedParsing() {
    DCHECK(!GetScriptableDocumentParser() || !parser_->IsParsing());
    DCHECK(!GetScriptableDocumentParser() || ready_state_ != kLoading);
-@@ -7124,6 +7185,10 @@ void Document::FinishedParsing() {
-       }
-     }
+@@ -7160,6 +7221,10 @@ void Document::FinishedParsing() {
+ 
+     frame->Loader().FinishedParsing();
  
 +    if (!IsPrefetchOnly()) {
 +       injectScripts();
@@ -131,7 +131,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -1975,6 +1975,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -1993,6 +1993,9 @@ class CORE_EXPORT Document : public ContainerNode,
    // Called when the AXMode of an existing AXContext changes.
    void AXContextModeChanged();
  
@@ -166,8 +166,8 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_script_element.cc b/third_party/blink/renderer/core/html/html_script_element.cc
 --- a/third_party/blink/renderer/core/html/html_script_element.cc
 +++ b/third_party/blink/renderer/core/html/html_script_element.cc
-@@ -194,6 +194,11 @@ void HTMLScriptElement::setTextContent(const String& string) {
-   script_text_internal_slot_ = ParkableString(string.Impl());
+@@ -190,6 +190,11 @@ void HTMLScriptElement::setTextContent(const String& string) {
+   Node::setTextContent(string);
  }
  
 +void HTMLScriptElement::setTextDirect(

build/patches/Keep-empty-tabs-between-sessions.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/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
-@@ -806,14 +806,6 @@ public class TabPersistentStore {
+@@ -816,14 +816,6 @@ public class TabPersistentStore {
                  mTabsToMigrate.add(tab);
              }
          } else {
@@ -30,7 +30,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
-@@ -598,9 +598,6 @@ public class CriticalPersistedTabData extends PersistedTabData {
+@@ -602,9 +602,6 @@ public class CriticalPersistedTabData extends PersistedTabData {
          if (getUrl() == null || getUrl().isEmpty()) {
              return false;
          }

build/patches/Keep-flag-to-allow-screenshots-in-Incognito-mode.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -3986,9 +3986,9 @@
+@@ -4140,9 +4140,9 @@
      "expiry_milestone": 110
    },
    {

build/patches/Logcat-crash-reports-UI.patch

@@ -140,7 +140,7 @@ diff --git a/chrome/browser/crash_upload_list/crash_upload_list_android.h b/chro
 diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
 --- a/chrome/browser/net/chrome_network_delegate.cc
 +++ b/chrome/browser/net/chrome_network_delegate.cc
-@@ -131,6 +131,13 @@ bool IsAccessAllowedAndroid(const base::FilePath& path) {
+@@ -133,6 +133,13 @@ bool IsAccessAllowedAndroid(const base::FilePath& path) {
    if (external_storage_path.IsParent(path))
      return true;
  
@@ -157,7 +157,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 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
-@@ -633,6 +633,7 @@ static_library("ui") {
+@@ -639,6 +639,7 @@ static_library("ui") {
      "//third_party/re2",
      "//third_party/webrtc_overrides:webrtc_component",
      "//third_party/zlib",
@@ -279,7 +279,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
  
    bool system_crash_reporter = false;
  #if BUILDFLAG(IS_CHROMEOS)
-@@ -234,14 +277,112 @@ void CrashesDOMHandler::UpdateUI() {
+@@ -226,14 +269,112 @@ void CrashesDOMHandler::UpdateUI() {
  
  void CrashesDOMHandler::HandleRequestSingleCrashUpload(
      const base::Value::List& args) {
@@ -398,7 +398,7 @@ diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/cra
  }
  
  }  // namespace
-@@ -253,7 +394,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
+@@ -245,7 +386,8 @@ void CrashesDOMHandler::HandleRequestSingleCrashUpload(
  ///////////////////////////////////////////////////////////////////////////////
  
  CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) {

build/patches/Make-all-favicon-requests-on-demand.patch

@@ -1,55 +0,0 @@
-From: Francois Marier <francois@brave.com>
-Date: Tue, 14 Jul 2020 17:39:44 -0700
-Subject: Make all favicon requests on-demand
-
-This patch can be dropped once https://crbug.com/1096660 is fixed
-as long as the test is retained and still passes.
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- components/favicon/core/favicon_database.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc
---- a/components/favicon/core/favicon_database.cc
-+++ b/components/favicon/core/favicon_database.cc
-@@ -509,6 +509,7 @@ FaviconBitmapID FaviconDatabase::AddFaviconBitmap(
-     base::Time time,
-     const gfx::Size& pixel_size) {
-   DCHECK(icon_id);
-+  type = FaviconBitmapType::ON_DEMAND; // Make all icons ON_DEMAND.
- 
-   sql::Statement statement(db_.GetCachedStatement(
-       SQL_FROM_HERE,
-@@ -561,8 +562,8 @@ bool FaviconDatabase::SetFaviconBitmap(
-   } else {
-     statement.BindNull(0);
-   }
--  statement.BindInt64(1, time.ToDeltaSinceWindowsEpoch().InMicroseconds());
--  statement.BindInt64(2, 0);
-+  statement.BindInt64(1, 0);
-+  statement.BindInt64(2, time.ToDeltaSinceWindowsEpoch().InMicroseconds());
-   statement.BindInt64(3, bitmap_id);
- 
-   return statement.Run();
-@@ -571,7 +572,7 @@ bool FaviconDatabase::SetFaviconBitmap(
- bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
-                                                      base::Time time) {
-   DCHECK(bitmap_id);
--  // By updating last_updated timestamp, we assume the icon is of type ON_VISIT.
-+  /* By updating last_updated timestamp, we assume the icon is of type ON_VISIT.
-   // If it is ON_DEMAND, reset last_requested to 0 and thus silently change the
-   // type to ON_VISIT.
-   sql::Statement statement(
-@@ -581,7 +582,8 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
-   statement.BindInt64(0, time.ToDeltaSinceWindowsEpoch().InMicroseconds());
-   statement.BindInt64(1, 0);
-   statement.BindInt64(2, bitmap_id);
--  return statement.Run();
-+  return statement.Run(); */
-+  return true;
- }
- 
- bool FaviconDatabase::SetFaviconsOutOfDateBetween(base::Time begin,
---
-2.25.1

build/patches/Modify-default-preferences.patch

@@ -28,7 +28,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  create mode 100644 components/bookmarks/browser/features.h
 
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 54fd9f0905ae8..c4e818c315441 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -79,6 +79,7 @@
@@ -52,7 +51,6 @@ index 54fd9f0905ae8..c4e818c315441 100644
       flag_descriptions::kTabGroupsNewBadgePromoName,
       flag_descriptions::kTabGroupsNewBadgePromoDescription, kOsDesktop,
 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
-index cbf9b5dd9480b..56ab82fb2dde8 100644
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
 @@ -377,7 +377,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
@@ -65,7 +63,6 @@ index cbf9b5dd9480b..56ab82fb2dde8 100644
  
  void BackgroundModeManager::RegisterProfile(Profile* profile) {
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
-index bb81389e0ea17..4e264ce161a8b 100644
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
 @@ -1435,7 +1435,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
@@ -78,7 +75,6 @@ index bb81389e0ea17..4e264ce161a8b 100644
    // user policy in addition to the same named ones in Local State (which are
    // used for mapping the command-line flags).
 diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 2904162779c98..606e9b943e0f8 100644
 --- a/chrome/browser/flag_descriptions.cc
 +++ b/chrome/browser/flag_descriptions.cc
 @@ -2920,6 +2920,10 @@ const char kTabToGTSAnimationAndroidDescription[] =
@@ -93,7 +89,6 @@ index 2904162779c98..606e9b943e0f8 100644
  const char kTabGroupsNewBadgePromoDescription[] =
      "Causes a 'New' badge to appear on the entry point for creating a tab "
 diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index 3aad4196b7895..fabe35badce4e 100644
 --- a/chrome/browser/flag_descriptions.h
 +++ b/chrome/browser/flag_descriptions.h
 @@ -1641,6 +1641,9 @@ extern const char kTabGroupsUiImprovementsAndroidDescription[];
@@ -107,7 +102,6 @@ index 3aad4196b7895..fabe35badce4e 100644
  extern const char kTabGroupsNewBadgePromoDescription[];
  
 diff --git a/chrome/browser/prefetch/prefetch_prefs.h b/chrome/browser/prefetch/prefetch_prefs.h
-index 6c4021a2d5d41..a00b3dc281a47 100644
 --- a/chrome/browser/prefetch/prefetch_prefs.h
 +++ b/chrome/browser/prefetch/prefetch_prefs.h
 @@ -25,7 +25,7 @@ enum class NetworkPredictionOptions {
@@ -120,7 +114,6 @@ index 6c4021a2d5d41..a00b3dc281a47 100644
  
  // Enum representing possible values of the Preload Pages opt-in state.  Since
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index a82af67cd3afb..8309bc84cdf96 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
 @@ -302,7 +302,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
@@ -133,7 +126,6 @@ index a82af67cd3afb..8309bc84cdf96 100644
  #if BUILDFLAG(IS_ANDROID)
    registry->RegisterStringPref(
 diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
-index fdc696d48682f..6752dae95ec5d 100644
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 @@ -36,7 +36,7 @@
@@ -146,7 +138,6 @@ index fdc696d48682f..6752dae95ec5d 100644
        </div>
      </cr-dialog>
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index df3225597d7e0..c02bdc82855df 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
 @@ -77,11 +77,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -165,7 +156,6 @@ index df3225597d7e0..c02bdc82855df 100644
    registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
    registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
 diff --git a/components/bookmarks/browser/BUILD.gn b/components/bookmarks/browser/BUILD.gn
-index fa0a550e02074..6ed7b1c16c780 100644
 --- a/components/bookmarks/browser/BUILD.gn
 +++ b/components/bookmarks/browser/BUILD.gn
 @@ -21,6 +21,7 @@ static_library("browser") {
@@ -185,7 +175,6 @@ index fa0a550e02074..6ed7b1c16c780 100644
      "scoped_group_bookmark_actions.cc",
      "titled_url_index.cc",
 diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
-index b08cbb0bd8a8d..020935e486a41 100644
 --- a/components/bookmarks/browser/bookmark_utils.cc
 +++ b/components/bookmarks/browser/bookmark_utils.cc
 @@ -25,6 +25,7 @@
@@ -215,7 +204,6 @@ index b08cbb0bd8a8d..020935e486a41 100644
        prefs::kShowManagedBookmarksInBookmarkBar, true,
 diff --git a/components/bookmarks/browser/features.cc b/components/bookmarks/browser/features.cc
 new file mode 100644
-index 0000000000000..59094046f1dcf
 --- /dev/null
 +++ b/components/bookmarks/browser/features.cc
 @@ -0,0 +1,16 @@
@@ -237,7 +225,6 @@ index 0000000000000..59094046f1dcf
 +}  // namespace bookmarks
 diff --git a/components/bookmarks/browser/features.h b/components/bookmarks/browser/features.h
 new file mode 100644
-index 0000000000000..5aa1e1ffce624
 --- /dev/null
 +++ b/components/bookmarks/browser/features.h
 @@ -0,0 +1,18 @@
@@ -260,7 +247,6 @@ index 0000000000000..5aa1e1ffce624
 +
 +#endif  // COMPONENTS_BOOKMARKS_BROWSER_FEATURES_H_
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
-index 85d55cd689a7b..3200dddb8904a 100644
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
 @@ -311,7 +311,7 @@ void ContentSettingsRegistry::Init() {
@@ -282,7 +268,6 @@ index 85d55cd689a7b..3200dddb8904a 100644
             ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK),
             WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
 diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
-index 10cf2824bdb0c..1728801c44c12 100644
 --- a/components/content_settings/core/browser/cookie_settings.cc
 +++ b/components/content_settings/core/browser/cookie_settings.cc
 @@ -66,7 +66,7 @@ void CookieSettings::RegisterProfilePrefs(
@@ -295,7 +280,6 @@ index 10cf2824bdb0c..1728801c44c12 100644
  }
  
 diff --git a/components/payments/core/payment_prefs.cc b/components/payments/core/payment_prefs.cc
-index 3196befc8c400..2caca44e2d4e7 100644
 --- a/components/payments/core/payment_prefs.cc
 +++ b/components/payments/core/payment_prefs.cc
 @@ -16,7 +16,7 @@ const char kCanMakePaymentEnabled[] = "payments.can_make_payment_enabled";
@@ -308,7 +292,6 @@ index 3196befc8c400..2caca44e2d4e7 100644
  }
  
 diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-index 12d10cc3059df..ba2b8297b6613 100644
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
 @@ -199,9 +199,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -324,7 +307,6 @@ index 12d10cc3059df..ba2b8297b6613 100644
    registry->RegisterBooleanPref(prefs::kSafeBrowsingEnhanced, false);
    registry->RegisterBooleanPref(prefs::kSafeBrowsingProceedAnywayDisabled,
 diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
-index d8b6883073669..71a93f1ed2a10 100644
 --- a/components/signin/internal/identity_manager/primary_account_manager.cc
 +++ b/components/signin/internal/identity_manager/primary_account_manager.cc
 @@ -50,9 +50,9 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -340,7 +322,6 @@ index d8b6883073669..71a93f1ed2a10 100644
  }
  
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
-index d57db0aa742ba..dbaa19eafbb64 100644
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
 @@ -540,8 +540,8 @@ const char kIsolateOriginsFieldTrialParamName[] = "OriginsList";
@@ -354,6 +335,5 @@ index d57db0aa742ba..dbaa19eafbb64 100644
  const base::FeatureParam<IsolateSandboxedIframesGrouping>::Option
      isolated_sandboxed_iframes_grouping_types[] = {
          {IsolateSandboxedIframesGrouping::kPerSite, "per-site"},
--- 
-2.30.2
-
+--
+2.25.1

build/patches/Move-navigation-bar-to-bottom.patch

@@ -12,7 +12,7 @@ Support for tablet mode is also included.
 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
 ---
- cc/base/features.cc                           |  3 ++
+ cc/base/features.cc                           |  4 ++
  cc/base/features.h                            |  1 +
  cc/input/browser_controls_offset_manager.cc   |  6 +++
  cc/trees/layer_tree_host_impl.cc              |  3 ++
@@ -44,7 +44,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../modaldialog/ChromeTabModalPresenter.java  |  2 +-
  .../chrome/browser/ntp/NewTabPage.java        | 13 +++--
  .../chrome/browser/ntp/RecentTabsPage.java    | 22 ++++++--
- .../browser/searchwidget/SearchActivity.java  | 12 ++++-
+ .../browser/searchwidget/SearchActivity.java  | 13 ++++-
  .../browser/settings/SettingsActivity.java    |  5 ++
  .../StatusIndicatorCoordinator.java           | 10 ++++
  .../StatusIndicatorSceneLayer.java            |  7 ++-
@@ -65,9 +65,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ui/appmenu/AppMenuHandlerImpl.java        | 11 ++++
  .../omnibox/LocationBarCoordinator.java       |  9 +++-
  .../browser/omnibox/UrlBarCoordinator.java    | 11 +++-
- .../suggestions/AutocompleteCoordinator.java  | 16 +++++-
+ .../suggestions/AutocompleteCoordinator.java  | 18 ++++++-
  .../suggestions/AutocompleteMediator.java     |  7 ++-
- .../OmniboxSuggestionsDropdown.java           | 23 +++++++-
+ .../OmniboxSuggestionsDropdown.java           | 22 +++++++-
  .../OmniboxSuggestionsDropdownEmbedder.java   |  4 ++
  .../strings/android_chrome_strings.grd        |  6 +++
  chrome/browser/ui/android/toolbar/BUILD.gn    |  1 +
@@ -86,29 +86,30 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../accessibility/AccessibilitySettings.java  | 16 ++++++
  .../AccessibilitySettingsDelegate.java        |  6 +++
  .../render_widget_host_view_android.cc        |  3 ++
- 74 files changed, 782 insertions(+), 56 deletions(-)
+ 74 files changed, 784 insertions(+), 57 deletions(-)
 
 diff --git a/cc/base/features.cc b/cc/base/features.cc
 --- a/cc/base/features.cc
 +++ b/cc/base/features.cc
-@@ -35,6 +35,9 @@ const base::Feature kSynchronizedScrolling = {
-     base::FEATURE_ENABLED_BY_DEFAULT};
- #endif
+@@ -40,6 +40,10 @@ BASE_FEATURE(kAvoidRasterDuringElasticOverscroll,
+              "AvoidRasterDuringElasticOverscroll",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
-+const base::Feature kMoveTopToolbarToBottom = {
-+    "MoveTopToolbarToBottom", base::FEATURE_DISABLED_BY_DEFAULT};
++BASE_FEATURE(kMoveTopToolbarToBottom,
++             "MoveTopToolbarToBottom",
++             base::FEATURE_DISABLED_BY_DEFAULT);
 +
- const base::Feature kRemoveMobileViewportDoubleTap{
-     "RemoveMobileViewportDoubleTap", base::FEATURE_ENABLED_BY_DEFAULT};
- 
+ BASE_FEATURE(kRemoveMobileViewportDoubleTap,
+              "RemoveMobileViewportDoubleTap",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 diff --git a/cc/base/features.h b/cc/base/features.h
 --- a/cc/base/features.h
 +++ b/cc/base/features.h
-@@ -14,6 +14,7 @@ namespace features {
- CC_BASE_EXPORT extern const base::Feature kAnimatedImageResume;
- CC_BASE_EXPORT extern bool IsImpulseScrollAnimationEnabled();
- CC_BASE_EXPORT extern const base::Feature kSynchronizedScrolling;
-+CC_BASE_EXPORT extern const base::Feature kMoveTopToolbarToBottom;
+@@ -20,6 +20,7 @@ CC_BASE_EXPORT BASE_DECLARE_FEATURE(kSynchronizedScrolling);
+ // that resets the scale at the end. When enabled, this aovids recomputing
+ // raster scale during elastic overscroll.
+ CC_BASE_EXPORT BASE_DECLARE_FEATURE(kAvoidRasterDuringElasticOverscroll);
++CC_BASE_EXPORT BASE_DECLARE_FEATURE(kMoveTopToolbarToBottom);
  
  // When enabled, the double tap to zoom will be disabled when the viewport
  // meta tag is properly set for mobile using content=width=device-width
@@ -138,7 +139,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
 diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
 --- a/cc/trees/layer_tree_host_impl.cc
 +++ b/cc/trees/layer_tree_host_impl.cc
-@@ -4229,6 +4229,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
+@@ -4253,6 +4253,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
    if (scroll_delta.IsZero())
      return false;
  
@@ -151,7 +152,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
 diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 --- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
 +++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
-@@ -78,6 +78,9 @@ import org.chromium.components.prefs.PrefService;
+@@ -85,6 +85,9 @@ import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.util.ColorUtils;
  
@@ -160,8 +161,8 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
 +
  /** The mediator implements the logic to interact with the surfaces and caller. */
  class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
-                                       StartSurface.OnTabSelectingListener, BackPressHandler {
-@@ -1028,6 +1031,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
+                                       StartSurface.OnTabSelectingListener, BackPressHandler,
+@@ -1095,6 +1098,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
      }
  
      private void setTopMargin(int topMargin) {
@@ -392,7 +393,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinder.java
-@@ -22,6 +22,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
+@@ -21,6 +21,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
  import org.chromium.components.browser_ui.styles.ChromeColors;
  import org.chromium.ui.modelutil.PropertyKey;
  import org.chromium.ui.modelutil.PropertyModel;
@@ -401,7 +402,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  
  /**
   * ViewBinder for TabListRecyclerView.
-@@ -58,6 +60,8 @@ class TabListContainerViewBinder {
+@@ -57,6 +59,8 @@ class TabListContainerViewBinder {
              params.topMargin = newTopMargin;
              view.requestLayout();
          } else if (BOTTOM_CONTROLS_HEIGHT == propertyKey) {
@@ -453,7 +454,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /**
       * Field trial parameter for downsampling scaling factor.
       */
-@@ -194,6 +197,7 @@ class TabListRecyclerView
+@@ -192,6 +195,7 @@ class TabListRecyclerView
                  ? FINAL_FADE_IN_DURATION_MS
                  : BASE_ANIMATION_DURATION_MS;
  
@@ -461,7 +462,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          setAlpha(0);
          setVisibility(View.VISIBLE);
          mFadeInAnimator = ObjectAnimator.ofFloat(this, View.ALPHA, 1);
-@@ -227,6 +231,11 @@ class TabListRecyclerView
+@@ -225,6 +229,11 @@ class TabListRecyclerView
      }
  
      void setShadowVisibility(boolean shouldShowShadow) {
@@ -473,7 +474,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          if (mShadowImageView == null) {
              Context context = getContext();
              mShadowImageView = new ImageView(context);
-@@ -239,7 +248,10 @@ class TabListRecyclerView
+@@ -237,7 +246,10 @@ class TabListRecyclerView
              if (getParent() instanceof FrameLayout) {
                  // Add shadow for grid tab switcher.
                  FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
@@ -485,7 +486,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                  mShadowImageView.setLayoutParams(params);
                  mShadowImageView.setTranslationY(mShadowTopOffset);
                  FrameLayout parent = (FrameLayout) getParent();
-@@ -266,6 +278,10 @@ class TabListRecyclerView
+@@ -264,6 +276,10 @@ class TabListRecyclerView
  
      void setShadowTopOffset(int shadowTopOffset) {
          mShadowTopOffset = shadowTopOffset;
@@ -496,7 +497,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  
          if (mShadowImageView != null && getParent() instanceof FrameLayout) {
              // Since the shadow has no functionality, other than just existing visually, we can use
-@@ -445,6 +461,7 @@ class TabListRecyclerView
+@@ -443,6 +459,7 @@ class TabListRecyclerView
                  mListener.finishedHiding();
              }
          });
@@ -507,15 +508,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java
-@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider
- import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
- import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
+@@ -43,6 +43,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthController;
+ import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager;
 +import org.chromium.chrome.browser.flags.CachedFeatureFlags;
  import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
-@@ -414,11 +415,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+@@ -457,11 +458,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
              updateTopControlsProperties();
              mContainerViewModel.set(
                      BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -538,7 +539,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
          }
  
          mContainerView = containerView;
-@@ -535,6 +547,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
+@@ -588,6 +600,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
          final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
  
          mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -628,7 +629,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 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
-@@ -243,6 +243,9 @@ import java.util.ArrayList;
+@@ -244,6 +244,9 @@ import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Consumer;
  
@@ -638,7 +639,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  /**
   * A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
   * and associated classes.
-@@ -747,6 +750,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -748,6 +751,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                  int toolbarLayoutId = getToolbarLayoutId();
                  if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
                      controlContainer.initWithToolbar(toolbarLayoutId);
@@ -658,19 +659,19 @@ 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
-@@ -107,6 +107,7 @@ public class ChromeCachedFlags {
+@@ -111,6 +111,7 @@ public class ChromeCachedFlags {
                  add(ChromeFeatureList.sInstanceSwitcher);
                  add(ChromeFeatureList.sInstantStart);
                  add(ChromeFeatureList.sInterestFeedV2);
 +                add(ChromeFeatureList.sMoveTopToolbarToBottom);
                  add(ChromeFeatureList.sNewWindowAppMenu);
                  add(ChromeFeatureList.sOmniboxModernizeVisualUpdate);
-                 add(ChromeFeatureList.sOptimizationGuidePushNotifications);
+                 add(ChromeFeatureList.sOmniboxRemoveExcessiveRecycledViewClearCalls);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
-@@ -79,6 +79,8 @@ import org.chromium.ui.base.EventOffsetHandler;
- import org.chromium.ui.base.WindowAndroid;
+@@ -83,6 +83,8 @@ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.ui.mojom.VirtualKeyboardMode;
  import org.chromium.ui.resources.ResourceManager;
  import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -678,7 +679,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
  
  import java.util.ArrayList;
  import java.util.HashSet;
-@@ -298,6 +300,10 @@ public class CompositorViewHolder extends FrameLayout
+@@ -316,6 +318,10 @@ public class CompositorViewHolder extends FrameLayout
                          WebContents webContents = mTabVisible.getWebContents();
                          if (webContents == null) return;
                          EventForwarder forwarder = webContents.getEventForwarder();
@@ -765,7 +766,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  
  import java.util.concurrent.Callable;
  
-@@ -84,7 +85,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome {
+@@ -87,7 +88,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome {
          mStartSurfaceSupplier = startSurfaceSupplier;
          mTabSwitcherSupplier = tabSwitcherSupplier;
          mTabStripLayoutHelperManager = new StripLayoutHelperManager(host.getContext(), this,
@@ -817,7 +818,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -376,7 +376,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
+@@ -375,7 +375,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
          // position 0 is on the left. Account for that in the offset calculation.
          boolean isRtl = LocalizationUtils.isLayoutRtl();
          boolean useUnadjustedScrollOffset = isRtl != isLeft;
@@ -1066,7 +1067,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/findinpage/Find
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/BrowserControlsManager.java
-@@ -49,6 +49,9 @@ import org.chromium.ui.vr.VrModeObserver;
+@@ -51,6 +51,9 @@ import org.chromium.ui.vr.VrModeObserver;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -1076,7 +1077,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
  /**
   * A class that manages browser control visibility and positioning.
   */
-@@ -367,6 +370,14 @@ public class BrowserControlsManager
+@@ -396,6 +399,14 @@ public class BrowserControlsManager
          return mTopControlContainerHeight;
      }
  
@@ -1091,7 +1092,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/Brow
      @Override
      public int getTopControlsMinHeight() {
          return mTopControlsMinHeight;
-@@ -433,6 +444,8 @@ public class BrowserControlsManager
+@@ -462,6 +473,8 @@ public class BrowserControlsManager
  
      @Override
      public float getTopVisibleContentOffset() {
@@ -1263,7 +1264,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
-@@ -71,6 +71,11 @@ import org.chromium.ui.base.WindowDelegate;
+@@ -76,6 +76,11 @@ import org.chromium.ui.base.WindowDelegate;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.url.GURL;
  
@@ -1275,24 +1276,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
  import java.lang.ref.WeakReference;
  
  /** Queries the user's default search engine and shows autocomplete suggestions. */
-@@ -182,6 +187,11 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -189,6 +194,12 @@ public class SearchActivity extends AsyncInitializationActivity
          mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
                  R.id.search_location_bar);
-         View anchorView = mContentView.findViewById(R.id.toolbar);
+         mAnchorView = mContentView.findViewById(R.id.toolbar);
 +        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
 +            CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams)
-+                anchorView.getLayoutParams();
++                mAnchorView.getLayoutParams();
 +            layoutParams.gravity = Gravity.START | Gravity.BOTTOM;
++            mAnchorView.setLayoutParams(layoutParams);
 +        }
+         updateAnchorViewLayout();
+ 
          OverrideUrlLoadingDelegate overrideUrlLoadingDelegate =
-                 (String url, @PageTransition int transition, String postDataType, byte[] postData,
-                         boolean incognito) -> {
-@@ -195,7 +205,7 @@ public class SearchActivity extends AsyncInitializationActivity
+@@ -204,7 +215,7 @@ public class SearchActivity extends AsyncInitializationActivity
              getOnBackPressedDispatcher().addCallback(this, backPressManager.getCallback());
          }
          // clang-format off
--        mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, anchorView,
-+        mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, anchorView, anchorView,
+-        mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, mAnchorView,
++        mLocationBarCoordinator = new LocationBarCoordinator(mSearchBox, mAnchorView, mAnchorView,
                  mProfileSupplier, PrivacyPreferencesManagerImpl.getInstance(),
                  mSearchBoxDataProvider, null, new WindowDelegate(getWindow()), getWindowAndroid(),
                  /*activityTabSupplier=*/() -> null, getModalDialogManagerSupplier(),
@@ -1365,7 +1367,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -176,6 +176,9 @@ import org.chromium.url.GURL;
+@@ -178,6 +178,9 @@ import org.chromium.url.GURL;
  
  import java.util.List;
  
@@ -1375,7 +1377,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  /**
   * Contains logic for managing the toolbar visual component.  This class manages the interactions
   * with the rest of the application to ensure the toolbar is always visually up to date.
-@@ -665,7 +668,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -670,7 +673,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                      mEphemeralTabCoordinatorSupplier);
              // clang-format off
              LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1384,7 +1386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                      PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
                      mActionModeController.getActionModeCallback(),
                      new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
-@@ -915,11 +918,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -927,11 +930,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
                  // the height won't be measured by the background image.
                  if (mControlContainer.getBackground() == null) {
                      setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1398,7 +1400,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                              mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
                              mLayoutChangeListener = null;
                          }
-@@ -1286,13 +1291,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1311,13 +1316,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
          return mLocationBar.getOmniboxStub().isUrlBarFocused();
      }
  
@@ -1426,7 +1428,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
                  mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
                  mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
                  mTabContentManager, mCompositorViewHolder,
-@@ -1301,8 +1318,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -1326,8 +1343,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
          mBottomControlsCoordinatorSupplier.set(new BottomControlsCoordinator(mActivity,
                  mWindowAndroid, mLayoutManager, mCompositorViewHolder.getResourceManager(),
                  mBrowserControlsSizer, mFullscreenManager,
@@ -1438,7 +1440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
      }
  
      /**
-@@ -2073,6 +2091,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
+@@ -2107,6 +2125,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
      private void setControlContainerTopMargin(int margin) {
          final ViewGroup.MarginLayoutParams layoutParams =
                  ((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1507,7 +1509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
  import org.chromium.base.ApiCompatibilityUtils;
  import org.chromium.base.CallbackController;
  import org.chromium.base.supplier.ObservableSupplier;
-@@ -347,6 +350,12 @@ public class StatusBarColorController
+@@ -370,6 +373,12 @@ public class StatusBarColorController
          boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
          ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
          ApiCompatibilityUtils.setStatusBarColor(mWindow, color);
@@ -1523,7 +1525,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
 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
-@@ -7202,6 +7202,11 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7422,6 +7422,11 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
       FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
  
@@ -1621,7 +1623,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
 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
-@@ -1703,6 +1703,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
+@@ -1752,6 +1752,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
      "Ensure keyboard shortcuts work consistently with international keyboard "
      "layouts and deprecate legacy shortcuts.";
  
@@ -1635,7 +1637,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
-@@ -954,6 +954,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
+@@ -987,6 +987,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
  extern const char kCompositorThreadedScrollbarScrollingName[];
  extern const char kCompositorThreadedScrollbarScrollingDescription[];
  
@@ -1688,26 +1690,26 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
  #include "base/metrics/field_trial_params.h"
  #include "base/no_destructor.h"
  #include "base/strings/string_piece_forward.h"
-@@ -249,6 +250,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -250,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kKitKatSupported,
      &kLensCameraAssistedSearch,
      &kLensOnQuickActionSearchWidget,
 +    &features::kMoveTopToolbarToBottom,
-     &kMostRecentTabOnBackgroundCloseTab,
      &kNewInstanceFromDraggedLink,
      &kNewTabPageTilesTitleWrapAround,
+     &kNewWindowAppMenu,
 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
-@@ -103,6 +103,7 @@ public class CachedFeatureFlags {
-                     .put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false)
+@@ -107,6 +107,7 @@ public class CachedFeatureFlags {
                      .put(ChromeFeatureList.TAB_GROUPS_FOR_TABLETS, false)
+                     .put(ChromeFeatureList.TAB_SELECTION_EDITOR_V2, false)
                      .put(ChromeFeatureList.TAB_STRIP_IMPROVEMENTS, false)
 +                    .put(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM, false)
                      .put(ChromeFeatureList.TAB_TO_GTS_ANIMATION, true)
                      .put(ChromeFeatureList.TEST_DEFAULT_DISABLED, false)
                      .put(ChromeFeatureList.TEST_DEFAULT_ENABLED, true)
-@@ -208,6 +209,23 @@ public class CachedFeatureFlags {
+@@ -213,6 +214,23 @@ public class CachedFeatureFlags {
          SharedPreferencesManager.getInstance().writeBoolean(preferenceName, isEnabledInNative);
      }
  
@@ -1731,7 +1733,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      /**
       * Forces a feature to be enabled or disabled for testing.
       *
-@@ -527,6 +545,7 @@ public class CachedFeatureFlags {
+@@ -532,6 +550,7 @@ public class CachedFeatureFlags {
  
      @NativeMethods
      interface Natives {
@@ -1742,16 +1744,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 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
-@@ -424,6 +424,8 @@ public abstract class ChromeFeatureList {
+@@ -430,6 +430,8 @@ public abstract class ChromeFeatureList {
      public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError";
      public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
      public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView";
 +    public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
 +            "MoveTopToolbarToBottom";
      public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
-     public static final String MOST_RECENT_TAB_ON_BACKGROUND_CLOSE_TAB =
-             "MostRecentTabOnBackgroundCloseTab";
-@@ -700,6 +702,8 @@ public abstract class ChromeFeatureList {
+     public static final String NEW_INSTANCE_FROM_DRAGGED_LINK = "NewInstanceFromDraggedLink";
+     public static final String NEW_TAB_PAGE_TILES_TITLE_WRAP_AROUND =
+@@ -714,6 +716,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
      public static final CachedFlag sLensCameraAssistedSearch =
              new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, false);
@@ -1859,7 +1861,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch
 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
-@@ -85,6 +85,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -88,6 +88,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
      private WindowDelegate mWindowDelegate;
      private WindowAndroid mWindowAndroid;
      private View mAutocompleteAnchorView;
@@ -1867,7 +1869,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private LocationBarMediator mLocationBarMediator;
      private View mUrlBar;
      private View mDeleteButton;
-@@ -141,7 +142,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -145,7 +146,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
       * @param reportExceptionCallback A {@link Callback} to report exceptions.
       * @param backPressManager The {@link BackPressManager} for intercepting back press.
       */
@@ -1876,15 +1878,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              ObservableSupplier<Profile> profileObservableSupplier,
              PrivacyPreferencesManager privacyPreferencesManager,
              LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback,
-@@ -171,6 +172,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -177,6 +178,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
          mActivityLifecycleDispatcher = activityLifecycleDispatcher;
          mActivityLifecycleDispatcher.register(this);
          mAutocompleteAnchorView = autocompleteAnchorView;
 +        mContainerView = containerView;
+         Context context = mLocationBarLayout.getContext();
  
          mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar);
-         // TODO(crbug.com/1151513): Inject LocaleManager instance to LocationBarCoordinator instead
-@@ -381,6 +383,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
+@@ -389,6 +391,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
          return mAutocompleteAnchorView;
      }
  
@@ -1909,7 +1911,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  /**
   * Coordinates the interactions with the UrlBar text component.
   */
-@@ -217,7 +220,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
+@@ -231,7 +234,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
          // to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and
          // receive a second request to hide the keyboard instantly.
          if (showKeyboard) {
@@ -1927,7 +1929,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
-@@ -57,6 +57,8 @@ import org.chromium.ui.modelutil.LazyConstructionPropertyMcp;
+@@ -61,6 +61,8 @@ import org.chromium.ui.modelutil.LazyConstructionPropertyMcp;
  import org.chromium.ui.modelutil.MVCListAdapter;
  import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
  import org.chromium.ui.modelutil.PropertyModel;
@@ -1936,15 +1938,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  
  import java.util.ArrayList;
  import java.util.List;
-@@ -71,6 +73,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
-     private final @NonNull AutocompleteMediator mMediator;
-     private final @NonNull Supplier<ModalDialogManager> mModalDialogManagerSupplier;
+@@ -77,6 +79,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
      private @Nullable OmniboxSuggestionsDropdown mDropdown;
+     private @NonNull ObserverList<OmniboxSuggestionsDropdownScrollListener> mScrollListenerList =
+             new ObserverList<>();
 +    private final @NonNull OmniboxSuggestionsDropdownEmbedder mDropdownEmbedder;
  
      public AutocompleteCoordinator(@NonNull ViewGroup parent,
              @NonNull AutocompleteDelegate delegate,
-@@ -92,6 +95,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
+@@ -99,6 +102,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
          PropertyModel listModel = new PropertyModel(SuggestionListProperties.ALL_KEYS);
          ModelList listItems = new ModelList();
  
@@ -1952,16 +1954,16 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
          listModel.set(SuggestionListProperties.EMBEDDER, dropdownEmbedder);
          listModel.set(SuggestionListProperties.VISIBLE, false);
          listModel.set(SuggestionListProperties.SUGGESTION_MODELS, listItems);
-@@ -140,7 +144,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
+@@ -154,7 +158,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
              public void inflate() {
                  OmniboxSuggestionsDropdown dropdown;
                  try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) {
--                    dropdown = new OmniboxSuggestionsDropdown(context, locationBarDataProvider);
-+                    dropdown = new OmniboxSuggestionsDropdown(context, locationBarDataProvider, mDropdownEmbedder);
+-                    dropdown = new OmniboxSuggestionsDropdown(context);
++                    dropdown = new OmniboxSuggestionsDropdown(context, mDropdownEmbedder);
                  }
  
                  // Start with visibility GONE to ensure that show() is called.
-@@ -211,6 +215,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
+@@ -232,6 +236,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
                  ViewGroup container = (ViewGroup) ((ViewStub) mParent.getRootView().findViewById(
                                                             R.id.omnibox_results_container_stub))
                                                .inflate();
@@ -1978,10 +1980,17 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  
                  mHolder = new SuggestionListViewHolder(container, dropdown);
                  for (int i = 0; i < mCallbacks.size(); i++) {
+@@ -458,4 +472,4 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
+             listener.onSuggestionDropdownOverscrolledToTop();
+         }
+     }
+-}
+\ No newline at end of file
++}
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteMediator.java
-@@ -57,6 +57,9 @@ import org.chromium.ui.modelutil.PropertyModel;
+@@ -58,6 +58,9 @@ import org.chromium.ui.modelutil.PropertyModel;
  import org.chromium.ui.mojom.WindowOpenDisposition;
  import org.chromium.url.GURL;
  
@@ -1991,7 +2000,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.List;
-@@ -969,7 +972,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
+@@ -1011,7 +1014,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
      public void onSuggestionDropdownScroll() {
          if (mDropdownViewInfoListBuilder.hasFullyConcealedElements()) {
              mSuggestionsListScrolled = true;
@@ -2005,7 +2014,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
-@@ -43,6 +43,9 @@ import org.chromium.ui.base.ViewUtils;
+@@ -42,6 +42,9 @@ import org.chromium.ui.base.ViewUtils;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -2015,33 +2024,31 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  /** A widget for showing a list of omnibox suggestions. */
  public class OmniboxSuggestionsDropdown extends RecyclerView {
      private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300;
-@@ -173,7 +176,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -208,7 +211,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+      * Constructs a new list designed for containing omnibox suggestions.
       * @param context Context used for contained views.
       */
-     public OmniboxSuggestionsDropdown(
--            @NonNull Context context, @NonNull LocationBarDataProvider locationBarDataProvider) {
-+            @NonNull Context context, @NonNull LocationBarDataProvider locationBarDataProvider,
+-    public OmniboxSuggestionsDropdown(@NonNull Context context) {
++    public OmniboxSuggestionsDropdown(@NonNull Context context,
 +            @NonNull OmniboxSuggestionsDropdownEmbedder embedder) {
          super(context, null, android.R.attr.dropDownListViewStyle);
          setFocusable(true);
          setFocusableInTouchMode(true);
-@@ -184,7 +188,7 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -218,13 +222,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+         setItemAnimator(null);
  
-         mScrollListener = new SuggestionScrollListener();
-         setOnScrollListener(mScrollListener);
--        setLayoutManager(new LinearLayoutManager(context) {
-+        LinearLayoutManager linearLayoutManager = (new LinearLayoutManager(context) {
-             @Override
-             public int scrollVerticallyBy(
-                     int deltaY, RecyclerView.Recycler recycler, RecyclerView.State state) {
-@@ -204,6 +208,19 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
-                 : 0;
+         mLayoutScrollListener = new SuggestionLayoutScrollListener(context);
+-        setLayoutManager(mLayoutScrollListener);
+ 
+         boolean shouldShowModernizeVisualUpdate =
+                 OmniboxFeatures.shouldShowModernizeVisualUpdate(context);
+         final Resources resources = context.getResources();
          int paddingBottom =
                  resources.getDimensionPixelOffset(R.dimen.omnibox_suggestion_list_padding_bottom);
 +        if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
 +            // reverse the layout so that the items are at the bottom (in reverse order)
 +            // and anchored to the bottom edge
-+            linearLayoutManager.setReverseLayout(true);
++            mLayoutScrollListener.setReverseLayout(true);
 +
 +            if (!embedder.isTablet()) {
 +                ViewGroup.MarginLayoutParams embedderParams = (ViewGroup.MarginLayoutParams)
@@ -2050,11 +2057,11 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +                                embedderParams.bottomMargin;
 +            }
 +        }
-+        setLayoutManager(linearLayoutManager);
-         ViewCompat.setPaddingRelative(this, paddingSide, 0, paddingSide, paddingBottom);
++        setLayoutManager(mLayoutScrollListener);
+         ViewCompat.setPaddingRelative(this, 0, 0, 0, paddingBottom);
  
          mStandardBgColor = shouldShowModernizeVisualUpdate
-@@ -379,6 +396,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
+@@ -442,6 +458,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
      }
  
      private int calculateAnchorBottomRelativeToContent() {
@@ -2096,7 +2103,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
 --- a/chrome/browser/ui/android/toolbar/BUILD.gn
 +++ b/chrome/browser/ui/android/toolbar/BUILD.gn
-@@ -162,6 +162,7 @@ android_library("java") {
+@@ -164,6 +164,7 @@ android_library("java") {
      "//components/user_prefs/android:java",
      "//content/public/android:content_java",
      "//third_party/android_deps:material_design_java",
@@ -2255,15 +2262,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsViewBinder.java
-@@ -39,6 +39,8 @@ class BottomControlsViewBinder {
+@@ -40,6 +40,8 @@ class BottomControlsViewBinder {
                      model.get(BottomControlsProperties.BOTTOM_CONTROLS_CONTAINER_HEIGHT_PX);
          } else if (BottomControlsProperties.Y_OFFSET == propertyKey) {
              view.sceneLayer.setYOffset(model.get(BottomControlsProperties.Y_OFFSET));
 +        } else if (BottomControlsProperties.TOPCONTROLSMINHEIGHT_OFFSET == propertyKey) {
 +            view.sceneLayer.setTopControlsMinHeightOffset(model.get(BottomControlsProperties.TOPCONTROLSMINHEIGHT_OFFSET));
-         } else if (BottomControlsProperties.ANDROID_VIEW_VISIBLE == propertyKey) {
-             view.root.setVisibility(model.get(BottomControlsProperties.ANDROID_VIEW_VISIBLE)
-                             ? View.VISIBLE
+         } else if (BottomControlsProperties.ANDROID_VIEW_VISIBLE == propertyKey
+                 || BottomControlsProperties.COMPOSITED_VIEW_VISIBLE == propertyKey) {
+             final boolean showAndroidView =
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/ScrollingBottomViewSceneLayer.java
@@ -2320,8 +2327,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 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
-@@ -43,6 +43,11 @@ import org.chromium.ui.base.ViewUtils;
- import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
+@@ -48,6 +48,11 @@ import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
+ import org.chromium.ui.util.TokenHolder;
  import org.chromium.ui.widget.OptimizedFrameLayout;
  
 +import android.view.Gravity;
@@ -2332,7 +2339,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  /**
   * Layout for the browser controls (omnibox, menu, tab strip, etc..).
   */
-@@ -99,6 +104,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
+@@ -104,6 +109,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
      @Override
      public void initWithToolbar(int toolbarLayoutId) {
          try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -2530,7 +2537,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
  #include "cc/base/math_util.h"
  #include "cc/layers/layer.h"
  #include "cc/layers/surface_layer.h"
-@@ -474,6 +475,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
+@@ -479,6 +480,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
    // factor. Thus, |top_content_offset| in CSS pixels is also in DIPs.
    float top_content_offset =
        metadata.top_controls_height * metadata.top_controls_shown_ratio;

build/patches/Multiple-fingerprinting-mitigations.patch

@@ -61,7 +61,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2379,6 +2379,7 @@ static_library("browser") {
+@@ -2395,6 +2395,7 @@ static_library("browser") {
      "//services/device/public/cpp:device_features",
      "//services/device/public/cpp/serial:switches",
      "//services/device/public/cpp/usb",
@@ -72,7 +72,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
-@@ -215,6 +215,8 @@
+@@ -216,6 +216,8 @@
  #include "ui/native_theme/native_theme_features.h"
  #include "ui/ui_features.h"
  
@@ -81,7 +81,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "base/allocator/buildflags.h"
  #endif
-@@ -3550,6 +3552,20 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3646,6 +3648,20 @@ const FeatureEntry kFeatureEntries[] = {
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsName,
       flag_descriptions::kWebrtcUseMinMaxVEADimensionsDescription, kOsAll,
       FEATURE_VALUE_TYPE(blink::features::kWebRtcUseMinMaxVEADimensions)},
@@ -105,7 +105,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -246,6 +246,7 @@ source_set("browser") {
+@@ -247,6 +247,7 @@ source_set("browser") {
      "//third_party/libyuv",
      "//third_party/re2",
      "//third_party/sqlite",
@@ -116,7 +116,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -203,6 +203,7 @@
+@@ -204,6 +204,7 @@
  #include "url/gurl.h"
  #include "url/origin.h"
  
@@ -124,7 +124,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/child_process_binding_types.h"
  #include "content/browser/android/java_interfaces_impl.h"
-@@ -3239,6 +3240,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
+@@ -3250,6 +3251,9 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
      switches::kDisableBreakpad,
      switches::kDisableDatabases,
      switches::kDisableFileSystem,
@@ -157,7 +157,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
  #if BUILDFLAG(IS_ANDROID)
  #include "base/android/build_info.h"
  #endif
-@@ -455,6 +457,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -456,6 +458,13 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
    if (!command_line.HasSwitch(switches::kDisableYUVImageDecoding) &&
        base::FeatureList::IsEnabled(
            blink::features::kDecodeLossyWebPImagesToYUV)) {
@@ -193,9 +193,9 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
  #include "base/metrics/histogram_functions.h"
 +#include "base/rand_util.h"
  #include "base/notreached.h"
+ #include "base/ranges/algorithm.h"
  #include "base/time/time.h"
- #include "cc/animation/animation_host.h"
-@@ -809,6 +810,15 @@ Document::Document(const DocumentInit& initializer,
+@@ -820,6 +821,15 @@ Document::Document(const DocumentInit& initializer,
                ? MakeGarbageCollected<RenderBlockingResourceManager>(*this)
                : nullptr),
        data_(MakeGarbageCollected<DocumentData>(GetExecutionContext())) {
@@ -211,7 +211,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
    if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution))
      script_runner_delayer_->Activate();
  
-@@ -2236,6 +2246,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
+@@ -2243,6 +2253,14 @@ void Document::UpdateStyleAndLayoutTreeForThisDocument() {
  #endif
  }
  
@@ -229,7 +229,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/renderer/core/dom/document.h
 --- a/third_party/blink/renderer/core/dom/document.h
 +++ b/third_party/blink/renderer/core/dom/document.h
-@@ -510,6 +510,10 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -513,6 +513,10 @@ class CORE_EXPORT Document : public ContainerNode,
      has_xml_declaration_ = has_xml_declaration ? 1 : 0;
    }
  
@@ -240,7 +240,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
    AtomicString visibilityState() const;
    bool IsPageVisible() const;
    bool hidden() const;
-@@ -2301,6 +2305,9 @@ class CORE_EXPORT Document : public ContainerNode,
+@@ -2332,6 +2336,9 @@ class CORE_EXPORT Document : public ContainerNode,
  
    base::ElapsedTimer start_time_;
  
@@ -253,7 +253,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.h b/third_party/blink/
 diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
 --- a/third_party/blink/renderer/core/dom/element.cc
 +++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -2123,6 +2123,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2053,6 +2053,7 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
        quads.push_back(element_layout_object->LocalToAbsoluteQuad(
            gfx::QuadF(element_layout_object->ObjectBoundingBox())));
      }
@@ -261,7 +261,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
      return;
    }
  
-@@ -2130,6 +2131,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
+@@ -2060,6 +2061,11 @@ void Element::ClientQuads(Vector<gfx::QuadF>& quads) const {
    if (element_layout_object->IsBoxModelObject() ||
        element_layout_object->IsBR())
      element_layout_object->AbsoluteQuads(quads);
@@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/
  }
  
  DOMRectList* Element::getClientRects() {
-@@ -2168,6 +2174,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
+@@ -2098,6 +2104,9 @@ gfx::RectF Element::GetBoundingClientRectNoLifecycleUpdate() const {
    DCHECK(element_layout_object);
    GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
                                                     *element_layout_object);
@@ -302,7 +302,7 @@ diff --git a/third_party/blink/renderer/core/dom/range.cc b/third_party/blink/re
 @@ -1743,7 +1749,11 @@ gfx::RectF Range::BoundingRect() const {
  
    // If all rects are empty, return the first rect.
-   if (result.IsEmpty() && !quads.IsEmpty())
+   if (result.IsEmpty() && !quads.empty())
 -    return quads.front().BoundingBox();
 +    result = quads.front().BoundingBox();
 +
@@ -523,12 +523,12 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
      "//third_party/ced",
 +    "//third_party/ungoogled:switches",
      "//third_party/emoji-segmenter",
-     "//third_party/harfbuzz-ng:hb_scoped_util",
      "//third_party/icu",
+     "//third_party/libyuv",
 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
-@@ -64,4 +64,16 @@ void WebRuntimeFeatures::EnableFluentScrollbars(bool enable) {
+@@ -65,4 +65,16 @@ void WebRuntimeFeatures::EnableFluentScrollbars(bool enable) {
    ScrollbarThemeSettings::SetFluentScrollbarsEnabled(enable);
  }
  
@@ -761,7 +761,7 @@ diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h
 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
-@@ -1418,6 +1418,15 @@
+@@ -1447,6 +1447,15 @@
        // No plan to support complex UI for date/time INPUT types on Android.
        status: {"Android": "test", "default": "stable"},
      },

build/patches/Offer-builtin-autocomplete-for-chrome-flags.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -267,6 +267,8 @@ std::vector<std::u16string> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
+@@ -278,6 +278,8 @@ std::vector<std::u16string> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
  std::vector<std::u16string>
  ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    std::vector<std::u16string> builtins_to_provide;

build/patches/OpenSearch-miscellaneous.patch

@@ -43,7 +43,19 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
  #include "base/metrics/histogram_macros.h"
  #include "chrome/browser/favicon/favicon_utils.h"
  #include "chrome/browser/profiles/profile.h"
-@@ -69,16 +70,20 @@ std::u16string SearchEngineTabHelper::GenerateKeywordFromNavigationEntry(
+@@ -46,8 +47,10 @@ void SearchEngineTabHelper::BindOpenSearchDescriptionDocumentHandler(
+     mojo::PendingReceiver<chrome::mojom::OpenSearchDescriptionDocumentHandler>
+         receiver) {
+   // Bind only for outermost main frames.
+-  if (rfh->GetParentOrOuterDocument())
++  if (rfh->GetParentOrOuterDocument()) {
++    LOG(INFO) << "OpenSearch: not on main frame";
+     return;
++  }
+ 
+   auto* web_contents = content::WebContents::FromRenderFrameHost(rfh);
+   if (!web_contents)
+@@ -73,16 +76,20 @@ std::u16string SearchEngineTabHelper::GenerateKeywordFromNavigationEntry(
      NavigationEntry* entry) {
    // Don't autogenerate keywords for pages that are the result of form
    // submissions.
@@ -66,7 +78,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
    }
  
    // Don't autogenerate keywords for referrers that
-@@ -86,10 +91,10 @@ std::u16string SearchEngineTabHelper::GenerateKeywordFromNavigationEntry(
+@@ -90,10 +97,10 @@ std::u16string SearchEngineTabHelper::GenerateKeywordFromNavigationEntry(
    // b) have a path.
    //
    // If we relax the path constraint, we need to be sure to sanitize the path
@@ -80,17 +92,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
      return std::u16string();
    }
  
-@@ -116,22 +121,27 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
- 
-   // Only accept messages from the main frame.
-   if (osdd_handler_receivers_.GetCurrentTargetFrame() !=
--      web_contents()->GetPrimaryMainFrame())
-+      web_contents()->GetPrimaryMainFrame()) {
-+    LOG(INFO) << "OpenSearch: frame mismatch on page " << page_url;
-     return;
-+  }
- 
-   // Make sure that the page is the current page and other basic checks.
+@@ -121,15 +128,18 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
    // When |page_url| has file: scheme, this method doesn't work because of
    // http://b/issue?id=863583. For that reason, this doesn't check and allow
    // urls referring to osdd urls with same schemes.
@@ -112,7 +114,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
  
    // If the current page is a form submit, find the last page that was not a
    // form submit and use its url to generate the keyword from.
-@@ -141,8 +151,10 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
+@@ -139,8 +149,10 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
         (index > 0) && IsFormSubmit(entry);
         entry = controller.GetEntryAtIndex(index))
      --index;
@@ -124,7 +126,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
  
    // Autogenerate a keyword for the autodetected case; in the other cases we'll
    // generate a keyword later after fetching the OSDD.
-@@ -150,6 +162,12 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
+@@ -148,6 +160,12 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
    if (keyword.empty())
      return;
  
@@ -137,7 +139,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
    auto* frame = web_contents()->GetPrimaryMainFrame();
    mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory;
    frame->CreateNetworkServiceDefaultFactory(
-@@ -157,6 +175,7 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
+@@ -155,6 +173,7 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
  
    // Download the OpenSearch description document. If this is successful, a
    // new keyword will be created when done.
@@ -145,7 +147,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
    TemplateURLFetcherFactory::GetForProfile(profile)->ScheduleDownload(
        keyword, osdd_url, entry->GetFavicon().url,
        frame->GetLastCommittedOrigin(), url_loader_factory.get(),
-@@ -198,11 +217,18 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
+@@ -196,11 +215,18 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
    if (last_index <= 0)
      return;
  
@@ -166,7 +168,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
    TemplateURLService* url_service =
        TemplateURLServiceFactory::GetForProfile(profile);
    if (!url_service)
-@@ -213,7 +239,6 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
+@@ -211,7 +237,6 @@ void SearchEngineTabHelper::GenerateKeywordIfNecessary(
      return;
    }
  
@@ -190,9 +192,9 @@ diff --git a/chrome/renderer/chrome_render_frame_observer.cc b/chrome/renderer/c
    GURL osdd_url = frame->GetDocument().OpenSearchDescriptionURL();
    if (!osdd_url.is_empty()) {
 +    LOG(INFO) << "OpenSearch: found OSDD URL: " << osdd_url;
-     mojo::AssociatedRemote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
+     mojo::Remote<chrome::mojom::OpenSearchDescriptionDocumentHandler>
          osdd_handler;
-     render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(
+     render_frame()->GetBrowserInterfaceBroker()->GetInterface(
 diff --git a/components/search_engines/template_url_fetcher.cc b/components/search_engines/template_url_fetcher.cc
 --- a/components/search_engines/template_url_fetcher.cc
 +++ b/components/search_engines/template_url_fetcher.cc
@@ -246,7 +248,7 @@ diff --git a/components/search_engines/template_url_service.h b/components/searc
    // regardless of |url| if the default search provider is managed by policy or
    // controlled by an extension.
    bool CanMakeDefault(const TemplateURL* url) const;
-@@ -636,9 +639,6 @@ class TemplateURLService : public WebDataServiceConsumer,
+@@ -646,9 +649,6 @@ class TemplateURLService : public WebDataServiceConsumer,
    // SetKeywordSearchTermsForURL is invoked.
    void UpdateKeywordSearchTermsForURL(const URLVisitedDetails& details);
  

build/patches/Override-Navigator-Language.patch

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
 --- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
 +++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
-@@ -35,6 +35,10 @@ import java.util.Locale;
+@@ -34,6 +34,10 @@ import java.util.Locale;
  public class AppLocaleUtils {
      private AppLocaleUtils(){};
  
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
      // Value of AppLocale preference when the system language is used.
      public static final String APP_LOCALE_USE_SYSTEM_LANGUAGE = null;
  
-@@ -99,6 +103,22 @@ public class AppLocaleUtils {
+@@ -98,6 +102,22 @@ public class AppLocaleUtils {
          return locale.toLanguageTag();
      }
  
@@ -71,7 +71,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
 diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -68,6 +68,7 @@
+@@ -69,6 +69,7 @@
  #include "cc/base/switches.h"
  #include "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom.h"
  #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
@@ -79,7 +79,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
  #include "components/metrics/single_sample_metrics.h"
  #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h"
  #include "components/services/storage/public/cpp/buckets/bucket_id.h"
-@@ -3173,8 +3174,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
+@@ -3175,8 +3176,11 @@ void RenderProcessHostImpl::AppendRendererCommandLine(
    PropagateBrowserCommandLineToRenderer(browser_command_line, command_line);
  
    // Pass on the browser locale.

build/patches/Partition-Blink-memory-cache.patch

@@ -16,13 +16,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../core/html/parser/html_srcset_parser.cc    |  2 +-
  .../core/inspector/inspector_network_agent.cc |  2 +-
- .../core/inspector/inspector_page_agent.cc    |  5 +++--
+ .../core/inspector/inspector_page_agent.cc    |  4 ++--
  .../renderer/core/loader/image_loader.cc      |  3 ++-
  .../platform/loader/fetch/memory_cache.cc     |  7 ++-----
  .../platform/loader/fetch/memory_cache.h      |  4 ++--
  .../platform/loader/fetch/resource_fetcher.cc | 21 ++++++++++++-------
  .../platform/loader/fetch/resource_fetcher.h  |  3 ++-
- 8 files changed, 27 insertions(+), 20 deletions(-)
+ 8 files changed, 26 insertions(+), 20 deletions(-)
 
 diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
 --- a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc
@@ -30,7 +30,7 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b
 @@ -413,7 +413,7 @@ static unsigned AvoidDownloadIfHigherDensityResourceIsInCache(
      KURL url = document->CompleteURL(
          StripLeadingAndTrailingHTMLSpaces(image_candidates[i]->Url()));
-     if (GetMemoryCache()->ResourceForURL(
+     if (MemoryCache::Get()->ResourceForURL(
 -            url, document->Fetcher()->GetCacheIdentifier(url)) ||
 +            url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin())) ||
          url.ProtocolIsData())
@@ -39,10 +39,10 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_srcset_parser.cc b
 diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_network_agent.cc
-@@ -2216,7 +2216,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
+@@ -2252,7 +2252,7 @@ bool InspectorNetworkAgent::FetchResourceContent(Document* document,
    Resource* cached_resource = document->Fetcher()->CachedResource(url);
    if (!cached_resource) {
-     cached_resource = GetMemoryCache()->ResourceForURL(
+     cached_resource = MemoryCache::Get()->ResourceForURL(
 -        url, document->Fetcher()->GetCacheIdentifier(url));
 +        url, document->Fetcher()->GetCacheIdentifier(url, document->TopFrameOrigin()));
    }
@@ -51,26 +51,25 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_network_agent.c
 diff --git a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_page_agent.cc
-@@ -167,9 +167,10 @@ Resource* CachedResource(LocalFrame* frame,
+@@ -167,9 +167,9 @@ Resource* CachedResource(LocalFrame* frame,
    if (!document)
      return nullptr;
    Resource* cached_resource = document->Fetcher()->CachedResource(url);
 -  if (!cached_resource) {
 +  if (!cached_resource && document->TopFrameOrigin()) {
-     cached_resource = GetMemoryCache()->ResourceForURL(
+     cached_resource = MemoryCache::Get()->ResourceForURL(
 -        url, document->Fetcher()->GetCacheIdentifier(url));
-+        url, document->Fetcher()->GetCacheIdentifier(url,
-+          document->TopFrameOrigin()));
++        url, document->Fetcher()->GetCacheIdentifier(url), document->TopFrameOrigin());
    }
    if (!cached_resource)
      cached_resource = loader->ResourceForURL(url);
 diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_party/blink/renderer/core/loader/image_loader.cc
 --- a/third_party/blink/renderer/core/loader/image_loader.cc
 +++ b/third_party/blink/renderer/core/loader/image_loader.cc
-@@ -726,7 +726,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const {
+@@ -729,7 +729,8 @@ bool ImageLoader::ShouldLoadImmediately(const KURL& url) const {
    // content when style recalc is over and DOM mutation is allowed again.
    if (!url.IsNull()) {
-     Resource* resource = GetMemoryCache()->ResourceForURL(
+     Resource* resource = MemoryCache::Get()->ResourceForURL(
 -        url, element_->GetDocument().Fetcher()->GetCacheIdentifier(url));
 +        url, element_->GetDocument().Fetcher()->GetCacheIdentifier(url,
 +                element_->GetDocument().TopFrameOrigin()));
@@ -80,7 +79,7 @@ diff --git a/third_party/blink/renderer/core/loader/image_loader.cc b/third_part
 diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
 --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc
-@@ -197,7 +197,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map,
+@@ -198,7 +198,7 @@ void MemoryCache::RemoveInternal(ResourceMap* resource_map,
  }
  
  bool MemoryCache::Contains(const Resource* resource) const {
@@ -89,7 +88,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/
      return false;
  
    const auto resource_maps_it =
-@@ -213,12 +213,9 @@ bool MemoryCache::Contains(const Resource* resource) const {
+@@ -214,12 +214,9 @@ bool MemoryCache::Contains(const Resource* resource) const {
    return resource == resources_it->value->GetResource();
  }
  
@@ -106,7 +105,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.cc b/
 diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/third_party/blink/renderer/platform/loader/fetch/memory_cache.h
 --- a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h
 +++ b/third_party/blink/renderer/platform/loader/fetch/memory_cache.h
-@@ -112,9 +112,7 @@ class PLATFORM_EXPORT MemoryCache final : public GarbageCollected<MemoryCache>,
+@@ -116,9 +116,7 @@ class PLATFORM_EXPORT MemoryCache final : public GarbageCollected<MemoryCache>,
      TypeStatistic other;
    };
  
@@ -116,7 +115,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t
  
    void Add(Resource*);
    void Remove(Resource*);
-@@ -159,6 +157,8 @@ class PLATFORM_EXPORT MemoryCache final : public GarbageCollected<MemoryCache>,
+@@ -163,6 +161,8 @@ class PLATFORM_EXPORT MemoryCache final : public GarbageCollected<MemoryCache>,
        base::MemoryPressureListener::MemoryPressureLevel) override;
  
   private:
@@ -128,7 +127,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/memory_cache.h b/t
 diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
 --- a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
 +++ b/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.cc
-@@ -652,7 +652,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
+@@ -657,7 +657,8 @@ Resource* ResourceFetcher::CreateResourceForStaticData(
    if (!archive_ && factory.GetType() == ResourceType::kRaw)
      return nullptr;
  
@@ -138,10 +137,10 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
    // Most off-main-thread resource fetches use Resource::kRaw and don't reach
    // this point, but off-main-thread module fetches might.
    if (IsMainThread()) {
-@@ -1111,7 +1112,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
+@@ -1116,7 +1117,9 @@ Resource* ResourceFetcher::RequestResource(FetchParameters& params,
          resource = nullptr;
        } else {
-         resource = GetMemoryCache()->ResourceForURL(
+         resource = MemoryCache::Get()->ResourceForURL(
 -            params.Url(), GetCacheIdentifier(params.Url()));
 +            params.Url(),
 +            GetCacheIdentifier(params.Url(),
@@ -149,7 +148,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
        }
        if (resource) {
          policy = DetermineRevalidationPolicy(resource_type, params, *resource,
-@@ -1319,7 +1322,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
+@@ -1324,7 +1327,8 @@ Resource* ResourceFetcher::CreateResourceForLoading(
      const FetchParameters& params,
      const ResourceFactory& factory) {
    const String cache_identifier =
@@ -159,7 +158,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
    if (!base::FeatureList::IsEnabled(
            blink::features::kScopeMemoryCachePerContext)) {
      DCHECK(!IsMainThread() || params.IsStaleRevalidation() ||
-@@ -2207,13 +2211,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
+@@ -2213,13 +2217,16 @@ void ResourceFetcher::UpdateAllImageResourcePriorities() {
    to_be_removed.clear();
  }
  
@@ -179,7 +178,7 @@ diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_fetcher.c
  
    // Requests that can be satisfied via `archive_` (i.e. MHTML) or
    // `subresource_web_bundles_` should not participate in the global caching,
-@@ -2225,7 +2232,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
+@@ -2231,7 +2238,7 @@ String ResourceFetcher::GetCacheIdentifier(const KURL& url) const {
    if (bundle)
      return bundle->GetCacheIdentifier();
  

build/patches/Partition-blobs-by-top-frame-URL.patch

@@ -101,7 +101,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.cc b/storage/browser/blob/
 diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/blob_url_store_impl.h
 --- a/storage/browser/blob/blob_url_store_impl.h
 +++ b/storage/browser/blob/blob_url_store_impl.h
-@@ -39,14 +39,21 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl
+@@ -40,14 +40,21 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl
        const absl::optional<net::SchemefulSite>& unsafe_top_level_site,
        RegisterCallback callback) override;
    void Revoke(const GURL& url) override;
@@ -124,7 +124,7 @@ diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/b
        ResolveForNavigationCallback callback) override;
  
   private:
-@@ -54,6 +61,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl
+@@ -55,6 +62,11 @@ class COMPONENT_EXPORT(STORAGE_BROWSER) BlobURLStoreImpl
    // Returns false and reports a bad mojo message if not.
    bool BlobUrlIsValid(const GURL& url, const char* method) const;
  
@@ -133,9 +133,9 @@ diff --git a/storage/browser/blob/blob_url_store_impl.h b/storage/browser/blob/b
 +      const base::UnguessableToken& unsafe_agent_cluster_id,
 +      const absl::optional<net::SchemefulSite>& unsafe_top_level_site);
 +
-   const url::Origin origin_;
-   base::WeakPtr<BlobUrlRegistry> registry_;
+   const blink::StorageKey storage_key_;
  
+   base::WeakPtr<BlobUrlRegistry> registry_;
 diff --git a/third_party/blink/public/mojom/blob/blob_url_store.mojom b/third_party/blink/public/mojom/blob/blob_url_store.mojom
 --- a/third_party/blink/public/mojom/blob/blob_url_store.mojom
 +++ b/third_party/blink/public/mojom/blob/blob_url_store.mojom
@@ -199,19 +199,19 @@ diff --git a/third_party/blink/renderer/core/fileapi/public_url_manager.cc b/thi
  PublicURLManager::PublicURLManager(ExecutionContext* context)
 @@ -176,6 +191,7 @@ void PublicURLManager::Resolve(
  
-   url_store_->ResolveAsURLLoaderFactory(
-       url, std::move(factory_receiver),
+   auto metrics_callback = [](ExecutionContext* execution_context,
+                              const absl::optional<base::UnguessableToken>&
 +      GetExecutionContext()->GetAgentClusterID(), GetInsecureTopLevelSite(GetExecutionContext()),
-       WTF::Bind(
-           [](ExecutionContext* execution_context,
-              const absl::optional<base::UnguessableToken>&
+                                  unsafe_agent_cluster_id,
+                              const absl::optional<BlinkSchemefulSite>&
+                                  unsafe_top_level_site) {
 @@ -249,6 +265,7 @@ void PublicURLManager::Resolve(
- 
-   url_store_->ResolveForNavigation(
-       url, std::move(token_receiver),
+   auto metrics_callback = [](ExecutionContext* execution_context,
+                              const absl::optional<base::UnguessableToken>&
+                                  unsafe_agent_cluster_id) {
 +      GetExecutionContext()->GetAgentClusterID(), GetInsecureTopLevelSite(GetExecutionContext()),
-       WTF::Bind(
-           [](ExecutionContext* execution_context,
-              const absl::optional<base::UnguessableToken>&
+     if (execution_context->GetAgentClusterID() != unsafe_agent_cluster_id) {
+       execution_context->CountUse(
+           WebFeature::
 --
 2.25.1

build/patches/Re-introduce-kWebAuthCable.patch

@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
 --- a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
 +++ b/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsertest.cc
-@@ -110,6 +110,12 @@ class TestSheetView : public AuthenticatorRequestSheetView {
+@@ -111,6 +111,12 @@ class TestSheetView : public AuthenticatorRequestSheetView {
  
  class AuthenticatorDialogViewTest : public DialogBrowserTest {
   public:
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/ui/views/webauthn/authenticator_dialog_view_browsert
    // DialogBrowserTest:
    void ShowUi(const std::string& name) override {
      dialog_model_ = std::make_unique<AuthenticatorRequestDialogModel>(
-@@ -165,6 +171,7 @@ class AuthenticatorDialogViewTest : public DialogBrowserTest {
+@@ -173,6 +179,7 @@ class AuthenticatorDialogViewTest : public DialogBrowserTest {
      }
    }
  
@@ -56,7 +56,7 @@ diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/ch
    // DialogBrowserTest:
    void ShowUi(const std::string& test_name) override {
      // Strip trailing feature param state.
-@@ -349,6 +355,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest,
+@@ -353,6 +359,7 @@ class AuthenticatorDialogTest : public DialogBrowserTest,
    std::unique_ptr<AuthenticatorRequestDialogModel> model_;
    base::RepeatingTimer timer_;
    int bio_samples_remaining_ = 5;
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/ch
 diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
 --- a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
 +++ b/chrome/browser/webauthn/chrome_webauthn_browsertest.cc
-@@ -478,6 +478,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) {
+@@ -730,6 +730,7 @@ IN_PROC_BROWSER_TEST_F(WebAuthnCableExtension, ServerLinkExperiments) {
  class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
   public:
    WebAuthnCableSecondFactor() {
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro
      // This makes it a little easier to compare against.
      trace_ << std::endl;
    }
-@@ -739,6 +740,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
+@@ -990,6 +991,7 @@ class WebAuthnCableSecondFactor : public WebAuthnBrowserTest {
    };
  
   protected:
@@ -86,7 +86,7 @@ diff --git a/chrome/browser/webauthn/chrome_webauthn_browsertest.cc b/chrome/bro
 diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc
 --- a/content/browser/webauth/authenticator_impl_unittest.cc
 +++ b/content/browser/webauth/authenticator_impl_unittest.cc
-@@ -1423,7 +1423,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) {
+@@ -1425,7 +1425,12 @@ TEST_F(AuthenticatorImplTest, OversizedCredentialId) {
    }
  }
  
@@ -100,7 +100,7 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br
    // https://crbug.com/954355
    NavigateAndCommit(GURL(kTestOrigin1));
  
-@@ -3410,7 +3415,13 @@ TEST_F(AuthenticatorContentBrowserClientTest,
+@@ -3412,7 +3417,13 @@ TEST_F(AuthenticatorContentBrowserClientTest,
              AuthenticatorStatus::SUCCESS);
  }
  
@@ -118,9 +118,9 @@ diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/br
 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
-@@ -1151,6 +1151,12 @@ const base::Feature kWebAssemblyTrapHandler {
+@@ -1283,6 +1283,12 @@ BASE_FEATURE(kWebAssemblyTrapHandler,
  #endif
- };
+ );
  
 +// Controls whether CTAP2 devices can communicate via the WebAuthentication API
 +// using pairingless BLE protocol.
@@ -129,18 +129,18 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 +                                  base::FEATURE_DISABLED_BY_DEFAULT};       // by default in Bromite
 +
  // Controls whether WebAuthn conditional UI requests are supported.
- const base::Feature kWebAuthConditionalUI{"WebAuthenticationConditionalUI",
-                                           base::FEATURE_DISABLED_BY_DEFAULT};
+ BASE_FEATURE(kWebAuthConditionalUI,
+              "WebAuthenticationConditionalUI",
 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
-@@ -297,6 +297,7 @@ CONTENT_EXPORT extern const base::Feature kWebAssemblyLazyCompilation;
- CONTENT_EXPORT extern const base::Feature kWebAssemblySimd;
- CONTENT_EXPORT extern const base::Feature kWebAssemblyTiering;
- CONTENT_EXPORT extern const base::Feature kWebAssemblyTrapHandler;
+@@ -297,6 +297,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebPayments);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebRtcUseGpuMemoryBufferVideoFrames);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUICodeCache);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUIReportOnlyTrustedTypes);
 +CONTENT_EXPORT extern const base::Feature kWebAuthCable;
- CONTENT_EXPORT extern const base::Feature kWebAuthConditionalUI;
- CONTENT_EXPORT extern const base::Feature kWebBluetooth;
- CONTENT_EXPORT extern const base::Feature kWebBluetoothNewPermissionsBackend;
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebUsb);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebXr);
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kWebXrArModule);
 --
 2.25.1