Update README with RendererAppContainer instructions (#2509)

Added note about running icacls for RendererAppContainer flag.

.github/workflows/build_additional_targets.yaml

@@ -111,7 +111,6 @@ jobs:
         - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/chr_arm64:/home/lg/working_dir/chromium/src/out/chr_arm64
         - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/chr_x64:/home/lg/working_dir/chromium/src/out/chr_x64
         - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/x64_webview:/home/lg/working_dir/chromium/src/out/x64_webview
-        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64_webview:/home/lg/working_dir/chromium/src/out/arm64_webview
         - /tmp/proxy:/tmp/proxy
         - /win_sdk:/win_sdk
 
@@ -145,10 +144,6 @@ jobs:
           test -d chromium/src/out/x64_webview || sudo mkdir -p chromium/src/out/x64_webview && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/x64_webview
-
-          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 mkdir -p /run/user/1000/
           sudo chown lg /run/user/1000/
@@ -177,27 +172,9 @@ jobs:
           gn args out/x64_webview/ --list >out/x64_webview/gn_list
           echo "::endgroup::"
 
-          ninja -C out/x64_webview system_webview_apk system_webview_shell
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/x64_webview system_webview_apk system_webview_shell --offline
           cp ../../cromite/build/RELEASE out/x64_webview
 
-      - name: Build Cromite System WebView arm64
-        shell: bash
-        run: |
-          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
-          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
-          echo "::endgroup::"
-
-          echo "::group::-------- gn args"
-          gn args out/arm64_webview/ --list --short
-          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list
-          echo "::endgroup::"
-
-          ninja -C out/arm64_webview system_webview_apk system_webview_shell
-          cp ../../cromite/build/RELEASE out/arm64_webview
-
       - name: Prepare Build Container for vanilla chromium
         shell: bash
         run: |
@@ -224,7 +201,7 @@ jobs:
           gn args out/chr_x64/ --list >out/chr_x64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/chr_x64 chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/chr_x64 chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/chr_x64
 
@@ -243,7 +220,7 @@ jobs:
           gn args out/chr_arm64/ --list >out/chr_arm64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/chr_arm64 chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/chr_arm64 chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/chr_arm64
 
@@ -262,6 +239,6 @@ jobs:
           gn args out/chr_arm/ --list >out/chr_arm/gn_list
           echo "::endgroup::"
 
-          ninja -C out/chr_arm chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/chr_arm chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/chr_arm

.github/workflows/build_cromite.yaml

@@ -177,11 +177,12 @@ 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
         KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/arm64/kythe
-        # cross build
+        # cross build (change also release.yaml)
         DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.26100.0/
         WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.26100.0/Windows Kits/10/"
         GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.26100.0/
@@ -197,6 +198,7 @@ jobs:
         - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/x64
         - /storage/images/${{ github.event.inputs.sha }}/linux/${{ github.event.inputs.debug }}/lin64:/home/lg/working_dir/chromium/src/out/lin64
         - /storage/images/${{ github.event.inputs.sha }}/win/x64:/home/lg/working_dir/chromium/src/out/win64
+        - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64_webview:/home/lg/working_dir/chromium/src/out/arm64_webview
         - /tmp/proxy:/tmp/proxy
         - /win_sdk:/win_sdk
 
@@ -214,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
@@ -234,6 +236,14 @@ jobs:
           test -d chromium/src/out/lin64 || sudo mkdir -p chromium/src/out/lin64 && \
             sudo chown lg chromium/src/out &&
             sudo chown lg chromium/src/out/lin64
+
+          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
@@ -269,8 +279,8 @@ jobs:
           gn args out/x64/ --list >out/x64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/x64 chrome_public_bundle
-          ninja -C out/x64 chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/x64 chrome_public_bundle --offline
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/x64 chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/x64
 
@@ -298,7 +308,7 @@ jobs:
           gn args out/win64/ --list >out/win64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/win64 chrome
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/win64 chrome --offline
 
           cp ../../cromite/build/RELEASE out/win64
 
@@ -326,8 +336,8 @@ jobs:
           gn args out/arm64/ --list >out/arm64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/arm64 chrome_public_bundle
-          ninja -C out/arm64 chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64 chrome_public_bundle --offline
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64 chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/arm64
 
@@ -347,7 +357,7 @@ jobs:
           cd $WORKSPACE/chromium/src
 
           echo "::group::-------- generating breakpad symbols"
-          ninja -C out/arm64 minidump_stackwalk dump_syms
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64 minidump_stackwalk dump_syms --offline
           components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/arm64 \
              --symbols-dir=out/arm64/symbols/ --binary=out/arm64/lib.unstripped/libchrome.so \
              --platform=android --clear --verbose
@@ -363,7 +373,7 @@ jobs:
           PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
           cd $WORKSPACE/chromium/src
 
-          tools/binary_size/supersize archive out/arm64/chrome.size --apk-file out/arm64/apks/ChromePublic.apk -v
+          vpython3 tools/binary_size/libsupersize/main.py archive out/arm64/chrome.size --apk-file out/arm64/apks/ChromePublic.apk -v
 
       - name: Build Cromite Android arm
         if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || github.event.inputs.build == 'all') }}
@@ -381,8 +391,8 @@ jobs:
           gn args out/arm/ --list >out/arm/gn_list
           echo "::endgroup::"
 
-          ninja -C out/arm chrome_public_bundle
-          ninja -C out/arm chrome_public_apk
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm chrome_public_bundle --offline
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm chrome_public_apk --offline
 
           cp ../../cromite/build/RELEASE out/arm
 
@@ -410,7 +420,7 @@ jobs:
           gn args out/lin64/ --list >out/lin64/gn_list
           echo "::endgroup::"
 
-          ninja -C out/lin64 chrome chrome_sandbox
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/lin64 chrome chrome_sandbox --offline
 
           cp ../../cromite/build/RELEASE out/lin64
 
@@ -422,6 +432,24 @@ jobs:
           $WORKSPACE/ninjatracing/ninjatracing -a $WORKSPACE/chromium/src/out/lin64/.ninja_log >$WORKSPACE/chromium/src/out/lin64/ninja_log_trace.json
           python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/lin64/ninja_log_trace.json
 
+      - name: Build Cromite System WebView arm64
+        shell: bash
+        run: |
+          PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
+          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
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/arm64_webview/ --list --short
+          gn args out/arm64_webview/ --list >out/arm64_webview/gn_list
+          echo "::endgroup::"
+
+          vpython3 /home/lg/working_dir/depot_tools/siso.py ninja -C out/arm64_webview system_webview_apk system_webview_shell --offline
+          cp ../../cromite/build/RELEASE out/arm64_webview
+
       - name: Generate clangd index for Android arm64
         if: ${{ github.event.inputs.clangd == 'true' }}
         shell: bash

.github/workflows/release.yaml

@@ -37,6 +37,7 @@ jobs:
       OUTPUTFILE_X64: /storage/images/${{ github.event.inputs.sha }}/android/false/x64/
       OUTPUTFILE_WIN: /storage/images/${{ github.event.inputs.sha }}/win/x64/
       OUTPUTFILE_LIN: /storage/images/${{ github.event.inputs.sha }}/linux/false/lin64/
+      OUTPUTFILE_WV_ARM64: /storage/images/${{ github.event.inputs.sha }}/android/false/arm64_webview/
 
     steps:
       - name: Login to Docker Hub
@@ -130,7 +131,7 @@ jobs:
           cp $OUTPUTFILE_WIN/chrome_proxy.exe chrome-win/
           cp $OUTPUTFILE_WIN/chrome_pwa_launcher.exe chrome-win/
           cp $OUTPUTFILE_WIN/chrome_wer.dll chrome-win/
-          cp "/win_sdk/10.0.22621.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
+          cp "/win_sdk/sdks/Win11SDK_10.0.26100.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
           cp $OUTPUTFILE_WIN/elevation_service.exe chrome-win/
           cp "$OUTPUTFILE_WIN/First Run" chrome-win/
           cp $OUTPUTFILE_WIN/headless_lib_data.pak chrome-win/
@@ -184,6 +185,7 @@ jobs:
           $GH release upload $VERSION-$CROMITE_SHA chrome-lin64.tar.gz
           echo "::endgroup::"
 
+          # android arm64 symbols
           echo "::group::-------- arm64 symbols"
           zip arm64_symbols.zip ${{ env.OUTPUTFILE_ARM64 }}/dump_syms \
                                 ${{ env.OUTPUTFILE_ARM64 }}/minidump_stackwalk \
@@ -191,6 +193,19 @@ jobs:
           $GH release upload $VERSION-$CROMITE_SHA arm64_symbols.zip
           echo "::endgroup::"
 
+          # android arm64
+          echo "::group::-------- android systemwebview arm64"
+          sudo cp ${{ env.OUTPUTFILE_WV_ARM64 }}/apks/SystemWebView.apk arm64_SystemWebView.apk
+          sudo chown runner arm64_SystemWebView.apk
+
+          sudo cp ${{ env.OUTPUTFILE_WV_ARM64 }}/apks/SystemWebViewShell.apk arm64_SystemWebViewShell.apk
+          sudo chown runner arm64_SystemWebViewShell.apk
+
+          echo Uploading arm64_SystemWebView
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebView.apk
+          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebViewShell.apk
+          echo "::endgroup::"
+
           TIMESTAMP=$(date +%s -r chrome-win.zip)
           echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$CROMITE_SHA"
           $GH release upload $VERSION-$CROMITE_SHA updateurl.txt
@@ -201,7 +216,4 @@ jobs:
             $GH release edit $VERSION-$CROMITE_SHA --draft=false
           fi
 
-          VERSION=$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)
-          docker push uazo/cromite:$VERSION-$CROMITE_SHA
-          docker push uazo/cromite-build:$VERSION-$CROMITE_SHA
 

.github/workflows/release_additional_targets.yaml

@@ -24,7 +24,6 @@ jobs:
     runs-on: ${{ github.event.inputs.type }}
     env:
       IS_DRAFT: ${{ github.event.inputs.draft }}
-      OUTPUTFILE_ARM64: /storage/images/${{ github.event.inputs.sha }}/android/false/arm64_webview/
       OUTPUTFILE_X64: /storage/images/${{ github.event.inputs.sha }}/android/false/x64_webview/
       OUTPUTFILE_CHR_ARM64: /storage/images/${{ github.event.inputs.sha }}/android/false/chr_arm64/
       OUTPUTFILE_CHR_ARM: /storage/images/${{ github.event.inputs.sha }}/android/false/chr_arm/
@@ -48,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
 
@@ -58,19 +57,6 @@ jobs:
 
           echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
 
-          # android arm64
-          echo "::group::-------- android systemwebview arm64"
-          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebView.apk arm64_SystemWebView.apk
-          sudo chown runner arm64_SystemWebView.apk
-
-          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/SystemWebViewShell.apk arm64_SystemWebViewShell.apk
-          sudo chown runner arm64_SystemWebViewShell.apk
-
-          echo Uploading arm64_SystemWebView
-          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebView.apk
-          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebViewShell.apk
-          echo "::endgroup::"
-
           # android x64
           echo "::group::-------- android systemwebview x64"
           sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/SystemWebView.apk x64_SystemWebView.apk

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 @@
-140.0.7339.128
+142.0.7444.176

build/cromite.gn_args

@@ -8,7 +8,6 @@ disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_iterator_debugging=false
 enable_mdns=false
-enable_nacl=false
 enable_remoting=false
 enable_reporting=false
 enable_vr=false
@@ -24,7 +23,6 @@ use_debug_fission=true
 use_errorprone_java_compiler=false
 use_official_google_api_keys=false
 use_rtti=false
-use_sysroot=false
 webview_includes_weblayer=false
 enable_arcore=false
 enable_openxr=false
@@ -65,7 +63,6 @@ if (target_os == "android" || target_os == "win") {
 
 # disable passthrough audio codecs
 enable_platform_dts_audio = false
-enable_passthrough_audio_codecs = false
 
 # disabled the use of the context snapshot
 # see https://github.com/uazo/cromite/pull/317 for context
@@ -89,6 +86,12 @@ enable_request_header_integrity = false
 # Disable precompiled headers because they are incompatible with the unsafe_buffers configuration
 enable_precompiled_headers = false
 
+# Disable integration with Gemini
+enable_glic = false
+
+# Disable TFLite with XNNPACK
+build_tflite_with_xnnpack = false
+
 declare_args() {
   _is_debug_build = ""
   build_webview = false
@@ -116,7 +119,7 @@ if (target_os == "android") {
   }
 
   cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")
-  
+
   disable_android_lint = true
 
   _is_debug_build = getenv("TARGET_ISDEBUG")

build/cromite_patches_list.txt

@@ -304,7 +304,10 @@ Android-Pixel-Perfect-Mode.patch
 Set-caret-blink-interval-to-default.patch
 Set-the-screen-frame-rate-to-60-Hz.patch
 Disable-Device-Attributes-API.patch
+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
 
 # temporary or wip patches
 Temp-PerformanceNavigationTiming-privacy-fix.patch
@@ -314,9 +317,9 @@ Temp-guard-FileSystemAccessPersistentPermissions.patch
 Never-treat-Proguard-warnings-as-errors.patch
 Temp-disable-experimental-web-platform-features.patch
 Block-leakage-of-urls-in-sandbox-iframes.patch
-Temporarily-disable-Tab-Group-Sync-Android.patch
 Fix-chromium-build-bugs.patch
 Try-to-fix-2082.patch
+Temp-use-PREVIEW-for-IDCompositionDevice5.patch
 
 # adblock patches
 eyeo-133.0.6943.49-base.patch
@@ -325,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
+Backport-v143-android-extensions-changes.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
-@@ -236,6 +236,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -242,6 +242,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;
-@@ -985,6 +986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -1004,6 +1005,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
          super.onStartWithNative();
  
          ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ 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
-@@ -184,6 +184,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -185,6 +185,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
@@ -51,7 +51,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
-@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {
+@@ -164,6 +164,7 @@ public abstract class ChromeFeatureList {
              "AccountForSuppressedKeyboardInsets";
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
              "AdaptiveButtonInTopToolbarCustomizationV2";
@@ -59,23 +59,23 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
              "AdaptiveButtonInTopToolbarPageSummary";
      public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
-@@ -768,6 +769,8 @@ public abstract class ChromeFeatureList {
+@@ -807,6 +808,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
-             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false);
+             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
      public static final CachedFlag sAppSpecificHistoryViewIntent =
              newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
      public static final CachedFlag sAsyncNotificationManager =
-@@ -1080,6 +1083,7 @@ public abstract class ChromeFeatureList {
-                     sAccountForSuppressedKeyboardInsets,
+@@ -1130,6 +1133,7 @@ public abstract class ChromeFeatureList {
                      sAllowTabClosingUponMinimization,
-                     sAndroidAppIntegration,
+                     sAndroidAnimatedProgressBarInBrowser,
+                     sAndroidAnimatedProgressBarInViz,
 +                    sAllowUserCertificates,
                      sAndroidAppIntegrationModule,
                      sAndroidAppIntegrationMultiDataSource,
-                     sAndroidAppIntegrationV2,
+                     sAndroidBottomToolbar,
 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
@@ -120,7 +120,7 @@ diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/j
      public static AndroidCertVerifyResult verifyServerCertificates(
              byte[][] certChain,
              String authType,
-@@ -637,6 +639,9 @@ public class X509Util {
+@@ -639,6 +641,9 @@ public class X509Util {
                  X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);
                  isIssuedByKnownRoot = isKnownRoot(root);
              }

build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

@@ -4,21 +4,22 @@ Subject: Add Alt+D hotkey to focus address bar
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../src/org/chromium/chrome/browser/KeyboardShortcuts.java   | 5 +++++
- 1 file changed, 5 insertions(+)
+ .../src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -890,6 +890,11 @@ public class KeyboardShortcuts {
-                     KeyEvent.KEYCODE_B,
-                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));
+@@ -883,6 +883,12 @@ public class KeyboardShortcuts {
+                     KeyEvent.KEYCODE_ESCAPE,
+                     KeyEvent.META_CTRL_ON);
          }
 +        addShortcut(context,
-+            shortcutGroupsById.get(R.string.keyboard_shortcut_chrome_feature_group_header),
-+            R.string.keyboard_shortcut_address_bar,
-+            KeyEvent.KEYCODE_D,
-+            KeyEvent.META_ALT_ON);
++                    shortcutGroupsById,
++                    R.string.keyboard_shortcut_chrome_feature_group_header,
++                    R.string.keyboard_shortcut_address_bar,
++                    KeyEvent.KEYCODE_D,
++                    KeyEvent.META_ALT_ON);
          return new ArrayList<>(shortcutGroupsById.values());
      }
  

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
-@@ -408,6 +408,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -413,6 +413,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
-@@ -149,6 +149,10 @@ bool IsReducePPMsEnabled() {
+@@ -188,6 +188,10 @@ bool IsReducePPMsEnabled() {
    return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
  }
  
@@ -29,15 +29,15 @@ diff --git a/base/features.cc b/base/features.cc
 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
-@@ -7,6 +7,7 @@
- #pragma allow_unsafe_libc_calls
- #endif
+@@ -2,6 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
  
 +#include "base/features.h"
  #include "content/renderer/render_process_impl.h"
  
  #include "build/build_config.h"
-@@ -127,10 +128,18 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -122,10 +123,18 @@ RenderProcessImpl::RenderProcessImpl()
        base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDisallowV8FeatureFlagOverrides);
    if (!disallow_v8_feature_flag_overrides) {

build/patches/Add-a-GN-flag-to-disable-trybot-verification.patch

@@ -27,13 +27,14 @@ diff --git a/chrome/android/expectations/expectations.gni b/chrome/android/expec
 +enable_libs_and_assets_verification = enable_trybot_verification &&
      !enable_chrome_android_internal && !is_component_build &&
      !use_jacoco_coverage && is_official_build &&
-     (target_cpu == "arm64" && android_channel == "stable")
-@@ -15,6 +19,6 @@ enable_libs_and_assets_verification =
+     ((target_cpu == "arm64" || target_cpu == "x64") &&
+@@ -16,7 +20,7 @@ enable_libs_and_assets_verification =
  # use_jacoco_coverage: Adds proguard flags.
  # android_channel: Manifest entries vary based on channel.
  # target_cpu: android:versionCode varies.
 -enable_manifest_verification =
 +enable_manifest_verification = enable_trybot_verification &&
      !is_java_debug && !enable_chrome_android_internal && !use_jacoco_coverage &&
-     (target_cpu == "arm64" && android_channel == "stable")
+     ((target_cpu == "arm64" || target_cpu == "x64") &&
+      android_channel == "stable")
 --

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
-@@ -8685,9 +8685,9 @@
+@@ -8924,9 +8924,9 @@
      "expiry_milestone": 150
    },
    {
@@ -28,11 +28,11 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 +    "expiry_milestone": -1
    },
    {
-     "name": "retain-omnibox-on-focus",
+     "name": "rewriter-api-for-gemini-nano",
 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
-@@ -258,6 +258,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -265,6 +265,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
-@@ -36,4 +36,12 @@ bool IsGamepadMultitouchEnabled() {
+@@ -37,4 +37,12 @@ bool IsGamepadMultitouchEnabled() {
    return false;
  }
  
@@ -72,10 +72,10 @@ 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
-@@ -13,8 +13,10 @@ namespace features {
- GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
-     kEnableWindowsGamingInputDataFetcher);
+@@ -15,8 +15,10 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
  GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
+     kEnableSimulatedGamepadDataFetcher);
 +GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
  
  GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();

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

@@ -78,7 +78,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
-@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -101,6 +101,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 +89,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
-@@ -376,6 +376,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -410,6 +410,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
  #endif
    builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -100,7 +100,7 @@ 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
-@@ -226,6 +226,9 @@
+@@ -229,6 +229,9 @@
          <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>
@@ -113,7 +113,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
-@@ -372,7 +372,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
+@@ -375,7 +375,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
          return std::nullopt;
        }
        return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -197,7 +197,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
-@@ -204,6 +204,8 @@
+@@ -207,6 +207,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
  
@@ -206,7 +206,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
-@@ -1605,6 +1607,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1749,6 +1751,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -661,7 +661,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -169,6 +169,8 @@ static_library("ui") {
+@@ -158,6 +158,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -683,7 +683,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
-@@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {
+@@ -426,7 +429,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
    map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
  #endif
@@ -1135,7 +1135,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -50,6 +50,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {
        kChromeUILockScreenNetworkHost,
        kChromeUILockScreenStartReauthHost,
        kChromeUIMobileSetupHost,
@@ -1143,7 +1143,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
        kChromeUIMultiDeviceSetupHost,
        kChromeUINetworkHost,
        kChromeUINotificationTesterHost,
-@@ -71,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -74,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view host) {
  // These hosts will also be suggested by BuiltinProvider.
  base::span<const base::cstring_view> ChromeURLHosts() {
    static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
@@ -1154,7 +1154,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
-@@ -188,6 +188,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+@@ -190,6 +190,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";

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

@@ -28,11 +28,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../chrome/browser/app/ChromeActivity.java    |   4 +
  .../AppMenuPropertiesDelegateImpl.java        |   7 +-
  .../ChromeContextMenuPopulator.java           |   6 +-
- .../CustomTabActivityLifecycleUmaTracker.java |  39 ----
+ .../CustomTabActivityLifecycleUmaTracker.java |  31 ----
  .../CustomTabAppMenuPropertiesDelegate.java   |   4 +
  .../CustomTabIntentDataProvider.java          |  10 +
  .../browser/download/DownloadUtils.java       |  13 +-
- .../history/HistoryContentManager.java        |   7 +-
+ .../history/HistoryContentManager.java        |   9 +-
  .../browser/history/HistoryManager.java       |  27 ++-
  .../chrome/browser/history/HistoryPage.java   |  16 ++
  .../native_page/NativePageFactory.java        |   4 +-
@@ -42,7 +42,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../HistoricalTabModelObserver.java           |   5 +-
  .../tab/tab_restore/HistoricalTabSaver.java   |   2 +-
  .../tab_restore/HistoricalTabSaverImpl.java   |  17 +-
- .../TabbedAppMenuPropertiesDelegate.java      |   6 +-
+ .../TabbedAppMenuPropertiesDelegate.java      |   4 +-
  .../tabbed_mode/TabbedRootUiCoordinator.java  |   4 +-
  .../browser/tabmodel/ChromeTabCreator.java    |   5 +-
  .../tabmodel/TabModelSelectorImpl.java        |   3 +
@@ -68,10 +68,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/profiles/profile_selections.cc |  10 +
  chrome/browser/profiles/profile_selections.h  |   7 +-
  .../browser/ui/android/native_page/BUILD.gn   |   2 +
- .../browser/ui/native_page/NativePage.java    |  22 ++-
+ .../browser/ui/native_page/NativePage.java    |  17 +-
  .../browser/omnibox/LocationBarMediator.java  |   8 +
  .../strings/android_chrome_strings.grd        |  25 +++
- .../browser/toolbar/LocationBarModel.java     |   5 +-
+ .../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 +88,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, 797 insertions(+), 111 deletions(-)
+ 69 files changed, 791 insertions(+), 103 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,8 +101,8 @@ 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
-@@ -620,6 +620,7 @@ chrome_java_resources = [
-   "java/res/xml/main_preferences_legacy.xml",
+@@ -638,6 +638,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",
 +  "java/res/xml/incognito_preferences.xml",
@@ -120,14 +120,14 @@ 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",
-@@ -908,6 +909,7 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
+@@ -925,6 +926,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",
 +  "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java",
    "java/src/org/chromium/chrome/browser/privacy_sandbox/CctHandler.java",
    "java/src/org/chromium/chrome/browser/privacy_sandbox/ChromeTrackingProtectionDelegate.java",
-   "java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandboxSurveyController.java",
+   "java/src/org/chromium/chrome/browser/privacy_sandbox/PrivacySandbox3pcdRollbackMessageController.java",
 diff --git a/chrome/android/java/res/xml/incognito_preferences.xml b/chrome/android/java/res/xml/incognito_preferences.xml
 new file mode 100644
 --- /dev/null
@@ -247,7 +247,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -74,6 +74,10 @@ import org.chromium.build.annotations.Nullable;
+@@ -71,6 +71,10 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.build.annotations.UsedByReflection;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
@@ -258,9 +258,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.app.ChromeActivity;
-@@ -794,14 +798,19 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -837,15 +841,20 @@ public class ChromeTabbedActivity extends ChromeActivity {
+             }
  
-             Profile profile = mTabModelSelector.getCurrentModel().getProfile();
              // For saving non-incognito tab closures for Recent Tabs.
 -            mHistoricalTabModelObserver =
 -                    new HistoricalTabModelObserver(
@@ -276,18 +276,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
                                      .getTabGroupModelFilterProvider()
 -                                    .getTabGroupModelFilter(false));
 -            mHistoricalTabModelObserver.addSecondaryTabModelSupplier(
--                    ArchivedTabModelOrchestrator.getForProfile(profile)::getTabModel);
--
+-                    ArchivedTabModelOrchestrator.getForProfile(currentTabModel.getProfile())
 +                                    .getTabGroupModelFilter(alwaysIncognito));
 +                mHistoricalTabModelObserver.addSecondaryTabModelSupplier(
-+                        ArchivedTabModelOrchestrator.getForProfile(profile)::getTabModel);
++                        ArchivedTabModelOrchestrator.getForProfile(currentTabModel.getProfile())
+                             ::getTabModel);
+-
 +            }
              // Defer creation of this helper so it triggers after TabGroupModelFilter observers.
              mUndoRefocusHelper =
                      new UndoRefocusHelper(
-@@ -3137,7 +3146,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
-         }
+@@ -3299,7 +3308,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
  
+         // We determine SupportedProfileType in onPreCreate().
          // We determine the model as soon as possible so every systems get initialized coherently.
 -        boolean startIncognito =
 +        boolean startIncognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito() ||
@@ -297,7 +298,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
-@@ -95,6 +95,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
+@@ -100,6 +100,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.chrome.browser.device.DeviceClassManager;
  import org.chromium.chrome.browser.devtools.DevToolsWindowAndroid;
@@ -305,7 +306,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils;
  import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
  import org.chromium.chrome.browser.download.DownloadManagerService;
-@@ -2000,6 +2001,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2076,6 +2077,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -318,16 +319,16 @@ 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
-@@ -88,6 +88,8 @@ import java.lang.annotation.RetentionPolicy;
- import java.util.Iterator;
+@@ -92,6 +92,8 @@ import java.util.Iterator;
  import java.util.List;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -606,8 +608,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -635,8 +637,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
                  && !isNativePage
                  && !isFileScheme
                  && !isContentScheme
@@ -342,7 +343,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.supplier.Supplier;
+@@ -41,6 +41,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;
@@ -350,7 +351,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;
-@@ -420,6 +421,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -430,6 +431,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
          mShowEphemeralTabNewLabel = null;
          mCustomActionMap.clear();
  
@@ -360,7 +361,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
          List<ModelList> groupedItems = new ArrayList<>();
  
          if (mParams.isPage() && shouldShowEmptySpaceContextMenu()) {
-@@ -489,7 +493,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -501,7 +505,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -372,29 +373,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
-@@ -63,45 +63,6 @@ public class CustomTabActivityLifecycleUmaTracker
+@@ -68,37 +68,6 @@ public class CustomTabActivityLifecycleUmaTracker
      private boolean mIsInitialResume = true;
  
      private void recordIncognitoLaunchReason() {
 -        // TODO(crbug.com/352525607): Separate Ephemeral and Incognito CCT metrics.
--        @IntentHandler.IncognitoCctCallerId int incognitoCctCallerId;
--        if (mIntentDataProvider.getCustomTabMode() == CustomTabProfileType.INCOGNITO) {
--            incognitoCctCallerId =
--                    ((IncognitoCustomTabIntentDataProvider) mIntentDataProvider)
--                            .getFeatureIdForMetricsCollection();
--        } else {
--            incognitoCctCallerId =
--                    ((EphemeralCustomTabIntentDataProvider) mIntentDataProvider)
--                            .getFeatureIdForMetricsCollection();
--        }
+-        @BrowserServicesIntentDataProvider.IncognitoCctCallerId
+-        int incognitoCctCallerId = mIntentDataProvider.getFeatureIdForMetricsCollection();
 -
 -        RecordHistogram.recordEnumeratedHistogram(
 -                "CustomTabs.IncognitoCctCallerId",
 -                incognitoCctCallerId,
--                IntentHandler.IncognitoCctCallerId.NUM_ENTRIES);
+-                BrowserServicesIntentDataProvider.IncognitoCctCallerId.NUM_ENTRIES);
 -
 -        // Record which 1P app launched Incognito CCT.
--        if (incognitoCctCallerId == IntentHandler.IncognitoCctCallerId.GOOGLE_APPS) {
+-        if (incognitoCctCallerId
+-                == BrowserServicesIntentDataProvider.IncognitoCctCallerId.GOOGLE_APPS) {
 -            String sendersPackageName = mIntentDataProvider.getClientPackageName();
 -            @IntentHandler.ExternalAppId
 -            int externalId = IntentHandler.mapPackageToExternalAppId(sendersPackageName);
@@ -406,9 +400,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 -            } else {
 -                // Using package name didn't give any meaningful insight on who launched the
 -                // Incognito CCT, falling back to check if they provided EXTRA_APPLICATION_ID.
--                externalId =
--                        IntentHandler.determineExternalIntentSource(
--                                mIntentDataProvider.getIntent(), mActivity);
+-                var intent = assertNonNull(mIntentDataProvider.getIntent());
+-                externalId = IntentHandler.determineExternalIntentSource(intent, mActivity);
 -                RecordHistogram.recordEnumeratedHistogram(
 -                        "CustomTabs.ClientAppId.Incognito",
 -                        externalId,
@@ -421,7 +414,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/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
-@@ -21,6 +21,7 @@ import org.chromium.base.supplier.Supplier;
+@@ -21,6 +21,7 @@ import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
@@ -429,7 +422,7 @@ 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;
-@@ -221,6 +222,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -224,6 +225,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
              openInChromeItemVisible = false;
              tryAddingReadAloud = false;
          }
@@ -442,7 +435,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/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
-@@ -101,6 +101,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -105,6 +105,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.device.mojom.ScreenOrientationLockType;
  import org.chromium.net.NetId;
  
@@ -452,7 +445,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;
-@@ -1260,6 +1263,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1287,6 +1290,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          return getInitialActivityWidth() > 0;
      }
  
@@ -488,8 +481,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  /** A class containing some utility static methods. */
  @NullMarked
  public class DownloadUtils {
-@@ -313,7 +318,13 @@ public class DownloadUtils {
-     public static boolean isAllowedToDownloadPage(Tab tab) {
+@@ -292,7 +297,13 @@ public class DownloadUtils {
+     public static boolean isAllowedToDownloadPage(@Nullable Tab tab) {
          if (tab == null) return false;
  
 -        if (tab.isIncognito()
@@ -506,22 +499,24 @@ 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
-@@ -307,7 +307,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -308,8 +308,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.generateFooterItems();
  
          // Listen to changes in sign in state.
--        IdentityServicesProvider.get().getSigninManager(profile).addSignInStateObserver(this);
+-        assumeNonNull(IdentityServicesProvider.get().getSigninManager(profile))
+-                .addSignInStateObserver(this);
 +        // getSigninManager is null in incognito
 +        if (IdentityServicesProvider.get().getSigninManager(profile) != null)
 +            IdentityServicesProvider.get().getSigninManager(profile).addSignInStateObserver(this);
  
          // Create PrefChangeRegistrar to receive notifications on preference changes.
          mPrefChangeRegistrar = PrefServiceUtil.createFor(profile);
-@@ -383,7 +385,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -386,8 +387,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.onDestroyed();
          mLargeIconBridge.destroy();
          mLargeIconBridge = null;
--        IdentityServicesProvider.get().getSigninManager(mProfile).removeSignInStateObserver(this);
+-        assumeNonNull(IdentityServicesProvider.get().getSigninManager(mProfile))
+-                .removeSignInStateObserver(this);
 +        if (IdentityServicesProvider.get().getSigninManager(mProfile) != null)
 +            IdentityServicesProvider.get().getSigninManager(mProfile).removeSignInStateObserver(this);
          mPrefChangeRegistrar.destroy();
@@ -530,9 +525,9 @@ 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/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
-@@ -57,6 +57,14 @@ import org.chromium.ui.base.Clipboard;
- import java.util.List;
+@@ -61,6 +61,14 @@ import java.util.List;
  import java.util.function.Function;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +import org.chromium.chrome.browser.profiles.Profile;
@@ -543,9 +538,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 +import org.chromium.chrome.browser.preferences.Pref;
 +
  /** Combines and manages the different UI components of browsing history. */
+ @NullMarked
  public class HistoryManager
-         implements OnMenuItemClickListener,
-@@ -162,7 +170,7 @@ public class HistoryManager
+@@ -166,7 +174,7 @@ public class HistoryManager
  
          mUmaRecorder.recordOpenHistory();
          // If incognito placeholder is shown, we don't need to create History UI elements.
@@ -554,7 +549,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              mSelectableListLayout = null;
              mRootView = getIncognitoHistoryPlaceholderView();
              return;
-@@ -415,9 +423,22 @@ public class HistoryManager
+@@ -451,9 +459,22 @@ public class HistoryManager
          onBackPressStateChanged();
      }
  
@@ -578,7 +573,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;
          }
-@@ -477,7 +498,7 @@ public class HistoryManager
+@@ -514,7 +535,7 @@ public class HistoryManager
       * @return True if manager handles this event, false if it decides to ignore.
       */
      private boolean onBackPressed() {
@@ -590,9 +585,9 @@ 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
-@@ -17,6 +17,14 @@ import org.chromium.chrome.browser.ui.native_page.NativePageHost;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -20,6 +20,14 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+ 
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +import org.chromium.chrome.browser.profiles.Profile;
@@ -603,9 +598,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 +import org.chromium.chrome.browser.preferences.Pref;
 +
  /** Native page for managing browsing history. */
+ @NullMarked
  public class HistoryPage extends BasicNativePage {
-     private HistoryManager mHistoryManager;
-@@ -45,6 +53,14 @@ public class HistoryPage extends BasicNativePage {
+@@ -49,6 +57,14 @@ public class HistoryPage extends BasicNativePage {
              String url) {
          super(host);
  
@@ -618,26 +613,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 +        }
 +
          Uri uri = Uri.parse(url);
-         assert uri.getHost().equals(UrlConstants.HISTORY_HOST);
+         assert UrlConstants.HISTORY_HOST.equals(uri.getHost());
  
 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
-@@ -19,6 +19,7 @@ import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.OneshotSupplier;
- import org.chromium.base.supplier.Supplier;
+@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
- import org.chromium.chrome.browser.bookmarks.BookmarkPage;
-@@ -371,7 +372,8 @@ public class NativePageFactory {
-             String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) {
+ import org.chromium.chrome.browser.back_press.BackPressManager;
+@@ -396,7 +397,8 @@ public class NativePageFactory {
+ 
          NativePage page;
  
--        switch (NativePage.nativePageType(url, candidatePage, isIncognito, pdfInfo != null)) {
+-        switch (NativePage.nativePageType(gurl, candidatePage, isIncognito, pdfInfo != null)) {
 +        boolean isAlwaysIncognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
-+        switch (NativePage.nativePageType(url, candidatePage, isIncognito, pdfInfo != null, isAlwaysIncognito)) {
++        switch (NativePage.nativePageType(gurl, candidatePage, isIncognito, pdfInfo != null, isAlwaysIncognito)) {
              case NativePageType.NONE:
                  return null;
              case NativePageType.CANDIDATE:
@@ -670,7 +665,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
          mActiveTab = tab;
          mTabModelSelector = tabModelSelector;
          mShowHistoryManager = showHistoryManager;
-@@ -301,6 +311,22 @@ public class RecentTabsManager
+@@ -302,6 +312,22 @@ public class RecentTabsManager
       */
      public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
          if (mIsDestroyed) return;
@@ -732,7 +727,7 @@ new file mode 100644
 +
 +import org.chromium.base.supplier.ObservableSupplier;
 +import org.chromium.base.supplier.ObservableSupplierImpl;
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
 +
 +import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.preferences.Pref;
@@ -808,7 +803,7 @@ new file mode 100644
 +                                ApplicationLifetime.terminate(true);
 +                        }
 +                }, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_UNKNOWN)
-+                .setSingleLine(false)
++                .setDefaultLines(false)
 +                .setAction(getActivity().getString(R.string.relaunch),
 +                        /*actionData*/null)
 +                .setDuration(/*durationMs*/70000);
@@ -876,7 +871,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
-@@ -49,6 +49,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
+@@ -50,6 +50,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
  import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
  import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -884,7 +879,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;
-@@ -231,6 +232,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -229,6 +230,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
                              SigninAndHistorySyncActivityLauncherImpl.get(),
                              new SettingsCustomTabLauncherImpl()));
          }
@@ -897,9 +892,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
-@@ -32,6 +32,8 @@ import java.util.HashMap;
- import java.util.List;
+@@ -32,6 +32,8 @@ import java.util.List;
  import java.util.Set;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
@@ -933,9 +928,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabSaverImpl.java
-@@ -30,6 +30,8 @@ import java.util.Arrays;
- import java.util.Collections;
+@@ -30,6 +30,8 @@ import java.util.Collections;
  import java.util.List;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
@@ -991,7 +986,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
          // Check the secondary tab model to see if the tab was moved instead of deleted.
          if (tabIdExistsInSecondaryModel(tab.getId())) return false;
  
-@@ -293,7 +296,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
+@@ -294,7 +297,7 @@ public class HistoricalTabSaverImpl implements HistoricalTabSaver {
  
      @NativeMethods
      interface Natives {
@@ -1003,30 +998,28 @@ 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.base.supplier.Supplier;
- import org.chromium.build.annotations.Contract;
+@@ -27,6 +27,7 @@ import org.chromium.build.annotations.Contract;
+ import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ai.AiAssistantService;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
-@@ -220,7 +221,10 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-         }
+@@ -241,7 +242,8 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
  
-         // New Tab
--        modelList.add(buildNewTabItem());
+         // 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.
+-        if (!IncognitoUtils.shouldOpenIncognitoAsWindow() || !isIncognitoShowing()) {
 +        boolean always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
-+        if (!always_incognito) {
-+            modelList.add(buildNewTabItem());
-+        }
- 
-         // New Incognito Tab
-         modelList.add(buildNewIncognitoTabItem());
++        if (!always_incognito || !IncognitoUtils.shouldOpenIncognitoAsWindow() || !isIncognitoShowing()) {
+             modelList.add(buildNewTabItem());
+         }
+         if (!IncognitoUtils.shouldOpenIncognitoAsWindow() || isIncognitoShowing()) {
 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
-@@ -212,6 +212,8 @@ import org.chromium.content_public.common.ContentSwitches;
+@@ -210,6 +210,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;
@@ -1035,7 +1028,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.ui.base.IntentRequestTracker;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.display.DisplayUtil;
-@@ -1247,7 +1249,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1281,7 +1283,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              () -> {
                                  mTabCreatorManagerSupplier
                                          .get()
@@ -1047,9 +1040,9 @@ 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/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
-@@ -53,6 +53,10 @@ import org.chromium.ui.base.PageTransition;
- import org.chromium.ui.base.WindowAndroid;
- import org.chromium.url.GURL;
+@@ -56,6 +56,10 @@ import org.chromium.url.GURL;
+ import java.util.Collections;
+ import java.util.function.Supplier;
  
 +import org.chromium.base.ContextUtils;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
@@ -1058,7 +1051,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */
  @NullMarked
  public class ChromeTabCreator extends TabCreator
-@@ -580,7 +584,6 @@ public class ChromeTabCreator extends TabCreator
+@@ -587,7 +591,6 @@ public class ChromeTabCreator extends TabCreator
      // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome.
      public @Nullable Tab launchUrlFromExternalApp(
              LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@@ -1069,15 +1062,15 @@ 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
-@@ -17,6 +17,7 @@ import org.chromium.build.annotations.EnsuresNonNull;
- import org.chromium.build.annotations.Initializer;
+@@ -20,6 +20,7 @@ import org.chromium.build.annotations.Initializer;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.ntp.RecentlyClosedBridge;
-@@ -127,6 +128,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
+ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
+@@ -139,6 +140,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
          ProfileProvider profileProvider = mProfileProviderSupplier.get();
          assert profileProvider != null;
  
@@ -1098,7 +1091,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
  import java.io.BufferedInputStream;
  import java.io.ByteArrayInputStream;
  import java.io.DataInputStream;
-@@ -838,6 +840,13 @@ public class TabPersistentStore {
+@@ -837,6 +839,13 @@ public class TabPersistentStore {
                  }
              }
          }
@@ -1115,7 +1108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 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.Supplier;
+@@ -50,6 +50,7 @@ import org.chromium.base.supplier.OneshotSupplierImpl;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
@@ -1123,12 +1116,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
  import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -859,7 +860,7 @@ public class ToolbarManager
-                                 TraceEvent.end("isOfflinePage");
+@@ -869,7 +870,7 @@ public class ToolbarManager
                                  return ret;
                              }
--                        });
-+                        }, AlwaysIncognitoLinkInterceptor.isAlwaysIncognito());
+                         },
+-                        mToolbarPositionSupplier);
++                        mToolbarPositionSupplier, AlwaysIncognitoLinkInterceptor.isAlwaysIncognito());
          mControlContainer = controlContainer;
          mToolbarHairline = mControlContainer.findViewById(R.id.toolbar_hairline);
  
@@ -1142,9 +1135,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
  /** Stores info about a web app. */
+ @NullMarked
  public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider {
-     private final Drawable mCloseButtonIcon;
-@@ -46,6 +48,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -47,6 +49,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
      private final ColorProviderImpl mDarkColorProvider;
      private @DisplayMode.EnumType int mResolvedDisplayMode = DisplayMode.UNDEFINED;
  
@@ -1153,7 +1146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
      /** Returns the toolbar color to use if a custom color is not specified by the webapp. */
      public static int getDefaultToolbarColor() {
          return Color.WHITE;
-@@ -81,6 +85,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -82,6 +86,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
          mWebappExtras = webappExtras;
          mWebApkExtras = webApkExtras;
          mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP;
@@ -1164,7 +1157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
      }
  
      @Override
-@@ -176,6 +184,13 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
+@@ -177,6 +185,13 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider
          return mWebApkExtras;
      }
  
@@ -1229,7 +1222,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    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());
-@@ -291,11 +302,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -292,11 +303,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
      const JavaParamRef<jobject>& jtab_android,
      const JavaParamRef<jobject>& state,
@@ -1247,7 +1240,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
-@@ -427,6 +427,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
+@@ -461,6 +461,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
    return AimEligibilityServiceFactory::GetForProfile(profile_);
  }
  
@@ -1374,7 +1367,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 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
-@@ -45,6 +45,9 @@
+@@ -48,6 +48,9 @@
  #include "components/feed/core/v2/public/feed_api.h"      // nogncheck
  #include "components/feed/core/v2/public/feed_service.h"  // nogncheck
  #include "content/public/browser/web_contents.h"
@@ -1384,7 +1377,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"
-@@ -598,6 +601,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -614,6 +617,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1398,7 +1391,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
    if (profile->IsOffTheRecord())
      return nullptr;
  
-@@ -605,6 +615,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -621,6 +631,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1482,7 +1475,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom
 diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
 --- a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
 +++ b/chrome/browser/offline_pages/android/offline_page_model_factory.cc
-@@ -24,6 +24,9 @@
+@@ -23,6 +23,9 @@
  #include "components/keyed_service/core/simple_dependency_manager.h"
  #include "components/offline_pages/core/model/offline_page_model_taskified.h"
  #include "components/offline_pages/core/offline_page_metadata_store.h"
@@ -1492,7 +1485,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
  
  namespace offline_pages {
  
-@@ -55,13 +58,15 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -54,13 +57,15 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
    scoped_refptr<base::SequencedTaskRunner> background_task_runner =
        base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()});
  
@@ -1510,7 +1503,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
    // If base::PathService::Get returns false, the temporary_archives_dir will be
    // empty, and no temporary pages will be saved during this chrome lifecycle.
    base::FilePath temporary_archives_dir;
-@@ -70,7 +75,6 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -69,7 +74,6 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
          temporary_archives_dir.Append(chrome::kOfflinePageArchivesDirname);
    }
  
@@ -1518,7 +1511,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_model_factory.cc
    auto archive_manager = std::make_unique<DownloadArchiveManager>(
        temporary_archives_dir, persistent_archives_dir,
        DownloadPrefs::GetDefaultDownloadDirectory(), background_task_runner,
-@@ -88,4 +92,14 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
+@@ -87,4 +91,14 @@ std::unique_ptr<KeyedService> OfflinePageModelFactory::BuildServiceInstanceFor(
    return model;
  }
  
@@ -1747,7 +1740,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
-@@ -254,6 +254,7 @@
+@@ -257,6 +257,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1755,7 +1748,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"
-@@ -2061,6 +2062,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2203,6 +2204,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1860,22 +1853,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -209,11 +212,12 @@ public interface NativePage {
-      */
-     // TODO(crbug.com/40549331) - Convert to using GURL.
-     static @NativePageType int nativePageType(
--            String url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload) {
-+            String url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload,
-+            boolean isAlwaysIncognito) {
-         if (url == null) return NativePageType.NONE;
- 
-         GURL gurl = new GURL(url);
--        return nativePageType(gurl, candidatePage, isIncognito, hasPdfDownload);
-+        return nativePageType(gurl, candidatePage, isIncognito, hasPdfDownload, isAlwaysIncognito);
-     }
- 
-     /**
-@@ -227,7 +231,8 @@ public interface NativePage {
+@@ -211,7 +214,8 @@ public interface NativePage {
              GURL url,
              @Nullable NativePage candidatePage,
              boolean isIncognito,
@@ -1885,7 +1863,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.
-@@ -245,7 +250,7 @@ public interface NativePage {
+@@ -229,7 +233,7 @@ public interface NativePage {
              // created after the pdf document is re-downloaded in other parts of the code.
              return NativePageType.NONE;
          } else {
@@ -1894,7 +1872,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          }
      }
  
-@@ -257,7 +262,7 @@ public interface NativePage {
+@@ -241,7 +245,7 @@ public interface NativePage {
       *     which do not have chrome or chrome-native scheme.
       */
      private static @NativePageType int chromePageType(
@@ -1903,7 +1881,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)
-@@ -277,7 +282,8 @@ public interface NativePage {
+@@ -261,7 +265,8 @@ public interface NativePage {
              return NativePageType.DOWNLOADS;
          } else if (UrlConstants.HISTORY_HOST.equals(host)) {
              return NativePageType.HISTORY;
@@ -1916,8 +1894,8 @@ 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
-@@ -92,6 +92,11 @@ import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.interpolators.Interpolators;
+@@ -99,6 +99,11 @@ import org.chromium.ui.interpolators.Interpolators;
+ import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.url.GURL;
  
 +import org.chromium.components.user_prefs.UserPrefs;
@@ -1928,7 +1906,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import java.util.ArrayList;
  import java.util.List;
  import java.util.function.BooleanSupplier;
-@@ -419,6 +424,9 @@ class LocationBarMediator
+@@ -448,6 +453,9 @@ class LocationBarMediator
          if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return;
          Tab tab = mLocationBarDataProvider.getTab();
          if (tab == null) return;
@@ -1941,7 +1919,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
-@@ -6675,6 +6675,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6669,6 +6669,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>
@@ -1976,7 +1954,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/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
-@@ -165,6 +165,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -167,6 +167,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
      protected GURL mVisibleGurl = GURL.emptyGURL();
      protected String mFormattedFullUrl;
      protected String mUrlForDisplay;
@@ -1984,14 +1962,13 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
      // 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
-@@ -188,7 +189,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
-             Context context,
+@@ -191,7 +192,8 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
              NewTabPageDelegate newTabPageDelegate,
              UrlFormatter urlFormatter,
--            OfflineStatus offlineStatus) {
-+            OfflineStatus offlineStatus,
+             OfflineStatus offlineStatus,
+-            ObservableSupplier<@ControlsPosition Integer> toolbarPositionSupplier) {
++            ObservableSupplier<@ControlsPosition Integer> toolbarPositionSupplier,
 +            boolean isAlwaysIncognito) {
-+        mIsAlwaysIncognito = isAlwaysIncognito; // (uazo) to do, check
          mContext = context;
          mNtpDelegate = newTabPageDelegate;
          mUrlFormatter = urlFormatter;
@@ -2030,7 +2007,7 @@ new file mode 100644
 +
 +package org.chromium.chrome.browser.ui.messages.snackbar;
 +
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 +
 +/**
@@ -2065,7 +2042,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
-@@ -4108,6 +4108,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -4101,6 +4101,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
  
@@ -2081,7 +2058,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
-@@ -114,10 +114,12 @@ void PrefProvider::RegisterProfilePrefs(
+@@ -120,10 +120,12 @@ void PrefProvider::RegisterProfilePrefs(
  
  PrefProvider::PrefProvider(PrefService* prefs,
                             bool off_the_record,
@@ -2094,7 +2071,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
        store_last_modified_(store_last_modified),
        clock_(base::DefaultClock::GetInstance()) {
    TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
-@@ -140,11 +142,13 @@ PrefProvider::PrefProvider(PrefService* prefs,
+@@ -146,11 +148,13 @@ PrefProvider::PrefProvider(PrefService* prefs,
    WebsiteSettingsRegistry* website_settings =
        WebsiteSettingsRegistry::GetInstance();
    for (const WebsiteSettingsInfo* info : *website_settings) {
@@ -2120,7 +2097,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
                 bool store_last_modified,
                 bool restore_session);
  
-@@ -127,6 +128,7 @@ class PrefProvider : public UserModifiableProvider {
+@@ -130,6 +131,7 @@ class PrefProvider : public UserModifiableProvider {
    raw_ptr<PrefService> prefs_;
  
    const bool off_the_record_;
@@ -2131,7 +2108,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
-@@ -287,6 +287,7 @@ struct ContentSettingEntry {
+@@ -288,6 +288,7 @@ struct ContentSettingEntry {
  
  HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
                                                 bool is_off_the_record,
@@ -2139,7 +2116,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                                                 bool store_last_modified,
                                                 bool restore_session,
                                                 bool should_record_metrics)
-@@ -296,6 +297,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -297,6 +298,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
  #endif
        prefs_(prefs),
        is_off_the_record_(is_off_the_record),
@@ -2147,7 +2124,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()) {
-@@ -309,7 +311,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -310,7 +312,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2167,7 +2144,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -544,6 +545,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -551,6 +552,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -2179,10 +2156,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
-@@ -66,3 +66,7 @@ base::WeakPtr<AutocompleteProviderClient>
- AutocompleteProviderClient::GetWeakPtr() {
+@@ -81,3 +81,7 @@ AutocompleteProviderClient::GetGeminiPrototypeOmniboxService() const {
    return nullptr;
  }
+ #endif  // BUILDFLAG(IS_IOS)
 +
 +bool AutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
 +  return false;
@@ -2190,7 +2167,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
-@@ -154,6 +154,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
+@@ -161,6 +161,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
    virtual bool IsOffTheRecord() const = 0;
    virtual bool IsIncognitoProfile() const = 0;
    virtual bool IsGuestSession() const = 0;
@@ -2201,7 +2178,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
-@@ -432,7 +432,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
+@@ -401,7 +401,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
  
    // Don't make a suggest request if in incognito mode; unless for the Lens
    // searchboxes.
@@ -2213,7 +2190,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
-@@ -916,7 +916,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
+@@ -921,7 +921,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-autoplay-site-setting.patch

@@ -164,7 +164,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
++import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -177,8 +177,8 @@ new file mode 100644
 +public class BromiteAutoplayContentSetting extends BromiteCustomContentSetting {
 +    public BromiteAutoplayContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.AUTOPLAY,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
++              /*defaultEnabledValue*/ ContentSetting.ALLOW,
++              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "autoplay",
 +              /*profilePrefKey*/ "autoplay");
@@ -197,11 +197,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
++    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
++            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_autoplay_enabled;
-+            case ContentSettingValues.BLOCK:
++            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_autoplay_disabled;
 +            default:
 +                return 0;
@@ -229,8 +229,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
++    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
++        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/autoplay.grdp b/components/browser_ui/strings/bromite_content_settings/autoplay.grdp
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
    if (!IsLockedPendingUserGesture())
      return false;
  
-@@ -458,6 +461,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -457,6 +460,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
    }
  }
  

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

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/java/AndroidManifest.xml       |   1 -
  .../menu/bookmark_toolbar_menu_improved.xml   |  14 +
  .../browser/TabbedModeTabDelegateFactory.java |   5 +-
- .../app/bookmarks/BookmarkActivity.java       |  31 ++
+ .../app/bookmarks/BookmarkActivity.java       |  32 ++
  .../native_page/NativePageFactory.java        |   9 +-
  chrome/browser/BUILD.gn                       |  11 +-
  .../bookmarks/android/bookmark_bridge.cc      | 197 ++++++++++++
@@ -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, 809 insertions(+), 24 deletions(-)
+ 40 files changed, 810 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
@@ -94,17 +94,17 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
-@@ -13,6 +13,7 @@ import org.chromium.base.jank_tracker.JankTracker;
- import org.chromium.base.supplier.ObservableSupplier;
+@@ -10,6 +10,7 @@ import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.chrome.browser.app.ChromeActivity;
  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;
- import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-@@ -60,7 +61,7 @@ import java.util.List;
-  * ChromeTabbedActivity}.
+@@ -60,7 +61,7 @@ import java.util.function.Supplier;
   */
+ @NullMarked
  public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
 -    private final Activity mActivity;
 +    private final ChromeActivity mActivity;
@@ -112,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
      private final Supplier<ShareDelegate> mShareDelegateSupplier;
      private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
 @@ -91,7 +92,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
-     private NativePageFactory mNativePageFactory;
+     private final BackPressManager mBackPressManager;
  
      public TabbedModeTabDelegateFactory(
 -            Activity activity,
@@ -123,15 +123,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
-@@ -9,6 +9,7 @@ import static org.chromium.build.NullUtil.assumeNonNull;
+@@ -6,6 +6,8 @@ package org.chromium.chrome.browser.app.bookmarks;
+ 
+ import static org.chromium.build.NullUtil.assumeNonNull;
+ 
++import android.os.Bundle;
++
  import android.content.ComponentName;
  import android.content.Intent;
  import android.text.TextUtils;
-+import android.os.Bundle;
- 
- import org.chromium.base.IntentUtils;
- import org.chromium.build.annotations.NullMarked;
-@@ -32,6 +33,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -35,6 +37,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  
@@ -141,9 +142,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
  /**
   * The activity that displays the bookmark UI on the phone. It keeps a {@link
   * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should
-@@ -46,6 +50,9 @@ public class BookmarkActivity extends SnackbarActivity {
-     private @Nullable BookmarkManagerCoordinator mBookmarkManagerCoordinator;
+@@ -50,6 +55,9 @@ public class BookmarkActivity extends SnackbarActivity {
      private @Nullable BookmarkOpener mBookmarkOpener;
+     private @Nullable OnKeyDownHandler mOnKeyDownHandler;
  
 +    private ActivityWindowAndroid mWindowAndroid;
 +    private IntentRequestTracker mIntentRequestTracker;
@@ -151,10 +152,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onProfileAvailable(Profile profile) {
          super.onProfileAvailable(profile);
-@@ -73,6 +80,14 @@ public class BookmarkActivity extends SnackbarActivity {
-         mBookmarkManagerCoordinator.updateForUrl(url);
-         setContentView(mBookmarkManagerCoordinator.getView());
-         BackPressHelper.create(this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator);
+@@ -82,6 +90,14 @@ public class BookmarkActivity extends SnackbarActivity {
+         mOnKeyDownHandler =
+                 BackPressHelper.create(
+                         this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator);
 +
 +        final boolean listenToActivityState = true;
 +        mIntentRequestTracker = IntentRequestTracker.createFromActivity(this);
@@ -166,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      }
  
      @Override
-@@ -91,6 +106,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -109,6 +125,7 @@ public class BookmarkActivity extends SnackbarActivity {
      @Override
      protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
@@ -174,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
          if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
              assumeNonNull(data);
              BookmarkId bookmarkId =
-@@ -100,6 +116,21 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -118,6 +135,21 @@ public class BookmarkActivity extends SnackbarActivity {
          }
      }
  
@@ -199,33 +200,33 @@ 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
-@@ -19,6 +19,7 @@ import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.OneshotSupplier;
- import org.chromium.base.supplier.Supplier;
+@@ -25,6 +25,7 @@ import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
+ import org.chromium.chrome.browser.back_press.BackPressManager;
  import org.chromium.chrome.browser.bookmarks.BookmarkPage;
- import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier;
-@@ -63,7 +64,7 @@ import org.chromium.ui.util.ColorUtils;
-  * Creates NativePage objects to show chrome-native:// URLs using the native Android view system.
+@@ -76,7 +77,7 @@ import java.util.function.Supplier;
   */
+ @NullMarked
  public class NativePageFactory {
 -    private final Activity mActivity;
 +    private final ChromeActivity mActivity;
      private final BottomSheetController mBottomSheetController;
      private final BrowserControlsManager mBrowserControlsManager;
-     private final Supplier<Tab> mCurrentTabSupplier;
-@@ -87,7 +88,7 @@ public class NativePageFactory {
-     private static NativePage sTestPage;
+     private final Supplier<@Nullable Tab> mCurrentTabSupplier;
+@@ -100,7 +101,7 @@ public class NativePageFactory {
+     private final BackPressManager mBackPressManager;
  
      public NativePageFactory(
--            @NonNull Activity activity,
-+            @NonNull ChromeActivity activity,
-             @NonNull BottomSheetController sheetController,
-             @NonNull BrowserControlsManager browserControlsManager,
-             @NonNull Supplier<Tab> currentTabSupplier,
-@@ -162,7 +163,7 @@ public class NativePageFactory {
+-            Activity activity,
++            ChromeActivity activity,
+             BottomSheetController sheetController,
+             BrowserControlsManager browserControlsManager,
+             Supplier<@Nullable Tab> currentTabSupplier,
+@@ -175,7 +176,7 @@ public class NativePageFactory {
  
      @VisibleForTesting
      static class NativePageBuilder {
@@ -234,20 +235,20 @@ 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;
-@@ -271,7 +272,7 @@ public class NativePageFactory {
-                             mBrowserControlsManager,
+@@ -284,7 +285,7 @@ public class NativePageFactory {
                              mTabModelSelector,
                              mEdgeToEdgeControllerSupplier),
--                    mActivity.getComponentName());
-+                    mActivity.getComponentName(), mActivity);
+                     mActivity.getComponentName(),
+-                    mBackPressManager);
++                    mBackPressManager, mActivity);
          }
  
          protected NativePage buildDownloadsPage(Tab tab) {
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -245,6 +245,8 @@ static_library("browser") {
-     "bluetooth/chrome_bluetooth_delegate_impl_client.h",
+@@ -205,6 +205,8 @@ static_library("browser") {
+     "bad_message.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
 +    "bookmarks/bookmark_html_writer.cc",
@@ -255,9 +256,9 @@ 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",
-@@ -1721,6 +1723,13 @@ static_library("browser") {
-     ]
-   }
+@@ -1625,6 +1627,13 @@ static_library("browser") {
+     "webdata_services/web_data_service_factory.cc",
+   ]
  
 +  if (is_android) {
 +    sources += [
@@ -269,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",
-@@ -3704,8 +3713,6 @@ static_library("browser") {
+@@ -3715,8 +3724,6 @@ static_library("browser") {
        "bookmarks/bookmark_expanded_state_tracker.h",
        "bookmarks/bookmark_expanded_state_tracker_factory.cc",
        "bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -681,16 +682,16 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -57,6 +57,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
- import org.chromium.components.image_fetcher.ImageFetcherConfig;
+@@ -57,6 +57,8 @@ import org.chromium.components.image_fetcher.ImageFetcherConfig;
  import org.chromium.components.image_fetcher.ImageFetcherFactory;
  import org.chromium.ui.KeyboardVisibilityDelegate;
+ import org.chromium.ui.edge_to_edge.EdgeToEdgePadAdjuster;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
-@@ -333,6 +335,13 @@ public class BookmarkManagerCoordinator
+@@ -344,6 +346,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -714,9 +715,9 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.accessibility.AccessibilityState;
- import org.chromium.ui.listmenu.ListMenu;
- import org.chromium.ui.listmenu.ListMenuItemProperties;
-@@ -81,6 +83,47 @@ import java.util.function.BooleanSupplier;
+ import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.DeviceInput;
+@@ -84,6 +86,47 @@ import java.util.function.BooleanSupplier;
  import java.util.function.Consumer;
  import java.util.function.Predicate;
  
@@ -764,7 +765,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
  /** Responsible for BookmarkManager business logic. */
  // TODO(crbug.com/40256938): Remove BookmarkDelegate if possible.
  @NullMarked
-@@ -91,6 +134,9 @@ class BookmarkManagerMediator
+@@ -94,6 +137,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -774,7 +775,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;
-@@ -597,6 +643,14 @@ class BookmarkManagerMediator
+@@ -655,6 +701,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -789,7 +790,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.
-@@ -769,6 +823,235 @@ class BookmarkManagerMediator
+@@ -827,6 +881,235 @@ class BookmarkManagerMediator
          }
      }
  
@@ -1028,7 +1029,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
-@@ -15,6 +15,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+@@ -16,6 +16,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
  import org.chromium.chrome.browser.ui.native_page.NativePageHost;
  import org.chromium.components.embedder_support.util.UrlConstants;
@@ -1038,19 +1039,19 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
  
  /** A native page holding a {@link BookmarkManagerCoordinator} on _tablet_. */
  @NullMarked
-@@ -35,7 +38,8 @@ public class BookmarkPage extends BasicNativePage {
-             SnackbarManager snackbarManager,
+@@ -37,7 +40,8 @@ public class BookmarkPage extends BasicNativePage {
              Profile profile,
              NativePageHost host,
--            @Nullable ComponentName componentName) {
-+            @Nullable ComponentName componentName,
+             @Nullable ComponentName componentName,
+-            BackPressManager backPressManager) {
++            BackPressManager backPressManager,
 +            ChromeActivity activity) {
          super(host);
-         mTitle = host.getContext().getString(R.string.bookmarks);
  
-@@ -56,6 +60,9 @@ public class BookmarkPage extends BasicNativePage {
-                         PriceDropNotificationManagerFactory.create(profile),
-                         host::createEdgeToEdgePadAdjuster);
+         mTitle = host.getContext().getString(R.string.bookmarks);
+@@ -65,6 +69,9 @@ public class BookmarkPage extends BasicNativePage {
+                         backPressManager);
+ 
          mBookmarkManagerCoordinator.setBasicNativePage(this);
 +        mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(),
 +            new ModalDialogManager(
@@ -1250,7 +1251,7 @@ 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
-@@ -251,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -255,6 +255,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kBatchTabRestore,
      &kBlockIntentsWhileLocked,
      &kBookmarkPaneAndroid,
@@ -1261,7 +1262,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
-@@ -689,6 +689,7 @@ public abstract class ChromeFeatureList {
+@@ -712,6 +712,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
      public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1324,7 +1325,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";
-@@ -1017,6 +1019,7 @@ public final class ChromePreferenceKeys {
+@@ -1067,6 +1069,7 @@ public final class ChromePreferenceKeys {
                  AUXILIARY_SEARCH_SCHEMA_VERSION,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1335,7 +1336,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
-@@ -249,6 +249,24 @@ CHAR_LIMIT guidelines:
+@@ -252,6 +252,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>
@@ -1410,7 +1411,7 @@ diff --git a/components/headless/select_file_dialog/headless_select_file_dialog.
 diff --git a/components/user_data_importer/content/content_bookmark_parser_utils.cc b/components/user_data_importer/content/content_bookmark_parser_utils.cc
 --- a/components/user_data_importer/content/content_bookmark_parser_utils.cc
 +++ b/components/user_data_importer/content/content_bookmark_parser_utils.cc
-@@ -89,6 +89,7 @@ std::optional<base::Time> GetTimeAttribute(const std::string& attribute_list,
+@@ -138,6 +138,7 @@ std::optional<bool> GetBoolAttribute(std::string_view attribute_list,
  
  // Given the URL of a page and a favicon data URL, adds an appropriate record
  // to the given favicon usage vector.
@@ -1418,7 +1419,7 @@ diff --git a/components/user_data_importer/content/content_bookmark_parser_utils
  void DataURLToFaviconUsage(const GURL& link_url,
                             const GURL& favicon_data,
                             favicon_base::FaviconUsageDataList* favicons) {
-@@ -438,9 +439,11 @@ BookmarkParser::ParsedBookmarks ParseBookmarksUnsafe(
+@@ -495,9 +496,11 @@ BookmarkParser::ParsedBookmarks ParseBookmarksUnsafe(
        }
        parsing_result.bookmarks.push_back(std::move(entry));
  

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

@@ -17,8 +17,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  base/android/feature_map.cc                   |   5 +
  .../base/cached_flags/ValuesReturned.java     |   2 +-
  base/feature_list.cc                          |  76 ++++++++
- base/feature_list.h                           |  80 +++++++-
- build/android/gyp/java_cpp_features.py        |  17 ++
+ base/feature_list.h                           |  98 +++++++++-
+ build/android/gyp/java_cpp_features.py        |  15 ++
  chrome/android/java/res/values/values.xml     |   3 +
  .../java/res/xml/privacy_preferences.xml      |   4 +
  .../homepage/settings/HomepageSettings.java   |   2 +-
@@ -35,7 +35,6 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/flags/ChromeFeatureList.java      |  13 +-
  .../flags/cromite/include_all_directory.java  |   1 +
  .../java_template/CromiteCachedFlag.java.tmpl |  47 +++++
- chrome/browser/settings/BUILD.gn              |   1 +
  .../settings/ChromeBaseSettingsFragment.java  |  50 +++++
  .../strings/android_chrome_strings.grd        |   1 +
  .../Add-cromite-flags-support.grdp            |   9 +
@@ -107,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 +
- 94 files changed, 834 insertions(+), 31 deletions(-)
+ 93 files changed, 848 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
@@ -144,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
-@@ -174,6 +174,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -170,6 +170,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") {
@@ -153,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
    sources = [
      "allocator/allocator_check.cc",
      "allocator/allocator_check.h",
-@@ -1043,7 +1045,7 @@ component("base") {
+@@ -1048,7 +1050,7 @@ component("base") {
      "//build/config/compiler:wglobal_constructors",
    ]
  
@@ -180,7 +179,7 @@ diff --git a/base/android/feature_map.cc b/base/android/feature_map.cc
 diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned.java b/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned.java
 --- a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned.java
 +++ b/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned.java
-@@ -18,7 +18,7 @@ import java.util.Map;
+@@ -18,7 +18,7 @@ import java.util.function.Supplier;
  @NullMarked
  public abstract class ValuesReturned {
      @GuardedBy("sBoolValues")
@@ -192,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
-@@ -41,6 +41,31 @@
+@@ -42,6 +42,31 @@
  
  namespace base {
  
@@ -224,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
-@@ -470,6 +495,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -471,6 +496,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
    return g_feature_list_instance->IsFeatureEnabled(feature);
  }
  
@@ -271,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;
-@@ -737,6 +802,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -738,6 +803,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
  
  void FeatureList::FinalizeInitialization() {
    DCHECK(!initialized_);
@@ -292,7 +291,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 diff --git a/base/feature_list.h b/base/feature_list.h
 --- a/base/feature_list.h
 +++ b/base/feature_list.h
-@@ -177,8 +177,10 @@ enum class FeatureMacroHandshake { kSecret };
+@@ -233,8 +233,10 @@ StringStorage(const char (&feature)[N]) -> StringStorage<N - 1>;
  struct BASE_EXPORT LOGICALLY_CONST Feature {
    constexpr Feature(const char* name,
                      FeatureState default_state,
@@ -305,7 +304,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
  #if BUILDFLAG(ENABLE_BANNED_BASE_FEATURE_PREFIX)
      if (std::string_view(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) ==
          0) {
-@@ -205,6 +207,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
+@@ -261,6 +263,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
    // command line switch.
    const FeatureState default_state;
  
@@ -315,7 +314,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
   private:
    friend class FeatureList;
  
-@@ -485,6 +490,11 @@ class BASE_EXPORT FeatureList {
+@@ -541,6 +546,11 @@ class BASE_EXPORT FeatureList {
    // instance, which is checked in builds with DCHECKs enabled.
    static bool IsEnabled(const Feature& feature);
  
@@ -327,7 +326,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
    // Some characters are not allowed to appear in feature names or the
    // associated field trial names, as they are used as special characters for
    // command-line serialization. This function checks that the strings are ASCII
-@@ -754,4 +764,70 @@ class BASE_EXPORT FeatureList {
+@@ -810,4 +820,88 @@ class BASE_EXPORT FeatureList {
  
  }  // namespace base
  
@@ -389,46 +388,65 @@ diff --git a/base/feature_list.h b/base/feature_list.h
 +  _Pragma("clang diagnostic pop")                               \
 +  static_assert(true, "") /* for a semicolon requirement */
 +
-+#define BASE_FEATURE_DISABLED(feature, name, default_state) \
++#define BASE_FEATURE_DISABLED_3_ARGS(feature, name, default_state) \
 +  BASE_FEATURE(feature, name, default_state); \
 +  static_assert(default_state == base::FEATURE_DISABLED_BY_DEFAULT, "Check default state")
 +
-+#define BASE_FEATURE_ENABLED(feature, name, default_state) \
++#define BASE_FEATURE_DISABLED_2_ARGS(name, default_state) \
++  BASE_FEATURE(name, default_state); \
++  static_assert(default_state == base::FEATURE_DISABLED_BY_DEFAULT, "Check default state")
++
++#define GET_BASE_FEATURE_DISABLED_MACRO(_1, _2, _3, NAME, ...) NAME
++#define BASE_FEATURE_DISABLED(...)                                            \
++  GET_BASE_FEATURE_DISABLED_MACRO(__VA_ARGS__, BASE_FEATURE_DISABLED_3_ARGS,  \
++                                 BASE_FEATURE_DISABLED_2_ARGS)(__VA_ARGS__)
++
++#define BASE_FEATURE_ENABLED_3_ARGS(feature, name, default_state) \
 +  BASE_FEATURE(feature, name, default_state); \
 +  static_assert(default_state == base::FEATURE_ENABLED_BY_DEFAULT, "Check default state")
++
++#define BASE_FEATURE_ENABLED_2_ARGS(name, default_state) \
++  BASE_FEATURE(name, default_state); \
++  static_assert(default_state == base::FEATURE_ENABLED_BY_DEFAULT, "Check default state")
++
++#define GET_BASE_FEATURE_ENABLED_MACRO(_1, _2, _3, NAME, ...) NAME
++#define BASE_FEATURE_ENABLED(...)                                            \
++  GET_BASE_FEATURE_ENABLED_MACRO(__VA_ARGS__, BASE_FEATURE_ENABLED_3_ARGS,  \
++                                 BASE_FEATURE_ENABLED_2_ARGS)(__VA_ARGS__)
 +
  #endif  // BASE_FEATURE_LIST_H_
 diff --git a/build/android/gyp/java_cpp_features.py b/build/android/gyp/java_cpp_features.py
 --- a/build/android/gyp/java_cpp_features.py
 +++ b/build/android/gyp/java_cpp_features.py
-@@ -21,10 +21,27 @@ class FeatureParserDelegate(java_cpp_utils.CppConstantParser.Delegate):
+@@ -22,6 +22,11 @@ class FeatureParserDelegate(java_cpp_utils.CppConstantParser.Delegate):
    #   ExtractConstantName() -> 'ConstantName'
-   #   ExtractValue() -> '"StringNameOfTheFeature"'
-   FEATURE_RE = re.compile(r'BASE_FEATURE\(k([^,]+),')
-+
-+  FEATURE_RE1 = re.compile(r'CROMITE_FEATURE\(k([^,]+),')
-+  FEATURE_RE2 = re.compile(r'CROMITE_FEATURE_KEEP_DISABLED\(k([^,]+),')
-+  FEATURE_RE3 = re.compile(r'CROMITE_FEATURE_DISABLED\(k([^,]+),')
-+  FEATURE_RE4 = re.compile(r'CROMITE_FEATURE_KEEP_ENABLED\(k([^,]+),')
-+  FEATURE_RE5 = re.compile(r'CROMITE_FEATURE_ENABLED\(k([^,]+),')
-+
-   VALUE_RE = re.compile(r'\s*("(?:\"|[^"])*")\s*,')
+   #   ExtractValue() -> '"StringNameOfTheFeature"' or '"ConstantName"'
+   _FEATURE_RE = re.compile(r'BASE_FEATURE\(\s*(k\w+),')
++  _FEATURE_RE1 = re.compile(r'CROMITE_FEATURE\(\s*(k\w+),')
++  _FEATURE_RE2 = re.compile(r'BASE_FEATURE_DISABLED\(\s*(k\w+),')
++  _FEATURE_RE3 = re.compile(r'CROMITE_FEATURE_DISABLED\(\s*(k\w+),')
++  _FEATURE_RE4 = re.compile(r'BASE_FEATURE_ENABLED\(\s*(k\w+),')
++  _FEATURE_RE5 = re.compile(r'CROMITE_FEATURE_ENABLED\(\s*(k\w+),')
+   _STRING_LITERAL_RE = re.compile(r'"(?:\\"|[^"])*"')
+   _constant_name = None  # The name of the current macro.
+   _comma_count = 0  # Number of commas seen in the current macro.
+@@ -34,6 +39,16 @@ class FeatureParserDelegate(java_cpp_utils.CppConstantParser.Delegate):
+     self._constant_name = None
  
-   def ExtractConstantName(self, line):
-     match = FeatureParserDelegate.FEATURE_RE.match(line)
+     match = self._FEATURE_RE.match(line)
 +    if match is None:
-+      match = FeatureParserDelegate.FEATURE_RE1.match(line)
++      match = self._FEATURE_RE1.match(line)
 +    if match is None:
-+      match = FeatureParserDelegate.FEATURE_RE2.match(line)
++      match = self._FEATURE_RE2.match(line)
 +    if match is None:
-+      match = FeatureParserDelegate.FEATURE_RE3.match(line)
++      match = self._FEATURE_RE3.match(line)
 +    if match is None:
-+      match = FeatureParserDelegate.FEATURE_RE4.match(line)
++      match = self._FEATURE_RE4.match(line)
 +    if match is None:
-+      match = FeatureParserDelegate.FEATURE_RE5.match(line)
-     return match.group(1) if match else None
- 
-   def ExtractValue(self, line):
++      match = self._FEATURE_RE5.match(line)
+     if match:
+       # The regex ensures that the feature name starts with 'k'.
+       feature_name = match.group(1)
 diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml
 --- a/chrome/android/java/res/values/values.xml
 +++ b/chrome/android/java/res/values/values.xml
@@ -471,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
-@@ -130,7 +130,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -132,7 +132,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      }
  
      @Override
@@ -483,18 +501,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
-@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
+@@ -10,6 +10,7 @@ import android.os.Bundle;
  import androidx.fragment.app.Fragment;
  import androidx.fragment.app.FragmentManager;
  
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
- import org.chromium.chrome.browser.accessibility.settings.ChromeAccessibilitySettingsDelegate;
-@@ -70,18 +71,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+ import org.chromium.build.annotations.NullMarked;
+@@ -71,24 +72,31 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
      private final OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
      private final OneshotSupplier<BottomSheetController> mBottomSheetControllerSupplier;
-     private final ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
+     private final ObservableSupplier<@Nullable ModalDialogManager> mModalDialogManagerSupplier;
 +    private final Supplier<ChromeBaseSettingsFragment.RequireRestartDelegate> mRequireRestartDelegateSupplier;
  
      public FragmentDependencyProvider(
@@ -502,8 +520,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
              Profile profile,
              OneshotSupplier<SnackbarManager> snackbarManagerSupplier,
              OneshotSupplier<BottomSheetController> bottomSheetControllerSupplier,
--            ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
-+            ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier,
+-            ObservableSupplier<@Nullable ModalDialogManager> modalDialogManagerSupplier) {
++            ObservableSupplier<@Nullable ModalDialogManager> modalDialogManagerSupplier,
 +            Supplier<ChromeBaseSettingsFragment.RequireRestartDelegate> requireRestartDelegateSupplier) {
          mContext = context;
          mProfile = profile;
@@ -514,9 +532,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
      }
  
      @Override
-@@ -90,6 +94,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
-             @NonNull Fragment fragment,
-             @NonNull Context unusedContext) {
+     public void onFragmentAttached(
+             FragmentManager fragmentManager, Fragment fragment, Context unusedContext) {
          // Common dependencies attachments.
 +        if (fragment instanceof ChromeBaseSettingsFragment) {
 +            ((ChromeBaseSettingsFragment)fragment).setRequestRestartDelegateSupplier(
@@ -528,25 +545,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 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
-@@ -4,6 +4,7 @@
+@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.settings;
  
- package org.chromium.chrome.browser.settings;
+ import static org.chromium.build.NullUtil.assumeNonNull;
  
 +import android.app.Activity;
  import android.annotation.SuppressLint;
  import android.content.Context;
  import android.content.Intent;
-@@ -32,7 +33,9 @@ import org.chromium.base.Callback;
- import org.chromium.base.CallbackUtils;
+@@ -39,7 +40,9 @@ import org.chromium.base.CallbackUtils;
+ import org.chromium.base.DeviceInfo;
  import org.chromium.base.Log;
  import org.chromium.base.metrics.RecordHistogram;
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
  import org.chromium.base.supplier.ObservableSupplier;
 +import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.OneshotSupplierImpl;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
-@@ -40,12 +43,14 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+@@ -49,12 +52,14 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
@@ -561,8 +578,8 @@ 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;
-@@ -88,6 +93,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
-         implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, SnackbarManageable {
+@@ -107,6 +112,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+                 PreferenceUpdateObserver {
      private static final String TAG = "SettingsActivity";
  
 +    private static class RequestRestartDelegate implements ChromeBaseSettingsFragment.RequireRestartDelegate {
@@ -589,7 +606,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 +                                    ApplicationLifetime.terminate(true);
 +                            }
 +                        }, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_UNKNOWN)
-+                        .setSingleLine(false)
++                        .setDefaultLines(false)
 +                        .setAction(mActivity.getString(R.string.relaunch),
 +                                /*actionData*/null)
 +                        .setDuration(/*durationMs*/70000);
@@ -602,7 +619,7 @@ 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";
  
-@@ -154,7 +193,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -184,7 +223,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                          mProfile,
                          mSnackbarManagerSupplier,
                          mBottomSheetControllerSupplier,
@@ -615,22 +632,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 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
-@@ -19,12 +19,13 @@ import org.chromium.build.annotations.Nullable;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
-+import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
- import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
- import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -23,8 +23,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  
  /** Settings fragment containing preferences aimed at Chrome and web developers. */
  @NullMarked
--public class DeveloperSettings extends PreferenceFragmentCompat implements EmbeddableSettingsPage {
+-public class DeveloperSettings extends ChromeBaseSettingsFragment
+-        implements EmbeddableSettingsPage {
 +public class DeveloperSettings extends ChromeBaseSettingsFragment implements EmbeddableSettingsPage {
      private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";
  
      // Non-translated strings:
-@@ -55,7 +56,7 @@ public class DeveloperSettings extends PreferenceFragmentCompat implements Embed
+@@ -55,7 +54,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment
      }
  
      @Override
@@ -642,7 +654,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
-@@ -380,6 +380,10 @@ using flags_ui::kOsLinux;
+@@ -387,6 +387,10 @@ using flags_ui::kOsLinux;
  using flags_ui::kOsMac;
  using flags_ui::kOsWin;
  
@@ -653,9 +665,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  namespace about_flags {
  
  namespace {
-@@ -4902,6 +4906,10 @@ const FeatureEntry::FeatureVariation
- constexpr char kWebiumFlag[] = "webium";
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -4977,6 +4981,10 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {
+      std::size(kSeamlessSigninPromoTypeTwoButtons), nullptr}};
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -664,7 +676,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.
-@@ -4928,6 +4936,9 @@ constexpr char kWebiumFlag[] = "webium";
+@@ -5003,6 +5011,9 @@ const FeatureEntry::FeatureVariation kSeamlessSigninPromoTypes[] = {
  const FeatureEntry kFeatureEntries[] = {
  // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
  // //tools/flags/generate_unexpire_flags.py.
@@ -677,16 +689,16 @@ 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
-@@ -368,4 +368,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
-              "RemovalOfIWAsFromTabCapture",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -313,4 +313,5 @@ BASE_FEATURE(kReportPakFileIntegrity,
+ // show both in Chrome Tabs and Windows.
+ BASE_FEATURE(kRemovalOfIWAsFromTabCapture, base::FEATURE_ENABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_browser_features_cc.inc"
  }  // namespace features
 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
-@@ -121,6 +121,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+@@ -126,6 +126,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
  // module, e.g.
  // //chrome/browser/<foo_module>/features.h
  //
@@ -697,7 +709,7 @@ diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -12,9 +12,14 @@ android_library("java") {
+@@ -13,9 +13,14 @@ android_library("java") {
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
    ]
@@ -712,7 +724,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
      "//base/version_info/android:version_constants_java",
      "//build:android_buildflags",
      "//build:chromeos_buildflags",
-@@ -25,12 +30,20 @@ android_library("java") {
+@@ -27,12 +32,20 @@ android_library("java") {
      "//third_party/jni_zero:jni_zero_java",
    ]
    srcjar_deps = [
@@ -736,9 +748,9 @@ 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
-@@ -1489,5 +1489,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
-              "WebOtpCrossDeviceSimpleString",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -1159,5 +1159,6 @@ BASE_FEATURE(kUseLibunwindstackNativeUnwinderAndroid,
+ // a descriptive text.
+ BASE_FEATURE(kWebOtpCrossDeviceSimpleString, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
  }  // namespace android
@@ -746,7 +758,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -331,6 +331,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(
+@@ -354,6 +354,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(
      "snippet_as_subtitle",
      /*default_value=*/false);
  
@@ -768,18 +780,18 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
  
-@@ -1063,7 +1067,7 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sWebApkMinShellApkVersion =
+@@ -1111,7 +1115,7 @@ public abstract class ChromeFeatureList {
              newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
+     // keep-sorted end
  
 -    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +    public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
              List.of(
+                     // keep-sorted start
                      sAccountForSuppressedKeyboardInsets,
-                     sAllowTabClosingUponMinimization,
-@@ -1205,6 +1209,13 @@ public abstract class ChromeFeatureList {
-                     sUseLibunwindstackNativeUnwinderAndroid,
-                     sWebApkMinShellApkVersion);
+@@ -1268,6 +1272,13 @@ public abstract class ChromeFeatureList {
+                     // keep-sorted end
+                     );
  
 +    private static <T> List<T> concatenateLists(List<T>... collections) {
 +        return Arrays.stream(collections).flatMap(x -> x.stream()).collect(Collectors.toList());
@@ -849,29 +861,19 @@ new file mode 100644
 +    }}
 +
 +}}
-diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn
---- a/chrome/browser/settings/BUILD.gn
-+++ b/chrome/browser/settings/BUILD.gn
-@@ -35,6 +35,7 @@ android_library("java") {
-     "//base:base_java",
-     "//chrome/browser/feedback/android:factory_java",
-     "//chrome/browser/feedback/android:java",
-+    "//chrome/browser/flags:java",
-     "//chrome/browser/preferences:java",
-     "//chrome/browser/profiles/android:java",
-     "//chrome/browser/ui/android/favicon:java",
 diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
 --- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
 +++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
-@@ -8,12 +8,19 @@ import androidx.preference.PreferenceFragmentCompat;
- 
+@@ -9,6 +9,7 @@ import androidx.preference.PreferenceFragmentCompat;
  import org.chromium.build.annotations.Initializer;
  import org.chromium.build.annotations.NullMarked;
-+import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.Nullable;
++import java.util.function.Supplier;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherFactory;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -18,6 +19,12 @@ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
+ import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver;
  import org.chromium.components.browser_ui.settings.SettingsCustomTabLauncher;
  
 +import android.os.Bundle;
@@ -883,9 +885,9 @@ diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browse
  /**
   * Base class for settings in Chrome.
   *
-@@ -28,6 +35,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
-     private Profile mProfile;
+@@ -35,6 +42,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
      private SettingsCustomTabLauncher mCustomTabLauncher;
+     private @Nullable PreferenceUpdateObserver mPreferenceUpdateObserver;
  
 +    private Supplier<ChromeBaseSettingsFragment.RequireRestartDelegate> mRequireRestartDelegateSupplier;
 +
@@ -967,9 +969,9 @@ 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
-@@ -619,4 +619,5 @@ bool IsBookmarkTabGroupConversionEnabled() {
-   return base::FeatureList::IsEnabled(kBookmarkTabGroupConversion);
- }
+@@ -664,4 +664,5 @@ bool IsAndroidAnimatedProgressBarInBrowserEnabled() {
+ 
+ BASE_FEATURE(kWhatsNewDesktopRefresh, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
  }  // namespace features
@@ -1008,9 +1010,9 @@ 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
-@@ -1977,5 +1977,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
+@@ -1694,5 +1694,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
+ // happen silently without prompting an updating dialog.
  BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
-              "SilentPolicyAndDefaultAppUpdating",
               base::FEATURE_DISABLED_BY_DEFAULT);
 -
 +#include "cromite_flags/chrome_common_chrome_features_cc.inc"
@@ -1018,14 +1020,14 @@ 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
-@@ -55,6 +55,7 @@ android_library("lib_java") {
+@@ -61,6 +61,7 @@ android_library("lib_java") {
      ":page_zoom_utils_java",
      "//base:base_java",
      "//build/android:build_java",
 +    "//chrome/browser/settings:java",
      "//components/browser_ui/settings/android:java",
      "//components/browser_ui/site_settings/android:java",
-     "//components/cached_flags:java",
+     "//components/browser_ui/styles/android:java",
 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
@@ -1036,9 +1038,9 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 +                  xmlns:app="http://schemas.android.com/apk/res-auto">
- 
-     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
-         android:key="page_zoom_default_zoom"
+     <Preference
+         android:key="zoom_info"
+         android:title="@string/zoom_info_preference_title"/>
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
@@ -1063,7 +1065,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 +    public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
  
-         mPageZoomDefaultZoomPref = findPreference(PREF_PAGE_ZOOM_DEFAULT_ZOOM);
+         // TODO(crbug.com/439911511): Add PageZoomPreference directly to the xml file instead.
 diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/components/browser_ui/settings/android/java/res/values/attrs.xml
 --- a/components/browser_ui/settings/android/java/res/values/attrs.xml
 +++ b/components/browser_ui/settings/android/java/res/values/attrs.xml
@@ -1081,7 +1083,7 @@ diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/
 diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java
 --- a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java
 +++ b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/ChromeSwitchPreference.java
-@@ -13,6 +13,8 @@ import android.view.accessibility.AccessibilityEvent;
+@@ -15,6 +15,8 @@ import android.view.accessibility.AccessibilityEvent;
  import android.view.accessibility.AccessibilityNodeInfo;
  import android.widget.TextView;
  
@@ -1090,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;
-@@ -38,6 +40,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+@@ -43,6 +45,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat
      /** Indicates if the preference uses a custom layout. */
      private final boolean mHasCustomLayout;
  
@@ -1102,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.
      /**
-@@ -57,6 +64,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+@@ -67,6 +74,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat
  
          mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs);
          mUseSummaryAsTitle = true;
@@ -1160,9 +1162,9 @@ 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
-@@ -181,5 +181,6 @@ BASE_FEATURE(kForceAllowStorageAccess,
-              "ForceAllowStorageAccess",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -160,5 +160,6 @@ BASE_FEATURE(kContentSettingsPartitioning, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kForceAllowStorageAccess, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/components_content_settings_core_common_features_cc.inc"
  }  // namespace features
@@ -1176,7 +1178,7 @@ new file mode 100644
 diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
 --- a/components/offline_pages/core/offline_page_feature.cc
 +++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
+@@ -47,4 +47,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
    return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
  }
  
@@ -1196,7 +1198,7 @@ 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
-@@ -219,4 +219,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
+@@ -183,4 +183,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -1205,8 +1207,8 @@ diff --git a/components/password_manager/core/browser/features/password_features
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -139,6 +139,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
-              "OsAdditionalSecurityPermissionKillSwitch",
+@@ -107,6 +107,8 @@ BASE_FEATURE(kSafetyHubUnusedPermissionRevocationForAllSurfaces,
+ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
 +
@@ -1638,7 +1640,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
-@@ -743,4 +743,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
+@@ -675,4 +675,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
               blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument);
  }
  
@@ -1647,7 +1649,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
-@@ -1676,4 +1676,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
+@@ -1411,4 +1411,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
               features::kPushSubscriptionChangeEventOnResubscribe);
  }
  
@@ -1656,7 +1658,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
-@@ -400,6 +400,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
+@@ -409,6 +409,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
  
@@ -2002,7 +2004,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
-@@ -2008,5 +2008,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -1730,5 +1730,5 @@ uint32_t GetPassthroughAudioFormats() {
    return 0;
  #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  }
@@ -2012,7 +2014,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
-@@ -601,5 +601,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
+@@ -609,5 +609,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
  MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
  
  }  // namespace media
@@ -2022,18 +2024,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
-@@ -909,4 +909,5 @@ BASE_FEATURE_PARAM(bool,
-                    "url_request_redirect_job",
-                    false);
+@@ -852,4 +852,5 @@ BASE_FEATURE_PARAM(std::string,
+                    "quic_options",
+                    "");
  
 +#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
-@@ -896,6 +896,7 @@ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(bool, kNetTaskSchedulerURLRequestJob);
- NET_EXPORT BASE_DECLARE_FEATURE_PARAM(bool,
-                                       kNetTaskSchedulerURLRequestRedirectJob);
+@@ -946,6 +946,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kTryQuicByDefault);
+ // separate the values with a comma (e.g. "ABCD,EFGH").
+ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(std::string, kQuicOptions);
  
 +#include "cromite_flags/net_base_features_h.inc"
  }  // namespace net::features
@@ -2042,16 +2044,16 @@ 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
-@@ -666,4 +666,5 @@ BASE_FEATURE_PARAM(bool,
+@@ -587,4 +587,5 @@ BASE_FEATURE_PARAM(bool,
                     "url_loader",
-                    false);
+                    true);
  
 +#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
-@@ -366,6 +366,7 @@ BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerResourceScheduler);
+@@ -361,6 +361,7 @@ BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerResourceScheduler);
  COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES)
  BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerURLLoader);
  
@@ -2062,7 +2064,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
-@@ -2927,4 +2927,5 @@ bool IsXrDevice() {
+@@ -2633,4 +2633,5 @@ bool IsXrDevice() {
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2071,7 +2073,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
-@@ -1912,6 +1912,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
+@@ -1917,6 +1917,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2082,18 +2084,18 @@ 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
-@@ -483,4 +483,5 @@ bool IsHandleIMESpanChangesOnUpdateCompositionEnabled() {
-       features::kHandleIMESpanChangesOnUpdateComposition);
- }
+@@ -434,4 +434,5 @@ BASE_FEATURE(kUseSystemDefaultAccentColors, base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kStringWidthCache, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/ui_base_features_cc.inc"
  }  // namespace features
 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
-@@ -242,6 +242,7 @@ BASE_DECLARE_FEATURE(kHandleIMESpanChangesOnUpdateComposition);
+@@ -267,6 +267,7 @@ BASE_DECLARE_FEATURE(kUseSystemDefaultAccentColors);
  COMPONENT_EXPORT(UI_BASE_FEATURES)
- bool IsHandleIMESpanChangesOnUpdateCompositionEnabled();
+ BASE_DECLARE_FEATURE(kStringWidthCache);
  
 +#include "cromite_flags/ui_base_features_h.inc"
  }  // namespace features

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

@@ -73,15 +73,15 @@ 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
-@@ -139,6 +139,7 @@ import org.chromium.ui.base.PhotoPickerListener;
- import org.chromium.ui.base.SelectFileDialog;
+@@ -145,6 +145,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;
 +import org.chromium.chrome.browser.flags.cromite.sActAsWebView;
  
  import java.io.File;
  import java.nio.charset.StandardCharsets;
-@@ -698,7 +699,10 @@ public class ProcessInitializationHandler {
+@@ -713,7 +714,10 @@ public class ProcessInitializationHandler {
  
          tasks.add(
                  () -> {
@@ -96,7 +96,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
 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
-@@ -37,7 +37,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
+@@ -35,7 +35,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
      private final ObservableSupplier<String> mPageTitle =
              new ObservableSupplierImpl<>(MSG_DEVELOPER_OPTIONS_TITLE);
  
@@ -417,9 +417,9 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/b
       */
      public boolean requestPermissionIfNeeded(boolean contextual) {
 +        if (!contextual) return false;
-         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
-                 || ApiCompatibilityUtils.isDemoUser()) {
+         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU || DeviceInfo.isRetailDemoMode()) {
              return false;
+         }
 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
@@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -657,6 +657,7 @@ mojom("mojo_bindings") {
+@@ -671,6 +671,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
-@@ -74,6 +74,8 @@ static_library("renderer") {
+@@ -80,6 +80,8 @@ static_library("renderer") {
      "chrome_render_thread_observer.cc",
      "chrome_render_thread_observer.h",
      "custom_menu_commands.h",
@@ -469,7 +469,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -54,6 +54,7 @@
+@@ -56,6 +56,7 @@
  #include "chrome/renderer/chrome_render_frame_observer.h"
  #include "chrome/renderer/chrome_render_thread_observer.h"
  #include "chrome/renderer/controlled_frame/controlled_frame_extensions_renderer_api_provider.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"
-@@ -624,6 +625,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -661,6 +662,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
  
    TrustedVaultEncryptionKeysExtension::Create(render_frame);
    GoogleAccountsPrivateApiExtension::Create(render_frame);
@@ -793,7 +793,7 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
  #include "content/public/common/content_switches.h"
  #include "content/public/common/url_constants.h"
  #include "net/base/io_buffer.h"
-@@ -587,9 +589,12 @@ void DevToolsHttpHandler::OnJsonRequest(
+@@ -588,9 +590,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
-@@ -315,6 +315,8 @@
+@@ -319,6 +319,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"
-@@ -4755,7 +4757,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -4773,7 +4775,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
-@@ -4772,8 +4775,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -4790,8 +4793,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
    const bool is_off_the_record =
        GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
  

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

@@ -18,14 +18,14 @@ 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      |  2 +-
+ .../flags/android/chrome_feature_list.cc      |  5 +-
  .../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, 156 insertions(+), 13 deletions(-)
+ 13 files changed, 158 insertions(+), 14 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
 
@@ -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());
-@@ -490,6 +500,17 @@ public class LaunchIntentDispatcher {
+@@ -489,6 +499,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
-@@ -233,16 +233,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -238,16 +238,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
-@@ -682,7 +682,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -689,7 +689,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);
-@@ -695,8 +695,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -702,8 +702,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(
-@@ -1267,7 +1267,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1294,7 +1294,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
-@@ -780,7 +780,7 @@ public class CustomTabsConnection {
+@@ -782,7 +782,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;
-@@ -996,6 +996,7 @@ public class CustomTabsConnection {
+@@ -999,6 +999,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
-@@ -40,6 +40,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -43,6 +43,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.
-@@ -121,6 +124,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -125,6 +128,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();
      }
  
-@@ -220,6 +226,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -222,6 +228,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()
-@@ -329,6 +339,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -332,6 +342,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
  
      @Override
      public @CustomTabProfileType int getCustomTabMode() {
@@ -231,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 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
-@@ -10,6 +10,7 @@ import android.content.Context;
+@@ -11,6 +11,7 @@ import android.content.Context;
  import android.content.Intent;
  import android.content.SharedPreferences;
  import android.graphics.drawable.Drawable;
@@ -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;
-@@ -152,6 +162,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -153,6 +163,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
      }
  
@@ -327,19 +327,22 @@ 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
-@@ -1093,7 +1093,7 @@ BASE_FEATURE(kMagicStackAndroid,
+@@ -909,8 +909,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);
 +CROMITE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
-              "MayLaunchUrlUsesSeparateStoragePartition",
-              base::FEATURE_DISABLED_BY_DEFAULT);
++                "MayLaunchUrlUsesSeparateStoragePartition",
++                base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kMediaIndicatorsAndroid, base::FEATURE_DISABLED_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
-@@ -943,6 +943,8 @@ public abstract class ChromeFeatureList {
+@@ -991,6 +991,8 @@ public abstract class ChromeFeatureList {
                      MOST_VISITED_TILES_CUSTOMIZATION,
                      /* defaultValue= */ false,
                      /* defaultValueInTests= */ true);
@@ -348,7 +351,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sMostVisitedTilesReselect =
              newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
      public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -1165,6 +1167,7 @@ public abstract class ChromeFeatureList {
+@@ -1224,6 +1226,7 @@ public abstract class ChromeFeatureList {
                      sMiniOriginBar,
                      sMitigateLegacySearchEnginePromoOverlap,
                      sMostVisitedTilesCustomization,
@@ -420,9 +423,9 @@ diff --git a/components/content_relationship_verification/android/java/src/org/c
 diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc
 --- a/components/language/core/common/language_experiments.cc
 +++ b/components/language/core/common/language_experiments.cc
-@@ -26,4 +26,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
-              "DisableGeoLanguageModel",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -20,4 +20,5 @@ BASE_FEATURE(kTranslateOpenSettings, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kDisableGeoLanguageModel, base::FEATURE_ENABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kCctAutoTranslate);
  }  // namespace language

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

@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/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
-@@ -119,6 +119,7 @@ found in the LICENSE file.
+@@ -123,6 +123,7 @@ found in the LICENSE file.
      <item type="id" name="ntp_feed_header_menu_item_toggle_switch" />
  
      <!-- App Menu -->
@@ -28,16 +28,16 @@ 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
-@@ -345,6 +345,8 @@ import java.util.Map;
- import java.util.Set;
+@@ -358,6 +358,8 @@ import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +
  /**
   * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
   * accessible via a chrome specific tab switching UI.
-@@ -3692,6 +3694,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3882,6 +3884,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                      .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
-@@ -59,6 +59,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+@@ -63,6 +63,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;
-@@ -2445,6 +2446,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2529,6 +2530,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
-@@ -384,6 +384,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -410,6 +410,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
-@@ -4347,6 +4347,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4317,6 +4317,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,7 +26,7 @@ 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"
-@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteController(
+@@ -571,6 +572,15 @@ AutocompleteController::AutocompleteController(
            provider_client_->GetOmniboxTriggeredFeatureService()),
        steady_state_omnibox_position_(
            metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -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"
-@@ -632,6 +633,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -637,6 +638,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -79,16 +79,16 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -15,6 +15,8 @@
- #include <string_view>
+@@ -11,6 +11,8 @@
  
  #include "base/check_op.h"
+ #include "base/compiler_specific.h"
 +#include "base/containers/contains.h"
 +#include "base/command_line.h"
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/i18n/char_iterator.h"
-@@ -648,6 +650,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -644,6 +646,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

@@ -103,7 +103,7 @@ 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"
-@@ -186,6 +190,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -187,6 +191,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
  int ClientSocketPoolManager::max_sockets_per_group(
      HttpNetworkSession::SocketPoolType pool_type) {
    DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);

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

@@ -45,7 +45,7 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1157,6 +1157,7 @@ component("net") {
+@@ -1172,6 +1172,7 @@ component("net") {
      ":net_deps",
      "//components/miracle_parameter/common",
      "//components/network_time/time_tracker",
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
  #include "net/log/net_log_with_source.h"
  #include "net/socket/client_socket_factory.h"
  #include "net/url_request/url_request_context.h"
-@@ -1497,6 +1498,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1493,6 +1494,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -49,7 +49,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/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
-@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
+@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
  import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -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;
-@@ -128,6 +129,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+@@ -156,6 +157,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
-@@ -26,6 +26,7 @@ import org.chromium.base.supplier.Supplier;
+@@ -25,6 +25,7 @@ import org.chromium.base.PackageManagerUtils;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.ChromeTabbedActivity2;
@@ -76,12 +76,12 @@ 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;
-@@ -117,7 +118,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
- 
+@@ -119,7 +120,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
      @Override
-     public boolean shouldDisableExternalIntentRequestsForUrl(GURL url) {
+     public boolean shouldDisableExternalIntentRequestsForUrl(
+             ExternalNavigationParams params, Intent intent) {
 -        return false;
-+        if ("tel".equals(url.getScheme())) return false;
++        if ("tel".equals(params.getUrl().getScheme())) return false;
 +        return !sAllowExternalIntentRequests.getInstance().isEnabled();
      }
  
@@ -149,9 +149,9 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
  }  // namespace
  
  // Alphabetical:
-@@ -62,7 +61,13 @@ BASE_FEATURE(kAuxiliaryNavigationStaysInPWA,
-              "AuxiliaryNavigationStaysInPWA",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -52,7 +51,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA,
+ 
+ BASE_FEATURE(kAuxiliaryNavigationStaysInPWA, base::FEATURE_DISABLED_BY_DEFAULT);
  
 +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
 +                "IntentBlockExternalFormRedirectsNoGesture",
@@ -193,8 +193,8 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 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
-@@ -1558,6 +1558,12 @@ public class ExternalNavigationHandler {
-                 || ignoreBackForwardNav(params);
+@@ -1623,6 +1623,12 @@ public class ExternalNavigationHandler {
+         return false;
      }
  
 +    /** Wrapper of check against the feature to support overriding for testing. */
@@ -206,7 +206,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
      private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
              ExternalNavigationParams params,
              Intent targetIntent,
-@@ -1626,6 +1632,21 @@ public class ExternalNavigationHandler {
+@@ -1716,6 +1722,21 @@ public class ExternalNavigationHandler {
              return OverrideUrlLoadingResult.forNoOverride();
          }
  

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

@@ -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
-@@ -1011,6 +1011,10 @@
+@@ -1070,6 +1070,10 @@
      {
        name: "CompositingDecisionAtAnimationPhaseBoundaries"
      },

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

@@ -7,23 +7,23 @@ Allows build with clangd by suppressing unsupported parameters
 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
 ---
- build/config/compiler/BUILD.gn | 14 +++++++++++---
+ build/config/compiler/BUILD.gn | 17 ++++++++++++++---
  build_overrides/build.gni      |  3 +++
- 2 files changed, 14 insertions(+), 3 deletions(-)
+ 2 files changed, 17 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
-@@ -700,7 +700,7 @@ config("compiler") {
+@@ -715,7 +715,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
--    if (is_linux && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
-+    if (is_linux && !skip_clangd_unsupported_options && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
-         current_cpu != "s390x" &&
-         default_toolchain != "//build/toolchain/cros:target") {
+-    if (is_linux && use_lld && current_cpu != "arm" && current_cpu != "s390x") {
++    if (is_linux && !skip_clangd_unsupported_options && use_lld && current_cpu != "arm" && current_cpu != "s390x") {
        cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
-@@ -1813,7 +1813,7 @@ config("clang_revision") {
+     }
+   }
+@@ -1848,7 +1848,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,16 +32,19 @@ 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 ]
-@@ -2146,7 +2146,6 @@ config("default_warnings") {
-       # TODO(crbug.com/376641662): Fix and re-enable.
-       "-Wno-nontrivial-memcall",
+@@ -2183,7 +2183,9 @@ config("default_warnings") {
+       # TODO(crbug.com/432275627): Fix and re-enable.
+       "-Wno-uninitialized-const-pointer",
      ]
 -
++    if (skip_clangd_unsupported_options) {
++      cflags -= [ "-Wno-uninitialized-const-pointer" ]
++    }
      cflags_cc += [
        # TODO(crbug.com/328490295): Fix and re-enable for C flags.
        "-Wenum-compare-conditional",
-@@ -2211,6 +2210,15 @@ config("default_warnings") {
-       ]
+@@ -2237,6 +2239,15 @@ config("default_warnings") {
+       ldflags += [ "-Wno-version-check" ]
      }
  
 +    if (skip_clangd_unsupported_options) {

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

@@ -142,8 +142,8 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/br
 diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome/browser/permissions/one_time_permissions_tracker.cc
 --- a/chrome/browser/permissions/one_time_permissions_tracker.cc
 +++ b/chrome/browser/permissions/one_time_permissions_tracker.cc
-@@ -19,8 +19,34 @@
- #include "components/permissions/features.h"
+@@ -20,8 +20,34 @@
+ #include "components/permissions/permission_util.h"
  #include "content/public/browser/visibility.h"
  #include "url/gurl.h"
 +#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -178,7 +178,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
  OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
  
  OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
-@@ -254,6 +280,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
+@@ -255,6 +281,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
    for (auto& observer : observer_list_) {
      observer.OnLastPageFromOriginClosed(origin);
    }
@@ -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
-@@ -227,7 +227,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
+@@ -228,7 +228,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
-@@ -630,6 +630,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -689,6 +689,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();
-@@ -1316,6 +1321,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1295,6 +1300,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
-@@ -218,7 +218,7 @@ void GetOrigins(JNIEnv* env,
+@@ -224,7 +224,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
-@@ -646,6 +646,11 @@
+@@ -649,6 +649,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>
@@ -365,7 +365,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
  bool CanTrackLastVisit(ContentSettingsType type) {
    DCHECK(WebsiteSettingsRegistry::GetInstance()->Get(type)) << type;
  
-@@ -261,10 +297,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
+@@ -282,10 +318,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
        ContentSettingsType::CAPTURED_SURFACE_CONTROL,
  #endif
        ContentSettingsType::KEYBOARD_LOCK,
@@ -376,7 +376,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
        ContentSettingsType::HAND_TRACKING,
        ContentSettingsType::SMART_CARD_DATA,
        ContentSettingsType::AR,
-@@ -280,10 +312,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
+@@ -301,10 +333,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
        ContentSettingsType::CAPTURED_SURFACE_CONTROL,
  #endif
        ContentSettingsType::KEYBOARD_LOCK,
@@ -425,34 +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
-@@ -378,9 +378,9 @@ public class PageInfoController
-             String name,
-             String nameMidSentence,
-             int type,
--            @ContentSettingValues int currentSettingValue) {
-+            @ContentSettingValues int currentSettingValue, boolean is_user_session) {
-         mPermissionParamsListBuilder.addPermissionEntry(
--                name, nameMidSentence, type, currentSettingValue);
-+                name, nameMidSentence, type, currentSettingValue, is_user_session);
+@@ -376,8 +376,8 @@ 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);
      }
  
      /** 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
-@@ -48,8 +48,9 @@ public class PermissionParamsListBuilder {
+@@ -46,8 +46,9 @@ public class PermissionParamsListBuilder {
+         mEntries = new ArrayList<>();
      }
  
-     public void addPermissionEntry(
--            String name, String nameMidSentence, int type, @ContentSettingValues int value) {
--        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, value));
-+            String name, String nameMidSentence, int type, @ContentSettingValues int value,
+-    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, value, is_user_session));
++        mEntries.add(new PageInfoPermissionEntry(name, nameMidSentence, type, allowed, is_user_session));
      }
  
      public void clearPermissionEntries() {
-@@ -85,6 +86,10 @@ public class PermissionParamsListBuilder {
+@@ -84,6 +85,10 @@ public class PermissionParamsListBuilder {
                  } else {
                      warningTextResource = R.string.page_info_android_permission_blocked;
                  }
@@ -461,21 +460,20 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 +                            R.string.page_info_android_permission_session_permission;
 +                }
              }
-         } else {
-             assert permission.setting == ContentSettingValues.ASK
-@@ -121,13 +126,15 @@ public class PermissionParamsListBuilder {
+         }
+ 
+@@ -112,12 +117,14 @@ public class PermissionParamsListBuilder {
          public final String nameMidSentence;
          public final int type;
-         public final @ContentSettingValues int setting;
+         public final boolean allowed;
 +        public final boolean is_user_session;
  
-         PageInfoPermissionEntry(
--                String name, String nameMidSentence, int type, @ContentSettingValues int setting) {
-+                String name, String nameMidSentence, int type, @ContentSettingValues int setting, 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) {
              this.name = name;
              this.nameMidSentence = nameMidSentence;
              this.type = type;
-             this.setting = setting;
+             this.allowed = allowed;
 +            this.is_user_session = is_user_session;
          }
  
@@ -483,35 +481,35 @@ 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
-@@ -186,6 +186,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -199,6 +199,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
-   std::map<ContentSettingsType, ContentSetting>
+   std::map<ContentSettingsType, /*allowed*/ bool>
        user_specified_settings_to_display;
 +  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)) {
-@@ -194,6 +196,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
-       if (setting_to_display) {
+@@ -211,6 +213,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+ 
          user_specified_settings_to_display[permission.type] =
-             *setting_to_display;
+             info->delegate().IsAnyPermissionAllowed(*setting_to_display);
 +        user_specified_settings_is_user_session[permission.type] =
 +            permission.is_user_session;
        }
      }
    }
-@@ -210,7 +214,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -227,7 +231,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
--          static_cast<jint>(user_specified_settings_to_display[permission]));
-+          static_cast<jint>(user_specified_settings_to_display[permission]),
+-          user_specified_settings_to_display[permission]);
++          user_specified_settings_to_display[permission],
 +          user_specified_settings_is_user_session[permission]);
      }
    }
  
-@@ -223,7 +228,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -240,7 +245,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),
@@ -524,15 +522,15 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1256,6 +1256,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1303,6 +1303,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
 +  permission_info.is_user_session =
 +      (info.metadata.session_model() == content_settings::mojom::SessionModel::USER_SESSION);
  
-   auto* page_specific_content_settings = GetPageSpecificContentSettings();
-   if (page_specific_content_settings && setting == CONTENT_SETTING_ALLOW) {
+   auto* setting_info =
+       content_settings::PermissionSettingsRegistry::GetInstance()->Get(
 diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
@@ -962,7 +960,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 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
-@@ -295,7 +295,7 @@ void EmbeddedPermissionPromptFlowModel::SetDelegateAction(
+@@ -294,7 +294,7 @@ void EmbeddedPermissionPromptFlowModel::SetDelegateAction(
        delegate_->Accept();
        break;
      case DelegateAction::kAllowThisTime:
@@ -974,7 +972,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
-@@ -260,6 +260,17 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -267,6 +267,17 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(request_finished_callback), UsesAutomaticEmbargo());
  }
  
@@ -992,7 +990,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  bool PermissionContextBase::UsesAutomaticEmbargo() const {
    return true;
  }
-@@ -551,7 +562,8 @@ void PermissionContextBase::DecidePermission(
+@@ -572,7 +583,8 @@ void PermissionContextBase::DecidePermission(
  void PermissionContextBase::PermissionDecided(
      PermissionDecision decision,
      bool is_final_decision,
@@ -1002,7 +1000,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    UserMadePermissionDecision(request_data.id, request_data.requesting_origin,
                               request_data.embedding_origin, decision);
  
-@@ -564,11 +576,12 @@ void PermissionContextBase::PermissionDecided(
+@@ -585,11 +597,12 @@ void PermissionContextBase::PermissionDecided(
    // missing if a permission prompt was preignored and we already notified an
    // origin about it.
    if (request->second.second) {
@@ -1019,7 +1017,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
    }
  }
  
-@@ -653,6 +666,30 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -674,6 +687,30 @@ void PermissionContextBase::NotifyPermissionSet(
      bool persist,
      PermissionDecision decision,
      bool is_final_decision) {
@@ -1050,18 +1048,18 @@ 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.
-@@ -668,8 +705,8 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -689,8 +726,8 @@ void PermissionContextBase::NotifyPermissionSet(
  
    if (persist) {
      // Clone new value, because we need it again for the callback.
--    UpdateSetting(request_data, std::move(new_value),
+-    UpdateSetting(request_data, new_value,
 -                  decision == PermissionDecision::kAllowThisTime);
-+    UpdateSettingImpl(request_data, std::move(new_value),
++    UpdateSettingImpl(request_data, new_value,
 +                  decision == PermissionDecision::kAllowThisTime, use_lifetime_option, lifetime_option);
    }
  
    if (is_final_decision) {
-@@ -706,6 +743,17 @@ void PermissionContextBase::UpdateSetting(
+@@ -728,6 +765,17 @@ void PermissionContextBase::UpdateSetting(
      const PermissionRequestData& request_data,
      PermissionSetting setting,
      bool is_one_time) {
@@ -1079,15 +1077,15 @@ 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,
-@@ -715,6 +763,8 @@ void PermissionContextBase::UpdateSetting(
+@@ -737,6 +785,8 @@ void PermissionContextBase::UpdateSetting(
    constraints.set_session_model(
        is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
                    : content_settings::mojom::SessionModel::DURABLE);
 +  if (use_lifetime_option)
 +    constraints = content_settings::GetConstraintSessionExpiration(lifetime_option);
  
-   // The Permissions module in Safety check will revoke permissions after
-   // a finite amount of time if the permission can be revoked.
+   // The unused permissions module in Safety check will revoke unused site
+   // permissions after a finite amount of time if the permission can be revoked.
 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
@@ -1263,7 +1261,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
-@@ -237,6 +248,9 @@ class PermissionRequest {
+@@ -234,6 +245,9 @@ class PermissionRequest {
    // Called once a decision is made about the permission.
    PermissionDecidedCallback permission_decided_callback_;
  
@@ -1276,7 +1274,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
-@@ -198,7 +198,7 @@ void PermissionRequestManager::AddRequest(
+@@ -201,7 +201,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1285,7 +1283,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      return;
    }
  
-@@ -267,7 +267,7 @@ void PermissionRequestManager::AddRequest(
+@@ -270,7 +270,7 @@ void PermissionRequestManager::AddRequest(
  
    if (should_auto_approve_request) {
      if (should_auto_approve_request == PermissionAction::GRANTED) {
@@ -1294,7 +1292,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      }
      return;
    }
-@@ -626,7 +626,8 @@ void PermissionRequestManager::Accept() {
+@@ -597,7 +597,8 @@ void PermissionRequestManager::Accept() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED);
      PermissionGrantedIncludingDuplicates(requests_iter->get(),
@@ -1304,7 +1302,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  
  #if !BUILDFLAG(IS_ANDROID)
      std::optional<ContentSettingsType> content_settings_type =
-@@ -644,7 +645,7 @@ void PermissionRequestManager::Accept() {
+@@ -615,7 +616,7 @@ void PermissionRequestManager::Accept() {
    CurrentRequestsDecided(PermissionAction::GRANTED);
  }
  
@@ -1313,7 +1311,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -658,7 +659,8 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -629,7 +630,8 @@ void PermissionRequestManager::AcceptThisTime() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED_ONCE);
      PermissionGrantedIncludingDuplicates(requests_iter->get(),
@@ -1323,7 +1321,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
  
    NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
-@@ -666,6 +668,15 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -637,6 +639,15 @@ void PermissionRequestManager::AcceptThisTime() {
  }
  
  void PermissionRequestManager::Deny() {
@@ -1339,7 +1337,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -688,7 +699,7 @@ void PermissionRequestManager::Deny() {
+@@ -659,7 +670,7 @@ void PermissionRequestManager::Deny() {
      StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
                                  (*requests_iter)->request_type(),
                                  PermissionAction::DENIED);
@@ -1348,7 +1346,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
  
    NotifyRequestDecided(PermissionAction::DENIED);
-@@ -1300,32 +1311,32 @@ PermissionRequestManager::VisitDuplicateRequests(
+@@ -1283,32 +1294,32 @@ PermissionRequestManager::VisitDuplicateRequests(
  
  void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
      PermissionRequest* request,
@@ -1391,7 +1389,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
        request);
  }
  
-@@ -1596,7 +1607,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
+@@ -1578,7 +1589,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
    }
    switch (auto_response_for_test_) {
      case ACCEPT_ONCE:
@@ -1403,7 +1401,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
-@@ -166,8 +166,10 @@ class PermissionRequestManager
+@@ -168,8 +168,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1415,7 +1413,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    void FinalizeCurrentRequests() override;
-@@ -413,9 +415,12 @@ class PermissionRequestManager
+@@ -419,9 +421,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

@@ -16,6 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../dialogs/DownloadLocationCustomView.java   |  4 +-
  .../strings/android_chrome_strings.grd        |  3 ++
  .../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 ++-
@@ -30,12 +31,12 @@ 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 +
- 26 files changed, 255 insertions(+), 14 deletions(-)
+ 27 files changed, 257 insertions(+), 14 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
-@@ -180,6 +180,7 @@ found in the LICENSE file.
+@@ -191,6 +191,7 @@ found in the LICENSE file.
      <item type="id" name="menu_select_tabs" />
      <item type="id" name="menu_item_content_filter_divider_line_id" />
      <item type="id" name="menu_item_content_filter_help_center_id" />
@@ -46,7 +47,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
-@@ -103,6 +103,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
+@@ -100,6 +100,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -54,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -287,6 +288,9 @@ import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTaskTrackerFac
+@@ -296,6 +297,9 @@ import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTaskTrackerFac
  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;
@@ -64,25 +65,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  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;
-@@ -298,6 +302,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
+@@ -309,6 +313,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
  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.bookmarks.BookmarkId;
 +import org.chromium.components.bookmarks.BookmarkItem;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper;
- import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper;
-@@ -3724,6 +3730,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
-                     getTabModelSelectorSupplier().get(),
-                     closeAllTabsRunnable);
+ 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 {
+             CloseAllTabsDialog.show(
+                     this, getModalDialogManagerSupplier(), tabModelSelector, closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
 +        } else if (id == R.id.bookmark_all_tabs_menu_id) {
 +            bookmarkAllTabs();
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
  
-@@ -3848,6 +3856,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -4030,6 +4038,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -127,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
-@@ -270,6 +270,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -291,6 +291,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
          // Bookmarks
          modelList.add(buildBookmarksItem());
  
@@ -142,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
          // Recent Tabs
          if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
  
-@@ -434,6 +442,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -466,6 +474,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
          }
          modelList.add(buildCloseAllTabsItem());
          if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
@@ -459,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
-@@ -4482,6 +4482,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_SELECT_TABS" desc="Menu item for bulk editing tabs. [CHAR_LIMIT=27]">
          Select tabs
        </message>
@@ -481,6 +482,18 @@ diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chro
        case bookmarks::BookmarkNode::URL:
          NOTREACHED();
        case bookmarks::BookmarkNode::FOLDER:
+diff --git a/chrome/browser/ui/webui_browser/bookmark_bar_page_handler.cc b/chrome/browser/ui/webui_browser/bookmark_bar_page_handler.cc
+--- a/chrome/browser/ui/webui_browser/bookmark_bar_page_handler.cc
++++ b/chrome/browser/ui/webui_browser/bookmark_bar_page_handler.cc
+@@ -37,6 +37,8 @@ bookmark_bar::mojom::BookmarkType ConvertType(
+       return bookmark_bar::mojom::BookmarkType::OTHER_NODE;
+     case bookmarks::BookmarkNode::MOBILE:
+       return bookmark_bar::mojom::BookmarkType::MOBILE;
++    case bookmarks::BookmarkNode::TABS_COLLECTION:
++      NOTREACHED();
+   }
+   NOTREACHED();
+ }
 diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_strings.grdp
 --- a/components/bookmark_bar_strings.grdp
 +++ b/components/bookmark_bar_strings.grdp
@@ -507,15 +520,15 @@ diff --git a/components/bookmark_bar_strings.grdp b/components/bookmark_bar_stri
 diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
 --- a/components/bookmarks/browser/bookmark_codec.cc
 +++ b/components/bookmarks/browser/bookmark_codec.cc
-@@ -36,6 +36,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
+@@ -39,6 +39,7 @@ const char BookmarkCodec::kBookmarkBarFolderNameKey[] = "bookmark_bar";
  const char BookmarkCodec::kOtherBookmarkFolderNameKey[] = "other";
  // The value is left as 'synced' for historical reasons.
  const char BookmarkCodec::kMobileBookmarkFolderNameKey[] = "synced";
 +const char BookmarkCodec::kTabsBookmarkFolderNameKey[] = "tabs";
  const char BookmarkCodec::kVersionKey[] = "version";
  const char BookmarkCodec::kChecksumKey[] = "checksum";
- const char BookmarkCodec::kIdKey[] = "id";
-@@ -73,6 +74,7 @@ base::Value::Dict BookmarkCodec::Encode(
+ const char BookmarkCodec::kChecksumSHA256Key[] = "checksum_sha256";
+@@ -99,6 +100,7 @@ base::Value::Dict BookmarkCodec::Encode(
      const BookmarkNode* bookmark_bar_node,
      const BookmarkNode* other_folder_node,
      const BookmarkNode* mobile_folder_node,
@@ -523,7 +536,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
      std::string sync_metadata_str) {
    ids_reassigned_ = false;
    uuids_reassigned_ = false;
-@@ -98,6 +100,8 @@ base::Value::Dict BookmarkCodec::Encode(
+@@ -124,6 +126,8 @@ base::Value::Dict BookmarkCodec::Encode(
      roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
      roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
      roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
@@ -532,7 +545,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    } else {
      // No permanent node should have been provided.
      CHECK(!other_folder_node);
-@@ -119,6 +123,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -148,6 +152,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
                             BookmarkNode* bb_node,
                             BookmarkNode* other_folder_node,
                             BookmarkNode* mobile_folder_node,
@@ -540,7 +553,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                             int64_t* max_id,
                             std::string* sync_metadata_str) {
    const int64_t max_already_assigned_id =
-@@ -133,7 +138,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -162,7 +167,8 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
              base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
              base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
              base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -550,23 +563,24 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
    ids_reassigned_ = false;
    uuids_reassigned_ = false;
    ids_valid_ = true;
-@@ -141,13 +147,14 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
-   stored_checksum_.clear();
+@@ -171,6 +177,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+   stored_sha256_checksum_.clear();
    InitializeChecksum();
    bool success = DecodeHelper(bb_node, other_folder_node, mobile_folder_node,
 +                              tabs_folder_node,
                                value, sync_metadata_str);
    FinalizeChecksum();
-   // If either the checksums differ or some IDs were missing/not unique,
-   // reassign IDs.
-   if (!ids_valid_ || computed_checksum_ != stored_checksum_) {
+ 
+@@ -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;
-@@ -205,6 +212,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
+@@ -239,6 +246,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
  bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                   BookmarkNode* other_folder_node,
                                   BookmarkNode* mobile_folder_node,
@@ -574,7 +588,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);
-@@ -237,6 +245,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -284,6 +292,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
        roots->FindDict(kOtherBookmarkFolderNameKey);
    const base::Value::Dict* mobile_folder_value =
        roots->FindDict(kMobileBookmarkFolderNameKey);
@@ -583,7 +597,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
  
    if (!bb_value || !other_folder_value || !mobile_folder_value)
      return false;
-@@ -244,6 +254,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -291,6 +301,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);
@@ -592,7 +606,7 @@ 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.
-@@ -475,12 +487,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
+@@ -499,12 +511,14 @@ void BookmarkCodec::DecodeMetaInfoHelper(
  
  void BookmarkCodec::ReassignIDs(BookmarkNode* bb_node,
                                  BookmarkNode* other_node,
@@ -611,7 +625,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
 --- a/components/bookmarks/browser/bookmark_codec.h
 +++ b/components/bookmarks/browser/bookmark_codec.h
-@@ -43,6 +43,7 @@ class BookmarkCodec {
+@@ -44,6 +44,7 @@ class BookmarkCodec {
        const BookmarkNode* bookmark_bar_node,
        const BookmarkNode* other_folder_node,
        const BookmarkNode* mobile_folder_node,
@@ -619,7 +633,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
        std::string sync_metadata_str);
  
    // Decodes the previously encoded value to the specified nodes as well as
-@@ -61,6 +62,7 @@ class BookmarkCodec {
+@@ -62,6 +63,7 @@ class BookmarkCodec {
                BookmarkNode* bb_node,
                BookmarkNode* other_folder_node,
                BookmarkNode* mobile_folder_node,
@@ -627,15 +641,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                int64_t* max_node_id,
                std::string* sync_metadata_str);
  
-@@ -92,6 +94,7 @@ class BookmarkCodec {
+@@ -100,6 +102,7 @@ class BookmarkCodec {
    static const char kBookmarkBarFolderNameKey[];
    static const char kOtherBookmarkFolderNameKey[];
    static const char kMobileBookmarkFolderNameKey[];
 +  static const char kTabsBookmarkFolderNameKey[];
    static const char kVersionKey[];
    static const char kChecksumKey[];
-   static const char kIdKey[];
-@@ -124,6 +127,7 @@ class BookmarkCodec {
+   static const char kChecksumSHA256Key[];
+@@ -133,6 +136,7 @@ class BookmarkCodec {
    bool DecodeHelper(BookmarkNode* bb_node,
                      BookmarkNode* other_folder_node,
                      BookmarkNode* mobile_folder_node,
@@ -643,7 +657,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
                      const base::Value::Dict& value,
                      std::string* sync_metadata_str);
  
-@@ -134,7 +138,8 @@ class BookmarkCodec {
+@@ -143,7 +147,8 @@ class BookmarkCodec {
    // Reassigns bookmark IDs for all nodes.
    void ReassignIDs(BookmarkNode* bb_node,
                     BookmarkNode* other_node,
@@ -893,7 +907,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();
  
-@@ -123,7 +127,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -118,7 +122,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(),
@@ -906,7 +920,7 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
 --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
 +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc
-@@ -442,6 +442,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
+@@ -447,6 +447,7 @@ sync_pb::BookmarkSpecifics::Type GetProtoTypeFromBookmarkNode(
      case bookmarks::BookmarkNode::BOOKMARK_BAR:
      case bookmarks::BookmarkNode::OTHER_NODE:
      case bookmarks::BookmarkNode::MOBILE:

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

@@ -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
-@@ -129,6 +129,7 @@ found in the LICENSE file.
+@@ -133,6 +133,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
-@@ -3764,6 +3764,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3946,6 +3946,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                  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
-@@ -2602,6 +2602,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2697,6 +2697,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
-@@ -957,6 +957,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -989,6 +989,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
-@@ -370,6 +370,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -378,6 +378,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
-@@ -334,6 +334,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -358,6 +358,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
              modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
          }
  
@@ -114,7 +114,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
-@@ -321,6 +321,10 @@ CHAR_LIMIT guidelines:
+@@ -324,6 +324,10 @@ CHAR_LIMIT guidelines:
          Collaboration
        </message>
  

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
-@@ -480,7 +480,12 @@ class TabGridViewBinder {
+@@ -497,7 +497,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) {
-@@ -518,6 +523,7 @@ class TabGridViewBinder {
+@@ -535,6 +540,7 @@ class TabGridViewBinder {
       */
      private static void setFavicon(
              ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
@@ -40,7 +40,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
-@@ -127,6 +127,9 @@ public class TabProperties {
+@@ -130,6 +130,9 @@ public class TabProperties {
      public static final WritableBooleanPropertyKey FAVICON_FETCHED =
              new WritableBooleanPropertyKey();
  
@@ -50,7 +50,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /** Property for lazily fetching favicons when required by an item in a UI. */
      public static final WritableObjectPropertyKey<TabListFaviconProvider.TabFaviconFetcher>
              FAVICON_FETCHER = new WritableObjectPropertyKey<>();
-@@ -220,6 +223,7 @@ public class TabProperties {
+@@ -224,6 +227,7 @@ public class TabProperties {
                  CARD_TYPE,
                  CONTENT_DESCRIPTION_TEXT_RESOLVER,
                  ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
@@ -58,7 +58,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                  QUICK_DELETE_ANIMATION_STATUS,
                  TAB_GROUP_COLOR_VIEW_PROVIDER,
                  TAB_GROUP_CARD_COLOR,
-@@ -259,6 +263,7 @@ public class TabProperties {
+@@ -264,6 +268,7 @@ public class TabProperties {
                  TAB_ACTION_BUTTON_DATA,
                  FAVICON_FETCHED,
                  FAVICON_FETCHER,
@@ -84,15 +84,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/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
-@@ -147,6 +147,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -152,6 +152,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;
 +import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
- import org.chromium.chrome.browser.profiles.ProfileProvider;
-@@ -641,7 +642,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+ import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
+@@ -658,7 +659,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                      new TabContentManager(
                              this,
                              mBrowserControlsManagerSupplier.get(),
@@ -109,11 +109,11 @@ 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;
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.ObservableSupplierImpl;
- import org.chromium.build.annotations.Nullable;
-@@ -98,12 +99,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.build.annotations.NullMarked;
+@@ -98,13 +99,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  
@@ -126,6 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import java.util.List;
  
  /** Fragment to keep track of the all the privacy related preferences. */
+ @NullMarked
  public class PrivacySettings extends ChromeBaseSettingsFragment
 -        implements Preference.OnPreferenceChangeListener {
 +        implements Preference.OnPreferenceChangeListener, INeedSnackbarManager {
@@ -141,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";
-@@ -215,6 +230,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -216,6 +231,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -155,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +                                ApplicationLifetime.terminate(true);
 +                        }
 +                }, Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_UNKNOWN)
-+                .setSingleLine(false)
++                .setDefaultLines(false)
 +                .setAction(getActivity().getString(R.string.relaunch),
 +                        /*actionData*/null)
 +                .setDuration(/*durationMs*/70000);
@@ -199,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
-@@ -6194,6 +6194,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6185,6 +6185,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

@@ -99,14 +99,14 @@ 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
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
+@@ -64,6 +64,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;
 +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController;
- import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager;
- import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
+ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+ import org.chromium.components.browser_ui.util.AutomotiveUtils;
 @@ -145,6 +146,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
      protected void attachBaseContext(Context newBase) {
          super.attachBaseContext(newBase);
@@ -119,15 +119,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-@@ -69,6 +69,7 @@ import org.chromium.content_public.browser.WebContents;
- import org.chromium.content_public.browser.WebContentsObserver;
- import org.chromium.net.NetId;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
+ import org.chromium.components.embedder_support.util.UrlConstants;
+ import org.chromium.content_public.browser.WebContents;
  import org.chromium.ui.LayoutInflaterUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.display.DisplayUtil;
  import org.chromium.url.GURL;
-@@ -491,7 +492,9 @@ public class WarmupManager {
+@@ -472,7 +473,9 @@ public class WarmupManager {
              ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
  
              if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -791,7 +791,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -808,7 +808,9 @@ 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) {
@@ -184,7 +184,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/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
-@@ -127,6 +127,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -132,6 +132,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 +192,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;
-@@ -4955,8 +4956,13 @@ public class StripLayoutHelper
+@@ -5040,8 +5041,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();
@@ -219,7 +219,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.PageTransition;
  import org.chromium.ui.base.WindowAndroid;
-@@ -495,7 +496,10 @@ public class StripLayoutHelperManager
+@@ -498,7 +499,10 @@ public class StripLayoutHelperManager
          mIsLayoutOptimizationsEnabled =
                  ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
                          /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
@@ -234,7 +234,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/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
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
-@@ -111,6 +111,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
+@@ -120,6 +120,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
          if (mNativePtr == 0) return;
          final boolean visible = yOffset > -layoutHelper.getHeight();
  
@@ -252,15 +252,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
-@@ -16,6 +16,7 @@ import org.chromium.base.library_loader.LibraryProcessType;
- import org.chromium.base.task.ChainedTasks;
- import org.chromium.base.task.TaskTraits;
+@@ -18,6 +18,7 @@ import org.chromium.base.task.TaskTraits;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.flags.ChromeSwitches;
 +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.profiles.ProfileManager;
  import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
-@@ -106,6 +107,7 @@ public class ChromeBrowserInitializer {
+@@ -110,6 +111,7 @@ public class ChromeBrowserInitializer {
      public void handlePreNativeStartupAndLoadLibraries(final BrowserParts parts) {
          ThreadUtils.checkUiThread();
          if (parts.isActivityFinishingOrDestroyed()) return;
@@ -271,7 +271,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
-@@ -747,7 +747,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -768,7 +768,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
      @Override
      public int getControlContainerHeightResource() {
@@ -285,7 +285,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
-@@ -108,6 +108,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -110,6 +110,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,7 +294,7 @@ 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;
-@@ -1715,7 +1717,9 @@ public class RootUiCoordinator
+@@ -1803,7 +1805,9 @@ public class RootUiCoordinator
          if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
  
          int stubId = R.id.find_toolbar_stub;
@@ -319,7 +319,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
-@@ -317,6 +317,7 @@ public final class ChromePreferenceKeys {
+@@ -337,6 +337,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";
@@ -371,14 +371,14 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c
 --- 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.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
  import org.chromium.ui.display.DisplayUtil;
+ import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
  import org.chromium.ui.insets.CaptionBarInsetsRectProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.insets.InsetObserver;
  import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer;
  import org.chromium.ui.insets.InsetsRectProvider;
-@@ -280,6 +281,7 @@ public class AppHeaderCoordinator
+@@ -281,6 +282,7 @@ public class AppHeaderCoordinator
              InsetsRectProvider insetsRectProvider,
              @DesktopWindowHeuristicResult int currentResult,
              boolean isOnExternalDisplay) {
@@ -389,7 +389,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c
 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
-@@ -833,7 +833,7 @@ public class LocationBarCoordinator
+@@ -869,7 +869,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -401,7 +401,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
-@@ -1531,6 +1531,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1489,6 +1489,13 @@ Your Google account may have other forms of browsing history like searches and a
          Privacy guide explanation closed
        </message>
  
@@ -422,24 +422,25 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
      android:id="@+id/control_container"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
--    android:minHeight="@dimen/control_container_height" >
-+    android:minHeight="@dimen/control_container_height_cromite" >
+-    android:minHeight="@dimen/control_container_height">
++    android:minHeight="@dimen/control_container_height_cromite">
  
      <view
-         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
-@@ -20,20 +20,20 @@ found in the LICENSE file.
+         class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceCoordinatorLayout"
+@@ -20,7 +20,7 @@ found in the LICENSE file.
          <ViewStub
              android:id="@+id/toolbar_stub"
              android:layout_width="match_parent"
 -            android:layout_marginTop="@dimen/tab_strip_height"
 +            android:layout_marginTop="@dimen/tab_strip_height_cromite"
+             android:layout_marginBottom="@dimen/toolbar_hairline_height"
              android:layout_height="@dimen/toolbar_height_no_shadow" />
  
-         <org.chromium.chrome.browser.toolbar.ToolbarHairlineView
-             android:id="@+id/toolbar_hairline"
+@@ -29,13 +29,13 @@ found in the LICENSE file.
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
--            android:layout_marginTop="@dimen/control_container_height" />
+             app:layout_anchorGravity="bottom"
+-            />
 +            android:layout_marginTop="@dimen/control_container_height_cromite" />
  
          <ViewStub
@@ -491,11 +492,11 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 +    <dimen name="tab_strip_reserved_top_padding_tabletui">2dp</dimen>
  
      <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
-@@ -27,7 +27,7 @@ public interface ControlContainer {
+@@ -26,7 +26,7 @@ public interface ControlContainer {
       *
       * @param toolbarLayoutId The ID of the toolbar layout to use.
       */
@@ -515,7 +516,7 @@ 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;
-@@ -163,8 +164,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+@@ -170,8 +171,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
  
      @Override
      @Initializer
@@ -545,7 +546,7 @@ 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/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
-@@ -66,6 +66,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -64,6 +64,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;
@@ -553,7 +554,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;
  
-@@ -594,7 +595,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -581,7 +582,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -586,7 +587,7 @@ 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/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
-@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+@@ -29,6 +29,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;
@@ -594,7 +595,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
  /** Class used to manage tab strip visibility and height updates. */
  @NullMarked
-@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+@@ -148,7 +149,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
          mTabStripReservedTopPadding =
                  controlContainerView()
                          .getResources()
@@ -609,7 +610,7 @@ 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
-@@ -41,6 +41,11 @@ found in the LICENSE file.
+@@ -36,6 +36,11 @@ found in the LICENSE file.
          android:summary="@string/jump_start_omnibox_summary"
          android:title="@string/jump_start_omnibox_title" />
  
@@ -642,7 +643,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
      private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -108,6 +112,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -117,6 +121,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
                  mDelegate.getReaderAccessibilityDelegate().getValue());
          readerForAccessibilityPref.setOnPreferenceChangeListener(this);
  
@@ -655,7 +656,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -167,6 +177,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -176,6 +186,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);
@@ -680,7 +681,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
-@@ -70,6 +70,14 @@ public class DeviceFormFactor {
+@@ -79,6 +79,14 @@ public class DeviceFormFactor {
      /** See {@link #setIsTabletForTesting(boolean)}. */
      private static @Nullable Boolean sIsTabletForTesting;
  
@@ -695,7 +696,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
-@@ -78,6 +86,7 @@ public class DeviceFormFactor {
+@@ -87,6 +95,7 @@ public class DeviceFormFactor {
      @CalledByNative
      @Deprecated
      public static boolean isTablet() {
@@ -703,7 +704,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          if (sIsTabletForTesting != null) {
              return sIsTabletForTesting;
          }
-@@ -108,6 +117,7 @@ public class DeviceFormFactor {
+@@ -117,6 +126,7 @@ public class DeviceFormFactor {
       *     E.g. http://developer.samsung.com/samsung-dex/testing
       */
      public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -711,7 +712,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
      }
  
-@@ -142,6 +152,7 @@ public class DeviceFormFactor {
+@@ -151,6 +161,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) {
@@ -719,7 +720,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);
      }
  
-@@ -149,6 +160,7 @@ public class DeviceFormFactor {
+@@ -158,6 +169,7 @@ public class DeviceFormFactor {
          ThreadUtils.assertOnUiThread();
          Context context = windowAndroid.getContext().get();
          if (context == null) return 0;
@@ -727,7 +728,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 +170,7 @@ public class DeviceFormFactor {
+@@ -167,6 +179,7 @@ public class DeviceFormFactor {
       */
      @UiThread
      public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
@@ -735,7 +736,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
      }
  
-@@ -166,6 +179,7 @@ public class DeviceFormFactor {
+@@ -175,6 +188,7 @@ public class DeviceFormFactor {
       *         layout.
       */
      public static int getMinimumTabletWidthPx(DisplayAndroid display) {

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

@@ -4,11 +4,12 @@ Subject: Add option to not persist tabs across sessions
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../android/java/res/xml/privacy_preferences.xml |  5 +++++
- .../chrome/browser/ChromeTabbedActivity.java     |  5 ++++-
- .../privacy/settings/PrivacySettings.java        | 16 +++++++++++++++-
- .../android/strings/android_chrome_strings.grd   |  6 ++++++
- 4 files changed, 30 insertions(+), 2 deletions(-)
+ .../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 ++++++
+ 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
@@ -28,7 +29,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
-@@ -46,6 +46,7 @@ import org.chromium.base.Callback;
+@@ -47,6 +47,7 @@ import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
  import org.chromium.base.CallbackUtils;
  import org.chromium.base.CommandLine;
@@ -36,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.base.IntentUtils;
  import org.chromium.base.Log;
  import org.chromium.base.MemoryPressureListener;
-@@ -2086,8 +2087,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2218,8 +2219,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
              boolean hadCipherData =
                      CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
  
@@ -51,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 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
-@@ -8,6 +8,7 @@ import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS
+@@ -9,6 +9,7 @@ import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS
  
  import android.content.Context;
  import android.content.Intent;
@@ -59,17 +60,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import android.graphics.drawable.Drawable;
  import android.os.Bundle;
  import android.text.SpannableString;
-@@ -20,7 +21,9 @@ import android.view.View;
- import androidx.annotation.VisibleForTesting;
+@@ -22,6 +23,7 @@ import androidx.annotation.VisibleForTesting;
  import androidx.preference.Preference;
  
-+import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.IntentUtils;
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -112,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -114,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final SharedPreferencesManager mSharedPreferencesManager =
              ChromeSharedPreferences.getInstance();
  
@@ -78,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";
-@@ -381,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -382,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -91,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)) {
-@@ -441,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -442,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              getContext(), getProfile()));
          }
  
@@ -103,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
-@@ -2901,6 +2901,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -2856,6 +2856,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

@@ -6,7 +6,7 @@ And allow use about:blank as default homepage
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../tab_management/TabGridDialogMediator.java    | 11 ++++++++++-
+ .../tab_management/TabGridDialogMediator.java    | 12 +++++++++++-
  .../tasks/tab_management/TabGroupUiMediator.java |  8 +++++++-
  .../java/res/xml/homepage_preferences.xml        |  5 +++++
  .../strip/TabGroupContextMenuCoordinator.java    | 11 ++++++++++-
@@ -19,14 +19,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../android/strings/android_chrome_strings.grd   |  3 +++
  chrome/browser/ui/browser_ui_prefs.cc            |  2 ++
  chrome/common/pref_names.h                       |  4 ++++
- 13 files changed, 79 insertions(+), 4 deletions(-)
+ 13 files changed, 80 insertions(+), 4 deletions(-)
 
 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
-@@ -120,6 +120,9 @@ import java.util.Objects;
- import java.util.Optional;
+@@ -100,6 +100,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;
++import org.chromium.components.embedder_support.util.UrlConstants;
+ 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;
  import java.util.Set;
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.homepage.HomepageManager;
 +import org.chromium.url.GURL;
@@ -34,11 +42,11 @@ 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.
-@@ -1035,9 +1038,15 @@ public class TabGridDialogMediator
-                 return;
-             }
+@@ -1033,9 +1037,15 @@ public class TabGridDialogMediator
+             UrlConstantResolver urlConstantResolver =
+                     UrlConstantResolverFactory.getForProfile(profile);
  
-+            String url = UrlConstants.NTP_URL;
++            String url = urlConstantResolver.getNtpUrl();
 +            if (UrlConstants.NTP_URL.equals(url)
 +                    && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
@@ -46,15 +54,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 +            }
              TabGroupUtils.openUrlInGroup(
                      assumeNonNull(mCurrentTabGroupModelFilterSupplier.get()),
--                    UrlConstants.NTP_URL,
+-                    urlConstantResolver.getNtpUrl(),
 +                    url,
-                     currentTab.getId(),
+                     tabsInGroup.get(tabsInGroup.size() - 1).getId(),
                      TabLaunchType.FROM_TAB_GROUP_UI);
              RecordUserAction.record("MobileNewTabOpened." + mComponentName);
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
-@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
+@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesConfig;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
@@ -62,11 +70,11 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -420,10 +421,15 @@ public class TabGroupUiMediator implements BackPressHandler {
-                     assert relatedTabs.size() > 0;
+@@ -425,10 +426,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+                             UrlConstantResolverFactory.getForProfile(currentTabProfile);
  
                      Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
-+                    String url = UrlConstants.NTP_URL;
++                    String url = urlConstantResolver.getNtpUrl();
 +                    if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                        GURL gurl = HomepageManager.getInstance().getHomepageGurl();
 +                        url = gurl != null ? gurl.getSpec() : url;
@@ -74,7 +82,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      mTabCreatorManager
                              .getTabCreator(currentTab.isIncognito())
                              .createNewTab(
--                                    new LoadUrlParams(UrlConstants.NTP_URL),
+-                                    new LoadUrlParams(urlConstantResolver.getNtpUrl()),
 +                                    new LoadUrlParams(url),
                                      TabLaunchType.FROM_TAB_GROUP_UI,
                                      parentTabToAttach);
@@ -97,9 +105,9 @@ 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
-@@ -75,6 +75,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
- import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation;
- import org.chromium.ui.widget.RectProvider;
+@@ -84,6 +84,9 @@ import org.chromium.ui.widget.RectProvider;
+ 
+ import java.util.function.Supplier;
  
 +import org.chromium.chrome.browser.homepage.HomepageManager;
 +import org.chromium.url.GURL;
@@ -107,7 +115,7 @@ 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.
-@@ -215,9 +218,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+@@ -228,9 +231,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
                          /* didCloseCallback= */ null);
                  RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
              } else if (menuId == R.id.open_new_tab_in_group) {
@@ -127,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
-@@ -258,6 +258,22 @@ public class HomepageManager
+@@ -257,6 +257,22 @@ public class HomepageManager
          notifyHomepageUpdated();
      }
  
@@ -170,8 +178,8 @@ 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<>();
-@@ -78,6 +81,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
-                 });
+@@ -102,6 +105,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+         mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged);
          mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
  
 +        ChromeSwitchPreference mNTPIsHomepageSwitch =
@@ -208,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -565,6 +566,13 @@ public class ChromeTabCreator extends TabCreator
+@@ -572,6 +573,13 @@ public class ChromeTabCreator extends TabCreator
       */
      public @Nullable Tab launchUrl(
              String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
@@ -225,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
-@@ -330,6 +330,7 @@ public final class ChromePreferenceKeys {
+@@ -350,6 +350,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";
  
@@ -247,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
-@@ -1357,6 +1357,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1330,6 +1330,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>
@@ -260,7 +268,7 @@ 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
-@@ -111,6 +111,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -119,6 +119,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
                                  pref_registration_flags);
@@ -272,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
-@@ -1327,6 +1327,10 @@ inline constexpr char kPinSplitTabButton[] = "browser.pin_split_tab_button";
+@@ -1336,6 +1336,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
  // by enterprise policy.
  inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
  

build/patches/Add-search-engine.patch

@@ -63,7 +63,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
    ]
  
    deps = [
-@@ -162,6 +163,7 @@ source_set("search_engine_utils") {
+@@ -164,6 +165,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" ]
-@@ -252,6 +254,7 @@ source_set("unit_tests") {
+@@ -258,6 +260,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
-@@ -155,10 +155,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+@@ -172,10 +172,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
  }
  
  void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -212,17 +212,16 @@ 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,11 +172,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+@@ -159,10 +172,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
      return std::vector<std::unique_ptr<TemplateURLData>>();
    }
  
--  return base::ToVector(
+-  return base::ToVector(regional_capabilities::GetPrepopulatedEngines(
 +  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
-+    base::ToVector(
-       regional_capabilities::GetPrepopulatedEngines(
-           country_id, prefs,
-           regional_capabilities::SearchEngineListType::kTopFive),
-       &PrepopulatedEngineToTemplateURLData);
++    base::ToVector(regional_capabilities::GetPrepopulatedEngines(
+                             country_id, prefs,
+                             regional_capabilities::SearchEngineListType::kTopN),
+                         &PrepopulatedEngineToTemplateURLData);
 +  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
 +  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));
 +  return t_urls;

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

@@ -48,7 +48,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
-@@ -262,6 +262,7 @@ chrome_java_sources = [
+@@ -265,6 +265,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",
@@ -82,7 +82,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;
-@@ -2091,7 +2092,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2224,7 +2225,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
              Intent intent = getIntent();
  
              boolean hadCipherData =
@@ -136,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -160,6 +160,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -164,6 +164,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
              assert mCheckbox == preference;
  
              mParent.updateButtonState();
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              return true;
          }
  
-@@ -241,7 +247,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -245,7 +251,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      private @TimePeriod int mLastSelectedTimePeriod;
      private boolean mShouldShowPostDeleteFeedback;
  
@@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
  
      /**
       * @return All available {@link DialogOption} entries.
-@@ -347,7 +353,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -351,7 +357,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      }
  
      /** Called when browsing data is about to be cleared. */
@@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          RecordUserAction.record("ClearBrowsingData_AdvancedTab");
  
          if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
-@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -442,6 +448,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
              BrowsingDataBridge.getForProfile(getProfile())
                      .setBrowsingDataDeletionPreference(
                              ClearBrowsingDataFragment.getDataType(item.getOption()),
@@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
                              item.isSelected());
          }
  
-@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -449,8 +456,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
      }
  
@@ -189,7 +189,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);
-@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -476,6 +487,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  DialogOption.CLEAR_SITE_SETTINGS);
      }
  
@@ -200,7 +200,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.
       *
-@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -484,7 +499,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       */
      private boolean isOptionSelectedByDefault(@DialogOption int option) {
          return BrowsingDataBridge.getForProfile(getProfile())
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      }
  
      /**
-@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -552,6 +567,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       * options.
       */
      private void onClearButtonClicked() {
@@ -217,15 +217,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
-         Button clearButton = (Button) getView().findViewById(R.id.clear_button);
+@@ -581,6 +597,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+         Button clearButton = (Button) assumeNonNull(getView()).findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
 +        clearButton.setVisibility(shouldClearBrowsingData() ? View.VISIBLE : View.INVISIBLE);
      }
  
      private int getSpinnerIndex(
-@@ -651,7 +668,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -658,7 +675,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                              .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
                  enabled = false;
                  browsingDataBridge.setBrowsingDataDeletionPreference(
@@ -234,7 +234,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.
-@@ -681,8 +698,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -688,8 +705,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
          mSigninManager.addSignInStateObserver(this);
  
          setHasOptionsMenu(true);
@@ -334,7 +334,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
-@@ -2054,6 +2054,16 @@
+@@ -2067,6 +2067,16 @@
    <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
      Delete browsing data
    </message>
@@ -354,7 +354,7 @@ 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
-@@ -107,6 +107,7 @@
+@@ -110,6 +110,7 @@
  #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"
@@ -467,7 +467,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());
-@@ -457,6 +458,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -453,6 +454,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -477,7 +477,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -565,6 +569,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -561,6 +565,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 +489,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&)>()
-@@ -593,9 +602,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -589,9 +598,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -503,7 +503,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
-@@ -1320,6 +1333,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1314,6 +1327,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -515,7 +515,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
-@@ -550,6 +550,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -557,6 +557,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -574,7 +574,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b
 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
-@@ -1441,6 +1441,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1435,6 +1435,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
    }
  }
  
@@ -594,7 +594,7 @@ 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_ ||
-@@ -2102,7 +2115,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2096,7 +2109,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
    Profile* original_profile = profile->GetOriginalProfile();
    // Do nothing if the closed window is not the last window of the same profile.
    for (Browser* browser_iter : *BrowserList::GetInstance()) {
@@ -691,7 +691,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
-@@ -1452,6 +1452,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1425,6 +1425,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 +718,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
-@@ -2021,6 +2021,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -2042,6 +2042,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -729,10 +729,10 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc
 --- a/components/browsing_data/content/browsing_data_helper.cc
 +++ b/components/browsing_data/content/browsing_data_helper.cc
-@@ -42,8 +42,13 @@ bool WebsiteSettingsFilterAdapter(
-   // this filter is used for is DURABLE_STORAGE, which also only uses
-   // origin-scoped patterns. Such patterns can be directly translated to a GURL.
-   GURL url(primary_pattern.ToString());
+@@ -44,8 +44,13 @@ bool WebsiteSettingsFilterAdapter(
+   // `example.com`).
+   GURL url = primary_pattern.ToRepresentativeUrl();
+ 
 -  DCHECK(url.is_valid()) << "url: '" << url.possibly_invalid_spec() << "' "
 -                         << "pattern: '" << primary_pattern.ToString() << "'";
 +  if (!url.is_valid()) {
@@ -770,7 +770,7 @@ diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/c
 diff --git a/components/browsing_data/core/browsing_data_policies_utils.cc b/components/browsing_data/core/browsing_data_policies_utils.cc
 --- a/components/browsing_data/core/browsing_data_policies_utils.cc
 +++ b/components/browsing_data/core/browsing_data_policies_utils.cc
-@@ -17,21 +17,21 @@
+@@ -18,21 +18,21 @@
  
  namespace browsing_data {
  
@@ -826,7 +826,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -413,6 +413,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -418,6 +418,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -976,7 +976,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
-@@ -212,7 +212,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+@@ -262,7 +262,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
      remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
      remover->RemoveWithFilterAndReply(
          base::Time::Min(), base::Time::Max(),
@@ -988,7 +988,7 @@ 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
-@@ -1529,6 +1529,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1550,6 +1550,7 @@ void StoragePartitionImpl::Initialize(
                              .AppendASCII("Code Cache");
      }
      DCHECK_GE(settings.size_in_bytes(), 0);

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

@@ -0,0 +1,336 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Thu, 9 Oct 2025 09:11:01 +0000
+Subject: Add setting to enable Credman for passkeys
+
+Enables Credential Manager for passkey management on A14+ devices via a switch
+in the settings. By default, the feature is disabled.
+In other versions of Android, webauthn appears to be enabled on websites but
+always returns a timeout error as per specifications.
+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 +++++++++++++++++
+ ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
+ .../webauthn/AuthenticatorImpl.java           | 29 +++++++------------
+ .../components/webauthn/WebauthnFeatures.java |  2 ++
+ .../cred_man/CredManSupportProvider.java      | 27 +++++------------
+ .../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(-)
+ 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
+--- 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
+@@ -10,6 +10,7 @@ import android.app.Activity;
+ import android.content.Context;
+ import android.content.Intent;
+ import android.net.Uri;
++import android.os.Build;
+ import android.os.Bundle;
+ import android.text.SpannableString;
+ import android.text.style.ForegroundColorSpan;
+@@ -64,6 +65,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+ import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
+ 
++import org.chromium.chrome.browser.flags.CromiteNativeUtils;
++import org.chromium.components.webauthn.WebauthnFeatureMap;
++import org.chromium.components.webauthn.WebauthnFeatures;
++
+ /**
+  * The "Passwords" screen in Settings, which allows the user to enable or disable password saving,
+  * to view saved passwords (just the username and URL), and to delete saved passwords.
+@@ -322,6 +327,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+         createSavePasswordsSwitch();
+         createAutoSignInCheckbox();
+         createEnableAndroidAutofillSwitch();
++        createCredManSwitch();
+ 
+         PasswordManagerHandlerProvider.getForProfile(getProfile())
+                 .getPasswordManagerHandler()
+@@ -673,6 +679,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+                 getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_AUTOSIGNIN));
+     }
+ 
++    private void createCredManSwitch() {
++        ChromeSwitchPreference credManSwitch =
++                new ChromeSwitchPreference(getStyledContext(), null);
++        credManSwitch.setTitle(R.string.enable_android_credman_title);
++        credManSwitch.setOrder(0);
++        credManSwitch.setSummary(R.string.enable_android_credman_summary);
++        credManSwitch.setChecked(
++                WebauthnFeatureMap.getInstance().isEnabled(WebauthnFeatures.WEBAUTHN_ANDROID_PASSKEY));
++        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
++            credManSwitch.setSummary(R.string.enable_android_credman_disabled_summary);
++            credManSwitch.setEnabled(false);
++        }
++        credManSwitch.setOnPreferenceChangeListener((preference, newValue) -> {
++            CromiteNativeUtils.setFlagEnabled("WebAuthenticationAndroidPasskey", (boolean)newValue);
++            if (!mSnackbarManagerSupplier.get().isShowing())
++                mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
++            return true;
++        });
++        getPreferenceScreen().addPreference(credManSwitch);
++    }
++
+     private void displayManageAccountLink() {
+         SyncService syncService = SyncServiceFactory.getForProfile(getProfile());
+         if (syncService == null || !syncService.isEngineInitialized()) {
+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
++++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp
+@@ -0,0 +1,12 @@
++<?xml version="1.0" encoding="utf-8"?>
++<grit-part>
++    <message name="IDS_ENABLE_ANDROID_CREDMAN_TITLE" desc="" formatter_data="android_java">
++        Enable Android Credential Manager
++    </message>
++    <message name="IDS_ENABLE_ANDROID_CREDMAN_SUMMARY" desc="" formatter_data="android_java">
++        Enable support for Android Credential Manager
++    </message>
++    <message name="IDS_ENABLE_ANDROID_CREDMAN_DISABLED_SUMMARY" desc="" formatter_data="android_java">
++        Not supported on your device (require A14+)
++    </message>
++</grit-part>
+diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+--- a/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
++++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/AuthenticatorImpl.java
+@@ -34,6 +34,8 @@ import org.chromium.blink.mojom.PublicKeyCredentialReportOptions;
+ import org.chromium.blink.mojom.WebAuthnClientCapability;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
++import org.chromium.components.webauthn.CredManSupport;
++import org.chromium.components.webauthn.cred_man.CredManSupportProvider;
+ 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
+         mIsPaymentRequest = options.isPaymentCredentialCreation;
+         mMakeCredentialCallback = callback;
+         mIsOperationPending = true;
+-        if (!GmsCoreUtils.isWebauthnSupported()
+-                || (!isChrome(mWebContents) && !GmsCoreUtils.isResultReceiverSupported())) {
++        if (CredManSupportProvider.getCredManSupport() == CredManSupport.DISABLED) {
+             recordOutcomeEvent(MakeCredentialOutcome.OTHER_FAILURE);
+             onError(AuthenticatorStatus.NOT_IMPLEMENTED);
+             return;
+@@ -234,8 +235,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+         mIsConditionalRequest = options.mediation == Mediation.CONDITIONAL;
+         mIsImmediateRequest = options.mediation == Mediation.IMMEDIATE;
+ 
+-        if (!GmsCoreUtils.isWebauthnSupported()
+-                || (!isChrome(mWebContents) && !GmsCoreUtils.isResultReceiverSupported())
++        if (CredManSupportProvider.getCredManSupport() == CredManSupport.DISABLED
+                 || options.publicKey == null) {
+             recordOutcomeEvent(GetAssertionOutcome.OTHER_FAILURE);
+             onError(AuthenticatorStatus.NOT_IMPLEMENTED);
+@@ -260,12 +260,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+     }
+ 
+     private boolean couldSupportConditionalMediation() {
+-        return GmsCoreUtils.isWebauthnSupported() && isChrome(mWebContents);
++        return isChrome(mWebContents);
+     }
+ 
+     private boolean couldSupportUvpaa() {
+-        return GmsCoreUtils.isWebauthnSupported()
+-                && (isChrome(mWebContents) || GmsCoreUtils.isResultReceiverSupported());
++        return isChrome(mWebContents);
+     }
+ 
+     @Override
+@@ -339,26 +338,20 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_GET,
+-                                            couldSupportConditionalMediation() && isUvpaa));
++                                            true));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_UVPAA,
+-                                            couldSupportUvpaa() && isUvpaa));
+-                            boolean conditionalCreateEnabled =
+-                                    couldSupportConditionalMediation()
+-                                            && DeviceFeatureMap.isEnabled(
+-                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE);
++                                            true));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_CREATE,
+-                                            isUvpaa && conditionalCreateEnabled));
++                                            DeviceFeatureMap.isEnabled(
++                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE)));
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants.CAPABILITY_IMMEDIATE_GET,
+-                                            DeviceFeatureMap.isEnabled(
+-                                                            DeviceFeatureList
+-                                                                    .WEBAUTHN_IMMEDIATE_GET)
+-                                                    && isUvpaa));
++                                            false));
+                             callback.call(capabilities.toArray(new WebAuthnClientCapability[0]));
+                         });
+     }
+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 {
+     public static final String WEBAUTHN_ANDROID_PASSKEY_CACHE_MIGRATION =
+             "WebAuthenticationAndroidPasskeyCacheMigration";
++    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;
+ 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.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 {
+         }
+         if (getAndroidVersion() < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+             sCredManSupport = CredManSupport.DISABLED;
+-            log(TAG, "Disabled because of Android version.");
++            WebauthnLogger.logError(TAG, "Disabled because of Android version.");
+             return sCredManSupport;
+         }
+-        if (notSkippedBecauseInTests() && hasOldGmsVersion()) {
++        if (!WebauthnFeatureMap.getInstance().isEnabled(WebauthnFeatures.WEBAUTHN_ANDROID_PASSKEY)) {
+             sCredManSupport = CredManSupport.DISABLED;
+-            log(TAG, "Disabled because of old GMS version.");
++            WebauthnLogger.logError(TAG, "Disabled because of user.");
+             return sCredManSupport;
+         }
+         if (notSkippedBecauseInTests()
+@@ -70,14 +72,14 @@ public class CredManSupportProvider {
+                         == null) {
+             sCredManSupport = CredManSupport.DISABLED;
+             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);
+ 
+         final CredManUiRecommender recommender =
+                 ServiceLoaderUtil.maybeCreate(CredManUiRecommender.class);
+-        boolean customUiRecommended = recommender != null && recommender.recommendsCustomUi();
++        boolean customUiRecommended = true;
+         boolean gpmInCredMan =
+                 sOverrideForcesGpm != null ? sOverrideForcesGpm : customUiRecommended;
+         boolean isChrome3pPwmMode =
+@@ -116,13 +118,6 @@ public class CredManSupportProvider {
+                 "WebAuthentication.Android.CredManAvailability", available);
+     }
+ 
+-    private static boolean hasOldGmsVersion() {
+-        assert sOverrideAndroidVersion == null : "Don't use in testing!";
+-        // The check works for unavailable and low GMS versions. `getGmsCoreVersion()` is -1 if the
+-        // GMS version can't be retrieved. Chrome assumes an insufficient GMS availability then.
+-        return GmsCoreUtils.getGmsCoreVersion() < getMinGmsVersionForCurrentChannel();
+-    }
+-
+     private static int getAndroidVersion() {
+         return sOverrideAndroidVersion == null ? Build.VERSION.SDK_INT : sOverrideAndroidVersion;
+     }
+@@ -130,10 +125,4 @@ public class CredManSupportProvider {
+     private static boolean notSkippedBecauseInTests() {
+         return sOverrideForcesGpm == null && sOverrideAndroidVersion == null;
+     }
+-
+-    private static int getMinGmsVersionForCurrentChannel() {
+-        return (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild())
+-                ? GMSCORE_MIN_VERSION_BETA_STABLE
+-                : GMSCORE_MIN_VERSION_CANARY_DEV;
+-    }
+ }
+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.
+ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kWebAuthnAndroidPasskeyCacheMigration,
++    &kWebAuthnAndroidPasskey,
+ };
+ 
+ // static
+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);
+ 
++CROMITE_FEATURE(kWebAuthnAndroidPasskey,
++                "WebAuthenticationAndroidPasskey",
++                base::FEATURE_DISABLED_BY_DEFAULT);
++
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if !BUILDFLAG(IS_ANDROID)
+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 {
+ COMPONENT_EXPORT(WEBAUTHN)
+ BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskeyCacheMigration);
+ 
++COMPONENT_EXPORT(WEBAUTHN)
++BASE_DECLARE_FEATURE(kWebAuthnAndroidPasskey);
++
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+ #if !BUILDFLAG(IS_ANDROID)
+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,
+ #else
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_ANDROID)
++SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGet);
+ 
+ BASE_FEATURE_PARAM(int,
+                    kWebAuthnImmediateMediationTimeoutMilliseconds,
+@@ -166,6 +167,7 @@ BASE_FEATURE_PARAM(int,
+ BASE_FEATURE(kWebAuthnImmediateGetAutoselect,
+              "WebAuthenticationImmediateGetAutoselect",
+              base::FEATURE_ENABLED_BY_DEFAULT);
++SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGetAutoselect);
+ 
+ // Default enabled in M140. Remove in or after M143.
+ BASE_FEATURE(kWebAuthnLargeBlobForGPM,
+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(
+     const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) {
+   DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS,
+             dom_exception_details.is_null());
++  if (status == AuthenticatorStatus::UNKNOWN_ERROR ||
++      status == AuthenticatorStatus::NOT_IMPLEMENTED) {
++      status = AuthenticatorStatus::NOT_ALLOWED_ERROR;
++      base::PlatformThread::Sleep(base::Milliseconds(base::RandInt(1000, 6000)));
++  }
+   switch (status) {
+     case AuthenticatorStatus::SUCCESS:
+       NOTREACHED();
+--

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
-@@ -105,6 +105,7 @@ found in the LICENSE file.
+@@ -109,6 +109,7 @@ found in the LICENSE file.
  
      <!-- Menu item IDs for FullscreenActivities -->
      <item type="id" name="contextmenu_open_in_chrome" />
@@ -98,18 +98,18 @@ 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
-@@ -128,8 +128,9 @@ class ChromeContextMenuItem {
-         int PRINT_PAGE = 38;
+@@ -132,8 +132,9 @@ class ChromeContextMenuItem {
+         int PRINT_PAGE = 40;
          // Developer Group
-         int INSPECT_ELEMENT = 39;
-+        int FOLLOW_LINK = 40;
+         int INSPECT_ELEMENT = 41;
++        int FOLLOW_LINK = 42;
          // ALWAYS UPDATE!
--        int NUM_ENTRIES = 40;
-+        int NUM_ENTRIES = 41;
+-        int NUM_ENTRIES = 42;
++        int NUM_ENTRIES = 43;
      }
  
      /** Mapping from {@link Item} to the ID found in the ids.xml. */
-@@ -174,6 +175,7 @@ class ChromeContextMenuItem {
+@@ -180,6 +181,7 @@ class ChromeContextMenuItem {
          R.id.contextmenu_share_page, // Item.SHARE_PAGE
          R.id.contextmenu_print_page, // Item.PRINT_PAGE
          R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
      };
  
      /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
-@@ -218,6 +220,7 @@ class ChromeContextMenuItem {
+@@ -226,6 +228,7 @@ class ChromeContextMenuItem {
          R.string.contextmenu_share_page, // Item.SHARE_PAGE
          R.string.contextmenu_print_page, // Item.PRINT_PAGE
          R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -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
-@@ -442,6 +442,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -452,6 +452,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())) {
-@@ -1026,6 +1029,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -1054,6 +1057,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
-@@ -369,6 +369,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -374,6 +374,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
-@@ -419,6 +419,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -433,6 +433,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
-@@ -494,6 +494,8 @@ public abstract class ChromeFeatureList {
+@@ -507,6 +507,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";
-@@ -988,6 +990,8 @@ public abstract class ChromeFeatureList {
+@@ -1035,6 +1037,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -197,7 +197,7 @@ 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);
-@@ -1228,6 +1232,7 @@ public abstract class ChromeFeatureList {
+@@ -1289,6 +1293,7 @@ public abstract class ChromeFeatureList {
                      sTopControlsRefactor,
                      sTouchToSearchCallout,
                      sTraceBinderIpc,
@@ -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
-@@ -1596,6 +1596,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1554,6 +1554,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,7 +221,7 @@ 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]">
-@@ -3237,6 +3243,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3195,6 +3201,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>
@@ -234,7 +234,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -31,6 +31,11 @@ found in the LICENSE file.
+@@ -26,6 +26,11 @@ found in the LICENSE file.
          android:summary="@string/page_zoom_always_show_preference_summary"
          android:title="@string/page_zoom_always_show_preference_title" />
  
@@ -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;
-@@ -139,6 +142,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -148,6 +151,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 -> {
-@@ -220,6 +229,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -229,6 +238,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
-@@ -66,6 +66,7 @@
+@@ -67,6 +67,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"
-@@ -501,6 +502,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -476,6 +477,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;
-@@ -591,6 +603,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -566,6 +578,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      frame_request.SetImpression(impression);
    }
  
@@ -386,8 +386,8 @@ 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;
  
-@@ -634,7 +655,7 @@ Element* HTMLAnchorElementBase::InterestForElement() const {
-       html_names::kInterestforAttr);
+@@ -601,7 +622,7 @@ bool HTMLAnchorElementBase::IsValidInterestInvoker(Element& target) const {
+   return IsLink();
  }
  
 -void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
@@ -395,25 +395,25 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    event.SetDefaultHandled();
  
    LocalDOMWindow* window = GetDocument().domWindow();
-@@ -730,13 +751,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -659,13 +680,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      return;
    }
  
--  base::OnceClosure navigate_closure = WTF::BindOnce(
+-  base::OnceClosure navigate_closure = blink::BindOnce(
 -      &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 -      std::move(request), navigation_policy, event.isTrusted(),
 -      event.PlatformTimeStamp(), std::move(completed_url));
 -
    if (navigation_policy == kNavigationPolicyDownload ||
        navigation_policy == kNavigationPolicyLinkPreview) {
-+    base::OnceClosure navigate_closure = WTF::BindOnce(
++    base::OnceClosure navigate_closure = blink::BindOnce(
 +        &HTMLAnchorElementBase::NavigateToHyperlink, WrapWeakPersistent(this),
 +        std::move(request), navigation_policy, event.isTrusted(),
 +        event.PlatformTimeStamp(), std::move(completed_url));
      // We distinguish single/double click with some modifiers.
      // See the comment of `EventHandler.delayed_navigation_task_handle_`.
      auto task_handle = PostDelayedCancellableTask(
-@@ -746,7 +766,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -675,7 +695,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      frame->GetEventHandler().SetDelayedNavigationTaskHandle(
          std::move(task_handle));
    } else {
@@ -428,7 +428,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
 --- 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,
-   Element* InterestForElement() const override;
+   bool IsValidInterestInvoker(Element& target) const override;
  
    void Trace(Visitor*) const override;
 +  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
@@ -459,7 +459,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/frame/attribution_src_loader.h"
  #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h"
  #include "third_party/blink/renderer/core/frame/local_dom_window.h"
-@@ -64,6 +65,7 @@
+@@ -65,6 +66,7 @@
  #include "third_party/blink/renderer/core/media_type_names.h"
  #include "third_party/blink/renderer/core/page/chrome_client.h"
  #include "third_party/blink/renderer/core/page/page.h"
@@ -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"
-@@ -815,6 +817,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -796,6 +798,21 @@ void HTMLImageElement::DidFinishLayout() {
    }
  }
  
@@ -492,7 +492,7 @@ 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
-@@ -215,6 +215,8 @@ class CORE_EXPORT HTMLImageElement
+@@ -216,6 +216,8 @@ class CORE_EXPORT HTMLImageElement
    void DidAddUserAgentShadowRoot(ShadowRoot&) override;
    void AdjustStyle(ComputedStyleBuilder&) override;
  
@@ -504,7 +504,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p
 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,14 +200,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -200,15 +200,17 @@ void ContextMenuController::DocumentDetached(Document* document) {
    }
  }
  
@@ -514,7 +514,8 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
 +  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
 +    DCHECK(mouse_event->type() == event_type_names::kContextmenu);
 +  }
-   LocalFrame* frame = mouse_event->target()->ToNode()->GetDocument().GetFrame();
+   LocalFrame* frame =
+       mouse_event->RawTarget()->ToNode()->GetDocument().GetFrame();
    PhysicalOffset location =
        PhysicalOffset::FromPointFRound(mouse_event->AbsoluteLocation());
  
@@ -524,7 +525,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
      mouse_event->SetDefaultHandled();
  }
  
-@@ -432,7 +434,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -433,7 +435,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
  bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                              const PhysicalOffset& point,
                                              WebMenuSourceType source_type,
@@ -534,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,
-@@ -455,6 +458,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -456,6 +459,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
    if (!result.InnerNodeOrImageMapImage())
      return false;
  
@@ -551,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;
-@@ -825,7 +838,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -836,7 +849,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
  
    SetAutofillData(result.InnerNode(), data);
  

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

@@ -9,6 +9,8 @@ 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 +++
@@ -16,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 ++++++
- 9 files changed, 105 insertions(+)
+ 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
@@ -24,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -165,6 +165,7 @@
+@@ -171,6 +171,7 @@
  #include "components/sensitive_content/features.h"
  #include "components/services/heap_profiling/public/cpp/switches.h"
  #include "components/services/storage/public/cpp/buckets/bucket_info.h"
@@ -65,6 +67,39 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
    std::map<std::string, ImportantDomainInfo> important_info;
    std::map<GURL, double> engagement_map;
  
+diff --git a/chrome/browser/media/media_engagement_service.cc b/chrome/browser/media/media_engagement_service.cc
+--- a/chrome/browser/media/media_engagement_service.cc
++++ b/chrome/browser/media/media_engagement_service.cc
+@@ -25,6 +25,7 @@
+ #include "components/history/core/browser/history_service.h"
+ #include "components/no_state_prefetch/browser/no_state_prefetch_contents.h"
+ #include "components/prefs/pref_service.h"
++#include "components/site_engagement/core/features.h"
+ #include "content/public/browser/web_contents.h"
+ #include "media/base/media_switches.h"
+ #include "url/origin.h"
+@@ -54,7 +55,8 @@ enum class MediaEngagementClearReason {
+ 
+ // static
+ bool MediaEngagementService::IsEnabled() {
+-  return base::FeatureList::IsEnabled(media::kRecordMediaEngagementScores);
++  return base::FeatureList::IsEnabled(media::kRecordMediaEngagementScores)
++           && base::FeatureList::IsEnabled(site_engagement::features::kSiteEngagement);
+ }
+ 
+ // 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
+@@ -42,7 +42,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
@@ -76,7 +111,7 @@ diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components
  #include "components/feature_engagement/internal/availability_model_impl.h"
  #include "components/feature_engagement/internal/blocked_iph_features.h"
  #include "components/feature_engagement/internal/chrome_variations_configuration.h"
-@@ -306,6 +307,8 @@ TrackerImpl::TrackerImpl(
+@@ -291,6 +292,8 @@ TrackerImpl::TrackerImpl(
  TrackerImpl::~TrackerImpl() = default;
  
  void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -88,7 +123,7 @@ diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components
 diff --git a/components/feature_engagement/public/feature_configurations.cc b/components/feature_engagement/public/feature_configurations.cc
 --- a/components/feature_engagement/public/feature_configurations.cc
 +++ b/components/feature_engagement/public/feature_configurations.cc
-@@ -11,6 +11,7 @@
+@@ -6,6 +6,7 @@
  
  #include "base/strings/string_util.h"
  #include "build/build_config.h"
@@ -96,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"
-@@ -118,6 +119,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
    }
  
  #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)

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

@@ -12,15 +12,15 @@ 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
-@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+@@ -63,6 +63,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;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
- import org.chromium.components.browser_ui.settings.SettingsFragment;
-@@ -469,8 +470,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+ import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver;
+@@ -733,8 +734,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              finishCurrentSettings(mainFragment);
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {
@@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
-@@ -28,6 +28,10 @@ import org.chromium.ui.drawable.StateListDrawableBuilder;
+@@ -33,6 +33,10 @@ import java.util.ArrayList;
  /** A helper class for Settings. */
  @NullMarked
  public class SettingsUtils {

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
-@@ -136,6 +136,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
+@@ -137,6 +137,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
                         Time::FromMillisecondsSinceUnixEpoch(last_modified));
  }
  

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

@@ -52,7 +52,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
++import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -65,8 +65,8 @@ new file mode 100644
 +public class BromiteWebGLContentSetting extends BromiteCustomContentSetting {
 +    public BromiteWebGLContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.WEBGL,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
++              /*defaultEnabledValue*/ ContentSetting.ALLOW,
++              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "webgl",
 +              /*profilePrefKey*/ "webgl");
@@ -85,11 +85,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
++    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
++            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_webgl_enabled;
-+            case ContentSettingValues.BLOCK:
++            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_webgl_disabled;
 +            default:
 +                return 0;
@@ -117,8 +117,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
++    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
++        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/webgl.grdp b/components/browser_ui/strings/bromite_content_settings/webgl.grdp
@@ -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
-@@ -114,6 +114,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -115,6 +115,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
-@@ -345,6 +345,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -346,6 +346,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
    }
  }
  
@@ -232,8 +232,8 @@ 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_);
-@@ -615,25 +622,6 @@ static String ExtractWebGLContextCreationError(
-     const Platform::GraphicsInfo& info) {
+@@ -616,25 +623,6 @@ static String ExtractWebGLContextCreationError(
+     const Platform::WebGLContextInfo& info) {
    StringBuilder builder;
    builder.Append("Could not create a WebGL context");
 -  FormatWebGLStatusString(
@@ -258,10 +258,10 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
    FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                            builder);
    builder.Append('.');
-@@ -693,6 +681,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -695,6 +683,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
      const CanvasContextCreationAttributesCore& attributes,
-     Platform::ContextType context_type,
-     Platform::GraphicsInfo* graphics_info) {
+     Platform::WebGLContextType context_type,
+     Platform::WebGLContextInfo* context_info) {
 +  if (!AllowWebglForHost(host)) {
 +    host->HostDispatchEvent(WebGLContextEvent::Create(
 +        event_type_names::kWebglcontextcreationerror,
@@ -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
-@@ -1951,6 +1951,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
+@@ -1959,6 +1959,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -49,7 +49,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
++import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -62,8 +62,8 @@ new file mode 100644
 +public class BromiteWebRTCContentSetting extends BromiteCustomContentSetting {
 +    public BromiteWebRTCContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.WEBRTC,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
++              /*defaultEnabledValue*/ ContentSetting.ALLOW,
++              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "webrtc",
 +              /*profilePrefKey*/ "webrtc");
@@ -82,11 +82,11 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
++    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
++            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_webrtc_enabled;
-+            case ContentSettingValues.BLOCK:
++            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_webrtc_disabled;
 +            default:
 +                // this will cause a runtime exception
@@ -115,8 +115,8 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return value != ContentSettingValues.BLOCK;
++    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
++        return value != ContentSetting.BLOCK;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/webrtc.grdp b/components/browser_ui/strings/bromite_content_settings/webrtc.grdp
@@ -187,7 +187,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -46,6 +46,7 @@
+@@ -47,6 +47,7 @@
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
  #include "third_party/blink/public/platform/platform.h"
  #include "third_party/blink/public/platform/task_type.h"
@@ -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"
-@@ -1062,6 +1063,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -989,6 +990,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // |request_multiple_routes|. Whether local IP addresses could be
        // collected depends on if mic/camera permission is granted for this
        // origin.
@@ -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"
-@@ -288,6 +291,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -279,6 +282,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  
@@ -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"
-@@ -1035,6 +1038,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1031,6 +1034,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  

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

@@ -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
-@@ -1496,6 +1496,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1520,6 +1520,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(
-@@ -1509,6 +1510,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1533,6 +1534,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -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
-@@ -16153,12 +16153,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -16264,12 +16264,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
-@@ -494,14 +494,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -506,14 +506,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
-@@ -125,6 +125,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+@@ -133,6 +133,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
    }
  
  #if BUILDFLAG(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
-@@ -1240,6 +1240,7 @@ interface NetworkContext {
+@@ -1303,6 +1303,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,
-@@ -1247,6 +1248,7 @@ interface NetworkContext {
+@@ -1310,6 +1311,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,
-@@ -1257,6 +1259,7 @@ interface NetworkContext {
+@@ -1320,6 +1322,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`.
@@ -386,7 +386,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/feature_list.h"
-@@ -1344,6 +1345,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1355,6 +1356,7 @@ void ContentSecurityPolicy::ReportViolation(
        ShouldBypassContentSecurityPolicy(KURL(violation_data->sourceFile()))) {
      return;
    }
@@ -394,7 +394,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
    PostViolationReport(violation_data, context_frame, report_endpoints,
                        use_reporting_api);
  
-@@ -1351,6 +1353,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1362,6 +1364,7 @@ void ContentSecurityPolicy::ReportViolation(
    // `context_frame` (i.e. we're not processing 'frame-ancestors').
    if (delegate_ && !context_frame)
      delegate_->DispatchViolationEvent(*violation_data, element);
@@ -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"
-@@ -2836,9 +2837,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2851,9 +2852,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
    return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
  }
  
@@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "net/storage_access_api/status.h"
-@@ -671,7 +672,9 @@ class CORE_EXPORT LocalFrame final
+@@ -668,7 +669,9 @@ class CORE_EXPORT LocalFrame final
      return client_hints_preferences_;
    }
  
@@ -547,7 +547,7 @@ 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
-@@ -62,8 +62,7 @@ void ReportingObserver::QueueReport(Report* report) {
+@@ -61,8 +61,7 @@ void ReportingObserver::QueueReport(Report* report) {
  }
  
  bool ReportingObserver::ObservedType(const String& type) {

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

@@ -24,7 +24,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
-@@ -819,7 +819,6 @@ if (_is_default_toolchain) {
+@@ -826,7 +826,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",
@@ -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
-@@ -319,7 +319,7 @@ void PrepareFactory(
+@@ -327,7 +327,7 @@ void PrepareFactory(
      policy::BrowserPolicyConnector* policy_connector) {
    factory->SetManagedPolicies(policy_service, policy_connector);
    factory->SetRecommendedPolicies(policy_service, policy_connector);
@@ -77,7 +77,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -471,7 +471,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -476,7 +476,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
  }
  
  std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -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
-@@ -684,10 +684,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -683,10 +683,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(
-@@ -1624,6 +1620,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1632,6 +1628,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
-@@ -1192,10 +1192,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1191,10 +1191,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,
-@@ -1962,9 +1958,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -1956,9 +1952,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
@@ -160,7 +160,7 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -617,10 +617,6 @@ bool ManagementUIHandler::managed() const {
+@@ -623,10 +623,6 @@ bool ManagementUIHandler::managed() const {
  
  void ManagementUIHandler::RegisterPrefChange(
      PrefChangeRegistrar& pref_registrar) {
@@ -174,7 +174,7 @@ diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrom
 diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.cc b/components/supervised_user/core/browser/supervised_user_pref_store.cc
 --- a/components/supervised_user/core/browser/supervised_user_pref_store.cc
 +++ b/components/supervised_user/core/browser/supervised_user_pref_store.cc
-@@ -175,6 +175,7 @@ void SupervisedUserPrefStore::OnNewContentFiltersStateAvailable(
+@@ -172,6 +172,7 @@ void SupervisedUserPrefStore::OnNewContentFiltersStateAvailable(
  
  void SupervisedUserPrefStore::OnNewSettingsAvailable(
      const base::Value::Dict& settings) {
@@ -185,7 +185,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.
 diff --git a/components/supervised_user/core/browser/supervised_user_preferences.cc b/components/supervised_user/core/browser/supervised_user_preferences.cc
 --- a/components/supervised_user/core/browser/supervised_user_preferences.cc
 +++ b/components/supervised_user/core/browser/supervised_user_preferences.cc
-@@ -164,6 +164,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -160,6 +160,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
  }
  
  void EnableParentalControls(PrefService& pref_service) {
@@ -196,7 +196,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
    pref_service.SetString(prefs::kSupervisedUserId,
                           supervised_user::kChildAccountSUID);
  #if BUILDFLAG(IS_CHROMEOS)
-@@ -197,7 +201,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
+@@ -187,7 +191,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
  }
  
  bool IsSubjectToParentalControls(const PrefService& pref_service) {
@@ -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
-@@ -249,6 +249,7 @@ SupervisedUserService::SupervisedUserService(
+@@ -248,6 +248,7 @@ SupervisedUserService::SupervisedUserService(
  }
  
  void SupervisedUserService::SetSettingsServiceActive(bool active) {
@@ -219,7 +219,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -33,7 +33,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
+@@ -30,7 +30,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
@@ -227,7 +227,7 @@ 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;
-@@ -170,4 +169,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
+@@ -151,4 +150,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
  
  #endif
  
@@ -236,7 +236,7 @@ diff --git a/components/supervised_user/core/common/features.cc b/components/sup
 diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
 --- a/extensions/browser/api/management/management_api.cc
 +++ b/extensions/browser/api/management/management_api.cc
-@@ -312,6 +312,7 @@ void AddExtensionInfo(const Extension* source_extension,
+@@ -324,6 +324,7 @@ void AddExtensionInfo(const Extension* source_extension,
  }
  
  bool PlatformSupportsApprovalFlowForExtensions() {

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1330,6 +1330,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1309,6 +1309,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
    return pipeline_metadata_.has_audio;
  }
  
@@ -24,9 +24,9 @@ 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());
-@@ -3683,7 +3689,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
-           : HasAudio();
+@@ -3645,7 +3651,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
  
+   const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured();
    // Audio only stream is allowed to play when in background.
 -  if (!HasVideo() && preserve_audio)
 +  //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
@@ -39,7 +39,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
-@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
    bool HasVideo() const override;
    bool HasAudio() const override;
  

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

@@ -10,15 +10,15 @@ 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/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
-@@ -24,6 +24,7 @@ import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.Supplier;
+@@ -23,6 +23,7 @@ import org.chromium.base.PackageManagerUtils;
+ import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
 +import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
-@@ -43,6 +44,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -42,6 +43,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;
-@@ -303,6 +305,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -308,6 +310,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());
-@@ -323,6 +326,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -328,6 +331,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

@@ -7,19 +7,19 @@ Ignore any partner-provided home page.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../org/chromium/chrome/browser/homepage/HomepageManager.java | 4 ----
- .../chrome/browser/new_tab_url/DseNewTabUrlManager.java       | 1 +
+ .../chrome/browser/new_tab_url/DseNewTabUrlManager.java       | 2 +-
  .../partnerbookmarks/PartnerBookmarksProviderIterator.java    | 1 +
  .../partnercustomizations/PartnerBrowserCustomizations.java   | 2 +-
  .../org/chromium/components/search_engines/TemplateUrl.java   | 1 +
  .../search_engines/android/template_url_service_android.cc    | 1 +
  .../always-use-new-tab-page-for-default-home-page.inc         | 1 +
- 7 files changed, 6 insertions(+), 5 deletions(-)
+ 7 files changed, 6 insertions(+), 6 deletions(-)
  create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
 
 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
-@@ -160,10 +160,6 @@ public class HomepageManager
+@@ -159,10 +159,6 @@ public class HomepageManager
       *     tab page if the homepage button is force enabled via flag.
       */
      public GURL getDefaultHomepageGurl() {
@@ -33,14 +33,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
-@@ -60,6 +60,7 @@ public class DseNewTabUrlManager {
+@@ -59,7 +59,7 @@ public class DseNewTabUrlManager {
  
      /** Returns whether the feature NewTabSearchEngineUrlAndroid is enabled. */
      public static boolean isNewTabSearchEngineUrlAndroidEnabled() {
-+        if ((true)) return false;
-         return ChromeSharedPreferences.getInstance()
-                         .readBoolean(ChromePreferenceKeys.IS_EEA_CHOICE_COUNTRY, false)
-                 || (OmniboxFeatures.sOmniboxMobileParityUpdate.isEnabled()
+-        return true;
++        return false;
+     }
+ 
+     /**
 diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
 --- a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
 +++ b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java

build/patches/Android-Toolbar-Scroll-Ablation-setting.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/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
 --- 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
-@@ -40,6 +40,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+@@ -41,6 +41,7 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
      private final Supplier<Boolean> mPersistentFullscreenMode;
  
      private long mCurrentShowingStartTime;
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
  
      /**
       * Constructs a BrowserControlsVisibilityDelegate designed to deal with overrides driven by
-@@ -65,7 +66,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+@@ -66,7 +67,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
          long currentShowingTime = SystemClock.uptimeMillis() - mCurrentShowingStartTime;
          if (currentShowingTime >= MINIMUM_SHOW_DURATION_MS) return;
  
@@ -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
-@@ -79,6 +79,12 @@ found in the LICENSE file.
+@@ -74,6 +74,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

@@ -38,11 +38,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../skia/src/ports/SkFontConfigInterface.cpp  |    4 +
  .../ports/SkFontConfigInterface_direct.cpp    |    5 +
  .../src/ports/SkFontConfigInterface_direct.h  |    1 +
- .../skia/src/ports/SkFontMgr_android.cpp      |  279 ++-
+ .../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_parser.h |    5 +-
- 36 files changed, 2415 insertions(+), 76 deletions(-)
+ 36 files changed, 2414 insertions(+), 76 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 +54,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
-@@ -1007,6 +1007,9 @@ public final class ProductionSupportedFlagList {
+@@ -1009,6 +1009,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."),
@@ -68,8 +68,8 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and
 --- 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"
  #include "components/update_client/update_client.h"
- #include "mojo/public/cpp/base/proto_wrapper.h"
  
 +#include "third_party/blink/public/common/features.h"
 +#include "components/component_updater/installer_policies/fonts_pack_component_installer.h"
@@ -106,8 +106,8 @@ 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
-@@ -7951,6 +7951,13 @@ static_library("browser") {
-     }
+@@ -8022,6 +8022,13 @@ static_library("browser") {
+     ]
    }
  
 +  if (is_android) {
@@ -161,7 +161,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
-@@ -258,6 +258,10 @@ static_library("renderer") {
+@@ -270,6 +270,10 @@ static_library("renderer") {
      deps += [ "//components/strings" ]
    }
  
@@ -615,7 +615,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
-@@ -2600,6 +2600,17 @@ source_set("browser") {
+@@ -2613,6 +2613,17 @@ source_set("browser") {
      ]
    }
  
@@ -633,7 +633,7 @@ 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" ]
-@@ -2645,6 +2656,13 @@ source_set("browser") {
+@@ -2658,6 +2669,13 @@ source_set("browser") {
      ]
    }
  
@@ -696,7 +696,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
-@@ -346,6 +346,10 @@ target(link_target_type, "renderer") {
+@@ -347,6 +347,10 @@ target(link_target_type, "renderer") {
      deps += [ "//services/screen_ai/public/mojom" ]
    }
  
@@ -734,7 +734,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  using blink::Platform;
  using blink::WebAudioDevice;
  using blink::WebAudioLatencyHint;
-@@ -180,6 +197,37 @@ gpu::ContextType ToGpuContextType(blink::Platform::ContextType type) {
+@@ -187,6 +204,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
    NOTREACHED();
  }
  
@@ -772,7 +772,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  }  // namespace
  
  //------------------------------------------------------------------------------
-@@ -193,18 +241,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -200,18 +248,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) {
@@ -838,7 +838,7 @@ new file mode 100644
 diff --git a/skia/BUILD.gn b/skia/BUILD.gn
 --- a/skia/BUILD.gn
 +++ b/skia/BUILD.gn
-@@ -463,6 +463,18 @@ component("skia") {
+@@ -465,6 +465,18 @@ component("skia") {
      sources += skia_ports_fci_sources
    }
  
@@ -987,10 +987,12 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
  #include <algorithm>
  #include <limits>
-@@ -36,6 +38,91 @@ using namespace skia_private;
- class SkData;
+@@ -37,7 +39,91 @@ class SkData;
  
  namespace {
+ 
+-[[maybe_unused]] static inline const constexpr bool kSkFontMgrVerbose = false;
++static inline const constexpr bool kSkFontMgrVerbose = true;
 +
 +#include "SkFontMgr_android_data.cpp"
 +
@@ -1075,11 +1077,10 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +
 +    using INHERITED = SkTypeface_FreeType;
 +};
-+
+ 
  class SkTypeface_AndroidSystem : public SkTypeface_proxy {
  public:
-     static sk_sp<SkTypeface_AndroidSystem> Make(sk_sp<SkTypeface> realTypeface,
-@@ -109,7 +196,8 @@ using StreamForPathCache = skia_private::THashMap<SkString, std::unique_ptr<SkSt
+@@ -112,7 +198,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,
@@ -1089,7 +1090,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];
-@@ -118,38 +206,60 @@ public:
+@@ -121,38 +208,60 @@ public:
  
          // TODO? make this lazy
          for (int i = 0; i < family.fFonts.size(); ++i) {
@@ -1173,7 +1174,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              }
  
              uint32_t variant = family.fVariant;
-@@ -160,13 +270,25 @@ public:
+@@ -163,13 +272,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.
@@ -1205,7 +1206,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) {
-@@ -177,6 +299,19 @@ public:
+@@ -180,6 +301,19 @@ public:
              }
              fontStyle = SkFontStyle(weight, fontStyle.width(), slant);
  
@@ -1225,7 +1226,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(),
-@@ -205,15 +340,18 @@ public:
+@@ -208,15 +342,18 @@ public:
          return fStyles[index];
      }
  
@@ -1247,7 +1248,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
      SkString fFallbackFor;
  
      friend struct NameToFamily;
-@@ -234,24 +372,26 @@ struct NameToFamily {
+@@ -237,24 +374,26 @@ struct NameToFamily {
  
  class SkFontMgr_Android : public SkFontMgr {
  public:
@@ -1257,7 +1258,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          : fScanner(std::move(scanner)) {
 +        custom_ = std::move(custom_in);
 +        auto* custom = custom_.get();
-         SkTDArray<FontFamily*> families;
+         std::vector<std::unique_ptr<FontFamily>> families;
          if (custom && SkFontMgr_Android_CustomFonts::kPreferSystem != custom->fSystemFontUse) {
              SkString base(custom->fBasePath);
              SkFontMgr_Android_Parser::GetCustomFontFamilies(
@@ -1278,22 +1279,24 @@ 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,33 +449,53 @@ protected:
-         return sset->matchStyle(style);
+@@ -309,12 +448,12 @@ protected:
      }
  
+     enum class NameType { Self, Fallback };
 -    static sk_sp<SkTypeface_AndroidSystem> find_family_style_character(
 +    sk_sp<SkTypeface> find_family_style_character(
              const SkString& familyName,
-             const TArray<NameToFamily, true>& fallbackNameToFamilyMap,
+             const TArray<NameToFamily, true>& nameToFamilyMap,
+             NameType nameType,
              const SkFontStyle& style, bool elegant,
 -            const SkString& langTag, SkUnichar character)
 +            const SkString& langTag, SkUnichar character) const
      {
-         for (int i = 0; i < fallbackNameToFamilyMap.size(); ++i) {
-             SkFontStyleSet_Android* family = fallbackNameToFamilyMap[i].styleSet;
-             if (familyName != family->fFallbackFor) {
-                 continue;
+         for (auto&& nameToFamily : nameToFamilyMap) {
+             SkFontStyleSet_Android* family = nameToFamily.styleSet;
+@@ -325,22 +464,42 @@ protected:
+                     continue;
+                 }
              }
 -            sk_sp<SkTypeface_AndroidSystem> face(family->matchAStyle(style));
 +            if (custom_) {
@@ -1334,38 +1337,29 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +                {
 +                    continue;
 +                }
-+
-+                if (SkToBool(face->fVariantStyle & kElegant_FontVariant) != elegant) {
-+                    continue;
-+                }
  
 -            if (face->unicharToGlyph(character) != 0) {
 -                return face;
++                if (SkToBool(face->fVariantStyle & kElegant_FontVariant) != elegant) {
++                    continue;
++                }
++
 +                if (face->unicharToGlyph(character) != 0) {
 +                    return face;
 +                }
              }
          }
          return nullptr;
-@@ -358,7 +518,7 @@ protected:
-                 for (int bcp47Index = bcp47Count; bcp47Index --> 0;) {
-                     SkLanguage lang(bcp47[bcp47Index]);
-                     while (!lang.getTag().isEmpty()) {
--                        sk_sp<SkTypeface_AndroidSystem> matchingTypeface =
-+                        sk_sp<SkTypeface> matchingTypeface =
-                             find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap,
-                                                         style, SkToBool(elegant),
-                                                         lang.getTag(), character);
-@@ -369,7 +529,7 @@ protected:
-                         lang = lang.getParent();
-                     }
-                 }
--                sk_sp<SkTypeface_AndroidSystem> matchingTypeface =
-+                sk_sp<SkTypeface> matchingTypeface =
-                     find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap,
-                                                 style, SkToBool(elegant),
-                                                 SkString(), character);
-@@ -420,6 +580,7 @@ protected:
+@@ -355,7 +514,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.
+-        sk_sp<SkTypeface_AndroidSystem> matchingTypeface;
++        sk_sp<SkTypeface> matchingTypeface;
+         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:
  private:
  
      std::unique_ptr<SkFontScanner> fScanner;
@@ -1373,7 +1367,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;
-@@ -441,7 +602,7 @@ private:
+@@ -456,7 +616,7 @@ private:
          }
  
          sk_sp<SkFontStyleSet_Android> newSet =
@@ -1382,22 +1376,22 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          if (0 == newSet->count()) {
              return;
          }
-@@ -486,7 +647,11 @@ static char const * const gSystemFontUseStrings[] = {
+@@ -502,7 +662,11 @@ static char const * const gSystemFontUseStrings[] = {
  
  }  // namespace
  
--sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom, std::unique_ptr<SkFontScanner> scanner) {
+-sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom,
 +sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom) {
 +    return SkFontMgr_New_Android(std::move(custom), SkFontScanner_Make_FreeType());
 +}
 +
-+sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom, std::unique_ptr<SkFontScanner> scanner) {
++sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom,
+                                        std::unique_ptr<SkFontScanner> scanner) {
      if (custom) {
          SkASSERT(0 <= custom->fSystemFontUse);
-         SkASSERT(custom->fSystemFontUse < std::size(gSystemFontUseStrings));
-@@ -496,5 +661,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
-                  custom->fFontsXml,
-                  custom->fFallbackFontsXml);
+@@ -515,5 +679,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
+                      custom->fFallbackFontsXml);
+         }
      }
 -    return sk_make_sp<SkFontMgr_Android>(custom, std::move(scanner));
 +    return sk_make_sp<SkFontMgr_Android>(std::move(custom), std::move(scanner));
@@ -3050,10 +3044,10 @@ new file mode 100644
 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
-@@ -652,14 +652,27 @@ static const XML_Memory_Handling_Suite sk_XML_alloc = {
-  * families array. Returns the version of the file, negative if the file does not exist.
+@@ -654,14 +654,27 @@ static const XML_Memory_Handling_Suite sk_XML_alloc = {
   */
- static int parse_config_file(const char* filename, SkTDArray<FontFamily*>& families,
+ static int parse_config_file(const char* filename,
+                              std::vector<std::unique_ptr<FontFamily>>& families,
 -                             const SkString& basePath, bool isFallback)
 +                             const SkString& basePath, bool isFallback,
 +                             const SkFontMgr_Android_CustomFonts* custom = nullptr)
@@ -3084,7 +3078,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
          return -1;
      }
  
-@@ -691,8 +704,8 @@ static int parse_config_file(const char* filename, SkTDArray<FontFamily*>& famil
+@@ -693,8 +706,8 @@ static int parse_config_file(const char* filename,
              SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "could not buffer enough to continue\n");
              return -1;
          }
@@ -3095,57 +3089,59 @@ 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);
-@@ -765,8 +778,10 @@ static void append_fallback_font_families_for_locale(SkTDArray<FontFamily*>& fal
- }
+@@ -768,8 +781,10 @@ static void append_fallback_font_families_for_locale(
  
- static void append_system_fallback_font_families(SkTDArray<FontFamily*>& fallbackFonts,
--                                                 const SkString& basePath)
-+                                                 const SkString& basePath,
+ 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)
  {
 +    if (custom) return;
      parse_config_file(FALLBACK_FONTS_FILE, fallbackFonts, basePath, true);
      append_fallback_font_families_for_locale(fallbackFonts,
                                               LOCALE_FALLBACK_FONTS_SYSTEM_DIR,
-@@ -774,8 +789,10 @@ static void append_system_fallback_font_families(SkTDArray<FontFamily*>& fallbac
- }
+@@ -778,8 +793,10 @@ static void append_system_fallback_font_families(
  
- static void mixin_vendor_fallback_font_families(SkTDArray<FontFamily*>& fallbackFonts,
--                                                const SkString& basePath)
-+                                                const SkString& basePath,
+ 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)
  {
 +    if (custom) return;
-     SkTDArray<FontFamily*> vendorFonts;
+     std::vector<std::unique_ptr<FontFamily>> vendorFonts;
      parse_config_file(VENDOR_FONTS_FILE, vendorFonts, basePath, true);
      append_fallback_font_families_for_locale(vendorFonts,
-@@ -806,7 +823,8 @@ static void mixin_vendor_fallback_font_families(SkTDArray<FontFamily*>& fallback
-     }
+@@ -811,7 +828,8 @@ static void mixin_vendor_fallback_font_families(
  }
  
--void SkFontMgr_Android_Parser::GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies) {
-+void SkFontMgr_Android_Parser::GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
-+                                                     const SkFontMgr_Android_CustomFonts* custom) {
+ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+-        std::vector<std::unique_ptr<FontFamily>>& fontFamilies)
++        std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
++                                                     const SkFontMgr_Android_CustomFonts* custom)
+ {
      // Version 21 of the system font configuration does not need any fallback configuration files.
      SkString basePath(getenv("ANDROID_ROOT"));
-     basePath.append(SK_FONT_FILE_PREFIX, sizeof(SK_FONT_FILE_PREFIX) - 1);
-@@ -817,22 +835,23 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(SkTDArray<FontFamily*>& fon
+@@ -823,8 +841,8 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
  
      // Append all the fallback fonts to system fonts
-     SkTDArray<FontFamily*> fallbackFonts;
+     std::vector<std::unique_ptr<FontFamily>> fallbackFonts;
 -    append_system_fallback_font_families(fallbackFonts, basePath);
 -    mixin_vendor_fallback_font_families(fallbackFonts, basePath);
 +    append_system_fallback_font_families(fallbackFonts, basePath, custom);
 +    mixin_vendor_fallback_font_families(fallbackFonts, basePath, custom);
-     fontFamilies.append(fallbackFonts.size(), fallbackFonts.begin());
- }
- 
- void SkFontMgr_Android_Parser::GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
-                                                      const SkString& basePath,
-+                                                     const SkFontMgr_Android_CustomFonts* custom,
-                                                      const char* fontsXml,
-                                                      const char* fallbackFontsXml,
-                                                      const char* langFallbackFontsDir)
+     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(
+ void SkFontMgr_Android_Parser::GetCustomFontFamilies(
+         std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
+         const SkString& basePath,
++        const SkFontMgr_Android_CustomFonts* custom,
+         const char* fontsXml,
+         const char* fallbackFontsXml,
+         const char* langFallbackFontsDir)
  {
      if (fontsXml) {
 -        parse_config_file(fontsXml, fontFamilies, basePath, false);
@@ -3160,7 +3156,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
 diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.h b/third_party/skia/src/ports/SkFontMgr_android_parser.h
 --- a/third_party/skia/src/ports/SkFontMgr_android_parser.h
 +++ b/third_party/skia/src/ports/SkFontMgr_android_parser.h
-@@ -15,6 +15,7 @@
+@@ -17,6 +17,7 @@
  #include "include/private/base/SkTArray.h"
  #include "include/private/base/SkTDArray.h"
  #include "src/core/SkTHash.h"
@@ -3168,16 +3164,16 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.h b/third_party
  
  #include <climits>
  #include <limits>
-@@ -105,11 +106,13 @@ struct FontFamily {
+@@ -109,11 +110,13 @@ struct FontFamily {
  namespace SkFontMgr_Android_Parser {
  
  /** Parses system font configuration files and appends result to fontFamilies. */
--void GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies);
-+void GetSystemFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
+-void GetSystemFontFamilies(std::vector<std::unique_ptr<FontFamily>>& fontFamilies);
++void GetSystemFontFamilies(std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
 +                           const SkFontMgr_Android_CustomFonts* custom);
  
  /** Parses font configuration files and appends result to fontFamilies. */
- void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
+ void GetCustomFontFamilies(std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
                             const SkString& basePath,
 +                           const SkFontMgr_Android_CustomFonts* custom,
                             const char* fontsXml,

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

@@ -87,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivit
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
-@@ -23,17 +23,39 @@ import org.chromium.build.annotations.Nullable;
+@@ -22,10 +22,31 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
  import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
@@ -118,9 +118,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +import org.chromium.content_public.browser.WebContents;
 +import org.chromium.net.NetworkChangeNotifier;
 +
+ import java.util.function.Supplier;
+ 
  /**
-  * Class that detects if the network is offline. Waits for the network to stablize before notifying
-  * the observer.
+@@ -34,7 +55,8 @@ import java.util.function.Supplier;
   */
  @NullMarked
  class OfflineDetector
@@ -130,7 +131,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      // If the connection is online, then we report that immediately via |mIsOfflineCallback|.
      // |STATUS_INDICATOR_WAIT_ON_OFFLINE_DURATION_MS| and
      // |mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs| control the duration before
-@@ -119,6 +141,11 @@ class OfflineDetector
+@@ -120,6 +142,11 @@ class OfflineDetector
  
      private static final String TAG = "OfflineDetector";
  
@@ -142,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      /**
       * Constructs the offline indicator.
       * @param isOfflineCallback The {@link Callback} is invoked when the connectivity status is
-@@ -130,7 +157,13 @@ class OfflineDetector
+@@ -131,7 +158,13 @@ class OfflineDetector
      OfflineDetector(
              Callback<Boolean> isOfflineCallback,
              Callback<Boolean> isForegroundCallback,
@@ -157,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
          mIsOfflineCallback = isOfflineCallback;
          mIsForegroundCallback = isForegroundCallback;
          mContext = context;
-@@ -234,6 +267,75 @@ class OfflineDetector
+@@ -235,6 +268,75 @@ class OfflineDetector
          updateState();
      }
  
@@ -198,7 +199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +            Snackbar snackbar = Snackbar.make(
 +                mContext.getString(R.string.ask_to_restart_on_connection_change_restart),
 +                /* snackbarController */ this, Snackbar.TYPE_PERSISTENT, Snackbar.UMA_UNKNOWN)
-+                .setSingleLine(false)
++                .setDefaultLines(false)
 +                .setAction(mContext.getString(R.string.relaunch), /*actionData*/0)
 +                .setDismissAction(mContext.getString(R.string.ask_to_restart_on_connection_change_close_notification), /*actionData*/1);
 +            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
@@ -233,7 +234,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      private void logToAdbConsoleNow(String prefix) {
          Log.i(
                  TAG,
-@@ -320,6 +422,7 @@ class OfflineDetector
+@@ -321,6 +423,7 @@ class OfflineDetector
       ** Calls |mUpdateOfflineStatusIndicatorDelayedRunnable| to update the connection state.
       */
      private void updateState() {
@@ -244,9 +245,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
-@@ -31,6 +31,11 @@ import org.chromium.content_public.common.ContentSwitches;
- import java.lang.annotation.Retention;
+@@ -31,6 +31,11 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
+ import java.util.function.Supplier;
  
 +import org.chromium.base.supplier.ObservableSupplierImpl;
 +import org.chromium.chrome.browser.layouts.LayoutManager;
@@ -283,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
-@@ -1417,7 +1417,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1465,7 +1465,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              mActivity,
                              mStatusIndicatorCoordinator,
                              isUrlBarFocusedSupplier,
@@ -298,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
-@@ -198,6 +198,13 @@ public abstract class TabModelSelectorBase
+@@ -199,6 +199,13 @@ public abstract class TabModelSelectorBase
          return null;
      }
  
@@ -352,9 +353,9 @@ 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
-@@ -146,6 +146,8 @@ public interface TabModelSelector {
-     /** Get total tab count across all tab models */
-     int getTotalTabCount();
+@@ -149,6 +149,8 @@ public interface TabModelSelector {
+     /** Get total pinned tab count across all tab models */
+     int getTotalPinnedTabCount();
  
 +    void setPagesFrozen(boolean frozen);
 +
@@ -364,7 +365,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
 --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
 +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
-@@ -16,12 +16,16 @@ import org.chromium.build.annotations.Nullable;
+@@ -15,6 +15,7 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabSelectionType;
  import org.chromium.content_public.browser.WebContents;
@@ -372,16 +373,17 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
  import org.chromium.ui.base.WindowAndroid;
  
  import java.util.ArrayList;
- import java.util.Collection;
+@@ -22,6 +23,9 @@ import java.util.Collection;
  import java.util.List;
  import java.util.function.Predicate;
+ import java.util.function.Supplier;
 +import java.util.Collections;
 +import java.util.stream.IntStream;
 +import java.util.stream.Collectors;
  
  /**
   * A set of convenience methods used for interacting with {@link TabList}s and {@link TabModel}s.
-@@ -55,6 +59,20 @@ public class TabModelUtils {
+@@ -54,6 +58,20 @@ public class TabModelUtils {
          return TabModel.INVALID_TAB_INDEX;
      }
  
@@ -405,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
-@@ -133,6 +133,8 @@ public interface TabWindowManager {
+@@ -135,6 +135,8 @@ public interface TabWindowManager {
      /** Returns the total number of incognito tabs across all tab model selectors. */
      int getIncognitoTabCount();
  
@@ -417,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
-@@ -546,6 +546,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+@@ -551,6 +551,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
          return tabGroupModelFilter.getTabsInGroup(tabGroupId);
      }
  
@@ -503,8 +505,8 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 +    private Object mDismissActionData;
      private int mBackgroundColor;
      private int mTextApperanceResId;
-     private boolean mSingleLine = true;
-@@ -241,6 +243,20 @@ public class Snackbar {
+     private boolean mDefaultLines = true;
+@@ -242,6 +244,20 @@ public class Snackbar {
          return this;
      }
  
@@ -528,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
-@@ -326,6 +326,12 @@ public class SnackbarManager
+@@ -327,6 +327,12 @@ public class SnackbarManager
                          new SnackbarView(
                                  mActivity,
                                  this,
@@ -544,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
-@@ -55,6 +55,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -56,6 +56,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      protected final ViewGroup mSnackbarView;
      protected final TemplatePreservingTextView mMessageView;
      private final TextView mActionButtonView;
@@ -552,7 +554,7 @@ 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;
-@@ -101,11 +102,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -102,11 +103,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
              OnClickListener listener,
@@ -566,7 +568,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      }
  
      /**
-@@ -124,6 +126,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -125,6 +127,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
              OnClickListener listener,
@@ -574,7 +576,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
              Snackbar snackbar,
              ViewGroup parentView,
              @Nullable WindowAndroid windowAndroid,
-@@ -154,6 +157,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -155,6 +158,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);
@@ -583,7 +585,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
          mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
          mEdgeToEdgeSupplier = edgeToEdgeSupplier;
          if (SnackbarManager.isFloatingSnackbarEnabled()) {
-@@ -428,6 +433,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -429,6 +434,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
              mActionButtonView.setVisibility(View.VISIBLE);
              mActionButtonView.setContentDescription(snackbar.getActionText());
              setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -636,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
-@@ -4080,8 +4080,10 @@ void WebContentsImpl::Stop() {
+@@ -4094,8 +4094,10 @@ void WebContentsImpl::Stop() {
  void WebContentsImpl::SetPageFrozen(bool frozen) {
    TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
  
@@ -650,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
-@@ -1138,6 +1138,12 @@ public class WebContentsImpl
+@@ -1134,6 +1134,12 @@ public class WebContentsImpl
          WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
      }
  
@@ -663,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;
-@@ -1447,6 +1453,8 @@ public class WebContentsImpl
+@@ -1463,6 +1469,8 @@ public class WebContentsImpl
  
          void setFocus(long nativeWebContentsAndroid, boolean focused);
  
@@ -732,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
-@@ -4614,6 +4614,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4654,6 +4654,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
  }
  
  void Document::DispatchFreezeEvent() {
@@ -743,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
-@@ -3273,6 +3273,7 @@ void LocalFrame::DidFreeze() {
+@@ -3303,6 +3303,7 @@ void LocalFrame::DidFreeze() {
    LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
    GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
    Loader().SetDefersLoading(freeze_mode);
@@ -751,7 +753,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  }
  
  void LocalFrame::DidResume() {
-@@ -3287,6 +3288,7 @@ void LocalFrame::DidResume() {
+@@ -3317,6 +3318,7 @@ void LocalFrame::DidResume() {
    GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
    Loader().SetDefersLoading(LoaderFreezeMode::kNone);
  
@@ -762,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
-@@ -989,7 +989,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -1033,7 +1033,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
    if (!parent_page_scheduler_)
      return SchedulingLifecycleState::kNotThrottled;
    if (parent_page_scheduler_->IsFrozen()) {
@@ -788,7 +790,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_sche
    PolicyUpdater policy_updater;
    SetPageFrozenImpl(frozen, policy_updater);
  }
-@@ -815,7 +817,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+@@ -816,7 +818,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

@@ -15,9 +15,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../modules/webaudio/base_audio_context.cc         | 12 ++++++++++++
  .../renderer/modules/webaudio/base_audio_context.h |  2 ++
  .../modules/webaudio/offline_audio_context.cc      |  1 +
- .../renderer/modules/webaudio/realtime_analyser.cc |  9 ++++++++-
+ .../renderer/modules/webaudio/realtime_analyser.cc | 13 ++++++++++---
  .../platform/runtime_enabled_features.json5        |  5 ++---
- 11 files changed, 57 insertions(+), 5 deletions(-)
+ 11 files changed, 59 insertions(+), 7 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc
@@ -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
-@@ -16,6 +16,7 @@
+@@ -17,6 +17,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"
-@@ -678,7 +679,9 @@ double AudioContext::baseLatency() const {
+@@ -850,7 +851,9 @@ double AudioContext::baseLatency() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
    DCHECK(destination());
  
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
  #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"
-@@ -710,6 +711,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -774,6 +775,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -170,25 +170,22 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
  #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"
-@@ -156,6 +157,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize]);
- 
-+      value = BaseAudioContext::ShuffleAudioData(value, i);
-       UNSAFE_TODO(destination[i]) = value;
+@@ -117,7 +118,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);
+-      UNSAFE_TODO(destination[i]) = static_cast<float>(db_mag);
++      auto v = static_cast<float>(db_mag);
++      UNSAFE_TODO(destination[i]) = BaseAudioContext::ShuffleAudioData(v, i);
      }
    }
-@@ -183,6 +185,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize]);
+ }
+@@ -155,9 +157,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
  
-+      value = BaseAudioContext::ShuffleAudioData(value, i);
-+
-       // Scale from nominal -1 -> +1 to unsigned byte.
-       double scaled_value = 128 * (value + 1);
- 
-@@ -306,6 +310,8 @@ void RealtimeAnalyser::ConvertToByteData(DOMUint8Array* destination_array) {
-       double scaled_value =
+       // The range m_minDecibels to m_maxDecibels will be scaled to byte values
+       // from 0 to UCHAR_MAX.
+-      const double scaled_value =
++      double scaled_value =
            UCHAR_MAX * (db_mag - min_decibels) * range_scale_factor;
  
 +      scaled_value = BaseAudioContext::ShuffleAudioData(scaled_value, i);
@@ -196,20 +193,32 @@ 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));
-@@ -324,7 +330,8 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) {
-     for (unsigned i = 0; i < len; ++i) {
-       float linear_value = UNSAFE_TODO(source[i]);
-       double db_mag = audio_utilities::LinearToDecibels(linear_value);
--      UNSAFE_TODO(destination[i]) = static_cast<float>(db_mag);
-+      auto v = static_cast<float>(db_mag);
-+      UNSAFE_TODO(destination[i]) = BaseAudioContext::ShuffleAudioData(v, i);
+@@ -188,6 +192,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
+                        kInputBufferSize]);
+ 
++      value = BaseAudioContext::ShuffleAudioData(value, i);
+       UNSAFE_TODO(destination[i]) = value;
      }
    }
- }
+@@ -211,10 +216,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+ 
+     for (unsigned i = 0; i < len; ++i) {
+       // Buffer access is protected due to modulo operation.
+-      const float value = UNSAFE_TODO(
++      float value = UNSAFE_TODO(
+           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
+                        kInputBufferSize]);
+ 
++      value = BaseAudioContext::ShuffleAudioData(value, i);
++
+       // Scale from nominal -1 -> +1 to unsigned byte.
+       const double scaled_value = 128 * (value + 1);
+ 
 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
-@@ -575,9 +575,8 @@
+@@ -608,9 +608,8 @@
      {
        // AudioContext.playoutStats interface.
        // https://chromestatus.com/feature/5172818344148992

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
-@@ -395,6 +395,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -398,6 +398,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    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
-@@ -1057,6 +1057,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1122,6 +1122,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -75,7 +75,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -187,6 +187,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -191,6 +191,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;
@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
-@@ -285,6 +285,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -288,6 +288,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
      return false;
    }
  

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
-@@ -5133,7 +5133,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -5151,7 +5151,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
  }
  
  void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -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
-@@ -833,6 +833,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -836,6 +836,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_;
  }
  
-@@ -2898,6 +2903,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2916,6 +2921,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
-@@ -771,7 +771,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -773,7 +773,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

@@ -49,7 +49,7 @@ diff --git a/chrome/browser/history/history_utils.cc b/chrome/browser/history/hi
 diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
 --- a/chrome/browser/ui/singleton_tabs.cc
 +++ b/chrome/browser/ui/singleton_tabs.cc
-@@ -136,6 +136,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -141,6 +141,11 @@ int GetIndexOfExistingTab(BrowserWindowInterface* browser,
        continue;
      }
  
@@ -60,7 +60,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
 +
      GURL rewritten_tab_url = tab_url;
      content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
-         &rewritten_tab_url, browser->profile());
+         &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
@@ -93,7 +93,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -602,6 +602,10 @@ GURL FixupURLInternal(const std::string& text,
+@@ -598,6 +598,10 @@ GURL FixupURLInternal(const std::string& text,
      }
    }
  
@@ -107,7 +107,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -970,6 +970,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -969,6 +969,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
    RegisterPseudoScheme(url::kJavaScriptScheme);
    RegisterPseudoScheme(kViewSourceScheme);
    RegisterPseudoScheme(kGoogleChromeScheme);
@@ -118,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1127,6 +1127,8 @@ component("net") {
+@@ -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",
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  namespace net {
  
-@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -650,6 +652,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
  
@@ -222,8 +222,8 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 +  }
 +
    context->url_requests()->insert(this);
-   net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] {
-     return NetLogURLRequestConstructorParams(url, priority_,
+   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

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
-@@ -249,6 +249,9 @@ CHAR_LIMIT guidelines:
+@@ -252,6 +252,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

@@ -21,12 +21,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/endpoint_fetcher/BUILD.gn      |  32 ++
  chrome/browser/endpoint_fetcher/DEPS          |   3 +
  chrome/browser/endpoint_fetcher/OWNERS        |   1 +
- .../endpoint_fetcher_android.cc               | 149 +++++++++
- .../endpoint_fetcher/EndpointFetcher.java     | 116 +++++++
+ .../endpoint_fetcher_android.cc               | 107 +++++++
+ .../endpoint_fetcher/EndpointFetcher.java     |  63 ++++
  .../EndpointHeaderResponse.java               |  31 ++
  .../endpoint_fetcher/EndpointResponse.java    |  30 ++
  .../flags/android/chrome_feature_list.cc      |   1 +
  .../browser/flags/ChromeFeatureList.java      |   1 +
+ .../access_code_cast_discovery_interface.cc   |   2 +-
  chrome/browser/omaha/android/BUILD.gn         |   3 +
  .../chrome/browser/omaha/OmahaPrefUtils.java  |  52 +++-
  .../chrome/browser/omaha/UpdateConfigs.java   |  27 +-
@@ -34,15 +35,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/omaha/VersionNumberGetter.java    |   4 +-
  .../omaha/inline/InlineUpdateController.java  |  57 ++++
  .../safety_hub/SafetyHubFetchService.java     |   5 -
+ .../browser/save_to_drive/drive_uploader.cc   |   2 +-
  .../strings/android_chrome_strings.grd        |  23 +-
- .../ui/lens/lens_overlay_query_controller.cc  |   1 +
- .../endpoint_fetcher/endpoint_fetcher.cc      | 123 ++++++--
- .../endpoint_fetcher/endpoint_fetcher.h       |  25 ++
- components/manta/base_provider.cc             |   1 +
+ .../ui/lens/lens_overlay_query_controller.cc  |   2 +-
+ components/commerce/core/account_checker.cc   |   2 +-
+ .../core/compare/cluster_server_proxy.cc      |   2 +-
+ .../product_specifications_server_proxy.cc    |   2 +-
+ .../subscriptions_server_proxy.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 +
- 34 files changed, 1235 insertions(+), 93 deletions(-)
+ 42 files changed, 1154 insertions(+), 106 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
  create mode 100644 chrome/browser/endpoint_fetcher/BUILD.gn
@@ -71,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
-@@ -1945,6 +1945,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1952,6 +1952,9 @@ if (!is_robolectric && enable_java_templates) {
        sources = [ "//build/android/java/templates/BuildConfig.template" ]
        defines = []
  
@@ -84,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
-@@ -833,6 +833,8 @@ chrome_java_sources = [
+@@ -848,6 +848,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",
@@ -121,7 +129,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
 +
  /** Settings fragment that displays information about Chrome. */
  @NullMarked
- public class AboutChromeSettings extends PreferenceFragmentCompat
+ public class AboutChromeSettings extends ChromeBaseSettingsFragment
 -        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener {
 +        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener,
 +                   Preference.OnPreferenceChangeListener {
@@ -132,7 +140,7 @@ 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 PreferenceFragmentCompat
+@@ -72,6 +78,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
          assumeNonNull(p);
          int currentYear = Calendar.getInstance().get(Calendar.YEAR);
          p.setSummary(getString(R.string.legal_information_summary, currentYear));
@@ -146,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
      }
  
      @Override
-@@ -142,6 +155,19 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
+@@ -142,6 +155,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
          return true;
      }
  
@@ -246,7 +254,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen
  import android.view.Choreographer;
 +import androidx.annotation.StringRes;
  
- import org.chromium.base.BuildInfo;
+ import org.chromium.base.ApkInfo;
  import org.chromium.base.Callback;
 @@ -23,6 +24,7 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
@@ -312,7 +320,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMen
                  // The badge is hidden if the update menu item has been clicked until there is an
                  // even newer version of Chrome available.
                  showBadge |=
-@@ -255,6 +270,72 @@ public class UpdateMenuItemHelper {
+@@ -254,6 +269,72 @@ public class UpdateMenuItemHelper {
                  mMenuUiState.itemState.icon = R.drawable.ic_error_24dp_filled;
                  mMenuUiState.itemState.enabled = false;
                  break;
@@ -678,7 +686,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
-@@ -2685,6 +2685,12 @@ static_library("browser") {
+@@ -2669,6 +2669,12 @@ static_library("browser") {
    }
  
    if (is_android) {
@@ -746,7 +754,7 @@ diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher_android.cc b/chrom
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher_android.cc
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,107 @@
 +// Copyright 2019 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -801,48 +809,6 @@ new file mode 100644
 +}
 +}  // namespace
 +
-+// TODO(crbug.com/1077537) Create a KeyProvider so
-+// we can have one centralized API.
-+
-+static void JNI_EndpointFetcher_NativeFetchOAuth(
-+    JNIEnv* env,
-+    const base::android::JavaParamRef<jobject>& jprofile,
-+    const base::android::JavaParamRef<jstring>& joauth_consumer_name,
-+    const base::android::JavaParamRef<jstring>& jurl,
-+    const base::android::JavaParamRef<jstring>& jhttps_method,
-+    const base::android::JavaParamRef<jstring>& jcontent_type,
-+    const base::android::JavaParamRef<jobjectArray>& jscopes,
-+    const base::android::JavaParamRef<jstring>& jpost_data,
-+    jlong jtimeout,
-+    jint jannotation_hash_code,
-+    const base::android::JavaParamRef<jobject>& jcallback) {
-+  std::vector<std::string> scopes;
-+  base::android::AppendJavaStringArrayToStringVector(env, jscopes, &scopes);
-+  auto endpoint_fetcher = std::make_unique<endpoint_fetcher::EndpointFetcher>(
-+      Profile::FromJavaObject(jprofile)
-+          ->GetDefaultStoragePartition()
-+          ->GetURLLoaderFactoryForBrowserProcess(),
-+      base::android::ConvertJavaStringToUTF8(env, joauth_consumer_name),
-+      GURL(base::android::ConvertJavaStringToUTF8(env, jurl)),
-+      base::android::ConvertJavaStringToUTF8(env, jhttps_method),
-+      base::android::ConvertJavaStringToUTF8(env, jcontent_type), scopes,
-+      base::Milliseconds(jtimeout), base::android::ConvertJavaStringToUTF8(env, jpost_data),
-+      net::NetworkTrafficAnnotationTag::FromJavaAnnotation(
-+          jannotation_hash_code),
-+      IdentityManagerFactory::GetForProfile(
-+          Profile::FromJavaObject(jprofile)),
-+      // TODO(crbug.com/1466445): ConsentLevel::kSync is deprecated and should
-+      //     be removed. See ConsentLevel::kSync documentation for details.
-+      signin::ConsentLevel::kSync);
-+  auto* const endpoint_fetcher_ptr = endpoint_fetcher.get();
-+  endpoint_fetcher_ptr->Fetch(
-+      base::BindOnce(&OnEndpointFetcherComplete,
-+                     base::android::ScopedJavaGlobalRef<jobject>(jcallback),
-+                     // unique_ptr endpoint_fetcher is passed until the callback
-+                     // to ensure its lifetime across the request.
-+                     std::move(endpoint_fetcher)));
-+}
-+
 +static void JNI_EndpointFetcher_NativeFetchWithNoAuth(
 +    JNIEnv* env,
 +    const base::android::JavaParamRef<jobject>& jprofile,
@@ -900,7 +866,7 @@ diff --git a/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browse
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/endpoint_fetcher/java/src/org/chromium/chrome/browser/endpoint_fetcher/EndpointFetcher.java
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,63 @@
 +// Copyright 2019 The Chromium Authors
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -928,47 +894,6 @@ new file mode 100644
 +public final class EndpointFetcher {
 +    private EndpointFetcher() {}
 +
-+    /**
-+     * Calls an endpoint using OAuth and returns the response via a callback
-+     * @param callback callback function response is returned in
-+     * @param profile profile via which the endpoint is called
-+     * @param oathConsumerName consumer name for OAuth
-+     * @param url endpoint URL called
-+     * @param httpsMethod the HTTPS method used e.g. "GET" or "POST"
-+     * @param contentType the content type e.g. "application/json"
-+     * @param scopes scopes used as part of authentication
-+     * @param postData data for a "POST" request
-+     * @param timeout time after which the request will terminate in the event a response hasn't
-+     *         been received
-+     */
-+    @MainThread
-+    public static void fetchUsingOAuth(
-+            Callback<EndpointResponse> callback,
-+            Profile profile,
-+            String oathConsumerName,
-+            String url,
-+            String httpsMethod,
-+            String contentType,
-+            String[] scopes,
-+            String postData,
-+            long timeout,
-+            NetworkTrafficAnnotationTag annotation) {
-+        // EndpointFetcher currently does not support incognito mode
-+        assert !profile.isOffTheRecord();
-+        EndpointFetcherJni.get()
-+                .nativeFetchOAuth(
-+                        profile,
-+                        oathConsumerName,
-+                        url,
-+                        httpsMethod,
-+                        contentType,
-+                        scopes,
-+                        postData,
-+                        timeout,
-+                        annotation.getHashCode(),
-+                        callback);
-+    }
-+
 +    @MainThread
 +    public static void nativeHeadWithNoAuth(
 +            Callback<EndpointHeaderResponse> callback, Profile profile,
@@ -989,18 +914,6 @@ new file mode 100644
 +
 +    @NativeMethods
 +    public interface Natives {
-+        void nativeFetchOAuth(
-+                Profile profile,
-+                String oathConsumerName,
-+                String url,
-+                String httpsMethod,
-+                String contentType,
-+                String[] scopes,
-+                String postData,
-+                long timeout,
-+                int annotationHashCode,
-+                Callback<EndpointResponse> callback);
-+
 +        void nativeFetchWithNoAuth(
 +                Profile profile,
 +                String url,
@@ -1091,7 +1004,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -363,6 +363,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -375,6 +375,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kProtectedTabsAndroid,
      &kPwaRestoreUi,
      &kPwaRestoreUiAtStartup,
@@ -1102,14 +1015,26 @@ 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
-@@ -453,6 +453,7 @@ public abstract class ChromeFeatureList {
-     public static final String HUB_BACK_BUTTON = "HubBackButton";
-     public static final String HUB_SLIDE_ANIMATION = "HubSlideAnimation";
+@@ -464,6 +464,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";
 +    public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
      public static final String INSTANCE_SWITCHER_V2 = "InstanceSwitcherV2";
      public static final String IP_PROTECTION_UX = "IpProtectionUx";
      public static final String KEYBOARD_ESC_BACK_NAVIGATION = "KeyboardEscBackNavigation";
+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)
+           .SetPostData(kEmptyPostData)
+-          .Build());
++          .Build(), kTrafficAnnotation);
+ }
+ 
+ void AccessCodeCastDiscoveryInterface::ValidateDiscoveryAccessCode(
 diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/android/BUILD.gn
 --- a/chrome/browser/omaha/android/BUILD.gn
 +++ b/chrome/browser/omaha/android/BUILD.gn
@@ -1282,10 +1207,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 +import org.chromium.base.ActivityState;
 +import org.chromium.base.ApplicationStatus;
 +import org.chromium.base.ApplicationStatus.ActivityStateListener;
- import org.chromium.base.BuildInfo;
+ import org.chromium.base.ApkInfo;
  import org.chromium.base.Callback;
- import org.chromium.base.ObserverList;
-@@ -30,6 +33,7 @@ import org.chromium.base.task.TaskTraits;
+ import org.chromium.base.DeviceInfo;
+@@ -31,6 +34,7 @@ import org.chromium.base.task.TaskTraits;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.build.annotations.RequiresNonNull;
@@ -1293,7 +1218,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
  import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
-@@ -39,6 +43,11 @@ import java.io.File;
+@@ -40,6 +44,11 @@ import java.io.File;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -1305,7 +1230,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
  /**
   * Provides the current update state for Chrome.  This update state is asynchronously determined and
   * can change as Chrome runs.
-@@ -46,24 +55,26 @@ import java.lang.annotation.RetentionPolicy;
+@@ -47,24 +56,26 @@ import java.lang.annotation.RetentionPolicy;
   * For manually testing this functionality, see {@link UpdateConfigs}.
   */
  @NullMarked
@@ -1340,7 +1265,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      }
  
      /** A set of properties that represent the current update state for Chrome. */
-@@ -97,6 +108,12 @@ public class UpdateStatusProvider {
+@@ -98,6 +109,12 @@ public class UpdateStatusProvider {
           */
          private boolean mIsSimulated;
  
@@ -1353,7 +1278,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
          public UpdateStatus() {}
  
          UpdateStatus(UpdateStatus other) {
-@@ -105,11 +122,13 @@ public class UpdateStatusProvider {
+@@ -106,11 +123,13 @@ public class UpdateStatusProvider {
              latestVersion = other.latestVersion;
              latestUnsupportedVersion = other.latestUnsupportedVersion;
              mIsSimulated = other.mIsSimulated;
@@ -1367,7 +1292,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      private final UpdateQuery mOmahaQuery;
      private final UpdateSuccessMetrics mMetrics;
      private @Nullable UpdateStatus mStatus;
-@@ -117,11 +136,6 @@ public class UpdateStatusProvider {
+@@ -118,11 +137,6 @@ public class UpdateStatusProvider {
      /** Whether or not we've recorded the initial update status yet. */
      private boolean mRecordedInitialStatus;
  
@@ -1379,7 +1304,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      /**
       * Adds {@code observer} to notify about update state changes.  It is safe to call this multiple
       * times with the same {@code observer}.  This method will always notify {@code observer} of the
-@@ -177,6 +191,30 @@ public class UpdateStatusProvider {
+@@ -178,6 +192,30 @@ public class UpdateStatusProvider {
          pingObservers();
      }
  
@@ -1410,7 +1335,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      /**
       * Starts the intent update process, if possible
       * @param context An {@link Context} that will be used to fire off the update intent.
-@@ -184,12 +222,11 @@ public class UpdateStatusProvider {
+@@ -185,12 +223,11 @@ public class UpdateStatusProvider {
       * @return        Whether or not the update intent was sent and had a valid handler.
       */
      public boolean startIntentUpdate(Context context, boolean newTask) {
@@ -1424,7 +1349,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
              Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStatus.updateUrl));
              if (newTask) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
              context.startActivity(intent);
-@@ -200,9 +237,15 @@ public class UpdateStatusProvider {
+@@ -201,9 +238,15 @@ public class UpdateStatusProvider {
          return true;
      }
  
@@ -1442,7 +1367,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      }
  
      @RequiresNonNull("mStatus")
-@@ -211,35 +254,52 @@ public class UpdateStatusProvider {
+@@ -212,35 +255,52 @@ public class UpdateStatusProvider {
      }
  
      private void resolveStatus() {
@@ -1504,7 +1429,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
              mCallback = resultReceiver;
          }
  
-@@ -251,7 +311,7 @@ public class UpdateStatusProvider {
+@@ -252,7 +312,7 @@ public class UpdateStatusProvider {
          protected UpdateStatus doInBackground() {
              UpdateStatus testStatus = getTestStatus();
              if (testStatus != null) return testStatus;
@@ -1513,7 +1438,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
          }
  
          @Override
-@@ -269,6 +329,8 @@ public class UpdateStatusProvider {
+@@ -270,6 +330,8 @@ public class UpdateStatusProvider {
              status.mIsSimulated = true;
              status.updateState = forcedUpdateState;
  
@@ -1522,7 +1447,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
              // Push custom configurations for certain update states.
              switch (forcedUpdateState) {
                  case UpdateState.UPDATE_AVAILABLE:
-@@ -286,31 +348,33 @@ public class UpdateStatusProvider {
+@@ -287,31 +349,33 @@ public class UpdateStatusProvider {
              return status;
          }
  
@@ -1537,7 +1462,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 -                boolean allowedToUpdate =
 -                        checkForSufficientStorage()
 -                                // Disable the version update check for automotive. See b/297925838.
--                                && !BuildInfo.getInstance().isAutomotive
+-                                && !DeviceInfo.isAutomotive()
 -                                && PackageUtils.isPackageInstalled(
 -                                        GooglePlayServicesUtil.GOOGLE_PLAY_STORE_PACKAGE);
 -                status.updateState =
@@ -1677,10 +1602,22 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
      }
  
      /** See {@link ChromeActivitySessionTracker#onForegroundSessionStart()}. */
+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(
+   return std::make_unique<endpoint_fetcher::EndpointFetcher>(
+       /*url_loader_factory=*/url_loader_factory_.get(),
+       /*identity_manager=*/identity_manager_,
+-      /*request_params=*/std::move(request_params));
++      /*request_params=*/std::move(request_params), kTrafficAnnotationTag);
+ }
+ 
+ DriveUploaderType DriveUploader::get_drive_uploader_type() const {
 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
-@@ -2324,6 +2324,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2279,6 +2279,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>
@@ -1693,7 +1630,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]">
-@@ -4288,7 +4294,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4255,7 +4261,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]">
@@ -1705,7 +1642,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
-@@ -4299,6 +4308,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4266,6 +4275,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>
@@ -1727,18 +1664,91 @@ 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
-@@ -802,6 +802,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
-       /*post_data=*/std::move(request_string),
-       /*headers=*/request_headers,
-       /*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(),
-+      kTrafficAnnotationTag,
-       /*request_params=*/
-       EndpointFetcher::RequestParams::Builder(http_method,
-                                               kTrafficAnnotationTag)
+@@ -726,7 +726,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
+           .SetTimeout(timeout)
+           .SetUrl(fetch_url)
+           .SetUploadProgressCallback(std::move(upload_progress_callback))
+-          .Build());
++          .Build(), kTrafficAnnotationTag);
+ }
+ 
+ void LensOverlayQueryController::SendLatencyGen204IfEnabled(
+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(
+       .SetPostData(post_data);
+   MaybeUseAlternateShoppingServer(request_params);
+   return std::make_unique<EndpointFetcher>(
+-      url_loader_factory_, identity_manager_, request_params.Build());
++      url_loader_factory_, identity_manager_, request_params.Build(), annotation_tag);
+ }
+ 
+ }  // namespace commerce
+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(
+       .SetPostData(post_data);
+   commerce::MaybeUseAlternateShoppingServer(request_params);
+   return std::make_unique<EndpointFetcher>(
+-      url_loader_factory_, identity_manager_, request_params.Build());
++      url_loader_factory_, identity_manager_, request_params.Build(), kGetComparableProductsTrafficAnnotation);
+ }
+ 
+ void ClusterServerProxy::HandleCompareResponse(
+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(
+       .SetPostData(post_data);
+   MaybeUseAlternateShoppingServer(request_params);
+   return std::make_unique<EndpointFetcher>(
+-      url_loader_factory_, identity_manager_, request_params.Build());
++      url_loader_factory_, identity_manager_, request_params.Build(), kShoppingListTrafficAnnotation);
+ }
+ 
+ std::optional<ProductSpecifications>
+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(
+       .SetPostData(post_data);
+   MaybeUseAlternateShoppingServer(request_params);
+   return std::make_unique<EndpointFetcher>(
+-      url_loader_factory_, identity_manager_, request_params.Build());
++      url_loader_factory_, identity_manager_, request_params.Build(), annotation_tag);
+ }
+ 
+ void SubscriptionsServerProxy::HandleManageSubscriptionsResponses(
+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)
+           .SetPostData(post_data)
+-          .Build());
++          .Build(), annotation_tag);
+ }
+ 
+ void DataSharingNetworkLoaderImpl::OnDownloadComplete(
+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(
+           .SetUrl(url)
+           .SetOauthScopes(std::vector<std::string>{kOAuthScope})
+           .SetOauthConsumerName(kOAuthName)
+-          .Build());
++          .Build(), kGetSharedDataPreviewTrafficAnnotation);
+ }
+ 
+ void PreviewServerProxy::HandleServerResponse(
 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
-@@ -21,6 +21,11 @@
+@@ -25,6 +25,11 @@
  #include "services/network/public/mojom/referrer_policy.mojom-shared.h"
  #include "services/network/public/mojom/url_response_head.mojom.h"
  
@@ -1750,61 +1760,43 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  namespace endpoint_fetcher {
  
  namespace {
-@@ -37,6 +42,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
-       return "POST";
-     case HttpMethod::kDelete:
+@@ -43,6 +48,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
        return "DELETE";
+     case HttpMethod::kPut:
+       return "PUT";
 +    case HttpMethod::kHead:
 +      return "HEAD";
      default:
        DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n",
                                        static_cast<int>(http_method));
-@@ -51,6 +58,8 @@ HttpMethod GetHttpMethod(const std::string& http_method_string) {
-     return HttpMethod::kPost;
-   } else if (http_method_string == "DELETE") {
-     return HttpMethod::kDelete;
-+  } else if (http_method_string == "HEAD") {
-+    return HttpMethod::kHead;
-   }
-   return HttpMethod::kUndefined;
+@@ -50,6 +57,13 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
+   return "";
  }
-@@ -110,6 +119,7 @@ EndpointFetcher::EndpointFetcher(
-     RequestParams request_params)
+ 
++HttpMethod GetHttpMethod(const std::string& http_method_string) {
++  if (http_method_string == "HEAD") {
++    return HttpMethod::kHead;
++  }
++  return HttpMethod::kUndefined;
++}
++
+ }  // namespace
+ 
+ EndpointResponse::EndpointResponse() = default;
+@@ -108,9 +122,11 @@ EndpointFetcher::RequestParams::Builder::Build() {
+ EndpointFetcher::EndpointFetcher(
+     const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
+     signin::IdentityManager* identity_manager,
+-    RequestParams request_params)
++    RequestParams request_params,
++    const net::NetworkTrafficAnnotationTag& annotation_tag)
      : url_loader_factory_(url_loader_factory),
        identity_manager_(identity_manager),
 +      intercept_redirect_(false),
        request_params_(std::move(request_params)) {
    if (request_params_.auth_type() == OAUTH) {
      DCHECK(identity_manager_)
-@@ -150,9 +160,11 @@ EndpointFetcher::EndpointFetcher(
-     const std::vector<std::string>& headers,
-     const std::vector<std::string>& cors_exempt_headers,
-     version_info::Channel channel,
-+    const net::NetworkTrafficAnnotationTag& annotation_tag,
-     const RequestParams request_params)
-     : url_loader_factory_(url_loader_factory),
-       identity_manager_(nullptr),
-+      intercept_redirect_(false),
-       request_params_(EndpointFetcher::RequestParams::Builder(request_params)
-                           .SetAuthType(CHROME_API_KEY)
-                           .SetUrl(url)
-@@ -171,6 +183,7 @@ EndpointFetcher::EndpointFetcher(
-     const net::NetworkTrafficAnnotationTag& annotation_tag)
-     : url_loader_factory_(url_loader_factory),
-       identity_manager_(nullptr),
-+      intercept_redirect_(false),
-       request_params_(EndpointFetcher::RequestParams::Builder(HttpMethod::kGet,
-                                                               annotation_tag)
-                           .SetAuthType(NO_AUTH)
-@@ -193,6 +206,7 @@ EndpointFetcher::EndpointFetcher(
-     signin::ConsentLevel consent_level)
-     : url_loader_factory_(url_loader_factory),
-       identity_manager_(identity_manager),
-+      intercept_redirect_(false),
-       request_params_(
-           EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method),
-                                                   annotation_tag)
-@@ -212,6 +226,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -123,12 +139,32 @@ EndpointFetcher::EndpointFetcher(
  EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
      : identity_manager_(nullptr),
@@ -1812,11 +1804,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        request_params_(
            EndpointFetcher::RequestParams::Builder(HttpMethod::kUndefined,
                                                    annotation_tag)
-@@ -219,6 +234,25 @@ EndpointFetcher::EndpointFetcher(
-               .SetSanitizeResponse(true)
+               .SetTimeout(kDefaultTimeOut)
                .Build()) {}
  
-+// constructor used by Bromite
++// constructor used by Cromite
 +EndpointFetcher::EndpointFetcher(
 +    const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
 +    const GURL& url,
@@ -1838,7 +1829,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  EndpointFetcher::~EndpointFetcher() = default;
  
  void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -301,13 +335,10 @@ void EndpointFetcher::PerformHttpRequest(
+@@ -211,13 +247,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();
@@ -1853,9 +1844,9 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +  resource_request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE
 +                                  | net::LOAD_DO_NOT_SAVE_COOKIES;
    // Add Content-Type header if post data is present.
-   if (request_params_.http_method() == HttpMethod::kPost &&
-       request_params_.post_data()) {
-@@ -346,8 +377,23 @@ void EndpointFetcher::PerformHttpRequest(
+   bool has_body_content = (request_params_.http_method() == HttpMethod::kPost ||
+                            request_params_.http_method() == HttpMethod::kPut) &&
+@@ -258,8 +291,23 @@ void EndpointFetcher::PerformHttpRequest(
        break;
    }
  
@@ -1877,9 +1868,9 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +      &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this)));
 +  }
  
-   if (request_params_.http_method() == HttpMethod::kPost &&
-       request_params_.post_data()) {
-@@ -361,9 +407,18 @@ void EndpointFetcher::PerformHttpRequest(
+   if (has_body_content) {
+     simple_url_loader_->AttachStringForUpload(
+@@ -272,9 +320,18 @@ void EndpointFetcher::PerformHttpRequest(
  
    simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                        network::SimpleURLLoader::RETRY_ON_5XX);
@@ -1901,7 +1892,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
    network::SimpleURLLoader::BodyAsStringCallbackDeprecated
        body_as_string_callback = base::BindOnce(
            &EndpointFetcher::OnResponseFetched, weak_ptr_factory_.GetWeakPtr(),
-@@ -453,21 +508,6 @@ void EndpointFetcher::OnSanitizationResult(
+@@ -333,21 +390,6 @@ void EndpointFetcher::OnResponseFetched(
    std::move(endpoint_fetcher_callback).Run(std::move(response));
  }
  
@@ -1921,9 +1912,9 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 -}
 -
  int EndpointFetcher::GetMaxRetries() const {
-   if (!request_params_.max_retries.has_value()) {
-     return kNumRetries;
-@@ -493,4 +533,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
+   return request_params_.max_retries.value_or(kNumRetries);
+ }
+@@ -365,4 +407,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
    return request_params_.url().spec();
  }
  
@@ -1966,59 +1957,55 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoint_fetcher/endpoint_fetcher.h
 --- a/components/endpoint_fetcher/endpoint_fetcher.h
 +++ b/components/endpoint_fetcher/endpoint_fetcher.h
-@@ -21,6 +21,8 @@
+@@ -20,6 +20,9 @@
+ #include "services/network/public/mojom/fetch_api.mojom-forward.h"
+ #include "url/gurl.h"
+ 
++#include "services/network/public/cpp/resource_request.h"
++#include "services/network/public/mojom/url_response_head.mojom.h"
++
  namespace base {
  class TimeDelta;
  }  // namespace base
-+#include "services/network/public/cpp/resource_request.h"
-+#include "services/network/public/mojom/url_response_head.mojom.h"
- 
- namespace network {
- class SimpleURLLoader;
-@@ -59,6 +61,7 @@ enum class HttpMethod {
-   kGet = 0,
+@@ -61,6 +64,7 @@ enum class HttpMethod {
    kPost = 1,
    kDelete = 2,
-+  kHead = 3,
+   kPut = 3,
++  kHead = 4,
  };
  
  enum AuthType {
-@@ -72,6 +75,8 @@ enum AuthType {
+@@ -79,6 +83,8 @@ struct EndpointResponse {
+   ~EndpointResponse();
  
- struct EndpointResponse {
    std::string response;
 +  long last_modified;
 +  std::string redirect_url;
    int http_status_code{-1};
    std::optional<FetchErrorType> error_type;
- };
-@@ -359,6 +364,7 @@ class EndpointFetcher {
-       const std::vector<std::string>& headers,
-       const std::vector<std::string>& cors_exempt_headers,
-       version_info::Channel channel,
-+      const net::NetworkTrafficAnnotationTag& annotation_tag,
-       const RequestParams request_params);
- 
-   // Less preferred convenience constructor for requests requiring no
-@@ -375,6 +381,14 @@ class EndpointFetcher {
-       const GURL& url,
-       const net::NetworkTrafficAnnotationTag& annotation_tag);
- 
-+  // Constructor if no authentication is needed, with timeout
+   scoped_refptr<net::HttpResponseHeaders> headers;
+@@ -314,7 +320,16 @@ class EndpointFetcher {
+   EndpointFetcher(
+       const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
+       signin::IdentityManager* identity_manager,
+-      RequestParams request_params);
++      RequestParams request_params,
++      const net::NetworkTrafficAnnotationTag& annotation_tag);
++
++  // Constructor used by cromite
 +  EndpointFetcher(const scoped_refptr<network::SharedURLLoaderFactory>& url_loader_factory,
 +                  const GURL& url,
 +                  const std::string& http_method,
 +                  int64_t timeout_ms,
 +                  const bool intercept_redirect,
 +                  const net::NetworkTrafficAnnotationTag& annotation_tag);
-+
-   // Used internally. Can be used if caller constructs their own
-   // url_loader_factory and identity_manager.
-   EndpointFetcher(
-@@ -424,11 +438,17 @@ class EndpointFetcher {
-   void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
-                             EndpointFetcherCallback endpoint_fetcher_callback,
-                             data_decoder::JsonSanitizer::Result result);
+ 
+   EndpointFetcher(const EndpointFetcher& endpoint_fetcher) = delete;
+   EndpointFetcher& operator=(const EndpointFetcher& endpoint_fetcher) = delete;
+@@ -347,11 +362,17 @@ class EndpointFetcher {
+ 
+   void OnResponseFetched(EndpointFetcherCallback callback,
+                          std::unique_ptr<std::string> response_body);
 +  void OnURLLoadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
 +  void OnSimpleLoaderRedirect(const GURL& url_before_redirect,
 +                              const net::RedirectInfo& redirect_info,
@@ -2033,7 +2020,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
    // Members set in constructor
    const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
-@@ -436,6 +456,8 @@ class EndpointFetcher {
+@@ -359,6 +380,8 @@ class EndpointFetcher {
    // this case, callers should invoke `PerformRequest` directly).
    const raw_ptr<signin::IdentityManager> identity_manager_;
  
@@ -2042,7 +2029,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    // The complete definition of the specific network request to be performed.
    // Contains authentication details and response handling preferences.
    const RequestParams request_params_;
-@@ -445,6 +467,9 @@ class EndpointFetcher {
+@@ -368,6 +391,9 @@ class EndpointFetcher {
        access_token_fetcher_;
    std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
  
@@ -2055,26 +2042,36 @@ 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
-@@ -163,6 +163,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
-       /*cors_exempt_headers=*/std::vector<std::string>(),
-       // ChromeOS always uses the stable channel API key
-       version_info::Channel::STABLE,
-+      annotation_tag,
-       EndpointFetcher::RequestParams::Builder(kHttpMethod, annotation_tag)
-           .Build());
+@@ -145,7 +145,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcher(
+           .SetOauthScopes(scopes)
+           .SetOauthConsumerName(oauth_consumer_name)
+           .SetPostData(post_data)
+-          .Build());
++          .Build(), annotation_tag);
  }
+ 
+ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
+@@ -163,7 +163,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
+           .SetTimeout(timeout)
+           .SetPostData(post_data)
+           .SetChannel(version_info::Channel::STABLE)
+-          .Build());
++          .Build(), annotation_tag);
+ }
+ 
+ }  // 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
-@@ -314,7 +314,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
-       /*post_data=*/std::move(request_string),
-       /*headers=*/request_headers,
-       /*cors_exempt_headers=*/cors_exempt_headers,
--      /*channel=*/channel_,
-+      /*channel=*/channel_, kTrafficAnnotationTag,
-       /*request_params=*/
-       EndpointFetcher::RequestParams::Builder(http_method,
-                                               kTrafficAnnotationTag)
+@@ -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

@@ -66,7 +66,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
-@@ -325,6 +325,7 @@ if (_is_default_toolchain) {
+@@ -324,6 +324,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,7 +77,7 @@ 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
-@@ -419,6 +419,7 @@ chrome_java_resources = [
+@@ -432,6 +432,7 @@ chrome_java_resources = [
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
    "java/res/layout/app_history_filter.xml",
@@ -85,7 +85,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -608,6 +609,7 @@ chrome_java_resources = [
+@@ -627,6 +628,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 +96,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
-@@ -903,6 +903,8 @@ chrome_java_sources = [
+@@ -918,6 +918,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,8 +180,8 @@ 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
-@@ -273,6 +273,24 @@ found in the LICENSE file.
-         <item name="android:textSize">20sp</item>
+@@ -312,6 +312,24 @@ found in the LICENSE file.
+         </item>
      </style>
  
 +    <style name="ButtonBarTopSpacer" parent="ButtonBarTopSpacerLight">
@@ -252,7 +252,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -120,6 +120,11 @@ for the previous order (main_preferences_legacy). -->
+@@ -111,6 +111,11 @@ found in the LICENSE file.
          android:key="toolbar_shortcut"
          android:order="21"
          android:title="@string/toolbar_shortcut"/>
@@ -377,7 +377,7 @@ new file mode 100644
 +
 +import org.chromium.base.supplier.ObservableSupplier;
 +import org.chromium.base.supplier.ObservableSupplierImpl;
-+import org.chromium.base.supplier.Supplier;
++import java.util.function.Supplier;
 +
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
@@ -442,16 +442,16 @@ 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
-@@ -72,6 +72,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
- import java.lang.ref.WeakReference;
+@@ -88,6 +88,8 @@ import java.util.HashMap;
  import java.util.Locale;
+ import java.util.Map;
  
 +import org.chromium.chrome.browser.settings.AdBlockEditor;
 +
  /**
   * The Chrome settings activity.
   *
-@@ -683,6 +685,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -948,6 +950,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
                  return;
              }
@@ -462,7 +462,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
-@@ -16888,6 +16888,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -17103,6 +17103,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -533,7 +533,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
-@@ -1273,6 +1273,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1270,6 +1270,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -590,7 +590,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
-@@ -384,6 +384,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -390,6 +390,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -603,7 +603,7 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -8,6 +8,7 @@ import("//third_party/jni_zero/jni_zero.gni")
+@@ -9,6 +9,7 @@ import("//third_party/jni_zero/jni_zero.gni")
  android_library("java") {
    sources = [ "android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java" ]
    sources += [
@@ -611,7 +611,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
-@@ -47,6 +48,7 @@ java_bromite_impl("java_cromite_cached_flags") {
+@@ -49,6 +50,7 @@ java_bromite_impl("java_cromite_cached_flags") {
  generate_jni("jni_headers") {
    sources = [ "android/java/src/org/chromium/chrome/browser/flags/CromiteNativeUtils.java" ]
    sources += [
@@ -619,7 +619,7 @@ diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
      "android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureMap.java",
      "android/java/src/org/chromium/chrome/browser/flags/ChromeSessionState.java",
    ]
-@@ -61,6 +63,7 @@ static_library("flags_android") {
+@@ -62,6 +64,7 @@ static_library("flags_android") {
      "android/chrome_session_state.cc",
      "android/chrome_session_state.h",
    ]
@@ -701,7 +701,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
-@@ -721,6 +721,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -715,6 +715,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
    NetworkProcessLaunchWatcher::RegisterPrefs(registry);
  
@@ -732,8 +732,8 @@ diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser
 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
-@@ -221,6 +221,20 @@ CHAR_LIMIT guidelines:
-         <ph name="PREF_TITLE">%1$s</ph>  <ph name="BEGIN_NEW">&lt;new&gt;</ph>New<ph name="END_NEW">&lt;/new&gt;</ph>
+@@ -224,6 +224,20 @@ CHAR_LIMIT guidelines:
+         Search settings
        </message>
  
 +      <!-- AdBlock settings -->
@@ -756,7 +756,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
-@@ -2907,6 +2907,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2931,6 +2931,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -771,7 +771,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
-@@ -391,6 +391,9 @@
+@@ -406,6 +406,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 +1613,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
        web_contents_helper_(web_contents_helper) {}
  
  ContentSubresourceFilterThrottleManager::
-@@ -628,6 +632,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -629,6 +633,17 @@ ContentSubresourceFilterThrottleManager::
        throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                  ad_tagging_state);
      }

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

@@ -33,9 +33,9 @@ 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
-@@ -1456,6 +1456,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
- 
-   WidgetAXManager* ax_manager() { return ax_manager_.get(); }
+@@ -1465,6 +1465,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   // initialized.
+   void SaveWindowPlacementIfNeeded();
  
 +  // Type of ways to ignore activation changes.
 +  enum class DisableActivationChangeHandlingType {
@@ -53,8 +53,8 @@ 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.
-@@ -1494,13 +1507,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
-   ui::ColorProviderKey GetColorProviderKey() const override;
+@@ -1505,13 +1518,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+   void set_widget_closed() { widget_closed_ = true; }
  
   private:
 -  // Type of ways to ignore activation changes.
@@ -67,7 +67,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
    class PaintAsActiveLockImpl;
  
    friend class ButtonTest;
-@@ -1511,11 +1517,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1522,11 +1528,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    friend class ui_devtools::BubbleLocking;
    friend void DisableActivationChangeHandlingForTests();
  

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

@@ -6,20 +6,33 @@ In site settings added ability to block all popups per site
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../settings/site_settings/popups_page.html   |   2 +
  .../tab_under_navigation_throttle.cc          |  11 +-
  .../android/popup_blocked_message_delegate.cc |  20 +++-
  .../android/popup_blocked_message_delegate.h  |   1 +
  components/blocked_content/popup_blocker.cc   |   3 +
  components/blocked_content_strings.grdp       |   3 +
  .../impl/BromitePopupContentSetting.java      | 106 ++++++++++++++++++
- .../bromite_content_settings/popups.grdp      |  12 ++
- .../bromite_content_settings/popups.inc       |   8 ++
+ .../bromite_content_settings/popups.grdp      |  18 +++
+ .../bromite_content_settings/popups.inc       |  13 +++
  .../core/browser/content_settings_registry.cc |   2 +-
- 9 files changed, 160 insertions(+), 6 deletions(-)
+ 10 files changed, 173 insertions(+), 6 deletions(-)
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromitePopupContentSetting.java
  create mode 100644 components/browser_ui/strings/bromite_content_settings/popups.grdp
  create mode 100644 components/content_settings/core/browser/bromite_content_settings/popups.inc
 
+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 @@
+       category="[[contentSettingsTypesEnum_.POPUPS]]"
+       allow-option-label="$i18n{siteSettingsPopupsAllowed}"
+       allow-option-icon="cr:open-in-new"
++      ask-option-label="$i18n{brSiteSettingspopupsAsk}"
++      ask-option-icon="privacy:open-in-new-off"
+       block-option-label="$i18n{siteSettingsPopupsBlocked}"
+       block-option-icon="privacy:open-in-new-off">
+   </settings-category-default-radio-group>
 diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
@@ -160,7 +173,7 @@ new file mode 100644
 +import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;
 +import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
 +import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;
-+import org.chromium.components.content_settings.ContentSettingValues;
++import org.chromium.components.content_settings.ContentSetting;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.content_public.browser.BrowserContextHandle;
 +
@@ -173,8 +186,8 @@ new file mode 100644
 +public class BromitePopupContentSetting extends BromiteCustomContentSetting {
 +    public BromitePopupContentSetting() {
 +        super(/*contentSettingsType*/ ContentSettingsType.POPUPS,
-+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,
-+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,
++              /*defaultEnabledValue*/ ContentSetting.ALLOW,
++              /*defaultDisabledValue*/ ContentSetting.BLOCK,
 +              /*allowException*/ true,
 +              /*preferenceKey*/ "popups",
 +              /*profilePrefKey*/ "popups");
@@ -193,13 +206,13 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {
++    public int getCategorySummary(@Nullable @ContentSetting int value) {
 +        switch (value) {
-+            case ContentSettingValues.ALLOW:
++            case ContentSetting.ALLOW:
 +                return R.string.website_settings_category_popup_allowed;
-+            case ContentSettingValues.BLOCK:
++            case ContentSetting.BLOCK:
 +                return R.string.website_settings_category_popup_blocked;
-+            case ContentSettingValues.ASK:
++            case ContentSetting.ASK:
 +                return R.string.website_settings_category_popup_block_all;
 +            default:
 +                return 0;
@@ -236,17 +249,23 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {
-+        return ContentSettingValues.ALLOW != value;
++    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {
++        return ContentSetting.ALLOW != value;
 +    }
 +}
 diff --git a/components/browser_ui/strings/bromite_content_settings/popups.grdp b/components/browser_ui/strings/bromite_content_settings/popups.grdp
 new file mode 100644
 --- /dev/null
 +++ b/components/browser_ui/strings/bromite_content_settings/popups.grdp
-@@ -0,0 +1,12 @@
+@@ -0,0 +1,18 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<grit-part>
++  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUP" desc="" formatter_data="android_java">
++    Block sites from showing pop-ups and redirects
++  </message>
++  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_DESCRIPTION" desc="" formatter_data="android_java">
++    When on, sites can use pop-ups and redirects. When off, sites can’t use pop-ups and redirects.
++  </message>
 +  <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCK_ALL" desc="" formatter_data="android_java">
 +    Block all popups
 +  </message>
@@ -261,15 +280,20 @@ diff --git a/components/content_settings/core/browser/bromite_content_settings/p
 new file mode 100644
 --- /dev/null
 +++ b/components/content_settings/core/browser/bromite_content_settings/popups.inc
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,13 @@
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::POPUPS)
 +    ->set_show_into_info_page()
 +    .set_desktop_ui()
 +    .set_is_renderer_content_setting()
++    .set_title_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP)
++    .set_description_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_DESCRIPTION)
 +    .set_allowed_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_ALLOWED)
 +    .set_ask_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCK_ALL)
-+    .set_blocked_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCKED);
++    .set_blocked_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCKED)
++    .set_allowed_exceptions_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_ALLOWED)
++    .set_blocked_exceptions_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP_BLOCKED)
++    .set_mid_sentence_ui(IDS_WEBSITE_SETTINGS_CATEGORY_POPUP);
 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

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

@@ -46,10 +46,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/updater/extension_downloader.h    |  1 -
  .../browser/updater/manifest_fetch_data.cc    |  8 +--
  .../browser/updater/safe_manifest_parser.cc   |  1 +
- extensions/common/extension_features.cc       | 14 +++++
- extensions/common/extension_features.h        |  2 +
+ extensions/common/extension_features.cc       |  7 +++
+ extensions/common/extension_features.h        | 10 +++
  .../definitions/developer_private.d.ts        |  2 +
- 36 files changed, 253 insertions(+), 107 deletions(-)
+ 36 files changed, 254 insertions(+), 107 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
 
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
@@ -71,9 +71,9 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
-@@ -25,6 +25,12 @@
- #include "extensions/browser/app_window/app_window_registry.h"
- #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
+@@ -28,6 +28,12 @@
+ 
+ static_assert(BUILDFLAG(ENABLE_EXTENSIONS_CORE));
  
 +#include "chrome/browser/about_flags.h"
 +#include "chrome/browser/browser_process.h"
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  namespace extensions {
  
  namespace developer = api::developer_private;
-@@ -66,6 +72,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
+@@ -69,6 +75,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
    return g_developer_private_api_factory.Pointer();
  }
  
@@ -116,7 +116,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -34,6 +34,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+@@ -37,6 +37,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
    static BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
    GetFactoryInstance();
  
@@ -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
-@@ -354,6 +354,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -364,6 +364,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));
-@@ -490,7 +491,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -500,7 +501,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)) {
-@@ -504,6 +505,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -514,6 +515,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
          ->MarkNoticeAsAcknowledgedGlobally();
    }
  
@@ -169,7 +169,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
  #include "chrome/common/pref_names.h"
  #include "components/policy/core/common/policy_pref_names.h"
  #include "components/prefs/pref_service.h"
-@@ -39,6 +40,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
+@@ -42,6 +43,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
        ManifestV2ExperimentManager::Get(profile)
            ->DidUserAcknowledgeNoticeGlobally();
  
@@ -181,15 +181,15 @@ 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
-@@ -63,6 +63,7 @@
- #include "extensions/browser/extension_util.h"
- #include "extensions/browser/extensions_browser_client.h"
+@@ -67,6 +67,7 @@
+ #include "extensions/browser/scoped_active_install.h"
+ #include "extensions/buildflags/buildflags.h"
  #include "extensions/common/extension.h"
 +#include "extensions/common/extension_features.h"
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -224,6 +225,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -229,6 +230,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
  // 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);
    }
-@@ -231,11 +234,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -236,11 +239,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;
-@@ -1158,7 +1165,8 @@ ExtensionFunction::ResponseAction
+@@ -1178,7 +1185,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::
-@@ -1254,11 +1262,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1275,11 +1283,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
-@@ -92,6 +92,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
+@@ -95,6 +95,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
      Profile* profile,
      const Extension* extension,
      UninstallReason reason) {
@@ -254,7 +254,7 @@ diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/brows
 diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/browser/extensions/cws_info_service_factory.cc
 --- a/chrome/browser/extensions/cws_info_service_factory.cc
 +++ b/chrome/browser/extensions/cws_info_service_factory.cc
-@@ -47,7 +47,8 @@ CWSInfoServiceFactory::CWSInfoServiceFactory()
+@@ -50,7 +50,8 @@ CWSInfoServiceFactory::CWSInfoServiceFactory()
  std::unique_ptr<KeyedService>
  CWSInfoServiceFactory::BuildServiceInstanceForBrowserContext(
      content::BrowserContext* context) const {
@@ -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
-@@ -424,6 +424,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+@@ -431,6 +431,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
  
  bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
      const Extension* extension) {
@@ -278,7 +278,7 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/
 diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/browser/extensions/extension_safety_check_utils.cc
 --- a/chrome/browser/extensions/extension_safety_check_utils.cc
 +++ b/chrome/browser/extensions/extension_safety_check_utils.cc
-@@ -240,8 +240,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
+@@ -243,8 +243,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
    developer::SafetyCheckWarningReason acknowledged_reason =
        GetPrefAcknowledgeSafetyCheckWarningReason(extension,
                                                   ExtensionPrefs::Get(profile));
@@ -291,7 +291,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/
 diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
 --- a/chrome/browser/extensions/extension_service.cc
 +++ b/chrome/browser/extensions/extension_service.cc
-@@ -241,8 +241,6 @@ ExtensionService::ExtensionService(
+@@ -247,8 +247,6 @@ ExtensionService::ExtensionService(
    UpgradeDetector::GetInstance()->AddObserver(this);
  #endif
  
@@ -300,7 +300,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
    ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
  
    if (autoupdate_enabled) {
-@@ -757,7 +755,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+@@ -763,7 +761,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
    // unpublished extensions should not be enabled. This update allows
    // unpublished extensions to be disabled sooner rather than waiting till the
    // next regularly scheduled fetch.
@@ -312,7 +312,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
 diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
-@@ -50,7 +50,6 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
+@@ -53,7 +53,6 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
      manifest_query_params += "&testrequest=1";
    }
    downloader->set_manifest_query_params(manifest_query_params);
@@ -323,7 +323,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto
 diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
 --- a/chrome/browser/extensions/updater/extension_updater.cc
 +++ b/chrome/browser/extensions/updater/extension_updater.cc
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
  #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
  #include "extensions/common/extension_id.h"
@@ -331,7 +331,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
  #include "extensions/common/extension_set.h"
  #include "extensions/common/extension_updater_uma.h"
  #include "extensions/common/extension_urls.h"
-@@ -228,6 +229,10 @@ void ExtensionUpdater::Start() {
+@@ -229,6 +230,10 @@ void ExtensionUpdater::Start() {
    DCHECK(!weak_ptr_factory_.HasWeakPtrs());
    DCHECK(registry_);
    alive_ = true;
@@ -341,8 +341,8 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 +  }
    // Check soon, and set up the first delayed check.
    if (!g_skip_scheduled_checks_for_tests) {
-     if (g_should_immediately_update)
-@@ -385,7 +390,8 @@ void ExtensionUpdater::AddToDownloader(
+     CheckSoon();
+@@ -380,7 +385,8 @@ void ExtensionUpdater::AddToDownloader(
      const Extension& extension = **extension_iter;
      const ExtensionId& extension_id = extension.id();
      if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -352,7 +352,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        continue;
      }
      // An extension might be overwritten by policy, and have its update url
-@@ -399,7 +405,7 @@ void ExtensionUpdater::AddToDownloader(
+@@ -395,7 +401,7 @@ void ExtensionUpdater::AddToDownloader(
        continue;
      }
  
@@ -361,7 +361,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
        update_check_params->update_info[extension_id] =
            GetExtensionUpdateData(extension_id);
      } else if (AddExtensionToDownloader(extension, request_id,
-@@ -436,6 +442,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
+@@ -433,6 +439,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
  }
  
  void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -374,16 +374,16 @@ 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
-@@ -445,7 +457,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -442,7 +454,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
  
    int request_id = next_request_id_++;
  
 -  VLOG(2) << "Starting update check " << request_id;
 +  LOG(INFO) << "Starting extensions update check id: " << request_id;
-   if (params.ids.empty())
+   if (params.ids.empty()) {
      NotifyStarted();
- 
-@@ -513,7 +525,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+   }
+@@ -512,7 +524,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
-@@ -523,7 +535,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -522,7 +534,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 =
-@@ -546,6 +558,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -545,6 +557,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,
-@@ -558,13 +572,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -557,13 +571,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 {
-@@ -572,7 +579,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -571,7 +578,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)) {
-@@ -716,7 +723,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -715,7 +722,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));
-@@ -727,6 +734,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -726,6 +733,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));
-@@ -839,7 +847,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -845,7 +853,7 @@ bool ExtensionUpdater::CanUseUpdateService(
  void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
    std::set<int> request_ids;
  
@@ -459,15 +459,15 @@ 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
-@@ -1046,7 +1054,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
-   InProgressCheck& request = requests_in_progress_[request_id];
-   if (!request.in_progress_ids.empty() || request.awaiting_update_service)
+@@ -1054,7 +1062,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+   if (!request.in_progress_ids.empty() || request.awaiting_update_service) {
      return;  // This request is not done yet.
+   }
 -  VLOG(2) << "Finished update check " << request_id;
 +  LOG(INFO) << "Finished update check id: " << request_id;
-   if (!request.callback.is_null())
+   if (!request.callback.is_null()) {
      std::move(request.callback).Run();
-   requests_in_progress_.erase(request_id);
+   }
 diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
 --- a/chrome/browser/extensions/updater/extension_updater.h
 +++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -480,7 +480,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
      // An extension update check can be originated by a user or by a scheduled
      // task. When the value of |fetch_priority| is FOREGROUND, the update
      // request was initiated by a user.
-@@ -401,6 +403,8 @@ class ExtensionUpdater : public KeyedService,
+@@ -397,6 +399,8 @@ class ExtensionUpdater : public KeyedService,
    base::TimeDelta frequency_;
    bool will_check_soon_ = false;
  
@@ -492,7 +492,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
 diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc
 --- a/chrome/browser/extensions/webstore_install_helper.cc
 +++ b/chrome/browser/extensions/webstore_install_helper.cc
-@@ -46,7 +46,7 @@ void WebstoreInstallHelper::Start(
+@@ -49,7 +49,7 @@ void WebstoreInstallHelper::Start(
    data_decoder::DataDecoder::ParseJsonIsolated(
        manifest_, base::BindOnce(&WebstoreInstallHelper::OnJSONParsed, this));
  
@@ -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
-@@ -591,7 +591,7 @@ void WebstoreInstaller::StartDownload(
+@@ -594,7 +594,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
-@@ -320,6 +320,11 @@ export class Service implements ServiceInterface {
+@@ -342,6 +342,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -689,7 +689,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
  #include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
  #include "chrome/browser/extensions/mv2_experiment_stage.h"
  #include "chrome/browser/extensions/permissions_url_constants.h"
-@@ -380,6 +381,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -381,6 +382,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        {"itemSuspiciousInstallLearnMore",
         IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
        {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -698,7 +698,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
        {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
        {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
        {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -464,6 +467,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -466,6 +469,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        "hostPermissionsLearnMoreLink",
        extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
    source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -735,7 +735,7 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
-@@ -272,6 +272,7 @@ namespace developerPrivate {
+@@ -273,6 +273,7 @@ namespace developerPrivate {
      boolean isIncognitoAvailable;
      boolean isChildAccount;
      boolean isMv2DeprecationNoticeDismissed;
@@ -743,7 +743,7 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/
    };
  
    dictionary GetExtensionsInfoOptions {
-@@ -295,6 +296,7 @@ namespace developerPrivate {
+@@ -296,6 +297,7 @@ namespace developerPrivate {
    dictionary ProfileConfigurationUpdate {
      boolean? inDeveloperMode;
      boolean? isMv2DeprecationNoticeDismissed;
@@ -764,7 +764,7 @@ diff --git a/components/update_client/update_query_params.cc b/components/update
        GetProdIdString(prod),
        g_delegate ? g_delegate->GetExtraParams().c_str() : "");
  }
-@@ -120,7 +119,7 @@ const char* UpdateQueryParams::GetArch() {
+@@ -120,7 +119,7 @@ std::string_view UpdateQueryParams::GetArch() {
  
  // static
  std::string UpdateQueryParams::GetProdVersion() {
@@ -810,7 +810,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  #include "extensions/browser/api/extensions_api_client.h"
  #include "extensions/browser/api/management/management_api_constants.h"
  #include "extensions/browser/disable_reason.h"
-@@ -41,6 +44,7 @@
+@@ -42,6 +45,7 @@
  #include "extensions/common/api/management.h"
  #include "extensions/common/error_utils.h"
  #include "extensions/common/extension.h"
@@ -818,7 +818,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  #include "extensions/common/extension_id.h"
  #include "extensions/common/extension_urls.h"
  #include "extensions/common/icons/extension_icon_set.h"
-@@ -92,6 +96,29 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
+@@ -104,6 +108,29 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
    return warnings_list;
  }
  
@@ -848,7 +848,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  std::vector<management::LaunchType> GetAvailableLaunchTypes(
      const Extension& extension) {
    std::vector<management::LaunchType> launch_type_list;
-@@ -269,6 +296,8 @@ void AddExtensionInfo(const Extension* source_extension,
+@@ -281,6 +308,8 @@ void AddExtensionInfo(const Extension* source_extension,
                        const ExtensionSet& extensions,
                        ExtensionInfoList* extension_list,
                        content::BrowserContext* context) {
@@ -857,7 +857,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    for (ExtensionSet::const_iterator iter = extensions.begin();
         iter != extensions.end(); ++iter) {
      const Extension& extension = **iter;
-@@ -311,10 +340,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
+@@ -323,10 +352,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
    std::optional<management::Get::Params> params =
        management::Get::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
@@ -869,7 +869,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!target_extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -335,8 +363,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
+@@ -347,8 +375,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
    EXTENSION_FUNCTION_VALIDATE(params);
  
    const Extension* extension =
@@ -879,7 +879,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -404,8 +431,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
+@@ -419,8 +446,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
    }
  
    const Extension* extension =
@@ -889,7 +889,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -547,8 +573,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
+@@ -562,8 +588,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
    // Extension could have been uninstalled externally while previous check was
    // happening.
    const Extension* extension =
@@ -900,7 +900,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -591,8 +617,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
+@@ -606,8 +632,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
    // Extension can be uninstalled externally while the previous check was
    // happening async.
    const Extension* extension =
@@ -911,7 +911,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -736,8 +762,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
+@@ -751,8 +777,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
  }
  
  const Extension* ManagementSetEnabledFunction::GetExtension() {
@@ -922,7 +922,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  }
  
  ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
-@@ -762,8 +788,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -777,8 +803,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                                ->GetDelegate();
    target_extension_id_ = target_extension_id;
    const Extension* target_extension =
@@ -932,7 +932,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
      return RespondNow(Error(keys::kNoExtensionError, target_extension_id_));
-@@ -828,8 +853,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -843,8 +868,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
    // The extension can be uninstalled in another window while the UI was
    // showing. Do nothing in that case.
    const Extension* target_extension =
@@ -942,7 +942,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    std::string error;
    bool success = false;
-@@ -909,8 +933,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -928,8 +952,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
        management::CreateAppShortcut::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -952,7 +952,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(
          ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
-@@ -964,8 +987,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -983,8 +1006,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
        management::SetLaunchType::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -965,7 +965,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
 diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/browser/updater/extension_downloader.cc
 --- a/extensions/browser/updater/extension_downloader.cc
 +++ b/extensions/browser/updater/extension_downloader.cc
-@@ -494,8 +494,8 @@ void ExtensionDownloader::CreateManifestLoader() {
+@@ -485,8 +485,8 @@ void ExtensionDownloader::CreateManifestLoader() {
    std::vector<std::string_view> id_vector(extension_ids.begin(),
                                            extension_ids.end());
    std::string id_list = base::JoinString(id_vector, ",");
@@ -976,7 +976,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
            << (active_request->foreground_check()
                    ? kUpdateInteractivityForeground
                    : kUpdateInteractivityBackground);
-@@ -520,7 +520,7 @@ void ExtensionDownloader::CreateManifestLoader() {
+@@ -511,7 +511,7 @@ void ExtensionDownloader::CreateManifestLoader() {
            destination: WEBSITE
          }
          policy {
@@ -985,7 +985,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
            cookies_store: "user"
            setting:
              "This feature cannot be disabled. It is only enabled when the user "
-@@ -537,6 +537,7 @@ void ExtensionDownloader::CreateManifestLoader() {
+@@ -528,6 +528,7 @@ void ExtensionDownloader::CreateManifestLoader() {
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = active_request->full_url(),
    resource_request->load_flags = net::LOAD_DISABLE_CACHE;
@@ -993,7 +993,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
  
    if (active_request->fetch_priority() == DownloadFetchPriority::kForeground) {
      resource_request->priority = net::MEDIUM;
-@@ -545,10 +546,6 @@ void ExtensionDownloader::CreateManifestLoader() {
+@@ -536,10 +537,6 @@ void ExtensionDownloader::CreateManifestLoader() {
    // Send traffic-management headers to the webstore, and omit credentials.
    // https://bugs.chromium.org/p/chromium/issues/detail?id=647516
    if (extension_urls::IsWebstoreUpdateUrl(active_request->full_url())) {
@@ -1004,7 +1004,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
      resource_request->headers.SetHeader(kUpdateAppIdHeader, id_list);
      resource_request->headers.SetHeader(
          kUpdateUpdaterHeader,
-@@ -833,20 +830,6 @@ void ExtensionDownloader::HandleManifestResults(
+@@ -824,20 +821,6 @@ void ExtensionDownloader::HandleManifestResults(
          update.second->info);
    }
  
@@ -1025,7 +1025,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
    ExtensionIdSet extension_ids_with_errors;
    for (const auto& failure : failures)
      extension_ids_with_errors.insert(failure.first.id);
-@@ -868,7 +851,7 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -859,7 +842,7 @@ ExtensionDownloader::GetUpdateAvailability(
      // extensions that have already existed in the system.
      if (!delegate_->GetExtensionExistingVersion(extension_id,
                                                  &extension_version)) {
@@ -1034,7 +1034,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
        return UpdateAvailability::kBadUpdateSpecification;
      }
      VLOG(2) << extension_id << " is at '" << extension_version << "'";
-@@ -879,11 +862,11 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -870,11 +853,11 @@ ExtensionDownloader::GetUpdateAvailability(
      const std::string& update_version_str = update->version;
      if (VLOG_IS_ON(2)) {
        if (update_version_str.empty())
@@ -1048,7 +1048,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
                  << " latest version is '" << update_version_str << "'";
      }
  
-@@ -893,21 +876,21 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -884,21 +867,21 @@ ExtensionDownloader::GetUpdateAvailability(
        // we don't want it.
        if (update_version_str.empty()) {
          // If update manifest doesn't have version number => no update.
@@ -1073,7 +1073,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
                  << update_version_str << "'";
          bool can_rollback =
              update_version.CompareTo(existing_version) < 0 &&
-@@ -934,7 +917,9 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -925,7 +908,9 @@ ExtensionDownloader::GetUpdateAvailability(
      }
  
      // Stop checking as soon as an update for |extension_id| is found.
@@ -1084,7 +1084,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
      *update_result_out = const_cast<UpdateManifestResult*>(update);
      return UpdateAvailability::kAvailable;
    }
-@@ -1179,7 +1164,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1170,7 +1155,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
    int load_flags = net::LOAD_DISABLE_CACHE;
    bool is_secure = fetch->url.SchemeIsCryptographic();
    extension_loader_resource_request_->load_flags = load_flags;
@@ -1093,7 +1093,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
      extension_loader_resource_request_->credentials_mode =
          network::mojom::CredentialsMode::kOmit;
    } else {
-@@ -1187,7 +1172,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1178,7 +1163,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
          net::SiteForCookies::FromUrl(fetch->url);
    }
  
@@ -1102,7 +1102,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
        is_secure) {
      if (access_token_.empty()) {
        // We should try OAuth2, but we have no token cached. This
-@@ -1212,7 +1197,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1201,7 +1186,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
          base::StringPrintf("Bearer %s", access_token_.c_str()));
    }
  
@@ -1111,7 +1111,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
  
    StartExtensionLoader();
  }
-@@ -1234,7 +1219,7 @@ void ExtensionDownloader::StartExtensionLoader() {
+@@ -1223,7 +1208,7 @@ void ExtensionDownloader::StartExtensionLoader() {
            destination: WEBSITE
          }
          policy {
@@ -1120,7 +1120,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
            cookies_store: "user"
            setting:
              "This feature cannot be disabled. It is only enabled when the user "
-@@ -1305,6 +1290,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
+@@ -1294,6 +1279,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
      RETRY_HISTOGRAM("CrxFetchSuccess",
                      extensions_queue_.active_request_failure_count(),
                      url);
@@ -1128,7 +1128,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
      std::unique_ptr<ExtensionFetch> fetch_data =
          std::move(extensions_queue_.reset_active_request().fetch);
      delegate_->OnExtensionDownloadStageChanged(
-@@ -1325,7 +1311,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
+@@ -1314,7 +1300,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
    } else {
      const std::set<int> request_ids = active_request.GetRequestIds();
      const ExtensionDownloaderDelegate::PingResult& ping = ping_results_[id];
@@ -1137,7 +1137,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
              << "' response code:" << response_code;
      if (ShouldRetryRequest(extension_loader_.get()) &&
          extensions_queue_.active_request_failure_count() < kMaxRetries) {
-@@ -1419,6 +1405,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailedWithList(
+@@ -1408,6 +1394,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailedWithList(
  bool ExtensionDownloader::IterateFetchCredentialsAfterFailure(
      ExtensionFetch* fetch,
      int response_code) {
@@ -1201,21 +1201,14 @@ 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
-@@ -242,4 +242,18 @@ BASE_FEATURE(kAvoidCloneArgsOnExtensionFunctionDispatch,
-              "AvoidCloneArgsOnExtensionFunctionDispatch",
+@@ -172,4 +172,11 @@ BASE_FEATURE(kRuntimeOnMessageWebExtensionPolyfillSupport,
+              "RuntimeOnMessageWebExtensionPolyfillSupport",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
-+// Activates the auto update of extensions.
-+// the only data provided by default is the list of extensions.
 +CROMITE_FEATURE(kEnableExtensionAutoupdate,
 +                "EnableExtensionAutoupdate",
 +                base::FEATURE_DISABLED_BY_DEFAULT);
 +
-+// Modifies "management" and "webstorePrivate" extension api
-+// by not allowing access to the list of installed extensions
-+// and reading or changing status.
-+// Allows the installation of new extensions.
-+// If active, exposes all features to the chrome web store like chromium.
 +CROMITE_FEATURE(kEnableExtensionManagementToChromeStore,
 +                "EnableExtensionToChromeStore",
 +                base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1223,11 +1216,19 @@ 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
-@@ -271,6 +271,8 @@ BASE_DECLARE_FEATURE(kOptimizeServiceWorkerStartRequests);
- // TODO(crbug.com/424432184): Clean up when experiment is complete.
- BASE_DECLARE_FEATURE(kAvoidCloneArgsOnExtensionFunctionDispatch);
+@@ -287,6 +287,16 @@ BASE_DECLARE_FEATURE(kContentVerifyJobUseJobVersionForHashing);
+ // during execution) the error is passed back to the sender.
+ BASE_DECLARE_FEATURE(kRuntimeOnMessageWebExtensionPolyfillSupport);
  
++// Activates the auto update of extensions.
++// the only data provided by default is the list of extensions.
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
++
++// Modifies "management" and "webstorePrivate" extension api
++// by not allowing access to the list of installed extensions
++// and reading or changing status.
++// Allows the installation of new extensions.
++// If active, exposes all features to the chrome web store like chromium.
 +BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore);
  }  // namespace extensions_features
  
@@ -1235,7 +1236,7 @@ diff --git a/extensions/common/extension_features.h b/extensions/common/extensio
 diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
 --- a/tools/typescript/definitions/developer_private.d.ts
 +++ b/tools/typescript/definitions/developer_private.d.ts
-@@ -264,6 +264,7 @@ declare global {
+@@ -265,6 +265,7 @@ declare global {
          isIncognitoAvailable: boolean;
          isChildAccount: boolean;
          isMv2DeprecationNoticeDismissed: boolean;
@@ -1243,7 +1244,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr
        }
  
        export interface ExtensionConfigurationUpdate {
-@@ -281,6 +282,7 @@ declare global {
+@@ -282,6 +283,7 @@ declare global {
        export interface ProfileConfigurationUpdate {
          inDeveloperMode?: boolean;
          isMv2DeprecationNoticeDismissed?: boolean;

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

@@ -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
-@@ -762,6 +762,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -752,6 +752,10 @@ void PreflightController::ClearCorsPreflightCache(
    cache_.ClearCache(std::move(url_filter));
  }
  
@@ -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
-@@ -1374,6 +1374,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1372,6 +1372,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,48 @@ 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(-)
+ 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 ++++++--
+ 15 files changed, 62 insertions(+), 15 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/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,10 +63,18 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
  
    std::string brand_version =
        output_version_type == blink::UserAgentBrandVersionType::kFullVersion
+@@ -698,6 +696,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
+   }
+ 
+   // 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
-@@ -57,6 +57,7 @@
+@@ -58,6 +58,7 @@
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/common/page/page_zoom.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
@@ -52,56 +82,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"
-@@ -703,7 +704,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();
-@@ -885,10 +887,12 @@ void AddRequestClientHintsHeaders(
-     AddEctHeader(headers, network_quality_tracker, url);
-   }
- 
--  UpdateNavigationRequestClientUaHeadersImpl(
--      delegate, is_ua_override_on, frame_tree_node,
--      ClientUaHeaderCallType::kDuringCreation, headers, container_policy,
--      request_url, data);
-+  if (blink::RuntimeEnabledFeatures::UserAgentClientHintEnabled()) {
-+    UpdateNavigationRequestClientUaHeadersImpl(
-+        delegate, is_ua_override_on, frame_tree_node,
-+        ClientUaHeaderCallType::kDuringCreation, headers, container_policy,
-+        request_url, data);
++    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);
-@@ -969,6 +973,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
-@@ -1674,6 +1674,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,17 +133,17 @@ 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
-@@ -111,6 +111,7 @@ const size_t kMaxRestarts = 32;
+@@ -113,6 +113,7 @@ const size_t kMaxRestarts = 32;
  
  // Returns true when Early Hints are allowed on the given protocol.
  bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -142,11 +154,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 +192,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;
@@ -234,7 +249,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl 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
-@@ -227,6 +227,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
+@@ -231,6 +231,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
                            bool is_1p_origin,
                            network::mojom::blink::WebClientHintsType type,
                            const ClientHintsPreferences& hints_preferences) {
@@ -243,7 +258,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(
-@@ -630,7 +632,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -715,7 +717,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
    }
  
    // Only send User Agent hints if the info is available
@@ -255,7 +270,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
-@@ -532,6 +532,11 @@
+@@ -569,6 +569,11 @@
        name: "AriaNotifyV2",
        status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
      },
@@ -267,7 +282,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
      {
        name: "AriaRowColIndexText",
        status: "stable",
-@@ -924,8 +929,7 @@
+@@ -976,8 +981,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

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

@@ -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
-@@ -581,7 +581,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI,
+@@ -509,7 +509,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
  // NetworkChangeNotifier::AreNetworkHandlesSupported).
  #if BUILDFLAG(IS_ANDROID)
  inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =

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   | 191 ++++++++++++++++++
+ .../res/xml/privacy_preferences_cromite.xml   | 197 ++++++++++++++++++
  .../privacy/settings/PrivacySettings.java     |   6 +-
  .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 213 insertions(+), 5 deletions(-)
+ 5 files changed, 219 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
-@@ -634,7 +634,7 @@ chrome_java_resources = [
+@@ -652,7 +652,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",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -15,7 +15,7 @@ for the previous order (main_preferences_legacy). -->
+@@ -11,7 +11,7 @@ found in the LICENSE file.
  <!-- `order=0` is reserved and it will be added in code.  -->
  <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
      <PreferenceCategory
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
          android:order="1001"
          android:title="@string/prefs_section_account_and_google_services"/>
      <org.chromium.chrome.browser.sync.settings.SignInPreference
-@@ -28,7 +28,7 @@ for the previous order (main_preferences_legacy). -->
+@@ -24,7 +24,7 @@ found in the LICENSE file.
          android:layout="@layout/account_management_account_row"
          android:title="@string/sync_category_title"/>
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
@@ -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,191 @@
+@@ -0,0 +1,197 @@
 +<?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
@@ -108,6 +108,12 @@ new file mode 100644
 +        android:key="can_make_payment"
 +        android:title="@string/can_make_payment_title"
 +        android:summary="@string/settings_can_make_payment_toggle_label" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="throttle_main_thread_to_60hz"
++        android:title="@string/throttle_main_thread_to_60hz_title"
++        android:summary="@string/throttle_main_thread_to_60hz_summary"
++        app:featureName="throttle-main-thread-to-60hz"
++        app:needRestart="true" />
 +
 +    <PreferenceCategory
 +        android:title="@string/data_exposed_to_device_section_title"/>
@@ -247,7 +253,7 @@ 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
-@@ -193,7 +193,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -194,7 +194,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
  
@@ -256,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
          Preference incognitoTrackingProtectionsPreference =
                  findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
-@@ -289,7 +289,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -290,7 +290,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
  
          ChromeSwitchPreference passwordLeakTogglePref =
                  (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);

build/patches/Cromite-Branding.patch

@@ -26,8 +26,10 @@ 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 +-
+ .../ChromeContextMenuPopulator.java           |   2 +-
  .../browser/fullscreen/FullscreenToast.java   |   2 +-
  .../inline/BromiteInlineUpdateController.java |  19 +++-
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |   2 +-
  chrome/app/extensions_strings.grdp            |   4 +-
  chrome/app/settings_strings.grdp              |   2 +-
  chrome/app/theme/chromium/BRANDING            |   8 +-
@@ -37,12 +39,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../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 +-
  chrome/browser/prefs/BUILD.gn                 |   1 +
  .../prefs/chrome_pref_service_factory.cc      |   6 +-
  .../profiles/profile_shortcut_manager_win.cc  |   2 +-
  .../settings/settings_menu/settings_menu.html |  14 ++-
- .../strings/android_chrome_strings.grd        |   2 +-
+ .../OmniboxSuggestionsContainer.java          |   8 +-
+ .../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 +-
@@ -52,6 +57,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../drawable-xhdpi/fre_product_logo.png       | Bin 5151 -> 34576 bytes
  .../drawable-xxhdpi/fre_product_logo.png      | Bin 7720 -> 60959 bytes
  .../drawable-xxxhdpi/fre_product_logo.png     | Bin 10740 -> 93273 bytes
+ .../browser/autocomplete_controller.cc        |   1 +
  .../vector_icons/product_chrome_refresh.icon  |  93 +++++++++---------
  .../chromium/product_logo.png                 | Bin 1562 -> 3577 bytes
  .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
@@ -60,9 +66,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../webui/version/resources/about_version.ts  |   4 +-
  .../resources/about_version_mobile.css        |   9 ++
  content/child/runtime_features.cc             |  44 ++++-----
- .../Cromite-Branding.inc                      |   1 +
+ .../Cromite-Branding.inc                      |   2 +
  tools/grit/grit/grd_reader.py                 |  35 +++++++
- 58 files changed, 204 insertions(+), 130 deletions(-)
+ 64 files changed, 261 insertions(+), 173 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
@@ -86,7 +92,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
-@@ -194,6 +194,10 @@ declare_args() {
+@@ -187,6 +187,10 @@ declare_args() {
    clang_warning_suppression_file = ""
  }
  
@@ -132,7 +138,7 @@ diff --git a/chrome/android/java/res/xml/legal_information_preferences.xml b/chr
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -16,20 +16,20 @@ for the previous order (main_preferences_legacy). -->
+@@ -12,20 +12,20 @@ found in the LICENSE file.
  <!-- TODO(crbug.com/364906215): Move SettingsPromoCardPreference here once SyncPromoPreference is removed -->
      <PreferenceCategory
          android:key="account_and_google_services_section"
@@ -9138,10 +9144,23 @@ 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/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 {
+                     && !isEmptyUrl(mParams.getUrl())
+                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
+                 if (mMode == ContextMenuMode.NORMAL) {
+-                    linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
+                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
++                    linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
+                     if (!mItemDelegate.isIncognito()
+                             && mItemDelegate.isIncognitoSupported()
+                             && !shouldOpenIncognitoAsWindow()) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
-@@ -108,7 +108,7 @@ interface FullscreenToast {
+@@ -109,7 +109,7 @@ interface FullscreenToast {
              mNotificationToast =
                      Toast.makeTextWithPriority(
                              mActivity, toastTextId, Toast.LENGTH_LONG, ToastPriority.HIGH);
@@ -9193,10 +9212,22 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
          Log.i(TAG, "BromiteUpdater: fetching with GET '%s'", UPSTREAM_VERSION_URL);
  
          EndpointFetcher.nativeFetchWithNoAuth(
+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 {
+                                 }
+                                 return mBackButtonShouldCloseTabFn.apply(tab)
+                                         ? ActionType.CLOSE_TAB
+-                                        : ActionType.EXIT_APP;
++                                        : ActionType.CLOSE_TAB;
+                             }
+ 
+                             @Override
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -398,7 +398,7 @@
+@@ -404,7 +404,7 @@
      No recent activities
    </message>
    <message name="IDS_EXTENSIONS_NO_INSTALLED_ITEMS" desc="The message shown to the user on the Extensions settings page when there are no extensions or apps installed.">
@@ -9205,7 +9236,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
    </message>
    <message name="IDS_EXTENSIONS_NO_DESCRIPTION" desc="The message shown to the user when an extension does not have any description.">
      No description provided
-@@ -536,7 +536,7 @@
+@@ -542,7 +542,7 @@
      My extensions
    </message>
    <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar of the chrome://extensions page to open the Chrome Web Store to get more extensions.">
@@ -13171,7 +13202,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
-@@ -1914,6 +1914,7 @@ static_library("browser") {
+@@ -1872,6 +1872,7 @@ static_library("browser") {
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
      "//build/config/linux/dbus:buildflags",
@@ -13182,15 +13213,128 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 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
-@@ -1340,7 +1340,7 @@ public abstract class ChromeFeatureList {
-     public static final MutableFlagWithSafeDefault sSuppressToolbarCapturesAtGestureEnd =
-             newMutableFlagWithSafeDefault(SUPPRESS_TOOLBAR_CAPTURES_AT_GESTURE_END, false);
-     public static final MutableFlagWithSafeDefault sSwapNewTabAndNewTabInGroupAndroid =
--            newMutableFlagWithSafeDefault(SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID, false);
-+            newMutableFlagWithSafeDefault(SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID, true);
-     public static final MutableFlagWithSafeDefault sTabArchivalDragDropAndroid =
-             newMutableFlagWithSafeDefault(TAB_ARCHIVAL_DRAG_DROP_ANDROID, true);
-     public static final MutableFlagWithSafeDefault sTabCollectionAndroid =
+@@ -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 {
+                 @Override
+                 public void onConfigurationChanged(Configuration configuration) {
+                     int screenWidthDp = configuration.screenWidthDp;
+-                    boolean isTablet = HubUtils.isScreenWidthTablet(screenWidthDp);
++                    boolean isTablet = true; //HubUtils.isScreenWidthTablet(screenWidthDp);
+                     mPropertyModel.set(BACK_BUTTON_VISIBLE, isTablet);
+ 
+                     Pane pane = mPaneManager.getFocusedPaneSupplier().get();
+diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
+--- a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
++++ b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
+@@ -38,33 +38,20 @@ found in the LICENSE file.
+         android:layout_width="wrap_content"
+         android:layout_height="match_parent"
+         android:layout_gravity="start|center_vertical">
+-
+-        <Space
+-          android:id="@+id/margin_spacer"
+-          android:layout_width="@dimen/hub_toolbar_action_button_start_margin"
+-          android:layout_height="match_parent"
+-          android:visibility="gone"/>
+-
+-        <org.chromium.ui.widget.ChromeImageButton
+-          android:id="@+id/toolbar_back_button"
+-          android:src="@drawable/ic_arrow_back_24dp"
+-          android:layout_width="@dimen/min_touch_target_size"
+-          android:layout_height="@dimen/min_touch_target_size"
+-          android:layout_gravity="center"
+-          android:layout_marginStart="4dp"
+-          android:contentDescription="@string/back"
+-          android:tooltipText="@string/back"
+-          android:visibility="gone"
+-          style="@style/ToolbarMenuButton"
+-          app:tint="@color/default_icon_color_tint_list"/>
+-
+-        <Button
+-          android:id="@+id/toolbar_action_button"
+-          android:layout_width="wrap_content"
+-          android:layout_height="match_parent"
+-          android:layout_gravity="start|center_vertical"
+-          android:visibility="gone"
+-          style="?attr/newTabButtonStyle"/>
++          <Space
++            android:layout_width="@dimen/hub_toolbar_action_button_start_margin"
++            android:layout_height="match_parent"/>
++          <org.chromium.ui.widget.ChromeImageButton
++            android:id="@+id/search_loupe"
++            android:visibility="gone"
++            android:gravity="center_vertical"
++            android:layout_width="44dp"
++            android:layout_height="match_parent"
++            android:contentDescription="@string/search"
++            android:src="@drawable/ic_search"
++            android:tooltipText="@string/accessibility_search_loupe_tooltip_text"
++            style="@style/ToolbarMenuButton"
++            app:tint="@color/default_icon_color_tint_list" />
+       </LinearLayout>
+ 
+       <FrameLayout
+@@ -96,18 +83,39 @@ found in the LICENSE file.
+         android:layout_width="wrap_content"
+         android:layout_height="match_parent"
+         android:layout_gravity="end" >
+-        <!-- On tablets, the searchbox (R.id.search_box) is hidden in favor of a button. -->
+-        <org.chromium.ui.widget.ChromeImageButton
+-            android:id="@+id/search_loupe"
++        <LinearLayout
++          android:orientation="horizontal"
++          android:layout_width="wrap_content"
++          android:layout_height="match_parent"
++          android:layout_gravity="start|center_vertical">
++
++          <org.chromium.ui.widget.ChromeImageButton
++            android:id="@+id/toolbar_back_button"
++            android:src="@drawable/ic_arrow_back_24dp"
++            android:layout_width="@dimen/min_touch_target_size"
++            android:layout_height="@dimen/min_touch_target_size"
++            android:layout_gravity="center"
++            android:layout_marginStart="4dp"
++            android:contentDescription="@string/back"
++            android:tooltipText="@string/back"
+             android:visibility="gone"
+-            android:gravity="center_vertical"
+-            android:layout_width="44dp"
+-            android:layout_height="match_parent"
+-            android:contentDescription="@string/search"
+-            android:src="@drawable/ic_search"
+-            android:tooltipText="@string/accessibility_search_loupe_tooltip_text"
+             style="@style/ToolbarMenuButton"
+-            app:tint="@color/default_icon_color_tint_list"  />
++            app:tint="@color/default_icon_color_tint_list"/>
++
++          <Button
++            android:id="@+id/toolbar_action_button"
++            android:layout_width="wrap_content"
++            android:layout_height="match_parent"
++            android:layout_gravity="start|center_vertical"
++            android:visibility="gone"
++            style="?attr/newTabButtonStyle"/>
++
++          <Space
++            android:id="@+id/margin_spacer"
++            android:layout_width="@dimen/hub_toolbar_action_button_start_margin"
++            android:layout_height="match_parent"
++            android:visibility="gone"/>
++        </LinearLayout>
+         <include layout="@layout/menu_button" />
+       </LinearLayout>
+ 
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
@@ -13225,7 +13369,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"
-@@ -281,10 +282,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -289,10 +290,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
      const base::FilePath& profile_path) {
    std::string seed;
    CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13271,7 +13415,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
        #menu {
          color: var(--google-grey-700);
          display: flex;
-@@ -164,7 +176,7 @@
+@@ -176,7 +188,7 @@
          </a>
          <a role="menuitem" id="about-menu" href="/help"
              class="cr-nav-menu-item">
@@ -13280,10 +13424,35 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
            $i18n{aboutPageTitle}
            <cr-ripple></cr-ripple>
          </a>
+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 {
+         // Omnibox.
+         // Making the container `clickable=true` achieves similar goal, but this consumes all
+         // activators, including keyboard <Enter> key.
+-        super.onTouchEvent(event);
+-        return true;
++        if (KeyboardUtils.isAndroidSoftKeyboardShowing(this)) {
++            KeyboardUtils.hideAndroidSoftKeyboard(this);
++            return true;
++        }
++        return false;
+     }
+ 
+     private void maybeUpdateLayoutParams(int topMargin) {
 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
-@@ -2389,7 +2389,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2344,7 +2344,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">
@@ -13292,6 +13461,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
+@@ -5536,7 +5536,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
@@ -13315,7 +13493,7 @@ diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
  #if BUILDFLAG(IS_CHROMEOS)
  inline constexpr char kChromeOsHelpViaWebUIURL[] =
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -193,7 +193,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
      "chrome-untrusted://new-tab-page/";
  
  // The URL for the Chromium project used in the About dialog.
@@ -13339,7 +13517,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
-@@ -1005,7 +1005,7 @@
+@@ -1014,7 +1014,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]">
@@ -18244,6 +18422,17 @@ z-aP~TXJZ`-(Yg4YH}L#8=YM{CKWmuBV|oH(e6M*W+WLnfYBCzOQRGLiPvyZq6&Nv6
 z4G!>zy1hcOdP%7GG2>1P`Or}=o{p{?6G1~J{`Cl{gUX-*clf=;TVY)N<lVO9k)vG$
 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(
+ 
+ #if BUILDFLAG(IS_ANDROID)
+   if (omnibox::IsAndroidHub(input_.current_page_classification())) {
++    if ((true)) return provider->type() == AutocompleteProvider::TYPE_OPEN_TAB;
+     return provider->type() == AutocompleteProvider::TYPE_SEARCH ||
+            provider->type() == AutocompleteProvider::TYPE_OPEN_TAB ||
+            provider->type() == AutocompleteProvider::TYPE_BOOKMARK ||
 diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon b/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 --- a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 +++ b/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
@@ -18985,7 +19174,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
-@@ -568,19 +568,22 @@ void ResolveInvalidConfigurations() {
+@@ -571,19 +571,22 @@ void ResolveInvalidConfigurations() {
         base::FeatureList::IsEnabled(
             features::kPrivacySandboxAdsAPIsM1Override)) &&
        !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -19012,7 +19201,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 << "="
-@@ -588,12 +591,14 @@ void ResolveInvalidConfigurations() {
+@@ -591,12 +594,14 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableFeatureFromString(
          "FencedFramesLocalUnpartitionedDataAccess", false);
    }
@@ -19028,7 +19217,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.";
-@@ -601,30 +606,23 @@ void ResolveInvalidConfigurations() {
+@@ -604,30 +609,23 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
      WebRuntimeFeatures::EnableTopicsImgAPI(false);
    } else {
@@ -19065,7 +19254,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "AttributionReporting cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -632,23 +630,25 @@ void ResolveInvalidConfigurations() {
+@@ -635,23 +633,25 @@ void ResolveInvalidConfigurations() {
          << " in addition.";
      WebRuntimeFeatures::EnableAttributionReporting(false);
    }
@@ -19099,8 +19288,9 @@ diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/C
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kSwapNewTabAndNewTabInGroupAndroid);
+@@ -0,0 +1,2 @@
++SET_CROMITE_FEATURE_ENABLED(kAndroidTabDeclutterArchiveAllButActiveTab);
++SET_CROMITE_FEATURE_ENABLED(kGridTabSwitcherUpdate);
 diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
 --- a/tools/grit/grit/grd_reader.py
 +++ b/tools/grit/grit/grd_reader.py

build/patches/Customize-selection-popup.patch

@@ -37,7 +37,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
-@@ -884,10 +884,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -915,10 +915,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
@@ -62,7 +62,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
-@@ -258,6 +258,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -249,6 +249,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
          // Skip opening a new Tab if it doesn't make sense.
          if (mTab.isClosing()) return false;
  
@@ -77,13 +77,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
          WindowAndroid window = mTab.getWindowAndroid();
          boolean openingPopup =
                  window != null
-@@ -288,7 +296,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -279,7 +287,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
                          mTab,
                          /* shouldPin= */ false,
                          webContents,
 -                        TabLaunchType.FROM_LONGPRESS_FOREGROUND,
 +                        tabLaunchType,
-                         url,
+                         targetUrl,
                          !openingPopup && !willReparentTab);
          if (tab == null) return false;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
@@ -97,7 +97,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  import org.chromium.base.ObserverList;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.supplier.ObservableSupplier;
-@@ -246,6 +247,13 @@ public class LayoutManagerImpl
+@@ -247,6 +248,13 @@ public class LayoutManagerImpl
                                                  != TabLaunchType
                                                          .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);
@@ -114,7 +114,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
-@@ -385,8 +385,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -390,8 +390,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
      public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
          loadUrlParams.setReferrer(referrer);
@@ -133,14 +133,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 --- 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;
- import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
+ import org.chromium.base.DeviceInfo;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -842,11 +843,16 @@ public class RootUiCoordinator
+@@ -910,11 +911,16 @@ public class RootUiCoordinator
                      TrackerFactory.getTrackerForProfile(tab.getProfile())
                              .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  
@@ -200,7 +200,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
-@@ -79,4 +79,28 @@ found in the LICENSE file.
+@@ -74,4 +74,28 @@ found in the LICENSE file.
          android:key="disable_toolbar_swipeup"
          android:title="@string/disable_toolbar_swipe_up" />
  
@@ -232,7 +232,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/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
-@@ -27,6 +27,7 @@ import androidx.core.content.ContextCompat;
+@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat;
  import org.chromium.base.ApiCompatibilityUtils;
  import org.chromium.base.ContextUtils;
  import org.chromium.base.Log;
@@ -240,7 +240,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
  import org.chromium.base.PackageManagerUtils;
  import org.chromium.base.StrictModeContext;
  import org.chromium.build.annotations.NullMarked;
-@@ -54,38 +55,84 @@ import java.util.TreeSet;
+@@ -53,38 +54,84 @@ import java.util.TreeSet;
  public class SelectActionMenuHelper {
      private static final String TAG = "SelectActionMenu"; // 20 char limit.
  
@@ -355,16 +355,16 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
      }
  
      @Retention(RetentionPolicy.SOURCE)
-@@ -196,7 +243,7 @@ public class SelectActionMenuHelper {
+@@ -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());
-         View.OnClickListener clickListener = null;
-         if (classificationResult.onClickListener != null) {
-             clickListener = classificationResult.onClickListener;
-@@ -223,7 +270,7 @@ public class SelectActionMenuHelper {
+         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(
@@ -373,7 +373,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
          List<SelectionMenuItem.Builder> menuItemBuilders = new ArrayList<>();
          menuItemBuilders.add(cut(delegate.canCut()));
          menuItemBuilders.add(copy(delegate.canCopy()));
-@@ -251,7 +298,7 @@ public class SelectActionMenuHelper {
+@@ -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 =
@@ -382,7 +382,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
  
          if (selectedText.isEmpty() && selectionActionMenuDelegate != null) {
              List<SelectionMenuItem> additionalMenuItems =
-@@ -313,7 +360,7 @@ public class SelectActionMenuHelper {
+@@ -311,7 +358,7 @@ public class SelectActionMenuHelper {
          SelectionMenuGroup textProcessingItems =
                  new SelectionMenuGroup(
                          R.id.select_action_menu_text_processing_items,
@@ -391,7 +391,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
          if (isSelectionPassword || intentHandler == null) {
              addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
              return textProcessingItems;
-@@ -415,7 +462,7 @@ public class SelectActionMenuHelper {
+@@ -420,7 +467,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_cut)
                  .setIconAttr(android.R.attr.actionModeCutDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
@@ -400,7 +400,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -427,7 +474,7 @@ public class SelectActionMenuHelper {
+@@ -432,7 +479,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_copy)
                  .setIconAttr(android.R.attr.actionModeCopyDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
@@ -409,7 +409,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -439,7 +486,7 @@ public class SelectActionMenuHelper {
+@@ -444,7 +491,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_paste)
                  .setIconAttr(android.R.attr.actionModePasteDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
@@ -418,7 +418,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -453,7 +500,7 @@ public class SelectActionMenuHelper {
+@@ -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)
@@ -427,7 +427,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -465,7 +512,7 @@ public class SelectActionMenuHelper {
+@@ -470,7 +517,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_select_all)
                  .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
@@ -436,7 +436,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -477,7 +524,7 @@ public class SelectActionMenuHelper {
+@@ -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)
@@ -445,7 +445,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                          .setShowAsActionFlags(
                                  MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                          .setIsEnabled(isEnabled);
-@@ -497,7 +544,7 @@ public class SelectActionMenuHelper {
+@@ -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)

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

@@ -10,24 +10,25 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/layout/url_bar.xml    |  1 +
- .../browser/omnibox/LocationBarMediator.java  | 13 ++++++++--
+ .../browser/omnibox/LocationBarMediator.java  | 14 ++++++++---
  .../chrome/browser/omnibox/UrlBar.java        | 24 +++++++++++++++++++
- 3 files changed, 36 insertions(+), 2 deletions(-)
+ 3 files changed, 36 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
 --- a/chrome/android/java/res/layout/url_bar.xml
 +++ b/chrome/android/java/res/layout/url_bar.xml
-@@ -15,5 +15,6 @@ found in the LICENSE file.
+@@ -16,6 +16,7 @@ found in the LICENSE file.
      android:singleLine="true"
      android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
      android:textAppearance="@style/TextAppearance.SearchBoxText"
 +    android:inputType="textUri"
      android:hint="@string/omnibox_empty_hint"
-     android:importantForAutofill="no"/>
+     app:layout_constraintStart_toEndOf="@id/location_bar_status"
+     app:layout_constraintEnd_toStartOf="@id/url_action_container"
 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
-@@ -307,8 +307,17 @@ class LocationBarMediator
+@@ -331,8 +331,17 @@ class LocationBarMediator
              if (!mUrlFocusedWithPastedText
                      && !shouldRetainOmniboxOnFocus
                      && mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -36,7 +37,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +                UrlBarData data = mLocationBarDataProvider.getUrlBarData();
 +                @SelectionState int selectionState = SelectionState.SELECT_ALL;
 +                GURL url = mLocationBarDataProvider.getUrlBarData().url;
-+                if (url != null && mTemplateUrlServiceSupplier.hasValue()) {
++                if (url != null && mTemplateUrlServiceSupplier.get() != null) {
 +                    String searchParams =
 +                        mTemplateUrlServiceSupplier.get().getSearchQueryForUrl(url);
 +                    if (searchParams != null && !searchParams.isEmpty()) {
@@ -47,6 +48,14 @@ 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
+         mUrlCoordinator.setKeyboardVisibility(true, false);
+     }
+ 
+-
+     // UrlBarDelegate implementation.
+ 
+     @Override
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -58,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;
-@@ -115,6 +116,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText {
      private boolean mAllowFocus = true;
      private boolean mShouldSendTypingStartedEvent;
  
@@ -66,7 +75,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private boolean mPendingScroll;
      private boolean mIsInCct;
  
-@@ -352,6 +354,28 @@ public class UrlBar extends AutocompleteEditText {
+@@ -345,6 +347,28 @@ public class UrlBar extends AutocompleteEditText {
          fixupTextDirection();
  
          mShouldSendTypingStartedEvent = focused;

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

@@ -27,22 +27,22 @@ 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
-@@ -8,6 +8,11 @@ found in the LICENSE file.
- <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                   xmlns:app="http://schemas.android.com/apk/res-auto">
+@@ -11,6 +11,11 @@ found in the LICENSE file.
+         android:key="zoom_info"
+         android:title="@string/zoom_info_preference_title"/>
  
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="enable_accessibility"
 +        android:summary="@string/enable_accessibility_summary"
 +        android:title="@string/enable_accessibility_title" />
 +
-     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
-         android:key="page_zoom_default_zoom"
-         android:selectable="false" />
+     <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+         android:key="page_zoom_include_os_adjustment"
+         android:summary="@string/page_zoom_include_os_adjustment_summary"
 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
-@@ -1125,6 +1125,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1134,6 +1134,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
@@ -38,7 +53,7 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
  import org.chromium.chrome.browser.flags.ChromeSwitches;
 +import org.chromium.components.policy.AppRestrictionsProvider;
  
- import java.util.LinkedList;
+ import java.util.ArrayDeque;
  import java.util.List;
 @@ -113,6 +114,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
              new AsyncTask<OwnedState>() {
@@ -54,10 +69,10 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
-@@ -26,6 +26,7 @@ android_library("java") {
-     "//build:chromeos_buildflags",
+@@ -28,6 +28,7 @@ android_library("java") {
      "//build/android:build_java",
      "//chrome/browser/preferences:java",
+     "//content/public/android:content_main_dex_java",
 +    "//components/policy/android:policy_java",
      "//third_party/android_deps:guava_android_java",
      "//third_party/androidx:androidx_annotation_annotation_java",

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

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -106,7 +106,8 @@ for the previous order (main_preferences_legacy). -->
+@@ -96,7 +96,8 @@ found in the LICENSE file.
          android:fragment="org.chromium.chrome.browser.tasks.tab_management.TabsSettings"
          android:key="tabs"
          android:order="18"

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
-@@ -397,7 +397,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -403,7 +403,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
              feature_name.Value().Utf8()) &&
          guard.Release()) {
        stream.ConsumeWhitespace();
@@ -28,7 +28,7 @@ diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
-@@ -578,7 +578,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+@@ -520,7 +520,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
      HeapVector<CSSSelector> arena;
      CSSPropertyValueSet* empty_properties =
          ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),

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
-@@ -1288,7 +1288,7 @@
+@@ -1326,7 +1326,7 @@
      },
      {
        name: "CSSDynamicRangeLimit",

build/patches/Disable-Compose-feature.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/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8414,6 +8414,12 @@ static_library("browser") {
+@@ -8435,6 +8435,12 @@ static_library("browser") {
      deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
    }
  
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    if (enable_compose) {
      sources += [
        "compose/chrome_compose_client.cc",
-@@ -8429,7 +8435,6 @@ static_library("browser") {
+@@ -8450,7 +8456,6 @@ static_library("browser") {
      ]
  
      deps += [
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "//chrome/common/compose",
        "//chrome/common/compose:mojo_bindings",
        "//components/autofill/content/browser",
-@@ -8888,7 +8893,7 @@ source_set("font_pref") {
+@@ -8870,7 +8875,7 @@ source_set("font_pref") {
    deps = [ "//chrome/common" ]
  }
  
@@ -46,7 +46,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 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
-@@ -352,7 +352,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -351,7 +351,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
        base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
  
  #if BUILDFLAG(ENABLE_COMPOSE)
@@ -58,9 +58,9 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui
 diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc
 --- a/components/compose/core/browser/compose_features.cc
 +++ b/components/compose/core/browser/compose_features.cc
-@@ -104,4 +104,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
-              "ComposeUpfrontInputModes",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -73,4 +73,6 @@ BASE_FEATURE(kComposeAllowOnDeviceExecution, base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+ BASE_FEATURE(kComposeUpfrontInputModes, base::FEATURE_ENABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
 +SET_CROMITE_FEATURE_DISABLED(kComposeEligible);

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

@@ -4,27 +4,28 @@ Subject: Disable Compression Dictionary Transport
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../blink/renderer/platform/runtime_enabled_features.json5  | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ chrome/browser/chrome_content_browser_client.cc                | 3 +--
+ .../features_cc/Disable-Compression-Dictionary-Transport.inc   | 1 +
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc
 
-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
-@@ -1031,12 +1031,14 @@
-       }
-     },
-     {
--      name: "CompressionDictionaryTransport",
-+      name: "CompressionDictionaryTransport", // need to be disabled
-+      status: "experimental",
-       base_feature: "none",
-       public: true,
-     },
-     {
--      name: "CompressionDictionaryTransportBackend",
-+      name: "CompressionDictionaryTransportBackend", // need to be disabled
-+      status: "experimental",
-       base_feature: "none",
-       public: true,
-     },
+diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
+--- a/chrome/browser/chrome_content_browser_client.cc
++++ b/chrome/browser/chrome_content_browser_client.cc
+@@ -1467,8 +1467,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+   registry->RegisterBooleanPref(prefs::kSandboxExternalProtocolBlocked, true);
+   registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true);
+   registry->RegisterListPref(prefs::kSSLErrorOverrideAllowedForOrigins);
+-  registry->RegisterBooleanPref(prefs::kCompressionDictionaryTransportEnabled,
+-                                true);
++  registry->RegisterBooleanPref(prefs::kCompressionDictionaryTransportEnabled, false);
+ #if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
+   registry->RegisterBooleanPref(prefs::kTranslatorAPIAllowed, true);
+ #endif
+diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kCompressionDictionaryTransport);
 --

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
-@@ -166,6 +166,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
+@@ -154,6 +154,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;
-@@ -361,6 +362,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
+@@ -349,6 +350,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
  void DeviceServiceImpl::GetDeviceAttribute(
      void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback),
      DeviceAttributeCallback callback) {

build/patches/Disable-FedCm.patch

@@ -39,7 +39,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
-@@ -2093,7 +2093,7 @@
+@@ -2143,7 +2143,7 @@
      {
        name: "FedCm",
        public: true,

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

@@ -5,19 +5,19 @@ Subject: Disable GSA by default
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../src/org/chromium/base/PackageUtils.java   |  1 +
- .../chrome/browser/IntentHandler.java         |  6 ----
+ .../chrome/browser/IntentHandler.java         |  7 ----
  .../chrome/browser/share/LensUtils.java       | 14 ++------
  .../chromium/chrome/browser/gsa/GSAUtils.java | 34 +++----------------
  .../GoogleBottomBarActionsHandler.java        | 19 ++---------
  .../chrome/browser/pdf/PdfCoordinator.java    |  2 +-
  .../Disable-GSA-by-default.inc                |  1 +
- 7 files changed, 12 insertions(+), 65 deletions(-)
+ 7 files changed, 12 insertions(+), 66 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc
 
 diff --git a/base/android/java/src/org/chromium/base/PackageUtils.java b/base/android/java/src/org/chromium/base/PackageUtils.java
 --- a/base/android/java/src/org/chromium/base/PackageUtils.java
 +++ b/base/android/java/src/org/chromium/base/PackageUtils.java
-@@ -165,6 +165,7 @@ public class PackageUtils {
+@@ -185,6 +185,7 @@ public class PackageUtils {
       * @return Package name of assistant app, or null if unable to get.
       */
      public static @Nullable String getDefaultAssistantPackageName(Context context) {
@@ -28,7 +28,7 @@ diff --git a/base/android/java/src/org/chromium/base/PackageUtils.java b/base/an
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
-@@ -47,7 +47,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -49,7 +49,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -36,37 +36,45 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.pdf.PdfUtils;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -293,9 +292,6 @@ public class IntentHandler {
- 
-     public static final String EXTRA_CCT_EARLY_NAV = "org.chromium.chrome.browser.cct_early_nav";
+@@ -303,9 +302,6 @@ public class IntentHandler {
+     public static final String EXTRA_TIPS_NOTIFICATION_FEATURE_TYPE =
+             "org.chromium.chrome.browser.tips_notification_feature_type";
  
 -    /** The package name for the Google Search App. */
 -    public static final String PACKAGE_GSA = GSAUtils.GSA_PACKAGE_NAME;
 -
-     private static Pair<Integer, String> sPendingReferrer;
+     /** Action to launch the Chrome Item Picker UI, e.g.: tabs. */
+     public static final String EXTRA_OPEN_CHROME_ITEM_PICKER =
+             "org.chromium.chrome.browser.actions.open_chrome_item_picker";
+@@ -313,7 +309,6 @@ public class IntentHandler {
+     /** Optional extra for the maximum number of items the user can select. */
+     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 String sPendingIncognitoUrl;
-@@ -588,8 +584,6 @@ public class IntentHandler {
+     private static @Nullable String sPendingIncognitoUrl;
+@@ -566,8 +561,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
-         } else if (packageName.equals(PACKAGE_WHATSAPP)) {
+         } else if (PACKAGE_WHATSAPP.equals(packageName)) {
              return ExternalAppId.WHATSAPP;
--        } else if (packageName.equals(PACKAGE_GSA)) {
+-        } else if (PACKAGE_GSA.equals(packageName)) {
 -            return ExternalAppId.GSA;
-         } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) {
+         } else if (ContextUtils.getApplicationContext().getPackageName().equals(packageName)) {
              return ExternalAppId.CHROME;
-         } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {
+         } else if (assumeNonNull(packageName).startsWith(WEBAPK_PACKAGE_PREFIX)) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
-@@ -9,7 +9,6 @@ import android.content.Context;
- import org.chromium.base.ResettersForTesting;
+@@ -10,7 +10,6 @@ import org.chromium.base.ResettersForTesting;
+ import org.chromium.build.annotations.NullMarked;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
 -import org.chromium.chrome.browser.gsa.GSAUtils;
  import org.chromium.components.externalauth.ExternalAuthUtils;
  
  /** This class provides utilities for intenting into Google Lens. */
-@@ -48,12 +47,7 @@ public class LensUtils {
+@@ -50,12 +49,7 @@ public class LensUtils {
              if (context == null) {
                  return "";
              }
@@ -79,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
          }
      }
  
-@@ -76,15 +70,11 @@ public class LensUtils {
+@@ -78,15 +72,11 @@ public class LensUtils {
       * @return Whether the package is valid.
       */
      public static boolean isValidAgsaPackage() {
@@ -186,7 +194,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
  import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_HOME;
  import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_LENS;
  import static org.chromium.chrome.browser.ui.google_bottom_bar.GoogleBottomBarLogger.GoogleBottomBarButtonEvent.SEARCHBOX_SEARCH;
-@@ -105,11 +102,6 @@ class GoogleBottomBarActionsHandler {
+@@ -106,11 +103,6 @@ class GoogleBottomBarActionsHandler {
      }
  
      void onSearchboxMicTap() {
@@ -198,7 +206,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
      }
  
      void onSearchboxLensTap(View buttonView) {
-@@ -148,21 +140,13 @@ class GoogleBottomBarActionsHandler {
+@@ -149,21 +141,13 @@ class GoogleBottomBarActionsHandler {
      }
  
      private void openGoogleAppSearch() {
@@ -221,7 +229,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
          intent.putExtra(EXTRA_IS_LAUNCHED_FROM_CHROME_SEARCH_ENTRYPOINT, true);
  
          if (PackageManagerUtils.canResolveActivity(intent)) {
-@@ -274,6 +258,7 @@ class GoogleBottomBarActionsHandler {
+@@ -275,6 +259,7 @@ class GoogleBottomBarActionsHandler {
      }
  
      private void sendPendingIntentWithUrl(PendingIntent pendingIntent) {

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
-@@ -2795,9 +2795,8 @@
+@@ -2886,9 +2886,8 @@
        status: "stable",
      },
      {

build/patches/Disable-Paint-Preview-by-default.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/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
-@@ -118,7 +118,7 @@ public class StartupPaintPreviewHelper implements Destroyable {
+@@ -119,7 +119,7 @@ public class StartupPaintPreviewHelper implements Destroyable {
  
      /** Enables Paint Preview show attempt on restoration of a tab. */
      public static void enableShowOnRestore() {

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
-@@ -326,8 +326,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -325,8 +325,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
    bool show_privacy_guide =

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        | 11 -----------
- .../browser/ui/webui/searchbox/searchbox_handler.cc   |  1 +
- components/search/ntp_features.cc                     |  6 +++---
- 4 files changed, 5 insertions(+), 15 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc           |  2 +-
+ chrome/browser/resources/new_tab_page/app.html  | 17 -----------------
+ .../ui/webui/searchbox/searchbox_handler.cc     |  1 +
+ components/search/ntp_features.cc               |  4 ++--
+ 4 files changed, 4 insertions(+), 20 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
-@@ -2272,7 +2272,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2417,7 +2417,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,56 +25,60 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 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
-@@ -21,17 +21,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
-       .theme="${this.theme_}" ?hidden="${!this.logoEnabled_}">
-   </ntp-logo>
+@@ -40,23 +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_()}"
+-        placeholder-text="$i18n{searchBoxPlaceholder}"
 -        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
--        @open-composebox="${this.toggleComposebox_}"
+-        @open-composebox="${this.openComposebox_}"
 -        @open-lens-search="${this.onOpenLensSearch_}"
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
 -        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
 -        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
 -        ?compose-button-enabled="${this.composeButtonEnabled}"
--        ?composebox-enabled="${this.composeboxEnabled}">
+-        ?composebox-enabled="${this.composeboxEnabled}"
+-        realbox-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_}">
 -    </cr-searchbox>
      ${this.showComposebox_ ? html`
-       <ntp-composebox id="composebox" ?is_collapsible="false" @close-composebox="${this.closeComposebox_}">
-       </ntp-composebox>
+       <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
-@@ -452,6 +452,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+@@ -295,6 +295,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                              Profile* profile,
                                              bool enable_voice_search,
                                              bool enable_lens_search) {
 +  enable_lens_search = false;
-   // Embedders which are served from chrome-untrusted:// URLs should override
-   // this to false. The chrome.timeTicks capability that the metrics reporter
-   // depends on is not defined in chrome-untrusted environments and attempting
+   // The WebUI Omnibox code will override this to `true` to adjust various
+   // color and layout options.
+   source->AddBoolean("isTopChromeSearchbox", false);
 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
-@@ -127,7 +127,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
+@@ -106,7 +106,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
  
  // If enabled, logo will be shown.
  // This is a kill switch. Keep indefinitely.
--BASE_FEATURE(kNtpLogo, "NtpLogo", base::FEATURE_ENABLED_BY_DEFAULT);
-+BASE_FEATURE(kNtpLogo, "NtpLogo", base::FEATURE_DISABLED_BY_DEFAULT);
+-BASE_FEATURE(kNtpLogo, base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kNtpLogo, base::FEATURE_DISABLED_BY_DEFAULT);
  
  // If enabled, middle slot promo will be shown.
  // This is a kill switch. Keep indefinitely.
-@@ -186,8 +186,8 @@ BASE_FEATURE(kNtpModuleSignInRequirement,
+@@ -148,7 +148,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
+ 
  // If enabled, OneGoogleBar will be shown.
  // This is a kill switch. Keep indefinitely.
- BASE_FEATURE(kNtpOneGoogleBar,
--             "NtpOneGoogleBar",
--             base::FEATURE_ENABLED_BY_DEFAULT);
-+             "NtpOneGoogleBar",                   // disabled
-+             base::FEATURE_DISABLED_BY_DEFAULT);  // by default
+-BASE_FEATURE(kNtpOneGoogleBar, base::FEATURE_ENABLED_BY_DEFAULT);
++BASE_FEATURE(kNtpOneGoogleBar, base::FEATURE_DISABLED_BY_DEFAULT);
  
  // If enabled, outlook calendar module will be shown.
- BASE_FEATURE(kNtpOutlookCalendarModule,
+ BASE_FEATURE(kNtpOutlookCalendarModule, base::FEATURE_ENABLED_BY_DEFAULT);
 --

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

@@ -0,0 +1,28 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Wed, 29 Oct 2025 13:01:41 +0000
+Subject: Disable Sticky User Activation Across Same Origin Navigation
+
+Do not retains the user activation status after navigating
+from one page to another page of the same origin.
+It is currently not possible to remove activation once it has been granted.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../blink/renderer/platform/runtime_enabled_features.json5    | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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
+@@ -4800,8 +4800,8 @@
+     {
+       // Preserves the sticky user activation state after a page navigates to
+       // another same-origin page. https://crbug.com/433729626
+-      name: "StickyUserActivationAcrossSameOriginNavigation",
+-      status: "stable",
++      name: "StickyUserActivationAcrossSameOriginNavigation", status: "experimental", // disabled by default
++
+     },
+     {
+       name: "StorageBuckets",
+--

build/patches/Disable-TLS-resumption.patch

@@ -79,7 +79,7 @@ new file mode 100644
 diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 --- a/net/http/http_network_session.cc
 +++ b/net/http/http_network_session.cc
-@@ -222,6 +222,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
+@@ -218,6 +218,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
  
    next_protos_.push_back(NextProto::kProtoHTTP11);
  
@@ -90,7 +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
-@@ -86,6 +86,7 @@
+@@ -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"
@@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -372,6 +373,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
+@@ -378,6 +379,38 @@ base::TimeDelta GetAdditionalDelayForMainJob() {
  
  }  // namespace
  
@@ -137,9 +137,9 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
  
  QuicSessionRequest::~QuicSessionRequest() {
-@@ -2373,7 +2406,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
+@@ -2409,7 +2442,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
                cert_verifier_, transport_security_state_, sct_auditing_delegate_,
-               HostsFromOrigins(params_.origins_to_force_quic_on),
+               std::move(hostnames_to_allow_unknown_roots),
                key.network_anonymization_key),
 -          std::make_unique<quic::QuicClientSessionCache>(), this);
 +          std::make_unique<BromiteSessionCache>(), this);
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -700,6 +726,8 @@ int SSLClientSocketImpl::Init() {
+@@ -709,6 +735,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -192,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    }
  
    transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -985,6 +1013,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -986,6 +1014,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -228,7 +228,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
  
    // Measure TLS connections that implement the renegotiation_info and EMS
-@@ -1624,6 +1681,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1625,6 +1682,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {

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
-@@ -5317,8 +5317,7 @@
+@@ -5475,8 +5475,7 @@
        status: "stable",
      },
      {

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
-@@ -547,6 +547,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -550,6 +550,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
  
    WebRuntimeFeatures::EnableRemotePlayback(false);
  
@@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -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)
@@ -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
-@@ -159,6 +159,8 @@ GPU::GPU(NavigatorBase& navigator)
+@@ -161,6 +161,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();
  }
  
-@@ -436,6 +438,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -444,6 +446,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
-@@ -1747,6 +1747,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1800,6 +1800,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
-@@ -172,7 +172,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -180,7 +180,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                  false);
@@ -63,7 +63,7 @@ diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_c
 diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 --- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 +++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
-@@ -120,6 +120,7 @@ public class UserEducationHelper {
+@@ -119,6 +119,7 @@ public class UserEducationHelper {
      }
  
      private void showIph(Tracker tracker, IphCommand iphCommand) {

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

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/java/AndroidManifest.xml       |   4 -
  .../ChromeSiteSettingsDelegate.java           |   2 +
  .../k_anonymity_trust_token_getter.cc         |   2 +-
- .../settings/privacy_page/privacy_page.html   |   5 -
+ .../privacy_page/privacy_page_index.html      |   8 -
  chrome/browser/resources/settings/route.ts    |   2 +-
  .../site_settings_page/site_settings_page.ts  |   1 +
  .../aggregatable_trigger_config.cc            |   2 +-
@@ -46,14 +46,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(+), 430 deletions(-)
+ 35 files changed, 103 insertions(+), 433 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
-@@ -1354,6 +1354,7 @@ network::mojom::AttributionSupport
+@@ -1317,6 +1317,7 @@ network::mojom::AttributionSupport
  AwContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -61,7 +61,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:
-@@ -1372,6 +1373,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1335,6 +1336,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -73,7 +73,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
 diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
-@@ -177,7 +177,7 @@ public class AwSettings {
+@@ -202,7 +202,7 @@ public class AwSettings {
      private boolean mSpatialNavigationEnabled; // Default depends on device features.
      private boolean mEnableSupportedHardwareAcceleratedFeatures;
      private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
@@ -82,7 +82,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
  
      @SpeculativeLoadingAllowedFlags
      private int mSpeculativeLoadingAllowedFlags =
-@@ -1804,7 +1804,7 @@ public class AwSettings {
+@@ -1784,7 +1784,7 @@ public class AwSettings {
      public void setAttributionBehavior(@AttributionBehavior int behavior) {
          synchronized (mAwSettingsLock) {
              if (mAttributionBehavior != behavior) {
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
      <!--
-@@ -1179,9 +1178,6 @@ by a child template that "extends" this file.
+@@ -1188,9 +1187,6 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
          </activity>
  
@@ -136,21 +136,24 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c
        !identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin)) {
      std::move(callback).Run(std::nullopt);
      return;
-diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
---- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
-+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -588,11 +588,6 @@
-           </category-setting-exceptions>
-         </settings-subpage>
-       </template>
--      <template is="dom-if" route-path="/content/autoVerify" no-search>
--        <settings-subpage page-title="$i18n{siteSettingsAntiAbuse}">
--          <settings-anti-abuse-page></settings-anti-abuse-page>
--        </settings-subpage>
--      </template>
-       <template is="dom-if" route-path="/content/microphone" no-search>
-         <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}"
-             search-label="$i18n{siteSettingsAllSitesSearch}"
+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 @@
+     </settings-ar-page>
+   </template>
+ 
+-  <template is="dom-if" if="[[renderView_(
+-      routes_.SITE_SETTINGS_AUTO_VERIFY, currentRoute, inSearchMode)]]">
+-    <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,
 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
@@ -166,7 +169,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
 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
-@@ -62,6 +62,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
+@@ -66,6 +66,7 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
        route: routes.SITE_SETTINGS_AUTO_VERIFY,
        id: Id.ANTI_ABUSE,
        label: 'siteSettingsAntiAbuse',
@@ -189,9 +192,9 @@ diff --git a/components/attribution_reporting/aggregatable_trigger_config.cc b/c
 diff --git a/components/attribution_reporting/features.cc b/components/attribution_reporting/features.cc
 --- a/components/attribution_reporting/features.cc
 +++ b/components/attribution_reporting/features.cc
-@@ -13,4 +13,5 @@ BASE_FEATURE(kConversionMeasurement,
-              "ConversionMeasurement",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -11,4 +11,5 @@ namespace attribution_reporting::features {
+ // Controls whether the Conversion Measurement API infrastructure is enabled.
+ BASE_FEATURE(kConversionMeasurement, base::FEATURE_ENABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kConversionMeasurement);
  }  // namespace attribution_reporting::features
@@ -210,9 +213,9 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/embedder_support/origin_trials/features.cc b/components/embedder_support/origin_trials/features.cc
 --- a/components/embedder_support/origin_trials/features.cc
 +++ b/components/embedder_support/origin_trials/features.cc
-@@ -16,4 +16,5 @@ namespace embedder_support {
+@@ -15,4 +15,5 @@ namespace embedder_support {
+ // from the origin trial.
  BASE_FEATURE(kOriginTrialsSampleAPIThirdPartyAlternativeUsage,
-              "OriginTrialsSampleAPIThirdPartyAlternativeUsage",
               base::FEATURE_ENABLED_BY_DEFAULT);
 +SET_CROMITE_FEATURE_DISABLED(kOriginTrialsSampleAPIThirdPartyAlternativeUsage);
  }  // namespace embedder_support
@@ -264,7 +267,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
-@@ -821,11 +821,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
+@@ -807,11 +807,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
          headers->GetNormalizedHeader(
              attribution_reporting::kAttributionReportingRegisterTriggerHeader);
  
@@ -278,7 +281,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();
-@@ -1184,6 +1182,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -1166,6 +1164,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
      Registrations& registrations,
      HeaderPendingDecode pending_decode,
      Registrar registrar) {
@@ -299,7 +302,7 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
  #endif
  }
  
-@@ -348,6 +346,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -346,6 +344,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
      return;
    }
  
@@ -310,7 +313,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
-@@ -612,11 +612,7 @@ bool IsOperationAllowed(
+@@ -601,11 +601,7 @@ bool IsOperationAllowed(
  }
  
  std::unique_ptr<AttributionOsLevelManager> CreateOsLevelManager() {
@@ -345,7 +348,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
-@@ -159,6 +159,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
+@@ -155,6 +155,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
                                                  url::Origin origin,
                                                  std::string body,
                                                  UrlLoaderCallback callback) {
@@ -355,7 +358,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;
-@@ -234,6 +237,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -230,6 +233,12 @@ void AttributionReportNetworkSender::OnReportSent(
      ReportSentCallback sent_callback,
      UrlLoaderList::iterator it,
      scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -371,7 +374,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
-@@ -541,6 +541,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -539,6 +539,8 @@ void AssignSourceForDeactivationOrDeletion(
    }
  }
  
@@ -380,7 +383,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
  }  // namespace
  
  // static
-@@ -563,9 +565,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -561,9 +563,9 @@ bool AttributionStorageSql::Transaction::Commit() {
  AttributionStorageSql::AttributionStorageSql(
      const base::FilePath& user_data_directory,
      AttributionResolverDelegate* delegate)
@@ -396,7 +399,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
-@@ -10465,6 +10465,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
+@@ -10511,6 +10511,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
      return false;
    }
  
@@ -404,7 +407,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.
-@@ -14415,6 +14416,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
+@@ -14517,6 +14518,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
      return;
    }
  
@@ -424,7 +427,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
-@@ -1484,15 +1484,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1505,15 +1505,6 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -440,7 +443,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.
-@@ -1544,9 +1535,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1565,9 +1556,6 @@ void StoragePartitionImpl::Initialize(
  
    font_access_manager_ = FontAccessManager::Create();
  
@@ -453,7 +456,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
-@@ -205,8 +205,6 @@ android_library("content_full_java") {
+@@ -211,8 +211,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",
@@ -927,7 +930,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
-@@ -631,6 +631,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -639,6 +639,7 @@ void ContentBrowserClient::OnAuctionComplete(
  network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -935,7 +938,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;
-@@ -648,13 +649,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -656,13 +657,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -951,7 +954,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
  }
  
  bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -662,7 +663,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -670,7 +671,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
      content::RenderFrameHost* rfh,
      const url::Origin& context_origin,
      const url::Origin& reporting_origin) {
@@ -1005,7 +1008,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
-@@ -1318,6 +1318,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
+@@ -1316,6 +1316,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
  
  void NetworkContext::ClearTrustTokenSessionOnlyData(
      ClearTrustTokenSessionOnlyDataCallback callback) {
@@ -1016,7 +1019,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_);
-@@ -2731,26 +2735,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2759,26 +2763,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
      builder.set_network_quality_estimator(
          network_service_->network_quality_estimator());
    }
@@ -1065,7 +1068,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
-@@ -211,8 +211,6 @@ struct AttributionSrcLoader::AttributionHeaders {
+@@ -209,8 +209,6 @@ struct AttributionSrcLoader::AttributionHeaders {
                       uint64_t request_id)
        : web_source(map.Get(http_names::kAttributionReportingRegisterSource)),
          web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
@@ -1077,7 +1080,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
-@@ -1604,7 +1604,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1620,7 +1620,7 @@ void Page::UpdateBrowsingContextGroup(
  
  void Page::SetAttributionSupport(
      network::mojom::AttributionSupport attribution_support) {
@@ -1089,7 +1092,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
 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
-@@ -285,8 +285,8 @@
+@@ -301,8 +301,8 @@
      },
      {
        // Interest Group JS API/runtimeflag.
@@ -1100,7 +1103,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        origin_trial_feature_name: "AdInterestGroupAPI",
        implied_by: ["Fledge", "Parakeet"],
        public: true,
-@@ -558,8 +558,8 @@
+@@ -591,8 +591,8 @@
        status: "stable",
      },
      {
@@ -1111,7 +1114,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -3778,8 +3778,8 @@
+@@ -3893,8 +3893,8 @@
        base_feature: "none",
      },
      {
@@ -1122,7 +1125,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -4983,16 +4983,16 @@
+@@ -5149,16 +5149,16 @@
        status: "stable",
      },
      {

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
-@@ -2719,15 +2719,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2797,15 +2797,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
          base::NumberToString(pid));
    }
  #endif
@@ -31,7 +31,7 @@ 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
-@@ -16087,6 +16087,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -16198,6 +16198,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
  void RenderFrameHostImpl::MaybeGenerateCrashReport(
      base::TerminationStatus status,
      int exit_code) {
@@ -42,7 +42,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 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
-@@ -10263,7 +10263,7 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -10266,7 +10266,7 @@ void WebContentsImpl::RendererUnresponsive(
    base::UmaHistogramEnumeration(
        "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
  

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

@@ -20,7 +20,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
-@@ -1436,8 +1436,7 @@
+@@ -1484,8 +1484,7 @@
        status: "test",
      },
      {

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

@@ -83,7 +83,7 @@ diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/c
 diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
 --- a/components/feed/feed_feature_list.cc
 +++ b/components/feed/feed_feature_list.cc
-@@ -124,4 +124,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
+@@ -88,4 +88,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
           !base::FeatureList::IsEnabled(kWebFeedKillSwitch);
  }
  

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

@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -514,6 +514,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -501,6 +501,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
  
  content::OriginTrialsControllerDelegate*
  AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -73,7 +73,7 @@ diff --git a/android_webview/common/aw_content_client.cc b/android_webview/commo
 diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
 --- a/android_webview/nonembedded/BUILD.gn
 +++ b/android_webview/nonembedded/BUILD.gn
-@@ -106,7 +106,6 @@ android_library("services_java") {
+@@ -107,7 +107,6 @@ android_library("services_java") {
      "java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
      "java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
      "java/src/org/chromium/android_webview/services/AwNetLogService.java",
@@ -81,7 +81,7 @@ diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/
      "java/src/org/chromium/android_webview/services/ComponentUpdaterResetSafeModeAction.java",
      "java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java",
      "java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java",
-@@ -125,7 +124,6 @@ android_library("services_java") {
+@@ -126,7 +125,6 @@ android_library("services_java") {
      "java/src/org/chromium/android_webview/services/SafeModeService.java",
      "java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java",
      "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java",
@@ -157,7 +157,7 @@ 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
-@@ -930,7 +930,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
+@@ -924,7 +924,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
  
  void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
      network::mojom::NetworkContextParams* network_context_params) {
@@ -204,7 +204,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
 diff --git a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
 --- a/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
 +++ b/components/variations/android/java/src/org/chromium/components/variations/firstrun/VariationsSeedFetcher.java
-@@ -476,39 +476,13 @@ public class VariationsSeedFetcher {
+@@ -474,39 +474,13 @@ public class VariationsSeedFetcher {
       */
      public void fetchSeed(String restrictMode, String milestone, String channel) {
          assert !ThreadUtils.runningOnUiThread();
@@ -248,7 +248,7 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
      }
  
      private void recordFetchResultOrCode(int resultOrCode) {
-@@ -556,7 +530,7 @@ public class VariationsSeedFetcher {
+@@ -554,7 +528,7 @@ public class VariationsSeedFetcher {
       * @return the object holds the request result and seed data with its related header fields.
       */
      @SuppressWarnings("Finally")
@@ -272,7 +272,7 @@ diff --git a/components/variations/net/BUILD.gn b/components/variations/net/BUIL
 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
-@@ -248,6 +248,8 @@ class VariationsHeaderHelper {
+@@ -252,6 +252,8 @@ class VariationsHeaderHelper {
    VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
  
    bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
@@ -284,7 +284,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
 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
-@@ -127,6 +127,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
+@@ -126,6 +126,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
  }
  
  #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,8 +292,8 @@ 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
-@@ -320,9 +321,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
-         std::move(client_filterable_state));
+@@ -333,9 +334,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
+         metrics_state_manager->GetLowEntropySource());
    }
  
 -  platform_field_trials->SetUpClientSideFieldTrials(
@@ -302,15 +302,15 @@ 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));
-@@ -652,6 +650,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+@@ -666,6 +664,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
      base::FeatureList* feature_list,
-     SafeSeedManagerBase* safe_seed_manager,
+     SafeSeedManager* safe_seed_manager,
      std::unique_ptr<ClientFilterableState> client_state) {
 +  if ((true)) return CreateTrialsResult{.applied_seed = false};
-   // This histogram name uses "VariationsFieldTrialCreator" rather than
-   // "VariationsFieldTrialCreator" for consistency with historical data
    TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
-@@ -766,6 +765,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   CHECK(!create_trials_from_seed_called_);
+@@ -782,6 +781,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
  
  void VariationsFieldTrialCreator::LoadSeedFromJsonFile(
      const base::FilePath& json_seed_path) {
@@ -321,7 +321,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
@@ -345,7 +345,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
-@@ -626,7 +611,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -628,7 +613,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.
@@ -393,7 +393,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -843,6 +843,7 @@ void PersistOriginTrialsFromHeaders(
+@@ -842,6 +842,7 @@ void PersistOriginTrialsFromHeaders(
      const network::mojom::URLResponseHead* response,
      BrowserContext* browser_context,
      ukm::SourceId source_id) {
@@ -437,7 +437,7 @@ new file mode 100644
 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
-@@ -209,13 +209,6 @@ std::vector<int> CopyInitiatorOriginTrials(
+@@ -211,13 +211,6 @@ std::vector<int> CopyInitiatorOriginTrials(
      const Vector<mojom::blink::OriginTrialFeature>&
          initiator_origin_trial_features) {
    std::vector<int> result;

build/patches/Disable-idle-detection.patch

@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 --- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 +++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
-@@ -375,6 +375,7 @@
+@@ -380,6 +380,7 @@
      {
        name: "IdleDetection",
        permissions_policy_name: "idle-detection",
@@ -55,7 +55,7 @@ diff --git a/third_party/blink/renderer/modules/idle/idle_detector.idl b/third_p
 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
-@@ -223,6 +223,11 @@
+@@ -233,6 +233,11 @@
        name: "AcceleratedSmallCanvases",
        status: "stable",
      },

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

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -111,6 +111,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -101,6 +101,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
  }
  
  bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
  #if !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
    if (!base::FeatureList::IsEnabled(kMediaRouter)) {
      return false;
-@@ -158,7 +159,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -148,7 +149,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
    registry->RegisterBooleanPref(
        media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
        true);
-@@ -221,4 +222,7 @@ bool IsCastMessageLoggingEnabled() {
+@@ -211,4 +212,7 @@ bool IsCastMessageLoggingEnabled() {
  #endif  // !BUILDFLAG(IS_ANDROID) ||
          // BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
  
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -429,7 +429,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -428,7 +428,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
  
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 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
-@@ -540,6 +540,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -543,6 +543,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
      WebRuntimeFeatures::EnableV8IdleTasks(true);
    }
  
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.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
-@@ -3969,14 +3969,10 @@
+@@ -4095,14 +4095,10 @@
        base_feature: "none",
      },
      {

build/patches/Disable-minidump-upload-scheduling.patch

@@ -11,15 +11,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -485,7 +485,7 @@ void EndpointFetcher::OnResponseFetched(
-     }
+@@ -384,7 +384,7 @@ void EndpointFetcher::OnResponseFetched(
+     response->response = *response_body;
    } else {
      std::string net_error = net::ErrorToString(net_error_code);
 -    VLOG(1) << __func__ << " with response error: " << net_error;
 +    LOG(ERROR) << __func__ << " with response error: " << net_error;
      response->response = "There was a response error";
-     std::move(endpoint_fetcher_callback).Run(std::move(response));
    }
+   std::move(endpoint_fetcher_callback).Run(std::move(response));
 diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
 --- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
 +++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java