Rebase to 144.0.7559.97

[AUTO][FILECONTROL] - version 144.0.7559.97

.github/workflows/build_additional_targets.yaml

@@ -128,7 +128,7 @@ jobs:
           http_proxy=
           https_proxy=
 
-          # set out folder permissions
+          # setup folder permissions
           test -d chromium/src/out/chr_arm || sudo mkdir -p chromium/src/out/chr_arm && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/chr_arm
@@ -145,6 +145,10 @@ jobs:
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/x64_webview
             
+          sudo chown lg /home/lg/working_dir
+          test -d /github/home/.config/depot_tools || sudo mkdir -p /github/home/.config/depot_tools
+          sudo chown lg /github/home/.config/depot_tools
+
           sudo mkdir -p /run/user/1000/
           sudo chown lg /run/user/1000/
           sudo chmod g-rxw /run/user/1000/

.github/workflows/build_cromite.yaml

@@ -177,6 +177,7 @@ jobs:
         USELOCALIMAGE: true       # CUSTOM RUNNER: permit use of local images
         USEINTERNALNETWORK: true  # CUSTOM RUNNER: create the docker network as internal
         WORKSPACE: /home/lg/working_dir
+        HOME: /home/lg/working_dir
         # kythe
         KYTHE_CORPUS: chromium.googlesource.com/chromium/src
         KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
@@ -215,7 +216,7 @@ jobs:
           http_proxy=
           https_proxy=
 
-          # set out folder permissions
+          # setup folder permissions
           test -d chromium/src/out/arm || sudo mkdir -p chromium/src/out/arm && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/arm
@@ -239,6 +240,10 @@ jobs:
           test -d chromium/src/out/arm64_webview || sudo mkdir -p chromium/src/out/arm64_webview && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/arm64_webview
+
+          sudo chown lg /home/lg/working_dir
+          test -d /github/home/.config/depot_tools || sudo mkdir -p /github/home/.config/depot_tools
+          sudo chown lg /github/home/.config/depot_tools
             
           # make kythe output directory
           test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY
@@ -266,12 +271,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/x64
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/x64 || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/x64/ --list --short
-          gn args out/x64/ --list >out/x64/gn_list
+          gn args out/x64/ --list --short || true
+          gn args out/x64/ --list >out/x64/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/x64 chrome_public_bundle --offline
@@ -295,12 +300,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"win\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/win64
+          gn gen --args="target_os = \"win\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/win64 || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/win64/ --list --short
-          gn args out/win64/ --list >out/win64/gn_list
+          gn args out/win64/ --list --short || true
+          gn args out/win64/ --list >out/win64/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/win64 chrome --offline
@@ -323,12 +328,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm64\" " out/arm64
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm64\" " out/arm64 || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/arm64/ --list --short
-          gn args out/arm64/ --list >out/arm64/gn_list
+          gn args out/arm64/ --list --short || true
+          gn args out/arm64/ --list >out/arm64/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64 chrome_public_bundle --offline
@@ -378,12 +383,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm\" " out/arm
+          gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm\" " out/arm || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/arm/ --list --short
-          gn args out/arm/ --list >out/arm/gn_list
+          gn args out/arm/ --list --short || true
+          gn args out/arm/ --list >out/arm/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm chrome_public_bundle --offline
@@ -407,12 +412,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"linux\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/lin64
+          gn gen --args="target_os = \"linux\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/lin64 || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/lin64/ --list --short
-          gn args out/lin64/ --list >out/lin64/gn_list
+          gn args out/lin64/ --list --short || true
+          gn args out/lin64/ --list >out/lin64/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/lin64 chrome chrome_sandbox --offline
@@ -434,12 +439,12 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- gn gen"
-          gn gen --args="target_os = \"android\" target_cpu = \"arm64\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) system_webview_package_name=\"com.android.webview\" enable_trybot_verification=false " out/arm64_webview
+          gn gen --args="target_os = \"android\" target_cpu = \"arm64\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) system_webview_package_name=\"com.android.webview\" enable_trybot_verification=false " out/arm64_webview  || true
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
-          gn args out/arm64_webview/ --list --short
-          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list
+          gn args out/arm64_webview/ --list --short || true
+          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list || true
           echo "::endgroup::"
 
           vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64_webview system_webview_apk system_webview_shell --offline

.github/workflows/release_additional_targets.yaml

@@ -47,7 +47,7 @@ jobs:
       - name: Create release
         shell: bash
         run: |          
-          VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
+          VERSION=v$(cat ${{ env.OUTPUTFILE_X64 }}/RELEASE)
 
           cd cromite/tools
 

.github/workflows/update_fdroid_repo.yaml

@@ -37,9 +37,9 @@ jobs:
             apt update
 
             DEBIAN_FRONTEND=noninteractive apt update && apt install -y wget unzip
-            wget https://github.com/rclone/rclone/releases/download/v1.64.0/rclone-v1.64.0-linux-amd64.zip
-            unzip rclone-v1.64.0-linux-amd64.zip
-            export rclone=rclone-v1.64.0-linux-amd64/rclone
+            wget https://github.com/rclone/rclone/releases/download/v1.72.0/rclone-v1.72.0-linux-amd64.zip
+            unzip rclone-v1.72.0-linux-amd64.zip
+            export rclone=rclone-v1.72.0-linux-amd64/rclone
 
             mkdir -p  ~/.config/rclone
             echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf

README.md

@@ -133,6 +133,7 @@ you can activate (highly recommended) the 'RendererAppContainer' flag from the c
 ```
   --enable-features=RendererAppContainer
 ```
+In this case, it is also necessary to run icacls as indicated above.
 
 ### Auto-update setup for linux
 working in progress in https://github.com/uazo/cromite/issues/771

build/RELEASE

@@ -1 +1 @@
-142.0.7444.60
+144.0.7559.97

build/cromite.gn_args

@@ -68,10 +68,6 @@ enable_platform_dts_audio = false
 # see https://github.com/uazo/cromite/pull/317 for context
 use_v8_context_snapshot = false
 
-# disable minikin engine
-# see https://github.com/uazo/cromite/issues/697
-use_minikin_hyphenation = false
-
 # disable automatic update of sync-related cookies
 # initial commit: https://source.chromium.org/chromium/chromium/src/+/fd9a841f7a63b9f5510f6b713d9c833d259c63ad
 enable_bound_session_credentials = false
@@ -160,7 +156,6 @@ if (target_os == "win") {
   enable_pdf = true
   pdf_is_complete_lib = true
   enable_plugins = true
-  enable_ppapi = false
 
   chrome_pgo_phase = 2 # enable pgo
 
@@ -176,7 +171,6 @@ if (target_os == "linux") {
   enable_pdf = true
   pdf_is_complete_lib = true
   enable_plugins = true
-  enable_ppapi = false
 
   use_sysroot = true
   chrome_pgo_phase = 2 # enable pgo

build/cromite_patches_list.txt

@@ -1,5 +1,4 @@
 Do-not-link-with-libatomic.patch
-Do-not-check-for-the-presence-of-use-remoteexec.patch
 bromite-build-utils.patch
 Add-cromite-flags-support.patch
 Force-use-vpython3-for-some-scripts.patch
@@ -10,7 +9,6 @@ Restore-chrome-password-store.patch
 Remove-EV-certificates.patch
 do-not-hide-.orig-files.patch
 do-not-add-suffix-to-package-name.patch
-exit-on-failure-of-inclusion.patch
 Move-some-account-settings-back-to-privacy-settings.patch
 kill-Vision.patch
 kill-Location-fall-back-to-system.patch
@@ -99,7 +97,6 @@ Block-gateway-attacks-via-websockets.patch
 Enable-darken-websites-checkbox-in-themes.patch
 Remove-blocklisted-URLs-upon-bookmark-creation.patch
 Disable-the-DIAL-repeating-discovery.patch
-Block-qjz9zk-or-trk-requests.patch
 Hardening-against-incognito-mode-detection.patch
 Restore-Simplified-NTP-launch.patch
 Add-option-to-use-home-page-as-NTP.patch
@@ -156,7 +153,6 @@ Enable-Certificate-Transparency.patch
 Invalidate-components-public-key.patch
 Improve-plain-text-rendering-on-mobile.patch
 Remove-segmentation-platform.patch
-Follow-only-system-dark-mode.patch
 Remove-window-name-on-cross-origin-navigation.patch
 Remove-preload-of-com.google.android.gms.fonts.patch
 Partition-Blink-memory-cache.patch
@@ -287,7 +283,6 @@ Disable-Posture-API.patch
 PublicKeyCredential-fingerprinting-mitigations.patch
 Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
 Enable-Cert-Management-UI.patch
-Enable-ProcessBoundStringEncryption-by-default.patch
 Prevent-mouse-wheel-fingerprinting-on-Windows.patch
 Enable-component-updater.patch
 Android-fonts-fingerprinting-mitigation.patch
@@ -308,9 +303,13 @@ Add-setting-to-enable-Credman-for-passkeys.patch
 Temp-disable-UseContextSnapshot.patch
 Enable-ClientHello-Segmentation.patch
 Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch
+Supporting-Dangling-Ptr-Detection-via-BackupRefPtr.patch
+Disable-device-bound-session.patch
+Keep-disabled-CpuPerformance.patch
+Immediately-destroy-shared-workers-when-closing-the-page.patch
+Disable-minikin-hyphenation.patch
 
 # temporary or wip patches
-Temp-PerformanceNavigationTiming-privacy-fix.patch
 Temp-disable-predictive-back-gesture.patch
 TEMP-Add-a-log-to-track-strange-behavior.patch
 Temp-guard-FileSystemAccessPersistentPermissions.patch
@@ -320,6 +319,7 @@ Block-leakage-of-urls-in-sandbox-iframes.patch
 Fix-chromium-build-bugs.patch
 Try-to-fix-2082.patch
 Temp-use-PREVIEW-for-IDCompositionDevice5.patch
+Temp-Backport-Fix-CtrlW-to-close-current-tab.patch
 
 # adblock patches
 eyeo-133.0.6943.49-base.patch
@@ -328,3 +328,7 @@ eyeo-133.0.6943.49-android_api.patch
 eyeo-133.0.6943.49-android_settings.patch
 eyeo-133.0.6943.49-extension_api.patch
 Eyeo-Adblock-for-Cromite.patch
+
+# extension patches
+Experimental-support-for-extensions-on-Android.patch
+Enable-extension-in-incognito.patch

build/patches/Add-AllowUserCertificates-flag.patch

@@ -20,7 +20,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/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
-@@ -242,6 +242,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -255,6 +255,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
  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;
-@@ -1004,6 +1005,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -1096,6 +1097,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
          super.onStartWithNative();
  
          ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,26 +40,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 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
-@@ -185,6 +185,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -196,6 +196,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedPerformanceStudy,
-     &feed::kFeedShowSignInCommand,
-     &feed::kFeedSignedOutViewDemotion,
-+    &kAllowUserCertificates,
      &feed::kFeedRecyclerBinderUnmountOnDetach,
+     &feed::kFeedShowSignInCommand,
++    &kAllowUserCertificates,
+     &feed::kFeedSignedOutViewDemotion,
      &feed::kInterestFeedV2,
      &feed::kWebFeedAwareness,
 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
-@@ -164,6 +164,7 @@ public abstract class ChromeFeatureList {
+@@ -166,6 +166,7 @@ public abstract class ChromeFeatureList {
              "AccountForSuppressedKeyboardInsets";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
              "AdaptiveButtonInTopToolbarCustomizationV2";
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
              "AdaptiveButtonInTopToolbarPageSummary";
-     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
-@@ -807,6 +808,8 @@ public abstract class ChromeFeatureList {
+     public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =
+@@ -820,6 +821,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
              newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sAppSpecificHistoryViewIntent =
              newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
      public static final CachedFlag sAsyncNotificationManager =
-@@ -1130,6 +1133,7 @@ public abstract class ChromeFeatureList {
-                     sAllowTabClosingUponMinimization,
+@@ -1136,6 +1139,7 @@ public abstract class ChromeFeatureList {
+                     sAccountForSuppressedKeyboardInsets,
                      sAndroidAnimatedProgressBarInBrowser,
                      sAndroidAnimatedProgressBarInViz,
 +                    sAllowUserCertificates,
                      sAndroidAppIntegrationModule,
                      sAndroidAppIntegrationMultiDataSource,
-                     sAndroidBottomToolbar,
+                     sAndroidAutoMintedTwa,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.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/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -883,6 +883,12 @@ public class KeyboardShortcuts {
+@@ -904,6 +904,12 @@ public class KeyboardShortcuts {
                      KeyEvent.KEYCODE_ESCAPE,
                      KeyEvent.META_CTRL_ON);
          }

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -44,7 +44,7 @@ new file mode 100644
 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
-@@ -413,6 +413,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -400,6 +400,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
  

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -188,6 +188,10 @@ bool IsReducePPMsEnabled() {
+@@ -200,6 +200,10 @@ bool IsReducePPMsEnabled() {
    return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
  }
  
@@ -23,9 +23,9 @@ diff --git a/base/features.cc b/base/features.cc
 +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
 +#endif
 +
- void Init(EmitThreadControllerProfilerMetadata
-               emit_thread_controller_profiler_metadata) {
+ void Init() {
    g_is_reduce_ppms_enabled.store(FeatureList::IsEnabled(kReducePPMs),
+                                  std::memory_order_relaxed);
 diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
 --- a/content/renderer/render_process_impl.cc
 +++ b/content/renderer/render_process_impl.cc

build/patches/Add-a-flag-to-disable-GamePad-API.patch

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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
-@@ -8924,9 +8924,9 @@
+@@ -9195,9 +9195,9 @@
      "expiry_milestone": 150
    },
    {
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -265,6 +265,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -262,6 +262,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
            {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
            {wf::EnablePeriodicBackgroundSync,
             raw_ref(features::kPeriodicBackgroundSync)},
@@ -56,7 +56,7 @@ new file mode 100644
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc
-@@ -37,4 +37,12 @@ bool IsGamepadMultitouchEnabled() {
+@@ -53,4 +53,12 @@ bool IsGamepadMultitouchEnabled() {
    return false;
  }
  
@@ -72,12 +72,17 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ
 diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
 --- a/device/gamepad/public/cpp/gamepad_features.h
 +++ b/device/gamepad/public/cpp/gamepad_features.h
-@@ -15,8 +15,10 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
- GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
+@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
  GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
      kEnableSimulatedGamepadDataFetcher);
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kGamepadRawInputChangeEvent);
 +GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
  
+ #if BUILDFLAG(IS_WIN)
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kIgnorePS5GamepadsInWgi);
+@@ -27,6 +28,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAllowlistHidrawGamepads);
+ #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ 
  GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
 +GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
  
@@ -91,10 +96,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
  #include "base/auto_reset.h"
  #include "device/gamepad/public/cpp/gamepads.h"
 +#include "device/gamepad/public/cpp/gamepad_features.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
  #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
-@@ -114,6 +115,9 @@ void RecordGamepadsForIdentifiabilityStudy(
+ #include "third_party/blink/public/platform/task_type.h"
+ #include "third_party/blink/renderer/bindings/modules/v8/v8_gamepad_mapping_type.h"
+@@ -86,6 +87,9 @@ NavigatorGamepad& NavigatorGamepad::From(Navigator& navigator) {
  HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
      Navigator& navigator,
      ExceptionState& exception_state) {
@@ -104,10 +109,10 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
    if (!navigator.DomWindow()) {
      // Using an existing NavigatorGamepad if one exists, but don't create one
      // for a detached window, as its subclasses depend on a non-null window.
-@@ -420,6 +424,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
- 
- void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
-                                             Gamepad* gamepad) {
+@@ -428,6 +432,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(
+ void NavigatorGamepad::DispatchGamepadConnectionChangedEvent(
+     const AtomicString& event_name,
+     Gamepad* gamepad) {
 +  if (::features::IsRestrictGamepadAccessEnabled())
 +    return;
    // Ensure that we're blocking re-entrancy.

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

@@ -10,6 +10,7 @@ this implementation is the same as the one in ChromeOS which gets proxy informat
 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.
+Enable the support for multiple proxy chain via the bracketed [] sintax
 
 Credits to @uazo for the LocalState integration.
 
@@ -38,10 +39,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../proxy_config/proxy_config_dictionary.cc   |  30 +-
  .../proxy_config/proxy_config_dictionary.h    |   7 +-
  .../proxy_config/proxy_policy_handler.cc      |   2 +-
+ net/features.gni                              |   2 +-
  net/proxy_resolution/pac_file_fetcher_impl.cc |   8 -
  net/proxy_resolution/proxy_config.cc          |  53 ++-
  net/proxy_resolution/proxy_config.h           |   3 +
- 26 files changed, 986 insertions(+), 26 deletions(-)
+ 27 files changed, 987 insertions(+), 27 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -78,7 +80,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -102,6 +102,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -89,7 +91,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
-@@ -410,6 +410,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -411,6 +411,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
  #endif
    builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -100,9 +102,9 @@ 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
-@@ -229,6 +229,9 @@
+@@ -239,6 +239,9 @@
+       <if expr="_google_chrome">
          <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
-         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />
        </if>
 +      <!-- Bromite Proxy Configuration UI -->
 +      <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
@@ -197,7 +199,7 @@ 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
-@@ -207,6 +207,8 @@
+@@ -212,6 +212,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
  
@@ -206,7 +208,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/extensions/background_mode_manager.h"
  #endif
-@@ -1749,6 +1751,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1314,6 +1316,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -673,7 +675,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_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -58,6 +58,9 @@
+@@ -59,6 +59,9 @@
  #include "extensions/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  
@@ -683,7 +685,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
  #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
  #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
  #endif
-@@ -426,7 +429,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -438,7 +441,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
    map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
  #endif
@@ -1154,7 +1156,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
-@@ -190,6 +190,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+@@ -197,6 +197,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
  inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
  inline constexpr char kChromeUINewTabHost[] = "newtab";
  inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";
@@ -1166,24 +1168,25 @@ diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_const
 diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/components/proxy_config/pref_proxy_config_tracker_impl.cc
 --- a/components/proxy_config/pref_proxy_config_tracker_impl.cc
 +++ b/components/proxy_config/pref_proxy_config_tracker_impl.cc
-@@ -253,14 +253,14 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
+@@ -550,7 +550,7 @@ PrefProxyConfigTrackerImpl::GetEffectiveProxyConfig(
  // static
  void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
    registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
 -                                   ProxyConfigDictionary::CreateSystem());
 +                                   ProxyConfigDictionary::CreateDirect());
- }
- 
- // static
+   registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules);
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+   registry->RegisterIntegerPref(
+@@ -562,7 +562,7 @@ void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  void PrefProxyConfigTrackerImpl::RegisterProfilePrefs(
      PrefRegistrySimple* registry) {
    registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
 -                                   ProxyConfigDictionary::CreateSystem());
 +                                   ProxyConfigDictionary::CreateDirect());
    registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false);
- }
- 
-@@ -405,6 +405,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+   registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules);
+ #if !BUILDFLAG(IS_CHROMEOS)
+@@ -716,6 +716,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
        if (proxy_dict.GetBypassList(&proxy_bypass)) {
          proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
        }
@@ -1196,7 +1199,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 +++ b/components/proxy_config/proxy_config_dictionary.cc
 @@ -30,6 +30,8 @@ const char kProxyPacMandatory[] = "pac_mandatory";
  // String containing proxy bypass rules. For a specification of the
- // expected syntax see net::ProxyBypassRules::ParseFromString().
+ // expected syntax see net::ProxyHostMatchingRules::ParseFromString().
  const char kProxyBypassList[] = "bypass_list";
 +// Boolean telling whether to reverse the meaning of the bypass list.
 +const char kProxyReverseBypass[] = "reverse_bypass";
@@ -1329,6 +1332,18 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
        }
        break;
      }
+diff --git a/net/features.gni b/net/features.gni
+--- a/net/features.gni
++++ b/net/features.gni
+@@ -62,7 +62,7 @@ declare_args() {
+   # Bracketed URIs parsing is only available for debug builds.
+   # TODO(crbug.com/365771838): Ensure tests are updated if needed if this
+   # feature is changed at all.
+-  enable_bracketed_proxy_uris = is_debug
++  enable_bracketed_proxy_uris = true
+ 
+   # General QUIC proxy support is only available for debug builds.
+   # TODO(crbug.com/367400641): If flag is changed or removed, ensure all
 diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
 --- a/net/proxy_resolution/pac_file_fetcher_impl.cc
 +++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
@@ -1420,7 +1435,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_config.h
 --- a/net/proxy_resolution/proxy_config.h
 +++ b/net/proxy_resolution/proxy_config.h
-@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig {
+@@ -106,6 +106,9 @@ class NET_EXPORT ProxyConfig {
      void ParseFromString(std::string_view proxy_rules,
                           bool allow_bracketed_proxy_chains = false,
                           bool is_quic_allowed = false);

build/patches/Add-an-always-incognito-mode.patch

@@ -29,10 +29,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../AppMenuPropertiesDelegateImpl.java        |   7 +-
  .../ChromeContextMenuPopulator.java           |   6 +-
  .../CustomTabActivityLifecycleUmaTracker.java |  31 ----
- .../CustomTabAppMenuPropertiesDelegate.java   |   4 +
+ .../CustomTabAppMenuPropertiesDelegate.java   |   5 +
  .../CustomTabIntentDataProvider.java          |  10 +
  .../browser/download/DownloadUtils.java       |  13 +-
- .../history/HistoryContentManager.java        |   9 +-
+ .../history/HistoryContentManager.java        |  20 +-
  .../browser/history/HistoryManager.java       |  27 ++-
  .../chrome/browser/history/HistoryPage.java   |  16 ++
  .../native_page/NativePageFactory.java        |   4 +-
@@ -46,8 +46,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../tabbed_mode/TabbedRootUiCoordinator.java  |   4 +-
  .../browser/tabmodel/ChromeTabCreator.java    |   5 +-
  .../tabmodel/TabModelSelectorImpl.java        |   3 +
- .../browser/tabmodel/TabPersistentStore.java  |   9 +
- .../browser/toolbar/ToolbarManager.java       |   3 +-
+ .../tabmodel/TabPersistentStoreImpl.java      |   7 +
+ .../browser/toolbar/ToolbarManager.java       |   1 +
  .../webapps/WebappIntentDataProvider.java     |  15 ++
  .../browser/android/historical_tab_saver.cc   |  24 ++-
  .../chrome_autocomplete_provider_client.cc    |   9 +
@@ -55,6 +55,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../remote_suggestions_service_factory.cc     |   5 +
  .../bookmarks/android/bookmark_bridge.cc      |   7 +
  .../host_content_settings_map_factory.cc      |  22 ++-
+ .../webstore_private/webstore_private_api.cc  |  26 ++-
  chrome/browser/history/history_tab_helper.cc  |  20 ++
  chrome/browser/history/history_tab_helper.h   |  10 +-
  .../android/offline_page_bridge.cc            |  11 +-
@@ -67,11 +68,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/prefs/browser_prefs.cc         |   5 +
  chrome/browser/profiles/profile_selections.cc |  10 +
  chrome/browser/profiles/profile_selections.h  |   7 +-
+ .../signin/services/ProfileDataCache.java     |   3 +-
  .../browser/ui/android/native_page/BUILD.gn   |   2 +
  .../browser/ui/native_page/NativePage.java    |  17 +-
  .../browser/omnibox/LocationBarMediator.java  |   8 +
  .../strings/android_chrome_strings.grd        |  25 +++
- .../browser/toolbar/LocationBarModel.java     |   4 +-
  chrome/browser/ui/messages/android/BUILD.gn   |   1 +
  .../snackbar/INeedSnackbarManager.java        |  28 +++
  .../search_engine_tab_helper.cc               |   6 +
@@ -88,7 +89,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../add-an-always-incognito-mode.inc          |   1 +
  .../add-an-always-incognito-mode.inc          |   3 +
  .../add-an-always-incognito-mode.inc          |   1 +
- 69 files changed, 791 insertions(+), 103 deletions(-)
+ 70 files changed, 809 insertions(+), 118 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
@@ -101,7 +102,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
-@@ -638,6 +638,7 @@ chrome_java_resources = [
+@@ -669,6 +669,7 @@ chrome_java_resources = [
    "java/res/xml/main_preferences.xml",
    "java/res/xml/manage_sync_preferences.xml",
    "java/res/xml/personalize_google_services_preferences.xml",
@@ -120,7 +121,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",
-@@ -925,6 +926,7 @@ chrome_java_sources = [
+@@ -949,6 +950,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/privacy/settings/PasswordEchoSettingHandlerFactory.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
    "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -173,7 +174,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -90,6 +90,11 @@ found in the LICENSE file.
+@@ -84,6 +84,11 @@ found in the LICENSE file.
          android:key="secure_dns"
          android:title="@string/settings_secure_dns_title"
          android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
@@ -257,9 +258,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
- import org.chromium.chrome.browser.app.ChromeActivity;
-@@ -837,15 +841,20 @@ public class ChromeTabbedActivity extends ChromeActivity {
-             }
+ import org.chromium.chrome.browser.accessibility.settings.CaretBrowsingDialog;
+@@ -819,15 +823,20 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+                     BrowserWindowType.NORMAL, currentTabModel, mMultiInstanceManager);
  
              // For saving non-incognito tab closures for Recent Tabs.
 -            mHistoricalTabModelObserver =
@@ -286,7 +287,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
              // Defer creation of this helper so it triggers after TabGroupModelFilter observers.
              mUndoRefocusHelper =
                      new UndoRefocusHelper(
-@@ -3299,7 +3308,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3282,7 +3291,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
  
          // We determine SupportedProfileType in onPreCreate().
          // We determine the model as soon as possible so every systems get initialized coherently.
@@ -298,15 +299,15 @@ 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
-@@ -100,6 +100,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
- import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+@@ -106,6 +106,7 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+ import org.chromium.chrome.browser.desktop_site.DesktopSiteUtils;
  import org.chromium.chrome.browser.device.DeviceClassManager;
  import org.chromium.chrome.browser.devtools.DevToolsWindowAndroid;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils;
  import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
  import org.chromium.chrome.browser.download.DownloadManagerService;
-@@ -2076,6 +2077,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2189,6 +2190,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -319,7 +320,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
-@@ -92,6 +92,8 @@ import java.util.Iterator;
+@@ -93,6 +93,8 @@ import java.util.Iterator;
  import java.util.List;
  import java.util.function.Supplier;
  
@@ -328,7 +329,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.
-@@ -635,8 +637,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -669,8 +671,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
                  && !isNativePage
                  && !isFileScheme
                  && !isContentScheme
@@ -343,7 +344,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/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -41,6 +41,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
+@@ -43,6 +43,7 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
@@ -351,7 +352,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
  import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ContextMenuItemType;
-@@ -430,6 +431,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -452,6 +453,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
          mShowEphemeralTabNewLabel = null;
          mCustomActionMap.clear();
  
@@ -361,7 +362,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
          List<ModelList> groupedItems = new ArrayList<>();
  
          if (mParams.isPage() && shouldShowEmptySpaceContextMenu()) {
-@@ -501,7 +505,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -523,7 +527,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -422,20 +423,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -224,6 +225,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-             openInChromeItemVisible = false;
+@@ -240,6 +241,10 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
              tryAddingReadAloud = false;
          }
-+            if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
-+                downloadItemVisible = true;
-+            }
  
-         boolean isNativePage =
-                 url.getScheme().equals(UrlConstants.CHROME_SCHEME)
++        if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
++            downloadItemVisible = true;
++        }
++
+         if (CustomTabIntentDataProvider.isOpenInBrowserDisallowed(mUiType, mIsIncognitoBranded)) {
+             openInChromeItemVisible = false;
+         }
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -105,6 +105,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -106,6 +106,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.device.mojom.ScreenOrientationLockType;
  import org.chromium.net.NetId;
  
@@ -445,7 +447,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;
-@@ -1287,6 +1290,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1362,6 +1365,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          return getInitialActivityWidth() > 0;
      }
  
@@ -499,7 +501,25 @@ 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/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
-@@ -308,8 +308,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -240,16 +240,7 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+                         };
+         mTabSupplier = tabSupplier;
+ 
+-        mHistorySyncPromoCoordinator =
+-                new SigninPromoCoordinator(
+-                        mActivity,
+-                        profile,
+-                        new HistoryPageSigninPromoDelegate(
+-                                mActivity,
+-                                profile,
+-                                SigninAndHistorySyncActivityLauncherImpl.get(),
+-                                this::updateHistorySyncPromoVisibility,
+-                                /* isCreatedInCct= */ launchedForApp));
++        mHistorySyncPromoCoordinator = null;
+ 
+         // History service is not keyed for Incognito profiles and {@link HistoryServiceFactory}
+         // explicitly redirects to use regular profile for Incognito case.
+@@ -308,8 +299,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.generateFooterItems();
  
          // Listen to changes in sign in state.
@@ -511,7 +531,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  
          // Create PrefChangeRegistrar to receive notifications on preference changes.
          mPrefChangeRegistrar = PrefServiceUtil.createFor(profile);
-@@ -386,8 +387,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -386,8 +378,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.onDestroyed();
          mLargeIconBridge.destroy();
          mLargeIconBridge = null;
@@ -549,7 +569,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              mSelectableListLayout = null;
              mRootView = getIncognitoHistoryPlaceholderView();
              return;
-@@ -451,9 +459,22 @@ public class HistoryManager
+@@ -458,9 +466,22 @@ public class HistoryManager
          onBackPressStateChanged();
      }
  
@@ -573,7 +593,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              // If Incognito placeholder is shown no need to call any destroy method.
              return;
          }
-@@ -514,7 +535,7 @@ public class HistoryManager
+@@ -521,7 +542,7 @@ public class HistoryManager
       * @return True if manager handles this event, false if it decides to ignore.
       */
      private boolean onBackPressed() {
@@ -585,7 +605,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryPage.java
-@@ -20,6 +20,14 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -21,6 +21,14 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  
  import java.util.function.Supplier;
  
@@ -600,8 +620,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  /** Native page for managing browsing history. */
  @NullMarked
  public class HistoryPage extends BasicNativePage {
-@@ -49,6 +57,14 @@ public class HistoryPage extends BasicNativePage {
-             String url) {
+@@ -51,6 +59,14 @@ public class HistoryPage extends BasicNativePage {
+             BackPressManager backPressManager) {
          super(host);
  
 +        if (profile.isOffTheRecord() &&
@@ -618,7 +638,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
@@ -626,7 +646,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
  import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
  import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -396,7 +397,8 @@ public class NativePageFactory {
+@@ -425,7 +426,8 @@ public class NativePageFactory {
  
          NativePage page;
  
@@ -879,7 +899,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
  import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation;
-@@ -229,6 +230,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -211,6 +212,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
                              SigninAndHistorySyncActivityLauncherImpl.get(),
                              new SettingsCustomTabLauncherImpl()));
          }
@@ -998,7 +1018,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/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -27,6 +27,7 @@ import org.chromium.build.annotations.Contract;
+@@ -27,6 +27,7 @@ import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
@@ -1006,7 +1026,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ai.AiAssistantService;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
-@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -245,7 +246,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
  
          // When the feature is enabled, show either "New Incognito tab" in incognito mode
          // or "New tab" in normal mode. When the feature is disabled, show both.
@@ -1019,16 +1039,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 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
-@@ -210,6 +210,8 @@ import org.chromium.content_public.common.ContentSwitches;
+@@ -216,6 +216,8 @@ import org.chromium.content_public.common.ContentSwitches;
  import org.chromium.ui.UiUtils;
  import org.chromium.ui.base.ActivityWindowAndroid;
  import org.chromium.ui.base.DeviceFormFactor;
 +import org.chromium.base.ContextUtils;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.ui.base.IntentRequestTracker;
- import org.chromium.ui.base.LocalizationUtils;
+ import org.chromium.ui.base.UiAndroidFeatureList;
  import org.chromium.ui.display.DisplayUtil;
-@@ -1281,7 +1283,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1309,7 +1311,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              () -> {
                                  mTabCreatorManagerSupplier
                                          .get()
@@ -1049,9 +1069,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 +import org.chromium.chrome.browser.tab.TabObserver;
 +
  /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */
- @NullMarked
- public class ChromeTabCreator extends TabCreator
-@@ -587,7 +591,6 @@ public class ChromeTabCreator extends TabCreator
+ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabModelOrderController {
+     /**
+@@ -598,7 +602,6 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
      // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome.
      public @Nullable Tab launchUrlFromExternalApp(
              LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@@ -1062,7 +1082,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
-@@ -20,6 +20,7 @@ import org.chromium.build.annotations.Initializer;
+@@ -20,6 +20,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
@@ -1070,7 +1090,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
-@@ -139,6 +140,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
+@@ -138,6 +139,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
          ProfileProvider profileProvider = mProfileProviderSupplier.get();
          assert profileProvider != null;
  
@@ -1079,19 +1099,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
          TabCreator regularTabCreator = getTabCreatorManager().getTabCreator(false);
          TabCreator incognitoTabCreator = getTabCreatorManager().getTabCreator(true);
          mRecentlyClosedBridge =
-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
-@@ -61,6 +61,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
- import org.chromium.components.embedder_support.util.UrlUtilities;
- import org.chromium.content_public.browser.LoadUrlParams;
- 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
+@@ -32,6 +32,7 @@ import org.chromium.base.task.TaskTraits;
+ import org.chromium.build.annotations.Initializer;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
-+
- import java.io.BufferedInputStream;
- import java.io.ByteArrayInputStream;
- import java.io.DataInputStream;
-@@ -837,6 +839,13 @@ public class TabPersistentStore {
+ import org.chromium.chrome.browser.app.tabmodel.AsyncTabParamsManagerSingleton;
+ import org.chromium.chrome.browser.crypto.CipherFactory;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -723,6 +724,12 @@ public class TabPersistentStoreImpl implements TabPersistentStore {
                  }
              }
          }
@@ -1101,30 +1120,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 +                return;
 +            }
 +        }
-+
          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
-@@ -50,6 +50,7 @@ import org.chromium.base.supplier.OneshotSupplierImpl;
+@@ -53,6 +53,7 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.cc.input.BrowserControlsState;
  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.tabwindow.TabWindowManagerSingleton;
  import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -869,7 +870,7 @@ public class ToolbarManager
-                                 return ret;
-                             }
-                         },
--                        mToolbarPositionSupplier);
-+                        mToolbarPositionSupplier, AlwaysIncognitoLinkInterceptor.isAlwaysIncognito());
-         mControlContainer = controlContainer;
-         mToolbarHairline = mControlContainer.findViewById(R.id.toolbar_hairline);
- 
+ import org.chromium.chrome.browser.back_press.BackPressMetrics;
 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
@@ -1186,7 +1195,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
  using base::android::JavaParamRef;
  using base::android::JavaRef;
  using base::android::ScopedJavaLocalRef;
-@@ -101,7 +106,8 @@ std::vector<std::optional<base::Uuid>> StringsToUuids(
+@@ -89,7 +94,8 @@ std::vector<std::optional<base::Uuid>> StringsToUuids(
  
  void CreateHistoricalTab(
      TabAndroid* tab_android,
@@ -1196,7 +1205,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!tab_android) {
      return;
    }
-@@ -112,9 +118,14 @@ void CreateHistoricalTab(
+@@ -100,9 +106,14 @@ void CreateHistoricalTab(
      return;
    }
  
@@ -1213,16 +1222,16 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!service) {
      return;
    }
-@@ -178,7 +189,7 @@ void CreateHistoricalBulkClosure(
+@@ -166,7 +177,7 @@ void CreateHistoricalBulkClosure(
          per_tab_optional_tab_group_ids,
-     std::vector<raw_ptr<TabAndroid, VectorExperimental>> tabs,
+     std::vector<TabAndroid*> tabs,
      std::vector<WebContentsStateByteBuffer> web_contents_state) {
 -  DCHECK(model);
 +  if (!model) return;
    DCHECK_EQ(tab_group_ids.size(), group_titles.size());
    DCHECK_EQ(tab_group_ids.size(), group_colors.size());
    DCHECK_EQ(tab_group_ids.size(), tab_group_ids.size());
-@@ -292,11 +303,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -280,11 +291,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
      const JavaParamRef<jobject>& jtab_android,
      const JavaParamRef<jobject>& state,
@@ -1240,7 +1249,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
 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
-@@ -461,6 +461,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
+@@ -462,6 +462,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
    return AimEligibilityServiceFactory::GetForProfile(profile_);
  }
  
@@ -1295,7 +1304,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -37,6 +37,7 @@
+@@ -33,6 +33,7 @@
  #include "base/strings/strcat.h"
  #include "base/strings/utf_string_conversions.h"
  #include "base/uuid.h"
@@ -1303,7 +1312,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  #include "chrome/browser/bookmarks/bookmark_model_factory.h"
  #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
  #include "chrome/browser/commerce/shopping_service_factory.h"
-@@ -214,6 +215,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
+@@ -210,6 +211,12 @@ static ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
    if (!profile)
      return nullptr;
  
@@ -1364,6 +1373,84 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
  #if BUILDFLAG(ENABLE_EXTENSIONS)
    // These must be registered before before the HostSettings are passed over to
    // the IOThread.  Simplest to do this on construction.
+diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
++++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+@@ -80,6 +80,12 @@
+ #include "chrome/browser/safe_browsing/safe_browsing_service.h"
+ #endif
+ 
++#if BUILDFLAG(IS_ANDROID)
++#include "chrome/common/pref_names.h"
++#include "components/prefs/pref_registry_simple.h"
++#include "components/prefs/pref_service.h"
++#endif
++
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
+ 
+ using safe_browsing::SafeBrowsingNavigationObserverManager;
+@@ -220,6 +226,16 @@ const int kExtensionReferrerUserGestureLimit = 2;
+ 
+ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+ 
++Profile* GetProfileInIncognito(Profile* profile) {
++#if BUILDFLAG(IS_ANDROID)
++  if (profile->GetOriginalProfile()
++             ->GetPrefs()->GetBoolean(prefs::kAlwaysIncognitoEnabled)) {
++    return profile->GetOriginalProfile();
++  }
++#endif
++  return profile;
++}
++
+ // We allow the web store to set a string containing login information when a
+ // purchase is made, so that when a user logs into sync with a different
+ // account we can recognize the situation. The Get function returns the login if
+@@ -426,7 +442,7 @@ WebstorePrivateBeginInstallWithManifest3Function::Run() {
+   params_ = Params::Create(args());
+   EXTENSION_FUNCTION_VALIDATE(params_);
+ 
+-  profile_ = Profile::FromBrowserContext(browser_context());
++  profile_ = GetProfileInIncognito(Profile::FromBrowserContext(browser_context()));
+ 
+   if (!crx_file::id_util::IdIsValid(details().id)) {
+     return RespondNow(BuildResponse(api::webstore_private::Result::kInvalidId,
+@@ -948,7 +964,7 @@ void WebstorePrivateBeginInstallWithManifest3Function::
+   DCHECK(extension);
+   DCHECK(contents);
+ 
+-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
++  Profile* profile = GetProfileInIncognito(Profile::FromBrowserContext(contents->GetBrowserContext()));
+ 
+   std::string message_from_admin =
+       ExtensionManagementFactory::GetForBrowserContext(profile)
+@@ -984,7 +1000,7 @@ WebstorePrivateCompleteInstallFunction::Run() {
+   std::optional<CompleteInstall::Params> params =
+       CompleteInstall::Params::Create(args());
+   EXTENSION_FUNCTION_VALIDATE(params);
+-  Profile* const profile = Profile::FromBrowserContext(browser_context());
++  Profile* const profile = GetProfileInIncognito(Profile::FromBrowserContext(browser_context()));
+   if (profile->IsGuestSession() || profile->IsOffTheRecord()) {
+     return RespondNow(Error(kIncognitoError));
+   }
+@@ -1302,7 +1318,7 @@ ExtensionFunction::ResponseValue
+ WebstorePrivateGetExtensionStatusFunction::BuildResponseWithoutManifest(
+     const ExtensionId& extension_id) {
+   ExtensionInstallStatus status = GetWebstoreExtensionInstallStatus(
+-      extension_id, Profile::FromBrowserContext(browser_context()));
++      extension_id, GetProfileInIncognito(Profile::FromBrowserContext(browser_context())));
+   api::webstore_private::ExtensionInstallStatus api_status =
+       ConvertExtensionInstallStatusForAPI(status);
+   return ArgumentList(GetExtensionStatus::Results::Create(api_status));
+@@ -1316,7 +1332,7 @@ void WebstorePrivateGetExtensionStatusFunction::OnManifestParsed(
+     return;
+   }
+ 
+-  Profile* const profile = Profile::FromBrowserContext(browser_context());
++  Profile* const profile = GetProfileInIncognito(Profile::FromBrowserContext(browser_context()));
+   if (!ExtensionsBrowserClient::Get()->IsValidContext(profile)) {
+     Respond(Error(kWebstoreUserCancelledError));
+     return;
 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
@@ -1377,7 +1464,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
  #else
  #include "chrome/browser/ui/browser.h"
  #include "chrome/browser/ui/browser_finder.h"
-@@ -614,6 +617,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -627,6 +630,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1391,7 +1478,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
    if (profile->IsOffTheRecord())
      return nullptr;
  
-@@ -621,6 +631,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -634,6 +644,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1411,7 +1498,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
 diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
 --- a/chrome/browser/history/history_tab_helper.h
 +++ b/chrome/browser/history/history_tab_helper.h
-@@ -17,6 +17,8 @@
+@@ -18,6 +18,8 @@
  #include "components/translate/core/browser/translate_driver.h"
  #include "content/public/browser/web_contents_observer.h"
  #include "content/public/browser/web_contents_user_data.h"
@@ -1420,7 +1507,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
  
  namespace history {
  struct HistoryAddPageArgs;
-@@ -59,6 +61,11 @@ class HistoryTabHelper
+@@ -60,6 +62,11 @@ class HistoryTabHelper
    std::optional<std::string> GetAppId() { return app_id_; }
  #endif
  
@@ -1740,7 +1827,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
-@@ -257,6 +257,7 @@
+@@ -262,6 +262,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1748,7 +1835,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
  #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
  #include "chrome/browser/android/preferences/browser_prefs_android.h"
-@@ -2203,6 +2204,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1774,6 +1775,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1810,10 +1897,28 @@ diff --git a/chrome/browser/profiles/profile_selections.h b/chrome/browser/profi
    kOwnInstance,           // Original: Self        --  OTR: Self
    kRedirectedToOriginal,  // Original: Self        --  OTR: Original
    kOffTheRecordOnly       // Original: No Profile  --  OTR: Self
+diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCache.java b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCache.java
+--- a/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCache.java
++++ b/chrome/browser/signin/services/android/java/src/org/chromium/chrome/browser/signin/services/ProfileDataCache.java
+@@ -134,13 +134,12 @@ public class ProfileDataCache implements AccountInfoService.Observer {
+     @VisibleForTesting
+     ProfileDataCache(
+             Context context,
+-            IdentityManager identityManager,
++            IdentityManager identityManagerNotUsed,
+             @Px int imageSize,
+             @Nullable BadgeConfig badgeConfig) {
+         // TODO(crbug.com/341948846): Remove AccountInfoService and update
+         // populateCache/populateCacheForAllAccounts to use identityManager to get the list of
+         // accounts
+-        assert identityManager != null;
+         mContext = context;
+         mImageSize = imageSize;
+         mDefaultBadgeConfig = badgeConfig;
 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
-@@ -31,6 +31,8 @@ robolectric_library("junit") {
+@@ -34,6 +34,8 @@ robolectric_library("junit") {
  
    deps = [
      ":java",
@@ -1834,7 +1939,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
  /** An interface for pages that will be using Android views instead of html/rendered Web content. */
  @NullMarked
  public interface NativePage {
-@@ -187,7 +189,8 @@ public interface NativePage {
+@@ -201,7 +203,8 @@ public interface NativePage {
       */
      static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) {
          return url != null
@@ -1844,7 +1949,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -197,7 +200,7 @@ public interface NativePage {
+@@ -211,7 +214,7 @@ public interface NativePage {
       *     not have chrome or chrome-native scheme.
       */
      static boolean isChromePageUrl(GURL url, boolean isIncognito) {
@@ -1853,7 +1958,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -211,7 +214,8 @@ public interface NativePage {
+@@ -225,7 +228,8 @@ public interface NativePage {
              GURL url,
              @Nullable NativePage candidatePage,
              boolean isIncognito,
@@ -1863,7 +1968,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          if (hasPdfDownload) {
              // For navigation with associated pdf download (e.g. open a pdf link), pdf page should
              // be created.
-@@ -229,7 +233,7 @@ public interface NativePage {
+@@ -243,7 +247,7 @@ public interface NativePage {
              // created after the pdf document is re-downloaded in other parts of the code.
              return NativePageType.NONE;
          } else {
@@ -1872,7 +1977,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          }
      }
  
-@@ -241,7 +245,7 @@ public interface NativePage {
+@@ -255,7 +259,7 @@ public interface NativePage {
       *     which do not have chrome or chrome-native scheme.
       */
      private static @NativePageType int chromePageType(
@@ -1881,7 +1986,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          String host = url.getHost();
          String scheme = url.getScheme();
          if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme)
-@@ -261,7 +265,8 @@ public interface NativePage {
+@@ -275,7 +279,8 @@ public interface NativePage {
              return NativePageType.DOWNLOADS;
          } else if (UrlConstants.HISTORY_HOST.equals(host)) {
              return NativePageType.HISTORY;
@@ -1894,7 +1999,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -99,6 +99,11 @@ import org.chromium.ui.interpolators.Interpolators;
+@@ -108,6 +108,11 @@ import org.chromium.ui.interpolators.Interpolators;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.url.GURL;
  
@@ -1904,9 +2009,9 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +import org.chromium.chrome.browser.preferences.Pref;
 +
  import java.util.ArrayList;
+ import java.util.Collection;
  import java.util.List;
- import java.util.function.BooleanSupplier;
-@@ -448,6 +453,9 @@ class LocationBarMediator
+@@ -528,6 +533,9 @@ class LocationBarMediator
          if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return;
          Tab tab = mLocationBarDataProvider.getTab();
          if (tab == null) return;
@@ -1919,7 +2024,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -6669,6 +6669,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6990,6 +6990,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">
          Cookies, cache, and other site data
        </message>
@@ -1951,27 +2056,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_QUICK_DELETE_DIALOG_SEARCH_HISTORY_DISAMBIGUATION_TEXT" desc="Text for signed in users only in the Quick Delete dialog, that is shown when the user clicks on 'Clear browsing data' option in the three dots menu, informing signed in users that search history and other forms of Activity saved in their Google account will not be deleted.">
          <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
        </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
-@@ -167,6 +167,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
-     protected GURL mVisibleGurl = GURL.emptyGURL();
-     protected String mFormattedFullUrl;
-     protected String mUrlForDisplay;
-+    private boolean mIsAlwaysIncognito;
- 
-     // notifyUrlChanged and notifySecurityStateChanged are usually called 3 times across a same
-     // document navigation. The first call is usually necessary, which updates the UrlBar to reflect
-@@ -191,7 +192,8 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
-             NewTabPageDelegate newTabPageDelegate,
-             UrlFormatter urlFormatter,
-             OfflineStatus offlineStatus,
--            ObservableSupplier<@ControlsPosition Integer> toolbarPositionSupplier) {
-+            ObservableSupplier<@ControlsPosition Integer> toolbarPositionSupplier,
-+            boolean isAlwaysIncognito) {
-         mContext = context;
-         mNtpDelegate = newTabPageDelegate;
-         mUrlFormatter = urlFormatter;
 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
@@ -2027,7 +2111,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
  #include "chrome/common/url_constants.h"
  #include "components/search_engines/template_url.h"
  #include "components/search_engines/template_url_fetcher.h"
-@@ -165,6 +166,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
+@@ -166,6 +167,11 @@ void SearchEngineTabHelper::PageHasOpenSearchDescriptionDocument(
  
    // Download the OpenSearch description document. If this is successful, a
    // new keyword will be created when done.
@@ -2042,7 +2126,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
 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
-@@ -4101,6 +4101,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -4153,6 +4153,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
  
@@ -2058,7 +2142,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
-@@ -120,10 +120,12 @@ void PrefProvider::RegisterProfilePrefs(
+@@ -129,10 +129,12 @@ void PrefProvider::RegisterProfilePrefs(
  
  PrefProvider::PrefProvider(PrefService* prefs,
                             bool off_the_record,
@@ -2071,25 +2155,24 @@ 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");
-@@ -146,11 +148,13 @@ PrefProvider::PrefProvider(PrefService* prefs,
+@@ -155,10 +157,12 @@ PrefProvider::PrefProvider(PrefService* prefs,
    WebsiteSettingsRegistry* website_settings =
        WebsiteSettingsRegistry::GetInstance();
    for (const WebsiteSettingsInfo* info : *website_settings) {
 +    bool save_site_settings = force_save_site_settings_ &&
 +      info->incognito_behavior() == WebsiteSettingsInfo::INHERIT_IN_INCOGNITO;
      content_settings_prefs_.insert(std::make_pair(
-         info->type(),
-         std::make_unique<ContentSettingsPref>(
-             info->type(), prefs_, &pref_change_registrar_, info->pref_name(),
--            info->partitioned_pref_name(), off_the_record_, restore_session,
-+            info->partitioned_pref_name(), off_the_record_ && !save_site_settings, restore_session,
-             base::BindRepeating(&PrefProvider::Notify,
-                                 base::Unretained(this)))));
+         info->type(), std::make_unique<ContentSettingsPref>(
+                           info->type(), prefs_, &pref_change_registrar_,
+-                          info->pref_name(), off_the_record_, restore_session,
++                          info->pref_name(), off_the_record_ && !save_site_settings, restore_session,
+                           base::BindRepeating(&PrefProvider::Notify,
+                                               base::Unretained(this)))));
    }
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h
 --- a/components/content_settings/core/browser/content_settings_pref_provider.h
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.h
-@@ -38,6 +38,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -37,6 +37,7 @@ class PrefProvider : public UserModifiableProvider {
  
    PrefProvider(PrefService* prefs,
                 bool off_the_record,
@@ -2097,7 +2180,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
                 bool store_last_modified,
                 bool restore_session);
  
-@@ -130,6 +131,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -117,6 +118,7 @@ class PrefProvider : public UserModifiableProvider {
    raw_ptr<PrefService> prefs_;
  
    const bool off_the_record_;
@@ -2108,7 +2191,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
 diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
 --- a/components/content_settings/core/browser/host_content_settings_map.cc
 +++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -288,6 +288,7 @@ struct ContentSettingEntry {
+@@ -287,6 +287,7 @@ struct ContentSettingEntry {
  
  HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
                                                 bool is_off_the_record,
@@ -2116,7 +2199,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                                                 bool store_last_modified,
                                                 bool restore_session,
                                                 bool should_record_metrics)
-@@ -297,6 +298,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -296,6 +297,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
  #endif
        prefs_(prefs),
        is_off_the_record_(is_off_the_record),
@@ -2124,7 +2207,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
        store_last_modified_(store_last_modified),
        allow_invalid_secondary_pattern_for_testing_(false),
        clock_(base::DefaultClock::GetInstance()) {
-@@ -310,7 +312,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -309,7 +311,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2144,7 +2227,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -551,6 +552,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -556,6 +557,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -2156,10 +2239,10 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc
 --- a/components/omnibox/browser/autocomplete_provider_client.cc
 +++ b/components/omnibox/browser/autocomplete_provider_client.cc
-@@ -81,3 +81,7 @@ AutocompleteProviderClient::GetGeminiPrototypeOmniboxService() const {
+@@ -77,3 +77,7 @@ base::WeakPtr<AutocompleteProviderClient>
+ AutocompleteProviderClient::GetWeakPtr() {
    return nullptr;
  }
- #endif  // BUILDFLAG(IS_IOS)
 +
 +bool AutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
 +  return false;
@@ -2167,7 +2250,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
-@@ -161,6 +161,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
+@@ -154,6 +154,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
    virtual bool IsOffTheRecord() const = 0;
    virtual bool IsIncognitoProfile() const = 0;
    virtual bool IsGuestSession() const = 0;
@@ -2178,7 +2261,7 @@ 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
-@@ -401,7 +401,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
+@@ -403,7 +403,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
  
    // Don't make a suggest request if in incognito mode; unless for the Lens
    // searchboxes.
@@ -2190,7 +2273,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
-@@ -921,7 +921,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
+@@ -948,7 +948,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
    // is required.
    // Request for suggestions in OTR contexts is not allowed; except for the Lens
    // searchboxes.

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

@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../app/bookmarks/BookmarkActivity.java       |  32 ++
  .../native_page/NativePageFactory.java        |   9 +-
  chrome/browser/BUILD.gn                       |  11 +-
- .../bookmarks/android/bookmark_bridge.cc      | 197 ++++++++++++
+ .../bookmarks/android/bookmark_bridge.cc      | 193 ++++++++++++
  .../bookmarks/android/bookmark_bridge.h       |  30 +-
  .../browser/bookmarks/BookmarkBridge.java     |  39 +++
  .../browser/bookmarks/BookmarkDelegate.java   |  10 +
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
  ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
  ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 40 files changed, 810 insertions(+), 24 deletions(-)
+ 40 files changed, 806 insertions(+), 24 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -65,8 +65,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
  
 -    <uses-permission-sdk-23 android:name="android.permission.READ_CONTACTS"/>
      <uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
-     <uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
  
+     <!--  Needed for allowing downloaded APKs to be installed. -->
 diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 --- a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
 +++ b/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
  import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid;
  import org.chromium.chrome.browser.back_press.BackPressManager;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
-@@ -60,7 +61,7 @@ import java.util.function.Supplier;
+@@ -61,7 +62,7 @@ import java.util.function.Supplier;
   */
  @NullMarked
  public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -111,8 +111,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
      private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
      private final Supplier<ShareDelegate> mShareDelegateSupplier;
      private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
-@@ -91,7 +92,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
-     private final BackPressManager mBackPressManager;
+@@ -93,7 +94,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+     private final MultiInstanceManager mMultiInstanceManager;
  
      public TabbedModeTabDelegateFactory(
 -            Activity activity,
@@ -200,7 +200,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/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+@@ -26,6 +26,7 @@ import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
  import org.chromium.chrome.browser.back_press.BackPressManager;
  import org.chromium.chrome.browser.bookmarks.BookmarkPage;
-@@ -76,7 +77,7 @@ import java.util.function.Supplier;
+@@ -79,7 +80,7 @@ import java.util.function.Supplier;
   */
  @NullMarked
  public class NativePageFactory {
@@ -217,8 +217,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
      private final BottomSheetController mBottomSheetController;
      private final BrowserControlsManager mBrowserControlsManager;
      private final Supplier<@Nullable Tab> mCurrentTabSupplier;
-@@ -100,7 +101,7 @@ public class NativePageFactory {
-     private final BackPressManager mBackPressManager;
+@@ -104,7 +105,7 @@ public class NativePageFactory {
+     private final MultiInstanceManager mMultiInstanceManager;
  
      public NativePageFactory(
 -            Activity activity,
@@ -226,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
              BottomSheetController sheetController,
              BrowserControlsManager browserControlsManager,
              Supplier<@Nullable Tab> currentTabSupplier,
-@@ -175,7 +176,7 @@ public class NativePageFactory {
+@@ -182,7 +183,7 @@ public class NativePageFactory {
  
      @VisibleForTesting
      static class NativePageBuilder {
@@ -235,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
          private final BottomSheetController mBottomSheetController;
          private final Supplier<NewTabPageCreationTracker> mNewTabPageCreationTracker;
          private final BrowserControlsManager mBrowserControlsManager;
-@@ -284,7 +285,7 @@ public class NativePageFactory {
+@@ -299,7 +300,7 @@ public class NativePageFactory {
                              mTabModelSelector,
                              mEdgeToEdgeControllerSupplier),
                      mActivity.getComponentName(),
@@ -247,7 +247,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
-@@ -205,6 +205,8 @@ static_library("browser") {
+@@ -207,6 +207,8 @@ static_library("browser") {
      "bad_message.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -256,7 +256,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/chrome_bookmark_client.cc",
      "bookmarks/chrome_bookmark_client.h",
      "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1625,6 +1627,13 @@ static_library("browser") {
+@@ -1573,6 +1575,13 @@ static_library("browser") {
      "webdata_services/web_data_service_factory.cc",
    ]
  
@@ -270,7 +270,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3715,8 +3724,6 @@ static_library("browser") {
+@@ -3733,8 +3742,6 @@ static_library("browser") {
        "bookmarks/bookmark_expanded_state_tracker.h",
        "bookmarks/bookmark_expanded_state_tracker_factory.cc",
        "bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -282,7 +282,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -68,6 +68,28 @@
+@@ -64,6 +64,28 @@
  #include "content/public/browser/web_contents.h"
  #include "url/gurl.h"
  
@@ -311,7 +311,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  // Must come after all headers that specialize FromJniType() / ToJniType().
  #include "chrome/browser/bookmarks/android/jni_headers/BookmarkBridge_jni.h"
  
-@@ -296,6 +318,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -292,6 +314,10 @@ BookmarkBridge::~BookmarkBridge() {
    partner_bookmarks_shim_observation_.Reset();
    bookmark_model_observation_.Reset();
    profile_observation_.Reset();
@@ -322,7 +322,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -847,6 +873,177 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -843,6 +869,173 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -449,13 +449,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    return "";
 +  }
 +
-+  if (fileLength > 10 * 1024 * 1024) {
-+    select_file_dialog_->ShowToast("Bookmark file is bigger than 10MB");
-+    return "";
-+  }
-+
 +  std::vector<char> buffer(fileLength);
-+  if (-1 == file.ReadAtCurrentPos(buffer.data(), fileLength)) {
++  base::span<uint8_t> buffer_span = base::as_writable_byte_span(buffer);
++  if (-1 == file.ReadAtCurrentPos(buffer_span)) {
 +    select_file_dialog_->ShowToast("Could not read bookmarks file");
 +    return "";
 +  }
@@ -775,7 +771,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /** Keeps track of whether drag is enabled / active for bookmark lists. */
      private class BookmarkDragStateDelegate implements DragStateDelegate {
          private BookmarkDelegate mBookmarkDelegate;
-@@ -655,6 +701,14 @@ class BookmarkManagerMediator
+@@ -646,6 +692,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -790,7 +786,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /** See BookmarkManager(Coordinator)#updateForUrl */
      void updateForUrl(String url) {
          // Bookmark model is null if the manager has been destroyed.
-@@ -827,6 +881,235 @@ class BookmarkManagerMediator
+@@ -818,6 +872,235 @@ class BookmarkManagerMediator
          }
      }
  
@@ -1057,8 +1053,8 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 +            new ModalDialogManager(
 +                new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP));
          initWithView(mBookmarkManagerCoordinator.getView());
-     }
  
+         setBackPressHandler(mBookmarkManagerCoordinator, backPressManager);
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -1251,20 +1247,20 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 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
-@@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kBatchTabRestore,
+@@ -264,6 +264,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kAuxiliarySearchHistoryDonation,
      &kBlockIntentsWhileLocked,
      &kBookmarkPaneAndroid,
 +    &kBookmarksExportUseSaf,
      &kBrowserControlsDebugging,
      &kBrowserControlsEarlyResize,
-     &kCacheActivityTaskID,
+     &kBrowserControlsRenderDrivenShowConstraint,
 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
-@@ -712,6 +712,7 @@ public abstract class ChromeFeatureList {
-     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
+@@ -713,6 +713,7 @@ public abstract class ChromeFeatureList {
              "UseLibunwindstackNativeUnwinderAndroid";
+     public static final String VERIFY_QWACS = "VerifyQWACs";
      public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
      public static final String WEB_APK_BACKUP_AND_RESTORE_BACKEND = "WebApkBackupAndRestoreBackend";
@@ -1325,7 +1321,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /** Whether Chrome is set as the default browser. Default value is false. */
      public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
-@@ -1067,6 +1069,7 @@ public final class ChromePreferenceKeys {
+@@ -1125,6 +1127,7 @@ public final class ChromePreferenceKeys {
                  AUXILIARY_SEARCH_SCHEMA_VERSION,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1336,7 +1332,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 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
-@@ -252,6 +252,24 @@ CHAR_LIMIT guidelines:
+@@ -264,6 +264,24 @@ CHAR_LIMIT guidelines:
        <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
          Sites
        </message>
@@ -1364,7 +1360,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -222,6 +222,13 @@ static_library("utility") {
+@@ -211,6 +211,13 @@ static_library("utility") {
      deps += [ "//chrome/services/pdf:lib" ]
    }
  
@@ -1574,8 +1570,8 @@ 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
-@@ -171,6 +171,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
-       owning_window->GetJavaObject());
+@@ -196,6 +196,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
+       suggested_name.value(), owning_window->GetJavaObject());
  }
  
 +void SelectFileDialogImpl::ShowToast(const std::string& message) {
@@ -1628,7 +1624,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_linux.h b/ui/shell_dialogs/sele
 diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/select_file_dialog_win.cc
 --- a/ui/shell_dialogs/select_file_dialog_win.cc
 +++ b/ui/shell_dialogs/select_file_dialog_win.cc
-@@ -193,6 +193,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
+@@ -192,6 +192,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog,
                              int index);
  
    bool HasMultipleFileTypeChoicesImpl() override;
@@ -1636,7 +1632,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_win.cc b/ui/shell_dialogs/selec
  
    // Returns the filter to be used while displaying the open/save file dialog.
    // This is computed from the extensions for the file types being opened.
-@@ -270,6 +271,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
+@@ -269,6 +270,10 @@ bool SelectFileDialogImpl::HasMultipleFileTypeChoicesImpl() {
    return has_multiple_file_type_choices_;
  }
  

build/patches/Add-cromite-flags-support.patch

@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../homepage/settings/HomepageSettings.java   |   2 +-
  .../privacy/settings/PrivacySettings.java     |   2 +-
  .../settings/FragmentDependencyProvider.java  |  10 +-
- .../browser/settings/SettingsActivity.java    |  42 ++++-
+ .../browser/settings/SettingsActivity.java    |  41 ++++-
  .../tracing/settings/DeveloperSettings.java   |   5 +-
  chrome/browser/about_flags.cc                 |  11 ++
  chrome/browser/browser_features.cc            |   1 +
@@ -54,7 +54,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../core/offline_page_feature.cc              |   1 +
  .../offline_pages/core/offline_page_feature.h |   1 +
  .../browser/features/password_features.cc     |   1 +
- components/permissions/features.cc            |   2 +
+ components/permissions/features.cc            |   1 +
  ...nthetic_trials_active_group_id_provider.cc |   4 +-
  ...ynthetic_trials_active_group_id_provider.h |   4 +-
  components/webui/flags/flags_state.cc         |  59 ++++++
@@ -106,7 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  third_party/blink/public/common/features.h    |   1 +
  ui/base/ui_base_features.cc                   |   1 +
  ui/base/ui_base_features.h                    |   1 +
- 93 files changed, 848 insertions(+), 32 deletions(-)
+ 93 files changed, 846 insertions(+), 32 deletions(-)
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -143,7 +143,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -170,6 +170,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -174,6 +174,8 @@ use_epoll = is_linux || is_chromeos || is_android
  # This does not include test code (test support and anything in the test
  # directory) which should use source_set as is recommended for GN targets).
  component("base") {
@@ -152,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
    sources = [
      "allocator/allocator_check.cc",
      "allocator/allocator_check.h",
-@@ -1048,7 +1050,7 @@ component("base") {
+@@ -1061,7 +1063,7 @@ component("base") {
      "//build/config/compiler:wglobal_constructors",
    ]
  
@@ -191,7 +191,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned
 diff --git a/base/feature_list.cc b/base/feature_list.cc
 --- a/base/feature_list.cc
 +++ b/base/feature_list.cc
-@@ -42,6 +42,31 @@
+@@ -43,6 +43,31 @@
  
  namespace base {
  
@@ -223,7 +223,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  namespace {
  
  // Pointer to the FeatureList instance singleton that was set via
-@@ -471,6 +496,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
    return g_feature_list_instance->IsFeatureEnabled(feature);
  }
  
@@ -270,7 +270,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  // static
  bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
    return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
-@@ -738,6 +803,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -739,6 +804,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
  
  void FeatureList::FinalizeInitialization() {
    DCHECK(!initialized_);
@@ -463,7 +463,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -44,6 +44,10 @@ found in the LICENSE file.
+@@ -38,6 +38,10 @@ found in the LICENSE file.
          android:key="do_not_track"
          android:title="@string/do_not_track_title"
          android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -477,7 +477,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -40,7 +40,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -41,7 +41,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
  
      @Override
@@ -489,7 +489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -132,7 +132,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      }
  
      @Override
@@ -509,7 +509,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.build.annotations.NullMarked;
-@@ -71,24 +72,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -68,24 +69,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
      private final OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
      private final OneshotSupplier<BottomSheetController> mBottomSheetControllerSupplier;
      private final ObservableSupplier<@Nullable ModalDialogManager> mModalDialogManagerSupplier;
@@ -551,19 +551,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  
 +import android.app.Activity;
  import android.annotation.SuppressLint;
+ import android.app.ActivityManager;
  import android.content.Context;
- import android.content.Intent;
-@@ -39,7 +40,9 @@ import org.chromium.base.CallbackUtils;
- import org.chromium.base.DeviceInfo;
- import org.chromium.base.Log;
+@@ -43,6 +44,7 @@ import org.chromium.base.Log;
  import org.chromium.base.metrics.RecordHistogram;
-+import java.util.function.Supplier;
+ import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.base.supplier.ObservableSupplier;
 +import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.OneshotSupplierImpl;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
-@@ -49,12 +52,14 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
+@@ -54,6 +56,7 @@ import org.chromium.chrome.browser.back_press.BackPressHelper.OnKeyDownHandler;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
@@ -571,6 +569,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
  import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
+@@ -61,6 +64,7 @@ import org.chromium.chrome.browser.settings.search.SettingsSearchCoordinator;
  import org.chromium.chrome.browser.ui.device_lock.MissingDeviceLockLauncher;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
@@ -578,7 +577,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
  import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
-@@ -107,6 +112,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -115,6 +119,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                  PreferenceUpdateObserver {
      private static final String TAG = "SettingsActivity";
  
@@ -619,16 +618,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
      @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
      public static final String EXTRA_SHOW_FRAGMENT = "show_fragment";
  
-@@ -184,7 +223,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -205,7 +243,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                          mProfile,
                          mSnackbarManagerSupplier,
                          mBottomSheetControllerSupplier,
 -                        getModalDialogManagerSupplier()),
 +                        getModalDialogManagerSupplier(),
 +                        () -> new RequestRestartDelegate(mSnackbarManagerSupplier, this)),
-                 true /* recursive */);
+                 /* recursive= */ true);
          fragmentManager.registerFragmentLifecycleCallbacks(
-                 new WideDisplayPaddingApplier(), false /* recursive */);
+                 new WideDisplayPaddingApplier(), /* recursive= */ true);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
@@ -654,7 +653,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
 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
-@@ -387,6 +387,10 @@ using flags_ui::kOsLinux;
+@@ -389,6 +389,10 @@ using flags_ui::kOsLinux;
  using flags_ui::kOsMac;
  using flags_ui::kOsWin;
  
@@ -665,9 +664,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  namespace about_flags {
  
  namespace {
-@@ -4966,6 +4970,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {
-      std::size(kSeamlessSigninPromoTypeTwoButtons), nullptr}};
- #endif  // BUILDFLAG(IS_ANDROID)
+@@ -5291,6 +5295,10 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
+ };
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -676,7 +675,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  // RECORDING USER METRICS FOR FLAGS:
  // -----------------------------------------------------------------------------
  // The first line of the entry is the internal name.
-@@ -4992,6 +5000,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {
+@@ -5317,6 +5325,9 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = {
  const FeatureEntry kFeatureEntries[] = {
  // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
  // //tools/flags/generate_unexpire_flags.py.
@@ -689,7 +688,7 @@ 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
-@@ -313,4 +313,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
+@@ -284,4 +284,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
  // show both in Chrome Tabs and Windows.
  BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -698,7 +697,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
 diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h
 --- a/chrome/browser/browser_features.h
 +++ b/chrome/browser/browser_features.h
-@@ -126,6 +126,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+@@ -118,6 +118,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
  // module, e.g.
  // //chrome/browser/<foo_module>/features.h
  //
@@ -748,19 +747,20 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 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
-@@ -1159,5 +1159,6 @@ BASE_FEATURE(kUseLibunwindstackNativeUnwinderAndroid,
- // a descriptive text.
- BASE_FEATURE(kWebOtpCrossDeviceSimpleString, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -840,6 +840,7 @@ BASE_FEATURE(kXplatSyncedSetup, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ // clang-format on
  
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
  }  // namespace android
  }  // namespace chrome
+ 
 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
-@@ -354,6 +354,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(
-     "snippet_as_subtitle",
-     /*default_value=*/false);
+@@ -375,6 +375,7 @@ inline constexpr base::FeatureParam<bool>
+                                            "snippet_as_subtitle",
+                                            /*default_value=*/false);
  
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_h.inc"
  }  // namespace chrome::android
@@ -769,7 +769,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 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
-@@ -19,6 +19,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam;
+@@ -20,6 +20,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam;
  import org.chromium.components.cached_flags.IntCachedFeatureParam;
  import org.chromium.components.cached_flags.StringCachedFeatureParam;
  
@@ -780,7 +780,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
  
-@@ -1111,7 +1115,7 @@ public abstract class ChromeFeatureList {
+@@ -1118,7 +1122,7 @@ public abstract class ChromeFeatureList {
              newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
      // keep-sorted end
  
@@ -789,7 +789,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
              List.of(
                      // keep-sorted start
                      sAccountForSuppressedKeyboardInsets,
-@@ -1268,6 +1272,13 @@ public abstract class ChromeFeatureList {
+@@ -1282,6 +1286,13 @@ public abstract class ChromeFeatureList {
                      // keep-sorted end
                      );
  
@@ -969,24 +969,24 @@ new file mode 100644
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -664,4 +664,5 @@ bool IsAndroidAnimatedProgressBarInBrowserEnabled() {
+@@ -788,4 +788,5 @@ BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT);
  
- BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kTabGroupsFocusing, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
  }  // namespace features
 diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
 --- a/chrome/browser/unexpire_flags.cc
 +++ b/chrome/browser/unexpire_flags.cc
-@@ -8,6 +8,7 @@
- #include "base/containers/contains.h"
+@@ -11,6 +11,7 @@
  #include "base/containers/flat_map.h"
+ #include "base/feature_list.h"
  #include "base/no_destructor.h"
 +#include "chrome/browser/about_flags.h"
  #include "chrome/browser/expired_flags_list.h"
  #include "chrome/browser/unexpire_flags_gen.h"
  #include "chrome/common/chrome_version.h"
-@@ -114,7 +115,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
+@@ -117,7 +118,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
  
    // Otherwise, the flag is expired if its expiration mstone is less than the
    // mstone of this copy of Chromium.
@@ -1010,7 +1010,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
 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
-@@ -1696,5 +1696,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -1906,5 +1906,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
  // happen silently without prompting an updating dialog.
  BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
               base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1020,7 +1020,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 diff --git a/components/browser_ui/accessibility/android/BUILD.gn b/components/browser_ui/accessibility/android/BUILD.gn
 --- a/components/browser_ui/accessibility/android/BUILD.gn
 +++ b/components/browser_ui/accessibility/android/BUILD.gn
-@@ -61,6 +61,7 @@ android_library("lib_java") {
+@@ -73,6 +73,7 @@ android_library("lib_java") {
      ":page_zoom_utils_java",
      "//base:base_java",
      "//build/android:build_java",
@@ -1044,9 +1044,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -28,9 +28,11 @@ import org.chromium.components.omnibox.OmniboxFeatures;
- import org.chromium.content_public.browser.ContentFeatureList;
+@@ -30,9 +30,11 @@ import org.chromium.content_public.browser.ContentFeatureList;
  import org.chromium.content_public.browser.ContentFeatureMap;
+ import org.chromium.ui.base.UiAndroidFeatureList;
  
 +import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +
@@ -1054,10 +1054,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
  @NullMarked
 -public class AccessibilitySettings extends PreferenceFragmentCompat
 +public class AccessibilitySettings extends ChromeBaseSettingsFragment
-         implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener {
-     public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
-     public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT =
-@@ -69,7 +71,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+         implements EmbeddableSettingsPage,
+                 Preference.OnPreferenceChangeListener,
+                 CustomDividerFragment {
+@@ -78,7 +80,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
      }
  
      @Override
@@ -1092,7 +1092,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
  import androidx.annotation.ColorInt;
  import androidx.annotation.VisibleForTesting;
  import androidx.preference.PreferenceViewHolder;
-@@ -43,6 +45,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat
+@@ -42,6 +44,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat implements Co
      /** Indicates if the preference uses a custom layout. */
      private final boolean mHasCustomLayout;
  
@@ -1104,7 +1104,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
      // TOOD(crbug.com/1451550): This is an interim solution. In the long-term, we should migrate
      // away from a switch with dynamically changing summaries onto a radio group.
      /**
-@@ -67,6 +74,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat
+@@ -66,6 +73,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat implements Co
  
          mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs);
          mUseSummaryAsTitle = true;
@@ -1126,7 +1126,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 diff --git a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 --- a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 +++ b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
-@@ -155,7 +155,7 @@ public class CachedFlag extends Flag {
+@@ -159,7 +159,7 @@ public class CachedFlag extends Flag {
          editor.putBoolean(getSharedPreferenceKey(), featureValue);
      }
  
@@ -1135,7 +1135,7 @@ diff --git a/components/cached_flags/android/java/src/org/chromium/components/ca
          // Create the key only once to avoid String concatenation every flag check.
          if (mPreferenceKey == null) {
              mPreferenceKey = CachedFlagsSharedPreferences.FLAGS_CACHED.createKey(mFeatureName);
-@@ -163,6 +163,12 @@ public class CachedFlag extends Flag {
+@@ -167,6 +167,12 @@ public class CachedFlag extends Flag {
          return mPreferenceKey;
      }
  
@@ -1162,7 +1162,7 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 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
-@@ -160,5 +160,6 @@ BASE_FEATURE(kContentSettingsPartitioning, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -143,5 +143,6 @@ const base::FeatureParam<EnableForIframeTypes>
  
  BASE_FEATURE(kForceAllowStorageAccess, base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -1198,24 +1198,23 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
 diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
 --- a/components/password_manager/core/browser/features/password_features.cc
 +++ b/components/password_manager/core/browser/features/password_features.cc
-@@ -183,4 +183,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
+@@ -201,4 +201,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
+ BASE_FEATURE(kUseActionablesForImprovedPasswordChange,
               base::FEATURE_DISABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_ANDROID)
  
 +#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
  }  // namespace password_manager::features
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -107,6 +107,8 @@ BASE_FEATURE(kSafetyHubUnusedPermissionRevocationForAllSurfaces,
- BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
+@@ -120,6 +120,7 @@ BASE_FEATURE(kReturnDeniedForNotificationsWhenNoAppLevelSettings,
+ BASE_FEATURE(kPermissionPredictionsGeolocationAccuracy,
               base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
-+
+ 
 +#include "cromite_flags/components_permissions_features_cc.inc"
  }  // namespace features
- namespace feature_params {
  
+ namespace feature_params {
 diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc
 --- a/components/variations/synthetic_trials_active_group_id_provider.cc
 +++ b/components/variations/synthetic_trials_active_group_id_provider.cc
@@ -1555,8 +1554,8 @@ diff --git a/components/webui/flags/resources/experiment.html.ts b/components/we
    return html`<!--_html_template_start_-->
  <div class="experiment" id="${this.feature_.internal_name}">
 -  <div class="flex-container">
-+  <div class="flex-container" class="${(this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
-+                                       + (this.feature_.is_default_value_on ? "experiment-on" : "")}">
++  <div class="${"flex-container " + (this.feature_.is_cromite && this.feature_.is_new ? "cromite " : "")
++                                  + (this.feature_.is_default_value_on ? "experiment-on" : "")}">
      <div class="flex">
        ${this.showingSearchHit_? html`
          <h2 class="experiment-name clone" id="${this.getHeaderId_()}"
@@ -1640,7 +1639,7 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
-@@ -675,4 +675,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
+@@ -750,4 +750,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
               blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument);
  }
  
@@ -1649,7 +1648,7 @@ diff --git a/content/common/features.cc b/content/common/features.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
-@@ -1411,4 +1411,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
+@@ -1438,4 +1438,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
               features::kPushSubscriptionChangeEventOnResubscribe);
  }
  
@@ -1658,7 +1657,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
-@@ -409,6 +409,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
+@@ -420,6 +420,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
  
@@ -2004,7 +2003,7 @@ new file mode 100755
 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
-@@ -1730,5 +1730,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -1750,5 +1750,5 @@ uint32_t GetPassthroughAudioFormats() {
    return 0;
  #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  }
@@ -2014,7 +2013,7 @@ diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
 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
-@@ -609,5 +609,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
+@@ -556,5 +556,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
  MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
  
  }  // namespace media
@@ -2024,18 +2023,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -839,4 +839,5 @@ BASE_FEATURE_PARAM(size_t,
-                    "cache_size",
-                    64);
+@@ -846,4 +846,5 @@ BASE_FEATURE(kAddAutomaticWithDohFallbackMode,
+ BASE_FEATURE(kUseQuicProxiesWithoutWaitingForConnectResponse,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/net_base_features_cc.inc"
  }  // namespace net::features
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -935,6 +935,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDnsFilteringDetails);
- NET_EXPORT BASE_DECLARE_FEATURE(kUpdateIsMainFrameOriginRecentlyAccessed);
- NET_EXPORT BASE_DECLARE_FEATURE_PARAM(size_t, kRecentlyAccessedOriginCacheSize);
+@@ -911,6 +911,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kAddAutomaticWithDohFallbackMode);
+ NET_EXPORT BASE_DECLARE_FEATURE(
+     kUseQuicProxiesWithoutWaitingForConnectResponse);
  
 +#include "cromite_flags/net_base_features_h.inc"
  }  // namespace net::features
@@ -2044,18 +2043,18 @@ diff --git a/net/base/features.h b/net/base/features.h
 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
-@@ -587,4 +587,5 @@ BASE_FEATURE_PARAM(bool,
-                    "url_loader",
-                    true);
+@@ -611,4 +611,5 @@ BASE_FEATURE(kNetworkServicePerPriorityTaskQueues,
+ BASE_FEATURE(kUseUnexportableKeyServiceInBrowserProcess,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/services_network_public_cpp_features_cc.inc"
  }  // namespace network::features
 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
-@@ -361,6 +361,7 @@ BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerResourceScheduler);
+@@ -383,6 +383,7 @@ BASE_DECLARE_FEATURE(kNetworkServicePerPriorityTaskQueues);
  COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES)
- BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerURLLoader);
+ BASE_DECLARE_FEATURE(kUseUnexportableKeyServiceInBrowserProcess);
  
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
  }  // namespace network::features
@@ -2064,7 +2063,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
 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
-@@ -2633,4 +2633,5 @@ bool IsXrDevice() {
+@@ -2647,4 +2647,5 @@ bool IsXrDevice() {
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2073,7 +2072,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
 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
-@@ -1917,6 +1917,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
+@@ -1960,6 +1960,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2084,7 +2083,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
 diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 --- a/ui/base/ui_base_features.cc
 +++ b/ui/base/ui_base_features.cc
-@@ -434,4 +434,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -449,4 +449,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT);
  
  BASE_FEATURE(kStringWidthCache, base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -2093,7 +2092,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
 --- a/ui/base/ui_base_features.h
 +++ b/ui/base/ui_base_features.h
-@@ -267,6 +267,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors);
+@@ -270,6 +270,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors);
  COMPONENT_EXPORT(UI_BASE_FEATURES)
  BASE_DECLARE_FEATURE(kStringWidthCache);
  

build/patches/Add-cromite-test-support.patch

@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-@@ -145,6 +145,7 @@ import org.chromium.ui.base.SelectFileDialog;
+@@ -149,6 +149,7 @@ import org.chromium.ui.base.SelectFileDialog;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
  import org.chromium.url.GURL;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
  
  import java.io.File;
  import java.nio.charset.StandardCharsets;
-@@ -713,7 +714,10 @@ public class ProcessInitializationHandler {
+@@ -729,7 +730,10 @@ public class ProcessInitializationHandler {
  
          tasks.add(
                  () -> {
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -188,6 +188,11 @@ source_set("shell_integration") {
+@@ -190,6 +190,11 @@ source_set("shell_integration") {
  # require many files from it. This makes linking more efficient.
  static_library("browser") {
    sources = [
@@ -139,7 +139,7 @@ diff --git a/chrome/browser/android/devtools_server.cc b/chrome/browser/android/
  #include "content/public/common/content_switches.h"
  #include "content/public/common/url_constants.h"
  #include "net/base/net_errors.h"
-@@ -64,6 +66,8 @@ const int kBackLog = 10;
+@@ -64,6 +66,8 @@ const int kBackLog = 4096;
  
  bool AuthorizeSocketAccessWithDebugPermission(
      const net::UnixDomainServerSocket::Credentials& credentials) {
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b
  #include "chrome/browser/chrome_browser_interface_binders_webui.h"
  #include "chrome/browser/chrome_content_browser_client.h"
  #include "chrome/browser/chrome_content_browser_client_parts.h"
-@@ -494,6 +495,15 @@ void ChromeContentBrowserClient::
+@@ -492,6 +493,15 @@ void ChromeContentBrowserClient::
                                                      render_frame_host);
        },
        &render_frame_host));
@@ -412,7 +412,7 @@ new file mode 100644
 diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
 --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
 +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
-@@ -182,6 +182,7 @@ public class NotificationPermissionController implements UnownedUserData {
+@@ -181,6 +181,7 @@ public class NotificationPermissionController {
       * @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise.
       */
      public boolean requestPermissionIfNeeded(boolean contextual) {
@@ -423,18 +423,18 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/b
 diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc
 +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -210,6 +210,7 @@ static const base::Feature* kBadFeatureFlagsInAboutFlags[] = {
+@@ -220,6 +220,7 @@ static const std::variant<const base::Feature*, const char*>
  
  #if BUILDFLAG(IS_ANDROID)
-     &chrome::android::kCommandLineOnNonRooted,
-+    &features::kEnableCromiteTestSupport,
+         &chrome::android::kCommandLineOnNonRooted,
++        &features::kEnableCromiteTestSupport,
  #endif
  
-     // This flag disables security for the Page Embedded Permission Control, for
+         // This flag disables security for the Page Embedded Permission Control,
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -671,6 +671,7 @@ mojom("mojo_bindings") {
+@@ -666,6 +666,7 @@ mojom("mojo_bindings") {
    sources = [
      "chrome_render_frame.mojom",
      "google_accounts_private_api_extension.mojom",
@@ -457,7 +457,7 @@ new file mode 100644
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -80,6 +80,8 @@ static_library("renderer") {
+@@ -79,6 +79,8 @@ static_library("renderer") {
      "chrome_render_thread_observer.cc",
      "chrome_render_thread_observer.h",
      "custom_menu_commands.h",
@@ -477,7 +477,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
  #include "chrome/renderer/google_accounts_private_api_extension.h"
  #include "chrome/renderer/loadtimes_extension_bindings.h"
  #include "chrome/renderer/media/flash_embed_rewrite.h"
-@@ -661,6 +662,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -650,6 +651,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
  
    TrustedVaultEncryptionKeysExtension::Create(render_frame);
    GoogleAccountsPrivateApiExtension::Create(render_frame);
@@ -785,15 +785,15 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
  #include "base/functional/bind.h"
  #include "base/functional/callback_helpers.h"
  #include "base/json/json_writer.h"
-@@ -46,6 +47,7 @@
- #include "content/public/browser/devtools_manager_delegate.h"
+@@ -47,6 +48,7 @@
  #include "content/public/browser/devtools_socket_factory.h"
  #include "content/public/common/content_client.h"
+ #include "content/public/common/content_constants.h"
 +#include "content/public/common/content_features.h"
  #include "content/public/common/content_switches.h"
  #include "content/public/common/url_constants.h"
  #include "net/base/io_buffer.h"
-@@ -588,9 +590,12 @@ void DevToolsHttpHandler::OnJsonRequest(
+@@ -602,9 +604,12 @@ void DevToolsHttpHandler::OnJsonRequest(
  
    if (command == "version") {
      base::Value::Dict version;
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console
 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
-@@ -319,6 +319,8 @@
+@@ -316,6 +316,8 @@
  #include "url/origin.h"
  #include "url/url_constants.h"
  
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
  #if BUILDFLAG(IS_ANDROID)
  #include "content/browser/accessibility/browser_accessibility_manager_android.h"
  #include "content/browser/android/content_url_loader_factory.h"
-@@ -4773,7 +4775,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -4786,7 +4788,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
    if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
                                          updated_source_id,
                                          untrusted_stack_trace)) {
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
    }
  
    // Pass through log severity only on builtin components pages to limit console
-@@ -4790,8 +4793,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -4803,8 +4806,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
    const bool is_off_the_record =
        GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
  

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

@@ -18,21 +18,21 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../customtabs/CustomTabsConnection.java      |  3 +-
  .../IncognitoCustomTabIntentDataProvider.java | 14 +++++
  .../privacy/settings/PrivacySettings.java     | 51 +++++++++++++++++++
- .../flags/android/chrome_feature_list.cc      |  5 +-
+ .../flags/android/chrome_feature_list.cc      |  4 +-
  .../browser/flags/ChromeFeatureList.java      |  3 ++
  .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++-
  ...Add-custom-tab-intents-privacy-option.grdp | 25 +++++++++
  .../OriginVerifier.java                       |  5 ++
  .../core/common/language_experiments.cc       |  1 +
  .../add-custom-tab-intents-privacy-option.inc |  1 +
- 13 files changed, 158 insertions(+), 14 deletions(-)
+ 13 files changed, 158 insertions(+), 13 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -52,6 +52,21 @@ found in the LICENSE file.
+@@ -46,6 +46,21 @@ found in the LICENSE file.
          android:key="cromite_flags"
          android:title="@string/cromite_flags_title"
          app:url="@string/cromite_flags_url" />
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -62,6 +62,9 @@ import java.lang.annotation.Retention;
+@@ -65,6 +65,9 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  /**
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
-@@ -264,6 +267,9 @@ public class LaunchIntentDispatcher {
+@@ -262,6 +265,9 @@ public class LaunchIntentDispatcher {
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          Log.w(
                  TAG,
                  "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -292,6 +298,10 @@ public class LaunchIntentDispatcher {
+@@ -290,6 +296,10 @@ public class LaunchIntentDispatcher {
          // Make sure the result of the CustomTabActivity is forwarded to the client.
          newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
  
@@ -88,7 +88,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());
-@@ -489,6 +499,17 @@ public class LaunchIntentDispatcher {
+@@ -486,6 +496,17 @@ public class LaunchIntentDispatcher {
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -238,16 +238,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -239,16 +239,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
  
      // Extra whose value is an array of ints that is supplied to
      // SyntheticTrialRegistry::RegisterExternalExperiments().
@@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  
      /**
       * Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab
-@@ -689,7 +689,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -697,7 +697,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
                                  TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION,
                                  ScreenOrientation.DEFAULT));
  
@@ -141,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  
          mBreakPointDp = getActivityBreakPointFromIntent(intent);
          mInitialActivityHeight = getInitialActivityHeightFromIntent(intent);
-@@ -702,8 +702,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -710,8 +710,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
                          intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT);
          mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED;
  
@@ -152,7 +152,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
              @BackgroundInteractBehavior
              int backgroundInteractBehavior =
                      IntentUtils.safeGetIntExtra(
-@@ -1294,7 +1294,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1369,7 +1369,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
      public @CustomTabProfileType int getCustomTabMode() {
          return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                  ? CustomTabProfileType.INCOGNITO
@@ -166,7 +166,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -782,7 +782,7 @@ public class CustomTabsConnection {
+@@ -786,7 +786,7 @@ public class CustomTabsConnection {
          ThreadUtils.assertOnUiThread();
          if (extras == null) return;
          int[] experimentIds =
@@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
          if (experimentIds == null) return;
          // When ids are set through cct, they should not override existing ids.
          boolean override = false;
-@@ -999,6 +999,7 @@ public class CustomTabsConnection {
+@@ -1003,6 +1003,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
-@@ -43,6 +43,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -44,6 +44,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
  import java.util.ArrayList;
  import java.util.List;
  
@@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
  /**
   * A model class that parses the incoming intent for incognito Custom Tabs specific customization
   * data.
-@@ -125,6 +128,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -133,6 +136,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
      }
  
      private static boolean isIntentFromThirdPartyAllowed() {
@@ -206,7 +206,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
          return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
      }
  
-@@ -222,6 +228,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -230,6 +236,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
      }
  
      public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
          if (!isIncognitoRequested(intent)) return false;
          var session = SessionHolder.getSessionHolderFromIntent(intent);
          if (isIntentFromThirdPartyAllowed()
-@@ -332,6 +342,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -340,6 +350,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
  
      @Override
      public @CustomTabProfileType int getCustomTabMode() {
@@ -239,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import android.os.Bundle;
  import android.text.SpannableString;
  import android.text.style.ClickableSpan;
-@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
+@@ -80,6 +81,15 @@ import org.chromium.ui.text.SpanApplier;
  import java.util.concurrent.TimeUnit;
  import java.util.function.Consumer;
  
@@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import androidx.preference.PreferenceCategory;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.base.shared_preferences.SharedPreferencesManager;
-@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -148,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
      }
  
@@ -265,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -376,6 +389,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
      }
  
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
-@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -396,6 +412,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
          } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -307,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -428,6 +469,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                      UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
@@ -327,33 +327,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
-@@ -909,8 +909,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -713,7 +713,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);
  // Enables an experimental feature which forces mayLaunchUrl to use a different
  // storage partition. This may reduce performance. This should not be enabled by
  // default.
--BASE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
--             base::FEATURE_DISABLED_BY_DEFAULT);
+-BASE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition, base::FEATURE_DISABLED_BY_DEFAULT);
 +CROMITE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
 +                "MayLaunchUrlUsesSeparateStoragePartition",
 +                base::FEATURE_DISABLED_BY_DEFAULT);
- 
  BASE_FEATURE(kMediaIndicatorsAndroid, base::FEATURE_DISABLED_BY_DEFAULT);
- 
+ BASE_FEATURE(kMiniOriginBar, base::FEATURE_ENABLED_BY_DEFAULT);
+ BASE_FEATURE(kMostVisitedTilesCustomization, base::FEATURE_ENABLED_BY_DEFAULT);
 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
-@@ -991,6 +991,8 @@ public abstract class ChromeFeatureList {
+@@ -989,6 +989,8 @@ public abstract class ChromeFeatureList {
                      MOST_VISITED_TILES_CUSTOMIZATION,
-                     /* defaultValue= */ false,
+                     /* defaultValue= */ true,
                      /* defaultValueInTests= */ true);
 +    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition =
 +            newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
      public static final CachedFlag sMostVisitedTilesReselect =
              newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
      public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -1224,6 +1226,7 @@ public abstract class ChromeFeatureList {
+@@ -1236,6 +1238,7 @@ public abstract class ChromeFeatureList {
+                     sMaliciousApkDownloadCheck,
                      sMiniOriginBar,
-                     sMitigateLegacySearchEnginePromoOverlap,
                      sMostVisitedTilesCustomization,
 +                    sMayLaunchurlUsesSeparateStoragePartition,
                      sMostVisitedTilesReselect,

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

@@ -17,18 +17,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -123,6 +123,7 @@ found in the LICENSE file.
+@@ -125,6 +125,7 @@ found in the LICENSE file.
      <item type="id" name="ntp_feed_header_menu_item_toggle_switch" />
  
      <!-- App Menu -->
 +    <item type="id" name="exit_id" />
      <item type="id" name="icon_row_menu_id" />
+     <item type="id" name="submenu_header_menu_id" />
      <item type="id" name="forward_menu_id" />
-     <item type="id" name="bookmark_this_page_id" />
 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
-@@ -358,6 +358,8 @@ import java.util.Set;
+@@ -363,6 +363,8 @@ import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.function.Supplier;
  
@@ -37,7 +37,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.
-@@ -3882,6 +3884,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3901,6 +3903,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                      .closeTabs(
                              TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
              RecordUserAction.record("MobileTabClosed");
@@ -49,7 +49,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
-@@ -63,6 +63,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+@@ -68,6 +68,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
@@ -57,7 +57,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;
-@@ -2529,6 +2530,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2633,6 +2634,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return true;
          }
  
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -410,6 +410,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -422,6 +422,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
              maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
              modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
          }
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 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
-@@ -4317,6 +4317,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4437,6 +4437,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <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

@@ -26,20 +26,20 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/functional/bind.h"
-@@ -571,6 +572,15 @@ AutocompleteController::AutocompleteController(
-           provider_client_->GetOmniboxTriggeredFeatureService()),
+@@ -553,6 +554,15 @@ AutocompleteController::AutocompleteController(
        steady_state_omnibox_position_(
-           metrics::OmniboxEventProto::UNKNOWN_POSITION) {
+           metrics::OmniboxEventProto::UNKNOWN_POSITION),
+       config_(config) {
 +  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {
 +    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
-+    provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
++    config_.provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
 +        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
 +    if (!base::Contains(flag_value, "bookmarks"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
++      config_.provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
 +    if (!base::Contains(flag_value, "chrome"))
-+      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
++      config_.provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
 +  }
-   provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
+   config_.provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
  
    // Providers run in the order they're added. Async providers should run first
 diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
  #include "base/functional/callback.h"
  #include "base/i18n/break_iterator.h"
  #include "base/i18n/case_conversion.h"
-@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -659,6 +660,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/i18n/char_iterator.h"
-@@ -644,6 +646,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -640,6 +642,8 @@ GURL FixupURLInternal(const std::string& text,
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
      if (chrome_url && !parts.host.is_valid()) {

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

@@ -8,40 +8,13 @@ with limited CPU/memory resources and it is disabled by default.
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../common/network_features.cc                  |  3 +++
- .../common/network_features.h                   |  4 ++++
  .../common/network_switch_list.h                |  4 ++++
  .../spoof_checks/top_domains/BUILD.gn           |  1 +
  ...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++
  net/socket/client_socket_pool_manager.cc        | 17 +++++++++++++++++
- 6 files changed, 46 insertions(+)
+ 4 files changed, 39 insertions(+)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc
 
-diff --git a/components/network_session_configurator/common/network_features.cc b/components/network_session_configurator/common/network_features.cc
---- a/components/network_session_configurator/common/network_features.cc
-+++ b/components/network_session_configurator/common/network_features.cc
-@@ -8,4 +8,7 @@
- 
- namespace features {
- 
-+const char kMaxConnectionsPerHostChoiceDefault[] = "6",
-+                 kMaxConnectionsPerHostChoice15[] = "15";
-+
- }  // namespace features
-diff --git a/components/network_session_configurator/common/network_features.h b/components/network_session_configurator/common/network_features.h
---- a/components/network_session_configurator/common/network_features.h
-+++ b/components/network_session_configurator/common/network_features.h
-@@ -10,6 +10,10 @@
- 
- namespace features {
- 
-+NETWORK_SESSION_CONFIGURATOR_EXPORT extern const char kMaxConnectionsPerHostChoiceDefault[],
-+                 kMaxConnectionsPerHostChoice6[],
-+                 kMaxConnectionsPerHostChoice15[];
-+
- }  // namespace features
- 
- #endif  // COMPONENTS_NETWORK_SESSION_CONFIGURATOR_COMMON_NETWORK_FEATURES_H_
 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
 --- a/components/network_session_configurator/common/network_switch_list.h
 +++ b/components/network_session_configurator/common/network_switch_list.h
@@ -54,8 +27,8 @@ diff --git a/components/network_session_configurator/common/network_switch_list.
 +NETWORK_SWITCH(kMaxConnectionsPerHost, "max-connections-per-host")
 +
  // Ignores certificate-related errors.
- NETWORK_SWITCH(kIgnoreCertificateErrors, "ignore-certificate-errors")
- 
+ // Note: In tests using net::EmbeddedTestServer with a custom hostname not
+ // covered by the default test certs, using this switch is usually incorrect.
 diff --git a/components/url_formatter/spoof_checks/top_domains/BUILD.gn b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 --- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn
 +++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn
@@ -75,8 +48,8 @@ new file mode 100644
 +#ifdef FEATURE_PARAM_SECTION
 +
 +const FeatureEntry::Choice kMaxConnectionsPerHostChoices[] = {
-+    {features::kMaxConnectionsPerHostChoiceDefault, "", ""},
-+    {features::kMaxConnectionsPerHostChoice15, switches::kMaxConnectionsPerHost, "15"},
++    {/*features::kMaxConnectionsPerHostChoiceDefault*/ "6", "", ""},
++    {/*features::kMaxConnectionsPerHostChoice15*/ "15", switches::kMaxConnectionsPerHost, "15"},
 +};
 +
 +#endif
@@ -92,7 +65,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -22,6 +22,10 @@
+@@ -21,6 +21,10 @@
  #include "net/socket/client_socket_handle.h"
  #include "net/socket/client_socket_pool.h"
  #include "net/socket/connect_job.h"
@@ -103,8 +76,8 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  #include "net/ssl/ssl_config.h"
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
-@@ -187,6 +191,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
- int ClientSocketPoolManager::max_sockets_per_group(
+@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(
+ size_t ClientSocketPoolManager::max_sockets_per_group(
      HttpNetworkSession::SocketPoolType pool_type) {
    DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
 +

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

@@ -45,10 +45,10 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1172,6 +1172,7 @@ component("net") {
+@@ -1182,6 +1182,7 @@ component("net") {
      ":net_deps",
-     "//components/miracle_parameter/common",
      "//components/network_time/time_tracker",
+     "//components/unexportable_keys",
 +    "//components/network_session_configurator/common",
      "//net/http:transport_security_state_generated_files",
      "//third_party/simdutf",

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

@@ -15,14 +15,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../ExternalNavigationDelegateImpl.java       |  4 ++-
  .../cromite/sAllowExternalIntentRequests.java | 33 +++++++++++++++++++
  ...g-to-disable-external-intent-requests.grdp |  9 +++++
- .../android/external_intents_features.cc      |  7 +++-
+ .../android/external_intents_features.cc      |  6 ++++
  .../android/external_intents_features.h       |  1 +
  .../ExternalIntentsFeatures.java              |  6 ++++
  .../ExternalNavigationHandler.java            | 21 ++++++++++++
  ...ag-to-disable-external-intent-requests.inc | 13 ++++++++
  ...t-Delete-block-external-form-redirects.inc | 15 +++++++++
  ...ag-to-disable-external-intent-requests.inc |  3 ++
- 12 files changed, 118 insertions(+), 3 deletions(-)
+ 12 files changed, 118 insertions(+), 2 deletions(-)
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAllowExternalIntentRequests.java
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-flag-to-disable-external-intent-requests.grdp
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-to-disable-external-intent-requests.inc
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -77,7 +77,12 @@ found in the LICENSE file.
+@@ -71,7 +71,12 @@ found in the LICENSE file.
          android:title="@string/settings_incognito_tab_lock_title"
          android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
          android:persistent="false" />
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
  import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
-@@ -156,6 +157,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+@@ -155,6 +156,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
  
          @Override
          public boolean shouldDisableAllExternalIntents() {
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
-@@ -25,6 +25,7 @@ import org.chromium.base.PackageManagerUtils;
+@@ -26,6 +26,7 @@ import org.chromium.base.ResettersForTesting;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.ChromeTabbedActivity2;
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.document.ChromeLauncherActivity;
-@@ -119,7 +120,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+@@ -134,7 +135,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
      @Override
      public boolean shouldDisableExternalIntentRequestsForUrl(
              ExternalNavigationParams params, Intent intent) {
@@ -141,17 +141,9 @@ new file mode 100644
 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
-@@ -29,7 +29,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kNavigationCaptureRefactorAndroid,  &kAuxiliaryNavigationStaysInBrowser,
-     &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA,
-     &kAuxiliaryNavigationStaysInPWA};
--
- }  // namespace
- 
- // Alphabetical:
-@@ -52,7 +51,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA,
- 
- BASE_FEATURE(kAuxiliaryNavigationStaysInPWA, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -35,7 +35,13 @@ BASE_FEATURE(kExternalNavigationDebugLogs, base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kNavigationCaptureRefactorAndroid,
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
 +                "IntentBlockExternalFormRedirectsNoGesture",
@@ -173,7 +165,7 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c
 +BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture);
  BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs);
  BASE_DECLARE_FEATURE(kBlockFrameRenavigations);
- BASE_DECLARE_FEATURE(kBlockIntentsToSelf);
+ BASE_DECLARE_FEATURE(kNavigationCaptureRefactorAndroid);
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
@@ -188,12 +180,12 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 +            new ExternalIntentsFeature(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
 +
      public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
-     public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf";
      public static final String NAVIGATION_CAPTURE_REFACTOR_ANDROID_NAME =
+             "NavigationCaptureRefactorAndroid";
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -1623,6 +1623,12 @@ public class ExternalNavigationHandler {
+@@ -1726,6 +1726,12 @@ public class ExternalNavigationHandler {
          return false;
      }
  
@@ -206,7 +198,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
      private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
              ExternalNavigationParams params,
              Intent targetIntent,
-@@ -1716,6 +1722,21 @@ public class ExternalNavigationHandler {
+@@ -1811,6 +1817,21 @@ public class ExternalNavigationHandler {
              return OverrideUrlLoadingResult.forNoOverride();
          }
  

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

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -105,6 +105,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -106,6 +106,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
    if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
      WebRuntimeFeatures::EnableMediaSession(false);
    }
@@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
  
  // Maximum number of entries in a vibration pattern.
  const unsigned kVibrationPatternLengthMax = 99;
-@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -105,6 +106,8 @@ bool VibrationController::vibrate(Navigator& navigator,
    // reference to |window| or |navigator| was retained in another window.
    if (!navigator.DomWindow())
      return false;
@@ -104,7 +104,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
-@@ -1070,6 +1070,10 @@
+@@ -1138,6 +1138,10 @@
      {
        name: "CompositingDecisionAtAnimationPhaseBoundaries"
      },

build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch

@@ -8,13 +8,13 @@ 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
 ---
  build/config/compiler/BUILD.gn | 17 ++++++++++++++---
- build_overrides/build.gni      |  3 +++
- 2 files changed, 17 insertions(+), 3 deletions(-)
+ build_overrides/build.gni      |  5 +++++
+ 2 files changed, 19 insertions(+), 3 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -715,7 +715,7 @@ config("compiler") {
+@@ -734,7 +734,7 @@ config("compiler") {
      # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
      # It also causes segfault on Linux s390x:
      # https://github.com/llvm/llvm-project/issues/149511
@@ -23,7 +23,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
        cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
      }
    }
-@@ -1848,7 +1848,7 @@ config("clang_revision") {
+@@ -1830,7 +1830,7 @@ config("clang_revision") {
  # e.g. by setting in the the project's .gn file.
  config("clang_warning_suppression") {
    # Some build configs use older versions of clang that don't support WSMs
@@ -32,7 +32,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
      from_build_root =
          rebase_path(clang_warning_suppression_file, root_build_dir)
      inputs = [ clang_warning_suppression_file ]
-@@ -2183,7 +2183,9 @@ config("default_warnings") {
+@@ -2192,7 +2192,9 @@ config("default_warnings") {
        # TODO(crbug.com/432275627): Fix and re-enable.
        "-Wno-uninitialized-const-pointer",
      ]
@@ -43,7 +43,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
      cflags_cc += [
        # TODO(crbug.com/328490295): Fix and re-enable for C flags.
        "-Wenum-compare-conditional",
-@@ -2237,6 +2239,15 @@ config("default_warnings") {
+@@ -2246,6 +2248,15 @@ config("default_warnings") {
        ldflags += [ "-Wno-version-check" ]
      }
  
@@ -62,14 +62,16 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -54,6 +54,9 @@ declare_args() {
-   # Allows googletest to pretty-print various absl types.
+@@ -54,6 +54,11 @@ declare_args() {
    gtest_enable_absl_printers = true
+ }
  
++declare_args() {
 +  # Allows clangd builds by suppressing unsupported parameters
 +  skip_clangd_unsupported_options = false
++}
 +
-   # Allow projects that wish to stay on C++17 to override Chromium's default.
-   # TODO(crbug.com/40251117): evaluate removing this end of 2023
-   use_cxx17 = false
+ # Features used by //base/trace_event.
+ declare_args() {
+   # Use Perfetto's trace processor for converting protobuf-encoded traces to
 --

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

@@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/browser/content_settings_utils.h     |  6 ++
  .../core/common/content_settings_enums.mojom  |  9 ++
  .../page_info/PageInfoController.java         |  4 +-
- .../PermissionParamsListBuilder.java          | 13 ++-
+ .../PermissionParamsListBuilder.java          | 12 ++-
  .../android/page_info_controller_android.cc   | 10 ++-
  components/page_info/page_info.cc             |  2 +
  components/page_info/page_info.h              |  1 +
@@ -87,9 +87,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/permissions/permission_prompt.h    |  3 +-
  components/permissions/permission_request.cc  | 34 +++++++-
  components/permissions/permission_request.h   | 18 +++-
- .../permissions/permission_request_manager.cc | 45 ++++++----
+ .../permissions/permission_request_manager.cc | 49 ++++++-----
  .../permissions/permission_request_manager.h  | 11 ++-
- 37 files changed, 507 insertions(+), 73 deletions(-)
+ 37 files changed, 508 insertions(+), 75 deletions(-)
 
 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -178,7 +178,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
  OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
  
  OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
-@@ -255,6 +281,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
+@@ -260,6 +286,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
    for (auto& observer : observer_list_) {
      observer.OnLastPageFromOriginClosed(origin);
    }
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/keyed_service/core/keyed_service.h"
  #include "content/public/browser/visibility.h"
-@@ -24,7 +25,7 @@ class OneTimePermissionsTracker : public KeyedService {
+@@ -26,7 +27,7 @@ class OneTimePermissionsTracker : public KeyedService {
        void (OneTimePermissionsTracker::*)(const url::Origin&);
  
   public:
@@ -211,7 +211,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
    ~OneTimePermissionsTracker() override;
  
    OneTimePermissionsTracker(const OneTimePermissionsTracker&) = delete;
-@@ -138,7 +139,7 @@ class OneTimePermissionsTracker : public KeyedService {
+@@ -147,7 +148,7 @@ class OneTimePermissionsTracker : public KeyedService {
    base::ObserverList<OneTimePermissionsTrackerObserver> observer_list_;
  
    std::map<url::Origin, OriginTrackEntry> origin_tracker_;
@@ -233,7 +233,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
-@@ -228,7 +228,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
+@@ -227,7 +227,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
        active_chip_permission_request_manager_.value()->Accept();
        break;
      case permissions::PermissionAction::GRANTED_ONCE:
@@ -269,7 +269,7 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v
 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
-@@ -689,6 +689,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -715,6 +715,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
      }
  
      @RequiresNonNull({"mSite"})
@@ -281,7 +281,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();
-@@ -1295,6 +1300,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1407,6 +1412,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
                                  .getDefaultColor());
              }
          }
@@ -295,7 +295,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
-@@ -224,7 +224,7 @@ void GetOrigins(JNIEnv* env,
+@@ -242,7 +242,7 @@ void GetOrigins(JNIEnv* env,
        seen_origins.push_back(origin);
        insertionFunc(env, static_cast<int>(content_type), list,
                      ConvertOriginToJavaString(env, origin), jembedder,
@@ -307,7 +307,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
-@@ -649,6 +649,11 @@
+@@ -652,6 +652,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>
@@ -425,33 +425,33 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
-@@ -376,8 +376,8 @@ public class PageInfoController
+@@ -387,9 +387,9 @@ public class PageInfoController
       */
      @CalledByNative
      private void addPermissionSection(
--            String name, String nameMidSentence, int type, boolean allowed) {
--        mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed);
-+            String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) {
-+        mPermissionParamsListBuilder.addPermissionEntry(name, nameMidSentence, type, allowed, is_user_session);
+-            String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
++            String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
+         mPermissionParamsListBuilder.addPermissionEntry(
+-                name, nameMidSentence, type, allowed, requested);
++                name, nameMidSentence, type, allowed, requested, is_user_session);
      }
  
      /** Update the permissions view based on the contents of mDisplayedPermissions. */
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
-@@ -46,8 +46,9 @@ public class PermissionParamsListBuilder {
-         mEntries = new ArrayList<>();
+@@ -47,8 +47,8 @@ public class PermissionParamsListBuilder {
      }
  
--    public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) {
--        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed));
-+    public void addPermissionEntry(String name, String nameMidSentence, int type, boolean allowed,
-+            boolean is_user_session) {
-+        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, is_user_session));
+     public void addPermissionEntry(
+-            String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
+-        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested));
++            String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
++        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, requested, is_user_session));
      }
  
      public void clearPermissionEntries() {
-@@ -84,6 +85,10 @@ public class PermissionParamsListBuilder {
+@@ -85,6 +85,10 @@ public class PermissionParamsListBuilder {
                  } else {
                      warningTextResource = R.string.page_info_android_permission_blocked;
                  }
@@ -462,18 +462,20 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
              }
          }
  
-@@ -112,12 +117,14 @@ public class PermissionParamsListBuilder {
-         public final String nameMidSentence;
+@@ -115,14 +119,16 @@ public class PermissionParamsListBuilder {
          public final int type;
          public final boolean allowed;
+         public final boolean requested;
 +        public final boolean is_user_session;
  
--        PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed) {
-+        PageInfoPermissionEntry(String name, String nameMidSentence, int type, boolean allowed, boolean is_user_session) {
+         PageInfoPermissionEntry(
+-                String name, String nameMidSentence, int type, boolean allowed, boolean requested) {
++                String name, String nameMidSentence, int type, boolean allowed, boolean requested, boolean is_user_session) {
              this.name = name;
              this.nameMidSentence = nameMidSentence;
              this.type = type;
              this.allowed = allowed;
+             this.requested = requested;
 +            this.is_user_session = is_user_session;
          }
  
@@ -481,40 +483,40 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
 --- a/components/page_info/android/page_info_controller_android.cc
 +++ b/components/page_info/android/page_info_controller_android.cc
-@@ -199,6 +199,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
- 
-   std::map<ContentSettingsType, /*allowed*/ bool>
-       user_specified_settings_to_display;
+@@ -214,6 +214,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+   // being requested. This is needed for the Loud Clapper experiment
+   // (crbug.com/458351800).
+   bool requested_notifications = false;
 +  std::map<ContentSettingsType, bool>
 +      user_specified_settings_is_user_session;
  
    for (const auto& permission : permission_info_list) {
      if (base::Contains(permissions_to_display, permission.type)) {
-@@ -211,6 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -226,6 +228,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
          user_specified_settings_to_display[permission.type] =
              info->delegate().IsAnyPermissionAllowed(*setting_to_display);
 +        user_specified_settings_is_user_session[permission.type] =
 +            permission.is_user_session;
        }
-     }
-   }
-@@ -227,7 +231,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
-           ConvertUTF16ToJavaString(env, setting_title),
+ 
+       // Notifications permission can have the setting to display as DEFAULT
+@@ -252,7 +256,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
--          user_specified_settings_to_display[permission]);
-+          user_specified_settings_to_display[permission],
+           user_specified_settings_to_display[permission],
+-          requested_notifications);
++          requested_notifications,
 +          user_specified_settings_is_user_session[permission]);
      }
    }
  
-@@ -240,7 +245,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -265,7 +270,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
          env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
          ConvertUTF16ToJavaString(env, object_title),
          static_cast<jint>(chosen_object->ui_info->content_settings_type),
--        static_cast<jint>(CONTENT_SETTING_ALLOW));
-+        static_cast<jint>(CONTENT_SETTING_ALLOW),
+-        static_cast<jint>(CONTENT_SETTING_ALLOW), requested_notifications);
++        static_cast<jint>(CONTENT_SETTING_ALLOW), requested_notifications,
 +        /* is_user_session */ false);
    }
  
@@ -522,7 +524,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
-@@ -1303,6 +1303,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1296,6 +1296,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
@@ -545,9 +547,9 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
-@@ -16,6 +16,7 @@ import org.jni_zero.NativeMethods;
- import org.chromium.build.annotations.NullMarked;
+@@ -16,6 +16,7 @@ import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
+ import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.WindowAndroid;
 +import org.chromium.components.content_settings.LifetimeMode;
  
@@ -582,7 +584,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
 --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
 +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
-@@ -13,6 +13,18 @@ import org.chromium.ui.UiUtils;
+@@ -14,6 +14,18 @@ import org.chromium.ui.UiUtils;
  import org.chromium.ui.modaldialog.ModalDialogProperties;
  import org.chromium.ui.modelutil.PropertyModel;
  
@@ -601,7 +603,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
  /** This class creates the model for the permission dialog. */
  @NullMarked
  class PermissionDialogModelFactory {
-@@ -67,7 +79,76 @@ class PermissionDialogModelFactory {
+@@ -77,7 +89,76 @@ class PermissionDialogModelFactory {
                              ModalDialogProperties.ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE)
                      .with(ModalDialogProperties.CHANGE_CUSTOM_VIEW_OR_BUTTONS, true);
          }
@@ -682,7 +684,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
 --- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
 +++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
-@@ -118,7 +118,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
+@@ -123,7 +123,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
    delegate()->FinalizeCurrentRequests();
  }
  
@@ -707,7 +709,7 @@ diff --git a/components/permissions/android/permission_prompt/embedded_permissio
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
-@@ -137,6 +137,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
+@@ -138,6 +138,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
        static_cast<int>(permission_prompt_->GetEmbeddedPromptVariant()));
  }
  
@@ -719,7 +721,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
  // static
  std::unique_ptr<PermissionDialogDelegate> PermissionDialogDelegate::Create(
      content::WebContents* web_contents,
-@@ -165,12 +170,22 @@ PermissionDialogDelegate::CreateForTesting(
+@@ -166,12 +171,22 @@ PermissionDialogDelegate::CreateForTesting(
  
  void PermissionDialogDelegate::Accept(JNIEnv* env) {
    CHECK(permission_prompt_);
@@ -743,7 +745,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
  }
  
  void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
-@@ -180,6 +195,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
+@@ -181,6 +196,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
  
  void PermissionDialogDelegate::Deny(JNIEnv* env) {
    CHECK(permission_prompt_);
@@ -760,7 +762,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
-@@ -42,6 +42,7 @@ class PermissionDialogJavaDelegate {
+@@ -43,6 +43,7 @@ class PermissionDialogJavaDelegate {
        const favicon_base::FaviconRawBitmapResult& favicon_result);
  
    virtual void DismissDialog();
@@ -789,7 +791,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.h
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h
-@@ -56,9 +56,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
+@@ -57,9 +57,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
        const;
    virtual void Closing();
    virtual void Accept();
@@ -831,7 +833,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co
 diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc
 --- a/components/permissions/contexts/geolocation_permission_context_android.cc
 +++ b/components/permissions/contexts/geolocation_permission_context_android.cc
-@@ -194,7 +194,18 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -195,7 +195,18 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
      PermissionDecision decision,
      bool is_final_decision) {
    DCHECK(is_final_decision);
@@ -850,25 +852,25 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
    bool is_default_search =
        IsRequestingOriginDSE(request_data.requesting_origin);
    if (decision == PermissionDecision::kAllow &&
-@@ -209,7 +220,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
-       FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
-                                 request_data.embedding_origin,
-                                 std::move(callback), false /* persist */,
--                                PermissionDecision::kDeny,
-+                                PermissionDecision::kDeny, lifetime_option,
-                                 request_data.prompt_options);
+@@ -210,7 +221,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+       FinishNotifyPermissionSet(
+           request_data.id, request_data.requesting_origin,
+           request_data.embedding_origin, std::move(callback),
+-          false /* persist */, PermissionDecision::kDeny,
++          false /* persist */, PermissionDecision::kDeny, lifetime_option,
+           request_data.prompt_options,
+           request_data.embedded_permission_request_descriptor.Clone());
        return;
-     }
-@@ -230,7 +241,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
-       FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
-                                 request_data.embedding_origin,
-                                 std::move(callback), false /* persist */,
--                                PermissionDecision::kDeny,
-+                                PermissionDecision::kDeny, lifetime_option,
-                                 request_data.prompt_options);
+@@ -232,7 +243,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+       FinishNotifyPermissionSet(
+           request_data.id, request_data.requesting_origin,
+           request_data.embedding_origin, std::move(callback),
+-          false /* persist */, PermissionDecision::kDeny,
++          false /* persist */, PermissionDecision::kDeny, lifetime_option,
+           request_data.prompt_options,
+           request_data.embedded_permission_request_descriptor.Clone());
        return;
-     }
-@@ -243,14 +254,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -246,14 +257,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
          base::BindOnce(
              &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
              weak_factory_.GetWeakPtr(), request_data.requesting_origin,
@@ -878,14 +880,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
      return;
    }
  
-   FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
-                             request_data.embedding_origin, std::move(callback),
--                            persist, decision, request_data.prompt_options);
-+                            persist, decision, lifetime_option, request_data.prompt_options);
+   FinishNotifyPermissionSet(
+       request_data.id, request_data.requesting_origin,
+-      request_data.embedding_origin, std::move(callback), persist, decision,
++      request_data.embedding_origin, std::move(callback), persist, decision, lifetime_option,
+       request_data.prompt_options,
+       request_data.embedded_permission_request_descriptor.Clone());
  }
- 
- content::PermissionResult
-@@ -427,7 +438,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -432,7 +443,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
      const GURL& requesting_origin,
      const GURL& embedding_origin,
      bool persist,
@@ -894,7 +896,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
      std::optional<PromptOptions> prompt_options,
      LocationSettingsDialogOutcome prompt_outcome) {
    bool is_default_search = IsRequestingOriginDSE(requesting_origin);
-@@ -447,7 +458,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -452,7 +463,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
    FinishNotifyPermissionSet(location_settings_dialog_request_id_,
                              requesting_origin, embedding_origin,
                              std::move(location_settings_dialog_callback_),
@@ -903,18 +905,18 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
  
    location_settings_dialog_request_id_ =
        PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
-@@ -460,7 +471,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+@@ -465,7 +476,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
      const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      bool persist,
 -    PermissionDecision decision,
 +    PermissionDecision decision, content_settings::mojom::LifetimeMode lifetime_option,
-     std::optional<PromptOptions> prompt_options) {
-   PermissionRequestData request_data(
-       this, id,
-@@ -469,9 +480,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
-               blink::PermissionType::GEOLOCATION)),
-       requesting_origin, embedding_origin);
+     std::optional<PromptOptions> prompt_options,
+     blink::mojom::EmbeddedPermissionRequestDescriptorPtr
+         embedded_permission_request_descriptor) {
+@@ -478,9 +489,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+   request_data.embedded_permission_request_descriptor =
+       std::move(embedded_permission_request_descriptor);
    request_data.prompt_options = prompt_options.value_or(std::monostate());
 -  GeolocationPermissionContext::NotifyPermissionSet(
 +  GeolocationPermissionContext::NotifyPermissionSetImpl(
@@ -949,14 +951,14 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
        std::optional<PromptOptions> prompt_options,
        LocationSettingsDialogOutcome prompt_outcome);
  
-@@ -145,6 +152,7 @@ class GeolocationPermissionContextAndroid
-                                  BrowserPermissionCallback callback,
-                                  bool persist,
-                                  PermissionDecision decision,
-+                                 content_settings::mojom::LifetimeMode lifetime_option,
-                                  std::optional<PromptOptions> prompt_options);
- 
-   std::unique_ptr<LocationSettings> location_settings_;
+@@ -146,6 +153,7 @@ class GeolocationPermissionContextAndroid
+       BrowserPermissionCallback callback,
+       bool persist,
+       PermissionDecision decision,
++      content_settings::mojom::LifetimeMode lifetime_option,
+       std::optional<PromptOptions> prompt_options,
+       blink::mojom::EmbeddedPermissionRequestDescriptorPtr
+           embedded_permission_request_descriptor = nullptr);
 diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/components/permissions/embedded_permission_prompt_flow_model.cc
 --- a/components/permissions/embedded_permission_prompt_flow_model.cc
 +++ b/components/permissions/embedded_permission_prompt_flow_model.cc
@@ -972,7 +974,7 @@ diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/c
 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
-@@ -267,6 +267,17 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -281,6 +281,17 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(request_finished_callback), UsesAutomaticEmbargo());
  }
  
@@ -990,7 +992,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  bool PermissionContextBase::UsesAutomaticEmbargo() const {
    return true;
  }
-@@ -572,7 +583,8 @@ void PermissionContextBase::DecidePermission(
+@@ -624,7 +635,8 @@ void PermissionContextBase::DecidePermission(
  void PermissionContextBase::PermissionDecided(
      PermissionDecision decision,
      bool is_final_decision,
@@ -999,8 +1001,8 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 +    content_settings::mojom::LifetimeMode lifetime_option) {
    UserMadePermissionDecision(request_data.id, request_data.requesting_origin,
                               request_data.embedding_origin, decision);
- 
-@@ -585,11 +597,12 @@ void PermissionContextBase::PermissionDecided(
+   //  If a permission request originates from an embedded element, its
+@@ -648,11 +660,12 @@ void PermissionContextBase::PermissionDecided(
    // missing if a permission prompt was preignored and we already notified an
    // origin about it.
    if (request->second.second) {
@@ -1017,7 +1019,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  }
  
-@@ -674,6 +687,30 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -737,6 +750,30 @@ void PermissionContextBase::NotifyPermissionSet(
      bool persist,
      PermissionDecision decision,
      bool is_final_decision) {
@@ -1048,7 +1050,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
    // Note that rfh may be null, see crbug.com/426909787.
-@@ -689,8 +726,8 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -752,8 +789,8 @@ void PermissionContextBase::NotifyPermissionSet(
  
    if (persist) {
      // Clone new value, because we need it again for the callback.
@@ -1059,7 +1061,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  
    if (is_final_decision) {
-@@ -728,6 +765,17 @@ void PermissionContextBase::UpdateSetting(
+@@ -811,6 +848,17 @@ void PermissionContextBase::UpdateSetting(
      const PermissionRequestData& request_data,
      PermissionSetting setting,
      bool is_one_time) {
@@ -1077,7 +1079,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    DCHECK_EQ(request_data.requesting_origin,
              request_data.requesting_origin.DeprecatedGetOriginAsURL());
    DCHECK_EQ(request_data.embedding_origin,
-@@ -737,6 +785,8 @@ void PermissionContextBase::UpdateSetting(
+@@ -820,6 +868,8 @@ void PermissionContextBase::UpdateSetting(
    constraints.set_session_model(
        is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
                    : content_settings::mojom::SessionModel::DURABLE);
@@ -1089,7 +1091,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
-@@ -192,6 +192,18 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -198,6 +198,18 @@ class PermissionContextBase : public content_settings::Observer {
  
    // Updates stored setting if persist is set, updates tab indicators
    // and runs the callback to finish the request.
@@ -1108,7 +1110,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    virtual void NotifyPermissionSet(const PermissionRequestData& request_data,
                                     BrowserPermissionCallback callback,
                                     bool persist,
-@@ -209,6 +221,11 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -214,6 +226,11 @@ class PermissionContextBase : public content_settings::Observer {
  
    // Store the decided permission state. Virtual since the permission might be
    // stored with different restrictions (for example for desktop notifications).
@@ -1120,7 +1122,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    virtual void UpdateSetting(const PermissionRequestData& request_data,
                               PermissionSetting setting,
                               bool is_one_time);
-@@ -238,6 +255,12 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -243,6 +260,12 @@ class PermissionContextBase : public content_settings::Observer {
        PermissionRequest::PermissionDecidedCallback permission_decided_callback,
        base::OnceClosure request_finished_callback) const;
  
@@ -1133,7 +1135,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    // Implementors can override this method to avoid using automatic embargo.
    virtual bool UsesAutomaticEmbargo() const;
  
-@@ -271,7 +294,8 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -285,7 +308,8 @@ class PermissionContextBase : public content_settings::Observer {
    // allows/blocks/dismisses a permission prompt.
    void PermissionDecided(PermissionDecision decision,
                           bool is_final_decision,
@@ -1160,7 +1162,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
-@@ -36,6 +36,16 @@ PermissionRequest::PermissionRequest(
+@@ -35,6 +35,16 @@ PermissionRequest::PermissionRequest(
        request_finished_callback_(std::move(request_finished_callback)),
        uses_automatic_embargo_(uses_automatic_embargo) {}
  
@@ -1177,7 +1179,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    std::move(request_finished_callback_).Run();
  }
-@@ -424,20 +434,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+@@ -433,20 +443,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
    return request_type() == RequestType::kStorageAccess;
  }
  
@@ -1248,7 +1250,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    PermissionRequest(const PermissionRequest&) = delete;
    PermissionRequest& operator=(const PermissionRequest&) = delete;
  
-@@ -172,10 +183,10 @@ class PermissionRequest {
+@@ -180,10 +191,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.
@@ -1261,7 +1263,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
-@@ -234,6 +245,9 @@ class PermissionRequest {
+@@ -247,6 +258,9 @@ class PermissionRequest {
    // Called once a decision is made about the permission.
    PermissionDecidedCallback permission_decided_callback_;
  
@@ -1274,7 +1276,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
-@@ -201,7 +201,7 @@ void PermissionRequestManager::AddRequest(
+@@ -208,12 +208,12 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1283,27 +1285,36 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      return;
    }
  
-@@ -270,7 +270,7 @@ void PermissionRequestManager::AddRequest(
+   if (display::Screen::Get()->IsHeadless()) {
+-    request->PermissionDenied();
++    request->PermissionDenied(/*is_one_time*/false, content_settings::mojom::LifetimeMode::ALWAYS);
+     return;
+   }
+ 
+@@ -284,9 +284,9 @@ void PermissionRequestManager::AddRequest(
  
    if (should_auto_approve_request) {
      if (should_auto_approve_request == PermissionAction::GRANTED) {
+-      request->PermissionGranted(/*is_one_time=*/false);
++      request->PermissionGranted(/*is_one_time=*/false, content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED);
+     } else if (should_auto_approve_request == PermissionAction::GRANTED_ONCE) {
 -      request->PermissionGranted(/*is_one_time=*/true);
 +      request->PermissionGranted(/*is_one_time=*/true, content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED);
      }
      return;
    }
-@@ -597,7 +597,8 @@ void PermissionRequestManager::Accept() {
-                                 (*requests_iter)->request_type(),
-                                 PermissionAction::GRANTED);
-     PermissionGrantedIncludingDuplicates(requests_iter->get(),
+@@ -615,7 +615,8 @@ void PermissionRequestManager::Accept() {
+     StorePermissionActionForUMA(request->requesting_origin(),
+                                 request->request_type(), action);
+     PermissionGrantedIncludingDuplicates(request.get(),
 -                                         /*is_one_time=*/false);
 +                                         /*is_one_time=*/false,
 +                                         content_settings::mojom::LifetimeMode::ALWAYS);
  
- #if !BUILDFLAG(IS_ANDROID)
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
      std::optional<ContentSettingsType> content_settings_type =
-@@ -615,7 +616,7 @@ void PermissionRequestManager::Accept() {
-   CurrentRequestsDecided(PermissionAction::GRANTED);
+@@ -633,7 +634,7 @@ void PermissionRequestManager::Accept() {
+   CurrentRequestsDecided(action);
  }
  
 -void PermissionRequestManager::AcceptThisTime() {
@@ -1311,17 +1322,17 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -629,7 +630,8 @@ void PermissionRequestManager::AcceptThisTime() {
-                                 (*requests_iter)->request_type(),
-                                 PermissionAction::GRANTED_ONCE);
-     PermissionGrantedIncludingDuplicates(requests_iter->get(),
+@@ -645,7 +646,8 @@ void PermissionRequestManager::AcceptThisTime() {
+     StorePermissionActionForUMA(request->requesting_origin(),
+                                 request->request_type(), action);
+     PermissionGrantedIncludingDuplicates(request.get(),
 -                                         /*is_one_time=*/true);
 +                                         /*is_one_time=*/true,
 +                                         mode);
    }
  
-   NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
-@@ -637,6 +639,15 @@ void PermissionRequestManager::AcceptThisTime() {
+   NotifyRequestDecided(action);
+@@ -653,6 +655,15 @@ void PermissionRequestManager::AcceptThisTime() {
  }
  
  void PermissionRequestManager::Deny() {
@@ -1337,16 +1348,16 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -659,7 +670,7 @@ void PermissionRequestManager::Deny() {
-     StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
-                                 (*requests_iter)->request_type(),
-                                 PermissionAction::DENIED);
--    PermissionDeniedIncludingDuplicates(requests_iter->get());
-+    PermissionDeniedIncludingDuplicates(requests_iter->get(), is_one_time, lifetime_option);
+@@ -673,7 +684,7 @@ void PermissionRequestManager::Deny() {
+   for (const auto& request : requests_) {
+     StorePermissionActionForUMA(request->requesting_origin(),
+                                 request->request_type(), action);
+-    PermissionDeniedIncludingDuplicates(request.get());
++    PermissionDeniedIncludingDuplicates(request.get(), is_one_time, lifetime_option);
    }
  
-   NotifyRequestDecided(PermissionAction::DENIED);
-@@ -1283,32 +1294,32 @@ PermissionRequestManager::VisitDuplicateRequests(
+   NotifyRequestDecided(action);
+@@ -1366,32 +1377,32 @@ PermissionRequestManager::VisitDuplicateRequests(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1389,7 +1400,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
        request);
  }
  
-@@ -1578,7 +1589,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
+@@ -1679,7 +1690,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
    }
    switch (auto_response_for_test_) {
      case ACCEPT_ONCE:
@@ -1401,7 +1412,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
-@@ -168,8 +168,10 @@ class PermissionRequestManager
+@@ -175,8 +175,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1413,7 +1424,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    void FinalizeCurrentRequests() override;
-@@ -419,9 +421,12 @@ class PermissionRequestManager
+@@ -441,9 +443,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

@@ -18,8 +18,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bookmark_ui_operations_helper.cc          |  2 +
  .../bookmark_bar_page_handler.cc              |  2 +
  components/bookmark_bar_strings.grdp          |  6 +++
- .../bookmarks/browser/bookmark_codec.cc       | 20 +++++++--
- components/bookmarks/browser/bookmark_codec.h |  7 ++-
+ .../bookmarks/browser/bookmark_codec.cc       | 14 +++++-
+ components/bookmarks/browser/bookmark_codec.h |  4 ++
  .../browser/bookmark_load_details.cc          | 15 +++++--
  .../bookmarks/browser/bookmark_load_details.h |  2 +
  .../bookmarks/browser/bookmark_model.cc       |  3 +-
@@ -31,15 +31,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/bookmarks/browser/bookmark_uuids.h |  1 +
  components/bookmarks/browser/model_loader.cc  |  9 +++-
  .../bookmark_specifics_conversions.cc         |  1 +
- 27 files changed, 257 insertions(+), 14 deletions(-)
+ 27 files changed, 251 insertions(+), 11 deletions(-)
 
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -191,6 +191,7 @@ found in the LICENSE file.
-     <item type="id" name="menu_select_tabs" />
+@@ -197,6 +197,7 @@ found in the LICENSE file.
      <item type="id" name="menu_item_content_filter_divider_line_id" />
      <item type="id" name="menu_item_content_filter_help_center_id" />
+     <item type="id" name="duplicate_tab_menu_id" />
 +    <item type="id" name="bookmark_all_tabs_menu_id" />
  
      <!-- Custom Tabs -->
@@ -55,26 +55,26 @@ 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;
-@@ -296,6 +297,9 @@ import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTaskTrackerFac
+@@ -299,6 +300,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
+ import org.chromium.chrome.browser.ui.browser_window.BrowserWindowType;
  import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
- import org.chromium.chrome.browser.ui.extensions.windowing.ExtensionWindowControllerBridgeFactory;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
  import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
  import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
  import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig;
-@@ -309,6 +313,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
- import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
+@@ -314,6 +318,8 @@ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
  import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionInitializerImpl;
  import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionManagerImpl;
+ import org.chromium.components.browser_ui.accessibility.AccessibilityFeatureMap;
 +import org.chromium.components.bookmarks.BookmarkId;
 +import org.chromium.components.bookmarks.BookmarkItem;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+ import org.chromium.components.browser_ui.share.ShareParams;
  import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate;
- import org.chromium.components.browser_ui.util.ComposedBrowserControlsVisibilityDelegate;
-@@ -3910,6 +3916,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3929,6 +3935,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
              CloseAllTabsDialog.show(
                      this, getModalDialogManagerSupplier(), tabModelSelector, closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
  
-@@ -4030,6 +4038,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -4058,6 +4066,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -291,6 +291,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -292,6 +292,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
          // Bookmarks
          modelList.add(buildBookmarksItem());
  
@@ -143,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
          // Recent Tabs
          if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
  
-@@ -466,6 +474,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -478,6 +486,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
          }
          modelList.add(buildCloseAllTabsItem());
          if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
@@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -340,6 +340,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
+@@ -336,6 +336,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
    return bookmark_model_->account_mobile_node() != nullptr;
  }
  
@@ -194,7 +194,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  base::android::ScopedJavaLocalRef<jobject>
  BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
                                                           const GURL& url) {
-@@ -452,6 +479,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -448,6 +475,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
    // Vector to temporarily contain all child bookmarks at same level for sorting
    std::vector<const BookmarkNode*> bookmarks = {
        bookmark_model_->mobile_node(),
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -560,6 +588,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+@@ -556,6 +584,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
      top_level_folders.push_back(other_node);
    }
  
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
    const BookmarkNode* reading_list_node =
        local_or_syncable_reading_list_manager_->GetRoot();
    if (IsPermanentFolderVisible(
-@@ -1237,6 +1268,17 @@ void BookmarkBridge::GetBookmarksOfType(
+@@ -1229,6 +1260,17 @@ void BookmarkBridge::GetBookmarksOfType(
    AddBookmarkNodesToBookmarkIdList(env, j_list, results);
  }
  
@@ -460,7 +460,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
-@@ -4437,6 +4437,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4562,6 +4562,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
          Select tabs
        </message>
@@ -545,15 +545,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    } else {
      // No permanent node should have been provided.
      CHECK(!other_folder_node);
-@@ -148,6 +152,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -144,6 +148,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
 +                           BookmarkNode* tabs_folder_node,
                             int64_t* max_id,
                             std::string* sync_metadata_str) {
-   const int64_t max_already_assigned_id =
-@@ -162,7 +167,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+   if (sync_metadata_str) {
+@@ -156,13 +161,15 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
              base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
              base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
              base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -562,25 +562,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 +            base::Uuid::ParseLowercase(kTabsCollectionBookmarksNodeUuid)};
    ids_reassigned_ = false;
    uuids_reassigned_ = false;
-   ids_valid_ = true;
-@@ -171,6 +177,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
-   stored_sha256_checksum_.clear();
-   InitializeChecksum();
+   nodes_requiring_id_reassignment_.clear();
+   reassigned_ids_per_old_id_.clear();
+ 
    bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
 +                              tabs_folder_node,
                                value, sync_metadata_str);
-   FinalizeChecksum();
+   ReassignIDsIfRequired();
  
-@@ -180,7 +187,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
-   if (!ids_valid_ || (computed_checksum_ != stored_checksum_) ||
-       (use_sha256 && computed_sha256_checksum_ != stored_sha256_checksum_)) {
-     maximum_id_ = max_already_assigned_id;
--    ReassignIDs(bb_node, other_folder_node, mobile_folder_node);
-+    ReassignIDs(bb_node, other_folder_node, mobile_folder_node, tabs_folder_node);
-   }
-   *max_id = maximum_id_ + 1;
-   return success;
-@@ -239,6 +246,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
+@@ -220,6 +227,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
  bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                   BookmarkNode* other_folder_node,
                                   BookmarkNode* mobile_folder_node,
@@ -588,7 +578,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                                   const base::Value::Dict& value,
                                   std::string* sync_metadata_str) {
    std::optional<int> version = value.FindInt(kVersionKey);
-@@ -284,6 +292,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -243,6 +251,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
        roots->FindDict(kOtherBookmarkFolderNameKey);
    const base::Value::Dict* mobile_folder_value =
        roots->FindDict(kMobileBookmarkFolderNameKey);
@@ -597,7 +587,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  
    if (!bb_value || !other_folder_value || !mobile_folder_value)
      return false;
-@@ -291,6 +301,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -250,6 +260,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
    DecodeNode(*bb_value, nullptr, bb_node);
    DecodeNode(*other_folder_value, nullptr, other_folder_node);
    DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
@@ -606,22 +596,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  
    // Need to reset the title as the title is persisted and restored from
    // the file.
-@@ -499,12 +511,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
- 
- void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
-                                 BookmarkNode* other_node,
--                                BookmarkNode* mobile_node) {
-+                                BookmarkNode* mobile_node,
-+                                BookmarkNode* tabs_folder_node) {
-   ids_.clear();
-   reassigned_ids_per_old_id_.clear();
-   ReassignIDsHelper(bb_node);
-   ReassignIDsHelper(other_node);
-   ReassignIDsHelper(mobile_node);
-+  ReassignIDsHelper(tabs_folder_node);
-   ids_reassigned_ = true;
- }
- 
 diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
 --- a/components/bookmarks/browser/bookmark_codec.h
 +++ b/components/bookmarks/browser/bookmark_codec.h
@@ -641,7 +615,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -100,6 +102,7 @@ class BookmarkCodec {
+@@ -95,6 +97,7 @@ class BookmarkCodec {
    static const char kBookmarkBarFolderNameKey[];
    static const char kOtherBookmarkFolderNameKey[];
    static const char kMobileBookmarkFolderNameKey[];
@@ -649,7 +623,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
    static const char kVersionKey[];
    static const char kChecksumKey[];
    static const char kChecksumSHA256Key[];
-@@ -133,6 +136,7 @@ class BookmarkCodec {
+@@ -128,6 +131,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -657,16 +631,6 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value::Dict& value,
                      std::string* sync_metadata_str);
  
-@@ -143,7 +147,8 @@ class BookmarkCodec {
-   // Reassigns bookmark IDs for all nodes.
-   void ReassignIDs(BookmarkNode* bb_node,
-                    BookmarkNode* other_node,
--                   BookmarkNode* mobile_node);
-+                   BookmarkNode* mobile_node,
-+                   BookmarkNode* tabs_folder_node);
- 
-   // Helper to recursively reassign IDs.
-   void ReassignIDsHelper(BookmarkNode* node);
 diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
 --- a/components/bookmarks/browser/bookmark_load_details.cc
 +++ b/components/bookmarks/browser/bookmark_load_details.cc
@@ -749,7 +713,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
-@@ -909,7 +909,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
+@@ -908,7 +908,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
           (account_bookmark_bar_node_ &&
            !account_bookmark_bar_node_->children().empty()) ||
           (account_other_node_ && !account_other_node_->children().empty()) ||
@@ -758,7 +722,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1241,6 +1241,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1240,6 +1240,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();
@@ -907,7 +871,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
                       &sync_metadata_str)) {
        ids_assigned_to_account_nodes = codec.release_assigned_ids();
  
-@@ -118,7 +122,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -123,7 +127,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
      if (root_dict.has_value() &&
          codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
                       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/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -133,6 +133,7 @@ found in the LICENSE file.
+@@ -136,6 +136,7 @@ found in the LICENSE file.
      <item type="id" name="update_menu_id" />
      <item type="id" name="new_tab_menu_id" />
      <item type="id" name="new_incognito_tab_menu_id" />
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 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
-@@ -3946,6 +3946,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3965,6 +3965,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -39,7 +39,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
-@@ -2697,6 +2697,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2797,6 +2797,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return doOpenWebApk(currentTab);
          }
  
@@ -54,7 +54,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
-@@ -989,6 +989,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -1024,6 +1024,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
          return false;
      }
  
@@ -88,7 +88,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
-@@ -378,6 +378,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -406,6 +406,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
              modelList.add(buildAddToHomescreenListItem(currentTab, false));
          }
  
@@ -101,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -358,6 +358,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -370,6 +370,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
              modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
          }
  
@@ -114,8 +114,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 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
-@@ -324,6 +324,10 @@ CHAR_LIMIT guidelines:
-         Collaboration
+@@ -339,6 +339,10 @@ CHAR_LIMIT guidelines:
+         Chrome Tips
        </message>
  
 +      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">

build/patches/Add-option-to-disable-snapshots.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -497,7 +497,12 @@ class TabGridViewBinder {
+@@ -512,7 +512,12 @@ class TabGridViewBinder {
                      if (result != null) {
                          TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                      } else {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -535,6 +540,7 @@ class TabGridViewBinder {
+@@ -550,6 +555,7 @@ class TabGridViewBinder {
       */
      private static void setFavicon(
              ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -73,6 +73,11 @@ found in the LICENSE file.
+@@ -67,6 +67,11 @@ found in the LICENSE file.
          android:title="@string/open_external_links_incognito_title"
          android:summary="@string/open_external_links_incognito_summary"
          android:defaultValue="false" />
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -152,6 +152,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -158,6 +158,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
  import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
  import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
-@@ -658,7 +659,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -679,7 +680,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                      new TabContentManager(
                              this,
                              mBrowserControlsManagerSupplier.get(),
@@ -113,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.ObservableSupplierImpl;
  import org.chromium.build.annotations.NullMarked;
-@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -99,13 +100,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  
@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
      private static final String PREF_PRELOAD_PAGES = "preload_pages";
      private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
-@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -201,6 +216,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
          // Record the launch of PG from the S&P link-row entry point
          privacyGuidePreference.setOnPreferenceClickListener(
-@@ -441,6 +471,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -433,6 +463,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
  
      public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
      public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -479,6 +510,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -529,6 +567,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              : R.string.text_off);
          }
  
@@ -200,7 +200,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
-@@ -6185,6 +6185,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6506,6 +6506,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
          Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
        </message>
  

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

@@ -9,9 +9,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../java/res/values-sw600dp/dimens.xml        |  4 ++--
  chrome/android/java/res/values/dimens.xml     |  6 +++++-
  .../browser/ChromeBaseAppCompatActivity.java  |  3 +++
- .../chrome/browser/WarmupManager.java         |  5 ++++-
- .../ChromeAccessibilitySettingsDelegate.java  | 19 ++++++++++++++++++
- .../chrome/browser/app/ChromeActivity.java    |  4 +++-
+ .../chrome/browser/WarmupManager.java         |  7 +++++--
+ .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++++++
+ .../chrome/browser/app/ChromeActivity.java    |  5 ++++-
  .../overlays/strip/StripLayoutHelper.java     | 10 ++++++++--
  .../strip/StripLayoutHelperManager.java       |  6 +++++-
  .../scene_layer/TabStripSceneLayer.java       |  8 ++++++++
@@ -20,25 +20,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../chrome/browser/ui/RootUiCoordinator.java  |  6 +++++-
  chrome/browser/preferences/BUILD.gn           |  1 +
  .../preferences/ChromePreferenceKeys.java     |  1 +
- .../preferences/ChromeSharedPreferences.java  | 12 +++++++++++
+ .../preferences/ChromeSharedPreferences.java  | 12 ++++++++++++
  .../LegacyChromePreferenceKeys.java           |  1 +
- .../AppHeaderCoordinator.java                 |  2 ++
+ .../ui/desktop_windowing/AppHeaderUtils.java  |  2 ++
  .../omnibox/LocationBarCoordinator.java       |  2 +-
  .../strings/android_chrome_strings.grd        |  7 +++++++
  .../java/res/layout/control_container.xml     |  8 ++++----
  .../java/res/layout/toolbar_tablet.xml        |  2 +-
  .../java/res/values-sw600dp/dimens.xml        |  5 +++--
  .../toolbar/java/res/values/dimens.xml        |  6 ++++--
- .../browser/toolbar/ControlContainer.java     |  2 +-
- .../toolbar/top/ToolbarControlContainer.java  | 20 ++++++++++++++++++-
+ .../toolbar/top/ToolbarControlContainer.java  | 19 +++++++++++++++++++
  .../browser/toolbar/top/ToolbarLayout.java    |  5 ++++-
  .../tab_strip/HeightTransitionHandler.java    |  2 ++
  .../TabStripTransitionCoordinator.java        |  6 +++++-
  .../res/xml/accessibility_preferences.xml     |  5 +++++
- .../accessibility/AccessibilitySettings.java  | 13 ++++++++++++
+ .../accessibility/AccessibilitySettings.java  | 13 +++++++++++++
  .../AccessibilitySettingsDelegate.java        |  2 ++
- .../chromium/ui/base/DeviceFormFactor.java    | 14 +++++++++++++
- 34 files changed, 171 insertions(+), 26 deletions(-)
+ .../chromium/ui/base/DeviceFormFactor.java    | 14 ++++++++++++++
+ 33 files changed, 172 insertions(+), 25 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
 --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
@@ -81,8 +80,8 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -119,9 +119,13 @@ found in the LICENSE file.
-     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
+@@ -116,9 +116,13 @@ found in the LICENSE file.
+     <dimen name="signin_screen_top_padding">50dp</dimen>
  
      <!-- Should match toolbar_height_no_shadow -->
 -    <dimen name="control_container_height">@dimen/default_action_bar_height</dimen>
@@ -99,7 +98,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
@@ -127,14 +126,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.display.DisplayUtil;
  import org.chromium.url.GURL;
-@@ -472,7 +473,9 @@ public class WarmupManager {
+@@ -472,8 +473,10 @@ public class WarmupManager {
              ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
  
              if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
--                controlContainer.initWithToolbar(toolbarId);
+-                controlContainer.initWithToolbar(
+-                        toolbarId, R.dimen.custom_tabs_control_container_height);
 +                controlContainer.initWithToolbar(toolbarId,
 +                        DeviceFormFactor.isForceTabletUI()
-+                            ? R.dimen.control_container_height_tabletui : 0);
++                            ? R.dimen.control_container_height_tabletui
++                            :  R.dimen.custom_tabs_control_container_height);
              }
              return mainView;
          } catch (InflateException e) {
@@ -170,21 +171,22 @@ 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
-@@ -808,7 +808,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -830,7 +830,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              // Inflate the correct toolbar layout for the device.
              int toolbarLayoutId = getToolbarLayoutId();
              if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
--                controlContainer.initWithToolbar(toolbarLayoutId);
+-                controlContainer.initWithToolbar(toolbarLayoutId, getToolbarLayoutHeightResId());
 +                controlContainer.initWithToolbar(toolbarLayoutId,
 +                        DeviceFormFactor.isForceTabletUI()
-+                            ? R.dimen.control_container_height_tabletui : 0);
++                            ? R.dimen.control_container_height_tabletui
++                            : getToolbarLayoutHeightResId());
              }
              onInitialLayoutInflationComplete();
          }
 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
-@@ -132,6 +132,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -137,6 +137,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
  import org.chromium.components.tab_group_sync.TriggerSource;
  import org.chromium.components.tab_groups.TabGroupColorId;
  import org.chromium.ui.accessibility.AccessibilityState;
@@ -192,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.util.ColorUtils;
-@@ -5039,8 +5040,13 @@ public class StripLayoutHelper
+@@ -5317,8 +5318,13 @@ public class StripLayoutHelper
          mCloseButtonMenu.setAnchorView(tabView);
          // 3. Set the vertical offset to align the close button menu with bottom of the tab strip
          int tabHeight = mManagerHost.getHeight();
@@ -220,8 +222,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  import org.chromium.ui.base.PageTransition;
  import org.chromium.ui.base.WindowAndroid;
 @@ -498,7 +499,10 @@ public class StripLayoutHelperManager
-         mIsLayoutOptimizationsEnabled =
-                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
+         mIsHeaderCustomizationSupported =
+                 ToolbarFeatures.isAppHeaderCustomizationSupported(
                          /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
 -        mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
 +        mScrollableStripHeight =
@@ -229,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 +                ? res.getDimension(R.dimen.tab_strip_height_tabletui)
 +                : res.getDimension(R.dimen.tab_strip_height_cromite)) / mDensity;
          mHeight =
-                 mIsLayoutOptimizationsEnabled
+                 mIsHeaderCustomizationSupported
                          ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
@@ -271,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow
 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
-@@ -768,7 +768,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -807,7 +807,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
      @Override
      public int getControlContainerHeightResource() {
@@ -285,7 +287,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -110,6 +110,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -120,6 +120,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.pdf.PdfPage;
@@ -294,9 +296,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
-@@ -1803,7 +1805,9 @@ public class RootUiCoordinator
-         if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
+@@ -1947,7 +1949,9 @@ public class RootUiCoordinator
  
+     protected int getFindToolbarStub() {
          int stubId = R.id.find_toolbar_stub;
 -        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
 +        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity) &&
@@ -304,7 +306,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 +                      ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED, false)) {
              stubId = R.id.find_toolbar_tablet_stub;
          }
-         mFindToolbarManager =
+         return stubId;
 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
@@ -319,7 +321,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 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
-@@ -337,6 +337,7 @@ public final class ChromePreferenceKeys {
+@@ -358,6 +358,7 @@ public final class ChromePreferenceKeys {
      /** Whether the app-specific history info text was already seen by users. */
      public static final String HISTORY_APP_SPECIFIC_INFO_SEEN =
              "Chrome.History.AppSpecificInfoSeen";
@@ -367,29 +369,29 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
                  ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
-diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
---- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-+++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-@@ -42,6 +42,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
- import org.chromium.ui.display.DisplayUtil;
- import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
- import org.chromium.ui.insets.CaptionBarInsetsRectProvider;
+diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
+--- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
++++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
+@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.Activit
+ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
 +import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.insets.InsetObserver;
- import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer;
+ import org.chromium.ui.display.DisplayUtil;
  import org.chromium.ui.insets.InsetsRectProvider;
-@@ -281,6 +282,7 @@ public class AppHeaderCoordinator
-             InsetsRectProvider insetsRectProvider,
-             @DesktopWindowHeuristicResult int currentResult,
-             boolean isOnExternalDisplay) {
+ 
+@@ -245,6 +246,7 @@ public class AppHeaderUtils {
+      */
+     static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
+             InsetsRectProvider insetsRectProvider, Context context) {
 +        if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW;
          @DesktopWindowHeuristicResult int newResult;
  
-         Insets captionBarInset = insetsRectProvider.getCachedInset();
+         boolean isOnExternalDisplay = !DisplayUtil.isContextInDefaultDisplay(context);
 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
-@@ -869,7 +869,7 @@ public class LocationBarCoordinator
+@@ -1008,7 +1008,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -401,7 +403,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1489,6 +1489,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1507,6 +1507,13 @@ Your Google account may have other forms of browsing history like searches and a
          Privacy guide explanation closed
        </message>
  
@@ -436,9 +438,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
              android:layout_marginBottom="@dimen/toolbar_hairline_height"
              android:layout_height="@dimen/toolbar_height_no_shadow" />
  
-@@ -29,13 +29,13 @@ found in the LICENSE file.
-             android:layout_width="match_parent"
+@@ -30,13 +30,13 @@ found in the LICENSE file.
              android:layout_height="wrap_content"
+             android:layout_gravity="bottom"
              app:layout_anchorGravity="bottom"
 -            />
 +            android:layout_marginTop="@dimen/control_container_height_cromite" />
@@ -493,18 +495,6 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
  
      <dimen name="ntp_search_box_height">64dp</dimen>
      <dimen name="ntp_search_box_height_tall">72dp</dimen>
-diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
---- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-@@ -26,7 +26,7 @@ public interface ControlContainer {
-      *
-      * @param toolbarLayoutId The ID of the toolbar layout to use.
-      */
--    void initWithToolbar(int toolbarLayoutId);
-+    void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId);
- 
-     /**
-      * @return The {@link ViewResourceAdapter} that exposes this {@link View} as a CC resource.
 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
@@ -516,16 +506,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import android.graphics.Canvas;
  import android.graphics.Color;
  import android.graphics.PorterDuff;
-@@ -170,8 +171,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
- 
-     @Override
+@@ -172,6 +173,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
      @Initializer
--    public void initWithToolbar(int toolbarLayoutId) {
-+    public void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId) {
+     public void initWithToolbar(int toolbarLayoutId, int toolbarLayoutHeightResId) {
          try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
-+            if (controlContainerHeightOverrideId != 0) {
++            if (DeviceFormFactor.isForceTabletUI() && toolbarLayoutHeightResId != 0) {
++                toolbarLayoutHeightResId = R.dimen.tab_strip_height_tabletui;
 +                Resources res = getContext().getResources();
-+                setMinimumHeight((int) res.getDimension(controlContainerHeightOverrideId));
++                setMinimumHeight((int) res.getDimension(toolbarLayoutHeightResId));
 +                int tab_strip_height =
 +                    (int) res.getDimension(R.dimen.tab_strip_height_tabletui);
 +
@@ -541,12 +529,12 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 +                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
 +            }
              mToolbarContainer = findViewById(R.id.toolbar_container);
+             mToolbarLayoutHeight = getResources().getDimensionPixelSize(toolbarLayoutHeightResId);
              ViewStub toolbarStub = findViewById(R.id.toolbar_stub);
-             toolbarStub.setLayoutResource(toolbarLayoutId);
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
  import org.chromium.components.feature_engagement.Tracker;
  import org.chromium.ui.base.ViewUtils;
  import org.chromium.ui.util.MotionEventUtils;
@@ -554,7 +542,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import org.chromium.ui.util.TokenHolder;
  import org.chromium.url.GURL;
  
-@@ -581,7 +582,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -588,7 +589,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -568,34 +556,34 @@ 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/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
-@@ -30,6 +30,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
- import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
+@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
  import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
+ import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionHandler;
  import org.chromium.ui.base.ViewUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
  import org.chromium.ui.util.TokenHolder;
  
-@@ -562,6 +563,7 @@ class HeightTransitionHandler {
+@@ -492,6 +493,7 @@ class HeightTransitionHandler {
+ 
+     /** Get the min screen width (in dp) required for the tab strip to become visible. */
+     private static int getScreenWidthThresholdDp() {
++        if (DeviceFormFactor.isForceTabletUI()) return 0;
          if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
              return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
          }
-+        if (DeviceFormFactor.isForceTabletUI()) return 0;
-         return TRANSITION_THRESHOLD_DP;
-     }
- 
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
-@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
  import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
  import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
  import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver;
 +import org.chromium.ui.base.DeviceFormFactor;
  
- /** Class used to manage tab strip visibility and height updates. */
- @NullMarked
-@@ -148,7 +149,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+ /**
+  * Class used to manage tab strip visibility and height updates.
+@@ -170,7 +171,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
          mTabStripReservedTopPadding =
                  controlContainerView()
                          .getResources()
@@ -610,9 +598,9 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -36,6 +36,11 @@ found in the LICENSE file.
-         android:summary="@string/jump_start_omnibox_summary"
-         android:title="@string/jump_start_omnibox_title" />
+@@ -41,6 +41,11 @@ found in the LICENSE file.
+         android:summary="@string/caret_browsing_summary"
+         android:title="@string/caret_browsing_title" />
  
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="force_tablet_ui"
@@ -625,17 +613,17 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
- import org.chromium.content_public.browser.ContentFeatureMap;
+@@ -31,6 +31,7 @@ import org.chromium.content_public.browser.ContentFeatureMap;
+ import org.chromium.ui.base.UiAndroidFeatureList;
  
  import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
  
  /** Fragment to keep track of all the accessibility related preferences. */
  @NullMarked
-@@ -44,6 +45,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
-     public static final String PREF_ZOOM_INFO = "zoom_info";
-     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
+@@ -51,6 +52,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public static final String PREF_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION =
+             "touchpad_overscroll_history_navigation";
  
 +    private BooleanPreferenceDelegate mForceTabletUIDelegate;
 +    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -643,7 +631,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
      private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -117,6 +121,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -126,6 +130,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
                  mDelegate.getReaderAccessibilityDelegate().getValue());
          readerForAccessibilityPref.setOnPreferenceChangeListener(this);
  
@@ -656,7 +644,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -176,6 +186,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -212,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
              mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);
@@ -681,7 +669,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
-@@ -79,6 +79,14 @@ public class DeviceFormFactor {
+@@ -87,6 +87,14 @@ public class DeviceFormFactor {
      /** See {@link #setIsTabletForTesting(boolean)}. */
      private static @Nullable Boolean sIsTabletForTesting;
  
@@ -696,7 +684,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
      /**
       * Each activity could be on a different display, and this will just tell you whether the
       * display associated with the application context is "tablet sized". Use {@link
-@@ -87,6 +95,7 @@ public class DeviceFormFactor {
+@@ -95,6 +103,7 @@ public class DeviceFormFactor {
      @CalledByNative
      @Deprecated
      public static boolean isTablet() {
@@ -704,7 +692,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          if (sIsTabletForTesting != null) {
              return sIsTabletForTesting;
          }
-@@ -117,6 +126,7 @@ public class DeviceFormFactor {
+@@ -125,6 +134,7 @@ public class DeviceFormFactor {
       *     E.g. http://developer.samsung.com/samsung-dex/testing
       */
      public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -712,7 +700,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
      }
  
-@@ -151,6 +161,7 @@ public class DeviceFormFactor {
+@@ -159,6 +169,7 @@ public class DeviceFormFactor {
       * @return The screen width bucket the device is in (see constants at the top of this class).
       */
      private static int detectScreenWidthBucket(Context context) {
@@ -720,7 +708,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return context.getResources().getInteger(R.integer.min_screen_width_bucket);
      }
  
-@@ -158,6 +169,7 @@ public class DeviceFormFactor {
+@@ -166,6 +177,7 @@ public class DeviceFormFactor {
          ThreadUtils.assertOnUiThread();
          Context context = windowAndroid.getContext().get();
          if (context == null) return 0;
@@ -728,7 +716,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return context.getResources().getInteger(R.integer.min_screen_width_bucket);
      }
  
-@@ -167,6 +179,7 @@ public class DeviceFormFactor {
+@@ -175,6 +187,7 @@ public class DeviceFormFactor {
       */
      @UiThread
      public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
@@ -736,7 +724,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
      }
  
-@@ -175,6 +188,7 @@ public class DeviceFormFactor {
+@@ -183,6 +196,7 @@ public class DeviceFormFactor {
       *         layout.
       */
      public static int getMinimumTabletWidthPx(DisplayAndroid display) {

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

@@ -7,13 +7,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/java/res/xml/privacy_preferences.xml  |  5 +++++
  .../chrome/browser/ChromeTabbedActivity.java      |  5 ++++-
  .../browser/privacy/settings/PrivacySettings.java | 15 ++++++++++++++-
+ .../browser/tab_group_sync/StartupHelper.java     |  6 ++++++
  .../ui/android/strings/android_chrome_strings.grd |  6 ++++++
- 4 files changed, 29 insertions(+), 2 deletions(-)
+ 5 files changed, 35 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -95,6 +95,11 @@ found in the LICENSE file.
+@@ -89,6 +89,11 @@ found in the LICENSE file.
          android:title="@string/incognito_settings_title"
          android:summary="@string/incognito_settings_summary"
          android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,15 +29,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
-@@ -47,6 +47,7 @@ import org.chromium.base.Callback;
+@@ -47,6 +47,7 @@ import org.chromium.base.ApplicationStatus;
+ import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
  import org.chromium.base.CallbackUtils;
- import org.chromium.base.CommandLine;
 +import org.chromium.base.ContextUtils;
+ import org.chromium.base.CommandLine;
+ import org.chromium.base.DeviceInfo;
  import org.chromium.base.IntentUtils;
- import org.chromium.base.Log;
- import org.chromium.base.MemoryPressureListener;
-@@ -2218,8 +2219,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2175,8 +2176,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
              boolean hadCipherData =
                      CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
  
@@ -67,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.base.IntentUtils;
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -114,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -113,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final SharedPreferencesManager mSharedPreferencesManager =
              ChromeSharedPreferences.getInstance();
  
@@ -76,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
      @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
      @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";
-@@ -382,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -374,7 +378,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -89,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
-@@ -442,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -434,6 +442,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              getContext(), getProfile()));
          }
  
@@ -101,10 +102,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
          if (secureDnsPref != null && secureDnsPref.isVisible()) {
              secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
+diff --git a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java
+--- a/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java
++++ b/chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/StartupHelper.java
+@@ -4,6 +4,7 @@
+ 
+ package org.chromium.chrome.browser.tab_group_sync;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.metrics.RecordHistogram;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.chrome.browser.preferences.Pref;
+@@ -74,6 +75,11 @@ public class StartupHelper {
+      */
+     public void initializeTabGroupSync() {
+         LogUtils.log(TAG, "initializeTabGroupSync");
++        if (ContextUtils.getAppSharedPreferences().getBoolean("close_tabs_on_exit", false)) {
++            for (String tabGroupId : mTabGroupSyncService.getAllGroupIds()) {
++                mTabGroupSyncService.removeGroup(tabGroupId);
++            }
++        }
+         // First close the groups that were deleted remotely when the activity was not running.
+         closeDeletedGroupsFromTabModel();
+ 
 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
-@@ -2856,6 +2856,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -2898,6 +2898,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_ACCESSIBILITY_TAB_SWITCHER_TITLE" desc="Accessibility label of the current window when Grid Tab Switcher is shown.">
          All tabs
        </message>

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

@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -100,6 +100,7 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationTyp
+@@ -101,6 +101,7 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationTyp
  import org.chromium.components.data_sharing.DataSharingService;
  import org.chromium.components.data_sharing.GroupMember;
  import org.chromium.components.data_sharing.member_role.MemberRole;
@@ -32,7 +32,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.components.tab_group_sync.EitherId.EitherGroupId;
  import org.chromium.components.tab_group_sync.LocalTabGroupId;
  import org.chromium.components.tab_group_sync.TabGroupSyncService;
-@@ -120,6 +121,9 @@ import java.util.Objects;
+@@ -121,6 +122,9 @@ import java.util.Objects;
  import java.util.Set;
  import java.util.function.Supplier;
  
@@ -42,14 +42,14 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  /**
   * A mediator for the TabGridDialog component, responsible for communicating with the components'
   * coordinator as well as managing the business logic for dialog show/hide.
-@@ -1033,9 +1037,15 @@ public class TabGridDialogMediator
+@@ -1034,9 +1038,15 @@ public class TabGridDialogMediator
              UrlConstantResolver urlConstantResolver =
                      UrlConstantResolverFactory.getForProfile(profile);
  
 +            String url = urlConstantResolver.getNtpUrl();
 +            if (UrlConstants.NTP_URL.equals(url)
 +                    && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
-+                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++                GURL gurl = HomepageManager.getInstance().getHomepageGurl(profile.isIncognitoBranded());
 +                url = gurl != null ? gurl.getSpec() : url;
 +            }
              TabGroupUtils.openUrlInGroup(
@@ -76,7 +76,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
 +                    String url = urlConstantResolver.getNtpUrl();
 +                    if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
-+                        GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++                        GURL gurl = HomepageManager.getInstance().getHomepageGurl(currentTab.isIncognito());
 +                        url = gurl != null ? gurl.getSpec() : url;
 +                    }
                      mTabCreatorManager
@@ -105,8 +105,8 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
-@@ -84,6 +84,9 @@ import org.chromium.ui.widget.RectProvider;
- 
+@@ -89,6 +89,9 @@ import java.util.List;
+ import java.util.function.BiConsumer;
  import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.homepage.HomepageManager;
@@ -115,14 +115,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  /**
   * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
   * responsible for creating a list of menu items, setting up the menu and displaying the menu.
-@@ -228,9 +231,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+@@ -239,9 +242,15 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper<Tok
                          /* didCloseCallback= */ null);
                  RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
              } else if (menuId == R.id.open_new_tab_in_group) {
 +                String url = UrlConstants.NTP_URL;
 +                if (UrlConstants.NTP_URL.equals(url)
 +                        && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
-+                    GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++                    GURL gurl = HomepageManager.getInstance().getHomepageGurl(tabModelSupplier.get().isIncognitoBranded());
 +                    url = gurl != null ? gurl.getSpec() : url;
 +                }
                  TabGroupUtils.openUrlInGroup(
@@ -135,7 +135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -257,6 +257,22 @@ public class HomepageManager
+@@ -264,6 +264,22 @@ public class HomepageManager
          notifyHomepageUpdated();
      }
  
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -26,6 +26,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  import org.chromium.components.embedder_support.util.UrlUtilities;
  import org.chromium.components.url_formatter.UrlFormatter;
  import org.chromium.url.GURL;
@@ -169,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
  
  /** Fragment that allows the user to configure homepage related preferences. */
  @NullMarked
-@@ -35,6 +36,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -36,6 +37,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
      @VisibleForTesting
      public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
  
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
      private HomepageManager mHomepageManager;
      private RadioButtonGroupHomepagePreference mRadioButtons;
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-@@ -102,6 +105,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -103,6 +106,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
          mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged);
          mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
  
@@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
-@@ -117,7 +117,6 @@ public class LaunchMetrics {
+@@ -136,7 +136,6 @@ public class LaunchMetrics {
      public static void recordHomePageLaunchMetrics(
              boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
          if (homepageGurl.isEmpty()) {
@@ -208,21 +208,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
+@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
+ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
+ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
+ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager.NewWindowAppSource;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
- import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
- import org.chromium.chrome.browser.profiles.Profile;
-@@ -572,6 +573,13 @@ public class ChromeTabCreator extends TabCreator
+@@ -583,6 +584,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
       */
      public @Nullable Tab launchUrl(
              String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
 +        if (!mIncognito && url.equals(UrlConstants.NTP_URL)) {
 +            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
-+                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
++                GURL gurl = HomepageManager.getInstance().getHomepageGurl(mIncognito);
 +                url = gurl != null ? gurl.getSpec() : url;
 +            }
 +        }
@@ -233,7 +233,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
-@@ -350,6 +350,7 @@ public final class ChromePreferenceKeys {
+@@ -371,6 +371,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP";
      public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
  
@@ -255,7 +255,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 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
-@@ -1330,6 +1330,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1348,6 +1348,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
          Last hour
        </message>
@@ -268,8 +268,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -119,6 +119,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
- 
+@@ -123,6 +123,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+                                 pref_registration_flags);
    registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
                                  pref_registration_flags);
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
@@ -280,7 +280,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 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
-@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
+@@ -1347,6 +1347,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
  // by enterprise policy.
  inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
  

build/patches/Add-search-engine.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  components/search_engines/BUILD.gn            |   3 ++
  components/search_engines/cromite/BUILD.gn    |  12 ++++++
  .../cromite/cromite_prepopulated_engines.json |  37 ++++++++++++++++++
- .../search_engine_choice_utils.cc             |   5 +--
+ .../search_engine_choice_utils.cc             |   9 +----
  .../search_engines/search_engine_type.h       |   5 +++
  .../template_url_prepopulate_data.cc          |  21 +++++++++-
  .../template_url_prepopulate_data.h           |   9 -----
@@ -20,7 +20,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  tools/json_to_struct/json_to_struct.py        |  26 ++++++++----
  tools/json_to_struct/struct_generator.py      |  10 +++--
  tools/variations/fieldtrial_to_struct.py      |   4 +-
- 12 files changed, 113 insertions(+), 28 deletions(-)
+ 12 files changed, 113 insertions(+), 32 deletions(-)
  create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
  create mode 100644 components/search_engines/cromite/BUILD.gn
  create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json
@@ -63,7 +63,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
    ]
  
    deps = [
-@@ -164,6 +165,7 @@ source_set("search_engine_utils") {
+@@ -161,6 +162,7 @@ source_set("search_engine_utils") {
      ":search_engine_type",
      "//components/google/core/common",
      "//third_party/search_engines_data:prepopulated_engines",
@@ -71,7 +71,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
    ]
  
    deps = [ "//url" ]
-@@ -258,6 +260,7 @@ source_set("unit_tests") {
+@@ -256,6 +258,7 @@ source_set("unit_tests") {
      "//testing/gmock",
      "//testing/gtest",
      "//third_party/search_engines_data:prepopulated_engines",
@@ -141,7 +141,7 @@ new file mode 100644
 diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
-@@ -172,10 +172,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+@@ -209,14 +209,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
  }
  
  void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -149,6 +149,10 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
 -      kSearchEngineChoiceScreenSelectedEngineIndexHistogram,
 -      selected_engine_index,
 -      TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
+-  base::PumaHistogramExactLinear(
+-      base::PumaType::kRc, kPumaSearchChoiceScreenSelectedEngineIndexHistogram,
+-      selected_engine_index,
+-      TemplateURLPrepopulateData::kMaxEeaPrepopulatedEngines);
 +  // do nothing in Cromite
  }
  
@@ -185,22 +189,22 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  namespace TemplateURLPrepopulateData {
  
  // Helpers --------------------------------------------------------------------
-@@ -122,7 +124,7 @@ int GetDataVersion(PrefService* prefs) {
+@@ -154,7 +156,7 @@ int GetDataVersion(PrefService* prefs) {
        kCurrentDataVersion;
  }
  
 -std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
 +std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEnginesChromium(
      PrefService& prefs,
-     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+     const std::vector<const PrepopulatedEngine*>&
          regional_prepopulated_engines) {
-@@ -138,6 +140,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+@@ -170,6 +172,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
                          &PrepopulatedEngineToTemplateURLData);
  }
  
 +std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
 +    PrefService& prefs,
-+    std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
++    const std::vector<const PrepopulatedEngine*>&
 +        regional_prepopulated_engines) {
 +  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
 +    GetPrepopulatedEnginesChromium(prefs, regional_prepopulated_engines);
@@ -211,8 +215,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 +
  std::unique_ptr<TemplateURLData> GetPrepopulatedEngine(
      PrefService& prefs,
-     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
-@@ -159,10 +172,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+     const std::vector<const PrepopulatedEngine*>& regional_prepopulated_engines,
+@@ -190,10 +203,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
      return std::vector<std::unique_ptr<TemplateURLData>>();
    }
  
@@ -276,7 +280,7 @@ diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json
 diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_to_struct.py
 --- a/tools/json_to_struct/json_to_struct.py
 +++ b/tools/json_to_struct/json_to_struct.py
-@@ -103,7 +103,7 @@ def _GenerateHeaderGuard(h_filename):
+@@ -104,7 +104,7 @@ def _GenerateHeaderGuard(h_filename):
    return re.sub(u'^_*', '', result) + u'_'  # Remove leading underscores.
  
  
@@ -285,7 +289,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
    """Generates the .h file containing the definition of the structure specified
    by the schema.
  
-@@ -147,11 +147,15 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+@@ -148,11 +148,15 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
        f.write(u'#include "%s"\n' % header)
      f.write(u'\n')
  
@@ -302,7 +306,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
        schema['type_name'], schema['schema']))
      f.write(u'\n')
  
-@@ -176,7 +180,7 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+@@ -177,7 +181,7 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
      f.write(u'#endif  // %s\n' % header_guard)
  
  
@@ -311,7 +315,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
    """Generates the .cc file containing the static initializers for the
    of the elements specified in the description.
  
-@@ -211,7 +215,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+@@ -212,7 +216,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
      f.write(element_generator.GenerateElements(schema['type_name'],
          schema['schema'], description))
  
@@ -320,7 +324,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
        f.write('\n}  // anonymous namespace \n\n')
  
      aggregated = GenerateCCAggregation(schema['type_name'], aggregation)
-@@ -298,7 +302,7 @@ def GenerateClass(basepath,
+@@ -299,7 +303,7 @@ def GenerateClass(basepath,
  
  
  def GenerateStruct(basepath, output_root, namespace, schema, description,
@@ -329,7 +333,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
    """Generates a C++ struct from a JSON description.
  
    Args:
-@@ -317,8 +321,8 @@ def GenerateStruct(basepath, output_root, namespace, schema, description,
+@@ -318,8 +322,8 @@ def GenerateStruct(basepath, output_root, namespace, schema, description,
    """
    year = int(year) if year else datetime.now().year
    head = HEAD % (year, schema_filename, description_filename)
@@ -340,7 +344,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
  
  if __name__ == '__main__':
    parser = optparse.OptionParser(
-@@ -333,11 +337,17 @@ if __name__ == '__main__':
+@@ -334,11 +338,17 @@ if __name__ == '__main__':
    parser.add_option('-s', '--schema', help='path to the schema file, '
        'mandatory.')
    parser.add_option('-o', '--output', help='output filename, ')
@@ -358,7 +362,7 @@ diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_
    description_filename = os.path.normpath(args[0])
    root, ext = os.path.splitext(description_filename)
    shortroot = opts.output if opts.output else os.path.split(root)[1]
-@@ -354,4 +364,4 @@ if __name__ == '__main__':
+@@ -355,4 +365,4 @@ if __name__ == '__main__':
    schema = _Load(opts.schema)
    description = _Load(description_filename)
    GenerateStruct(basepath, output_root, opts.namespace, schema, description,

build/patches/Add-setting-to-clear-data-on-exit.patch

@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../api/settings_private/prefs_util.cc        | 17 ++++
  .../browser/profiles/ProfileManagerUtils.java |  5 ++
  .../profiles/android/profile_manager_utils.cc |  5 ++
- chrome/browser/profiles/profile_manager.cc    | 15 +++-
+ chrome/browser/profiles/profile_manager.cc    | 17 +++-
  chrome/browser/profiles/profile_manager.h     |  2 +
  .../clear_browsing_data_dialog.html           | 44 +++++++++++
  .../clear_browsing_data_dialog.ts             |  2 +
@@ -31,16 +31,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../core/browsing_data_policies_utils.h       | 11 +++
  .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
  .../core/clear_browsing_data_tab.h            |  3 +-
+ components/browsing_data/core/features.h      |  1 +
  components/browsing_data/core/pref_names.cc   | 17 ++++
  components/browsing_data/core/pref_names.h    | 10 +++
  components/favicon/core/favicon_database.cc   |  9 +++
- components/favicon/core/favicon_database.h    |  2 +
+ components/favicon/core/favicon_database.h    |  3 +
  .../search_engines/template_url_service.cc    |  1 +
  content/browser/btm/btm_service_impl.cc       |  2 +-
- content/browser/storage_partition_impl.cc     |  1 +
+ content/browser/storage_partition_impl.cc     |  2 +
  .../public/browser/browsing_data_remover.h    |  7 +-
  .../Add-setting-to-clear-data-on-exit.inc     |  8 ++
- 36 files changed, 406 insertions(+), 33 deletions(-)
+ 37 files changed, 410 insertions(+), 34 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
@@ -48,7 +49,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -265,6 +265,7 @@ chrome_java_sources = [
+@@ -270,6 +270,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
@@ -74,7 +75,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -203,6 +203,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -208,6 +208,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
@@ -82,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
  import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
  import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
-@@ -2224,7 +2225,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2181,7 +2182,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
              Intent intent = getIntent();
  
              boolean hadCipherData =
@@ -98,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
-@@ -224,8 +224,8 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -205,8 +205,8 @@ public final class BrowsingDataBridge {
       *     BrowsingDataType}).
       * @return The state of the corresponding deletion preference.
       */
@@ -109,7 +110,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
      }
  
      /**
-@@ -235,8 +235,8 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -216,8 +216,8 @@ public final class BrowsingDataBridge {
       *     BrowsingDataType}).
       * @param value The state to be set.
       */
@@ -120,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
      }
  
      /**
-@@ -340,10 +340,10 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -278,10 +278,10 @@ public final class BrowsingDataBridge {
                  @JniType("Profile*") Profile profile, @JniType("std::string") String origin);
  
          boolean getBrowsingDataDeletionPreference(
@@ -165,9 +166,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 -    private void onClearBrowsingData() {
 +    protected void onClearBrowsingData() {
          RecordUserAction.record("ClearBrowsingData_AdvancedTab");
+     }
  
-         if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
-@@ -442,6 +448,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
              BrowsingDataBridge.getForProfile(getProfile())
                      .setBrowsingDataDeletionPreference(
                              ClearBrowsingDataFragment.getDataType(item.getOption()),
@@ -175,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
                              item.isSelected());
          }
  
-@@ -449,8 +456,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
      }
  
@@ -189,7 +190,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          String referrer =
                  fragmentArgs.getString(
                          ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
-@@ -476,6 +487,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  DialogOption.CLEAR_SITE_SETTINGS);
      }
  
@@ -200,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      /**
       * Decides whether a given dialog option should be selected when the dialog is initialized.
       *
-@@ -484,7 +499,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       */
      private boolean isOptionSelectedByDefault(@DialogOption int option) {
          return BrowsingDataBridge.getForProfile(getProfile())
@@ -209,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      }
  
      /**
-@@ -552,6 +567,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       * options.
       */
      private void onClearButtonClicked() {
@@ -217,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -581,6 +597,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
          Button clearButton = (Button) assumeNonNull(getView()).findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
@@ -225,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      }
  
      private int getSpinnerIndex(
-@@ -658,7 +675,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -653,7 +670,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                              .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
                  enabled = false;
                  browsingDataBridge.setBrowsingDataDeletionPreference(
@@ -234,7 +235,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              }
  
              // Disable tabs closure if the user is in multi-window mode.
-@@ -688,8 +705,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -683,8 +700,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
          mSigninManager.addSignInStateObserver(this);
  
          setHasOptionsMenu(true);
@@ -334,7 +335,7 @@ new file mode 100644
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2067,6 +2067,16 @@
+@@ -2148,6 +2148,16 @@
    <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
      Delete browsing data
    </message>
@@ -354,9 +355,9 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 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
-@@ -110,6 +110,7 @@
+@@ -109,6 +109,7 @@
+ #include "components/enterprise/client_certificates/core/features.h"
  #include "components/enterprise/data_controls/core/browser/features.h"
- #include "components/enterprise/obfuscation/core/utils.h"
  #include "components/error_page/common/error_page_switches.h"
 +#include "components/favicon/core/favicon_database.h"
  #include "components/feature_engagement/public/feature_constants.h"
@@ -365,7 +366,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-@@ -70,6 +70,15 @@ PrefService* GetPrefService(Profile* profile) {
+@@ -67,6 +67,15 @@ PrefService* GetPrefService(Profile* profile) {
    return profile->GetOriginalProfile()->GetPrefs();
  }
  
@@ -381,7 +382,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
  void OnBrowsingDataModelBuilt(JNIEnv* env,
                                const ScopedJavaGlobalRef<jobject>& java_callback,
                                std::unique_ptr<BrowsingDataModel> model) {
-@@ -222,7 +231,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
+@@ -219,7 +228,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
  static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
      JNIEnv* env,
      Profile* profile,
@@ -391,7 +392,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
    DCHECK_GE(data_type, 0);
    DCHECK_LE(data_type,
              static_cast<int>(browsing_data::BrowsingDataType::MAX_VALUE));
-@@ -234,7 +244,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+@@ -231,7 +241,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
    std::string pref;
    if (!browsing_data::GetDeletionPreferenceFromDataType(
            static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -400,7 +401,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
      return false;
    }
  
-@@ -245,6 +255,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+@@ -242,6 +252,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
      JNIEnv* env,
      Profile* profile,
      jint data_type,
@@ -408,7 +409,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
      jboolean value) {
    DCHECK_GE(data_type, 0);
    DCHECK_LE(data_type,
-@@ -253,7 +264,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+@@ -250,7 +261,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
    std::string pref;
    if (!browsing_data::GetDeletionPreferenceFromDataType(
            static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -420,7 +421,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -324,8 +324,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -327,8 +327,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
  
  void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
      bool keep_browser_alive) {
@@ -448,7 +449,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
  
    if (!data_types.empty() &&
        IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -434,6 +451,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -437,6 +454,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
  bool ChromeBrowsingDataLifetimeManager::
      IsConditionSatisfiedForBrowsingDataRemoval(
          const syncer::UserSelectableTypeSet sync_types) {
@@ -459,7 +460,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -350,6 +350,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -352,6 +352,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      uint64_t origin_type_mask,
      base::OnceCallback<void(uint64_t)> callback) {
    CHECK(((remove_mask &
@@ -467,7 +468,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
            ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
            ~constants::FILTERABLE_DATA_TYPES) == 0) ||
          filter_builder->MatchesAllOriginsAndDomains());
-@@ -453,6 +454,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -455,6 +456,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -477,7 +478,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -561,6 +565,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -563,6 +567,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      // and SSL host state are scoped to hosts and represent them as std::string.
      // Rename the method to indicate its more general usage.
      if (profile_->GetSSLHostStateDelegate()) {
@@ -489,7 +490,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
        profile_->GetSSLHostStateDelegate()->Clear(
            filter_builder->MatchesAllOriginsAndDomains()
                ? base::RepeatingCallback<bool(const std::string&)>()
-@@ -589,9 +598,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -591,9 +600,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -503,7 +504,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
-@@ -1314,6 +1327,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1320,6 +1333,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -515,7 +516,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -557,6 +557,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -564,6 +564,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -562,19 +563,20 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc
 --- a/chrome/browser/profiles/android/profile_manager_utils.cc
 +++ b/chrome/browser/profiles/android/profile_manager_utils.cc
-@@ -64,3 +64,8 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
-       g_browser_process->profile_manager()->GetLoadedProfiles(),
+@@ -65,4 +65,9 @@ static void JNI_ProfileManagerUtils_RemoveSessionCookiesForAllProfiles(
        RemoveSessionCookiesForProfile);
  }
-+
+ 
 +static void JNI_ProfileManagerUtils_RemoveBrowsingDataAtStart(
 +    JNIEnv* env) {
 +  g_browser_process->profile_manager()->RemoveBrowsingDataAtStart();
 +}
++
+ DEFINE_JNI(ProfileManagerUtils)
 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
-@@ -1435,6 +1435,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1516,6 +1516,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
    }
  }
  
@@ -594,19 +596,22 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  void ProfileManager::DoFinalInitForServices(Profile* profile,
                                              bool go_off_the_record) {
    if (!do_final_services_init_ ||
-@@ -2096,7 +2109,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
-   Profile* original_profile = profile->GetOriginalProfile();
+@@ -2185,9 +2198,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
    // Do nothing if the closed window is not the last window of the same profile.
-   for (Browser* browser_iter : *BrowserList::GetInstance()) {
--    if (browser_iter->profile()->GetOriginalProfile() == original_profile)
-+    if (browser_iter->profile() == profile)
-       return;
-   }
- 
+   bool has_other_window = false;
+   ForEachCurrentBrowserWindowInterfaceOrderedByActivation(
+-      [original_profile, &has_other_window](BrowserWindowInterface* browser) {
++      [profile, &has_other_window](BrowserWindowInterface* browser) {
+         const Profile* const iter_profile = browser->GetProfile();
+-        if (iter_profile->GetOriginalProfile() == original_profile) {
++        if (iter_profile == profile) {
+           has_other_window = true;
+         }
+         return !has_other_window;
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -215,6 +215,8 @@ class ProfileManager : public Profile::Delegate {
+@@ -231,6 +231,8 @@ class ProfileManager : public Profile::Delegate {
    //   profiles.
    std::vector<Profile*> GetLoadedProfiles() const;
  
@@ -672,7 +677,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -214,6 +214,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -216,6 +216,7 @@ export class SettingsClearBrowsingDataDialogElement extends
          value: () =>
              [loadTimeData.getString('basicPageTitle'),
               loadTimeData.getString('advancedPageTitle'),
@@ -680,7 +685,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
      ],
        },
  
-@@ -336,6 +337,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -344,6 +345,7 @@ export class SettingsClearBrowsingDataDialogElement extends
      }
      this.clearButtonDisabled_ =
          this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -691,7 +696,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 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
-@@ -1425,6 +1425,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1443,6 +1443,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
          Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
        </message>
@@ -718,7 +723,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2042,6 +2042,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -2218,6 +2218,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -877,6 +882,17 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
  
  }  // namespace browsing_data
  
+diff --git a/components/browsing_data/core/features.h b/components/browsing_data/core/features.h
+--- a/components/browsing_data/core/features.h
++++ b/components/browsing_data/core/features.h
+@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBrowsingDataModel);
+ // updates to history counter logic and removal of the bulk password deletion
+ // option from the dialog.
+ BASE_DECLARE_FEATURE(kDbdRevampDesktop);
++SET_CROMITE_FEATURE_DISABLED(kDbdRevampDesktop);
+ 
+ // When enabled, calls to browsingData.removePasswords extension API would
+ // result in an error response instead of a console warning.
 diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
 --- a/components/browsing_data/core/pref_names.cc
 +++ b/components/browsing_data/core/pref_names.cc
@@ -938,7 +954,7 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co
  // Description of database tables:
  //
  // icon_mapping
-@@ -507,6 +511,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
+@@ -505,6 +509,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
  
  bool FaviconDatabase::SetFaviconsOutOfDateBetween(base::Time begin,
                                                    base::Time end) {
@@ -953,7 +969,15 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co
 diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h
 --- a/components/favicon/core/favicon_database.h
 +++ b/components/favicon/core/favicon_database.h
-@@ -33,6 +33,8 @@ namespace favicon {
+@@ -9,6 +9,7 @@
+ #include <optional>
+ #include <vector>
+ 
++#include "base/feature_list.h"
+ #include "base/gtest_prod_util.h"
+ #include "base/memory/ref_counted.h"
+ #include "components/favicon/core/favicon_types.h"
+@@ -33,6 +34,8 @@ namespace favicon {
  // All earlier updates are ignored.
  static const int kFaviconUpdateLastRequestedAfterDays = 10;
  
@@ -965,7 +989,7 @@ diff --git a/components/favicon/core/favicon_database.h b/components/favicon/cor
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -925,6 +925,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -924,6 +924,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
      if (turl->date_created() >= created_after &&
          (created_before.is_null() || turl->date_created() < created_before) &&
          turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -976,7 +1000,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
 diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
 --- a/content/browser/btm/btm_service_impl.cc
 +++ b/content/browser/btm/btm_service_impl.cc
-@@ -262,7 +262,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+@@ -261,7 +261,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
      remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
      remover->RemoveWithFilterAndReply(
          base::Time::Min(), base::Time::Max(),
@@ -988,7 +1012,15 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s
 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
-@@ -1550,6 +1550,7 @@ void StoragePartitionImpl::Initialize(
+@@ -19,6 +19,7 @@
+ #include "base/containers/contains.h"
+ #include "base/dcheck_is_on.h"
+ #include "base/feature_list.h"
++#include "base/files/file_util.h"
+ #include "base/functional/bind.h"
+ #include "base/functional/callback_helpers.h"
+ #include "base/functional/concurrent_closures.h"
+@@ -1557,6 +1558,7 @@ void StoragePartitionImpl::Initialize(
                              .AppendASCII("Code Cache");
      }
      DCHECK_GE(settings.size_in_bytes(), 0);

build/patches/Add-setting-to-enable-Credman-for-passkeys.patch

@@ -11,16 +11,17 @@ Conditional immediate support is disabled.
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../settings/PasswordSettings.java            | 27 +++++++++++++++++
+ .../touch_to_fill_controller.cc               |  2 ++
  ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
  .../webauthn/AuthenticatorImpl.java           | 29 +++++++------------
  .../components/webauthn/WebauthnFeatures.java |  2 ++
- .../cred_man/CredManSupportProvider.java      | 27 +++++------------
+ .../cred_man/CredManSupportProvider.java      | 25 ++++------------
  .../webauthn/android/webauthn_feature_map.cc  |  1 +
  components/webauthn/features.cc               |  4 +++
  components/webauthn/features.h                |  3 ++
  device/fido/features.cc                       |  2 ++
  .../authentication_credentials_container.cc   |  5 ++++
- 10 files changed, 75 insertions(+), 37 deletions(-)
+ 11 files changed, 75 insertions(+), 37 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
 
 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
@@ -81,6 +82,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
      private void displayManageAccountLink() {
          SyncService syncService = SyncServiceFactory.getForProfile(getProfile());
          if (syncService == null || !syncService.isEngineInitialized()) {
+diff --git a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
+--- a/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
++++ b/chrome/browser/touch_to_fill/password_manager/touch_to_fill_controller.cc
+@@ -312,6 +312,7 @@ void TouchToFillController::Reset() {
+   }
+   visibility_controller_->Reset();
+   credentials_.clear();
++  cred_man_delegate_ = nullptr;
+ }
+ 
+ void TouchToFillController::ActionCompleted() {
+@@ -319,6 +320,7 @@ void TouchToFillController::ActionCompleted() {
+     visibility_controller_->SetShown();
+   }
+   ttf_delegate_.reset();
++  cred_man_delegate_ = nullptr;
+ }
+ 
+ DisplayTarget TouchToFillController::GetResponsibleDisplayTarget(
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
 new file mode 100644
 --- /dev/null
@@ -110,7 +130,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
  import org.chromium.components.ukm.UkmRecorder;
  import org.chromium.content_public.browser.RenderFrameHost;
  import org.chromium.content_public.browser.WebContents;
-@@ -169,8 +171,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -170,8 +172,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
          mIsPaymentRequest = options.isPaymentCredentialCreation;
          mMakeCredentialCallback = callback;
          mIsOperationPending = true;
@@ -120,7 +140,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
              recordOutcomeEvent(MakeCredentialOutcome.OTHER_FAILURE);
              onError(AuthenticatorStatus.NOT_IMPLEMENTED);
              return;
-@@ -234,8 +235,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -235,8 +236,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
          mIsConditionalRequest = options.mediation == Mediation.CONDITIONAL;
          mIsImmediateRequest = options.mediation == Mediation.IMMEDIATE;
  
@@ -130,7 +150,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
                  || options.publicKey == null) {
              recordOutcomeEvent(GetAssertionOutcome.OTHER_FAILURE);
              onError(AuthenticatorStatus.NOT_IMPLEMENTED);
-@@ -260,12 +260,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -277,12 +277,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
      }
  
      private boolean couldSupportConditionalMediation() {
@@ -145,7 +165,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
      }
  
      @Override
-@@ -339,26 +338,20 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -356,26 +355,20 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
                              capabilities.add(
                                      createWebAuthnClientCapability(
                                              AuthenticatorConstants.CAPABILITY_CONDITIONAL_GET,
@@ -174,36 +194,36 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 -                                                                    .WEBAUTHN_IMMEDIATE_GET)
 -                                                    && isUvpaa));
 +                                            false));
-                             callback.call(capabilities.toArray(new WebAuthnClientCapability[0]));
-                         });
-     }
+                             boolean signalSupported =
+                                     isUvpaa
+                                             && DeviceFeatureMap.isEnabled(
 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
 +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
-@@ -16,4 +16,6 @@ import org.chromium.build.annotations.NullMarked;
- public abstract class WebauthnFeatures {
+@@ -17,4 +17,6 @@ public abstract class WebauthnFeatures {
      public static final String WEBAUTHN_ANDROID_PASSKEY_CACHE_MIGRATION =
              "WebAuthenticationAndroidPasskeyCacheMigration";
+     public static final String WEBAUTHN_ANDROID_CRED_MAN_FOR_DEV = "WebAuthnAndroidCredManForDev";
 +    public static final String WEBAUTHN_ANDROID_PASSKEY =
 +            "WebAuthenticationAndroidPasskey";
  }
 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
 +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/cred_man/CredManSupportProvider.java
-@@ -19,9 +19,11 @@ import org.chromium.base.version_info.VersionInfo;
+@@ -19,11 +19,11 @@ import org.chromium.base.version_info.VersionInfo;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.components.webauthn.CredManSupport;
 -import org.chromium.components.webauthn.GmsCoreUtils;
+ import org.chromium.components.webauthn.WebauthnFeatureMap;
+ import org.chromium.components.webauthn.WebauthnFeatures;
  import org.chromium.components.webauthn.WebauthnMode;
  import org.chromium.components.webauthn.WebauthnModeProvider;
-+import org.chromium.components.webauthn.WebauthnFeatureMap;
-+import org.chromium.components.webauthn.WebauthnFeatures;
 +import org.chromium.components.webauthn.WebauthnLogger;
  
  @NullMarked
  public class CredManSupportProvider {
-@@ -57,12 +59,12 @@ public class CredManSupportProvider {
+@@ -79,12 +79,12 @@ public class CredManSupportProvider {
          }
          if (getAndroidVersion() < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
              sCredManSupport = CredManSupport.DISABLED;
@@ -219,15 +239,15 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
              return sCredManSupport;
          }
          if (notSkippedBecauseInTests()
-@@ -70,14 +72,14 @@ public class CredManSupportProvider {
+@@ -92,14 +92,14 @@ public class CredManSupportProvider {
                          == null) {
              sCredManSupport = CredManSupport.DISABLED;
-             recordCredManAvailability(/*available*/ false);
+             recordCredManAvailability(/* available= */ false);
 -            log(TAG, "Disabled because CredentialManager is not available.");
 +            WebauthnLogger.logError(TAG, "Disabled because CredentialManager is not available.");
              return sCredManSupport;
          }
-         recordCredManAvailability(/*available*/ true);
+         recordCredManAvailability(/* available= */ true);
  
          final CredManUiRecommender recommender =
                  ServiceLoaderUtil.maybeCreate(CredManUiRecommender.class);
@@ -236,7 +256,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
          boolean gpmInCredMan =
                  sOverrideForcesGpm != null ? sOverrideForcesGpm : customUiRecommended;
          boolean isChrome3pPwmMode =
-@@ -116,13 +118,6 @@ public class CredManSupportProvider {
+@@ -138,13 +138,6 @@ public class CredManSupportProvider {
                  "WebAuthentication.Android.CredManAvailability", available);
      }
  
@@ -250,7 +270,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
      private static int getAndroidVersion() {
          return sOverrideAndroidVersion == null ? Build.VERSION.SDK_INT : sOverrideAndroidVersion;
      }
-@@ -130,10 +125,4 @@ public class CredManSupportProvider {
+@@ -152,10 +145,4 @@ public class CredManSupportProvider {
      private static boolean notSkippedBecauseInTests() {
          return sOverrideForcesGpm == null && sOverrideAndroidVersion == null;
      }
@@ -264,10 +284,10 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/webauthn/android/webauthn_feature_map.cc
 --- a/components/webauthn/android/webauthn_feature_map.cc
 +++ b/components/webauthn/android/webauthn_feature_map.cc
-@@ -16,6 +16,7 @@ namespace {
- // Array of features exposed through the Java WebauthnFeatureMap API.
+@@ -17,6 +17,7 @@ namespace {
  const base::Feature* const kFeaturesExposedToJava[] = {
      &kWebAuthnAndroidPasskeyCacheMigration,
+     &kWebAuthnAndroidCredManForDev,
 +    &kWebAuthnAndroidPasskey,
  };
  
@@ -275,9 +295,9 @@ diff --git a/components/webauthn/android/webauthn_feature_map.cc b/components/we
 diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc
 --- a/components/webauthn/features.cc
 +++ b/components/webauthn/features.cc
-@@ -16,6 +16,10 @@ BASE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration,
-              "WebAuthenticationAndroidPasskeyCacheMigration",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -25,6 +25,10 @@ BASE_FEATURE(kWebAuthnAndroidCredManForDev, base::FEATURE_DISABLED_BY_DEFAULT);
+ const base::FeatureParam<std::string> kWebAuthnAndroidCredManForDevMode{
+     &kWebAuthnAndroidCredManForDev, "mode", ""};
  
 +CROMITE_FEATURE(kWebAuthnAndroidPasskey,
 +                "WebAuthenticationAndroidPasskey",
@@ -289,9 +309,9 @@ diff --git a/components/webauthn/features.cc b/components/webauthn/features.cc
 diff --git a/components/webauthn/features.h b/components/webauthn/features.h
 --- a/components/webauthn/features.h
 +++ b/components/webauthn/features.h
-@@ -20,6 +20,9 @@ namespace webauthn::features {
+@@ -27,6 +27,9 @@ BASE_DECLARE_FEATURE(kWebAuthnAndroidCredManForDev);
  COMPONENT_EXPORT(WEBAUTHN)
- BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration);
+ extern const base::FeatureParam<std::string> kWebAuthnAndroidCredManForDevMode;
  
 +COMPONENT_EXPORT(WEBAUTHN)
 +BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskey);
@@ -302,7 +322,7 @@ diff --git a/components/webauthn/features.h b/components/webauthn/features.h
 diff --git a/device/fido/features.cc b/device/fido/features.cc
 --- a/device/fido/features.cc
 +++ b/device/fido/features.cc
-@@ -154,6 +154,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
+@@ -188,6 +188,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
  #else
               base::FEATURE_ENABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
@@ -310,7 +330,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
  
  BASE_FEATURE_PARAM(int,
                     kWebAuthnImmediateMediationTimeoutMilliseconds,
-@@ -166,6 +167,7 @@ BASE_FEATURE_PARAM(int,
+@@ -200,6 +201,7 @@ BASE_FEATURE_PARAM(int,
  BASE_FEATURE(kWebAuthnImmediateGetAutoselect,
               "WebAuthenticationImmediateGetAutoselect",
               base::FEATURE_ENABLED_BY_DEFAULT);
@@ -321,7 +341,7 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
 diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
 --- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
 +++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
-@@ -1076,6 +1076,11 @@ DOMException* AuthenticatorStatusToDOMException(
+@@ -1090,6 +1090,11 @@ DOMException* AuthenticatorStatusToDOMException(
      const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) {
    DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS,
              dom_exception_details.is_null());

build/patches/Add-setting-to-invert-tap-and-long-tap.patch

@@ -59,7 +59,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/contextmenu/A
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -109,6 +109,7 @@ found in the LICENSE file.
+@@ -111,6 +111,7 @@ found in the LICENSE file.
  
      <!-- Menu item IDs for FullscreenActivities -->
      <item type="id" name="contextmenu_open_in_chrome" />
@@ -98,28 +98,28 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
-@@ -132,8 +132,9 @@ class ChromeContextMenuItem {
-         int PRINT_PAGE = 40;
+@@ -135,8 +135,9 @@ class ChromeContextMenuItem {
          // Developer Group
-         int INSPECT_ELEMENT = 41;
-+        int FOLLOW_LINK = 42;
+         int VIEW_PAGE_SOURCE = 41;
+         int INSPECT_ELEMENT = 42;
++        int FOLLOW_LINK = 43;
          // ALWAYS UPDATE!
--        int NUM_ENTRIES = 42;
-+        int NUM_ENTRIES = 43;
+-        int NUM_ENTRIES = 43;
++        int NUM_ENTRIES = 44;
      }
  
      /** Mapping from {@link Item} to the ID found in the ids.xml. */
-@@ -180,6 +181,7 @@ class ChromeContextMenuItem {
-         R.id.contextmenu_share_page, // Item.SHARE_PAGE
+@@ -184,6 +185,7 @@ class ChromeContextMenuItem {
          R.id.contextmenu_print_page, // Item.PRINT_PAGE
+         R.id.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE
          R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
 +        R.id.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
      };
  
      /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
-@@ -226,6 +228,7 @@ class ChromeContextMenuItem {
-         R.string.contextmenu_share_page, // Item.SHARE_PAGE
+@@ -231,6 +233,7 @@ class ChromeContextMenuItem {
          R.string.contextmenu_print_page, // Item.PRINT_PAGE
+         R.string.contextmenu_view_page_source, // Item.VIEW_PAGE_SOURCE
          R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
 +        R.string.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
      };
@@ -128,7 +128,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/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -452,6 +452,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -474,6 +474,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
          }
          if (mParams.isAnchor()) {
              ModelList linkGroup = new ModelList();
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
              if (FirstRunStatus.getFirstRunFlowComplete()
                      && !isEmptyUrl(mParams.getUrl())
                      && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -1054,6 +1057,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -1083,6 +1086,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -150,7 +150,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/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -374,6 +374,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -414,6 +414,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
          mTab.loadUrl(loadUrlParams);
      }
  
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 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
-@@ -433,6 +433,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -446,6 +446,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kTabGroupParityBottomSheetAndroid,
      &kTabModelInitFixes,
      &kTabStorageSqlitePrototype,
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 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
-@@ -507,6 +507,8 @@ public abstract class ChromeFeatureList {
+@@ -517,6 +517,8 @@ public abstract class ChromeFeatureList {
              "DisableToolbarSwipeUp";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
              "NewTabPageCustomizationToolbarButton";
      public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2";
-@@ -1035,6 +1037,8 @@ public abstract class ChromeFeatureList {
+@@ -1031,6 +1033,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -197,10 +197,10 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
      public static final CachedFlag sPostGetMyMemoryStateToBackground =
              newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
-@@ -1289,6 +1293,7 @@ public abstract class ChromeFeatureList {
+@@ -1303,6 +1307,7 @@ public abstract class ChromeFeatureList {
                      sTopControlsRefactor,
+                     sTopControlsRefactorV2,
                      sTouchToSearchCallout,
-                     sTraceBinderIpc,
 +                    sShowAlwaysContextMenuOnLinks,
                      sUseActivityManagerForTabActivation,
                      sUseChimeAndroidSdk,
@@ -208,7 +208,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
-@@ -1554,6 +1554,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1572,6 +1572,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
          Disable toolbar swipe up
        </message>
@@ -221,15 +221,15 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Safety check -->
        <message name="IDS_PREFS_SAFETY_CHECK" desc="Title of the Safety check element in settings, allowing the user to check multiple areas of browser safety. [CHAR_LIMIT=32]">
-@@ -3195,6 +3201,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3237,6 +3243,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
          Open in new Chrome tab
        </message>
 +      <message name="IDS_CONTEXTMENU_OPEN_IN_TAB" desc="Context sensitive menu item to open the selected link in tab. [CHAR_LIMIT=30]">
 +        Open in current tab
 +      </message>
-       <message name="IDS_CONTEXTMENU_OPEN_IN_CHROME_INCOGNITO_TAB" desc="Context sensitive menu item to open the selected link in a Chrome Incognito tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
-         Open in Incognito tab
+       <message name="IDS_CONTEXTMENU_OPEN_IN_CHROME_WINDOW" desc="Context sensitive menu item to open the selected link in a Chrome window from Chrome Custom Tab. Used when there is a dedicated window for Incognito tabs. [CHAR_LIMIT=30]">
+         Open in Chrome window
        </message>
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
@@ -249,7 +249,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -53,6 +53,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -60,6 +60,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
      private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
      private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
  
@@ -259,7 +259,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
      private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -148,6 +151,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -157,6 +160,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
          mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
          mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
  
@@ -272,7 +272,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -229,6 +238,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -265,6 +274,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
          } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
              mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
              mDelegate.requestRestart(getActivity());
@@ -344,7 +344,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
 --- a/third_party/blink/renderer/core/html/html_anchor_element.cc
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
-@@ -67,6 +67,7 @@
+@@ -65,6 +65,7 @@
  #include "third_party/blink/renderer/core/loader/render_blocking_resource_manager.h"
  #include "third_party/blink/renderer/core/navigation_api/navigation_api.h"
  #include "third_party/blink/renderer/core/page/chrome_client.h"
@@ -352,7 +352,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
  #include "third_party/blink/renderer/core/page/page.h"
  #include "third_party/blink/renderer/core/scroll/scroll_into_view_util.h"
  #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
-@@ -476,6 +477,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -415,6 +416,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      bool is_trusted,
      base::TimeTicks platform_time_stamp,
      KURL completed_url) {
@@ -370,7 +370,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    LocalDOMWindow* window = GetDocument().domWindow();
    if (!window) {
      return;
-@@ -566,6 +578,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -495,6 +507,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      frame_request.SetImpression(impression);
    }
  
@@ -386,7 +386,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    Frame* target_frame =
        frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
  
-@@ -601,7 +622,7 @@ bool HTMLAnchorElementBase::IsValidInterestInvoker(Element& target) const {
+@@ -531,7 +552,7 @@ bool HTMLAnchorElementBase::IsValidInterestInvoker(Element& target) const {
    return IsLink();
  }
  
@@ -395,7 +395,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    event.SetDefaultHandled();
  
    LocalDOMWindow* window = GetDocument().domWindow();
-@@ -659,13 +680,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -583,13 +604,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      return;
    }
  
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
      // We distinguish single/double click with some modifiers.
      // See the comment of `EventHandler.delayed_navigation_task_handle_`.
      auto task_handle = PostDelayedCancellableTask(
-@@ -675,7 +695,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -599,7 +619,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      frame->GetEventHandler().SetDelayedNavigationTaskHandle(
          std::move(task_handle));
    } else {
@@ -427,7 +427,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
-@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
+@@ -90,6 +90,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
    bool IsValidInterestInvoker(Element& target) const override;
  
    void Trace(Visitor*) const override;
@@ -435,7 +435,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
  
   protected:
    HTMLAnchorElementBase(const QualifiedName& tag_name, Document&);
-@@ -143,7 +144,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
+@@ -121,7 +122,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
                             bool is_trusted,
                             base::TimeTicks platform_time_stamp,
                             KURL);
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
  #include "third_party/blink/renderer/core/probe/core_probes.h"
  #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
-@@ -796,6 +798,21 @@ void HTMLImageElement::DidFinishLayout() {
+@@ -782,6 +784,21 @@ void HTMLImageElement::DidFinishLayout() {
    }
  }
  
@@ -492,19 +492,19 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -216,6 +216,8 @@ class CORE_EXPORT HTMLImageElement
+@@ -211,6 +211,8 @@ class CORE_EXPORT HTMLImageElement
    void DidAddUserAgentShadowRoot(ShadowRoot&) override;
    void AdjustStyle(ComputedStyleBuilder&) override;
  
 +  void DefaultEventHandler(Event&) override;
 +
   private:
-   bool AreAuthorShadowsAllowed() const override { return false; }
- 
+   void ParseAttribute(const AttributeModificationParams&) override;
+   bool IsPresentationAttribute(const QualifiedName&) const override;
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc
 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -200,15 +200,17 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -201,15 +201,17 @@ void ContextMenuController::DocumentDetached(Document* document) {
    }
  }
  
@@ -525,7 +525,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
      mouse_event->SetDefaultHandled();
  }
  
-@@ -433,7 +435,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -440,7 +442,8 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
  bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                              const PhysicalOffset& point,
                                              WebMenuSourceType source_type,
@@ -535,7 +535,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Displaying the context menu in this function is a big hack as we don't
    // have context, i.e. whether this is being invoked via a script or in
    // response to user input (Mouse event WM_RBUTTONDOWN,
-@@ -456,6 +459,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -463,6 +466,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
    if (!result.InnerNodeOrImageMapImage())
      return false;
  
@@ -552,7 +552,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Clear any previously set cached results if we are resetting the hit test
    // result.
    image_selection_cached_result_ = nullptr;
-@@ -836,7 +849,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -844,7 +857,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
  
    SetAutofillData(result.InnerNode(), data);
  
@@ -564,7 +564,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h
 --- a/third_party/blink/renderer/core/page/context_menu_controller.h
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.h
-@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController final
+@@ -58,7 +58,7 @@ class CORE_EXPORT ContextMenuController
  
    void DocumentDetached(Document*);
  
@@ -573,13 +573,13 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th
    void ShowContextMenuAtPoint(LocalFrame*,
                                float x,
                                float y,
-@@ -125,7 +125,8 @@ class CORE_EXPORT ContextMenuController final
-   bool ShowContextMenu(LocalFrame*,
-                        const PhysicalOffset&,
-                        WebMenuSourceType,
--                       const MouseEvent* mouse_event = nullptr);
-+                       const MouseEvent* mouse_event = nullptr,
-+                       bool do_not_show_context_menu = false);
+@@ -127,7 +127,8 @@ class CORE_EXPORT ContextMenuController
+   virtual bool ShowContextMenu(LocalFrame*,
+                                const PhysicalOffset&,
+                                WebMenuSourceType,
+-                               const MouseEvent* mouse_event);
++                               const MouseEvent* mouse_event,
++                               bool do_not_show_context_menu = false);
  
    bool ShouldShowContextMenuFromTouch(const ContextMenuData&);
  

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

@@ -10,6 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/about_flags.cc                 |  1 +
  .../engagement/important_sites_util.cc        |  9 +++++
  .../browser/media/media_engagement_service.cc |  4 ++-
+ .../auto_picture_in_picture_tab_helper.cc     |  2 +-
  .../internal/tracker_impl.cc                  |  3 ++
  .../public/feature_configurations.cc          |  7 ++++
  .../content/site_engagement_score.cc          |  5 +++
@@ -17,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/site_engagement/core/features.cc   | 30 ++++++++++++++++
  components/site_engagement/core/features.h    | 34 +++++++++++++++++++
  .../Add-site-engagement-flag.inc              | 10 ++++++
- 10 files changed, 108 insertions(+), 1 deletion(-)
+ 11 files changed, 109 insertions(+), 2 deletions(-)
  create mode 100644 components/site_engagement/core/features.cc
  create mode 100644 components/site_engagement/core/features.h
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
@@ -25,9 +26,9 @@ 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
-@@ -171,6 +171,7 @@
- #include "components/sensitive_content/features.h"
+@@ -169,6 +169,7 @@
  #include "components/services/heap_profiling/public/cpp/switches.h"
+ #include "components/services/on_device_translation/buildflags/buildflags.h"
  #include "components/services/storage/public/cpp/buckets/bucket_info.h"
 +#include "components/site_engagement/core/features.h"
  #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
@@ -44,7 +45,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
  #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h"
  #include "components/webapps/browser/banners/app_banner_settings_helper.h"
  #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-@@ -344,6 +345,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -345,6 +346,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
  // static
  std::set<std::string> ImportantSitesUtil::GetInstalledRegisterableDomains(
      Profile* profile) {
@@ -55,7 +56,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
    std::set<GURL> installed_origins = GetOriginsWithInstalledWebApps(profile);
    std::set<std::string> registerable_domains;
  
-@@ -358,6 +363,10 @@ std::vector<ImportantDomainInfo>
+@@ -359,6 +364,10 @@ std::vector<ImportantDomainInfo>
  ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
                                                      size_t max_results) {
    SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime");
@@ -87,6 +88,18 @@ diff --git a/chrome/browser/media/media_engagement_service.cc b/chrome/browser/m
  }
  
  // static
+diff --git a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc
+--- a/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc
++++ b/chrome/browser/picture_in_picture/auto_picture_in_picture_tab_helper.cc
+@@ -46,7 +46,7 @@ AutoPictureInPictureTabHelper::AutoPictureInPictureTabHelper(
+           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
+       auto_blocker_(PermissionDecisionAutoBlockerFactory::GetForProfile(
+           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
+-      media_engagement_service_(MediaEngagementService::Get(
++      media_engagement_service_(!MediaEngagementService::IsEnabled() ? nullptr : MediaEngagementService::Get(
+           Profile::FromBrowserContext(web_contents->GetBrowserContext()))),
+       clock_(base::DefaultTickClock::GetInstance()) {
+   // `base::Unretained` is safe here since we own `tab_observer_helper_`.
 diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc
 --- a/components/feature_engagement/internal/tracker_impl.cc
 +++ b/components/feature_engagement/internal/tracker_impl.cc
@@ -118,7 +131,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
  #include "components/feature_engagement/public/configuration.h"
  #include "components/feature_engagement/public/event_constants.h"
  #include "components/feature_engagement/public/feature_constants.h"
-@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -121,6 +122,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
    }
  
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)

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

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+@@ -68,6 +68,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
  import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
@@ -20,10 +20,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
  import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver;
-@@ -733,8 +734,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
-             finishCurrentSettings(mainFragment);
+@@ -922,8 +923,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {
+             RecordUserAction.record("Settings.MobileHelpAndFeedback");
 -            HelpAndFeedbackLauncherImpl.getForProfile(mProfile)
 -                    .show(this, getString(R.string.help_context_settings), null);
 +            if (mainFragment instanceof SettingsUtils.ISupportHelpAndFeedback) {

build/patches/Add-support-for-writing-URIs.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
 --- a/base/android/content_uri_utils.cc
 +++ b/base/android/content_uri_utils.cc
-@@ -137,6 +137,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
+@@ -137,6 +137,16 @@ static void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
                         Time::FromMillisecondsSinceUnixEpoch(last_modified));
  }
  

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

@@ -189,7 +189,7 @@ new file mode 100644
 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
-@@ -86,6 +86,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
+@@ -94,6 +94,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
    return settings;
  }
  
@@ -206,7 +206,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
-@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -149,6 +149,8 @@ enum ReasonForCallingCanExecuteScripts {
  
  enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
  
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -346,6 +346,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -341,6 +341,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
    }
  }
  
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
  unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
    base::AutoLock locker(WebGLContextLimitLock());
    DCHECK(webgl_context_limits_initialized_);
-@@ -616,25 +623,6 @@ static String ExtractWebGLContextCreationError(
+@@ -611,25 +618,6 @@ static String ExtractWebGLContextCreationError(
      const Platform::WebGLContextInfo& info) {
    StringBuilder builder;
    builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
    FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                            builder);
    builder.Append('.');
-@@ -695,6 +683,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -690,6 +678,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
      const CanvasContextCreationAttributesCore& attributes,
      Platform::WebGLContextType context_type,
      Platform::WebGLContextInfo* context_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
-@@ -1959,6 +1959,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
+@@ -1965,6 +1965,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -989,6 +990,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -1041,6 +1042,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // |request_multiple_routes|. Whether local IP addresses could be
        // collected depends on if mic/camera permission is granted for this
        // origin.
@@ -210,9 +210,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
-@@ -16,6 +16,9 @@
- #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
- #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
+@@ -12,6 +12,9 @@
+ #include "base/synchronization/lock.h"
+ #include "base/task/single_thread_task_runner.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
@@ -220,7 +220,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
-@@ -279,6 +282,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -277,6 +280,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  
@@ -238,9 +238,9 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
-@@ -21,6 +21,9 @@
- #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
- #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
+@@ -17,6 +17,9 @@
+ #include "base/strings/to_string.h"
+ #include "base/task/single_thread_task_runner.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
@@ -248,7 +248,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1031,6 +1034,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1019,6 +1022,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  

build/patches/Allow-DocumentPiP-if-PopupsAndRedirects-are-active.patch

@@ -34,7 +34,7 @@ diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/pict
  #include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h"
  #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
  #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -386,6 +387,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -388,6 +389,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
      return;
    }
  

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

@@ -25,14 +25,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../blink/renderer/core/frame/local_frame.h      |  3 +++
  .../renderer/core/frame/reporting_context.cc     |  9 +++++++++
  .../renderer/core/frame/reporting_context.h      |  7 +++++--
- .../renderer/core/frame/reporting_observer.cc    |  3 +--
- 22 files changed, 64 insertions(+), 25 deletions(-)
+ .../renderer/core/frame/reporting_observer.cc    |  4 +---
+ 22 files changed, 64 insertions(+), 26 deletions(-)
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc
 
 diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
 --- a/chrome/browser/net/chrome_report_sender.cc
 +++ b/chrome/browser/net/chrome_report_sender.cc
-@@ -85,6 +85,7 @@ void SendReport(
+@@ -88,6 +88,7 @@ void SendReport(
      const std::string& report,
      base::OnceClosure success_callback,
      ErrorCallback error_callback) {
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 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
-@@ -1520,6 +1520,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1517,6 +1517,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
@@ -51,7 +51,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;
    frame_host->ForEachRenderFrameHostImplWithAction(
-@@ -1533,6 +1534,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1530,6 +1531,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -106,9 +106,9 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
  #include "base/values.h"
 +#include "net/base/features.h"
  #include "content/browser/service_worker/service_worker_host.h"
+ #include "content/browser/shared_storage/shared_storage_worklet_host.h"
  #include "content/browser/worker_host/dedicated_worker_host.h"
- #include "content/browser/worker_host/shared_worker_host.h"
-@@ -240,12 +241,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+@@ -241,12 +242,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
                     const std::string& group,
                     const std::string& type,
                     base::Value::Dict body) {
@@ -126,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 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
-@@ -16264,12 +16264,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -16347,12 +16347,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
        }
      }
    }
@@ -308,7 +308,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
-@@ -506,14 +506,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -499,14 +499,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
        const GURL& url,
        const std::optional<base::UnguessableToken>& reporting_source,
        const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -329,7 +329,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/public/cpp/parsed_headers.cc
 --- a/services/network/public/cpp/parsed_headers.cc
 +++ b/services/network/public/cpp/parsed_headers.cc
-@@ -133,6 +133,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+@@ -140,6 +140,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
    }
  
  #if BUILDFLAG(ENABLE_REPORTING)
@@ -340,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu
 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
-@@ -1793,7 +1793,6 @@ mojom("mojom") {
+@@ -1833,7 +1833,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -351,7 +351,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
-@@ -1303,6 +1303,7 @@ interface NetworkContext {
+@@ -1245,6 +1245,7 @@ interface NetworkContext {
    // provided `network_anonymization_key`.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1310,6 +1311,7 @@ interface NetworkContext {
+@@ -1252,6 +1253,7 @@ interface NetworkContext {
                NetworkAnonymizationKey network_anonymization_key,
                mojo_base.mojom.DictionaryValue body);
  
@@ -367,7 +367,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueEnterpriseReport(string type,
                          string group,
                          url.mojom.Url url,
-@@ -1320,6 +1322,7 @@ interface NetworkContext {
+@@ -1262,6 +1264,7 @@ interface NetworkContext {
    // Note that this queued report will never be delivered if no reporting
    // endpoint matching is registered for with the provided
    // `network_anonymization_key`.
@@ -405,7 +405,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 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
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
  #include "build/build_config.h"
  #include "mojo/public/cpp/bindings/self_owned_receiver.h"
  #include "mojo/public/cpp/system/message_pipe.h"
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
  #include "services/network/public/mojom/source_location.mojom-blink.h"
-@@ -2851,9 +2852,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2871,9 +2872,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
    return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
  }
  
@@ -428,15 +428,15 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
 --- a/third_party/blink/renderer/core/frame/local_frame.h
 +++ b/third_party/blink/renderer/core/frame/local_frame.h
-@@ -37,6 +37,7 @@
- #include "base/time/time.h"
+@@ -38,6 +38,7 @@
  #include "base/unguessable_token.h"
  #include "build/build_config.h"
-+#include "net/net_buildflags.h"
- #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
++#include "net/net_buildflags.h"
  #include "net/storage_access_api/status.h"
-@@ -668,7 +669,9 @@ class CORE_EXPORT LocalFrame final
+ #include "services/metrics/public/cpp/ukm_source_id.h"
+ #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
+@@ -670,7 +671,9 @@ class CORE_EXPORT LocalFrame final
      return client_hints_preferences_;
    }
  
@@ -457,17 +457,17 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
  #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
  #include "third_party/blink/public/platform/platform.h"
  #include "third_party/blink/public/platform/task_type.h"
-@@ -59,7 +60,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
+@@ -55,7 +56,9 @@ bool ShouldReportBeVisibleToObservers(Report* report) {
+ 
  ReportingContext::ReportingContext(ExecutionContext& context)
-     : Supplement<ExecutionContext>(context),
-       execution_context_(context),
+     : execution_context_(context),
 +#if BUILDFLAG(ENABLE_REPORTING)
        reporting_service_(&context),
 +#endif
        receivers_(this, &context) {}
  
  // static
-@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
+@@ -121,7 +124,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
    visitor->Trace(observers_);
    visitor->Trace(report_buffer_);
    visitor->Trace(execution_context_);
@@ -475,9 +475,9 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
    visitor->Trace(reporting_service_);
 +#endif
    visitor->Trace(receivers_);
-   Supplement<ExecutionContext>::Trace(visitor);
  }
-@@ -149,6 +154,7 @@ void ReportingContext::CountReport(Report* report) {
+ 
+@@ -143,6 +148,7 @@ void ReportingContext::CountReport(Report* report) {
    UseCounter::Count(execution_context_, feature);
  }
  
@@ -485,7 +485,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
  const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
  ReportingContext::GetReportingService() const {
    if (!reporting_service_.is_bound()) {
-@@ -158,6 +164,7 @@ ReportingContext::GetReportingService() const {
+@@ -152,6 +158,7 @@ ReportingContext::GetReportingService() const {
    }
    return reporting_service_;
  }
@@ -493,7 +493,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
  
  void ReportingContext::NotifyInternal(Report* report) {
    if (!ShouldReportBeVisibleToObservers(report)) {
-@@ -184,6 +191,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+@@ -178,6 +185,7 @@ void ReportingContext::NotifyInternal(Report* report) {
  
  void ReportingContext::SendToReportingAPI(Report* report,
                                            const String& endpoint) const {
@@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
    const String& type = report->type();
    if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
          type == ReportType::kDeprecation ||
-@@ -263,6 +271,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+@@ -262,6 +270,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
          url, endpoint, body->featureId(), body->disposition(), body->message(),
          body->sourceFile(), line_number, column_number);
    }
@@ -520,7 +520,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
  #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
  #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
  #include "third_party/blink/renderer/core/core_export.h"
-@@ -56,10 +57,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -52,10 +53,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
   private:
    // Counts the use of a report type via UseCounter.
    void CountReport(Report*);
@@ -533,7 +533,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
    void NotifyInternal(Report* report);
    // Send |report| via the Reporting API to |endpoint|.
    void SendToReportingAPI(Report* report, const String& endpoint) const;
-@@ -71,8 +72,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -67,8 +68,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
  
    // This is declared mutable so that the service endpoint can be cached by
    // const methods.
@@ -547,12 +547,13 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
 diff --git a/third_party/blink/renderer/core/frame/reporting_observer.cc b/third_party/blink/renderer/core/frame/reporting_observer.cc
 --- a/third_party/blink/renderer/core/frame/reporting_observer.cc
 +++ b/third_party/blink/renderer/core/frame/reporting_observer.cc
-@@ -61,8 +61,7 @@ void ReportingObserver::QueueReport(Report* report) {
+@@ -61,9 +61,7 @@ void ReportingObserver::QueueReport(Report* report) {
  }
  
  bool ReportingObserver::ObservedType(const String& type) {
--  return !options_->hasTypesNonNull() || options_->typesNonNull().empty() ||
--         options_->typesNonNull().Find(type) != kNotFound;
+-  return !options_->hasTypes() || !options_->types() ||
+-         options_->types()->empty() ||
+-         options_->types()->Find(type) != kNotFound;
 +  return false;
  }
  

build/patches/Allow-building-without-supervised-users.patch

@@ -17,21 +17,21 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/browser/supervised_user_pref_store.cc             | 1 +
  .../core/browser/supervised_user_preferences.cc            | 6 +++++-
  .../core/browser/supervised_user_service.cc                | 1 +
- components/supervised_user/core/common/features.cc         | 2 +-
+ components/supervised_user/core/common/features.cc         | 3 ++-
  extensions/browser/api/management/management_api.cc        | 1 +
- 15 files changed, 13 insertions(+), 27 deletions(-)
+ 15 files changed, 14 insertions(+), 27 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -826,7 +826,6 @@ if (_is_default_toolchain) {
+@@ -815,7 +815,6 @@ if (_is_default_toolchain) {
        "//components/offline_pages/core:offline_page_model_enums_java",
        "//components/sharing_message:sharing_dialog_type_generated_enum",
        "//components/sharing_message:sharing_send_message_result_generated_enum",
 -      "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen",
+       "//components/touch_to_search/core/browser:quick_action_category_enum_javagen",
      ]
  
-     # From java_sources.gni.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -327,7 +327,7 @@ void PrepareFactory(
+@@ -332,7 +332,7 @@ void PrepareFactory(
      policy::BrowserPolicyConnector* policy_connector) {
    factory->SetManagedPolicies(policy_service, policy_connector);
    factory->SetRecommendedPolicies(policy_service, policy_connector);
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.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
-@@ -683,10 +683,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -679,10 +679,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
      prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
  
    pref_change_registrar_.Init(prefs);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
  
    // Changes in the profile avatar.
    pref_change_registrar_.Add(
-@@ -1632,6 +1628,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1603,6 +1599,7 @@ GURL ProfileImpl::GetHomePage() {
  }
  
  void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -111,7 +111,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 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
-@@ -1191,10 +1191,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1262,10 +1262,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
      profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
    }
  
@@ -122,7 +122,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  }
  
  void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
-@@ -1956,9 +1952,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -2044,9 +2040,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
@@ -135,7 +135,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 diff --git a/chrome/browser/supervised_user/supervised_user_browser_utils.cc b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
 --- a/chrome/browser/supervised_user/supervised_user_browser_utils.cc
 +++ b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
-@@ -99,6 +99,7 @@ bool SupervisedUserCanSkipExtensionParentApprovals(const Profile* profile) {
+@@ -98,6 +98,7 @@ bool SupervisedUserCanSkipExtensionParentApprovals(const Profile* profile) {
  }
  
  bool AreExtensionsPermissionsEnabled(Profile* profile) {
@@ -208,7 +208,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
 --- a/components/supervised_user/core/browser/supervised_user_service.cc
 +++ b/components/supervised_user/core/browser/supervised_user_service.cc
-@@ -248,6 +248,7 @@ SupervisedUserService::SupervisedUserService(
+@@ -244,6 +244,7 @@ SupervisedUserService::SupervisedUserService(
  }
  
  void SupervisedUserService::SetSettingsServiceActive(bool active) {
@@ -227,7 +227,15 @@ diff --git a/components/supervised_user/core/common/features.cc b/components/sup
  #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_WIN)
  const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
-@@ -151,4 +150,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
+@@ -116,6 +115,7 @@ const base::FeatureParam<std::string>
+ 
+ namespace {
+ bool PlatformSupportsLocalSupervision() {
++  if ((true)) return false;
+   int32_t major, minor, bugfix;
+   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
+   bool supported_by_os = (major == 16 && minor >= 1) || major > 16;
+@@ -151,4 +151,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
  
  #endif
  

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

@@ -4,14 +4,26 @@ Subject: Allow playing audio in background
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
+ .../renderer/render_frame_media_playback_options.cc   |  1 +
  .../renderer/platform/media/web_media_player_impl.cc  | 11 ++++++++++-
  .../renderer/platform/media/web_media_player_impl.h   |  3 +++
- 2 files changed, 13 insertions(+), 1 deletion(-)
+ 3 files changed, 14 insertions(+), 1 deletion(-)
 
+diff --git a/content/public/renderer/render_frame_media_playback_options.cc b/content/public/renderer/render_frame_media_playback_options.cc
+--- a/content/public/renderer/render_frame_media_playback_options.cc
++++ b/content/public/renderer/render_frame_media_playback_options.cc
+@@ -14,6 +14,7 @@
+ 
+ namespace content {
+ bool IsBackgroundMediaSuspendEnabled() {
++  if ((true)) return false;
+ #if BUILDFLAG(IS_ANDROID)
+   // For Android devices, do not suspend background media for devices with large
+   // displays. Exception is for Webview.
 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
-@@ -1309,6 +1309,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1287,6 +1287,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -24,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      std::optional<WebMediaPlayer::TrackId> enabled_track_id) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3645,7 +3651,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3654,7 +3660,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
  
    const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured();
    // Audio only stream is allowed to play when in background.
@@ -39,7 +51,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
-@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
    bool HasVideo() const override;
    bool HasAudio() const override;
  

build/patches/Always-allow-inspect-fallback.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resources/inspect/inspect.js
 --- a/chrome/browser/resources/inspect/inspect.js
 +++ b/chrome/browser/resources/inspect/inspect.js
-@@ -45,6 +45,7 @@ if ('browser-inspector' in queryParamsObject) {
+@@ -46,6 +46,7 @@ if ('browser-inspector' in queryParamsObject) {
  })();
  
  function isVersionNewerThanHost(version) {
@@ -20,7 +20,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resour
    if (!HOST_CHROME_VERSION) {
      return false;
    }
-@@ -590,7 +591,7 @@ function formatValue(data, property) {
+@@ -597,7 +598,7 @@ function formatValue(data, property) {
  function addFavicon(row, data) {
    const favicon = document.createElement('img');
    if (data['faviconUrl']) {

build/patches/Always-open-browser-controls-in-new-tab.patch

@@ -18,7 +18,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
-@@ -42,6 +43,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -45,6 +46,7 @@ import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
  import org.chromium.chrome.browser.printing.TabPrinter;
  import org.chromium.chrome.browser.profiles.Profile;
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  import org.chromium.chrome.browser.tabmodel.TabModelSelector;
  import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-@@ -308,6 +310,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -348,6 +350,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
              @Nullable Referrer referrer,
              boolean navigateToTab,
              @Nullable AdditionalNavigationParams additionalNavigationParams) {
@@ -34,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
          RecordUserAction.record("MobileNewTabOpened");
          RecordUserAction.record("LinkOpenedInNewTab");
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-@@ -328,6 +331,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -368,6 +371,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
       * @param url The URL to open.
       */
      public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) {

build/patches/Always-use-new-tab-page-for-default-home-page.patch

@@ -19,10 +19,10 @@ 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/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -159,10 +159,6 @@ public class HomepageManager
+@@ -164,10 +164,6 @@ public class HomepageManager
       *     tab page if the homepage button is force enabled via flag.
       */
-     public GURL getDefaultHomepageGurl() {
+     public GURL getDefaultHomepageGurl(boolean isIncognito) {
 -        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
 -            return assumeNonNull(PartnerBrowserCustomizations.getInstance().getHomePageUrl());
 -        }
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
 diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
 --- a/components/search_engines/android/template_url_service_android.cc
 +++ b/components/search_engines/android/template_url_service_android.cc
-@@ -400,6 +400,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -404,6 +404,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
          jimage_translate_source_language_param_key,
      const base::android::JavaParamRef<jstring>&
          jimage_translate_target_language_param_key) {

build/patches/Android-Toolbar-Scroll-Ablation-setting.patch

@@ -19,7 +19,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
 --- a/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
 +++ b/chrome/browser/browser_controls/android/java/src/org/chromium/chrome/browser/browser_controls/BrowserStateBrowserControlsVisibilityDelegate.java
 @@ -41,6 +41,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
-     private final Supplier<Boolean> mPersistentFullscreenMode;
+     private final ObservableSupplier<Boolean> mPersistentFullscreenMode;
  
      private long mCurrentShowingStartTime;
 +    private int temporaryToken;
@@ -53,7 +53,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -74,6 +74,12 @@ found in the LICENSE file.
+@@ -84,6 +84,12 @@ found in the LICENSE file.
          android:key="disable_toolbar_swipeup"
          android:title="@string/disable_toolbar_swipe_up" />
  

build/patches/Android-fonts-fingerprinting-mitigation.patch

@@ -8,16 +8,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../common/ProductionSupportedFlagList.java   |    3 +
  .../component_updater/registration.cc         |    9 +
+ build/config/freetype/freetype.gni            |    2 +-
  .../java/res/xml/developer_preferences.xml    |    5 +
  chrome/browser/BUILD.gn                       |    7 +
  .../browser/component_updater/registration.cc |   10 +
  ...droid-fonts-fingerprinting-mitigation.grdp |    9 +
+ chrome/browser/ui/prefs/prefs_tab_helper.cc   |    9 +-
  chrome/renderer/BUILD.gn                      |    4 +
  .../installer_policies/BUILD.gn               |    7 +
  .../fonts_pack_component_installer.cc         |   96 +
  .../fonts_pack_component_installer.h          |   60 +
  components/services/font/BUILD.gn             |   10 +
- components/services/font/font_service_app.cc  |   44 +
+ components/services/font/font_service_app.cc  |   46 +
  components/services/font/font_service_app.h   |    1 +
  .../services/font/public/cpp/font_loader.cc   |   11 +
  .../services/font/public/cpp/font_loader.h    |    1 +
@@ -29,20 +31,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  content/child/BUILD.gn                        |    7 +
  content/renderer/BUILD.gn                     |    4 +
  .../renderer/renderer_blink_platform_impl.cc  |   55 +-
+ ...renderer_main_platform_delegate_android.cc |    2 +-
  ...ndroid-fonts-fingerprinting-mitigation.inc |   12 +
  ...ndroid-fonts-fingerprinting-mitigation.inc |    7 +
  ...ndroid-fonts-fingerprinting-mitigation.inc |    5 +
  skia/BUILD.gn                                 |   12 +
+ skia/ext/font_utils.cc                        |    1 +
+ .../freetype/config/ftoption.h                |    2 +-
  .../include/ports/SkFontConfigInterface.h     |    2 +
  .../skia/include/ports/SkFontMgr_android.h    |   42 +-
- .../skia/src/ports/SkFontConfigInterface.cpp  |    4 +
+ .../skia/src/ports/SkFontConfigInterface.cpp  |    5 +
  .../ports/SkFontConfigInterface_direct.cpp    |    5 +
  .../src/ports/SkFontConfigInterface_direct.h  |    1 +
- .../skia/src/ports/SkFontMgr_android.cpp      |  278 ++-
- .../skia/src/ports/SkFontMgr_android_data.cpp | 1640 +++++++++++++++++
- .../src/ports/SkFontMgr_android_parser.cpp    |   49 +-
+ .../skia/src/ports/SkFontMgr_android.cpp      |  282 ++-
+ .../skia/src/ports/SkFontMgr_android_data.cpp | 1641 +++++++++++++++++
+ .../skia/src/ports/SkFontMgr_android_ndk.cpp  |    2 +-
+ .../src/ports/SkFontMgr_android_parser.cpp    |   66 +-
  .../skia/src/ports/SkFontMgr_android_parser.h |    5 +-
- 36 files changed, 2414 insertions(+), 76 deletions(-)
+ 42 files changed, 2448 insertions(+), 85 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp
  create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc
  create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h
@@ -54,7 +60,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
-@@ -1003,6 +1003,9 @@ public final class ProductionSupportedFlagList {
+@@ -933,6 +933,9 @@ public final class ProductionSupportedFlagList {
                  "Hides user preference on the system keyboard by setting the standard "
                   + "eng layout and removing the layout information from the "
                   + "javascript keyboard events."),
@@ -67,8 +73,8 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/common/Produc
 diff --git a/android_webview/nonembedded/component_updater/registration.cc b/android_webview/nonembedded/component_updater/registration.cc
 --- a/android_webview/nonembedded/component_updater/registration.cc
 +++ b/android_webview/nonembedded/component_updater/registration.cc
-@@ -26,6 +26,9 @@
- #include "components/privacy_sandbox/masked_domain_list/masked_domain_list.pb.h"
+@@ -20,6 +20,9 @@
+ #include "components/component_updater/installer_policies/origin_trials_component_installer.h"
  #include "components/update_client/update_client.h"
  
 +#include "third_party/blink/public/common/features.h"
@@ -77,7 +83,7 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and
  namespace android_webview {
  
  void RegisterComponentsForUpdate(
-@@ -42,6 +45,12 @@ void RegisterComponentsForUpdate(
+@@ -36,6 +39,12 @@ void RegisterComponentsForUpdate(
    std::vector<std::unique_ptr<component_updater::ComponentInstallerPolicy>>
        component_installer_list_cromite;
  
@@ -90,6 +96,16 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and
    component_installer_list.push_back(
        std::make_unique<
            component_updater::OriginTrialsComponentInstallerPolicy>());
+diff --git a/build/config/freetype/freetype.gni b/build/config/freetype/freetype.gni
+--- a/build/config/freetype/freetype.gni
++++ b/build/config/freetype/freetype.gni
+@@ -26,5 +26,5 @@ declare_args() {
+   #   https://crbug.com/370816215
+   #
+   # Note: //build should not import directly from //pdf for layering reasons.
+-  enable_freetype = !is_android && !is_ios && (is_linux || !is_castos)
++  enable_freetype = is_android || (!is_ios && (is_linux || !is_castos))
+ }
 diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml
 --- a/chrome/android/java/res/xml/developer_preferences.xml
 +++ b/chrome/android/java/res/xml/developer_preferences.xml
@@ -106,7 +122,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8022,6 +8022,13 @@ static_library("browser") {
+@@ -8012,6 +8012,13 @@ static_library("browser") {
      ]
    }
  
@@ -158,10 +174,36 @@ new file mode 100644
 +        Replaces all system fonts with the same for all devices
 +    </message>
 +</grit-part>
+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
+@@ -64,8 +64,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
+-    BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+ // If a font name in prefs default values starts with a comma, consider it's a
+ // comma-separated font list and resolve it to the first available font.
+ #define PREFS_FONT_LIST 1
+@@ -442,9 +441,9 @@ void PrefsTabHelper::RegisterProfilePrefs(
+         value = gfx::FontList::FirstAvailableOrFirst(value);
+       }
+ #else   // !PREFS_FONT_LIST
+-      DCHECK(!value.starts_with(','))
+-          << "This platform doesn't support default font lists. "
+-          << pref.pref_name << "=" << value;
++      // DCHECK(!value.starts_with(','))
++      //     << "This platform doesn't support default font lists. "
++      //     << pref.pref_name << "=" << value;
+ #endif  // PREFS_FONT_LIST
+       registry->RegisterStringPref(pref.pref_name, value);
+       fonts_with_defaults.insert(pref.pref_name);
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -270,6 +270,10 @@ static_library("renderer") {
+@@ -266,6 +266,10 @@ static_library("renderer") {
      deps += [ "//components/strings" ]
    }
  
@@ -175,7 +217,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
 --- a/components/component_updater/installer_policies/BUILD.gn
 +++ b/components/component_updater/installer_policies/BUILD.gn
-@@ -38,6 +38,13 @@ static_library("installer_policies_no_content_deps") {
+@@ -32,6 +32,13 @@ static_library("installer_policies_no_content_deps") {
      "trust_token_key_commitments_component_installer_policy.h",
    ]
  
@@ -358,7 +400,7 @@ new file mode 100644
 diff --git a/components/services/font/BUILD.gn b/components/services/font/BUILD.gn
 --- a/components/services/font/BUILD.gn
 +++ b/components/services/font/BUILD.gn
-@@ -24,6 +24,16 @@ source_set("lib") {
+@@ -23,6 +23,16 @@ source_set("lib") {
      "//ui/gfx",
    ]
  
@@ -378,7 +420,17 @@ diff --git a/components/services/font/BUILD.gn b/components/services/font/BUILD.
 diff --git a/components/services/font/font_service_app.cc b/components/services/font/font_service_app.cc
 --- a/components/services/font/font_service_app.cc
 +++ b/components/services/font/font_service_app.cc
-@@ -20,6 +20,12 @@
+@@ -4,7 +4,9 @@
+ 
+ #include "components/services/font/font_service_app.h"
+ 
++#if !BUILDFLAG(IS_ANDROID)
+ #include <fontconfig/fontconfig.h>
++#endif
+ 
+ #include <set>
+ #include <utility>
+@@ -25,6 +27,12 @@
  #include "ui/gfx/font_fallback_linux.h"
  #include "ui/gfx/font_render_params.h"
  
@@ -391,7 +443,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
  #if BUILDFLAG(ENABLE_PDF)
  #include "components/services/font/pdf_fontconfig_matching.h"  // nogncheck
  #endif
-@@ -95,6 +101,7 @@ void FontServiceApp::BindReceiver(
+@@ -100,6 +108,7 @@ void FontServiceApp::BindReceiver(
  void FontServiceApp::MatchFamilyName(const std::string& family_name,
                                       mojom::TypefaceStylePtr requested_style,
                                       MatchFamilyNameCallback callback) {
@@ -399,7 +451,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
    TRACE_EVENT0("fonts", "FontServiceApp::MatchFamilyName");
  
    SkFontConfigInterface::FontIdentity result_identity;
-@@ -155,6 +162,7 @@ void FontServiceApp::MatchFamilyName(const std::string& family_name,
+@@ -160,6 +169,7 @@ void FontServiceApp::MatchFamilyName(const std::string& family_name,
  
    std::move(callback).Run(std::move(identity), result_family_cppstring,
                            std::move(style));
@@ -407,7 +459,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
  }
  
  void FontServiceApp::OpenStream(uint32_t id_number,
-@@ -169,12 +177,43 @@ void FontServiceApp::OpenStream(uint32_t id_number,
+@@ -174,12 +184,43 @@ void FontServiceApp::OpenStream(uint32_t id_number,
    std::move(callback).Run(std::move(file));
  }
  
@@ -451,7 +503,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
    gfx::FallbackFontData fallback_font;
    if (gfx::GetFallbackFontForChar(character, locale, &fallback_font)) {
      size_t index = FindOrAddPath(fallback_font.filepath);
-@@ -189,6 +228,7 @@ void FontServiceApp::FallbackFontForCharacter(
+@@ -194,6 +235,7 @@ void FontServiceApp::FallbackFontForCharacter(
    } else {
      std::move(callback).Run(nullptr, "", false, false);
    }
@@ -459,7 +511,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
  }
  
  void FontServiceApp::FontRenderStyleForStrike(
-@@ -232,6 +272,9 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
+@@ -237,6 +279,9 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
    TRACE_EVENT0("fonts",
                 "FontServiceApp::MatchFontByPostscriptNameOrFullFontName");
  
@@ -469,7 +521,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
    std::optional<FontConfigLocalMatching::FontConfigMatchResult> match_result =
        FontConfigLocalMatching::FindFontByPostscriptNameOrFullFontName(family);
    if (match_result) {
-@@ -243,6 +286,7 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
+@@ -248,6 +293,7 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
      return;
    }
    std::move(callback).Run(nullptr);
@@ -512,7 +564,7 @@ diff --git a/components/services/font/public/cpp/font_loader.cc b/components/ser
 diff --git a/components/services/font/public/cpp/font_loader.h b/components/services/font/public/cpp/font_loader.h
 --- a/components/services/font/public/cpp/font_loader.h
 +++ b/components/services/font/public/cpp/font_loader.h
-@@ -54,6 +54,7 @@ class FontLoader : public SkFontConfigInterface,
+@@ -56,6 +56,7 @@ class FontLoader : public SkFontConfigInterface,
                         SkFontStyle* out_style) override;
    SkStreamAsset* openStream(const FontIdentity& identity) override
        LOCKS_EXCLUDED(mapped_font_files_lock_);
@@ -523,7 +575,7 @@ diff --git a/components/services/font/public/cpp/font_loader.h b/components/serv
 diff --git a/components/services/font/public/cpp/font_service_thread.cc b/components/services/font/public/cpp/font_service_thread.cc
 --- a/components/services/font/public/cpp/font_service_thread.cc
 +++ b/components/services/font/public/cpp/font_service_thread.cc
-@@ -247,6 +247,54 @@ void FontServiceThread::OpenStreamImpl(base::WaitableEvent* done_event,
+@@ -258,6 +258,54 @@ void FontServiceThread::OpenStreamImpl(base::WaitableEvent* done_event,
                                  done_event, output_file));
  }
  
@@ -581,7 +633,7 @@ diff --git a/components/services/font/public/cpp/font_service_thread.cc b/compon
 diff --git a/components/services/font/public/cpp/font_service_thread.h b/components/services/font/public/cpp/font_service_thread.h
 --- a/components/services/font/public/cpp/font_service_thread.h
 +++ b/components/services/font/public/cpp/font_service_thread.h
-@@ -55,6 +55,8 @@ class FontServiceThread : public base::RefCountedThreadSafe<FontServiceThread> {
+@@ -57,6 +57,8 @@ class FontServiceThread : public base::RefCountedThreadSafe<FontServiceThread> {
                         SkFontStyle* out_style);
    scoped_refptr<MappedFontFile> OpenStream(
        const SkFontConfigInterface::FontIdentity& identity);
@@ -590,7 +642,7 @@ diff --git a/components/services/font/public/cpp/font_service_thread.h b/compone
  
    bool FallbackFontForCharacter(
        uint32_t character,
-@@ -118,6 +120,9 @@ class FontServiceThread : public base::RefCountedThreadSafe<FontServiceThread> {
+@@ -121,6 +123,9 @@ class FontServiceThread : public base::RefCountedThreadSafe<FontServiceThread> {
    void OpenStreamImpl(base::WaitableEvent* done_event,
                        base::File* output_file,
                        const uint32_t id_number);
@@ -615,7 +667,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2613,6 +2613,17 @@ source_set("browser") {
+@@ -2608,6 +2608,17 @@ source_set("browser") {
      ]
    }
  
@@ -633,8 +685,8 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
    if (is_linux || is_chromeos) {
      sources -=
          [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2658,6 +2669,13 @@ source_set("browser") {
-     ]
+@@ -2654,6 +2665,13 @@ source_set("browser") {
+     deps += [ "//components/services/font_data:lib" ]
    }
  
 +  if (is_android) {
@@ -662,7 +714,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
  #include "content/browser/font_service.h"  // nogncheck
-@@ -348,6 +353,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
+@@ -351,6 +356,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
    }
  #endif
  
@@ -679,7 +731,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
 diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -136,6 +136,13 @@ target(link_target_type, "child") {
+@@ -135,6 +135,13 @@ target(link_target_type, "child") {
      ]
    }
  
@@ -696,7 +748,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 --- a/content/renderer/BUILD.gn
 +++ b/content/renderer/BUILD.gn
-@@ -347,6 +347,10 @@ target(link_target_type, "renderer") {
+@@ -350,6 +350,10 @@ target(link_target_type, "renderer") {
      deps += [ "//services/screen_ai/public/mojom" ]
    }
  
@@ -710,7 +762,7 @@ diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -137,6 +137,23 @@
+@@ -142,6 +142,23 @@
  #include "content/common/android/sync_compositor_statics.h"
  #endif
  
@@ -734,7 +786,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  using blink::Platform;
  using blink::WebAudioDevice;
  using blink::WebAudioLatencyHint;
-@@ -187,6 +204,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
+@@ -192,6 +209,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
    NOTREACHED();
  }
  
@@ -772,7 +824,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  }  // namespace
  
  //------------------------------------------------------------------------------
-@@ -200,18 +248,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -205,18 +253,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -795,7 +847,19 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
 +#endif
  #endif
  
- #if BUILDFLAG(IS_WIN)
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc
+--- a/content/renderer/renderer_main_platform_delegate_android.cc
++++ b/content/renderer/renderer_main_platform_delegate_android.cc
+@@ -35,7 +35,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
+   // Android 14+ user devices with updated system fonts will call statx and
+   // possibly other system calls that are not allowed in the sandbox.
+   // See https://crbug.com/40618213 for details.
+-  [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
++  // [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
+ }
+ 
+ void RendererMainPlatformDelegate::PlatformUninitialize() {
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc
 new file mode 100644
 --- /dev/null
@@ -838,7 +902,7 @@ new file mode 100644
 diff --git a/skia/BUILD.gn b/skia/BUILD.gn
 --- a/skia/BUILD.gn
 +++ b/skia/BUILD.gn
-@@ -465,6 +465,18 @@ component("skia") {
+@@ -449,6 +449,18 @@ component("skia") {
      sources += skia_ports_fci_sources
    }
  
@@ -857,6 +921,29 @@ diff --git a/skia/BUILD.gn b/skia/BUILD.gn
    if (is_linux || is_chromeos || is_android) {
      # Retain the files for the SkFontMgr_Android on linux to emulate android
      # fonts. See content/zygote/zygote_main_linux.cc
+diff --git a/skia/ext/font_utils.cc b/skia/ext/font_utils.cc
+--- a/skia/ext/font_utils.cc
++++ b/skia/ext/font_utils.cc
+@@ -59,6 +59,7 @@ SkFontMgr* g_fontmgr_override = nullptr;
+ #if BUILDFLAG(IS_ANDROID)
+ // https://crbug.com/461659286 Failure to create any font causes crash.
+ BASE_FEATURE(kUseAndroidNDKFontAPI, base::FEATURE_DISABLED_BY_DEFAULT);
++SET_CROMITE_FEATURE_DISABLED(kUseAndroidNDKFontAPI);
+ #endif
+ 
+ }  // namespace
+diff --git a/third_party/freetype/include/freetype-custom/freetype/config/ftoption.h b/third_party/freetype/include/freetype-custom/freetype/config/ftoption.h
+--- a/third_party/freetype/include/freetype-custom/freetype/config/ftoption.h
++++ b/third_party/freetype/include/freetype-custom/freetype/config/ftoption.h
+@@ -607,7 +607,7 @@ FT_BEGIN_HEADER
+    * module (namely TrueType~& OpenType).
+    */
+ /* Not needed since PDFs do not support any of the color font formats. */
+-/* #define TT_CONFIG_OPTION_COLOR_LAYERS */
++#define TT_CONFIG_OPTION_COLOR_LAYERS
+ 
+ 
+   /**************************************************************************
 diff --git a/third_party/skia/include/ports/SkFontConfigInterface.h b/third_party/skia/include/ports/SkFontConfigInterface.h
 --- a/third_party/skia/include/ports/SkFontConfigInterface.h
 +++ b/third_party/skia/include/ports/SkFontConfigInterface.h
@@ -933,11 +1020,12 @@ diff --git a/third_party/skia/include/ports/SkFontMgr_android.h b/third_party/sk
 diff --git a/third_party/skia/src/ports/SkFontConfigInterface.cpp b/third_party/skia/src/ports/SkFontConfigInterface.cpp
 --- a/third_party/skia/src/ports/SkFontConfigInterface.cpp
 +++ b/third_party/skia/src/ports/SkFontConfigInterface.cpp
-@@ -22,7 +22,11 @@ sk_sp<SkFontConfigInterface> SkFontConfigInterface::RefGlobal() {
+@@ -22,7 +22,12 @@ sk_sp<SkFontConfigInterface> SkFontConfigInterface::RefGlobal() {
      if (gFontConfigInterface) {
          return sk_ref_sp(gFontConfigInterface);
      }
 +#if defined(CROMITE_IS_ANDROID)
++    SkASSERT(false);
 +    return nullptr;
 +#else
      return sk_ref_sp(SkFontConfigInterface::GetSingletonDirectInterface());
@@ -987,7 +1075,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
  #include <algorithm>
  #include <limits>
-@@ -37,7 +39,91 @@ class SkData;
+@@ -37,7 +39,95 @@ class SkData;
  
  namespace {
  
@@ -1040,18 +1128,22 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +        desc->setFactoryId(SkTypeface_FreeType::FactoryId);
 +        *serialize = false;
 +    }
++
 +    std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override {
 +        *ttcIndex = fIndex;
 +        return this->makeStream();
 +    }
++
 +    std::unique_ptr<SkFontData> onMakeFontData() const override {
 +        return std::make_unique<SkFontData>(
 +                this->makeStream(), fIndex, 0, fAxes.begin(), fAxes.size(), nullptr, 0);
 +    }
++
 +    sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
 +        SkFontStyle style = this->fontStyle();
 +        std::unique_ptr<SkFontData> data = this->cloneFontData(args, &style);
 +        if (!data) {
++            SkASSERT(false);
 +            return nullptr;
 +        }
 +        return sk_make_sp<SkTypeface_AndroidSystemCustom>(
@@ -1080,7 +1172,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
  class SkTypeface_AndroidSystem : public SkTypeface_proxy {
  public:
-@@ -112,7 +198,8 @@ using StreamForPathCache = skia_private::THashMap<SkString, std::unique_ptr<SkSt
+@@ -112,7 +202,8 @@ using StreamForPathCache = skia_private::THashMap<SkString, std::unique_ptr<SkSt
  class SkFontStyleSet_Android : public SkFontStyleSet {
  public:
      explicit SkFontStyleSet_Android(const FontFamily& family, const SkFontScanner* scanner,
@@ -1090,7 +1182,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          const SkString* cannonicalFamilyName = nullptr;
          if (!family.fNames.empty()) {
              cannonicalFamilyName = &family.fNames[0];
-@@ -121,38 +208,60 @@ public:
+@@ -121,38 +212,60 @@ public:
  
          // TODO? make this lazy
          for (int i = 0; i < family.fFonts.size(); ++i) {
@@ -1139,7 +1231,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +                use_custom = true;
 +                if (!GetFontData(fontFile.fFileName,
 +                                  &familyName, &fontStyle, &isFixedWidth, &axisDefinitions)) {
-+                    stream = custom->getPlatformFile(pathName.c_str());
++                    stream = custom->getPlatformFile(fontFile.fFileName.c_str());
 +                }
 +                pathName = fontFile.fFileName;
              }
@@ -1174,7 +1266,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              }
  
              uint32_t variant = family.fVariant;
-@@ -163,13 +272,25 @@ public:
+@@ -163,13 +276,25 @@ public:
              // The first specified family name overrides the family name found in the font.
              // TODO: SkTypeface_AndroidSystem::onCreateFamilyNameIterator should return
              // all of the specified family names in addition to the names found in the font.
@@ -1206,7 +1298,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              int weight = fontFile.fWeight != 0 ? fontFile.fWeight : fontStyle.weight();
              SkFontStyle::Slant slant = fontStyle.slant();
              switch (fontFile.fStyle) {
-@@ -180,6 +301,19 @@ public:
+@@ -180,6 +305,19 @@ public:
              }
              fontStyle = SkFontStyle(weight, fontStyle.width(), slant);
  
@@ -1226,7 +1318,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              fStyles.push_back(
                  SkTypeface_AndroidSystem::Make(proxy,
                                                 fontStyle, proxy->isFixedPitch(),
-@@ -208,15 +342,18 @@ public:
+@@ -208,15 +346,18 @@ public:
          return fStyles[index];
      }
  
@@ -1248,7 +1340,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
      SkString fFallbackFor;
  
      friend struct NameToFamily;
-@@ -237,24 +374,26 @@ struct NameToFamily {
+@@ -237,24 +378,26 @@ struct NameToFamily {
  
  class SkFontMgr_Android : public SkFontMgr {
  public:
@@ -1279,7 +1371,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          }
          this->buildNameToFamilyMap(families, custom ? custom->fIsolated : false);
          this->findDefaultStyleSet();
-@@ -309,12 +448,12 @@ protected:
+@@ -309,12 +452,12 @@ protected:
      }
  
      enum class NameType { Self, Fallback };
@@ -1294,7 +1386,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
      {
          for (auto&& nameToFamily : nameToFamilyMap) {
              SkFontStyleSet_Android* family = nameToFamily.styleSet;
-@@ -325,22 +464,42 @@ protected:
+@@ -325,22 +468,42 @@ protected:
                      continue;
                  }
              }
@@ -1350,7 +1442,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              }
          }
          return nullptr;
-@@ -355,7 +514,7 @@ protected:
+@@ -355,7 +518,7 @@ protected:
          // The variant 'default' means 'compact and elegant'.
          // As a result, it is not possible to know the variant context from the font alone.
          // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request.
@@ -1359,7 +1451,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          SkString familyNameString(familyName);
          for (const SkString& currentFamilyName : { familyNameString, SkString() }) {
              // The first time match anything elegant, second time anything not elegant.
-@@ -435,6 +594,7 @@ protected:
+@@ -435,6 +598,7 @@ protected:
  private:
  
      std::unique_ptr<SkFontScanner> fScanner;
@@ -1367,7 +1459,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
      TArray<sk_sp<SkFontStyleSet_Android>> fStyleSets;
      sk_sp<SkFontStyleSet> fDefaultStyleSet;
-@@ -456,7 +616,7 @@ private:
+@@ -456,7 +620,7 @@ private:
          }
  
          sk_sp<SkFontStyleSet_Android> newSet =
@@ -1376,7 +1468,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          if (0 == newSet->count()) {
              return;
          }
-@@ -502,7 +662,11 @@ static char const * const gSystemFontUseStrings[] = {
+@@ -502,7 +666,11 @@ static char const * const gSystemFontUseStrings[] = {
  
  }  // namespace
  
@@ -1389,7 +1481,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
                                         std::unique_ptr<SkFontScanner> scanner) {
      if (custom) {
          SkASSERT(0 <= custom->fSystemFontUse);
-@@ -515,5 +679,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
+@@ -515,5 +683,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
                       custom->fFallbackFontsXml);
          }
      }
@@ -1400,7 +1492,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_data.cpp b/third_party
 new file mode 100644
 --- /dev/null
 +++ b/third_party/skia/src/ports/SkFontMgr_android_data.cpp
-@@ -0,0 +1,1640 @@
+@@ -0,0 +1,1641 @@
 +// AUTOGENERATED
 +//
 +// SkString dumpAxis("axis|");
@@ -2990,6 +3082,7 @@ new file mode 100644
 +        return true;
 +    }
 +    else if (file.equals("RobotoStatic-Regular.ttf")) {
++        // see https://android.googlesource.com/platform/frameworks/base/+/89abe560d722a6f4136b7a05d80f23b269413aad
 +        familyName->set("RobotoStatic");
 +        *style = SkFontStyle(400, 5, SkFontStyle::kUpright_Slant);
 +        *isFixedPitch = false;
@@ -3041,6 +3134,18 @@ new file mode 100644
 +
 +    return false;
 +}
+diff --git a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
+--- a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
++++ b/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp
+@@ -996,7 +996,7 @@ public:
+         }
+ 
+         std::vector<std::unique_ptr<FontFamily>> xmlFamilies;
+-        SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies);
++        SkFontMgr_Android_Parser::GetSystemFontFamilies(xmlFamilies, /*custom*/ nullptr);
+ 
+         skia_private::THashMap<SkString, std::unique_ptr<SkStreamAsset>> streamForPath;
+ 
 diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
 --- a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
 +++ b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
@@ -3089,41 +3194,65 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
          XML_Status status = XML_ParseBuffer(parser, len, done);
          if (XML_STATUS_ERROR == status) {
              XML_Error error = XML_GetErrorCode(parser);
-@@ -768,8 +781,10 @@ static void append_fallback_font_families_for_locale(
+@@ -706,6 +719,23 @@ static int parse_config_file(const char* filename,
+             return -1;
+         }
+     }
++    if (custom) {
++        // remove NotoColorEmojiLegacy.ttf
++        for (int i = 0; i < families.size(); ++i) {
++            bool exists = false;
++            auto& family = families[i];
++            for (auto& font : family->fFonts) {
++                if (font.fFileName.equals("NotoColorEmojiLegacy.ttf")) {
++                    exists = true;
++                    break;
++                }
++            }
++            if (exists) {
++                families.erase(families.begin() + i);
++                break;
++            }
++        }
++    }
+     return self.fVersion;
+ }
+ 
+@@ -768,8 +798,10 @@ static void append_fallback_font_families_for_locale(
  
  static void append_system_fallback_font_families(
      std::vector<std::unique_ptr<FontFamily>>& fallbackFonts,
 -    const SkString& basePath)
 +    const SkString& basePath,
-+                                                 const SkFontMgr_Android_CustomFonts* custom)
++    const SkFontMgr_Android_CustomFonts* custom)
  {
 +    if (custom) return;
      parse_config_file(FALLBACK_FONTS_FILE, fallbackFonts, basePath, true);
      append_fallback_font_families_for_locale(fallbackFonts,
                                               LOCALE_FALLBACK_FONTS_SYSTEM_DIR,
-@@ -778,8 +793,10 @@ static void append_system_fallback_font_families(
+@@ -778,8 +810,10 @@ static void append_system_fallback_font_families(
  
  static void mixin_vendor_fallback_font_families(
          std::vector<std::unique_ptr<FontFamily>>& fallbackFonts,
 -        const SkString& basePath)
 +        const SkString& basePath,
-+                                                const SkFontMgr_Android_CustomFonts* custom)
++        const SkFontMgr_Android_CustomFonts* custom)
  {
 +    if (custom) return;
      std::vector<std::unique_ptr<FontFamily>> vendorFonts;
      parse_config_file(VENDOR_FONTS_FILE, vendorFonts, basePath, true);
      append_fallback_font_families_for_locale(vendorFonts,
-@@ -811,7 +828,8 @@ static void mixin_vendor_fallback_font_families(
+@@ -811,7 +845,8 @@ static void mixin_vendor_fallback_font_families(
  }
  
  void SkFontMgr_Android_Parser::GetSystemFontFamilies(
 -        std::vector<std::unique_ptr<FontFamily>>& fontFamilies)
 +        std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
-+                                                     const SkFontMgr_Android_CustomFonts* custom)
++        const SkFontMgr_Android_CustomFonts* custom)
  {
      // Version 21 of the system font configuration does not need any fallback configuration files.
      SkString basePath(getenv("ANDROID_ROOT"));
-@@ -823,8 +841,8 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+@@ -823,8 +858,8 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
  
      // Append all the fallback fonts to system fonts
      std::vector<std::unique_ptr<FontFamily>> fallbackFonts;
@@ -3134,7 +3263,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
      fontFamilies.insert(fontFamilies.end(),
                          std::make_move_iterator(fallbackFonts.begin()),
                          std::make_move_iterator(fallbackFonts.end()));
-@@ -833,15 +851,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+@@ -833,15 +868,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
  void SkFontMgr_Android_Parser::GetCustomFontFamilies(
          std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
          const SkString& basePath,

build/patches/Ask-for-restart-on-connection-change.patch

@@ -284,7 +284,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 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
-@@ -1465,7 +1465,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1525,7 +1525,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              mActivity,
                              mStatusIndicatorCoordinator,
                              isUrlBarFocusedSupplier,
@@ -299,7 +299,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-@@ -199,6 +199,13 @@ public abstract class TabModelSelectorBase
+@@ -200,6 +200,13 @@ public abstract class TabModelSelectorBase
          return null;
      }
  
@@ -353,7 +353,7 @@ new file mode 100644
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
 --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
 +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
-@@ -149,6 +149,8 @@ public interface TabModelSelector {
+@@ -150,6 +150,8 @@ public interface TabModelSelector {
      /** Get total pinned tab count across all tab models */
      int getTotalPinnedTabCount();
  
@@ -407,7 +407,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 --- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 +++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
-@@ -135,6 +135,8 @@ public interface TabWindowManager {
+@@ -138,6 +138,8 @@ public interface TabWindowManager {
      /** Returns the total number of incognito tabs across all tab model selectors. */
      int getIncognitoTabCount();
  
@@ -419,7 +419,7 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 --- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 +++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
-@@ -551,6 +551,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+@@ -568,6 +568,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
          return tabGroupModelFilter.getTabsInGroup(tabGroupId);
      }
  
@@ -497,7 +497,7 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/c
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
-@@ -136,6 +136,8 @@ public class Snackbar {
+@@ -140,6 +140,8 @@ public class Snackbar {
      private @Nullable String mTemplateText;
      private @Nullable String mActionText;
      private @Nullable Object mActionData;
@@ -506,7 +506,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      private int mBackgroundColor;
      private int mTextApperanceResId;
      private boolean mDefaultLines = true;
-@@ -242,6 +244,20 @@ public class Snackbar {
+@@ -246,6 +248,20 @@ public class Snackbar {
          return this;
      }
  
@@ -530,7 +530,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
-@@ -327,6 +327,12 @@ public class SnackbarManager
+@@ -348,6 +348,12 @@ public class SnackbarManager
                          new SnackbarView(
                                  mActivity,
                                  this,
@@ -546,7 +546,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
-@@ -56,6 +56,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -55,6 +55,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      protected final ViewGroup mSnackbarView;
      protected final TemplatePreservingTextView mMessageView;
      private final TextView mActionButtonView;
@@ -554,38 +554,38 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      private final ImageView mProfileImageView;
      private final int mAnimationDuration;
      private final boolean mIsTablet;
-@@ -102,11 +103,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -100,11 +101,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
-             OnClickListener listener,
+             SnackbarManager manager,
 +            OnClickListener dismissListener,
              Snackbar snackbar,
              ViewGroup parentView,
              @Nullable WindowAndroid windowAndroid,
              boolean isTablet) {
--        this(activity, listener, snackbar, parentView, windowAndroid, null, isTablet);
-+        this(activity, listener, dismissListener, snackbar, parentView, windowAndroid, null, isTablet);
+-        this(activity, manager, snackbar, parentView, windowAndroid, null, isTablet);
++        this(activity, manager, dismissListener, snackbar, parentView, windowAndroid, null, isTablet);
      }
  
      /**
-@@ -125,6 +127,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -122,6 +124,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
-             OnClickListener listener,
+             SnackbarManager manager,
 +            OnClickListener dismissListener,
              Snackbar snackbar,
              ViewGroup parentView,
              @Nullable WindowAndroid windowAndroid,
-@@ -155,6 +158,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -158,6 +161,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
                  (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
          mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
-         mActionButtonView.setOnClickListener(listener);
+         mActionButtonView.setOnClickListener(manager);
 +        mDismissButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_dismiss);
 +        mDismissButtonView.setOnClickListener(dismissListener);
          mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
          mEdgeToEdgeSupplier = edgeToEdgeSupplier;
-         if (SnackbarManager.isFloatingSnackbarEnabled()) {
-@@ -429,6 +434,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+         // TODO(crbug.com/451807932): Replace with a custom pad adjuster to account for inset
+@@ -434,6 +439,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
              mActionButtonView.setVisibility(View.VISIBLE);
              mActionButtonView.setContentDescription(snackbar.getActionText());
              setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -601,7 +601,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
 --- a/content/browser/web_contents/web_contents_android.cc
 +++ b/content/browser/web_contents/web_contents_android.cc
-@@ -903,6 +903,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
+@@ -911,6 +911,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
    view->SetFocus(focused);
  }
  
@@ -627,7 +627,7 @@ diff --git a/content/browser/web_contents/web_contents_android.cc b/content/brow
 diff --git a/content/browser/web_contents/web_contents_android.h b/content/browser/web_contents/web_contents_android.h
 --- a/content/browser/web_contents/web_contents_android.h
 +++ b/content/browser/web_contents/web_contents_android.h
-@@ -196,6 +196,7 @@ class CONTENT_EXPORT WebContentsAndroid {
+@@ -199,6 +199,7 @@ class CONTENT_EXPORT WebContentsAndroid {
  
    void OnScaleFactorChanged(JNIEnv* env);
    void SetFocus(JNIEnv* env, jboolean focused);
@@ -638,7 +638,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -4094,8 +4094,10 @@ void WebContentsImpl::Stop() {
+@@ -4096,8 +4096,10 @@ void WebContentsImpl::Stop() {
  void WebContentsImpl::SetPageFrozen(bool frozen) {
    TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
  
@@ -652,7 +652,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
-@@ -1134,6 +1134,12 @@ public class WebContentsImpl
+@@ -1143,6 +1143,12 @@ public class WebContentsImpl
          WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
      }
  
@@ -665,7 +665,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
      @Override
      public void setDisplayCutoutSafeArea(Rect insets) {
          if (mNativeWebContentsAndroid == 0) return;
-@@ -1463,6 +1469,8 @@ public class WebContentsImpl
+@@ -1486,6 +1492,8 @@ public class WebContentsImpl
  
          void setFocus(long nativeWebContentsAndroid, boolean focused);
  
@@ -677,7 +677,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
 diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 --- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 +++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
-@@ -288,6 +288,8 @@ public interface WebContents extends Parcelable {
+@@ -297,6 +297,8 @@ public interface WebContents extends Parcelable {
       */
      void setFocus(boolean hasFocus);
  
@@ -689,7 +689,7 @@ diff --git a/content/public/android/java/src/org/chromium/content_public/browser
 diff --git a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
 --- a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
 +++ b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
-@@ -188,6 +188,9 @@ public class MockWebContents implements WebContents, WebContentsObserver.Observa
+@@ -191,6 +191,9 @@ public class MockWebContents implements WebContents, WebContentsObserver.Observa
      @Override
      public void setFocus(boolean hasFocus) {}
  
@@ -734,7 +734,7 @@ new file mode 100644
 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
-@@ -4654,6 +4654,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4665,6 +4665,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
  }
  
  void Document::DispatchFreezeEvent() {
@@ -745,7 +745,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 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
-@@ -3303,6 +3303,7 @@ void LocalFrame::DidFreeze() {
+@@ -3321,6 +3321,7 @@ void LocalFrame::DidFreeze() {
    LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
    GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
    Loader().SetDefersLoading(freeze_mode);
@@ -753,7 +753,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  }
  
  void LocalFrame::DidResume() {
-@@ -3317,6 +3318,7 @@ void LocalFrame::DidResume() {
+@@ -3335,6 +3336,7 @@ void LocalFrame::DidResume() {
    GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
    Loader().SetDefersLoading(LoaderFreezeMode::kNone);
  
@@ -764,7 +764,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
 +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
-@@ -1033,7 +1033,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -1025,7 +1025,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
    if (!parent_page_scheduler_)
      return SchedulingLifecycleState::kNotThrottled;
    if (parent_page_scheduler_->IsFrozen()) {
@@ -777,7 +777,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_sch
 diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 --- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 +++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-@@ -237,10 +237,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
+@@ -236,10 +236,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
    // it is desirable to reject the page freeze to prevent the scheduler from
    // being put in a bad state. See https://crbug.com/873214 for context of how
    // this can happen on the browser side.
@@ -790,7 +790,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_sche
    PolicyUpdater policy_updater;
    SetPageFrozenImpl(frozen, policy_updater);
  }
-@@ -816,7 +818,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+@@ -804,7 +806,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
    // expire immediately when a page is backgrounded, which is undesirable in
    // headless mode. To prevent that, a page is never considerer backgrounded
    // when virtual time is enabled.

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

@@ -76,7 +76,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
-@@ -116,6 +116,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
+@@ -115,6 +115,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
  
    std::unique_ptr<SharedAudioBuffer> CreateSharedAudioBuffer();
  
@@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 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
-@@ -17,6 +17,7 @@
+@@ -20,6 +20,7 @@
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/mediastream/media_devices.h"
  #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
@@ -96,7 +96,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
  #include "third_party/blink/public/platform/web_audio_latency_hint.h"
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
-@@ -850,7 +851,9 @@ double AudioContext::baseLatency() const {
+@@ -921,7 +922,9 @@ double AudioContext::baseLatency() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
    DCHECK(destination());
  
@@ -110,15 +110,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
-@@ -29,6 +29,7 @@
- 
+@@ -30,6 +30,7 @@
  #include "base/metrics/histogram_functions.h"
  #include "build/build_config.h"
+ #include "media/base/audio_bus.h"
 +#include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
  #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
  #include "third_party/blink/public/platform/platform.h"
-@@ -774,6 +775,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -777,6 +778,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -151,7 +151,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
 diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
-@@ -374,6 +374,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -395,6 +395,7 @@ void OfflineAudioContext::FireCompletionEvent() {
      if (!rendered_buffer) {
        return;
      }
@@ -162,15 +162,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.c
 diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
-@@ -32,6 +32,7 @@
- #include <complex>
+@@ -33,6 +33,7 @@
  
  #include "base/compiler_specific.h"
+ #include "media/base/audio_bus.h"
 +#include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
  #include "third_party/blink/renderer/platform/audio/audio_bus.h"
  #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
  #include "third_party/blink/renderer/platform/audio/vector_math.h"
-@@ -117,7 +118,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
+@@ -118,7 +119,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
      for (unsigned i = 0; i < len; ++i) {
        const float linear_value = UNSAFE_TODO(source[i]);
        const double db_mag = audio_utilities::LinearToDecibels(linear_value);
@@ -180,7 +180,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
      }
    }
  }
-@@ -155,9 +157,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
+@@ -156,9 +158,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
  
        // The range m_minDecibels to m_maxDecibels will be scaled to byte values
        // from 0 to UCHAR_MAX.
@@ -193,7 +193,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
        // Clip to valid range.
        UNSAFE_TODO(destination[i]) =
            static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
-@@ -188,6 +192,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+@@ -189,6 +193,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
            input_buffer[(i + write_index - fft_size + kInputBufferSize) %
                         kInputBufferSize]);
  
@@ -201,7 +201,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
        UNSAFE_TODO(destination[i]) = value;
      }
    }
-@@ -211,10 +216,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+@@ -212,10 +217,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
  
      for (unsigned i = 0; i < len; ++i) {
        // Buffer access is protected due to modulo operation.
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 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
-@@ -608,9 +608,8 @@
+@@ -639,9 +639,8 @@
      {
        // AudioContext.playoutStats interface.
        // https://chromestatus.com/feature/5172818344148992

build/patches/Battery-API-return-nothing.patch

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -80,46 +80,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
+@@ -77,46 +77,28 @@ ScriptPromise<BatteryManager> BatteryManager::StartRequest(
  }
  
  bool BatteryManager::charging() {

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.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
-@@ -398,6 +398,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -425,6 +425,7 @@ class CORE_EXPORT ExecutionContext : public MojoBindingContext,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -45,7 +45,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
-@@ -1120,6 +1120,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1122,6 +1122,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -93,8 +93,8 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 +#include "third_party/blink/renderer/platform/network/network_utils.h"
  #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
  #include "third_party/blink/renderer/platform/scheduler/public/virtual_time_controller.h"
- #include "third_party/blink/renderer/platform/supplementable.h"
-@@ -90,6 +91,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+ #include "third_party/blink/renderer/platform/weborigin/security_policy.h"
+@@ -89,6 +90,26 @@ bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  

build/patches/Block-leakage-of-urls-in-sandbox-iframes.patch

@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -5151,7 +5151,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -5158,7 +5158,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
  }
  
  void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
  #include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
  #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
  #include "third_party/blink/renderer/core/dom/document.h"
-@@ -126,8 +127,20 @@ DOMStringList* Location::ancestorOrigins() const {
+@@ -127,8 +128,20 @@ DOMStringList* Location::ancestorOrigins() const {
    auto* origins = MakeGarbageCollected<DOMStringList>();
    if (!IsAttached())
      return origins;
@@ -106,7 +106,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
 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
-@@ -836,6 +836,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -835,6 +835,11 @@ WebString DocumentLoader::HttpMethod() const {
  }
  
  const AtomicString& DocumentLoader::GetReferrer() const {
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return referrer_;
  }
  
-@@ -2916,6 +2921,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2913,6 +2918,13 @@ void DocumentLoader::CommitNavigation() {
          response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
    }
  
@@ -135,7 +135,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
 diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
 --- a/third_party/blink/renderer/core/loader/document_loader.h
 +++ b/third_party/blink/renderer/core/loader/document_loader.h
-@@ -773,7 +773,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -768,7 +768,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
    // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set.
    bool loading_main_document_from_mhtml_archive_ = false;
    const bool loading_srcdoc_ = false;

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

@@ -1,277 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Wed, 30 Oct 2019 11:50:13 +0100
-Subject: Block 'qjz9zk' or 'trk:' requests
-
-An info bar is displayed unless the --disable-trkbar command-line flag or the chrome://flag option is used.
-This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved'
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- .../chrome_autocomplete_scheme_classifier.cc  |  1 +
- chrome/browser/history/history_utils.cc       |  1 +
- chrome/browser/ui/singleton_tabs.cc           |  5 ++++
- .../omnibox/browser/autocomplete_input.cc     |  8 ++++-
- components/url_formatter/url_fixer.cc         |  4 +++
- .../child_process_security_policy_impl.cc     |  1 +
- net/BUILD.gn                                  |  2 ++
- net/url_request/trk_protocol_handler.cc       | 25 ++++++++++++++++
- net/url_request/trk_protocol_handler.h        | 30 +++++++++++++++++++
- net/url_request/url_request.cc                |  8 +++++
- .../url_request_context_builder.cc            |  3 ++
- url/url_constants.h                           |  1 +
- url/url_util.cc                               |  2 ++
- 13 files changed, 90 insertions(+), 1 deletion(-)
- create mode 100644 net/url_request/trk_protocol_handler.cc
- create mode 100644 net/url_request/trk_protocol_handler.h
-
-diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
---- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
-   if (base::IsStringASCII(scheme) &&
-       (ProfileIOData::IsHandledProtocol(scheme) ||
-        base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
-+       base::EqualsCaseInsensitiveASCII(scheme, url::kTraceScheme) ||
-        base::EqualsCaseInsensitiveASCII(scheme, url::kJavaScriptScheme) ||
-        base::EqualsCaseInsensitiveASCII(scheme, url::kDataScheme))) {
-     return metrics::OmniboxInputType::URL;
-diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/history_utils.cc
---- a/chrome/browser/history/history_utils.cc
-+++ b/chrome/browser/history/history_utils.cc
-@@ -22,6 +22,7 @@ bool CanAddURLToHistory(const GURL& url) {
-       url.SchemeIs(content::kChromeUIScheme) ||
-       url.SchemeIs(content::kChromeUIUntrustedScheme) ||
-       url.SchemeIs(content::kViewSourceScheme) ||
-+      url.SchemeIs(url::kTraceScheme) ||
-       url.SchemeIs(chrome::kChromeNativeScheme) ||
-       url.SchemeIs(chrome::kChromeSearchScheme) ||
-       url.SchemeIs(dom_distiller::kDomDistillerScheme))
-diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
---- a/chrome/browser/ui/singleton_tabs.cc
-+++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -141,6 +141,11 @@ int GetIndexOfExistingTab(BrowserWindowInterface* browser,
-       continue;
-     }
- 
-+    // trk: URLs must not be rewritten
-+    if (tab_url.SchemeIs(url::kTraceScheme)) {
-+      continue;
-+    }
-+
-     GURL rewritten_tab_url = tab_url;
-     content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
-         &rewritten_tab_url, browser->GetProfile());
-diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
---- a/components/omnibox/browser/autocomplete_input.cc
-+++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
- bool HasScheme(const std::u16string& input, const char* scheme) {
-   std::string utf8_input(base::UTF16ToUTF8(input));
-   url::Component view_source_scheme;
-+
-+  if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &view_source_scheme)) {
-+    return false;
-+  }
-   if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme,
-                                 &view_source_scheme)) {
-     utf8_input.erase(0, view_source_scheme.end() + 1);
-   }
-+
-   return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
- }
- 
-@@ -578,7 +583,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
-   // For the view-source and blob schemes, we should emphasize the host of the
-   // URL qualified by the view-source or blob prefix.
-   if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
--       base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme)) &&
-+       base::EqualsCaseInsensitiveASCII(scheme_str, url::kBlobScheme) ||
-+       base::EqualsCaseInsensitiveASCII(scheme_str, url::kTraceScheme)) &&
-       (static_cast<int>(text.length()) > after_scheme_and_colon)) {
-     // Obtain the URL prefixed by view-source or blob and parse it.
-     std::u16string real_url(text.substr(after_scheme_and_colon));
-diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
---- a/components/url_formatter/url_fixer.cc
-+++ b/components/url_formatter/url_fixer.cc
-@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& text,
-     }
-   }
- 
-+  if (scheme == url::kTraceScheme) {
-+    return GURL();
-+  }
-+
-   // We handle the file scheme separately.
-   if (scheme == url::kFileScheme) {
-     return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
-diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
---- a/content/browser/child_process_security_policy_impl.cc
-+++ b/content/browser/child_process_security_policy_impl.cc
-@@ -969,6 +969,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
-   RegisterPseudoScheme(url::kJavaScriptScheme);
-   RegisterPseudoScheme(kViewSourceScheme);
-   RegisterPseudoScheme(kGoogleChromeScheme);
-+  RegisterWebSafeScheme(url::kTraceScheme);
- }
- 
- ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() = default;
-diff --git a/net/BUILD.gn b/net/BUILD.gn
---- a/net/BUILD.gn
-+++ b/net/BUILD.gn
-@@ -1142,6 +1142,8 @@ component("net") {
-     "url_request/url_request_http_job.cc",
-     "url_request/url_request_http_job.h",
-     "url_request/url_request_interceptor.cc",
-+    "url_request/trk_protocol_handler.cc",
-+    "url_request/trk_protocol_handler.h",
-     "url_request/url_request_interceptor.h",
-     "url_request/url_request_job.cc",
-     "url_request/url_request_job.h",
-diff --git a/net/url_request/trk_protocol_handler.cc b/net/url_request/trk_protocol_handler.cc
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/trk_protocol_handler.cc
-@@ -0,0 +1,25 @@
-+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "net/url_request/trk_protocol_handler.h"
-+
-+#include "base/logging.h"
-+#include "net/base/net_errors.h"
-+#include "net/url_request/url_request_error_job.h"
-+
-+namespace net {
-+
-+TrkProtocolHandler::TrkProtocolHandler() = default;
-+
-+std::unique_ptr<URLRequestJob> TrkProtocolHandler::CreateJob(
-+    URLRequest* request) const {
-+  LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url();
-+  return std::make_unique<URLRequestErrorJob>(request, ERR_BLOCKED_BY_CLIENT);
-+}
-+
-+bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const {
-+  return true;
-+}
-+
-+}  // namespace net
-diff --git a/net/url_request/trk_protocol_handler.h b/net/url_request/trk_protocol_handler.h
-new file mode 100644
---- /dev/null
-+++ b/net/url_request/trk_protocol_handler.h
-@@ -0,0 +1,30 @@
-+// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-+#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-+
-+#include "base/compiler_specific.h"
-+#include "net/base/net_export.h"
-+#include "net/url_request/url_request_job_factory.h"
-+
-+namespace net {
-+
-+class URLRequestJob;
-+
-+// Implements a ProtocolHandler for Trk jobs.
-+class NET_EXPORT TrkProtocolHandler
-+    : public URLRequestJobFactory::ProtocolHandler {
-+ public:
-+  TrkProtocolHandler(const TrkProtocolHandler&) = delete;
-+  TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete;
-+
-+  TrkProtocolHandler();
-+  std::unique_ptr<URLRequestJob> CreateJob(URLRequest* request) const override;
-+  bool IsSafeRedirectTarget(const GURL& location) const override;
-+};
-+
-+}  // namespace net
-+
-+#endif  // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
-diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
---- a/net/url_request/url_request.cc
-+++ b/net/url_request/url_request.cc
-@@ -15,6 +15,7 @@
- #include "base/notreached.h"
- #include "base/rand_util.h"
- #include "base/strings/utf_string_conversions.h"
-+#include "base/strings/string_util.h"
- #include "base/synchronization/lock.h"
- #include "base/task/single_thread_task_runner.h"
- #include "base/types/optional_util.h"
-@@ -55,6 +56,7 @@
- #include "net/url_request/url_request_redirect_job.h"
- #include "url/gurl.h"
- #include "url/origin.h"
-+#include "url/url_constants.h"
- 
- namespace net {
- 
-@@ -650,6 +652,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
-   // Sanity check out environment.
-   DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
- 
-+  if (!url.SchemeIs(url::kTraceScheme) &&
-+      base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
-+    LOG(ERROR) << "Block URL in URLRequest: " << url;
-+    url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec()));
-+  }
-+
-   context->url_requests()->insert(this);
-   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE,
-                       [&](NetLogCaptureMode capture_mode) {
-diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
---- a/net/url_request/url_request_context_builder.cc
-+++ b/net/url_request/url_request_context_builder.cc
-@@ -55,6 +55,7 @@
- #include "net/socket/network_binding_client_socket_factory.h"
- #include "net/ssl/ssl_config_service_defaults.h"
- #include "net/url_request/static_http_user_agent_settings.h"
-+#include "net/url_request/trk_protocol_handler.h"
- #include "net/url_request/url_request_context.h"
- #include "net/url_request/url_request_job_factory.h"
- #include "url/url_constants.h"
-@@ -619,6 +620,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
-     job_factory->SetProtocolHandler(scheme_handler.first,
-                                     std::move(scheme_handler.second));
-   }
-+  job_factory->SetProtocolHandler(url::kTraceScheme,
-+                                  std::make_unique<TrkProtocolHandler>());
-   protocol_handlers_.clear();
- 
-   context->set_job_factory(std::move(job_factory));
-diff --git a/url/url_constants.h b/url/url_constants.h
---- a/url/url_constants.h
-+++ b/url/url_constants.h
-@@ -34,6 +34,7 @@ inline constexpr char16_t kDataScheme16[] = u"data";
- inline constexpr char kDrivefsScheme[] = "drivefs";
- inline constexpr char kFileScheme[] = "file";
- inline constexpr char16_t kFileScheme16[] = u"file";
-+inline constexpr char kTraceScheme[] = "trk";
- inline constexpr char kFileSystemScheme[] = "filesystem";
- inline constexpr char16_t kFileSystemScheme16[] = u"filesystem";
- inline constexpr char kFtpScheme[] = "ftp";
-diff --git a/url/url_util.cc b/url/url_util.cc
---- a/url/url_util.cc
-+++ b/url/url_util.cc
-@@ -54,6 +54,7 @@ struct SchemeRegistry {
-   std::vector<SchemeWithType> standard_schemes = {
-       {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
-       {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
-+      {kTraceScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
-       // Yes, file URLs can have a hostname, so file URLs should be handled as
-       // "standard". File URLs never have a port as specified by the SchemeType
-       // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -99,6 +100,7 @@ struct SchemeRegistry {
-       kAboutScheme,
-       kJavaScriptScheme,
-       kDataScheme,
-+      kTraceScheme,
-   };
- 
-   // Schemes that can be sent CORS requests.
---

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

@@ -80,7 +80,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 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
-@@ -252,6 +252,9 @@ CHAR_LIMIT guidelines:
+@@ -264,6 +264,9 @@ CHAR_LIMIT guidelines:
        <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
          Sites
        </message>

build/patches/Bromite-auto-updater.patch

@@ -42,12 +42,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/compare/cluster_server_proxy.cc      |   2 +-
  .../product_specifications_server_proxy.cc    |   2 +-
  .../subscriptions_server_proxy.cc             |   2 +-
+ .../internal/composebox_query_controller.cc   |   2 +-
  .../data_sharing_network_loader_impl.cc       |   2 +-
  .../internal/preview_server_proxy.cc          |   2 +-
  .../endpoint_fetcher/endpoint_fetcher.cc      | 127 ++++++--
  .../endpoint_fetcher/endpoint_fetcher.h       |  28 +-
  components/manta/base_provider.cc             |   4 +-
- .../composebox/composebox_query_controller.cc |   2 +-
  .../Bromite-auto-updater.inc                  |   3 +
  .../Bromite-auto-updater.inc                  |   1 +
  42 files changed, 1154 insertions(+), 106 deletions(-)
@@ -79,7 +79,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
-@@ -1952,6 +1952,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1959,6 +1959,9 @@ if (!is_robolectric && enable_java_templates) {
        sources = [ "//build/android/java/templates/BuildConfig.template" ]
        defines = []
  
@@ -92,7 +92,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
-@@ -848,6 +848,8 @@ chrome_java_sources = [
+@@ -871,6 +871,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/omaha/OmahaBase.java",
    "java/src/org/chromium/chrome/browser/omaha/OmahaDelegate.java",
    "java/src/org/chromium/chrome/browser/omaha/OmahaDelegateBase.java",
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/a
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
-@@ -29,13 +29,19 @@ import org.chromium.ui.widget.Toast;
+@@ -31,10 +31,15 @@ import org.chromium.ui.widget.Toast;
  
  import java.util.Calendar;
  
@@ -133,6 +133,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
 -        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener {
 +        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener,
 +                   Preference.OnPreferenceChangeListener {
+     static {
+         CalendarFactory.warmUp();
+     }
+@@ -42,6 +47,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
      private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7;
  
      private static final String PREF_APPLICATION_VERSION = "application_version";
@@ -140,9 +144,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
      private static final String PREF_OS_VERSION = "os_version";
      private static final String PREF_LEGAL_INFORMATION = "legal_information";
  
-@@ -72,6 +78,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+@@ -78,6 +84,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
          assumeNonNull(p);
-         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
+         int currentYear = CalendarFactory.get().get(Calendar.YEAR);
          p.setSummary(getString(R.string.legal_information_summary, currentYear));
 +
 +        ChromeSwitchPreference allowInlineUpdate =
@@ -154,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
      }
  
      @Override
-@@ -142,6 +155,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+@@ -148,6 +161,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
          return true;
      }
  
@@ -686,7 +690,7 @@ new file mode 100644
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2669,6 +2669,12 @@ static_library("browser") {
+@@ -2652,6 +2652,12 @@ static_library("browser") {
    }
  
    if (is_android) {
@@ -1004,18 +1008,18 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -375,6 +375,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -387,6 +387,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kProtectedTabsAndroid,
      &kPwaRestoreUi,
      &kPwaRestoreUiAtStartup,
 +    &kInlineUpdateFlow,
-     &kOmahaMinSdkVersionAndroid,
-     &kShortCircuitUnfocusAnimation,
-     &kShowHomeButtonPolicyAndroid,
+     &kReadAloud,
+     &kReadAloudAudioOverviews,
+     &kReadAloudAudioOverviewsFeedback,
 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
-@@ -464,6 +464,7 @@ public abstract class ChromeFeatureList {
+@@ -477,6 +477,7 @@ public abstract class ChromeFeatureList {
      public static final String INCOGNITO_NTP_SMALL_ICON = "IncognitoNtpSmallIcon";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
      public static final String INCOGNITO_THEME_OVERLAY_TESTING = "IncognitoThemeOverlayTesting";
@@ -1026,9 +1030,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
 +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
-@@ -270,7 +270,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher(
-           .SetOauthScopes(discovery_scopes)
-           .SetOauthConsumerName(kDiscoveryOAuthConsumerName)
+@@ -264,7 +264,7 @@ AccessCodeCastDiscoveryInterface::CreateEndpointFetcher(
+           .SetTimeout(kTimeout)
+           .SetUrl(GURL(base::StrCat({GetDiscoveryUrl(), "/", access_code})))
            .SetPostData(kEmptyPostData)
 -          .Build());
 +          .Build(), kTrafficAnnotation);
@@ -1605,7 +1609,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/save_to_drive/drive_uploader.cc b/chrome/browser/save_to_drive/drive_uploader.cc
 --- a/chrome/browser/save_to_drive/drive_uploader.cc
 +++ b/chrome/browser/save_to_drive/drive_uploader.cc
-@@ -288,7 +288,7 @@ DriveUploader::CreateEndpointFetcher(
+@@ -290,7 +290,7 @@ DriveUploader::CreateEndpointFetcher(
    return std::make_unique<endpoint_fetcher::EndpointFetcher>(
        /*url_loader_factory=*/url_loader_factory_.get(),
        /*identity_manager=*/identity_manager_,
@@ -1617,7 +1621,7 @@ diff --git a/chrome/browser/save_to_drive/drive_uploader.cc b/chrome/browser/sav
 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
-@@ -2279,6 +2279,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2315,6 +2315,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>
@@ -1630,7 +1634,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]">
-@@ -4255,7 +4261,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4366,7 +4372,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
  
        <!-- Main menu items -->
        <message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1642,7 +1646,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
-@@ -4266,6 +4275,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4377,6 +4386,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <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>
@@ -1664,7 +1668,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 --- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 +++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
-@@ -726,7 +726,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
+@@ -770,7 +770,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
            .SetTimeout(timeout)
            .SetUrl(fetch_url)
            .SetUploadProgressCallback(std::move(upload_progress_callback))
@@ -1676,7 +1680,7 @@ diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/br
 diff --git a/components/commerce/core/account_checker.cc b/components/commerce/core/account_checker.cc
 --- a/components/commerce/core/account_checker.cc
 +++ b/components/commerce/core/account_checker.cc
-@@ -331,7 +331,7 @@ std::unique_ptr<EndpointFetcher> AccountChecker::CreateEndpointFetcher(
+@@ -327,7 +327,7 @@ std::unique_ptr<EndpointFetcher> AccountChecker::CreateEndpointFetcher(
        .SetPostData(post_data);
    MaybeUseAlternateShoppingServer(request_params);
    return std::make_unique<EndpointFetcher>(
@@ -1688,7 +1692,7 @@ diff --git a/components/commerce/core/account_checker.cc b/components/commerce/c
 diff --git a/components/commerce/core/compare/cluster_server_proxy.cc b/components/commerce/core/compare/cluster_server_proxy.cc
 --- a/components/commerce/core/compare/cluster_server_proxy.cc
 +++ b/components/commerce/core/compare/cluster_server_proxy.cc
-@@ -158,7 +158,7 @@ std::unique_ptr<EndpointFetcher> ClusterServerProxy::CreateEndpointFetcher(
+@@ -156,7 +156,7 @@ std::unique_ptr<EndpointFetcher> ClusterServerProxy::CreateEndpointFetcher(
        .SetPostData(post_data);
    commerce::MaybeUseAlternateShoppingServer(request_params);
    return std::make_unique<EndpointFetcher>(
@@ -1700,7 +1704,7 @@ diff --git a/components/commerce/core/compare/cluster_server_proxy.cc b/componen
 diff --git a/components/commerce/core/compare/product_specifications_server_proxy.cc b/components/commerce/core/compare/product_specifications_server_proxy.cc
 --- a/components/commerce/core/compare/product_specifications_server_proxy.cc
 +++ b/components/commerce/core/compare/product_specifications_server_proxy.cc
-@@ -298,7 +298,7 @@ ProductSpecificationsServerProxy::CreateEndpointFetcher(
+@@ -296,7 +296,7 @@ ProductSpecificationsServerProxy::CreateEndpointFetcher(
        .SetPostData(post_data);
    MaybeUseAlternateShoppingServer(request_params);
    return std::make_unique<EndpointFetcher>(
@@ -1712,7 +1716,7 @@ diff --git a/components/commerce/core/compare/product_specifications_server_prox
 diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 --- a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 +++ b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
-@@ -304,7 +304,7 @@ SubscriptionsServerProxy::CreateEndpointFetcher(
+@@ -302,7 +302,7 @@ SubscriptionsServerProxy::CreateEndpointFetcher(
        .SetPostData(post_data);
    MaybeUseAlternateShoppingServer(request_params);
    return std::make_unique<EndpointFetcher>(
@@ -1721,12 +1725,24 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
  }
  
  void SubscriptionsServerProxy::HandleManageSubscriptionsResponses(
+diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
+--- a/components/contextual_search/internal/composebox_query_controller.cc
++++ b/components/contextual_search/internal/composebox_query_controller.cc
+@@ -777,7 +777,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
+           .SetTimeout(timeout)
+           .SetUploadProgressCallback(std::move(upload_progress_callback))
+           .SetUrl(fetch_url)
+-          .Build());
++          .Build(), kTrafficAnnotationTag);
+ }
+ 
+ lens::LensOverlayClientContext ComposeboxQueryController::CreateClientContext()
 diff --git a/components/data_sharing/internal/data_sharing_network_loader_impl.cc b/components/data_sharing/internal/data_sharing_network_loader_impl.cc
 --- a/components/data_sharing/internal/data_sharing_network_loader_impl.cc
 +++ b/components/data_sharing/internal/data_sharing_network_loader_impl.cc
-@@ -78,7 +78,7 @@ DataSharingNetworkLoaderImpl::CreateEndpointFetcher(
-           .SetOauthScopes(scopes)
-           .SetOauthConsumerName(kOauthConsumerName)
+@@ -63,7 +63,7 @@ DataSharingNetworkLoaderImpl::CreateEndpointFetcher(
+           .SetUrl(url)
+           .SetOAuthConsumerId(signin::OAuthConsumerId::kDataSharingAndroid)
            .SetPostData(post_data)
 -          .Build());
 +          .Build(), annotation_tag);
@@ -1736,10 +1752,10 @@ diff --git a/components/data_sharing/internal/data_sharing_network_loader_impl.c
 diff --git a/components/data_sharing/internal/preview_server_proxy.cc b/components/data_sharing/internal/preview_server_proxy.cc
 --- a/components/data_sharing/internal/preview_server_proxy.cc
 +++ b/components/data_sharing/internal/preview_server_proxy.cc
-@@ -351,7 +351,7 @@ std::unique_ptr<EndpointFetcher> PreviewServerProxy::CreateEndpointFetcher(
+@@ -346,7 +346,7 @@ std::unique_ptr<EndpointFetcher> PreviewServerProxy::CreateEndpointFetcher(
+           .SetContentType(kContentType)
+           .SetTimeout(kTimeout)
            .SetUrl(url)
-           .SetOauthScopes(std::vector<std::string>{kOAuthScope})
-           .SetOauthConsumerName(kOAuthName)
 -          .Build());
 +          .Build(), kGetSharedDataPreviewTrafficAnnotation);
  }
@@ -1748,7 +1764,7 @@ diff --git a/components/data_sharing/internal/preview_server_proxy.cc b/componen
 diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
 --- a/components/endpoint_fetcher/endpoint_fetcher.cc
 +++ b/components/endpoint_fetcher/endpoint_fetcher.cc
-@@ -25,6 +25,11 @@
+@@ -29,6 +29,11 @@
  #include "services/network/public/mojom/referrer_policy.mojom-shared.h"
  #include "services/network/public/mojom/url_response_head.mojom.h"
  
@@ -1760,7 +1776,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  namespace endpoint_fetcher {
  
  namespace {
-@@ -43,6 +48,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
+@@ -47,6 +52,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
        return "DELETE";
      case HttpMethod::kPut:
        return "PUT";
@@ -1769,7 +1785,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
      default:
        DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n",
                                        static_cast<int>(http_method));
-@@ -50,6 +57,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
+@@ -54,6 +61,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
    return "";
  }
  
@@ -1783,7 +1799,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  }  // namespace
  
  EndpointResponse::EndpointResponse() = default;
-@@ -108,9 +122,11 @@ EndpointFetcher::RequestParams::Builder::Build() {
+@@ -109,9 +123,11 @@ EndpointFetcher::RequestParams::Builder::Build() {
  EndpointFetcher::EndpointFetcher(
      const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
      signin::IdentityManager* identity_manager,
@@ -1796,7 +1812,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        request_params_(std::move(request_params)) {
    if (request_params_.auth_type() == OAUTH) {
      DCHECK(identity_manager_)
-@@ -123,12 +139,32 @@ EndpointFetcher::EndpointFetcher(
+@@ -124,12 +140,32 @@ EndpointFetcher::EndpointFetcher(
  EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
      : identity_manager_(nullptr),
@@ -1829,7 +1845,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  EndpointFetcher::~EndpointFetcher() = default;
  
  void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -211,13 +247,10 @@ void EndpointFetcher::PerformHttpRequest(
+@@ -212,13 +248,10 @@ void EndpointFetcher::PerformHttpRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->method = GetHttpMethodString(request_params_.http_method());
    resource_request->url = request_params_.url();
@@ -1846,7 +1862,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
    // Add Content-Type header if post data is present.
    bool has_body_content = (request_params_.http_method() == HttpMethod::kPost ||
                             request_params_.http_method() == HttpMethod::kPut) &&
-@@ -258,8 +291,23 @@ void EndpointFetcher::PerformHttpRequest(
+@@ -259,8 +292,23 @@ void EndpointFetcher::PerformHttpRequest(
        break;
    }
  
@@ -1870,7 +1886,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  
    if (has_body_content) {
      simple_url_loader_->AttachStringForUpload(
-@@ -272,9 +320,18 @@ void EndpointFetcher::PerformHttpRequest(
+@@ -273,9 +321,18 @@ void EndpointFetcher::PerformHttpRequest(
  
    simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                        network::SimpleURLLoader::RETRY_ON_5XX);
@@ -1889,10 +1905,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +                     base::Unretained(this)));
 +    return;
 +  }
-   network::SimpleURLLoader::BodyAsStringCallbackDeprecated
-       body_as_string_callback = base::BindOnce(
-           &EndpointFetcher::OnResponseFetched, weak_ptr_factory_.GetWeakPtr(),
-@@ -333,21 +390,6 @@ void EndpointFetcher::OnResponseFetched(
+   network::SimpleURLLoader::BodyAsStringCallback body_as_string_callback =
+       base::BindOnce(&EndpointFetcher::OnResponseFetched,
+                      weak_ptr_factory_.GetWeakPtr(),
+@@ -334,21 +391,6 @@ void EndpointFetcher::OnResponseFetched(
    std::move(endpoint_fetcher_callback).Run(std::move(response));
  }
  
@@ -1914,7 +1930,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  int EndpointFetcher::GetMaxRetries() const {
    return request_params_.max_retries.value_or(kNumRetries);
  }
-@@ -365,4 +407,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
+@@ -366,4 +408,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
    return request_params_.url().spec();
  }
  
@@ -1984,7 +2000,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    int http_status_code{-1};
    std::optional<FetchErrorType> error_type;
    scoped_refptr<net::HttpResponseHeaders> headers;
-@@ -314,7 +320,16 @@ class EndpointFetcher {
+@@ -301,7 +307,16 @@ class EndpointFetcher {
    EndpointFetcher(
        const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
        signin::IdentityManager* identity_manager,
@@ -2002,10 +2018,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
    EndpointFetcher(const EndpointFetcher& endpoint_fetcher) = delete;
    EndpointFetcher& operator=(const EndpointFetcher& endpoint_fetcher) = delete;
-@@ -347,11 +362,17 @@ class EndpointFetcher {
+@@ -334,11 +349,17 @@ class EndpointFetcher {
  
    void OnResponseFetched(EndpointFetcherCallback callback,
-                          std::unique_ptr<std::string> response_body);
+                          std::optional<std::string> response_body);
 +  void OnURLLoadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
 +  void OnSimpleLoaderRedirect(const GURL& url_before_redirect,
 +                              const net::RedirectInfo& redirect_info,
@@ -2020,16 +2036,16 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
    // Members set in constructor
    const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
-@@ -359,6 +380,8 @@ class EndpointFetcher {
-   // this case, callers should invoke `PerformRequest` directly).
-   const raw_ptr<signin::IdentityManager> identity_manager_;
+@@ -349,6 +370,8 @@ class EndpointFetcher {
+   // SingleClientSharedTabGroupVersioningSyncTest.ShouldShowVersioningMessagesAfterRestart/kSyncTransportOnly
+   const raw_ptr<signin::IdentityManager, DanglingUntriaged> identity_manager_;
  
 +  const bool intercept_redirect_;
 +
    // The complete definition of the specific network request to be performed.
    // Contains authentication details and response handling preferences.
    const RequestParams request_params_;
-@@ -368,6 +391,9 @@ class EndpointFetcher {
+@@ -358,6 +381,9 @@ class EndpointFetcher {
        access_token_fetcher_;
    std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
  
@@ -2042,16 +2058,16 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 diff --git a/components/manta/base_provider.cc b/components/manta/base_provider.cc
 --- a/components/manta/base_provider.cc
 +++ b/components/manta/base_provider.cc
-@@ -145,7 +145,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcher(
-           .SetOauthScopes(scopes)
-           .SetOauthConsumerName(oauth_consumer_name)
+@@ -140,7 +140,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcher(
+           .SetUrl(url)
+           .SetOAuthConsumerId(signin::OAuthConsumerId::kManta)
            .SetPostData(post_data)
 -          .Build());
 +          .Build(), annotation_tag);
  }
  
  std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
-@@ -163,7 +163,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
+@@ -158,7 +158,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
            .SetTimeout(timeout)
            .SetPostData(post_data)
            .SetChannel(version_info::Channel::STABLE)
@@ -2060,18 +2076,6 @@ diff --git a/components/manta/base_provider.cc b/components/manta/base_provider.
  }
  
  }  // namespace manta
-diff --git a/components/omnibox/composebox/composebox_query_controller.cc b/components/omnibox/composebox/composebox_query_controller.cc
---- a/components/omnibox/composebox/composebox_query_controller.cc
-+++ b/components/omnibox/composebox/composebox_query_controller.cc
-@@ -524,7 +524,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
-           .SetTimeout(timeout)
-           .SetUploadProgressCallback(std::move(upload_progress_callback))
-           .SetUrl(fetch_url)
--          .Build());
-+          .Build(), kTrafficAnnotationTag);
- }
- 
- lens::LensOverlayClientContext ComposeboxQueryController::CreateClientContext()
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc
 new file mode 100644
 --- /dev/null

build/patches/Bromite-subresource-adblocker.patch

@@ -33,7 +33,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../flags/android/adblock_native_gateway.cc   |  31 ++
  .../browser/flags/AdBlockNativeGateway.java   |  30 ++
  .../net/system_network_context_manager.cc     |   4 +
- .../sessions/session_restore_android.cc       |   7 +-
  .../strings/android_chrome_strings.grd        |  14 +
  chrome/common/pref_names.h                    |   5 +
  .../strings/android/site_settings.grdp        |   3 +
@@ -51,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/subresource_filter_features.cc    | 118 +-------
  .../core/browser/verified_ruleset_dealer.cc   |   4 +
  .../core/common/indexed_ruleset.cc            |   5 +-
- 39 files changed, 1287 insertions(+), 129 deletions(-)
+ 38 files changed, 1282 insertions(+), 127 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
@@ -66,7 +65,7 @@ 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
-@@ -324,6 +324,7 @@ if (_is_default_toolchain) {
+@@ -302,6 +302,7 @@ if (_is_default_toolchain) {
        "//chrome/android/features/tab_ui/public:ui_java_resources",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
@@ -77,15 +76,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 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
-@@ -432,6 +432,7 @@ chrome_java_resources = [
-   "java/res/layout/account_divider_preference.xml",
+@@ -453,6 +453,7 @@ chrome_java_resources = [
    "java/res/layout/account_management_account_row.xml",
    "java/res/layout/app_history_filter.xml",
+   "java/res/layout/auto_pip_permission_dialog.xml",
 +  "java/res/layout/adblock_editor.xml",
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -627,6 +628,7 @@ chrome_java_resources = [
+@@ -658,6 +659,7 @@ chrome_java_resources = [
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
    "java/res/xml/appearance_preferences.xml",
@@ -96,7 +95,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
-@@ -918,6 +918,8 @@ chrome_java_sources = [
+@@ -942,6 +942,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -180,7 +179,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -312,6 +312,24 @@ found in the LICENSE file.
+@@ -331,6 +331,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -442,7 +441,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -88,6 +88,8 @@ import java.util.HashMap;
+@@ -95,6 +95,8 @@ import java.util.HashMap;
  import java.util.Locale;
  import java.util.Map;
  
@@ -451,8 +450,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  /**
   * The Chrome settings activity.
   *
-@@ -948,6 +950,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
-             if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
+@@ -1175,6 +1177,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+                     && !MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
                  return;
              }
 +            if (fragment instanceof AdBlockEditor) return;
@@ -462,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 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
-@@ -17103,6 +17103,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -17395,6 +17395,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -522,7 +521,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
  namespace gcm {
  class GCMDriver;
  }
-@@ -271,6 +276,7 @@ class BrowserProcess {
+@@ -276,6 +281,7 @@ class BrowserProcess {
  #endif
  
    virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -533,7 +532,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1270,6 +1270,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1284,6 +1284,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -571,7 +570,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -212,6 +212,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -213,6 +213,7 @@ class BrowserProcessImpl : public BrowserProcess,
  #endif
  
    component_updater::ComponentUpdateService* component_updater() override;
@@ -579,7 +578,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
    MediaFileSystemRegistry* media_file_system_registry() override;
    WebRtcLogUploader* webrtc_log_uploader() override;
    network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -429,6 +430,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -426,6 +427,7 @@ class BrowserProcessImpl : public BrowserProcess,
    // to concerns over integrity of data shared between profiles,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -590,7 +589,7 @@ 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
-@@ -390,6 +390,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -430,6 +430,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -701,7 +700,7 @@ new file mode 100755
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -715,6 +715,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -716,6 +716,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
    NetworkProcessLaunchWatcher::RegisterPrefs(registry);
  
@@ -712,28 +711,11 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
    // Static auth params
    registry->RegisterStringPref(prefs::kAuthSchemes,
                                 "basic,digest,ntlm,negotiate");
-diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
---- a/chrome/browser/sessions/session_restore_android.cc
-+++ b/chrome/browser/sessions/session_restore_android.cc
-@@ -58,8 +58,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
-   DCHECK(current_tab);
-   // If swapped, return the current tab's most up-to-date web contents.
-   if (disposition == WindowOpenDisposition::CURRENT_TAB) {
--    current_tab->SwapWebContents(std::move(new_web_contents), false, false);
--    return current_tab->web_contents();
-+    int active_tab_index = tab_model->GetActiveIndex();
-+    tab_model->CreateTab(current_tab, new_web_contents.release(),
-+      disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
-+    tab_model->CloseTabAt(active_tab_index);
-+    return raw_new_web_contents;
-   }
-   DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
-          disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
 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
-@@ -224,6 +224,20 @@ CHAR_LIMIT guidelines:
-         Search settings
+@@ -236,6 +236,20 @@ CHAR_LIMIT guidelines:
+         Try searching the help center
        </message>
  
 +      <!-- AdBlock settings -->
@@ -756,7 +738,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -2931,6 +2931,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2979,6 +2979,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -771,7 +753,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
-@@ -406,6 +406,9 @@
+@@ -424,6 +424,9 @@
    <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>
@@ -1613,7 +1595,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
        web_contents_helper_(web_contents_helper) {}
  
  ContentSubresourceFilterThrottleManager::
-@@ -629,6 +633,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -661,6 +665,17 @@ ContentSubresourceFilterThrottleManager::
        throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                  ad_tagging_state);
      }
@@ -1634,7 +1616,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
-@@ -403,6 +403,8 @@ class ContentSubresourceFilterThrottleManager
+@@ -410,6 +410,8 @@ class ContentSubresourceFilterThrottleManager
  
    std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
  
@@ -2016,15 +1998,15 @@ diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.
 diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/components/subresource_filter/core/common/indexed_ruleset.cc
 --- a/components/subresource_filter/core/common/indexed_ruleset.cc
 +++ b/components/subresource_filter/core/common/indexed_ruleset.cc
-@@ -6,6 +6,7 @@
- 
+@@ -7,6 +7,7 @@
  #include "base/check.h"
+ #include "base/functional/callback.h"
  #include "base/hash/hash.h"
 +#include "base/logging.h"
  #include "base/metrics/histogram_functions.h"
  #include "base/strings/strcat.h"
  #include "base/trace_event/trace_event.h"
-@@ -37,7 +38,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
+@@ -38,7 +39,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
    // least once.  The verifier detects a subset of the errors detected by the
    // checksum, and is unneeded once expected_checksum is consistently nonzero.
    flatbuffers::Verifier verifier(buffer.data(), buffer.size());

build/patches/Bubble-Locking-on-UI-DevTools.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
 --- a/chrome/browser/ui/views/toolbar/reload_button.cc
 +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
-@@ -225,6 +225,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
+@@ -276,6 +276,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
        command = IDC_RELOAD;
      }
  
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/u
 diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
 --- a/ui/views/widget/widget.h
 +++ b/ui/views/widget/widget.h
-@@ -1465,6 +1465,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1468,6 +1468,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    // initialized.
    void SaveWindowPlacementIfNeeded();
  
@@ -53,7 +53,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
   protected:
    // Creates the RootView to be used within this Widget. Subclasses may override
    // to create custom RootViews that do specialized event processing.
-@@ -1505,13 +1518,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1508,13 +1521,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    void set_widget_closed() { widget_closed_ = true; }
  
   private:
@@ -67,7 +67,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
    class PaintAsActiveLockImpl;
  
    friend class ButtonTest;
-@@ -1522,11 +1528,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1525,11 +1531,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    friend class ui_devtools::BubbleLocking;
    friend void DisableActivationChangeHandlingForTests();
  

build/patches/Change-popup-site-setting.patch

@@ -24,7 +24,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/resources/settings/site_settings/popups_page.html b/chrome/browser/resources/settings/site_settings/popups_page.html
 --- a/chrome/browser/resources/settings/site_settings/popups_page.html
 +++ b/chrome/browser/resources/settings/site_settings/popups_page.html
-@@ -9,6 +9,8 @@
+@@ -10,6 +10,8 @@
        category="[[contentSettingsTypesEnum_.POPUPS]]"
        allow-option-label="$i18n{siteSettingsPopupsAllowed}"
        allow-option-icon="cr:open-in-new"

build/patches/Chrome-web-store-protection.patch

@@ -129,7 +129,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
-@@ -364,6 +364,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -375,6 +375,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
      ExtensionUpdater::CheckParams params;
      params.fetch_priority = DownloadFetchPriority::kForeground;
      params.install_immediately = true;
@@ -137,7 +137,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
      params.callback =
          base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
      updater->CheckNow(std::move(params));
-@@ -500,7 +501,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -511,7 +512,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
  
    const developer::ProfileConfigurationUpdate& update = params->update;
  
@@ -146,7 +146,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
      Profile* profile = Profile::FromBrowserContext(browser_context());
      CHECK(profile);
      if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -514,6 +515,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -525,6 +526,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
          ->MarkNoticeAsAcknowledgedGlobally();
    }
  
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -67,6 +67,7 @@
+@@ -68,6 +68,7 @@
  #include "extensions/browser/scoped_active_install.h"
  #include "extensions/buildflags/buildflags.h"
  #include "extensions/common/extension.h"
@@ -189,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -229,6 +230,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -242,6 +243,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
  // there was previously stored data, or an empty string otherwise. The Set will
  // overwrite any previous login.
  std::string GetWebstoreLogin(Profile* profile) {
@@ -198,7 +198,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
      return profile->GetPrefs()->GetString(kWebstoreLogin);
    }
-@@ -236,11 +239,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -249,11 +252,15 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -214,7 +214,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    switch (status) {
      case kCanRequest:
        return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1178,7 +1185,8 @@ ExtensionFunction::ResponseAction
+@@ -1177,7 +1184,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1275,11 +1283,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1274,11 +1282,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -243,7 +243,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/browser/extensions/chrome_extension_system.cc
 --- a/chrome/browser/extensions/chrome_extension_system.cc
 +++ b/chrome/browser/extensions/chrome_extension_system.cc
-@@ -95,6 +95,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
+@@ -96,6 +96,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
      Profile* profile,
      const Extension* extension,
      UninstallReason reason) {
@@ -267,7 +267,7 @@ diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/brow
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -431,6 +431,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+@@ -436,6 +436,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
  
  bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
      const Extension* extension) {
@@ -374,7 +374,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    CHECK(enabled_);
    if (params.ids.empty()) {
      // Checking all extensions. Cancel pending DoCheckSoon() call if there's
-@@ -442,7 +454,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -450,7 +462,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
  
    int request_id = next_request_id_++;
  
@@ -383,7 +383,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    if (params.ids.empty()) {
      NotifyStarted();
    }
-@@ -512,7 +524,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -519,7 +531,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
          update_check_params.update_info[pending_id] =
              GetExtensionUpdateData(pending_id);
        } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {
@@ -392,7 +392,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
          continue;
        }
        // We have to mark high-priority extensions (such as policy-forced
-@@ -522,7 +534,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -529,7 +541,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
        // See https://crbug.com/904600 and https://crbug.com/965686.
        const bool is_high_priority_extension_pending =
            pending_extension_manager->HasHighPriorityPendingExtension();
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
          update_check_params.update_info[pending_id] =
              GetExtensionUpdateData(pending_id);
          update_check_params.update_info[pending_id].is_corrupt_reinstall =
-@@ -545,6 +557,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -552,6 +564,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
            LOG(WARNING) << "Corrupt extension with id " << pending_id
                         << " will be reinstalled with ExtensionDownloader.";
          }
@@ -410,7 +410,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        } else {
          InstallStageTracker::Get(profile_)->ReportFailure(
              pending_id,
-@@ -557,13 +571,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -564,13 +578,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
      AddToDownloader(&registry_->disabled_extensions(), pending_ids, request_id,
                      params.fetch_priority, &update_check_params);
      ExtensionSet remotely_disabled_extensions;
@@ -424,7 +424,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
      AddToDownloader(&remotely_disabled_extensions, pending_ids, request_id,
                      params.fetch_priority, &update_check_params);
    } else {
-@@ -571,7 +578,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -578,7 +585,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
        const Extension* extension =
            registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
        if (extension) {
@@ -433,7 +433,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
            update_check_params.update_info[id] = GetExtensionUpdateData(id);
          } else if (AddExtensionToDownloader(*extension, request_id,
                                              params.fetch_priority)) {
-@@ -715,7 +722,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -722,7 +729,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
        file.extension_id, InstallStageTracker::Stage::INSTALLING);
    UpdatePingData(file.extension_id, ping);
  
@@ -442,7 +442,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  
    FetchedCRXFile fetched(file, file_ownership_passed, request_ids,
                           std::move(callback));
-@@ -726,6 +733,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -733,6 +740,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
  
  bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                 DownloadPingData* ping_data) {
@@ -450,7 +450,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
    DCHECK(alive_);
    ping_data->rollcall_days =
        CalculatePingDaysForExtension(extension_prefs_->LastPingDay(id));
-@@ -845,7 +853,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -852,7 +860,7 @@ bool ExtensionUpdater::CanUseUpdateService(
  void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
    std::set<int> request_ids;
  
@@ -459,7 +459,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
            << crx_file.info.path.value();
  
    // The delegate is now responsible for cleaning up the temp file at
-@@ -1054,7 +1062,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+@@ -1061,7 +1069,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
    if (!request.in_progress_ids.empty() || request.awaiting_update_service) {
      return;  // This request is not done yet.
    }
@@ -504,7 +504,7 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows
 diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -594,7 +594,7 @@ void WebstoreInstaller::StartDownload(
+@@ -595,7 +595,7 @@ void WebstoreInstaller::StartDownload(
        traffic_annotation));
    params->set_file_path(file);
    params->set_initiator(render_frame_host->GetLastCommittedOrigin());
@@ -556,7 +556,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -342,6 +342,11 @@ export class Service implements ServiceInterface {
+@@ -356,6 +356,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -1201,9 +1201,9 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
 diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
 --- a/extensions/common/extension_features.cc
 +++ b/extensions/common/extension_features.cc
-@@ -172,4 +172,11 @@ BASE_FEATURE(kRuntimeOnMessageWebExtensionPolyfillSupport,
-              "RuntimeOnMessageWebExtensionPolyfillSupport",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -183,4 +183,11 @@ BASE_FEATURE(kEnableShouldShowPromotion, base::FEATURE_DISABLED_BY_DEFAULT);
+ BASE_FEATURE(kWebRequestPersistFilteredEvents,
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +CROMITE_FEATURE(kEnableExtensionAutoupdate,
 +                "EnableExtensionAutoupdate",
@@ -1216,9 +1216,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -287,6 +287,16 @@ BASE_DECLARE_FEATURE(kContentVerifyJobUseJobVersionForHashing);
- // during execution) the error is passed back to the sender.
- BASE_DECLARE_FEATURE(kRuntimeOnMessageWebExtensionPolyfillSupport);
+@@ -307,6 +307,16 @@ BASE_DECLARE_FEATURE(kWebRequestSecurityInfo);
+ // browser startup).
+ BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEvents);
  
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.

build/patches/Clear-CORS-Preflight-Cache-on-clearing-data.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc
 --- a/services/network/cors/preflight_cache.cc
 +++ b/services/network/cors/preflight_cache.cc
-@@ -204,6 +204,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
+@@ -197,6 +197,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
    MayPurge(max_entries, purge_unit);
  }
  
@@ -29,7 +29,7 @@ diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/pr
 diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/preflight_cache.h
 --- a/services/network/cors/preflight_cache.h
 +++ b/services/network/cors/preflight_cache.h
-@@ -78,6 +78,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
+@@ -75,6 +75,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
    // `max_entries` for testing.
    void MayPurgeForTesting(size_t max_entries, size_t purge_unit);
  
@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
 diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
 --- a/services/network/cors/preflight_controller.cc
 +++ b/services/network/cors/preflight_controller.cc
-@@ -752,6 +752,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -631,6 +631,10 @@ void PreflightController::ClearCorsPreflightCache(
    cache_.ClearCache(std::move(url_filter));
  }
  
@@ -55,9 +55,9 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co
 diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
 --- a/services/network/cors/preflight_controller.h
 +++ b/services/network/cors/preflight_controller.h
-@@ -151,6 +151,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
-           url_loader_network_service_observer,
-       const PreflightMode& preflight_mode);
+@@ -117,6 +117,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
+       mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
+           url_loader_network_service_observer);
  
 +  void ClearCache();
 +
@@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
 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
-@@ -1372,6 +1372,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1368,6 +1368,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
                                      base::Time end_time,
                                      mojom::ClearDataFilterPtr filter,
                                      ClearHttpCacheCallback callback) {

build/patches/Client-hints-overrides.patch

@@ -7,26 +7,61 @@ Use Google Chrome branding for client hints
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- components/embedder_support/user_agent_utils.cc   |  4 +---
- content/browser/client_hints/client_hints.cc      | 15 ++++++++++-----
- .../browser/loader/navigation_url_loader_impl.cc  |  5 +++++
- .../about_flags_cc/Client-hints-overrides.inc     |  9 +++++++++
- .../common/features_cc/Client-hints-overrides.inc |  1 +
- .../cpp/features_cc/Client-hints-overrides.inc    |  1 +
- net/http/http_network_transaction.cc              |  1 +
- services/network/public/cpp/client_hints.cc       |  1 +
- .../blink/common/client_hints/client_hints.cc     |  6 ++++--
- .../common/client_hints/enabled_client_hints.cc   |  6 ++++++
- .../blink/renderer/core/frame/navigator_ua.idl    |  4 +++-
- .../renderer/core/frame/navigator_ua_data.cc      |  1 +
- .../renderer/core/frame/navigator_ua_data.idl     |  5 ++++-
- .../renderer/core/loader/frame_fetch_context.cc   |  4 +++-
- .../platform/runtime_enabled_features.json5       |  8 ++++++--
- 15 files changed, 56 insertions(+), 15 deletions(-)
+ .../SupportLibWebViewChromiumFactory.java       |  2 +-
+ components/client_hints/browser/client_hints.cc |  5 +++--
+ components/embedder_support/user_agent_utils.cc |  5 ++---
+ content/browser/client_hints/client_hints.cc    | 17 +++++++++++++++--
+ .../about_flags_cc/Client-hints-overrides.inc   |  9 +++++++++
+ .../features_cc/Client-hints-overrides.inc      |  1 +
+ .../cpp/features_cc/Client-hints-overrides.inc  |  1 +
+ net/http/http_network_transaction.cc            |  1 +
+ services/network/public/cpp/client_hints.cc     |  2 +-
+ .../blink/common/client_hints/client_hints.cc   |  6 ++++--
+ .../common/client_hints/enabled_client_hints.cc |  8 ++++++++
+ .../blink/renderer/core/frame/navigator_ua.idl  |  4 +++-
+ .../renderer/core/frame/navigator_ua_data.cc    |  1 +
+ .../renderer/core/frame/navigator_ua_data.idl   |  5 ++++-
+ .../renderer/core/loader/frame_fetch_context.cc |  4 +++-
+ .../platform/runtime_enabled_features.json5     |  8 ++++++--
+ 16 files changed, 63 insertions(+), 16 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
  create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc
 
+diff --git a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
+--- a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
++++ b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
+@@ -95,7 +95,7 @@ public class SupportLibWebViewChromiumFactory implements WebViewProviderFactoryB
+                 Features.GET_COOKIE_INFO,
+                 Features.WEB_MESSAGE_ARRAY_BUFFER,
+                 Features.IMAGE_DRAG_DROP,
+-                Features.USER_AGENT_METADATA,
++                // Features.USER_AGENT_METADATA,
+                 Features.MULTI_PROFILE,
+                 Features.ATTRIBUTION_BEHAVIOR,
+                 Features.WEBVIEW_MEDIA_INTEGRITY_API_STATUS,
+diff --git a/components/client_hints/browser/client_hints.cc b/components/client_hints/browser/client_hints.cc
+--- a/components/client_hints/browser/client_hints.cc
++++ b/components/client_hints/browser/client_hints.cc
+@@ -35,7 +35,7 @@ ParseInitializeClientHintsStorage() {
+   auto results =
+       base::flat_map<url::Origin,
+                      std::vector<network::mojom::WebClientHintsType>>();
+-
++  if ((true)) return results;
+   std::string raw_client_hint_json =
+       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+           switches::kInitializeClientHintsStorage);
+@@ -200,7 +200,8 @@ void ClientHints::PersistClientHints(
+   // TODO(tbansal): crbug.com/735518. Disable updates to client hints settings
+   // when cookies are disabled for |primary_origin|.
+   content_settings::ContentSettingConstraints constraints;
+-  constraints.set_session_model(content_settings::mojom::SessionModel::DURABLE);
++  constraints.set_session_model(content_settings::mojom::SessionModel::USER_SESSION);
++  constraints.set_lifetime(base::Minutes(1));
+   settings_map_->SetWebsiteSettingDefaultScope(
+       primary_url, GURL(), ContentSettingsType::CLIENT_HINTS,
+       base::Value(std::move(client_hints_dictionary)), constraints);
 diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
 --- a/components/embedder_support/user_agent_utils.cc
 +++ b/components/embedder_support/user_agent_utils.cc
@@ -41,6 +76,14 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
  
    std::string brand_version =
        output_version_type == blink::UserAgentBrandVersionType::kFullVersion
+@@ -695,6 +693,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
+   }
+ 
+   // High entropy client hints.
++  if ((true)) return metadata;
+   metadata.brand_full_version_list =
+       GetUserAgentBrandFullVersionListInternal(std::nullopt);
+   metadata.full_version = std::string(version_info::GetVersionNumber());
 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
@@ -52,56 +95,38 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  #include "ui/display/display.h"
  #include "ui/display/screen.h"
  #include "url/origin.h"
-@@ -706,7 +707,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
-     // value, disable them. This overwrites previous decision from UI.
-     disable_due_to_custom_ua = !ua_metadata.has_value();
-   }
--
+@@ -602,10 +603,21 @@ bool IsClientHintEnabled(const ClientHintsExtendedData& data,
+ 
+ bool IsClientHintAllowed(const ClientHintsExtendedData& data,
+                          WebClientHintsType type) {
 +  if (!blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled())
-+    disable_due_to_custom_ua = true;
-   if (!disable_due_to_custom_ua) {
-     if (!ua_metadata.has_value())
-       ua_metadata = delegate->GetUserAgentMetadata();
-@@ -898,10 +900,12 @@ void AddRequestClientHintsHeaders(
-     AddEctHeader(headers, network_quality_tracker, url);
-   }
- 
--  UpdateNavigationRequestClientUaHeadersImpl(
--      delegate, is_ua_override_on, frame_tree_node,
--      ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data,
--      ftn_for_devtools_override);
-+  if (blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) {
-+    UpdateNavigationRequestClientUaHeadersImpl(
-+        delegate, is_ua_override_on, frame_tree_node,
-+        ClientUaHeaderCallType::kDuringCreation, headers, container_policy, data,
-+        ftn_for_devtools_override);
++    return false;
++
++  bool allowed = false;
++  if (type == WebClientHintsType::kUA ||
++      type == WebClientHintsType::kUAMobile ||
++      type == WebClientHintsType::kUAPlatform ||
++      type == WebClientHintsType::kUAModel ||
++      type == WebClientHintsType::kUAPlatformVersion) {
++    allowed = true;
 +  }
- 
-   if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
-     AddPrefersColorSchemeHeader(headers, frame_tree_node);
-@@ -989,6 +993,7 @@ ParseAndPersistAcceptCHForNavigation(
-     BrowserContext* context,
-     ClientHintsControllerDelegate* delegate,
-     FrameTreeNode* frame_tree_node) {
-+  if ((true)) return std::nullopt;
-   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-   DCHECK(context);
-   DCHECK(parsed_headers);
-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
-@@ -1744,6 +1744,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+   if (data.is_outermost_main_frame) {
+-    return true;
++    return allowed;
+   }
+-  return (data.permissions_policy->IsFeatureEnabledForOrigin(
++  return ((false)) && (data.permissions_policy->IsFeatureEnabledForOrigin(
+       network::GetClientHintToPolicyFeatureMap().at(type),
+       data.resource_origin));
+ }
+@@ -630,6 +642,7 @@ bool IsJavascriptEnabled(FrameTreeNode* frame_tree_node) {
+ void UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints(
+     ClientHintsExtendedData& data,
+     const network::ParsedPermissionsPolicy& container_policy) {
++  if ((true)) return;
+   if (container_policy.empty()) {
      return;
    }
- 
-+  if (!base::FeatureList::IsEnabled(network::features::kAcceptCHFrame)) {
-+    std::move(callback).Run(net::OK);
-+    return;
-+  }
-+
-   LogAcceptCHFrameStatus(AcceptCHFrameRestart::kFramePresent);
- 
-   // Given that this is happening in the middle of navigation, there should
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc b/cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
 new file mode 100644
 --- /dev/null
@@ -121,13 +146,13 @@ new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/content/common/features_cc/Client-hints-overrides.inc
 @@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kCriticalClientHint);
++SET_CROMITE_FEATURE_ENABLED(kCriticalClientHint);
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc
 @@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kAcceptCHFrame);
++SET_CROMITE_FEATURE_ENABLED(kAcceptCHFrame);
 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
 --- a/net/http/http_network_transaction.cc
 +++ b/net/http/http_network_transaction.cc
@@ -142,11 +167,12 @@ diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transa
 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
-@@ -112,6 +112,7 @@ const DecodeMap& GetDecodeMap() {
+@@ -111,7 +111,7 @@ const DecodeMap& GetDecodeMap() {
+ }  // namespace
  
  std::optional<std::vector<network::mojom::WebClientHintsType>>
- ParseClientHintsHeader(const std::string& header) {
-+  if ((true)) return std::nullopt;
+-ParseClientHintsHeader(const std::string& header) {
++ParseClientHintsHeader(const std::string& header) { // Parse Client Hints Header
    // Accept-CH is an sh-list of tokens; see:
    // https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-header-structure-19#section-3.1
    std::optional<net::structured_headers::List> maybe_list =
@@ -179,13 +205,15 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
 diff --git a/third_party/blink/common/client_hints/enabled_client_hints.cc b/third_party/blink/common/client_hints/enabled_client_hints.cc
 --- a/third_party/blink/common/client_hints/enabled_client_hints.cc
 +++ b/third_party/blink/common/client_hints/enabled_client_hints.cc
-@@ -15,6 +15,12 @@ namespace {
+@@ -15,6 +15,14 @@ namespace {
  using ::network::mojom::WebClientHintsType;
  
  bool IsDisabledByFeature(const WebClientHintsType type) {
 +  if (type == WebClientHintsType::kUA ||
 +        type == WebClientHintsType::kUAMobile ||
-+        type == WebClientHintsType::kUAPlatform) {
++        type == WebClientHintsType::kUAPlatform ||
++        type == WebClientHintsType::kUAModel ||
++        type == WebClientHintsType::kUAPlatformVersion) {
 +    return false;
 +  }
 +  if ((true)) return true;
@@ -208,7 +236,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const {
+@@ -114,6 +114,7 @@ const String& NavigatorUAData::platform() const {
  }
  
  bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
@@ -228,9 +256,9 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third
 +    RuntimeEnabled=UserAgentClientHint,
 +    Exposed=(Window,Worker)
 +] interface NavigatorUAData {
-   [HighEntropy, MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
-   [HighEntropy=Direct, MeasureAs=NavigatorUAData_Mobile]  readonly attribute boolean mobile;
-   [HighEntropy=Direct, MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
+   [MeasureAs=NavigatorUAData_Brands] readonly attribute FrozenArray<NavigatorUABrandVersion> brands;
+   [MeasureAs=NavigatorUAData_Mobile]  readonly attribute boolean mobile;
+   [MeasureAs=NavigatorUAData_Platform] readonly attribute DOMString platform;
 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
@@ -243,7 +271,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
    // For subresource requests, sending the hint in the fetch request based on
    // the permissions policy.
    if (!policy.IsFeatureEnabledForOrigin(
-@@ -713,7 +715,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -715,7 +717,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
    }
  
    // Only send User Agent hints if the info is available
@@ -255,7 +283,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 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
-@@ -569,6 +569,11 @@
+@@ -610,6 +610,11 @@
        name: "AriaNotifyV2",
        status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
      },
@@ -267,12 +295,12 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
      {
        name: "AriaRowColIndexText",
        status: "stable",
-@@ -976,8 +981,7 @@
+@@ -1016,8 +1021,7 @@
        // Allows top-level sites to restrict collection of high-entropy UA client
        // hints (from 3Ps, or itself) via the getHighEntropyValues API.
        // crbug.com/385161047
 -      name: "ClientHintUAHighEntropyValuesPermissionPolicy",
--      status: "test",
+-      status: "stable",
 +      name: "ClientHintUAHighEntropyValuesPermissionPolicy",  // disabled by default
      },
      {

build/patches/Close-Sessions-On-Ip-Change.patch

@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
 --- a/components/network_session_configurator/browser/network_session_configurator.cc
 +++ b/components/network_session_configurator/browser/network_session_configurator.cc
-@@ -222,9 +222,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
+@@ -221,9 +221,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
  
  bool ShouldQuicCloseSessionsOnIpChange(
      const VariationParameters& quic_trial_params) {
@@ -34,7 +34,7 @@ diff --git a/components/network_session_configurator/browser/network_session_con
  }
  
  bool ShouldQuicGoAwaySessionsOnIpChange(
-@@ -305,11 +304,8 @@ bool ShouldQuicEstimateInitialRtt(
+@@ -304,11 +303,8 @@ bool ShouldQuicEstimateInitialRtt(
  
  bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
      const VariationParameters& quic_trial_params) {
@@ -88,7 +88,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -509,7 +509,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -443,7 +443,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
  // NetworkChangeNotifier::AreNetworkHandlesSupported).
  #if BUILDFLAG(IS_ANDROID)
  inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =

build/patches/Compress-libchrome-to-free-up-some-space.patch

@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -677,6 +677,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -674,6 +674,7 @@ template("chrome_common_apk_or_module_tmpl") {
            [ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
        loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
        library_always_compress += [ "libchrome_crashpad_handler.so" ]

build/patches/Cromite-Branding--improve-settings-ui.patch

@@ -8,17 +8,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/android/chrome_java_resources.gni      |   2 +-
  .../android/java/res/xml/main_preferences.xml |   4 +-
- .../res/xml/privacy_preferences_cromite.xml   | 197 ++++++++++++++++++
+ .../res/xml/privacy_preferences_cromite.xml   | 191 ++++++++++++++++++
  .../privacy/settings/PrivacySettings.java     |   6 +-
  .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 219 insertions(+), 5 deletions(-)
+ 5 files changed, 213 insertions(+), 5 deletions(-)
  create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
 
 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
-@@ -652,7 +652,7 @@ chrome_java_resources = [
+@@ -683,7 +683,7 @@ chrome_java_resources = [
    "java/res/xml/manage_sync_preferences.xml",
    "java/res/xml/personalize_google_services_preferences.xml",
    "java/res/xml/incognito_preferences.xml",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
-@@ -0,0 +1,197 @@
+@@ -0,0 +1,191 @@
 +<?xml version="1.0" encoding="utf-8"?><!--
 +Copyright 2022 The Chromium Authors
 +Use of this source code is governed by a BSD-style license that can be
@@ -223,12 +223,6 @@ new file mode 100644
 +        android:fragment="org.chromium.components.privacy_sandbox.TrackingProtectionSettings"
 +        app:isPreferenceVisible="false" />
 +    <Preference
-+        android:key="incognito_tracking_protections"
-+        android:title="@string/incognito_tracking_protections_link_row_label"
-+        android:summary="@string/incognito_tracking_protections_link_row_sublabel"
-+        android:fragment="org.chromium.components.privacy_sandbox.IncognitoTrackingProtectionsFragment"
-+        app:isPreferenceVisible="false" />
-+    <Preference
 +        android:key="privacy_sandbox"
 +        android:title="@string/ad_privacy_link_row_label"
 +        android:summary="@string/ad_privacy_link_row_sub_label"
@@ -253,16 +247,16 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -189,7 +189,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
  
 -        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
  
-         Preference incognitoTrackingProtectionsPreference =
-                 findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
-@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+         Preference sandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
+         // Overwrite the click listener to pass a correct referrer to the fragment.
+@@ -282,7 +282,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
  
          ChromeSwitchPreference passwordLeakTogglePref =
                  (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);

build/patches/Cromite-Branding.patch

@@ -26,10 +26,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../mipmap-xxxhdpi/layered_app_icon.png       | Bin 3652 -> 29220 bytes
  .../layered_app_icon_background.png           | Bin 3519 -> 142032 bytes
  .../values/channel_constants.xml              |   8 +-
+ .../about_settings/AboutChromeSettings.java   |   4 +-
  .../ChromeContextMenuPopulator.java           |   2 +-
  .../browser/fullscreen/FullscreenToast.java   |   2 +-
  .../inline/BromiteInlineUpdateController.java |  19 +++-
- .../tabbed_mode/TabbedRootUiCoordinator.java  |   2 +-
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |   4 +-
  chrome/app/extensions_strings.grdp            |   4 +-
  chrome/app/settings_strings.grdp              |   2 +-
  chrome/app/theme/chromium/BRANDING            |   8 +-
@@ -38,7 +39,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../theme/chromium/win/tiles/SmallLogo.png    | Bin 9784 -> 12363 bytes
  .../chromium/product_logo_32.png              | Bin 822 -> 2301 bytes
  chrome/browser/BUILD.gn                       |   1 +
- .../browser/flags/ChromeFeatureList.java      |   2 +-
  .../browser/hub/HubToolbarMediator.java       |   2 +-
  .../android/res/layout/hub_toolbar_layout.xml |  82 ++++++++-------
  .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
@@ -47,7 +47,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../profiles/profile_shortcut_manager_win.cc  |   2 +-
  .../settings/settings_menu/settings_menu.html |  14 ++-
  .../OmniboxSuggestionsContainer.java          |   8 +-
- .../strings/android_chrome_strings.grd        |   2 +-
+ .../strings/android_chrome_strings.grd        |   4 +-
  .../toolbar/chrome_labs/chrome_labs_utils.cc  |   1 +
  chrome/common/url_constants.h                 |   4 +-
  .../install_static/chromium_install_modes.cc  |   2 +-
@@ -59,6 +59,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../drawable-xxxhdpi/fre_product_logo.png     | Bin 10740 -> 93273 bytes
  .../browser/autocomplete_controller.cc        |   1 +
  .../vector_icons/product_chrome_refresh.icon  |  93 +++++++++---------
+ components/policy/core/common/policy_paths.cc |   2 +-
  .../chromium/product_logo.png                 | Bin 1562 -> 3577 bytes
  .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
  .../chromium/product_logo.png                 | Bin 2714 -> 7923 bytes
@@ -68,7 +69,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  content/child/runtime_features.cc             |  44 ++++-----
  .../Cromite-Branding.inc                      |   2 +
  tools/grit/grit/grd_reader.py                 |  35 +++++++
- 64 files changed, 260 insertions(+), 172 deletions(-)
+ 65 files changed, 265 insertions(+), 175 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
 
 diff --git a/build/BUILD.gn b/build/BUILD.gn
@@ -92,7 +93,7 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -187,6 +187,10 @@ declare_args() {
+@@ -184,6 +184,10 @@ declare_args() {
    clang_warning_suppression_file = ""
  }
  
@@ -106,7 +107,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 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
-@@ -189,7 +189,7 @@ by a child template that "extends" this file.
+@@ -200,7 +200,7 @@ by a child template that "extends" this file.
        <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
          android:icon="@drawable/ic_launcher"
          android:roundIcon="@drawable/ic_launcher_round"
@@ -9144,10 +9145,24 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml
 +    <string name="search_widget_title" translatable="false">Cromite search</string>
 +    <string name="quick_action_search_widget_title" translatable="false">Cromite quick action search</string>
  </resources>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+@@ -82,7 +82,9 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+         p.setSummary(AboutSettingsBridge.getOSVersion());
+         p = findPreference(PREF_LEGAL_INFORMATION);
+         assumeNonNull(p);
+-        int currentYear = CalendarFactory.get().get(Calendar.YEAR);
++        Calendar calendar = CalendarFactory.get();
++        calendar.setTimeInMillis(System.currentTimeMillis());
++        int currentYear = calendar.get(Calendar.YEAR);
+         p.setSummary(getString(R.string.legal_information_summary, currentYear));
+ 
+         ChromeSwitchPreference allowInlineUpdate =
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -459,8 +459,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -481,8 +481,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                      && !isEmptyUrl(mParams.getUrl())
                      && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
                  if (mMode == ContextMenuMode.NORMAL) {
@@ -9215,7 +9230,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 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
-@@ -875,7 +875,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -909,12 +909,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+                                 if (tab.canGoBack()) {
+                                     return ActionType.NAVIGATE_BACK;
+                                 }
+-                                if (TabAssociatedApp.isOpenedFromExternalApp(tab)) {
++                                if (TabAssociatedApp.isOpenedFromExternalApp(tab) && tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP) {
+                                     return ActionType.EXIT_APP;
                                  }
                                  return mBackButtonShouldCloseTabFn.apply(tab)
                                          ? ActionType.CLOSE_TAB
@@ -13202,7 +13223,7 @@ e)fqMZZ`3a)Ds&5H<cfp<0000<MNUMnLSTYHt&Yn8
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1872,6 +1872,7 @@ static_library("browser") {
+@@ -1825,6 +1825,7 @@ static_library("browser") {
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
      "//build/config/linux/dbus:buildflags",
@@ -13210,22 +13231,10 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "//cc",
      "//chrome:extra_resources",
      "//chrome:resources",
-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
-@@ -968,7 +968,7 @@ public abstract class ChromeFeatureList {
-                     /* defaultValue= */ false,
-                     /* defaultValueInTests= */ false);
-     public static final CachedFlag sGridTabSwitcherUpdate =
--            newCachedFlag(GRID_TAB_SWITCHER_UPDATE, false, /* defaultValueInTests= */ true);
-+            newCachedFlag(GRID_TAB_SWITCHER_UPDATE, true, /* defaultValueInTests= */ true);
-     public static final CachedFlag sHistoryPaneAndroid =
-             newCachedFlag(
-                     HISTORY_PANE_ANDROID,
 diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
 --- a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
 +++ b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
-@@ -82,7 +82,7 @@ public class HubToolbarMediator {
+@@ -83,7 +83,7 @@ public class HubToolbarMediator {
                  @Override
                  public void onConfigurationChanged(Configuration configuration) {
                      int screenWidthDp = configuration.screenWidthDp;
@@ -13369,7 +13378,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -289,10 +290,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
      const base::FilePath& profile_path) {
    std::string seed;
    CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13384,7 +13393,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
-@@ -78,7 +78,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
+@@ -79,7 +79,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
  // Incrementing this number will cause profile icons to be regenerated on
  // profile startup (it should be incremented whenever the product/avatar icons
  // change, etc).
@@ -13415,7 +13424,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
        #menu {
          color: var(--google-grey-700);
          display: flex;
-@@ -176,7 +188,7 @@
+@@ -177,7 +189,7 @@
          </a>
          <a role="menuitem" id="about-menu" href="/help"
              class="cr-nav-menu-item">
@@ -13427,15 +13436,15 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsContainer.java
-@@ -34,6 +34,7 @@ import org.chromium.components.omnibox.OmniboxFeatures;
- import org.chromium.ui.KeyboardVisibilityDelegate;
- import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.base.ViewUtils;
-+import org.chromium.ui.KeyboardUtils;
- 
- import java.util.Optional;
- 
-@@ -104,8 +105,11 @@ public class OmniboxSuggestionsContainer extends FrameLayout {
+@@ -24,6 +24,7 @@ import org.chromium.base.TraceEvent;
+ import org.chromium.base.metrics.TimingMetric;
+ import org.chromium.base.task.PostTask;
+ import org.chromium.base.task.TaskTraits;
++import org.chromium.base.ui.KeyboardUtils;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.chrome.browser.omnibox.OmniboxMetrics;
+ import org.chromium.chrome.browser.omnibox.R;
+@@ -111,8 +112,11 @@ public class OmniboxSuggestionsContainer extends FrameLayout {
          // Omnibox.
          // Making the container `clickable=true` achieves similar goal, but this consumes all
          // activators, including keyboard <Enter> key.
@@ -13452,7 +13461,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -2344,7 +2344,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2380,7 +2380,7 @@ Your Google account may have other forms of browsing history like searches and a
          About Chrome
        </message>
        <message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
@@ -13461,6 +13470,15 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
          Application version
+@@ -5845,7 +5845,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+ 
+       <!-- Storage Preference UI strings for clearing storage. -->
+       <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity.">
+-         Google <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> storage
++         <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> storage
+       </message>
+       <message name="IDS_STORAGE_MANAGEMENT_UNIMPORTANT_SITE_DATA_DESCRIPTION" desc="Text to describe the data stored by unimportant or infrequent sites.">
+         Stored data that Chrome doesn't think is important (e.g. sites with no saved settings or that you don't visit often)
 diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
@@ -13508,7 +13526,7 @@ diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_st
 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
-@@ -1014,7 +1014,7 @@
+@@ -1020,7 +1020,7 @@
  
        <!-- Accessibility preferences -->
        <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR_LIMIT=32]">
@@ -18416,7 +18434,7 @@ i?Ib$(ofrX17!1R|`h|N%TnD<%35@j2bgPM^i2nno*_EOI
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -1136,6 +1136,7 @@ bool AutocompleteController::ShouldRunProvider(
+@@ -1106,6 +1106,7 @@ bool AutocompleteController::ShouldRunProvider(
  
  #if BUILDFLAG(IS_ANDROID)
    if (omnibox::IsAndroidHub(input_.current_page_classification())) {
@@ -18525,6 +18543,18 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 +CLOSE,
 +MOVE_TO, 11.2f, 8,
  CLOSE
+diff --git a/components/policy/core/common/policy_paths.cc b/components/policy/core/common/policy_paths.cc
+--- a/components/policy/core/common/policy_paths.cc
++++ b/components/policy/core/common/policy_paths.cc
+@@ -18,7 +18,7 @@ const char kPolicyPath[] = "/etc/opt/chrome/policies";
+ #elif BUILDFLAG(GOOGLE_CHROME_FOR_TESTING_BRANDING)
+ const char kPolicyPath[] = "/etc/opt/chrome_for_testing/policies";
+ #else
+-const char kPolicyPath[] = "/etc/chromium/policies";
++const char kPolicyPath[] = "/etc/cromite/policies";
+ #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
+ 
 diff --git a/components/resources/default_100_percent/chromium/product_logo.png b/components/resources/default_100_percent/chromium/product_logo.png
 index 7b60bd8c6053346e4eb265cc77d28add65103028..66b3c4c7a4f68fba1ef098000bd373ba103a0de0 100644
 GIT binary patch
@@ -19165,7 +19195,7 @@ diff --git a/components/webui/version/resources/about_version_mobile.css b/compo
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -571,19 +571,22 @@ void ResolveInvalidConfigurations() {
+@@ -573,19 +573,22 @@ void ResolveInvalidConfigurations() {
         base::FeatureList::IsEnabled(
             features::kPrivacySandboxAdsAPIsM1Override)) &&
        !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -19192,7 +19222,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "Fenced frames must be enabled in order to enable local "
             "unpartitioned "
          << "data access. Use --" << switches::kEnableFeatures << "="
-@@ -591,12 +594,14 @@ void ResolveInvalidConfigurations() {
+@@ -593,12 +596,14 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableFeatureFromString(
          "FencedFramesLocalUnpartitionedDataAccess", false);
    }
@@ -19208,7 +19238,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "Topics cannot be enabled in this configuration. Use --"
          << switches::kEnableFeatures << "="
          << network::features::kBrowsingTopics.name << " in addition.";
-@@ -604,30 +609,23 @@ void ResolveInvalidConfigurations() {
+@@ -606,30 +611,23 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
      WebRuntimeFeatures::EnableTopicsImgAPI(false);
    } else {
@@ -19245,7 +19275,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "AttributionReporting cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -635,23 +633,25 @@ void ResolveInvalidConfigurations() {
+@@ -637,23 +635,25 @@ void ResolveInvalidConfigurations() {
          << " in addition.";
      WebRuntimeFeatures::EnableAttributionReporting(false);
    }

build/patches/Customize-selection-popup.patch

@@ -7,19 +7,63 @@ Opens tabs in foreground,  Move web search to the top of items,
 Web search in tab group and Enable smart text selection
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../browser/ChromeActionModeHandler.java      |   4 +-
- .../chrome/browser/ChromeTabbedActivity.java  |  15 +-
- ...ActivityTabWebContentsDelegateAndroid.java |  10 +-
- .../compositor/layouts/LayoutManagerImpl.java |   8 ++
- .../tab/TabContextMenuItemDelegate.java       |   7 +-
- .../chrome/browser/ui/RootUiCoordinator.java  |   8 +-
- .../Customize-selection-popup.grdp            |  34 +++++
- .../res/xml/accessibility_preferences.xml     |  24 ++++
- .../selection/SelectActionMenuHelper.java     | 129 ++++++++++++------
- .../selection/SmartSelectionClient.java       |   4 +
- 10 files changed, 192 insertions(+), 51 deletions(-)
+ .../SamsungSelectionActionMenuDelegate.java   |  7 +-
+ .../browser/ChromeActionModeHandler.java      |  4 +-
+ .../chrome/browser/ChromeTabbedActivity.java  | 15 +++-
+ ...ActivityTabWebContentsDelegateAndroid.java | 10 ++-
+ .../compositor/layouts/LayoutManagerImpl.java |  8 ++
+ .../tab/TabContextMenuItemDelegate.java       |  7 +-
+ .../chrome/browser/ui/RootUiCoordinator.java  |  8 +-
+ .../Customize-selection-popup.grdp            | 34 +++++++++
+ .../AutofillSelectionMenuItemHelper.java      |  4 +-
+ .../res/xml/accessibility_preferences.xml     | 24 ++++++
+ .../selection/SelectActionMenuHelper.java     | 20 ++---
+ .../SelectionPopupControllerImpl.java         |  2 +-
+ .../selection/SmartSelectionClient.java       |  4 +
+ .../browser/PendingSelectionMenu.java         |  8 +-
+ .../browser/SelectionMenuItem.java            | 73 ++++++++++++-------
+ .../SelectionActionMenuDelegate.java          | 32 +++++---
+ 16 files changed, 194 insertions(+), 66 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp
 
+diff --git a/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java b/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java
+--- a/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java
++++ b/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java
+@@ -134,7 +134,7 @@ public class SamsungSelectionActionMenuDelegate extends AutofillSelectionActionM
+                             .setIcon(null)
+                             .setOrderAndCategory(
+                                     Menu.CATEGORY_SECONDARY,
+-                                    SelectionMenuItem.ItemGroupOffset.TEXT_PROCESSING_ITEMS)
++                                    SelectionMenuItem.ItemGroupOffset.TEXT_PROCESSING_ITEMS())
+                             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                             .setIntent(createManageAppsIntent())
+                             .build());
+@@ -167,7 +167,7 @@ public class SamsungSelectionActionMenuDelegate extends AutofillSelectionActionM
+                             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                             .setOrderAndCategory(
+                                     DefaultItem.PASTE, // Show after paste.
+-                                    SelectionMenuItem.ItemGroupOffset.DEFAULT_ITEMS)
++                                    SelectionMenuItem.ItemGroupOffset.DEFAULT_ITEMS())
+                             .setIntent(
+                                     getTranslationActionIntent(selectedText, translateResolveInfo))
+                             .build());
+@@ -180,7 +180,7 @@ public class SamsungSelectionActionMenuDelegate extends AutofillSelectionActionM
+                             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                             .setOrderAndCategory(
+                                     Menu.FIRST, // Show as first item after primary assist item.
+-                                    SelectionMenuItem.ItemGroupOffset.ASSIST_ITEMS)
++                                    SelectionMenuItem.ItemGroupOffset.ASSIST_ITEMS())
+                             .setIntent(
+                                     createWritingToolkitIntent(selectedText, isSelectionReadOnly))
+                             .build());
+@@ -239,6 +239,7 @@ public class SamsungSelectionActionMenuDelegate extends AutofillSelectionActionM
+     }
+ 
+     public static boolean shouldUseSamsungMenuItemOrdering() {
++        if ((true)) return false;
+         return Build.VERSION.SDK_INT <= MAXIMUM_BUILD_VERSION_CODE_SUPPORTED && isSamsungDevice();
+     }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
@@ -37,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
 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
-@@ -915,10 +915,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -897,10 +897,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
@@ -62,7 +106,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/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-@@ -249,6 +249,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -250,6 +250,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
          // Skip opening a new Tab if it doesn't make sense.
          if (mTab.isClosing()) return false;
  
@@ -77,7 +121,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
          WindowAndroid window = mTab.getWindowAndroid();
          boolean openingPopup =
                  window != null
-@@ -279,7 +287,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -294,7 +302,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
                          mTab,
                          /* shouldPin= */ false,
                          webContents,
@@ -114,7 +158,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/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -390,8 +390,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -430,8 +430,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
      public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
          loadUrlParams.setReferrer(referrer);
@@ -132,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -30,6 +30,7 @@ import androidx.core.view.WindowInsetsCompat;
+@@ -33,6 +33,7 @@ import androidx.core.view.WindowInsetsCompat;
  import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
  import org.chromium.base.DeviceInfo;
@@ -140,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.base.TraceEvent;
  import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -910,11 +911,16 @@ public class RootUiCoordinator
+@@ -1021,11 +1022,16 @@ public class RootUiCoordinator
                      TrackerFactory.getTrackerForProfile(tab.getProfile())
                              .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  
@@ -197,10 +241,31 @@ new file mode 100644
 +        Smart Text selection automatically augments the selected boundaries and classifies the selected text based on the context by sending selection together with its surrounding text
 +    </message>
 +</grit-part>
+diff --git a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillSelectionMenuItemHelper.java b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillSelectionMenuItemHelper.java
+--- a/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillSelectionMenuItemHelper.java
++++ b/components/android_autofill/browser/java/src/org/chromium/components/autofill/AutofillSelectionMenuItemHelper.java
+@@ -39,7 +39,7 @@ public class AutofillSelectionMenuItemHelper {
+                             .setGroupId(R.id.select_action_menu_delegate_items)
+                             .setOrderAndCategory(
+                                     Menu.FIRST,
+-                                    SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS)
++                                    SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS())
+                             .setShowAsActionFlags(
+                                     MenuItem.SHOW_AS_ACTION_ALWAYS
+                                             | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+@@ -52,7 +52,7 @@ public class AutofillSelectionMenuItemHelper {
+                             .setGroupId(R.id.select_action_menu_delegate_items)
+                             .setOrderAndCategory(
+                                     Menu.CATEGORY_SECONDARY, // Show at end of section.
+-                                    SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS)
++                                    SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS())
+                             .setShowAsActionFlags(
+                                     MenuItem.SHOW_AS_ACTION_NEVER
+                                             | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -74,4 +74,28 @@ found in the LICENSE file.
+@@ -84,4 +84,28 @@ found in the LICENSE file.
          android:key="disable_toolbar_swipeup"
          android:title="@string/disable_toolbar_swipe_up" />
  
@@ -232,31 +297,178 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
- import org.chromium.base.ApiCompatibilityUtils;
- import org.chromium.base.ContextUtils;
- import org.chromium.base.Log;
-+import org.chromium.base.ContextUtils;
- import org.chromium.base.PackageManagerUtils;
- import org.chromium.base.StrictModeContext;
- import org.chromium.build.annotations.NullMarked;
-@@ -53,38 +54,84 @@ import java.util.TreeSet;
- public class SelectActionMenuHelper {
-     private static final String TAG = "SelectActionMenu"; // 20 char limit.
+@@ -169,7 +169,7 @@ public class SelectActionMenuHelper {
+         return new SelectionMenuItem.Builder(primaryAction.getTitle())
+                 .setId(android.R.id.textAssist)
+                 .setGroupId(R.id.select_action_menu_assist_items)
+-                .setOrderAndCategory(0, ItemGroupOffset.ASSIST_ITEMS)
++                .setOrderAndCategory(0, ItemGroupOffset.ASSIST_ITEMS())
+                 .setIcon(getPrimaryActionIconForClassificationResult(classificationResult, context))
+                 .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                 .build();
+@@ -247,7 +247,7 @@ public class SelectActionMenuHelper {
+                             .setGroupId(groupId)
+                             .setIcon(icons == null ? null : icons.get(i))
+                             .setOrderAndCategory(
+-                                    i - startIndex, ItemGroupOffset.SECONDARY_ASSIST_ITEMS)
++                                    i - startIndex, ItemGroupOffset.SECONDARY_ASSIST_ITEMS())
+                             .setContentDescription(action.getContentDescription())
+                             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                             .build();
+@@ -296,7 +296,7 @@ public class SelectActionMenuHelper {
+                             .setId(Menu.NONE)
+                             .setGroupId(R.id.select_action_menu_text_processing_items)
+                             .setIcon(icon)
+-                            .setOrderAndCategory(i, ItemGroupOffset.TEXT_PROCESSING_ITEMS)
++                            .setOrderAndCategory(i, ItemGroupOffset.TEXT_PROCESSING_ITEMS())
+                             .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+                             .setIntent(intent)
+                             .build());
+@@ -341,7 +341,7 @@ public class SelectActionMenuHelper {
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModeCutDrawable)
+                 .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+@@ -355,7 +355,7 @@ public class SelectActionMenuHelper {
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModeCopyDrawable)
+                 .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+@@ -369,7 +369,7 @@ public class SelectActionMenuHelper {
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModePasteDrawable)
+                 .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+@@ -385,7 +385,7 @@ public class SelectActionMenuHelper {
+                 .setId(R.id.select_action_menu_share)
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModeShareDrawable)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+@@ -399,7 +399,7 @@ public class SelectActionMenuHelper {
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
+                 .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+@@ -412,7 +412,7 @@ public class SelectActionMenuHelper {
+                 new SelectionMenuItem.Builder(android.R.string.paste_as_plain_text)
+                         .setId(R.id.select_action_menu_paste_as_plain_text)
+                         .setGroupId(R.id.select_action_menu_default_items)
+-                        .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                        .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                         .setShowAsActionFlags(
+                                 MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                         .setIsEnabled(true);
+@@ -432,7 +432,7 @@ public class SelectActionMenuHelper {
+                 .setId(R.id.select_action_menu_web_search)
+                 .setGroupId(R.id.select_action_menu_default_items)
+                 .setIconAttr(android.R.attr.actionModeWebSearchDrawable)
+-                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
++                .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
+                 .setShowAsActionFlags(
+                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
+                 .setIsEnabled(true)
+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
+@@ -1114,7 +1114,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
  
+     private boolean handleAssistMenuItemClick(int order) {
+         // Primary assist action is always the first action in the list so offset by 1.
+-        int index = 1 + order - SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS;
++        int index = 1 + order - SelectionMenuItem.ItemGroupOffset.SECONDARY_ASSIST_ITEMS();
+         if (mClassificationResult == null
+                 || mClassificationResult.textClassification == null
+                 || mClassificationResult.textClassification.getActions().size() <= index) {
+diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
+--- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
++++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
+@@ -18,6 +18,7 @@ import org.jni_zero.CalledByNative;
+ import org.jni_zero.JNINamespace;
+ import org.jni_zero.NativeMethods;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.UserData;
+ import org.chromium.build.annotations.Initializer;
+@@ -84,6 +85,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
+             return null;
+         }
+ 
++        if (!ContextUtils.getAppSharedPreferences().getBoolean(
++                "selection_popup_smart_text", false)) return null;
++
+         SmartSelectionClient client =
+                 assumeNonNull(
+                         webContents.getOrSetUserData(
+diff --git a/content/public/android/java/src/org/chromium/content_public/browser/PendingSelectionMenu.java b/content/public/android/java/src/org/chromium/content_public/browser/PendingSelectionMenu.java
+--- a/content/public/android/java/src/org/chromium/content_public/browser/PendingSelectionMenu.java
++++ b/content/public/android/java/src/org/chromium/content_public/browser/PendingSelectionMenu.java
+@@ -165,13 +165,13 @@ public final class PendingSelectionMenu {
+     @VisibleForTesting
+     public @LogicalGroup int determineGroup(SelectionMenuItem item) {
+         int order = item.order;
+-        if (order >= ItemGroupOffset.TEXT_PROCESSING_ITEMS) {
++        if (order >= ItemGroupOffset.TEXT_PROCESSING_ITEMS()) {
+             return LogicalGroup.TEXT_PROCESSING_ITEMS;
+-        } else if (order >= ItemGroupOffset.SECONDARY_ASSIST_ITEMS) {
++        } else if (order >= ItemGroupOffset.SECONDARY_ASSIST_ITEMS()) {
+             return LogicalGroup.SECONDARY_ASSIST_ITEMS;
+-        } else if (order >= ItemGroupOffset.DEFAULT_ITEMS) {
++        } else if (order >= ItemGroupOffset.DEFAULT_ITEMS()) {
+             return LogicalGroup.DEFAULT_ITEMS;
+-        } else if (order >= ItemGroupOffset.ASSIST_ITEMS) {
++        } else if (order >= ItemGroupOffset.ASSIST_ITEMS()) {
+             return LogicalGroup.ASSIST_ITEMS;
+         }
+         throw new IllegalStateException("Invalid order. Must be >= 0");
+diff --git a/content/public/android/java/src/org/chromium/content_public/browser/SelectionMenuItem.java b/content/public/android/java/src/org/chromium/content_public/browser/SelectionMenuItem.java
+--- a/content/public/android/java/src/org/chromium/content_public/browser/SelectionMenuItem.java
++++ b/content/public/android/java/src/org/chromium/content_public/browser/SelectionMenuItem.java
+@@ -18,6 +18,7 @@ import androidx.annotation.IntDef;
+ import androidx.annotation.StringRes;
+ import androidx.appcompat.content.res.AppCompatResources;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ 
+@@ -34,18 +35,38 @@ public final class SelectionMenuItem implements Comparable<SelectionMenuItem> {
+      * less than SECONDARY_ASSIST_ITEMS will appear in the default items section. Each section is
+      * separated by a divider in dropdown menus.
+      */
 -    @Retention(RetentionPolicy.SOURCE)
 -    @IntDef({
--        GroupItemOrder.ASSIST_ITEMS,
--        GroupItemOrder.DEFAULT_ITEMS,
--        GroupItemOrder.SECONDARY_ASSIST_ITEMS,
--        GroupItemOrder.TEXT_PROCESSING_ITEMS
+-        ItemGroupOffset.ASSIST_ITEMS,
+-        ItemGroupOffset.DEFAULT_ITEMS,
+-        ItemGroupOffset.SECONDARY_ASSIST_ITEMS,
+-        ItemGroupOffset.TEXT_PROCESSING_ITEMS
 -    })
--    public @interface GroupItemOrder {
--        int ASSIST_ITEMS = 1;
--        int DEFAULT_ITEMS = 2;
--        int SECONDARY_ASSIST_ITEMS = 3;
--        int TEXT_PROCESSING_ITEMS = 4;
-+    private static class GroupItemOrderChromium {
+-    public @interface ItemGroupOffset {
+-        int ASSIST_ITEMS = 0;
+-        int DEFAULT_ITEMS = 10;
+-        int SECONDARY_ASSIST_ITEMS = 20;
+-        int TEXT_PROCESSING_ITEMS = 30;
++    public static class ItemGroupOffset {
 +        static int CHROMIUM_ASSIST_ITEMS = 1;
 +        static int CHROMIUM_DEFAULT_ITEMS = 2;
 +        static int CHROMIUM_SECONDARY_ASSIST_ITEMS = 3;
@@ -290,189 +502,93 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 +        }
      }
  
--    @Retention(RetentionPolicy.SOURCE)
--    @IntDef({
--        DefaultItemOrder.CUT,
--        DefaultItemOrder.COPY,
--        DefaultItemOrder.PASTE,
--        DefaultItemOrder.PASTE_AS_PLAIN_TEXT,
--        DefaultItemOrder.SHARE,
--        DefaultItemOrder.SELECT_ALL,
--        DefaultItemOrder.WEB_SEARCH
--    })
--    public @interface DefaultItemOrder {
--        int CUT = 1;
--        int COPY = 2;
--        int PASTE = 3;
--        int PASTE_AS_PLAIN_TEXT = 4;
--        int SHARE = 5;
--        int SELECT_ALL = 6;
--        int WEB_SEARCH = 7;
-+    private static class DefaultItemOrderChromium {
-+        static int CHROMIUM_CUT = 1;
-+        static int CHROMIUM_COPY = 2;
-+        static int CHROMIUM_PASTE = 3;
-+        static int CHROMIUM_SHARE = 4;
-+        static int CHROMIUM_SELECT_ALL = 5;
-+        static int CHROMIUM_PASTE_AS_PLAIN_TEXT = 6;
-+        static int CHROMIUM_WEB_SEARCH = 7;
-+
-+        static int CROMITE_WEB_SEARCH = 1;
-+        static int CROMITE_CUT = 2;
-+        static int CROMITE_COPY = 3;
-+        static int CROMITE_PASTE = 4;
-+        static int CROMITE_SHARE = 5;
-+        static int CROMITE_SELECT_ALL = 6;
-+        static int CROMITE_PASTE_AS_PLAIN_TEXT = 7;
-+
-+        private static int GetValue(int a, int b) {
-+            return !ContextUtils.getAppSharedPreferences().getBoolean(
-+                "selection_popup_web_search_to_top", false)
-+                ? a : b;
-+        }
-+
-+        public static int CUT() {
-+            return GetValue(CHROMIUM_CUT, CROMITE_CUT);
-+        }
-+        public static int COPY() {
-+            return GetValue(CHROMIUM_COPY, CROMITE_COPY);
-+        }
-+        public static int PASTE() {
-+            return GetValue(CHROMIUM_PASTE, CROMITE_PASTE);
-+        }
-+        public static int SHARE() {
-+            return GetValue(CHROMIUM_SHARE, CROMITE_SHARE);
-+        }
-+        public static int SELECT_ALL() {
-+            return GetValue(CHROMIUM_SELECT_ALL, CROMITE_SELECT_ALL);
-+        }
-+        public static int PASTE_AS_PLAIN_TEXT() {
-+            return GetValue(CHROMIUM_PASTE_AS_PLAIN_TEXT, CROMITE_PASTE_AS_PLAIN_TEXT);
-+        }
-+        public static int WEB_SEARCH() {
-+            return GetValue(CHROMIUM_WEB_SEARCH, CROMITE_WEB_SEARCH);
+     private final @AttrRes int mIconAttr;
+@@ -210,25 +231,23 @@ public final class SelectionMenuItem implements Comparable<SelectionMenuItem> {
+          * @param order the order, must be >= 0.
+          * @param category the section of the menu in which this item should appear.
+          */
+-        public Builder setOrderAndCategory(int order, @ItemGroupOffset int category) {
++        public Builder setOrderAndCategory(int order, int category) {
+             if (order < 0) {
+                 throw new IllegalArgumentException("Invalid order. Must be >= 0");
+             }
+             // Make sure items don't spill over into the next category.
+-            mOrder =
+-                    switch (category) {
+-                        case ItemGroupOffset.ASSIST_ITEMS ->
+-                                Math.min(order + category, ItemGroupOffset.DEFAULT_ITEMS - 1);
+-                        case ItemGroupOffset.DEFAULT_ITEMS ->
+-                                Math.min(
+-                                        order + category,
+-                                        ItemGroupOffset.SECONDARY_ASSIST_ITEMS - 1);
+-                        case ItemGroupOffset.SECONDARY_ASSIST_ITEMS ->
+-                                Math.min(
+-                                        order + category,
+-                                        ItemGroupOffset.TEXT_PROCESSING_ITEMS - 1);
+-                        default -> order + category;
+-                    };
++            if (category == ItemGroupOffset.ASSIST_ITEMS())
++                mOrder = Math.min(order + category, ItemGroupOffset.DEFAULT_ITEMS() - 1);
++            else if (category == ItemGroupOffset.DEFAULT_ITEMS())
++                mOrder = Math.min(
++                        order + category,
++                        ItemGroupOffset.SECONDARY_ASSIST_ITEMS() - 1);
++            else if (category == ItemGroupOffset.SECONDARY_ASSIST_ITEMS())
++                mOrder = Math.min(
++                        order + category,
++                        ItemGroupOffset.TEXT_PROCESSING_ITEMS() - 1);
++            else
++                mOrder = order + category;
+             return this;
+         }
+ 
+diff --git a/content/public/android/java/src/org/chromium/content_public/browser/selection/SelectionActionMenuDelegate.java b/content/public/android/java/src/org/chromium/content_public/browser/selection/SelectionActionMenuDelegate.java
+--- a/content/public/android/java/src/org/chromium/content_public/browser/selection/SelectionActionMenuDelegate.java
++++ b/content/public/android/java/src/org/chromium/content_public/browser/selection/SelectionActionMenuDelegate.java
+@@ -7,6 +7,7 @@ package org.chromium.content_public.browser.selection;
+ import android.content.pm.ResolveInfo;
+ import android.view.View;
+ 
++import org.chromium.base.ContextUtils;
+ import org.chromium.base.SelectionActionMenuClientWrapper.DefaultItem;
+ import org.chromium.base.SelectionActionMenuClientWrapper.MenuType;
+ import org.chromium.build.annotations.NullMarked;
+@@ -23,15 +24,28 @@ import java.util.List;
+ @NullMarked
+ public interface SelectionActionMenuDelegate {
+     static @DefaultItem int[] getDefaultMenuItemOrder() {
+-        return new @DefaultItem int[] {
+-            DefaultItem.CUT,
+-            DefaultItem.COPY,
+-            DefaultItem.PASTE,
+-            DefaultItem.PASTE_AS_PLAIN_TEXT,
+-            DefaultItem.SHARE,
+-            DefaultItem.SELECT_ALL,
+-            DefaultItem.WEB_SEARCH
+-        };
++        if (!ContextUtils.getAppSharedPreferences().getBoolean(
++                "selection_popup_web_search_to_top", false)) {
++            return new @DefaultItem int[] {
++                DefaultItem.CUT,
++                DefaultItem.COPY,
++                DefaultItem.PASTE,
++                DefaultItem.PASTE_AS_PLAIN_TEXT,
++                DefaultItem.SHARE,
++                DefaultItem.SELECT_ALL,
++                DefaultItem.WEB_SEARCH
++            };
++        } else {
++            return new @DefaultItem int[] {
++                DefaultItem.WEB_SEARCH,
++                DefaultItem.CUT,
++                DefaultItem.COPY,
++                DefaultItem.PASTE,
++                DefaultItem.PASTE_AS_PLAIN_TEXT,
++                DefaultItem.SHARE,
++                DefaultItem.SELECT_ALL
++            };
 +        }
      }
  
-     @Retention(RetentionPolicy.SOURCE)
-@@ -201,7 +248,7 @@ public class SelectActionMenuHelper {
-         }
-         SelectionMenuGroup primaryAssistGroup =
-                 new SelectionMenuGroup(
--                        R.id.select_action_menu_assist_items, GroupItemOrder.ASSIST_ITEMS);
-+                        R.id.select_action_menu_assist_items, GroupItemOrderChromium.ASSIST_ITEMS());
-         RemoteAction primaryAction = classificationResult.textClassification.getActions().get(0);
-         primaryAssistGroup.addItem(
-                 new SelectionMenuItem.Builder(primaryAction.getTitle())
-@@ -225,7 +272,7 @@ public class SelectActionMenuHelper {
-             String selectedText) {
-         SelectionMenuGroup defaultGroup =
-                 new SelectionMenuGroup(
--                        R.id.select_action_menu_default_items, GroupItemOrder.DEFAULT_ITEMS);
-+                        R.id.select_action_menu_default_items, GroupItemOrderChromium.DEFAULT_ITEMS());
-         List<SelectionMenuItem.Builder> menuItemBuilders = new ArrayList<>();
-         menuItemBuilders.add(cut(delegate.canCut()));
-         menuItemBuilders.add(copy(delegate.canCopy()));
-@@ -252,7 +299,7 @@ public class SelectActionMenuHelper {
-         // menu items if there is selected text.
-         @IdRes int groupId = selectedText.isEmpty() ? Menu.NONE : android.R.id.textAssist;
-         SelectionMenuGroup secondaryAssistItems =
--                new SelectionMenuGroup(groupId, GroupItemOrder.SECONDARY_ASSIST_ITEMS);
-+                new SelectionMenuGroup(groupId, GroupItemOrderChromium.SECONDARY_ASSIST_ITEMS());
- 
-         if (selectedText.isEmpty() && selectionActionMenuDelegate != null) {
-             List<SelectionMenuItem> additionalMenuItems =
-@@ -311,7 +358,7 @@ public class SelectActionMenuHelper {
-         SelectionMenuGroup textProcessingItems =
-                 new SelectionMenuGroup(
-                         R.id.select_action_menu_text_processing_items,
--                        GroupItemOrder.TEXT_PROCESSING_ITEMS);
-+                        GroupItemOrderChromium.TEXT_PROCESSING_ITEMS());
-         if (isSelectionPassword || intentHandler == null) {
-             addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
-             return textProcessingItems;
-@@ -420,7 +467,7 @@ public class SelectActionMenuHelper {
-                 .setId(R.id.select_action_menu_cut)
-                 .setIconAttr(android.R.attr.actionModeCutDrawable)
-                 .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
--                .setOrderInCategory(DefaultItemOrder.CUT)
-+                .setOrderInCategory(DefaultItemOrderChromium.CUT())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-@@ -432,7 +479,7 @@ public class SelectActionMenuHelper {
-                 .setId(R.id.select_action_menu_copy)
-                 .setIconAttr(android.R.attr.actionModeCopyDrawable)
-                 .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
--                .setOrderInCategory(DefaultItemOrder.COPY)
-+                .setOrderInCategory(DefaultItemOrderChromium.COPY())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-@@ -444,7 +491,7 @@ public class SelectActionMenuHelper {
-                 .setId(R.id.select_action_menu_paste)
-                 .setIconAttr(android.R.attr.actionModePasteDrawable)
-                 .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
--                .setOrderInCategory(DefaultItemOrder.PASTE)
-+                .setOrderInCategory(DefaultItemOrderChromium.PASTE())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-@@ -458,7 +505,7 @@ public class SelectActionMenuHelper {
-         return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_share))
-                 .setId(R.id.select_action_menu_share)
-                 .setIconAttr(android.R.attr.actionModeShareDrawable)
--                .setOrderInCategory(DefaultItemOrder.SHARE)
-+                .setOrderInCategory(DefaultItemOrderChromium.SHARE())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-@@ -470,7 +517,7 @@ public class SelectActionMenuHelper {
-                 .setId(R.id.select_action_menu_select_all)
-                 .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
-                 .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
--                .setOrderInCategory(DefaultItemOrder.SELECT_ALL)
-+                .setOrderInCategory(DefaultItemOrderChromium.SELECT_ALL())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-@@ -482,7 +529,7 @@ public class SelectActionMenuHelper {
-         SelectionMenuItem.Builder builder =
-                 new SelectionMenuItem.Builder(android.R.string.paste_as_plain_text)
-                         .setId(R.id.select_action_menu_paste_as_plain_text)
--                        .setOrderInCategory(DefaultItemOrder.PASTE_AS_PLAIN_TEXT)
-+                        .setOrderInCategory(DefaultItemOrderChromium.PASTE_AS_PLAIN_TEXT())
-                         .setShowAsActionFlags(
-                                 MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                         .setIsEnabled(isEnabled);
-@@ -502,7 +549,7 @@ public class SelectActionMenuHelper {
-         return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_web_search))
-                 .setId(R.id.select_action_menu_web_search)
-                 .setIconAttr(android.R.attr.actionModeWebSearchDrawable)
--                .setOrderInCategory(DefaultItemOrder.WEB_SEARCH)
-+                .setOrderInCategory(DefaultItemOrderChromium.WEB_SEARCH())
-                 .setShowAsActionFlags(
-                         MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
-                 .setIsEnabled(isEnabled)
-diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
---- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
-+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
-@@ -18,6 +18,7 @@ import org.jni_zero.CalledByNative;
- import org.jni_zero.JNINamespace;
- import org.jni_zero.NativeMethods;
- 
-+import org.chromium.base.ContextUtils;
- import org.chromium.base.ObserverList;
- import org.chromium.base.UserData;
- import org.chromium.build.annotations.Initializer;
-@@ -84,6 +85,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
-             return null;
-         }
- 
-+        if (!ContextUtils.getAppSharedPreferences().getBoolean(
-+                "selection_popup_smart_text", false)) return null;
-+
-         SmartSelectionClient client =
-                 assumeNonNull(
-                         webContents.getOrSetUserData(
+     /**
 --

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

@@ -23,12 +23,12 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
      android:textAppearance="@style/TextAppearance.SearchBoxText"
 +    android:inputType="textUri"
      android:hint="@string/omnibox_empty_hint"
-     app:layout_constraintStart_toEndOf="@id/location_bar_status"
-     app:layout_constraintEnd_toStartOf="@id/url_action_container"
+     android:textAlignment="viewStart"
+     android:importantForAutofill="no"
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -331,8 +331,17 @@ class LocationBarMediator
+@@ -409,8 +409,17 @@ class LocationBarMediator
              if (!mUrlFocusedWithPastedText
                      && !shouldRetainOmniboxOnFocus
                      && mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -48,7 +48,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
              } else if (shouldRetainOmniboxOnFocus) {
                  mUrlCoordinator.setSelectAllOnFocus(true);
              }
-@@ -1666,7 +1675,6 @@ class LocationBarMediator
+@@ -1898,7 +1907,6 @@ class LocationBarMediator
          mUrlCoordinator.setKeyboardVisibility(true, false);
      }
  
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import android.os.SystemClock;
  import android.text.Editable;
  import android.text.InputType;
-@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -116,6 +117,7 @@ public class UrlBar extends AutocompleteEditText {
      private boolean mAllowFocus = true;
      private boolean mShouldSendTypingStartedEvent;
  
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private boolean mPendingScroll;
      private boolean mIsInCct;
  
-@@ -345,6 +347,28 @@ public class UrlBar extends AutocompleteEditText {
+@@ -369,6 +371,28 @@ public class UrlBar extends AutocompleteEditText {
          fixupTextDirection();
  
          mShouldSendTypingStartedEvent = focused;

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

@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 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
-@@ -1134,6 +1134,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1142,6 +1142,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

build/patches/Disable-Android-AppRestrictions.patch

@@ -4,6 +4,7 @@ Subject: Disable Android AppRestrictions
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../org/chromium/chrome/browser/AppHooks.java |  4 +-
  chrome/browser/enterprise/util/BUILD.gn       |  1 +
  .../enterprise/util/EnterpriseInfoImpl.java   |  5 +++
  chrome/browser/flags/BUILD.gn                 |  1 +
@@ -12,12 +13,26 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../DisableAndroidAppRestriction.inc          | 13 +++++++
  .../disable-android-app-restriction.inc       |  3 ++
  .../disable-android-app-restriction.inc       |  1 +
- 8 files changed, 75 insertions(+)
+ 9 files changed, 77 insertions(+), 2 deletions(-)
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableAndroidAppRestriction.java
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/DisableAndroidAppRestriction.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/disable-android-app-restriction.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/disable-android-app-restriction.inc
 
+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
+@@ -43,8 +43,8 @@ public class AppHooks {
+     }
+ 
+     public void registerPolicyProviders(CombinedPolicyProvider combinedProvider) {
+-        combinedProvider.registerProvider(
+-                new AppRestrictionsProvider(ContextUtils.getApplicationContext()));
++        // combinedProvider.registerProvider(
++        //         new AppRestrictionsProvider(ContextUtils.getApplicationContext()));
+     }
+ 
+     /** Async fetch the iterator of partner bookmarks (or null if not available). */
 diff --git a/chrome/browser/enterprise/util/BUILD.gn b/chrome/browser/enterprise/util/BUILD.gn
 --- a/chrome/browser/enterprise/util/BUILD.gn
 +++ b/chrome/browser/enterprise/util/BUILD.gn

build/patches/Disable-Android-Tab-Declutter.patch

@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
-@@ -104,11 +104,12 @@ public class TabArchiveSettings {
+@@ -105,11 +105,12 @@ public class TabArchiveSettings {
          // are created, and tabs disappearing from tests is very unexpected. For archive tests,
          // this will need to be turned on manually.
          return mPrefsManager.readBoolean(

build/patches/Disable-CSS-blink-feature-support.patch

@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 --- a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 +++ b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
-@@ -403,7 +403,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -263,7 +263,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
              feature_name.Value().Utf8()) &&
          guard.Release()) {
        stream.ConsumeWhitespace();

build/patches/Disable-CSSDynamicRangeLimit.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -1326,7 +1326,7 @@
+@@ -1419,7 +1419,7 @@
      },
      {
        name: "CSSDynamicRangeLimit",

build/patches/Disable-Compose-feature.patch

@@ -4,50 +4,27 @@ Subject: Disable Compose feature
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/BUILD.gn                             | 9 +++++++--
- chrome/browser/ui/webui/settings/settings_ui.cc     | 2 +-
+ chrome/browser/ui/webui/settings/settings_ui.cc     | 6 ++++--
  components/compose/core/browser/compose_features.cc | 2 ++
  components/compose/features.gni                     | 2 +-
- 4 files changed, 11 insertions(+), 4 deletions(-)
+ 3 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
---- a/chrome/browser/BUILD.gn
-+++ b/chrome/browser/BUILD.gn
-@@ -8435,6 +8435,12 @@ static_library("browser") {
-     deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
-   }
- 
-+  if (!is_android) {
-+    deps += [
-+      ":compose_optimization_guide_proto",
-+    ]
-+  }
-+
-   if (enable_compose) {
-     sources += [
-       "compose/chrome_compose_client.cc",
-@@ -8450,7 +8456,6 @@ static_library("browser") {
-     ]
- 
-     deps += [
--      ":compose_optimization_guide_proto",
-       "//chrome/common/compose",
-       "//chrome/common/compose:mojo_bindings",
-       "//components/autofill/content/browser",
-@@ -8870,7 +8875,7 @@ source_set("font_pref") {
-   deps = [ "//chrome/common" ]
- }
- 
--if (enable_compose) {
-+if (!is_android) {
-   proto_library("compose_optimization_guide_proto") {
-     sources = [ "compose/proto/compose_optimization_guide.proto" ]
-     cc_generator_options = "lite=true:"
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -351,7 +351,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
-       base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
+@@ -20,7 +20,9 @@
+ #include "chrome/browser/browser_features.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/commerce/shopping_service_factory.h"
+-#include "chrome/browser/compose/compose_enabling.h"
++// #if BUILDFLAG(ENABLE_COMPOSE)
++// #include "chrome/browser/compose/compose_enabling.h"
++// #endif
+ #include "chrome/browser/history_embeddings/history_embeddings_utils.h"
+ #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
+ #include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h"
+@@ -359,7 +361,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+       base::FeatureList::IsEnabled(permissions::features::kKeyboardLockPrompt));
  
  #if BUILDFLAG(ENABLE_COMPOSE)
 -  const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile);

build/patches/Disable-Compression-Dictionary-Transport.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -1467,8 +1467,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1452,8 +1452,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
    registry->RegisterBooleanPref(prefs::kSandboxExternalProtocolBlocked, true);
    registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true);
    registry->RegisterListPref(prefs::kSSLErrorOverrideAllowedForOrigins);

build/patches/Disable-Device-Attributes-API.patch

@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/device_api/device_service_impl.cc
 --- a/chrome/browser/device_api/device_service_impl.cc
 +++ b/chrome/browser/device_api/device_service_impl.cc
-@@ -154,6 +154,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
+@@ -155,6 +155,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
  
  bool IsTrustedContext(content::RenderFrameHost& host,
                        const url::Origin& origin) {
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/d
    // Do not create the service for the incognito mode.
    if (GetProfile(host)->IsIncognitoProfile()) {
      return false;
-@@ -349,6 +350,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
+@@ -350,6 +351,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
  void DeviceServiceImpl::GetDeviceAttribute(
      void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback),
      DeviceAttributeCallback callback) {

build/patches/Disable-FedCm.patch

@@ -6,16 +6,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../content_settings/core/browser/content_settings_registry.cc  | 2 +-
  .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
+ .../services/network/public/cpp/features_cc/Disable-FedCm.inc   | 1 +
  .../third_party/blink/common/features_cc/Disable-FedCm.inc      | 1 +
  .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 4 files changed, 4 insertions(+), 2 deletions(-)
+ 5 files changed, 5 insertions(+), 2 deletions(-)
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
+ create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
 
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -671,7 +671,7 @@ void ContentSettingsRegistry::Init() {
+@@ -640,7 +640,7 @@ void ContentSettingsRegistry::Init() {
             PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
    Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
@@ -30,6 +32,12 @@ new file mode 100644
 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 @@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kFedCm);
+diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-FedCm.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_ENABLED(kSendSameSiteLaxForFedCM);
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
 new file mode 100644
 --- /dev/null
@@ -39,7 +47,7 @@ new file mode 100644
 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
-@@ -2137,7 +2137,7 @@
+@@ -2286,7 +2286,7 @@
      {
        name: "FedCm",
        public: true,

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

@@ -51,10 +51,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
      public static final String EXTRA_ITEM_PICKER_MAX_SELECTABLE_ITEMS =
              "org.chromium.chrome.browser.extras.item_picker_max_selectable_items";
 -
-     private static @Nullable Pair<Integer, String> sPendingReferrer;
-     private static int sReferrerId;
-     private static @Nullable String sPendingIncognitoUrl;
-@@ -566,8 +561,6 @@ public class IntentHandler {
+     public static final String EXTRA_ITEM_PICKER_ERROR =
+             "org.chromium.chrome.browser.chrome_item_picker.EXTRA_ITEM_PICKER_ERROR";
+ 
+@@ -569,8 +564,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (PACKAGE_WHATSAPP.equals(packageName)) {
              return ExternalAppId.WHATSAPP;
@@ -240,7 +240,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
-@@ -266,7 +266,7 @@ public class PdfCoordinator {
+@@ -276,7 +276,7 @@ public class PdfCoordinator {
      }
  
      @Nullable String requestAssistContent(String filename, boolean isWorkProfile) {

build/patches/Disable-GetInstalledRelatedApps-API.patch

@@ -58,7 +58,7 @@ new file mode 100644
 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
-@@ -2879,9 +2879,8 @@
+@@ -3037,9 +3037,8 @@
        status: "stable",
      },
      {

build/patches/Disable-PrivacyGuide.patch

@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -325,8 +325,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -336,8 +336,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
    bool show_privacy_guide =
@@ -31,5 +31,5 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui
 +      false;
    html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
  
-   html_source->AddBoolean("enableHandTrackingContentSetting",
+   html_source->AddBoolean(
 --

build/patches/Disable-Real-Box.patch

@@ -4,16 +4,16 @@ Subject: Disable Real Box
 
 Real-box is search box in ntp
 ---
- chrome/browser/prefs/browser_prefs.cc            |  2 +-
- chrome/browser/resources/new_tab_page/app.html   | 16 ----------------
- .../ui/webui/searchbox/searchbox_handler.cc      |  1 +
- components/search/ntp_features.cc                |  4 ++--
- 4 files changed, 4 insertions(+), 19 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc         |  2 +-
+ .../browser/resources/new_tab_page/app.html   | 19 -------------------
+ .../searchbox/searchbox_handler.cc            |  1 +
+ components/search/ntp_features.cc             |  4 ++--
+ 4 files changed, 4 insertions(+), 22 deletions(-)
 
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2417,7 +2417,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -1987,7 +1987,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -21,12 +21,12 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 +  registry->RegisterBooleanPref(prefs::kLensDesktopNTPSearchEnabled, false);
  #endif
  
-   registry->RegisterListPref(
+   registry->RegisterBooleanPref(prefs::kDisableScreenshots, false);
 diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
-@@ -39,22 +39,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
-         @click="${this.showComposebox_ && this.composeboxCloseByClickOutside_ ? this.onComposeboxClickOutside_ : nothing}"></div>
+@@ -40,25 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
+         ?hidden="${!this.showScrim_}"></div>
    ` : ''}
    <div id="searchboxContainer">
 -    <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
@@ -37,21 +37,24 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
 -        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
+-        @context-menu-entrypoint-click="${this.onContextMenuEntrypointClick_}"
 -        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
 -        ?compose-button-enabled="${this.composeButtonEnabled}"
 -        ?composebox-enabled="${this.composeboxEnabled}"
--        realbox-layout-mode="${this.realboxLayoutMode_}"
+-        searchbox-layout-mode="${this.realboxLayoutMode_}"
 -        ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
 -        ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
--        @dropdown-visible-changed="${this.onDropdownVisibleChanged_}">
+-        @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
+-        context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}"
+-        ?multi-line-enabled="${this.multiLineEnabled_}">
 -    </cr-searchbox>
      ${this.showComposebox_ ? html`
-       <ntp-composebox id="composebox" ?is_collapsible="false"
-           ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
-diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
---- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-+++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -295,6 +295,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+       ${this.enableModalComposebox_ ? html`
+         <div id="dialogAnchor"></div>
+diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
+--- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
++++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
+@@ -299,6 +299,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                              Profile* profile,
                                              bool enable_voice_search,
                                              bool enable_lens_search) {
@@ -62,7 +65,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -106,7 +106,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -114,7 +114,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
  
  // If enabled, logo will be shown.
  // This is a kill switch. Keep indefinitely.
@@ -71,7 +74,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
  
  // If enabled, middle slot promo will be shown.
  // This is a kill switch. Keep indefinitely.
-@@ -148,7 +148,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -156,7 +156,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
  
  // If enabled, OneGoogleBar will be shown.
  // This is a kill switch. Keep indefinitely.

build/patches/Disable-Sticky-User-Activation-Across-Same-Origin-Navigation.patch

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -4794,8 +4794,8 @@
+@@ -4951,8 +4951,8 @@
      {
        // Preserves the sticky user activation state after a page navigates to
        // another same-origin page. https://crbug.com/433729626

build/patches/Disable-TLS-resumption.patch

@@ -29,10 +29,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../features_cc/Disable-TLS-resumption.inc    |  7 +++
  .../features_h/Disable-TLS-resumption.inc     |  5 ++
  net/http/http_network_session.cc              |  1 +
- net/quic/quic_session_pool.cc                 | 35 ++++++++++-
+ net/quic/quic_session_pool.cc                 | 34 ++++++++++-
  net/socket/ssl_client_socket_impl.cc          | 59 +++++++++++++++++++
  net/socket/ssl_client_socket_impl.h           |  2 +
- 7 files changed, 120 insertions(+), 1 deletion(-)
+ 7 files changed, 119 insertions(+), 1 deletion(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc
  create mode 100644 cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc
  create mode 100644 cromite_flags/net/base/features_h/Disable-TLS-resumption.inc
@@ -90,15 +90,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 --- a/net/quic/quic_session_pool.cc
 +++ b/net/quic/quic_session_pool.cc
-@@ -87,6 +87,7 @@
- #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
- #include "net/traffic_annotation/network_traffic_annotation.h"
- #include "third_party/boringssl/src/include/openssl/aead.h"
-+#include "third_party/boringssl/src/include/openssl/ssl.h"
- #include "url/gurl.h"
- #include "url/scheme_host_port.h"
- #include "url/url_constants.h"
-@@ -378,6 +379,38 @@ base::TimeDelta GetAdditionalDelayForMainJob() {
+@@ -380,6 +380,38 @@ base::TimeDelta GetAdditionalDelayForMainJob() {
  
  }  // namespace
  
@@ -137,7 +129,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
  
  QuicSessionRequest::~QuicSessionRequest() {
-@@ -2404,7 +2437,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
+@@ -2422,7 +2454,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
                cert_verifier_, transport_security_state_, sct_auditing_delegate_,
                std::move(hostnames_to_allow_unknown_roots),
                key.network_anonymization_key),

build/patches/Disable-UA-full-version.patch

@@ -7,8 +7,8 @@ getHighEntropyValues will return only the major version
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../renderer/core/frame/navigator_ua_data.cc    | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ .../renderer/core/frame/navigator_ua_data.cc  | 21 +++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
@@ -20,13 +20,15 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 +#include "base/version.h"
 +#include "base/strings/strcat.h"
 +#include "base/strings/string_number_conversions.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
- #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
- #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
-@@ -65,6 +68,16 @@ void MaybeRecordMetric(bool record_identifiability,
-                     execution_context);
- }
+ #include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom-blink.h"
+ #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
+ #include "third_party/blink/renderer/bindings/core/v8/v8_ua_data_values.h"
+@@ -17,6 +20,20 @@
  
+ namespace blink {
+ 
++namespace {
++
 +const String GetReducedVersionNumber(const std::string& fullVersion) {
 +  base::Version version(fullVersion);
 +  std::string version_str;
@@ -37,10 +39,12 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 +  return String::FromUTF8(version_str);
 +}
 +
- }  // namespace
- 
++}
++
  NavigatorUAData::NavigatorUAData(ExecutionContext* context)
-@@ -103,7 +116,7 @@ void NavigatorUAData::SetFullVersionList(
+     : ExecutionContextClient(context) {
+   NavigatorUABrandVersion* dict = NavigatorUABrandVersion::Create();
+@@ -53,7 +70,7 @@ void NavigatorUAData::SetFullVersionList(
      const UserAgentBrandList& full_version_list) {
    for (const auto& brand_version : full_version_list) {
      AddBrandFullVersion(String::FromUTF8(brand_version.brand),
@@ -49,7 +53,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
    }
  }
  
-@@ -125,7 +138,7 @@ void NavigatorUAData::SetModel(const String& model) {
+@@ -75,7 +92,7 @@ void NavigatorUAData::SetModel(const String& model) {
  }
  
  void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {

build/patches/Disable-Viewport-Segments.patch

@@ -21,7 +21,7 @@ new file mode 100644
 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
-@@ -5469,8 +5469,7 @@
+@@ -5592,8 +5592,7 @@
        status: "stable",
      },
      {
@@ -30,5 +30,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      name: "ViewportSegments", status: "test", public: true
      },
      {
-       name: "ViewTransitionAnimationDelayInherit",
+       name: "ViewTransitionAsyncFinished",
 --

build/patches/Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -378,8 +378,13 @@ void ContentSettingsRegistry::Init() {
+@@ -347,8 +347,13 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
             PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
  

build/patches/Disable-WebGPU.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -550,6 +550,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -552,6 +552,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
  
    WebRuntimeFeatures::EnableRemotePlayback(false);
  
@@ -27,7 +27,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 @@ -196,7 +196,7 @@ BASE_FEATURE(kEnableDrDc,
  // enabled by default on supported platforms.
  #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
-     BUILDFLAG(IS_ANDROID)
+     BUILDFLAG(IS_ANDROID) || BUILDFLAG(USE_WEBGPU_ON_VULKAN_VIA_GL_INTEROP)
 -#define WEBGPU_ENABLED base::FEATURE_ENABLED_BY_DEFAULT
 +#define WEBGPU_ENABLED base::FEATURE_DISABLED_BY_DEFAULT
  #else
@@ -36,7 +36,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
-@@ -161,6 +161,8 @@ GPU::GPU(NavigatorBase& navigator)
+@@ -153,6 +153,8 @@ GPU::GPU(NavigatorBase& navigator)
  GPU::~GPU() = default;
  
  WGSLLanguageFeatures* GPU::wgslLanguageFeatures() const {
@@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blin
    return wgsl_language_features_.Get();
  }
  
-@@ -444,6 +446,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -404,6 +406,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
          "WebGPU is experimental on this platform. See "
          "https://github.com/gpuweb/gpuweb/wiki/"
          "Implementation-Status#implementation-status"));

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

@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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
-@@ -1800,6 +1800,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1858,6 +1858,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      }
  
      private boolean maybeShowPromo(Profile profile) {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -180,7 +180,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -187,7 +187,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                  false);
@@ -52,7 +52,7 @@ diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_contr
 diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 --- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 +++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
-@@ -45,6 +45,7 @@ user_education::FeaturePromoResult
+@@ -47,6 +47,7 @@ user_education::FeaturePromoResult
  BrowserFeaturePromoController20::CanShowPromoForElement(
      ui::TrackedElement* anchor_element,
      const user_education::UserEducationContextPtr& context) const {

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

@@ -13,12 +13,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../browser/aw_content_browser_client.cc      |   3 +
  .../chromium/android_webview/AwSettings.java  |   4 +-
+ .../apk/AndroidManifest.xml                   |   3 -
  chrome/android/java/AndroidManifest.xml       |   4 -
  .../ChromeSiteSettingsDelegate.java           |   2 +
  .../k_anonymity_trust_token_getter.cc         |   2 +-
- .../privacy_page/privacy_page_index.html      |   8 -
+ .../privacy_page/privacy_page_index.html      |   9 -
  chrome/browser/resources/settings/route.ts    |   2 +-
- .../site_settings_page/site_settings_page.ts  |   1 +
+ .../site_settings/site_settings_page.ts       |   1 +
  .../aggregatable_trigger_config.cc            |   2 +-
  components/attribution_reporting/features.cc  |   1 +
  .../core/browser/content_settings_registry.cc |   2 +-
@@ -46,14 +47,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/blink/renderer/core/page/page.cc  |   2 +-
  .../platform/runtime_enabled_features.json5   |  20 +-
  ui/events/android/motion_event_android.cc     |   8 +-
- 35 files changed, 103 insertions(+), 433 deletions(-)
+ 36 files changed, 103 insertions(+), 437 deletions(-)
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
 
 diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
 --- a/android_webview/browser/aw_content_browser_client.cc
 +++ b/android_webview/browser/aw_content_browser_client.cc
-@@ -1317,6 +1317,7 @@ network::mojom::AttributionSupport
+@@ -1352,6 +1352,7 @@ network::mojom::AttributionSupport
  AwContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -61,7 +62,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
    // WebView only supports OS-level attribution and not web-attribution.
    switch (state) {
      case AttributionReportingOsApiState::kDisabled:
-@@ -1335,6 +1336,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1370,6 +1371,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -82,7 +83,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
  
      @SpeculativeLoadingAllowedFlags
      private int mSpeculativeLoadingAllowedFlags =
-@@ -1784,7 +1784,7 @@ public class AwSettings {
+@@ -1795,7 +1795,7 @@ public class AwSettings {
      public void setAttributionBehavior(@AttributionBehavior int behavior) {
          synchronized (mAwSettingsLock) {
              if (mAttributionBehavior != behavior) {
@@ -91,20 +92,33 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
                  mEventHandler.updateWebkitPreferencesLocked();
              }
          }
+diff --git a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
+--- a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
++++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
+@@ -178,9 +178,6 @@
+             android:exported="true">
+         </activity>
+ 
+-        <property android:name="android.adservices.AD_SERVICES_CONFIG"
+-            android:resource="@xml/ad_services_config" />
+-
+         <service android:name="android.webkit.MetaDataHolderService"
+                  android:enabled="false"
+                  android:exported="false">
 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
 @@ -39,7 +39,6 @@ by a child template that "extends" this file.
-         <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
-     {% endif %}
+     <uses-permission-sdk-23 android:name="android.permission.ACCESS_WIFI_STATE" />
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  
 -    <uses-permission-sdk-23 android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION" />
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
      <!--
-@@ -1188,9 +1187,6 @@ by a child template that "extends" this file.
-             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
-         </activity>
+@@ -1221,9 +1220,6 @@ by a child template that "extends" this file.
+             android:name="com.google.android.gms.cast.framework.ReconnectionService"
+             tools:node="remove" />
  
 -        <property android:name="android.adservices.AD_SERVICES_CONFIG"
 -            android:resource="@xml/ad_services_config" />
@@ -115,7 +129,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
-@@ -150,6 +150,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -152,6 +152,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
                  // not great to dynamically remove the preference in this way.
              case SiteSettingsCategory.Type.ADS:
                  return SiteSettingsCategory.adsCategoryEnabled();
@@ -127,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
 diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
 --- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
 +++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
-@@ -120,7 +120,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
+@@ -122,7 +122,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
  
  void KAnonymityTrustTokenGetter::TryGetTrustTokenAndKey(
      TryGetTrustTokenAndKeyCallback callback) {
@@ -139,25 +153,26 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
-@@ -177,14 +177,6 @@
+@@ -179,15 +179,6 @@
      </settings-ar-page>
    </template>
  
 -  <template is="dom-if" if="[[renderView_(
--      routes_.SITE_SETTINGS_AUTO_VERIFY, currentRoute, inSearchMode)]]">
+-      routes_.SITE_SETTINGS_AUTO_VERIFY, currentRoute, inSearchMode)]]"
+-      update-when-false>
 -    <settings-anti-abuse-page slot="view" id="siteSettingsAutoVerify"
 -        data-parent-view-id="privacy"
 -        route-path$="[[routes_.SITE_SETTINGS_AUTO_VERIFY.path]]">
 -    </settings-anti-abuse-page>
 -  </template>
 -
-   <template is="dom-if" if="[[autoPictureInPictureEnabled_]]">
-     <template is="dom-if" if="[[renderView_(
-         routes_.SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE, currentRoute,
+   <template is="dom-if" if="[[renderView_(
+       routes_.SITE_SETTINGS_AUTO_PICTURE_IN_PICTURE, currentRoute,
+       inSearchMode)]]" update-when-false>
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -84,7 +84,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -79,7 +79,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
          r.SITE_SETTINGS.createChild('smartCardReaders');
    }
    // </if>
@@ -166,10 +181,10 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
    r.SITE_SETTINGS_BACKGROUND_SYNC =
        r.SITE_SETTINGS.createChild('backgroundSync');
    r.SITE_SETTINGS_CAMERA = r.SITE_SETTINGS.createChild('camera');
-diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
---- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
-@@ -66,6 +66,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
+diff --git a/chrome/browser/resources/settings/site_settings/site_settings_page.ts b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
+--- a/chrome/browser/resources/settings/site_settings/site_settings_page.ts
++++ b/chrome/browser/resources/settings/site_settings/site_settings_page.ts
+@@ -67,6 +67,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
        route: routes.SITE_SETTINGS_AUTO_VERIFY,
        id: Id.ANTI_ABUSE,
        label: 'siteSettingsAntiAbuse',
@@ -201,7 +216,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -680,7 +680,7 @@ void ContentSettingsRegistry::Init() {
+@@ -649,7 +649,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
@@ -267,7 +282,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
-@@ -807,11 +807,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
+@@ -787,11 +787,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
          headers->GetNormalizedHeader(
              attribution_reporting::kAttributionReportingRegisterTriggerHeader);
  
@@ -281,7 +296,7 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager
  
      const bool has_source =
          web_source_header.has_value() || os_source_header.has_value();
-@@ -1166,6 +1164,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -1143,6 +1141,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
      Registrations& registrations,
      HeaderPendingDecode pending_decode,
      Registrar registrar) {
@@ -302,7 +317,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
  #endif
  }
  
-@@ -346,6 +344,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -342,6 +340,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
      return;
    }
  
@@ -313,7 +328,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
 diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
-@@ -601,11 +601,7 @@ bool IsOperationAllowed(
+@@ -522,11 +522,7 @@ bool IsOperationAllowed(
  }
  
  std::unique_ptr<AttributionOsLevelManager> CreateOsLevelManager() {
@@ -348,7 +363,7 @@ diff --git a/content/browser/attribution_reporting/attribution_os_level_manager.
 diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc
 --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc
 +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
-@@ -155,6 +155,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
+@@ -131,6 +131,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
                                                  url::Origin origin,
                                                  std::string body,
                                                  UrlLoaderCallback callback) {
@@ -358,7 +373,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = std::move(url);
    resource_request->method = net::HttpRequestHeaders::kPostMethod;
-@@ -230,6 +233,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -206,6 +209,12 @@ void AttributionReportNetworkSender::OnReportSent(
      ReportSentCallback sent_callback,
      UrlLoaderList::iterator it,
      scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -374,7 +389,7 @@ 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
-@@ -539,6 +539,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -535,6 +535,8 @@ void AssignSourceForDeactivationOrDeletion(
    }
  }
  
@@ -383,7 +398,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
  }  // namespace
  
  // static
-@@ -561,9 +563,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -557,9 +559,9 @@ bool AttributionStorageSql::Transaction::Commit() {
  AttributionStorageSql::AttributionStorageSql(
      const base::FilePath& user_data_directory,
      AttributionResolverDelegate* delegate)
@@ -399,7 +414,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 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
-@@ -10511,6 +10511,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
+@@ -10507,6 +10507,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
      return false;
    }
  
@@ -407,7 +422,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
    if (!IsActive()) {
      // reportEvent is not allowed when this RenderFrameHost or one of its
      // ancestors is not active.
-@@ -14517,6 +14518,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
+@@ -14607,6 +14608,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
      return;
    }
  
@@ -427,7 +442,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 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
-@@ -1505,15 +1505,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1512,15 +1512,6 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -443,7 +458,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
    if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
      // Auction worklets on non-Android use dedicated processes; on Android due
      // to high cost of process launch they try to reuse renderers.
-@@ -1565,9 +1556,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1572,9 +1563,6 @@ void StoragePartitionImpl::Initialize(
  
    font_access_manager_ = FontAccessManager::Create();
  
@@ -456,7 +471,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 --- a/content/public/android/BUILD.gn
 +++ b/content/public/android/BUILD.gn
-@@ -211,8 +211,6 @@ android_library("content_full_java") {
+@@ -213,8 +213,6 @@ android_library("content_full_java") {
      "//third_party/androidx:androidx_appcompat_appcompat_resources_java",
      "//third_party/androidx:androidx_collection_collection_java",
      "//third_party/androidx:androidx_core_core_java",
@@ -930,7 +945,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -639,6 +639,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -649,6 +649,7 @@ void ContentBrowserClient::OnAuctionComplete(
  network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -938,7 +953,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
    switch (state) {
      case AttributionReportingOsApiState::kDisabled:
        return network::mojom::AttributionSupport::kWeb;
-@@ -656,13 +657,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -666,13 +667,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -954,7 +969,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
  }
  
  bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -670,7 +671,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -680,7 +681,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
      content::RenderFrameHost* rfh,
      const url::Origin& context_origin,
      const url::Origin& reporting_origin) {
@@ -1008,7 +1023,7 @@ diff --git a/services/network/attribution/request_headers_internal.cc b/services
 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
-@@ -1316,6 +1316,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
+@@ -1312,6 +1312,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
  
  void NetworkContext::ClearTrustTokenSessionOnlyData(
      ClearTrustTokenSessionOnlyDataCallback callback) {
@@ -1019,7 +1034,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    // Only called when Private State Tokens is enabled, i.e.,
    // `trust_token_store_` is non-null.
    DCHECK(trust_token_store_);
-@@ -2759,26 +2763,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2731,26 +2735,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
      builder.set_network_quality_estimator(
          network_service_->network_quality_estimator());
    }
@@ -1068,7 +1083,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
 diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
 --- a/third_party/blink/renderer/core/frame/attribution_src_loader.cc
 +++ b/third_party/blink/renderer/core/frame/attribution_src_loader.cc
-@@ -209,8 +209,6 @@ struct AttributionSrcLoader::AttributionHeaders {
+@@ -220,8 +220,6 @@ struct AttributionSrcLoader::AttributionHeaders {
                       uint64_t request_id)
        : web_source(map.Get(http_names::kAttributionReportingRegisterSource)),
          web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
@@ -1080,7 +1095,7 @@ diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/t
 diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
 --- a/third_party/blink/renderer/core/page/page.cc
 +++ b/third_party/blink/renderer/core/page/page.cc
-@@ -1620,7 +1620,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1586,7 +1586,7 @@ void Page::UpdateBrowsingContextGroup(
  
  void Page::SetAttributionSupport(
      network::mojom::AttributionSupport attribution_support) {
@@ -1088,7 +1103,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
 +  attribution_support_ = network::mojom::AttributionSupport::kNone;
  }
  
- template class CORE_TEMPLATE_EXPORT Supplement<Page>;
+ // static
 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
@@ -1103,7 +1118,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        origin_trial_feature_name: "AdInterestGroupAPI",
        implied_by: ["Fledge", "Parakeet"],
        public: true,
-@@ -591,8 +591,8 @@
+@@ -626,8 +626,8 @@
        status: "stable",
      },
      {
@@ -1114,7 +1129,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -3886,8 +3886,8 @@
+@@ -4047,8 +4047,8 @@
        base_feature: "none",
      },
      {
@@ -1125,8 +1140,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -5143,16 +5143,16 @@
-       status: "stable",
+@@ -5268,16 +5268,16 @@
+       status: "experimental",
      },
      {
 -      name: "TopicsAPI",

build/patches/Disable-crash-reporting.patch

@@ -12,7 +12,7 @@ Subject: Disable crash reporting
 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
-@@ -2797,15 +2797,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2688,15 +2688,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
          base::NumberToString(pid));
    }
  #endif
@@ -31,18 +31,18 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 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
-@@ -16198,6 +16198,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -16276,6 +16276,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
  void RenderFrameHostImpl::MaybeGenerateCrashReport(
      base::TerminationStatus status,
      int exit_code) {
 +  if ((true)) return;
-   if (!last_committed_url_.SchemeIsHTTPOrHTTPS())
+   if (!last_committed_url_.SchemeIsHTTPOrHTTPS()) {
      return;
- 
+   }
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -10266,7 +10266,7 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -10332,7 +10332,7 @@ void WebContentsImpl::RendererUnresponsive(
    base::UmaHistogramEnumeration(
        "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
  
@@ -54,7 +54,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 --- a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 +++ b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
-@@ -102,7 +102,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
+@@ -98,7 +98,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
      return;
    }
    ExecutionContext* execution_context = ToExecutionContext(script_state);

build/patches/Disable-css-preferred-text-scale.patch

@@ -6,9 +6,12 @@ Do not expose the user's preferred font scale to CSS.
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../blink/common/features_cc/Disable-CSSPreferredTextScale.inc | 1 +
- .../blink/renderer/platform/runtime_enabled_features.json5     | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ .../common/features_cc/Disable-CSSPreferredTextScale.inc    | 1 +
+ .../core/css/document_style_environment_variables.cc        | 6 ++++--
+ .../blink/renderer/core/css/style_environment_variables.cc  | 4 +++-
+ third_party/blink/renderer/core/page/page.cc                | 4 +++-
+ .../blink/renderer/platform/runtime_enabled_features.json5  | 3 +++
+ 5 files changed, 14 insertions(+), 4 deletions(-)
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
 
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
@@ -17,17 +20,61 @@ new file mode 100644
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-CSSPreferredTextScale.inc
 @@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kCSSPreferredTextScale);
+diff --git a/third_party/blink/renderer/core/css/document_style_environment_variables.cc b/third_party/blink/renderer/core/css/document_style_environment_variables.cc
+--- a/third_party/blink/renderer/core/css/document_style_environment_variables.cc
++++ b/third_party/blink/renderer/core/css/document_style_environment_variables.cc
+@@ -55,8 +55,10 @@ DocumentStyleEnvironmentVariables::DocumentStyleEnvironmentVariables(
+     StyleEnvironmentVariables& parent,
+     Document& document)
+     : StyleEnvironmentVariables(parent), document_(&document) {
+-  SetPreferredTextScale(
+-      document_->GetSettings()->GetAccessibilityFontScaleFactor());
++  if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
++    SetPreferredTextScale(
++        document_->GetSettings()->GetAccessibilityFontScaleFactor());
++  }
+ }
+ 
+ void DocumentStyleEnvironmentVariables::RecordVariableUsage(
+diff --git a/third_party/blink/renderer/core/css/style_environment_variables.cc b/third_party/blink/renderer/core/css/style_environment_variables.cc
+--- a/third_party/blink/renderer/core/css/style_environment_variables.cc
++++ b/third_party/blink/renderer/core/css/style_environment_variables.cc
+@@ -49,7 +49,9 @@ void SetDefaultEnvironmentVariables(StyleEnvironmentVariables* instance) {
+   instance->SetVariable(UADefinedVariable::kKeyboardInsetHeight,
+                         kKeyboardInsetDefault);
+ 
+-  instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1");
++  if (RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
++    instance->SetVariable(UADefinedVariable::kPreferredTextScale, "1");
++  }
+ }
+ 
+ }  // namespace.
+diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
+--- a/third_party/blink/renderer/core/page/page.cc
++++ b/third_party/blink/renderer/core/page/page.cc
+@@ -1056,7 +1056,9 @@ void Page::SettingsChanged(ChangeType change_type) {
+       }
+       break;
+     case ChangeType::kFontScaleFactor:
+-
++      if (!RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) {
++        break;
++      }
+       for (Frame* frame = MainFrame(); frame;
+            frame = frame->Tree().TraverseNext()) {
+         LocalFrame* local_frame = DynamicTo<LocalFrame>(frame);
 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
-@@ -1478,8 +1478,7 @@
+@@ -1582,6 +1582,9 @@
+       name: "CSSPositionStickyStaticScrollPosition",
        status: "test",
      },
-     {
--      name: "CSSPreferredTextScale",
--      status: "stable",
++    {
 +      name: "CSSPreferredTextScale", status: "test", public: true
-     },
++    },
      // https://drafts.csswg.org/css-values-5/#progress
      // progress()
+     {
 --

build/patches/Disable-device-bound-session.patch

@@ -0,0 +1,25 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 19 Jan 2026 12:00:34 +0000
+Subject: Disable device bound session
+
+Disable DBSC due to potential privacy issues
+see https://w3c.github.io/webappsec-dbsc/#privacy-considerations
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ net/features.gni | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/features.gni b/net/features.gni
+--- a/net/features.gni
++++ b/net/features.gni
+@@ -57,7 +57,7 @@ declare_args() {
+   chrome_root_store_only = is_win || is_mac || is_linux || is_chromeos
+ 
+   # DBSC is only supported on Windows, Linux and Mac for now.
+-  enable_device_bound_sessions = is_win || is_linux || is_mac
++  enable_device_bound_sessions = false
+ 
+   # Bracketed URIs parsing is only available for debug builds.
+   # TODO(crbug.com/365771838): Ensure tests are updated if needed if this
+--

build/patches/Disable-devtools-remote-and-custom-protocols.patch

@@ -9,7 +9,7 @@ Subject: Disable devtools remote and custom protocols
 diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
 --- a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
 +++ b/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc
-@@ -179,7 +179,7 @@ void DevToolsDataSource::StartDataRequest(
+@@ -181,7 +181,7 @@ void DevToolsDataSource::StartDataRequest(
    // Serve request to devtools://remote from remote location.
    std::string remote_path_prefix(chrome::kChromeUIDevToolsRemotePath);
    remote_path_prefix += "/";
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/ui/webui/devtools/devtools_ui_data_source.cc b/chrom
                         base::CompareCase::INSENSITIVE_ASCII)) {
      if (MaybeHandleCustomRequest(path.substr(remote_path_prefix.length()),
                                   &callback)) {
-@@ -202,7 +202,7 @@ void DevToolsDataSource::StartDataRequest(
+@@ -204,7 +204,7 @@ void DevToolsDataSource::StartDataRequest(
    // Serve request to devtools://custom from custom URL.
    std::string custom_path_prefix(chrome::kChromeUIDevToolsCustomPath);
    custom_path_prefix += "/";

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

@@ -21,25 +21,27 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../firstrun/VariationsSeedBridge.java        |  2 +-
  .../firstrun/VariationsSeedFetcher.java       | 36 +++----------------
  components/variations/net/BUILD.gn            |  2 --
+ .../omnibox_autofocus_url_loader_throttle.cc  |  1 +
  .../variations/net/variations_http_headers.cc |  2 ++
+ .../net/variations_url_loader_throttle.cc     |  1 +
  .../service/variations_field_trial_creator.cc |  6 ++--
  .../variations/service/variations_service.cc  | 19 ++--------
  .../browser/loader/url_loader_throttles.cc    |  7 ----
  .../origin_trials/origin_trials_utils.cc      |  2 +-
  .../renderer_host/navigation_request.cc       |  1 +
- .../variations_render_thread_observer.cc      |  9 -----
- .../Disable-fetching-of-all-field-trials.inc  |  3 ++
+ .../variations_render_thread_observer.cc      |  8 -----
+ .../Disable-fetching-of-all-field-trials.inc  |  1 +
  .../Disable-fetching-of-all-field-trials.inc  |  1 +
  .../renderer/core/loader/document_loader.cc   |  7 ----
  .../platform/loader/fetch/resource_request.h  |  1 -
- 25 files changed, 31 insertions(+), 91 deletions(-)
+ 27 files changed, 31 insertions(+), 90 deletions(-)
  create mode 100644 cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-trials.inc
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc
 
 diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
 --- a/android_webview/browser/aw_browser_context.cc
 +++ b/android_webview/browser/aw_browser_context.cc
-@@ -501,6 +501,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -496,6 +496,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
  
  content::OriginTrialsControllerDelegate*
  AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -50,18 +52,18 @@ diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/bro
 diff --git a/android_webview/browser/component_updater/origin_trials_component_loader.cc b/android_webview/browser/component_updater/origin_trials_component_loader.cc
 --- a/android_webview/browser/component_updater/origin_trials_component_loader.cc
 +++ b/android_webview/browser/component_updater/origin_trials_component_loader.cc
-@@ -14,6 +14,7 @@ namespace android_webview {
+@@ -16,6 +16,7 @@ namespace android_webview {
  
  void LoadOriginTrialsComponent(
      component_updater::ComponentLoaderPolicyVector& policies) {
 +  if ((true)) return;
-   policies.push_back(std::make_unique<OriginTrialsComponentLoaderPolicy>());
- }
- 
+   if (!base::FeatureList::IsEnabled(
+           features::kWebViewFetchOriginTrialsComponent)) {
+     return;
 diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
 --- a/android_webview/common/aw_content_client.cc
 +++ b/android_webview/common/aw_content_client.cc
-@@ -115,6 +115,8 @@ void AwContentClient::ExposeInterfacesToBrowser(
+@@ -118,6 +118,8 @@ void AwContentClient::ExposeInterfacesToBrowser(
  }
  
  blink::OriginTrialPolicy* AwContentClient::GetOriginTrialPolicy() {
@@ -157,14 +159,14 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -924,7 +924,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
+@@ -931,7 +931,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
  
  void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
      network::mojom::NetworkContextParams* network_context_params) {
 -  variations::UpdateCorsExemptHeaderForVariations(network_context_params);
+   variations::UpdateCorsExemptHeaderForOmniboxAutofocus(network_context_params);
  #if BUILDFLAG(ENABLE_REQUEST_HEADER_INTEGRITY)
    request_header_integrity::RequestHeaderIntegrityURLLoaderThrottle::
-       UpdateCorsExemptHeaders(network_context_params);
 diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/browser/origin_trials/origin_trials_factory.cc
 --- a/chrome/browser/origin_trials/origin_trials_factory.cc
 +++ b/chrome/browser/origin_trials/origin_trials_factory.cc
@@ -179,7 +181,7 @@ diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/brow
 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
-@@ -203,6 +203,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
+@@ -192,6 +192,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
  
  UkmRecorderImpl::UkmRecorderImpl()
      : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -269,6 +271,17 @@ diff --git a/components/variations/net/BUILD.gn b/components/variations/net/BUIL
      ]
      deps += [
        "//components/variations:variations_mojom",
+diff --git a/components/variations/net/omnibox_autofocus_url_loader_throttle.cc b/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
+--- a/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
++++ b/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
+@@ -18,6 +18,7 @@ OmniboxAutofocusURLLoaderThrottle::~OmniboxAutofocusURLLoaderThrottle() =
+ // static
+ void OmniboxAutofocusURLLoaderThrottle::AppendThrottleIfNeeded(
+     std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
++  if ((true)) return;
+ #if BUILDFLAG(IS_ANDROID)
+   if (!base::FeatureList::IsEnabled(kReportOmniboxAutofocusHeader)) {
+     return;
 diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc
 --- a/components/variations/net/variations_http_headers.cc
 +++ b/components/variations/net/variations_http_headers.cc
@@ -281,10 +294,21 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
      // Note the criteria for attaching client experiment headers:
      // 1. We only transmit to Google owned domains which can evaluate
      // experiments.
+diff --git a/components/variations/net/variations_url_loader_throttle.cc b/components/variations/net/variations_url_loader_throttle.cc
+--- a/components/variations/net/variations_url_loader_throttle.cc
++++ b/components/variations/net/variations_url_loader_throttle.cc
+@@ -47,6 +47,7 @@ VariationsURLLoaderThrottle::~VariationsURLLoaderThrottle() = default;
+ void VariationsURLLoaderThrottle::AppendThrottleIfNeeded(
+     const variations::VariationsClient* variations_client,
+     std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
++  if ((true)) return;
+   if (!variations_client || variations_client->IsOffTheRecord()) {
+     return;
+   }
 diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
 --- a/components/variations/service/variations_field_trial_creator.cc
 +++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -126,6 +126,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
+@@ -130,6 +130,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
  }
  
  #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,7 +316,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
  // Determines whether the field trial testing config defined in
  // testing/variations/fieldtrial_testing_config.json should be applied. If the
  // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing
-@@ -333,9 +334,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
+@@ -374,9 +375,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
          metrics_state_manager->GetLowEntropySource());
    }
  
@@ -302,7 +326,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
    platform_field_trials->RegisterFeatureOverrides(feature_list.get());
  
    base::FeatureList::SetInstance(std::move(feature_list));
-@@ -666,6 +664,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+@@ -725,6 +723,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
      base::FeatureList* feature_list,
      SafeSeedManager* safe_seed_manager,
      std::unique_ptr<ClientFilterableState> client_state) {
@@ -310,7 +334,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
    TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    CHECK(!create_trials_from_seed_called_);
-@@ -782,6 +781,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+@@ -844,6 +843,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
  
  void VariationsFieldTrialCreator::LoadSeedFromJsonFile(
      const base::FilePath& json_seed_path) {
@@ -345,7 +369,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
  }
  
  // Returns the already downloaded first run seed, and clear the seed from the
-@@ -628,7 +613,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -636,7 +621,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
    // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
    // had a chance to run yet from the previous request. In this case, don't
    // start a new request and just let the previous one finish.
@@ -357,7 +381,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/loader/url_loader_throttles.cc
 --- a/content/browser/loader/url_loader_throttles.cc
 +++ b/content/browser/loader/url_loader_throttles.cc
-@@ -51,8 +51,6 @@ CreateContentBrowserURLLoaderThrottles(
+@@ -54,8 +54,6 @@ CreateContentBrowserURLLoaderThrottles(
    // TODO(crbug.com/40135370): Consider whether we want to use the WebContents
    // to determine the value for variations::Owner. Alternatively, this is the
    // browser side, and we might be fine with Owner::kUnknown.
@@ -366,7 +390,7 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
  
    ClientHintsControllerDelegate* client_hint_delegate =
        browser_context->GetClientHintsControllerDelegate();
-@@ -136,11 +134,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
+@@ -139,11 +137,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
    std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles =
        GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive(
            browser_context, frame_tree_node_id);
@@ -404,11 +428,10 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/brows
 diff --git a/content/renderer/variations_render_thread_observer.cc b/content/renderer/variations_render_thread_observer.cc
 --- a/content/renderer/variations_render_thread_observer.cc
 +++ b/content/renderer/variations_render_thread_observer.cc
-@@ -54,15 +54,6 @@ VariationsRenderThreadObserver::~VariationsRenderThreadObserver() = default;
- void VariationsRenderThreadObserver::AppendThrottleIfNeeded(
-     const url::Origin& top_frame_origin,
+@@ -57,14 +57,6 @@ void VariationsRenderThreadObserver::AppendThrottleIfNeeded(
      std::vector<std::unique_ptr<blink::URLLoaderThrottle>>* throttles) {
--
+   variations::OmniboxAutofocusURLLoaderThrottle::AppendThrottleIfNeeded(
+       throttles);
 -  variations::mojom::VariationsHeadersPtr variations_headers =
 -      GetVariationsData()->GetVariationsHeaders();
 -
@@ -424,10 +447,8 @@ diff --git a/cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-tr
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-trials.inc
-@@ -0,0 +1,3 @@
-+SET_CROMITE_FEATURE_DISABLED(kTopLevelTpcdOriginTrial);
-+SET_CROMITE_FEATURE_DISABLED(kTpcdTrialSettings);
-+SET_CROMITE_FEATURE_DISABLED(kTopLevelTpcdTrialSettings);
+@@ -0,0 +1 @@
++// empty file
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc
 new file mode 100644
 --- /dev/null