Bump to 138.0.7204.184

[AUTO][FILECONTROL] - version 138.0.7204.169 (#2226 )
[AUTO][FILECONTROL] - version 138.0.7204.169
2025-07-30 09:12:56 +02:00 · 2025-07-24 09:38:19 +03:00 · 2025-07-23 16:56:49 +10:00 · 2025-07-23 06:50:30 +00:00 · 2025-07-23 08:42:59 +02:00 · 2025-07-23 08:42:44 +02:00
880 changed files with 100524 additions and 86740 deletions
@@ -1 +1,2 @@
-*.zip binary
+*.zip binary
+*.pdf binary
@@ -84,6 +84,7 @@ jobs:
      - name: Building build-deps container ${{ env.VERSION }}
        shell: bash
        run: |
+          docker pull uazo/build-deps:$VERSION || true
          IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
            IS_PRESENT=$(./regctl image inspect uazo/build-deps:$VERSION > /dev/null ; echo $?)
@@ -100,6 +101,7 @@ jobs:
      - name: Building chromium container ${{ env.VERSION }}
        shell: bash
        run: |
+          docker pull uazo/chromium:$VERSION || true
          IS_PRESENT=$(docker inspect --type=image uazo/chromium:$VERSION > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
            IS_PRESENT=$(./regctl image inspect uazo/chromium:$VERSION > /dev/null ; echo $?)
@@ -115,6 +117,7 @@ jobs:
      - name: Building cromite container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
        shell: bash
        run: |
+          docker pull uazo/cromite:$VERSION-$CROMITE_SHA || true
          IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
            IS_PRESENT=$(./regctl image inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
@@ -130,6 +133,7 @@ jobs:
      - name: Building cromite-build container ${{ env.VERSION }}-${{ env.CROMITE_SHA }}
        shell: bash
        run: |
+          docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA || true
          IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
          if [ $IS_PRESENT -ne "0" ]; then
            IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?)
@@ -178,9 +182,9 @@ jobs:
        KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
        KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/arm64/kythe
        # cross build
-        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
-        WINDOWSSDKDIR: "/win_sdk/sdks/Win11SDK_10.0.22621.2428/Windows Kits/10/"
-        GYP_MSVS_OVERRIDE_PATH: /win_sdk/sdks/Win11SDK_10.0.22621.2428/
+        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/
        # compile in debug mode
        TARGET_ISDEBUG: ${{ github.event.inputs.debug }}
        TARGET_OS: ${{ github.event.inputs.target_os }}
@@ -246,6 +250,9 @@ jobs:
          gpg --homedir ./ -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch cromite.keystore.asc > cromite.keystore
          echo "::endgroup::"

+          # bootstrap python3 for gn
+          echo ../../../../../usr/bin >$WORKSPACE/depot_tools/python3_bin_reldir.txt
+
      - name: Build Cromite Android x64
        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
        shell: bash
@@ -427,5 +434,5 @@ jobs:
            gn gen --args="import(\"/home/lg/working_dir/cromite/build/cromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
            $WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \
              -t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
-            /home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \
+            /home/lg/working_dir/clangd_snapshot_20250518/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/arm64/cromite.idx && \
            rm -rf out/clangd
@@ -2,6 +2,11 @@ name: Update fdroid repo

 on:
  workflow_dispatch:
+    inputs:
+      type:
+        description: 'runner? [dev/ci]'
+        required: true
+        default: 'ci'

 env:
  REMOVEDOCKERSUPPORT: true
@@ -10,7 +15,7 @@ env:

 jobs:
  update-fdroid:
-    runs-on: ci2
+    runs-on: ${{ github.event.inputs.type }}

    container:
      image: uazo/fdroidserver:latest
@@ -50,10 +50,6 @@ The following files will be present for each release:
 - [arm_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/arm_ChromePublic.apk)
 - [x64_ChromePublic.apk](https://github.com/uazo/cromite/releases/latest/download/x64_ChromePublic.apk)

-#### Cromite System WebView apk for android:
- [arm64_SystemWebView.apk](https://github.com/uazo/cromite/releases/latest/download/arm64_SystemWebView.apk)
- [x64_SystemWebView.apk](https://github.com/uazo/cromite/releases/latest/download/x64_SystemWebView.apk)
-
 #### Linux package:
 - [chrome-lin64.tar.gz](https://github.com/uazo/cromite/releases/latest/download/chrome-lin64.tar.gz)

@@ -73,6 +69,10 @@ The following files will be present for each release:

 Additional files are also available: please note that these files are created by an [additional build](https://github.com/uazo/cromite/actions/workflows/build_additional_targets.yaml) separate from the release process, and therefore may not be immediately available.

+#### Cromite System WebView apk for android:
+- arm64_SystemWebView.apk
+- x64_SystemWebView.apk
+
 #### Vanilla Chromium for android (used for tests):
 - arm64_VanillaChromium.apk
 - arm_VanillaChromium.apk
@@ -185,7 +185,13 @@ thanks to [austinhuang0131](https://github.com/austinhuang0131) for the svg icon

 # Donate

-If you want, you can donate to support cromite development through [paypal](https://www.paypal.com/pools/c/9cwNgAQhRL).
+If you want, you can donate to support cromite development through [paypal](https://www.paypal.com/pools/c/9e5lO2OIzb).
+
+Current link:
+- https://www.paypal.com/pools/c/9e5lO2OIzb
+
+Historical fundraisings links:
+- https://www.paypal.com/pools/c/9cwNgAQhRL

 # License

@@ -1 +1 @@
-133.0.6943.127
+138.0.7204.184
@@ -0,0 +1,36 @@
+)]}'
+{
+	"response": {
+		"server": "prod",
+		"protocol": "3.1",
+		"app": [
+			{
+				"appid": "gcmjkmgdlgnkkcocmoeiminaijmmjnii",
+				"status": "ok",
+				"updatecheck": {
+					"status": "ok",
+					"urls": {
+						"url": [
+							{
+								"codebase": "https://www.cromite.org/components/"
+							}
+						]
+					},
+					"manifest": {
+						"version": "1.0.0",
+						"packages": {
+							"package": [
+								{
+									"hash_sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482",
+									"name": "fonts_component.zip",
+									"fp": "1.22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482",
+									"required": true
+								}
+							]
+						}
+					}
+				}
+			}
+		]
+	}
+}
@@ -0,0 +1,32 @@
+)]}' {
+	"response": {
+		"server": "prod",
+		"protocol": "4.0",
+		"apps": [
+			{
+				"appid": "gcmjkmgdlgnkkcocmoeiminaijmmjnii",
+				"status": "ok",
+				"updatecheck": {
+					"status": "ok",
+					"nextversion": "1.0.0",
+					"pipelines": [
+						{
+							"operations": [
+								{
+									"type": "download",
+									"urls": [ { "url": "https://www.cromite.org/components/fonts_component.zip" } ],
+									"out": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" },
+									"size": 60716451
+								},
+								{
+									"type": "crx3",
+									"in": { "sha256": "22639FA1B21D9D95E6343A6A58028B224903D23BA404537584A22236FCFC3482" }
+								}
+							]
+						}
+					]
+				}
+			}
+		]
+	}
+}
@@ -4,10 +4,8 @@ build_contextual_search=false
 build_with_tflite_lib=false
 chrome_pgo_phase=0
 dcheck_always_on=false
-dfmify_dev_ui=false
 disable_android_lint=true
 disable_fieldtrial_testing_config=true
-enable_gvr_services=false
 enable_hangout_services_extension=false
 enable_iterator_debugging=false
 enable_mdns=false
@@ -119,6 +117,9 @@ if (target_os == "android") {

  chrome_pgo_phase = 2 # enable pgo

+  # do not split Developer UI split into a separate Dynamic Feature Module
+  dfmify_dev_ui = false
+
  if (getenv("USE_KEYSTORE") != "") {
    android_keystore_path = "/home/lg/working_dir/cromite.keystore"
    android_keystore_name = "cromite"
@@ -136,6 +137,13 @@ if (target_os == "android") {
    symbol_level = 1
    strip_debug_info = false
    generate_linker_map = false
+
+    # Disable static analysis
+    android_static_analysis = "off"
+
+    # Turns off all V8 debug features. Disables running V8 in a pseudo debug mode
+    # bypass build error -5 in clang_x64/mksnapshot
+    v8_enable_debugging_features = false
  } else {
    generate_linker_map = true
  }
@@ -1,6 +1,9 @@
 Do-not-link-with-libatomic.patch
+Do-not-check-for-the-presence-of-use-remoteexec.patch
 bromite-build-utils.patch
 Add-cromite-flags-support.patch
+Force-use-vpython3-for-some-scripts.patch
+Permit-PGO-for-debug-builds.patch
 Fix-chromium-vanilla.patch
 Final-patch-for-chromium-vanilla.patch

@@ -170,7 +173,6 @@ Enable-third-party-storage-partitioning.patch
 Restore-adaptive-button-in-top-toolbar-customization.patch
 Add-kill-switch-for-unsupported-clangd-flags.patch

-# cromite patches
 WIN-enable-pdf-plugin.patch
 WIN-disable-annotate-downloads.patch
 Enable-HighEfficiencyMode-by-default.patch
@@ -292,6 +294,17 @@ Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
 Enable-Cert-Management-UI.patch
 Enable-ProcessBoundStringEncryption-by-default.patch
 Prevent-mouse-wheel-fingerprinting-on-Windows.patch
+Enable-component-updater.patch
+Android-fonts-fingerprinting-mitigation.patch
+Disable-Android-Tab-Declutter.patch
+Disable-CSSDynamicRangeLimit.patch
+Android-Import-Passwords.patch
+Disable-prefers-reduced-motion.patch
+Disable-css-preferred-text-scale.patch
+Disable-Viewport-Segments.patch
+Keep-disabled-cache-sharing-for-pervasive-scripts.patch
+High-Resolution-Timing-Mitigation.patch
+Temp-disable-UseContextSnapshot.patch

 # temporary or wip patches
 Temp-PerformanceNavigationTiming-privacy-fix.patch
@@ -301,14 +314,14 @@ 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
-Enable-component-updater.patch
-Android-fonts-fingerprinting-mitigation.patch
+Try-to-fix-2082.patch

 # adblock patches
-eyeo-beta-118.0.5993.48-base.patch
-eyeo-beta-118.0.5993.48-chrome_integration.patch
-eyeo-beta-118.0.5993.48-android_api.patch
-eyeo-beta-118.0.5993.48-android_settings.patch
-eyeo-beta-118.0.5993.48-extension_api.patch
+eyeo-133.0.6943.49-base.patch
+eyeo-133.0.6943.49-chrome_integration.patch
+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
@@ -31,8 +31,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 gpu/config/gpu_util.cc                           |  8 ++++++++
 gpu/config/gpu_workaround_list.txt               |  1 +
 gpu/ipc/service/gpu_init.cc                      |  8 ++++++++
- gpu/ipc/service/stream_texture_android.cc        | 10 +++++++++-
- 12 files changed, 87 insertions(+), 1 deletion(-)
+ media/gpu/android/video_frame_factory_impl.cc    |  4 +++-
+ 12 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
 create mode 100644 cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc

@@ -90,10 +90,10 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3219,6 +3219,10 @@
-     "name": "enable-identity-in-auth-error",
-     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
-     "expiry_milestone": 135
+@@ -3514,6 +3514,10 @@
+       "chrome-signin-team@google.com"
+     ],
+     "expiry_milestone": 138
 +  },{
 +    "name": "enable-image-reader",          // Bromite: do not expire
 +    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],  // flag
@@ -119,7 +119,7 @@ new file mode 100644
 diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json
 --- a/gpu/config/gpu_driver_bug_list.json
 +++ b/gpu/config/gpu_driver_bug_list.json
-@@ -2605,6 +2605,22 @@
+@@ -2613,6 +2613,22 @@
         "no_downscaled_overlay_promotion"
       ]
     },
@@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
+@@ -58,6 +58,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 #if BUILDFLAG(IS_ANDROID)
@@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -127,6 +127,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
 #if !BUILDFLAG(IS_ANDROID)
   return kGpuFeatureStatusDisabled;
 #else
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
   if (!gpu_preferences.enable_android_surface_control)
     return kGpuFeatureStatusDisabled;
 
-@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
+@@ -348,6 +351,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
           kGpuFeatureStatusSoftware;
     }
   }
@@ -196,7 +196,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
 --- a/gpu/config/gpu_workaround_list.txt
 +++ b/gpu/config/gpu_workaround_list.txt
-@@ -7,6 +7,7 @@ check_egl_fence_before_wait
+@@ -6,6 +6,7 @@ check_egl_fence_before_wait
 check_ycbcr_studio_g22_left_p709_for_nv12_support
 disable_2d_canvas_auto_flush
 disable_accelerated_av1_decode
@@ -207,7 +207,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
 diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -69,6 +69,7 @@
+@@ -70,6 +70,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "ui/gfx/android/android_surface_control_compat.h"
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 #endif
 
 #if BUILDFLAG(ENABLE_VULKAN)
-@@ -716,6 +717,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -687,6 +688,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
   }
 #endif  // BUILDFLAG(IS_WIN)
 
@@ -229,24 +229,21 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
           kGpuFeatureStatusEnabled ||
       !InitializeVulkan()) {
-diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc
--- a/gpu/ipc/service/stream_texture_android.cc
-+++ b/gpu/ipc/service/stream_texture_android.cc
-@@ -50,7 +50,15 @@ std::unique_ptr<ui::ScopedMakeCurrent> MakeCurrent(
- }
+diff --git a/media/gpu/android/video_frame_factory_impl.cc b/media/gpu/android/video_frame_factory_impl.cc
+--- a/media/gpu/android/video_frame_factory_impl.cc
+++ b/media/gpu/android/video_frame_factory_impl.cc
+@@ -35,10 +35,12 @@ namespace {
 
- TextureOwner::Mode GetTextureOwnerMode() {
-  return base::android::EnableAndroidImageReader()
-+  const bool a_image_reader_supported =
-+      base::android::AndroidImageReader::GetInstance().IsSupported();
-+
-+  // TODO(vikassoni) : Currently we have 2 different flags to enable/disable
-+  // AImageReader - one for MCVD and other for MediaPlayer here. Merge those 2
-+  // flags into a single flag. Keeping the 2 flags separate for now since finch
-+  // experiment using this flag is in progress.
-+  return a_image_reader_supported && base::android::EnableAndroidImageReader() &&
-+             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer)
-              ? TextureOwner::Mode::kAImageReaderInsecure
-              : TextureOwner::Mode::kSurfaceTextureInsecure;
- }
+ gpu::TextureOwner::Mode GetTextureOwnerMode(
+     VideoFrameFactory::OverlayMode overlay_mode) {
+  const bool enabled = base::android::EnableAndroidImageReader() &&
+             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer);
+   switch (overlay_mode) {
+     case VideoFrameFactory::OverlayMode::kDontRequestPromotionHints:
+     case VideoFrameFactory::OverlayMode::kRequestPromotionHints:
+-      return base::android::EnableAndroidImageReader()
+      return enabled
+                  ? gpu::TextureOwner::Mode::kAImageReaderInsecure
+                  : gpu::TextureOwner::Mode::kSurfaceTextureInsecure;
+     case VideoFrameFactory::OverlayMode::kSurfaceControlSecure:
 --
@@ -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
-@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -233,6 +233,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;
-@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -981,6 +982,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         super.onStartWithNative();
 
         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -51,31 +51,31 @@ 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
-@@ -157,6 +157,7 @@ public abstract class ChromeFeatureList {
- 
-     // Feature names.
-     /* Alphabetical: */
+@@ -162,6 +162,7 @@ public abstract class ChromeFeatureList {
+             "AccountForSuppressedKeyboardInsets";
+     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
+             "AdaptiveButtonInTopToolbarCustomizationV2";
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
             "AdaptiveButtonInTopToolbarPageSummary";
-     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
-@@ -616,6 +617,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
-             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
+     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
+@@ -680,6 +681,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidWindowPopupLargeScreen =
+             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);
     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
     public static final CachedFlag sAsyncNotificationManager =
             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
-     public static final CachedFlag sBlockIntentsWhileLocked =
-@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {
-     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
-             List.of(
+     public static final CachedFlag sAsyncNotificationManagerForDownload =
+@@ -941,6 +944,7 @@ public abstract class ChromeFeatureList {
+                     sAccountForSuppressedKeyboardInsets,
+                     sAllowTabClosingUponMinimization,
                     sAndroidAppIntegration,
 +                    sAllowUserCertificates,
                     sAndroidAppIntegrationModule,
+                     sAndroidAppIntegrationMultiDataSource,
                     sAndroidAppIntegrationV2,
-                     sNewTabPageCustomization,
 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
@@ -111,19 +111,19 @@ new file mode 100644
 diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
 --- a/net/android/java/src/org/chromium/net/X509Util.java
 +++ b/net/android/java/src/org/chromium/net/X509Util.java
-@@ -528,6 +528,8 @@ public class X509Util {
+@@ -537,6 +537,8 @@ public class X509Util {
         return userRootBytes.toArray(new byte[0][]);
     }
 
 +    public static boolean AllowUserCertificates = false;
 +
     public static AndroidCertVerifyResult verifyServerCertificates(
-             byte[][] certChain, String authType, String host)
-             throws KeyStoreException, NoSuchAlgorithmException {
-@@ -616,6 +618,9 @@ public class X509Util {
+             byte[][] certChain,
+             String authType,
+@@ -637,6 +639,9 @@ public class X509Util {
+                 X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);
                 isIssuedByKnownRoot = isKnownRoot(root);
             }
- 
 +            if (AllowUserCertificates == false && isIssuedByKnownRoot == false)
 +                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT);
 +
@@ -4,19 +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
 ---
- .../java/src/org/chromium/chrome/browser/KeyboardShortcuts.java | 2 ++
- 1 file changed, 2 insertions(+)
+ .../src/org/chromium/chrome/browser/KeyboardShortcuts.java   | 5 +++++
+ 1 file changed, 5 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
-@@ -472,6 +472,8 @@ public class KeyboardShortcuts {
-                 R.string.keyboard_shortcut_address_bar,
-                 KeyEvent.KEYCODE_L,
-                 KeyEvent.META_CTRL_ON);
-+        addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,
-+                KeyEvent.KEYCODE_D, KeyEvent.META_ALT_ON);
-         shortcutGroups.add(chromeFeatureShortcutGroup);
+@@ -839,6 +839,11 @@ public class KeyboardShortcuts {
+                     KeyEvent.KEYCODE_B,
+                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_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);
+         return new ArrayList<>(shortcutGroupsById.values());
+     }
 
-         KeyboardShortcutGroup webpageShortcutGroup =
 --
@@ -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
-@@ -372,6 +372,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -387,6 +387,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
       }
     }
 
@@ -7,16 +7,15 @@ adds a new flag in chrome://flags to re-enable the experiment
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 base/features.cc                                     |  4 ++++
- chrome/browser/about_flags.cc                        |  1 +
 .../Add-PartialLowEndModeOnMidRangeDevices-flag.inc  | 12 ++++++++++++
- 3 files changed, 17 insertions(+)
+ 2 files changed, 16 insertions(+)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc

 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -114,6 +114,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
-              FEATURE_ENABLED_BY_DEFAULT);
+@@ -126,6 +126,10 @@ BASE_FEATURE(kUseSharedRebindServiceConnection,
+              FEATURE_DISABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_ANDROID)
 
 +#if BUILDFLAG(IS_ANDROID)
@@ -25,18 +24,7 @@ diff --git a/base/features.cc b/base/features.cc
 +
 void Init(EmitThreadControllerProfilerMetadata
               emit_thread_controller_profiler_metadata) {
-   InitializeCpuReductionExperiment();
-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
-@@ -22,6 +22,7 @@
- #include "base/base_switches.h"
- #include "base/command_line.h"
- #include "base/feature_list.h"
-+#include "base/features.h"
- #include "base/functional/bind.h"
- #include "base/functional/callback.h"
- #include "base/i18n/base_i18n_switches.h"
+   sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc
 new file mode 100644
 --- /dev/null
@@ -10,14 +10,14 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc  | 7 +++++++
 device/gamepad/public/cpp/gamepad_features.cc             | 8 ++++++++
 device/gamepad/public/cpp/gamepad_features.h              | 2 ++
- .../blink/renderer/modules/gamepad/navigator_gamepad.cc   | 7 +++++++
- 6 files changed, 28 insertions(+), 2 deletions(-)
+ .../blink/renderer/modules/gamepad/navigator_gamepad.cc   | 6 ++++++
+ 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc

 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
-@@ -7587,9 +7587,9 @@
+@@ -8364,9 +8364,9 @@
     "expiry_milestone": 140
   },
   {
@@ -32,10 +32,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -267,6 +267,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -253,6 +253,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+           {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
+           {wf::EnablePeriodicBackgroundSync,
            raw_ref(features::kPeriodicBackgroundSync)},
-           {wf::EnablePushMessagingSubscriptionChange,
-            raw_ref(features::kPushSubscriptionChangeEvent)},
 +          {wf::EnableRestrictGamepadAccess,
 +           raw_ref(features::kRestrictGamepadAccess)},
           {wf::EnableSecurePaymentConfirmation,
@@ -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
-@@ -27,4 +27,12 @@ bool IsGamepadMultitouchEnabled() {
+@@ -36,4 +36,12 @@ bool IsGamepadMultitouchEnabled() {
   return false;
 }
 
@@ -72,9 +72,9 @@ 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
-@@ -11,8 +11,10 @@
- namespace features {
- 
+@@ -13,8 +13,10 @@ namespace features {
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
+     kEnableWindowsGamingInputDataFetcher);
 GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
 +GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
 
@@ -94,18 +94,17 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
 #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
 #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
 #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
-@@ -114,6 +115,10 @@ void RecordGamepadsForIdentifiabilityStudy(
+@@ -114,6 +115,9 @@ void RecordGamepadsForIdentifiabilityStudy(
 HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
     Navigator& navigator,
     ExceptionState& exception_state) {
 +  if (::features::IsRestrictGamepadAccessEnabled()) {
-+    exception_state.ThrowSecurityError("Access to the feature \"gamepad\" is denied");
 +    return HeapVector<Member<Gamepad>>();
 +  }
   if (!navigator.DomWindow()) {
     // Using an existing NavigatorGamepad if one exists, but don't create one
     // for a detached window, as its subclasses depend on a non-null window.
-@@ -420,6 +425,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
+@@ -420,6 +424,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
 
 void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
                                             Gamepad* gamepad) {
@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/resources/proxy_config.html    |  77 ++++
 chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
 chrome/browser/ui/BUILD.gn                    |   2 +
- .../browser/ui/webui/chrome_web_ui_configs.cc |   4 +
+ .../browser/ui/webui/chrome_web_ui_configs.cc |   5 +-
 chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
 chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++
 chrome/common/webui_url_constants.cc          |   2 +
@@ -38,9 +38,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../proxy_config/proxy_config_dictionary.cc   |  30 +-
 .../proxy_config/proxy_config_dictionary.h    |   7 +-
 .../proxy_config/proxy_policy_handler.cc      |   2 +-
- net/proxy_resolution/proxy_config.cc          |  51 ++-
+ net/proxy_resolution/pac_file_fetcher_impl.cc |   8 -
+ net/proxy_resolution/proxy_config.cc          |  53 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 984 insertions(+), 17 deletions(-)
+ 26 files changed, 986 insertions(+), 26 deletions(-)
 create mode 100644 chrome/browser/resources/proxy_config.css
 create mode 100644 chrome/browser/resources/proxy_config.html
 create mode 100644 chrome/browser/resources/proxy_config.js
@@ -77,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
-@@ -82,6 +82,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";
@@ -88,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
-@@ -333,6 +333,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -372,6 +372,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
 #endif
   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -99,14 +100,14 @@ 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
-@@ -231,6 +231,9 @@
+@@ -221,6 +221,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>
 +      <!-- Bromite Proxy Configuration UI -->
 +      <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
 +      <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
-       <if expr="not is_android">
+       <if expr="not is_android or enable_extensions_core">
         <!-- Page not available for guest. -->
         <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -140,9 +141,9 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 +#include "components/prefs/pref_service.h"
 +#include "components/prefs/pref_registry_simple.h"
 
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h"
-@@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
+@@ -57,7 +61,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
   return std::make_unique<ash::ProxyConfigServiceImpl>(
       profile_prefs, local_state_prefs, nullptr);
 #else
@@ -161,12 +162,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 +    local_state_prefs->CommitPendingWrite();
 +  }
 +  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 }
 
-@@ -86,3 +103,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+@@ -73,3 +90,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
                                                       nullptr);
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 }
 +
 +// static
@@ -196,16 +197,16 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -198,6 +198,8 @@
+@@ -204,6 +204,8 @@
 #include "printing/buildflags/buildflags.h"
 #include "rlz/buildflags/buildflags.h"
 
 +#include "chrome/browser/net/proxy_service_factory.h"
 +
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
- #include "chrome/browser/background/background_mode_manager.h"
+ #include "chrome/browser/background/extensions/background_mode_manager.h"
 #endif
-@@ -1714,6 +1716,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1613,6 +1615,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -217,7 +218,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -160,7 +160,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
     SetValue(proxy_config::prefs::kProxy,
              base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -660,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
-@@ -226,6 +226,8 @@ static_library("ui") {
+@@ -204,6 +204,8 @@ static_library("ui") {
     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -672,7 +673,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -55,6 +55,9 @@
+@@ -57,6 +57,9 @@
 #include "extensions/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 
@@ -682,12 +683,15 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
 #if BUILDFLAG(ENABLE_NACL)
 #include "chrome/browser/ui/webui/nacl_ui.h"
 #endif
-@@ -401,4 +404,5 @@ void RegisterChromeWebUIConfigs() {
- #if BUILDFLAG(ENABLE_GLIC)
+@@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {
   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
+   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
 #endif
+-
 +  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
- }
+ #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+   map.AddWebUIConfig(
+       std::make_unique<safe_browsing::ChromeSafeBrowsingUIConfig>());
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
@@ -1131,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) {
+@@ -51,6 +51,7 @@ bool IsSystemWebUIHost(std::string_view host) {
       kChromeUILockScreenNetworkHost,
       kChromeUILockScreenStartReauthHost,
       kChromeUIMobileSetupHost,
@@ -1139,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) {
+@@ -72,6 +73,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>({
@@ -1150,10 +1154,10 @@ 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
-@@ -159,6 +159,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";
- inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+@@ -179,6 +179,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";
 +inline constexpr char16_t kChromeUIProxyConfigURL16[] = u"chrome://proxy/";
 +inline constexpr char kChromeUIProxyConfigHost[] = "proxy";
 inline constexpr char kChromeUINewTabPageHost[] = "new-tab-page";
@@ -1316,7 +1320,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
 diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
 --- a/components/proxy_config/proxy_policy_handler.cc
 +++ b/components/proxy_config/proxy_policy_handler.cc
-@@ -380,7 +380,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
+@@ -378,7 +378,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,
         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(
             server->GetString(), bypass_list && bypass_list->is_string()
                                      ? bypass_list->GetString()
@@ -1325,11 +1329,29 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
       }
       break;
     }
+diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
+--- a/net/proxy_resolution/pac_file_fetcher_impl.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
+@@ -359,14 +359,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
+     return false;
+   }
+ 
+-  // Enforce maximum size bound.
+-  if (num_bytes + bytes_read_so_far_.size() >
+-      static_cast<size_t>(max_response_bytes_)) {
+-    result_code_ = ERR_FILE_TOO_BIG;
+-    request->Cancel();
+-    return false;
+-  }
+-
+   bytes_read_so_far_.append(buf_->data(), num_bytes);
+   return true;
+ }
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -129,7 +129,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
-             std::move(url_scheme), &single_proxies, ProxyServer::SCHEME_HTTP,
+@@ -133,7 +133,7 @@ void ProxyConfig::ProxyRules::ParseFromString(std::string_view proxy_rules,
+             url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP,
             allow_bracketed_proxy_chains, is_quic_allowed);
         type = Type::PROXY_LIST;
 -        return;
@@ -1337,7 +1359,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
       }
 
       // Trim whitespace off the url scheme.
-@@ -160,6 +160,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
+@@ -164,6 +164,57 @@ void ProxyConfig::ProxyRules::ParseFromString(std::string_view proxy_rules,
   }
 }
 
@@ -1345,8 +1367,10 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
 +  if (type == Type::PROXY_LIST) {
 +    std::string proxy_list;
 +    for (const auto& proxy_chain : single_proxies.AllChains()) {
-+      net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
-+      proxy_list += ProxyServerToProxyUri(proxy_server) + ";";
+      if (proxy_chain.length()) {
+        net::ProxyServer proxy_server = proxy_chain.GetProxyServer(/*chain_index=*/0);
+        proxy_list += ProxyServerToProxyUri(proxy_server) + ";";
+      }
 +    }
 +    // remove last semicolon
 +    if (proxy_list.length() != 0 ) {
@@ -1397,7 +1421,7 @@ diff --git a/net/proxy_resolution/proxy_config.h b/net/proxy_resolution/proxy_co
 --- a/net/proxy_resolution/proxy_config.h
 +++ b/net/proxy_resolution/proxy_config.h
@@ -107,6 +107,9 @@ class NET_EXPORT ProxyConfig {
-     void ParseFromString(const std::string& proxy_rules,
+     void ParseFromString(std::string_view proxy_rules,
                          bool allow_bracketed_proxy_chains = false,
                          bool is_quic_allowed = false);
 +    // Returns the proxy rules in a format that can be parsed by ParseFromString;
@@ -279,7 +279,7 @@ new file mode 100644
 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
-@@ -248,7 +248,7 @@ void ContentSettingsRegistry::Init() {
+@@ -249,7 +249,7 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
@@ -292,14 +292,14 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
@@ -9,6 +9,7 @@
+ #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h"
 #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h"
- #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
 #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom-blink.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 #include "third_party/blink/public/platform/web_media_player.h"
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_local_frame_client.h"
-@@ -337,6 +338,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
+@@ -346,6 +347,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
 }
 
 bool AutoplayPolicy::IsGestureNeededForPlayback() const {
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
   if (!IsLockedPendingUserGesture())
     return false;
 
-@@ -449,6 +452,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -458,6 +461,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
   }
 }
 
@@ -41,31 +41,32 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../Add-cromite-flags-support.grdp            |   9 +
 .../placeholder.txt                           |   1 +
 chrome/browser/ui/ui_features.cc              |   1 +
+ chrome/browser/unexpire_flags.cc              |  15 +-
 chrome/common/chrome_features.cc              |   1 +
 .../browser_ui/accessibility/android/BUILD.gn |   1 +
 .../res/xml/accessibility_preferences.xml     |   3 +-
 .../accessibility/AccessibilitySettings.java  |   6 +-
 .../android/java/res/values/attrs.xml         |   4 +
- .../settings/ChromeSwitchPreference.java      |  20 ++
- .../components/cached_flags/CachedFlag.java   |   9 +-
+ .../settings/ChromeSwitchPreference.java      |  19 ++
+ .../components/cached_flags/CachedFlag.java   |   8 +-
 components/components_strings.grd             |   1 +
 .../content_settings/core/common/features.cc  |   1 +
 .../placeholder.txt                           |   1 +
- components/flags_ui/flags_state.cc            |  54 ++++++
- components/flags_ui/resources/app.css         |  24 +++
- components/flags_ui/resources/app.html.ts     |  28 +++
- components/flags_ui/resources/app.ts          |  23 +++
- components/flags_ui/resources/experiment.css  |   9 +-
- .../flags_ui/resources/experiment.html.ts     |   7 +-
- components/flags_ui/resources/experiment.ts   |  14 +-
- .../flags_ui/resources/flags_browser_proxy.ts |   5 +
 .../core/offline_page_feature.cc              |   1 +
 .../offline_pages/core/offline_page_feature.h |   1 +
 .../browser/features/password_features.cc     |   1 +
- components/permissions/features.cc            |   1 +
+ components/permissions/features.cc            |   2 +
 ...nthetic_trials_active_group_id_provider.cc |   4 +-
 ...ynthetic_trials_active_group_id_provider.h |   4 +-
- .../version_ui/version_handler_helper.cc      |   4 +-
+ components/webui/flags/flags_state.cc         |  59 ++++++
+ components/webui/flags/resources/app.css      |  24 +++
+ components/webui/flags/resources/app.html.ts  |  28 +++
+ components/webui/flags/resources/app.ts       |  24 +++
+ .../webui/flags/resources/experiment.css      |   9 +-
+ .../webui/flags/resources/experiment.html.ts  |   7 +-
+ .../webui/flags/resources/experiment.ts       |  12 +-
+ .../flags/resources/flags_browser_proxy.ts    |   5 +
+ .../webui/version/version_handler_helper.cc   |   4 +-
 content/common/features.cc                    |   1 +
 content/public/common/content_features.cc     |   1 +
 content/public/common/content_features.h      |   1 +
@@ -106,7 +107,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 third_party/blink/public/common/features.h    |   1 +
 ui/base/ui_base_features.cc                   |   1 +
 ui/base/ui_base_features.h                    |   1 +
- 93 files changed, 808 insertions(+), 30 deletions(-)
+ 94 files changed, 826 insertions(+), 30 deletions(-)
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -143,7 +144,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
-@@ -165,6 +165,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -178,6 +178,8 @@ use_epoll = is_linux || is_chromeos || is_android
 # This does not include test code (test support and anything in the test
 # directory) which should use source_set as is recommended for GN targets).
 component("base") {
@@ -152,7 +153,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
   sources = [
     "allocator/allocator_check.cc",
     "allocator/allocator_check.h",
-@@ -1017,7 +1019,7 @@ component("base") {
+@@ -1036,7 +1038,7 @@ component("base") {
     "//build/config/compiler:wglobal_constructors",
   ]
 
@@ -164,7 +165,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
 diff --git a/base/android/feature_map.cc b/base/android/feature_map.cc
 --- a/base/android/feature_map.cc
 +++ b/base/android/feature_map.cc
-@@ -46,6 +46,11 @@ const Feature* FeatureMap::FindFeatureExposedToJava(
+@@ -47,6 +47,11 @@ const Feature* FeatureMap::FindFeatureExposedToJava(
 static jboolean JNI_FeatureMap_IsEnabled(JNIEnv* env,
                                          jlong jfeature_map,
                                          std::string& feature_name) {
@@ -191,7 +192,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned
 diff --git a/base/feature_list.cc b/base/feature_list.cc
 --- a/base/feature_list.cc
 +++ b/base/feature_list.cc
-@@ -42,6 +42,31 @@
+@@ -41,6 +41,31 @@
 
 namespace base {
 
@@ -223,7 +224,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 namespace {
 
 // Pointer to the FeatureList instance singleton that was set via
-@@ -473,6 +498,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
   return g_feature_list_instance->IsFeatureEnabled(feature);
 }
 
@@ -270,7 +271,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;
-@@ -743,6 +808,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -742,6 +807,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
 
 void FeatureList::FinalizeInitialization() {
   DCHECK(!initialized_);
@@ -291,7 +292,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
-@@ -170,8 +170,10 @@ enum class FeatureMacroHandshake { kSecret };
+@@ -174,8 +174,10 @@ enum class FeatureMacroHandshake { kSecret };
 struct BASE_EXPORT LOGICALLY_CONST Feature {
   constexpr Feature(const char* name,
                     FeatureState default_state,
@@ -304,7 +305,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) {
-@@ -198,6 +200,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
+@@ -202,6 +204,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
   // command line switch.
   const FeatureState default_state;
 
@@ -314,7 +315,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
  private:
   friend class FeatureList;
 
-@@ -477,6 +482,11 @@ class BASE_EXPORT FeatureList {
+@@ -481,6 +486,11 @@ class BASE_EXPORT FeatureList {
   // instance, which is checked in builds with DCHECKs enabled.
   static bool IsEnabled(const Feature& feature);
 
@@ -326,7 +327,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
-@@ -746,4 +756,62 @@ class BASE_EXPORT FeatureList {
+@@ -750,4 +760,62 @@ class BASE_EXPORT FeatureList {
 
 }  // namespace base
 
@@ -436,7 +437,7 @@ diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -54,6 +54,10 @@ found in the LICENSE file.
+@@ -44,6 +44,10 @@ found in the LICENSE file.
         android:key="do_not_track"
         android:title="@string/do_not_track_title"
         android:fragment="org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings" />
@@ -450,24 +451,24 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -37,7 +37,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -38,7 +38,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+    public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+    public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mHomepageManager = HomepageManager.getInstance();
 
         mPageTitle.set(getString(R.string.options_homepage_title));
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -89,7 +89,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     }
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+    public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+    public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
 
         SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
@@ -527,7 +528,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-@@ -32,7 +33,9 @@ import org.chromium.base.Callback;
+@@ -34,7 +35,9 @@ import org.chromium.base.Callback;
 import org.chromium.base.CallbackUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
@@ -537,7 +538,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import org.chromium.base.supplier.OneshotSupplierImpl;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
-@@ -41,12 +44,14 @@ import org.chromium.chrome.browser.back_press.SecondaryActivityBackPressUma.Seco
+@@ -42,12 +45,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;
@@ -552,10 +553,10 @@ 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;
-@@ -85,6 +90,40 @@ import java.util.Locale;
-  */
- public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -89,6 +94,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
         implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, SnackbarManageable {
+     private static final String TAG = "SettingsActivity";
+ 
 +    private static class RequestRestartDelegate implements ChromeBaseSettingsFragment.RequireRestartDelegate {
 +        private OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
 +        private Activity mActivity;
@@ -593,7 +594,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";
 
-@@ -151,7 +190,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -155,7 +194,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                         mProfile,
                         mSnackbarManagerSupplier,
                         mBottomSheetControllerSupplier,
@@ -632,7 +633,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
-@@ -392,6 +392,10 @@ using flags_ui::kOsLinux;
+@@ -406,6 +406,10 @@ using flags_ui::kOsLinux;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
 
@@ -643,9 +644,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 namespace about_flags {
 
 namespace {
-@@ -4313,6 +4317,10 @@ const FeatureEntry::FeatureVariation kMerchantTrustVariations[] = {
-      std::size(kMerchantTrustEnabledWithSampleData), nullptr}};
- #endif  // !BUILDFLAG(IS_ANDROID)
+@@ -4705,6 +4709,10 @@ const FeatureEntry::FeatureVariation kHistorySyncOptinExpansionPillVariations[]
+      nullptr}};
+ #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
 
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -654,7 +655,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.
-@@ -4339,6 +4347,9 @@ const FeatureEntry::FeatureVariation kMerchantTrustVariations[] = {
+@@ -4731,6 +4739,9 @@ const FeatureEntry::FeatureVariation kHistorySyncOptinExpansionPillVariations[]
 const FeatureEntry kFeatureEntries[] = {
 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 // //tools/flags/generate_unexpire_flags.py.
@@ -667,7 +668,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_features.cc
 --- a/chrome/browser/browser_features.cc
 +++ b/chrome/browser/browser_features.cc
-@@ -352,4 +352,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
+@@ -359,4 +359,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
              "RemovalOfIWAsFromTabCapture",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -676,7 +677,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
 diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h
 --- a/chrome/browser/browser_features.h
 +++ b/chrome/browser/browser_features.h
-@@ -136,6 +136,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+@@ -135,6 +135,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
 // module, e.g.
 // //chrome/browser/<foo_module>/features.h
 //
@@ -726,7 +727,7 @@ 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
-@@ -1133,5 +1133,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
+@@ -1348,5 +1348,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
              "WebOtpCrossDeviceSimpleString",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -736,7 +737,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
-@@ -225,6 +225,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
+@@ -286,6 +286,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
     "trigger_id",
     /*default_value=*/"");
 
@@ -747,7 +748,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -20,6 +20,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam;
+@@ -19,6 +19,10 @@ import org.chromium.components.cached_flags.DoubleCachedFeatureParam;
 import org.chromium.components.cached_flags.IntCachedFeatureParam;
 import org.chromium.components.cached_flags.StringCachedFeatureParam;
 
@@ -758,16 +759,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 import java.util.List;
 import java.util.Map;
 
-@@ -818,7 +822,7 @@ public abstract class ChromeFeatureList {
+@@ -924,7 +928,7 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sWebApkMinShellApkVersion =
             newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
 
 -    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +    public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
             List.of(
-                     sAndroidAppIntegration,
-                     sAndroidAppIntegrationModule,
-@@ -916,6 +920,13 @@ public abstract class ChromeFeatureList {
+                     sAccountForSuppressedKeyboardInsets,
+                     sAllowTabClosingUponMinimization,
+@@ -1048,6 +1052,13 @@ public abstract class ChromeFeatureList {
                     sUseLibunwindstackNativeUnwinderAndroid,
                     sWebApkMinShellApkVersion);
 
@@ -778,9 +779,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +            concatenateLists(CromiteCachedFlagImplBase.getList(), sFlagsCachedFullBrowserChromium);
 +
-     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser = List.of();
+     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser =
+             List.of(sAsyncNotificationManagerForDownload);
 
-     public static final List<CachedFlag> sTestCachedFlags =
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
 new file mode 100644
 --- /dev/null
@@ -853,10 +854,10 @@ diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn
 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
-@@ -7,12 +7,19 @@ package org.chromium.chrome.browser.settings;
- import androidx.annotation.NonNull;
- import androidx.preference.PreferenceFragmentCompat;
+@@ -8,12 +8,19 @@ 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.chrome.browser.feedback.HelpAndFeedbackLauncher;
 import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherFactory;
@@ -873,7 +874,7 @@ diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browse
 /**
  * Base class for settings in Chrome.
  *
-@@ -26,6 +33,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
+@@ -28,6 +35,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
     private Profile mProfile;
     private SettingsCustomTabLauncher mCustomTabLauncher;
 
@@ -957,16 +958,48 @@ 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
-@@ -440,4 +440,5 @@ BASE_FEATURE(kPageActionsMigration,
-              "PageActionsMigration",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -500,4 +500,5 @@ bool HasTabSearchToolbarButton() {
+   return has_tab_search_toolbar_button;
+ }
 
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
 }  // namespace features
+diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
+--- a/chrome/browser/unexpire_flags.cc
+++ b/chrome/browser/unexpire_flags.cc
+@@ -12,6 +12,7 @@
+ #include "base/containers/contains.h"
+ #include "base/containers/flat_map.h"
+ #include "base/no_destructor.h"
+#include "chrome/browser/about_flags.h"
+ #include "chrome/browser/expired_flags_list.h"
+ #include "chrome/browser/unexpire_flags_gen.h"
+ #include "chrome/common/chrome_version.h"
+@@ -117,7 +118,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
+ 
+   // Otherwise, the flag is expired if its expiration mstone is less than the
+   // mstone of this copy of Chromium.
+-  return mstone < CHROME_VERSION_MAJOR;
+  if (mstone < CHROME_VERSION_MAJOR) {
+    if (const flags_ui::FeatureEntry* entry =
+          about_flags::GetCurrentFlagsState()->FindFeatureEntryByName(
+            internal_name)) {
+      if (const base::Feature* feature = entry->feature.feature) {
+        if (feature->is_cromite) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  return false;
+ }
+ 
+ namespace testing {
 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
-@@ -1561,4 +1561,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
+@@ -1795,4 +1795,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
              "DisableShortcutsEnableDiy",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -999,27 +1032,28 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -24,8 +24,10 @@ import org.chromium.components.omnibox.OmniboxFeatures;
+@@ -28,9 +28,11 @@ import org.chromium.components.omnibox.OmniboxFeatures;
 import org.chromium.content_public.browser.ContentFeatureList;
 import org.chromium.content_public.browser.ContentFeatureMap;
 
 +import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +
 /** Fragment to keep track of all the accessibility related preferences. */
+ @NullMarked
 -public class AccessibilitySettings extends PreferenceFragmentCompat
 +public class AccessibilitySettings extends ChromeBaseSettingsFragment
         implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener {
     public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
     public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT =
-@@ -64,7 +66,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+@@ -69,7 +71,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
     }
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+    public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+    public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
 
-         mPageZoomDefaultZoomPref = (PageZoomPreference) findPreference(PREF_PAGE_ZOOM_DEFAULT_ZOOM);
+         mPageZoomDefaultZoomPref = findPreference(PREF_PAGE_ZOOM_DEFAULT_ZOOM);
 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
@@ -1037,17 +1071,16 @@ 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
-@@ -12,6 +12,9 @@ import android.view.accessibility.AccessibilityEvent;
+@@ -13,6 +13,8 @@ import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.TextView;
 
-+import androidx.annotation.Nullable;
 +import android.content.res.TypedArray;
 +
 import androidx.annotation.ColorInt;
- import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-@@ -31,6 +34,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+ import androidx.preference.PreferenceViewHolder;
+@@ -38,6 +40,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
     /** Indicates if the preference uses a custom layout. */
     private final boolean mHasCustomLayout;
 
@@ -1059,7 +1092,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.
     /**
-@@ -50,6 +58,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
+@@ -57,6 +64,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
 
         mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs);
         mUseSummaryAsTitle = true;
@@ -1081,16 +1114,8 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 diff --git a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 --- a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 +++ b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
-@@ -5,6 +5,7 @@
- package org.chromium.components.cached_flags;
- 
- import android.content.SharedPreferences;
-+import androidx.annotation.Nullable;
- 
- import org.chromium.base.FeatureList;
- import org.chromium.base.FeatureMap;
-@@ -143,7 +144,7 @@ public class CachedFlag extends Flag {
-         editor.putBoolean(getSharedPreferenceKey(), isEnabledInNative);
+@@ -155,7 +155,7 @@ public class CachedFlag extends Flag {
+         editor.putBoolean(getSharedPreferenceKey(), featureValue);
     }
 
 -    String getSharedPreferenceKey() {
@@ -1098,7 +1123,7 @@ diff --git a/components/cached_flags/android/java/src/org/chromium/components/ca
         // Create the key only once to avoid String concatenation every flag check.
         if (mPreferenceKey == null) {
             mPreferenceKey = CachedFlagsSharedPreferences.FLAGS_CACHED.createKey(mFeatureName);
-@@ -151,6 +152,12 @@ public class CachedFlag extends Flag {
+@@ -163,6 +163,12 @@ public class CachedFlag extends Flag {
         return mPreferenceKey;
     }
 
@@ -1125,8 +1150,8 @@ 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
-@@ -163,5 +163,6 @@ BASE_FEATURE(kContentSettingsPartitioning,
-              "ContentSettingsPartitioning",
+@@ -167,5 +167,6 @@ BASE_FEATURE(kForceAllowStorageAccess,
+              "ForceAllowStorageAccess",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/components_content_settings_core_common_features_cc.inc"
@@ -1138,10 +1163,93 @@ new file mode 100644
 +++ b/components/cromite_components_strings_grd/placeholder.txt
@@ -0,0 +1 @@
 +this file is intentionally empty
-diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc
--- a/components/flags_ui/flags_state.cc
-+++ b/components/flags_ui/flags_state.cc
-@@ -363,6 +363,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
+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() {
+   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
+ }
+ 
+#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc"
+ }  // namespace offline_pages
+diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
+--- a/components/offline_pages/core/offline_page_feature.h
+++ b/components/offline_pages/core/offline_page_feature.h
+@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
+ // offline pages to avoid showing them even when the device is online.
+ bool IsOfflinePagesNetworkStateLikelyUnknown();
+ 
+#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc"
+ }  // namespace offline_pages
+ 
+ #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_
+diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
+--- a/components/password_manager/core/browser/features/password_features.cc
+++ b/components/password_manager/core/browser/features/password_features.cc
+@@ -183,4 +183,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
+              "ImprovedPasswordChangeService",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
+#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
+ }  // namespace password_manager::features
+diff --git a/components/permissions/features.cc b/components/permissions/features.cc
+--- a/components/permissions/features.cc
+++ b/components/permissions/features.cc
+@@ -146,6 +146,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
+              "OsAdditionalSecurityPermissionKillSwitch",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+
+#include "cromite_flags/components_permissions_features_cc.inc"
+ }  // namespace features
+ namespace feature_params {
+ 
+diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc
+--- a/components/variations/synthetic_trials_active_group_id_provider.cc
+++ b/components/variations/synthetic_trials_active_group_id_provider.cc
+@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() {
+   return group_ids_;
+ }
+ 
+-#if !defined(NDEBUG)
+#if true
+ std::vector<SyntheticTrialGroup>
+ SyntheticTrialsActiveGroupIdProvider::GetGroups() {
+   base::AutoLock scoped_lock(lock_);
+@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged(
+     for (const auto& group : groups) {
+       group_ids_.push_back(group.id());
+     }
+-#if !defined(NDEBUG)
+#if true
+     groups_ = groups;
+ #endif  // !defined(NDEBUG)
+   }
+diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h
+--- a/components/variations/synthetic_trials_active_group_id_provider.h
+++ b/components/variations/synthetic_trials_active_group_id_provider.h
+@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
+   // Returns currently active synthetic trial group IDs.
+   std::vector<ActiveGroupId> GetActiveGroupIds();
+ 
+-#if !defined(NDEBUG)
+#if true
+   // In debug mode, not only the group IDs are tracked but also the full group
+   // info, to display the names unhashed in chrome://version.
+   std::vector<SyntheticTrialGroup> GetGroups();
+@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
+ 
+   base::Lock lock_;
+   std::vector<ActiveGroupId> group_ids_;  // GUARDED_BY(lock_);
+-#if !defined(NDEBUG)
+#if true
+   // In debug builds, keep the full group information to be able to display it
+   // in chrome://version.
+   std::vector<SyntheticTrialGroup> groups_;  // GUARDED_BY(lock_);
+diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flags_state.cc
+--- a/components/webui/flags/flags_state.cc
+++ b/components/webui/flags/flags_state.cc
+@@ -376,6 +376,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
 
   for (const std::string& entry_name : enabled_entries) {
     const auto& entry_it = name_to_switch_map.find(entry_name);
@@ -1160,10 +1268,10 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +      }
 +      NOTREACHED();
 +    }
-     CHECK(entry_it != name_to_switch_map.end(), base::NotFatalUntil::M130);
+     CHECK(entry_it != name_to_switch_map.end());
 
     const SwitchEntry& entry = entry_it->second;
-@@ -680,6 +695,27 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -709,6 +724,27 @@ void FlagsState::GetFlagFeatureEntries(
       data.Set("links", std::move(links));
     }
 
@@ -1191,7 +1299,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
     switch (entry.type) {
       case FeatureEntry::SINGLE_VALUE:
       case FeatureEntry::SINGLE_DISABLE_VALUE:
-@@ -806,6 +842,16 @@ void FlagsState::AddSwitchesToCommandLine(
+@@ -836,6 +872,16 @@ void FlagsState::AddSwitchesToCommandLine(
   for (const std::string& entry_name : enabled_entries) {
     const auto& entry_it = name_to_switch_map.find(entry_name);
     if (entry_it == name_to_switch_map.end()) {
@@ -1208,7 +1316,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
       NOTREACHED();
     }
 
-@@ -1057,6 +1103,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
+@@ -1092,6 +1138,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
 bool FlagsState::IsSupportedFeature(const FlagsStorage* storage,
                                     const std::string& name,
                                     int platform_mask) const {
@@ -1222,10 +1330,22 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +  }
   for (const auto& entry : feature_entries_) {
     DCHECK(entry.IsValid());
-     if (!(entry.supported_platforms & platform_mask))
-diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resources/app.css
--- a/components/flags_ui/resources/app.css
-+++ b/components/flags_ui/resources/app.css
+     if (!(entry.supported_platforms & platform_mask)) {
+@@ -1130,6 +1184,11 @@ void FlagsState::SetFlags(
+         FindFeatureEntryByName(feature_internal_name);
+     // Since this flag is currently enabled, we know for sure that we can find
+     // its feature entry using its internal name.
+    if (!entry) {
+      if (base::FeatureList::IsCromiteFlag(feature_internal_name)) {
+        continue;
+      }
+    }
+     CHECK(entry);
+ 
+     if (entry->type == FeatureEntry::FEATURE_VALUE ||
+diff --git a/components/webui/flags/resources/app.css b/components/webui/flags/resources/app.css
+--- a/components/webui/flags/resources/app.css
+++ b/components/webui/flags/resources/app.css
@@ -383,3 +383,27 @@ cr-tabs {
     padding-top: 1.5rem;
   }
@@ -1254,9 +1374,9 @@ diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resourc
 +.cromite .section-header-title {
 +  display: none;
 +}
-diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/resources/app.html.ts
--- a/components/flags_ui/resources/app.html.ts
-+++ b/components/flags_ui/resources/app.html.ts
+diff --git a/components/webui/flags/resources/app.html.ts b/components/webui/flags/resources/app.html.ts
+--- a/components/webui/flags/resources/app.html.ts
+++ b/components/webui/flags/resources/app.html.ts
@@ -9,6 +9,7 @@ import type {AppElement} from './app.js';
 export function getHtml(this: AppElement) {
   // clang-format off
@@ -1306,37 +1426,37 @@ diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/res
 <!--_html_template_end_-->`;
   // clang-format on
 }
-diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resources/app.ts
--- a/components/flags_ui/resources/app.ts
-+++ b/components/flags_ui/resources/app.ts
+diff --git a/components/webui/flags/resources/app.ts b/components/webui/flags/resources/app.ts
+--- a/components/webui/flags/resources/app.ts
+++ b/components/webui/flags/resources/app.ts
@@ -132,6 +132,7 @@ export class FlagsAppElement extends CrLitElement {
     // <if expr="not is_ios">
     loadTimeData.getString('unavailable'),
     // </if>
 +    "Cromite",
   ];
-   protected selectedTabIndex_: number = 0;
+   protected accessor selectedTabIndex_: number = 0;
 
@@ -150,9 +151,12 @@ export class FlagsAppElement extends CrLitElement {
 
-   protected defaultFeatures: Feature[] = [];
-   protected nonDefaultFeatures: Feature[] = [];
+   protected accessor defaultFeatures: Feature[] = [];
+   protected accessor nonDefaultFeatures: Feature[] = [];
 +  protected defaultCromiteFeatures: Feature[] = [];
 +  protected nonDefaultCromiteFeatures: Feature[] = [];
-   protected searching: boolean = false;
-   protected needsRestart: boolean = false;
+   protected accessor searching: boolean = false;
+   protected accessor needsRestart: boolean = false;
 
 +  private onlyCromiteFlags: boolean = false;
   private announceStatusDelayMs: number = 100;
   private featuresResolver: PromiseResolver<void> = new PromiseResolver();
   private flagSearch: FlagSearch|null = null;
-@@ -186,10 +190,24 @@ export class FlagsAppElement extends CrLitElement {
+@@ -186,10 +190,25 @@ export class FlagsAppElement extends CrLitElement {
     if (changedPrivateProperties.has('data')) {
       const defaultFeatures: Feature[] = [];
       const nonDefaultFeatures: Feature[] = [];
 +      const defaultCromiteFeatures: Feature[] = [];
 +      const nonDefaultCromiteFeatures: Feature[] = [];
- 
+
 +      if (this.onlyCromiteFlags) {
 +        this.data.supportedFeatures =
 +          this.data.supportedFeatures.filter(item => item.is_new);
@@ -1347,6 +1467,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
 +                : undefined));
 +      this.data.supportedFeatures.sort(
 +        (a,b) => (a.internal_name.localeCompare(b.internal_name)));
+ 
       this.data.supportedFeatures.forEach(
           f => (f.is_default ? defaultFeatures : nonDefaultFeatures).push(f));
 
@@ -1355,7 +1476,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
       this.defaultFeatures = defaultFeatures;
       this.nonDefaultFeatures = nonDefaultFeatures;
 
-@@ -233,6 +251,11 @@ export class FlagsAppElement extends CrLitElement {
+@@ -233,6 +252,11 @@ export class FlagsAppElement extends CrLitElement {
   override connectedCallback() {
     super.connectedCallback();
 
@@ -1367,9 +1488,9 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
     // <if expr="not is_ios">
     const pathname = new URL(window.location.href).pathname;
     this.isFlagsDeprecatedUrl_ =
-diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/resources/experiment.css
--- a/components/flags_ui/resources/experiment.css
-+++ b/components/flags_ui/resources/experiment.css
+diff --git a/components/webui/flags/resources/experiment.css b/components/webui/flags/resources/experiment.css
+--- a/components/webui/flags/resources/experiment.css
+++ b/components/webui/flags/resources/experiment.css
@@ -12,6 +12,7 @@
 }
 
@@ -1414,9 +1535,9 @@ diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/
     width: 100%;
   }
 
-diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags_ui/resources/experiment.html.ts
--- a/components/flags_ui/resources/experiment.html.ts
-+++ b/components/flags_ui/resources/experiment.html.ts
+diff --git a/components/webui/flags/resources/experiment.html.ts b/components/webui/flags/resources/experiment.html.ts
+--- a/components/webui/flags/resources/experiment.html.ts
+++ b/components/webui/flags/resources/experiment.html.ts
@@ -10,7 +10,8 @@ export function getHtml(this: ExperimentElement) {
   // clang-format off
   return html`<!--_html_template_start_-->
@@ -1438,9 +1559,9 @@ diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags
             </option>
           `)}
         </select>
-diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/resources/experiment.ts
--- a/components/flags_ui/resources/experiment.ts
-+++ b/components/flags_ui/resources/experiment.ts
+diff --git a/components/webui/flags/resources/experiment.ts b/components/webui/flags/resources/experiment.ts
+--- a/components/webui/flags/resources/experiment.ts
+++ b/components/webui/flags/resources/experiment.ts
@@ -81,6 +81,11 @@ export class ExperimentElement extends CrLitElement {
     enabled: false,
     is_default: false,
@@ -1453,7 +1574,7 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
   };
 
   // Whether the controls to change the experiment state should be hidden.
-@@ -127,12 +132,15 @@ export class ExperimentElement extends CrLitElement {
+@@ -127,9 +132,12 @@ export class ExperimentElement extends CrLitElement {
   }
 
   protected getExperimentTitle_(): string {
@@ -1467,14 +1588,10 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
 +                               loadTimeData.getString('experiment-enabled')) + suffix;
     }
 
-    return '';
-+    return suffix;
-   }
- 
-   protected getPlatforms_(): string {
-diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/flags_ui/resources/flags_browser_proxy.ts
--- a/components/flags_ui/resources/flags_browser_proxy.ts
-+++ b/components/flags_ui/resources/flags_browser_proxy.ts
+     return '';
+diff --git a/components/webui/flags/resources/flags_browser_proxy.ts b/components/webui/flags/resources/flags_browser_proxy.ts
+--- a/components/webui/flags/resources/flags_browser_proxy.ts
+++ b/components/webui/flags/resources/flags_browser_proxy.ts
@@ -16,6 +16,11 @@ export interface Feature {
   description: string;
   enabled: boolean;
@@ -1487,91 +1604,9 @@ diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/f
   supported_platforms: string[];
   origin_list_value?: string;
   string_value?: string;
-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() {
-   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
- }
- 
-+#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc"
- }  // namespace offline_pages
-diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
--- a/components/offline_pages/core/offline_page_feature.h
-+++ b/components/offline_pages/core/offline_page_feature.h
-@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
- // offline pages to avoid showing them even when the device is online.
- bool IsOfflinePagesNetworkStateLikelyUnknown();
- 
-+#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc"
- }  // namespace offline_pages
- 
- #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_
-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
-@@ -188,4 +188,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
-              "ImprovedPasswordChangeService",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
- }  // namespace password_manager::features
-diff --git a/components/permissions/features.cc b/components/permissions/features.cc
--- a/components/permissions/features.cc
-+++ b/components/permissions/features.cc
-@@ -122,6 +122,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
- BASE_FEATURE(kCpssUseTfliteSignatureRunner,
-              "CpssUseTfliteSignatureRunner",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+#include "cromite_flags/components_permissions_features_cc.inc"
- }  // namespace features
- namespace feature_params {
- 
-diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc
--- a/components/variations/synthetic_trials_active_group_id_provider.cc
-+++ b/components/variations/synthetic_trials_active_group_id_provider.cc
-@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() {
-   return group_ids_;
- }
- 
-#if !defined(NDEBUG)
-+#if true
- std::vector<SyntheticTrialGroup>
- SyntheticTrialsActiveGroupIdProvider::GetGroups() {
-   base::AutoLock scoped_lock(lock_);
-@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged(
-     for (const auto& group : groups) {
-       group_ids_.push_back(group.id());
-     }
-#if !defined(NDEBUG)
-+#if true
-     groups_ = groups;
- #endif  // !defined(NDEBUG)
-   }
-diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h
--- a/components/variations/synthetic_trials_active_group_id_provider.h
-+++ b/components/variations/synthetic_trials_active_group_id_provider.h
-@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
-   // Returns currently active synthetic trial group IDs.
-   std::vector<ActiveGroupId> GetActiveGroupIds();
- 
-#if !defined(NDEBUG)
-+#if true
-   // In debug mode, not only the group IDs are tracked but also the full group
-   // info, to display the names unhashed in chrome://version.
-   std::vector<SyntheticTrialGroup> GetGroups();
-@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
- 
-   base::Lock lock_;
-   std::vector<ActiveGroupId> group_ids_;  // GUARDED_BY(lock_);
-#if !defined(NDEBUG)
-+#if true
-   // In debug builds, keep the full group information to be able to display it
-   // in chrome://version.
-   std::vector<SyntheticTrialGroup> groups_;  // GUARDED_BY(lock_);
-diff --git a/components/version_ui/version_handler_helper.cc b/components/version_ui/version_handler_helper.cc
--- a/components/version_ui/version_handler_helper.cc
-+++ b/components/version_ui/version_handler_helper.cc
+diff --git a/components/webui/version/version_handler_helper.cc b/components/webui/version/version_handler_helper.cc
+--- a/components/webui/version/version_handler_helper.cc
+++ b/components/webui/version/version_handler_helper.cc
@@ -20,7 +20,7 @@
 namespace version_ui {
 namespace {
@@ -1593,7 +1628,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
-@@ -475,4 +475,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
+@@ -596,4 +596,5 @@ BASE_FEATURE(kDisallowRasterInterfaceWithoutSkiaBackend,
 
 // Please keep features in alphabetical order.
 
@@ -1602,8 +1637,8 @@ 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
-@@ -1421,4 +1421,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
-          VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
+@@ -1527,4 +1527,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
+              features::kPushSubscriptionChangeEventOnResubscribe);
 }
 
 +#include "cromite_flags/content_public_common_content_features_cc.inc"
@@ -1611,9 +1646,9 @@ 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
-@@ -341,6 +341,7 @@ CONTENT_EXPORT extern const base::FeatureParam<std::string>
- CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
+@@ -361,6 +361,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
+ CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
 
 +#include "cromite_flags/content_public_common_content_features_h.inc"
 }  // namespace features
@@ -1957,7 +1992,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
-@@ -1819,5 +1819,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -1843,5 +1843,5 @@ uint32_t GetPassthroughAudioFormats() {
   return 0;
 #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
 }
@@ -1967,7 +2002,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
-@@ -570,5 +570,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
+@@ -569,5 +569,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
 MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
 
 }  // namespace media
@@ -1977,8 +2012,8 @@ 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
-@@ -666,4 +666,5 @@ BASE_FEATURE(kHstsTopLevelNavigationsOnly,
-              "HstsTopLevelNavigationsOnly",
+@@ -784,4 +784,5 @@ BASE_FEATURE(kRestrictAbusePortsOnLocalhost,
+              "RestrictAbusePortsOnLocalhost",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/net_base_features_cc.inc"
@@ -1986,9 +2021,9 @@ diff --git a/net/base/features.cc b/net/base/features.cc
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -687,6 +687,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kNewClientCertPathBuilding);
- // When enabled HSTS upgrades will only apply to top-level navigations.
- NET_EXPORT BASE_DECLARE_FEATURE(kHstsTopLevelNavigationsOnly);
+@@ -800,6 +800,7 @@ NET_EXPORT extern const base::FeatureParam<std::string>
+ // Finch-controlled list of ports that should be blocked on localhost.
+ NET_EXPORT BASE_DECLARE_FEATURE(kRestrictAbusePortsOnLocalhost);
 
 +#include "cromite_flags/net_base_features_h.inc"
 }  // namespace net::features
@@ -1997,18 +2032,18 @@ diff --git a/net/base/features.h b/net/base/features.h
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -366,4 +366,5 @@ BASE_FEATURE(kSRIMessageSignatureEnforcement,
-              "SRIMessageSignatureEnforcement",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -617,4 +617,5 @@ BASE_FEATURE_PARAM(size_t,
+                    /*name=*/"max_size",
+                    1'000'000);
 
 +#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
-@@ -155,6 +155,7 @@ BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault);
- COMPONENT_EXPORT(NETWORK_CPP)
- BASE_DECLARE_FEATURE(kSRIMessageSignatureEnforcement);
+@@ -340,6 +340,7 @@ BASE_DECLARE_FEATURE_PARAM(size_t, kSharedDictionaryCacheSize);
+ COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES)
+ BASE_DECLARE_FEATURE_PARAM(size_t, kSharedDictionaryCacheMaxSizeBytes);
 
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
 }  // namespace network::features
@@ -2017,7 +2052,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
-@@ -2898,4 +2898,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
+@@ -2912,4 +2912,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
 //
 // DO NOT ADD NEW FEATURES HERE.
 
@@ -2026,7 +2061,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
-@@ -1874,6 +1874,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
+@@ -1896,6 +1896,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
 //
 // DO NOT ADD NEW FEATURES HERE.
 
@@ -2037,18 +2072,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
-@@ -454,4 +454,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
-              "AsyncFullscreenWindowState",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -506,4 +506,5 @@ bool IsPixelCanvasRecordingEnabled() {
+   return base::FeatureList::IsEnabled(features::kEnablePixelCanvasRecording);
+ }
 
 +#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
-@@ -235,6 +235,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle);
- COMPONENT_EXPORT(UI_BASE_FEATURES)
- BASE_DECLARE_FEATURE(kAsyncFullscreenWindowState);
+@@ -252,6 +252,7 @@ BASE_DECLARE_FEATURE(kEnablePixelCanvasRecording);
+ 
+ bool COMPONENT_EXPORT(UI_BASE_FEATURES) IsPixelCanvasRecordingEnabled();
 
 +#include "cromite_flags/ui_base_features_h.inc"
 }  // namespace features
@@ -18,20 +18,21 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../customtabs/CustomTabsConnection.java      |  1 +
 .../IncognitoCustomTabIntentDataProvider.java | 14 ++++++
 .../privacy/settings/PrivacySettings.java     | 50 +++++++++++++++++++
- .../browser/flags/ChromeFeatureList.java      |  2 +
+ .../flags/android/chrome_feature_list.cc      |  2 +-
+ .../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 +
- 12 files changed, 143 insertions(+), 2 deletions(-)
+ 13 files changed, 145 insertions(+), 3 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc

 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -62,6 +62,21 @@ found in the LICENSE file.
+@@ -52,6 +52,21 @@ found in the LICENSE file.
         android:key="cromite_flags"
         android:title="@string/cromite_flags_title"
         app:url="@string/cromite_flags_url" />
@@ -56,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -64,6 +64,9 @@ import java.lang.annotation.Retention;
+@@ -61,6 +61,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Set;
 
@@ -66,8 +67,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 /**
  * Dispatches incoming intents to the appropriate activity based on the current configuration and
  * Intent fired.
-@@ -267,6 +270,9 @@ public class LaunchIntentDispatcher {
-     @OptIn(markerClass = ExperimentalAuthTab.class)
+@@ -263,6 +266,9 @@ public class LaunchIntentDispatcher {
+      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
 +        if (!ContextUtils.getAppSharedPreferences()
@@ -76,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
         Log.w(
                 TAG,
                 "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -295,6 +301,10 @@ public class LaunchIntentDispatcher {
+@@ -291,6 +297,10 @@ public class LaunchIntentDispatcher {
         // Make sure the result of the CustomTabActivity is forwarded to the client.
         newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
@@ -87,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 {
+@@ -483,6 +493,17 @@ public class LaunchIntentDispatcher {
 
         if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                 && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -108,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
-@@ -1187,7 +1187,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1257,7 +1257,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
     public @CustomTabProfileType int getCustomTabMode() {
         return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                 ? CustomTabProfileType.INCOGNITO
@@ -122,7 +123,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
-@@ -980,6 +980,7 @@ public class CustomTabsConnection {
+@@ -968,6 +968,7 @@ public class CustomTabsConnection {
         PostTask.postTask(
                 TaskTraits.UI_DEFAULT,
                 () -> {
@@ -143,7 +144,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.
-@@ -118,6 +121,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -121,6 +124,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     private static boolean isIntentFromThirdPartyAllowed() {
@@ -153,7 +154,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
         return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
     }
 
-@@ -217,6 +223,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -220,6 +226,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
@@ -164,7 +165,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()
-@@ -330,6 +340,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -329,6 +339,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
 
     @Override
     public @CustomTabProfileType int getCustomTabMode() {
@@ -178,9 +179,9 @@ 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
-@@ -60,6 +60,15 @@ import org.chromium.device.DeviceFeatureList;
- import org.chromium.device.DeviceFeatureMap;
- import org.chromium.ui.text.SpanApplier;
+@@ -80,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
+ import java.util.concurrent.TimeUnit;
+ import java.util.function.Consumer;
 
 +import android.app.role.RoleManager;
 +import android.content.Context;
@@ -191,20 +192,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +import org.chromium.base.IntentUtils;
 +import org.chromium.base.PackageManagerUtils;
 +
- import androidx.annotation.Nullable;
 import androidx.preference.PreferenceCategory;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
-@@ -112,6 +121,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     private IncognitoLockSettings mIncognitoLockSettings;
-     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+ import org.chromium.base.shared_preferences.SharedPreferencesManager;
+@@ -149,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+                 startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
+     }
 
 +    private ChromeSwitchPreference allowCustomTabIntentsPref;
 +    private ChromeSwitchPreference openExternalLinksPref;
 +
     @Override
-     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -349,6 +361,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -376,6 +388,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
     }
 
@@ -214,7 +215,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
-@@ -369,6 +384,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -396,6 +411,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -246,7 +247,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -401,6 +441,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -428,6 +468,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -263,29 +264,42 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference doNotTrackPref = findPreference(PREF_DO_NOT_TRACK);
         if (doNotTrackPref != null) {
             doNotTrackPref.setSummary(
+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
+@@ -1020,7 +1020,7 @@ BASE_FEATURE(kMagicStackAndroid,
+ // 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,
+CROMITE_FEATURE(kMayLaunchUrlUsesSeparateStoragePartition,
+              "MayLaunchUrlUsesSeparateStoragePartition",
+              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
-@@ -719,6 +719,7 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sLogoPolishAnimationKillSwitch =
-             newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true);
-     public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);
-+    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
+@@ -825,6 +825,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sMiniOriginBar = newCachedFlag(MINI_ORIGIN_BAR, false, true);
+     public static final CachedFlag sMostVisitedTilesCustomization =
+             newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false);
+    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition =
+            newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
     public static final CachedFlag sMostVisitedTilesReselect =
             newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
     public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -883,6 +884,7 @@ public abstract class ChromeFeatureList {
-                     sLogoPolishAnimationKillSwitch,
-                     sNotificationTrampoline,
+@@ -1013,6 +1015,7 @@ public abstract class ChromeFeatureList {
                     sMagicStackAndroid,
+                     sMiniOriginBar,
+                     sMostVisitedTilesCustomization,
 +                    sMayLaunchurlUsesSeparateStoragePartition,
                     sMostVisitedTilesReselect,
                     sMultiInstanceApplicationStatusCleanup,
-                     sNavBarColorAnimation,
+                     sMvcUpdateViewWhenModelChanged,
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
-@@ -87,7 +87,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
+@@ -88,7 +88,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
     public static boolean isOpenedFromExternalApp(Tab tab) {
         TabAssociatedApp app = get(tab);
         if (app == null) return false;
@@ -331,7 +345,7 @@ new file mode 100644
 diff --git a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
 --- a/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
 +++ b/components/content_relationship_verification/android/java/src/org/chromium/components/content_relationship_verification/OriginVerifier.java
-@@ -176,6 +176,11 @@ public abstract class OriginVerifier {
+@@ -180,6 +180,11 @@ public abstract class OriginVerifier {
         assert mNativeOriginVerifier != 0
                 : "Either provide a browserContextHandle to "
                         + "OriginVerifier#ctor or call initNativeOriginVerifier.";
@@ -342,7 +356,7 @@ diff --git a/components/content_relationship_verification/android/java/src/org/c
 +        }
 
         String scheme = origin.uri().getScheme();
-         String host = origin.uri().getHost();
+         String host = assumeNonNull(origin.uri().getHost());
 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
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -163,6 +163,9 @@ found in the LICENSE file.
+@@ -181,6 +181,9 @@ found in the LICENSE file.
         <item android:id="@+id/managed_by_menu_id"
             android:title="@string/managed_browser"
             android:icon="@drawable/ic_business" />
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
     </group>
 
     <!-- Items shown only in the tab switcher -->
-@@ -192,6 +195,9 @@ found in the LICENSE file.
+@@ -213,6 +216,9 @@ found in the LICENSE file.
         <item android:id="@id/preferences_id"
             android:title="@string/menu_settings"
             android:icon="@drawable/settings_cog" />
@@ -39,36 +39,36 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -292,6 +292,8 @@ import java.util.Set;
+@@ -326,6 +326,8 @@ import java.util.Map;
+ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
- import java.util.function.DoubleConsumer;
 
 +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.
-@@ -3000,6 +3002,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3361,6 +3363,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                     .closeTabs(
                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
             RecordUserAction.record("MobileTabClosed");
 +        } else if (id == R.id.exit_id) {
 +            ApplicationLifetime.terminate(false);
         } else if (id == R.id.close_all_tabs_menu_id) {
-             // Close both incognito and normal tabs.
-             Runnable closeAllTabsRunnable =
+             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
+@@ -60,6 +60,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.ActivityUtils;
- import org.chromium.chrome.browser.AppHooks;
 +import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 import org.chromium.chrome.browser.ChromeActivitySessionTracker;
 import org.chromium.chrome.browser.ChromeApplicationImpl;
 import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2374,6 +2375,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2419,6 +2420,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return true;
         }
 
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4388,6 +4388,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4436,6 +4436,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>
@@ -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"
-@@ -535,6 +536,15 @@ AutocompleteController::AutocompleteController(
+@@ -567,6 +568,15 @@ AutocompleteController::AutocompleteController(
           provider_client_->GetOmniboxTriggeredFeatureService()),
       steady_state_omnibox_position_(
           metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -45,7 +45,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
@@ -79,7 +79,7 @@ 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
-@@ -14,6 +14,8 @@
+@@ -15,6 +15,8 @@
 #include <string_view>
 
 #include "base/check_op.h"
@@ -92,7 +92,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -26,6 +26,10 @@
+@@ -22,6 +22,10 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/connect_job.h"
@@ -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"
-@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -164,6 +168,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);
@@ -45,8 +45,8 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1112,6 +1112,7 @@ component("net") {
-     "//build:chromeos_buildflags",
+@@ -1145,6 +1145,7 @@ component("net") {
+     ":net_deps",
     "//components/miracle_parameter/common",
     "//components/network_time/time_tracker",
 +    "//components/network_session_configurator/common",
@@ -56,7 +56,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -114,6 +114,7 @@
+@@ -115,6 +115,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
@@ -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"
-@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1489,6 +1490,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
     return OK;
   }
 
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -87,7 +87,12 @@ found in the LICENSE file.
+@@ -77,7 +77,12 @@ found in the LICENSE file.
         android:title="@string/settings_incognito_tab_lock_title"
         android:summary="@string/settings_incognito_tab_lock_summary_android_setting_off"
         android:persistent="false" />
@@ -45,11 +45,11 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 +        app:needRestart="false" />
     <PreferenceCategory
         android:key="security_section"
-         android:title="@string/security_section_title" />
+       android:title="@string/security_section_title" />
 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;
+@@ -35,6 +35,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;
-@@ -133,6 +134,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+@@ -126,6 +127,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
 
         @Override
         public boolean shouldDisableAllExternalIntents() {
@@ -141,17 +141,17 @@ new file mode 100644
 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
 --- a/components/external_intents/android/external_intents_features.cc
 +++ b/components/external_intents/android/external_intents_features.cc
-@@ -27,7 +27,6 @@ namespace {
- const base::Feature* kFeaturesExposedToJava[] = {
-     &kExternalNavigationDebugLogs, &kBlockFrameRenavigations,
-     &kBlockIntentsToSelf, &kTrustedClientGestureBypass};
+@@ -28,7 +28,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kExternalNavigationDebugLogs,       &kBlockIntentsToSelf,
+     &kNavigationCaptureRefactorAndroid,  &kAuxiliaryNavigationStaysInBrowser,
+     &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA};
 -
 }  // namespace
 
 // Alphabetical:
-@@ -48,7 +47,13 @@ BASE_FEATURE(kTrustedClientGestureBypass,
-              "TrustedClientGestureBypass",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -57,7 +56,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA,
+              "ReparentAuxiliaryNavigationFromPWA",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
 +                "IntentBlockExternalFormRedirectsNoGesture",
@@ -177,23 +177,23 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
-@@ -18,6 +18,12 @@ import org.chromium.base.Features;
-  */
+@@ -19,6 +19,12 @@ import org.chromium.build.annotations.NullMarked;
 @JNINamespace("external_intents")
- public class ExternalIntentsFeatures extends Features {
+ @NullMarked
+ public class ExternalIntentsFeatures {
 +    public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME =
 +            "IntentBlockExternalFormRedirectsNoGesture";
 +
-+    public static final ExternalIntentsFeatures INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE =
-+            new ExternalIntentsFeatures(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
+    public static final ExternalIntentsFeature INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE =
+            new ExternalIntentsFeature(-1, INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME);
 +
     public static final String EXTERNAL_NAVIGATION_DEBUG_LOGS_NAME = "ExternalNavigationDebugLogs";
-     public static final String BLOCK_FRAME_RENAVIGATIONS_NAME = "BlockFrameRenavigations3";
     public static final String BLOCK_INTENTS_TO_SELF_NAME = "BlockIntentsToSelf";
+     public static final String NAVIGATION_CAPTURE_REFACTOR_ANDROID_NAME =
 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
-@@ -1530,6 +1530,12 @@ public class ExternalNavigationHandler {
+@@ -1560,6 +1560,12 @@ public class ExternalNavigationHandler {
                 || ignoreBackForwardNav(params);
     }
 
@@ -206,7 +206,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
     private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
             ExternalNavigationParams params,
             Intent targetIntent,
-@@ -1586,6 +1592,21 @@ public class ExternalNavigationHandler {
+@@ -1617,6 +1623,21 @@ public class ExternalNavigationHandler {
             return OverrideUrlLoadingResult.forNoOverride();
         }
 
@@ -104,9 +104,9 @@ 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
-@@ -853,6 +853,10 @@
-       status: {"Android": "stable"},
-       base_feature: "none",
+@@ -987,6 +987,10 @@
+     {
+       name: "CompositingDecisionAtAnimationPhaseBoundaries"
     },
 +    {
 +      name: "Vibration",
@@ -7,42 +7,59 @@ 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 | 11 ++++++++++-
+ build/config/compiler/BUILD.gn | 14 +++++++++++---
 build_overrides/build.gni      |  3 +++
- 2 files changed, 13 insertions(+), 1 deletion(-)
+ 2 files changed, 14 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
-@@ -1980,7 +1980,6 @@ config("default_warnings") {
-         # TODO(crbug.com/40284799): Fix and re-enable.
-         "-Wno-thread-safety-reference-return",
+@@ -640,7 +640,7 @@ config("compiler") {
+     # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF
+     # (excluding toolchains that use an older version of LLVM).
+     # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
+-    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" &&
+         default_toolchain != "//build/toolchain/cros:target") {
+       cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
+     }
+@@ -1784,7 +1784,7 @@ config("clang_revision") {
+ config("clang_warning_suppression") {
+   # Some build configs use older versions of clang that don't support WSMs
+   if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+-      !llvm_android_mainline && is_clang &&
+      !llvm_android_mainline && is_clang && !skip_clangd_unsupported_options &&
+       clang_warning_suppression_file != "") {
+     from_build_root =
+         rebase_path(clang_warning_suppression_file, root_build_dir)
+@@ -2146,7 +2146,6 @@ config("default_warnings") {
+         # TODO(crbug.com/376641662): Fix and re-enable.
+         "-Wno-nontrivial-memcall",
       ]
 -
       cflags_cc += [
         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
         "-Wenum-compare-conditional",
-@@ -2001,6 +2000,16 @@ config("default_warnings") {
-         # TODO(crbug.com/376641662): Fix and re-enable.
-         cflags += [ "-Wno-nontrivial-memcall" ]
-       }
-+      if (skip_clangd_unsupported_options) {
-+        cflags -= [
-+          "-Wno-thread-safety-reference-return",
-+        ]
-+        cflags_cc -= [
-+          "-Wno-c++11-narrowing-const-reference",
-+          "-Wno-missing-template-arg-list-after-template-kw",
-+          "-Wno-dangling-assignment-gsl",
-+        ]
-+      }
+@@ -2187,6 +2186,15 @@ config("default_warnings") {
+       ]
     }
 
-     # Some builders, such as Cronet, use a different version of Clang than
+    if (skip_clangd_unsupported_options) {
+      cflags -= [
+        "-Wno-thread-safety-reference-return",
+        "-Wno-nontrivial-memcall",
+      ]
+      cflags_cc -= [
+      ]
+    }
+
+     # Disable the GNU line marker warning when building a target with Icecc,
+     # ccache, or both. This warning appears frequently when compiling
+     # files that use GNU-style line markers with Clang and Icecc. It can
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -54,6 +54,9 @@ declare_args() {
+@@ -62,6 +62,9 @@ declare_args() {
   # to lack of toolchain support.
   gtest_enable_absl_printers = !is_nacl
 
@@ -4,37 +4,38 @@ Subject: Add menu item to bookmark all tabs

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/main_menu.xml    |  7 ++
- .../chrome/browser/ChromeTabbedActivity.java  | 24 +++++++
- .../browser/bookmarks/BookmarkBridge.java     | 67 +++++++++++++++++++
- .../bookmarks/android/bookmark_bridge.cc      | 44 +++++++++++-
- .../bookmarks/android/bookmark_bridge.h       |  8 +++
- .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
- .../bookmark_merged_surface_service.cc        |  3 +
+ chrome/android/java/res/menu/main_menu.xml    |  7 +++
+ .../chrome/browser/ChromeTabbedActivity.java  | 43 +++++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.cc      | 42 ++++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.h       |  8 ++++
+ .../browser/bookmarks/BookmarkBridge.java     | 41 ++++++++++++++++++
+ .../browser/bookmarks/bookmark_html_writer.cc | 14 +++++-
+ .../bookmarks/bookmark_parent_folder.cc       |  1 +
 .../permanent_folder_ordering_tracker.cc      |  2 +
 .../dialogs/DownloadLocationCustomView.java   |  4 +-
- .../strings/android_chrome_strings.grd        |  3 +
+ .../strings/android_chrome_strings.grd        |  3 ++
 .../bookmark_ui_operations_helper.cc          |  2 +
- components/bookmark_bar_strings.grdp          |  6 ++
- .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
- components/bookmarks/browser/bookmark_codec.h |  7 +-
- .../browser/bookmark_load_details.cc          | 14 +++-
+ components/bookmark_bar_strings.grdp          |  6 +++
+ .../bookmarks/browser/bookmark_codec.cc       | 20 +++++++--
+ components/bookmarks/browser/bookmark_codec.h |  7 ++-
+ .../browser/bookmark_load_details.cc          | 15 +++++--
 .../bookmarks/browser/bookmark_load_details.h |  2 +
 .../bookmarks/browser/bookmark_model.cc       |  3 +-
- components/bookmarks/browser/bookmark_model.h |  7 ++
- components/bookmarks/browser/bookmark_node.cc | 11 +++
- components/bookmarks/browser/bookmark_node.h  |  3 +
+ components/bookmarks/browser/bookmark_model.h |  7 +++
+ components/bookmarks/browser/bookmark_node.cc | 13 ++++++
+ components/bookmarks/browser/bookmark_node.h  |  4 ++
 .../bookmarks/browser/bookmark_storage.cc     |  2 +
- .../bookmarks/browser/bookmark_uuids.cc       |  3 +
+ .../bookmarks/browser/bookmark_uuids.cc       |  3 ++
 components/bookmarks/browser/bookmark_uuids.h |  1 +
- components/bookmarks/browser/model_loader.cc  |  8 ++-
+ components/bookmarks/browser/model_loader.cc  |  9 +++-
+ ...ookmark_model_merger_comparison_metrics.cc |  4 ++
 .../bookmark_specifics_conversions.cc         |  1 +
- 25 files changed, 248 insertions(+), 15 deletions(-)
+ 26 files changed, 250 insertions(+), 14 deletions(-)

 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -74,6 +74,10 @@ found in the LICENSE file.
+@@ -77,6 +77,10 @@ found in the LICENSE file.
         <item android:id="@+id/all_bookmarks_menu_id"
             android:title="@string/menu_bookmarks"
             android:icon="@drawable/btn_star_filled" />
@@ -45,7 +46,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
         <item android:id="@+id/recent_tabs_menu_id"
             android:title="@string/menu_recent_tabs"
             android:icon="@drawable/devices_black_24dp" />
-@@ -186,6 +190,9 @@ found in the LICENSE file.
+@@ -207,6 +211,9 @@ found in the LICENSE file.
         <item android:id="@id/tinker_tank_menu_id"
             android:title="@string/menu_tinker_tank"
             android:icon="@drawable/ic_add_box_rounded_corner" />
@@ -58,7 +59,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -96,6 +96,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
+@@ -103,6 +103,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;
@@ -66,16 +67,35 @@ 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;
-@@ -3032,6 +3033,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -275,6 +276,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
+ 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.ExtensionKeybindingRegistry;
+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
+ import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
+ import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
+ import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig;
+@@ -284,6 +288,8 @@ import org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController;
+ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
+ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
+ import org.chromium.chrome.browser.xr.XrLayoutStateObserver;
+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;
+@@ -3394,6 +3400,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                     getTabModelSelectorSupplier().get(),
                     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) {
-             // Close only incognito tabs
-             Runnable closeAllTabsRunnable =
-@@ -3117,6 +3120,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
+ 
+@@ -3502,6 +3510,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
     }
 
@@ -94,147 +114,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +                if (tab.isNativePage()) {
 +                    continue;
 +                }
-+                bookmarkModel.addToTabsCollection(this, tab);
+                bookmarkModel.addToTabsCollection(tab);
 +            }
-+            bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager());
+            BookmarkId parent = bookmarkModel.getTabsCollectionFolderId();
+            BookmarkItem bookmarkItem = bookmarkModel.getBookmarkById(parent);
+            String folderName = "";
+            if (bookmarkItem != null) {
+                folderName = bookmarkItem.getTitle();
+            }
+            SnackbarController snackbarController = new SnackbarController() {
+                @Override
+                public void onAction(Object actionData) {
+                }
+            };
+            Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
+                            Snackbar.UMA_BOOKMARK_ADDED)
+                            .setTemplateText(getString(R.string.bookmark_page_saved_folder));
+            getSnackbarManager().showSnackbar(snackbar);
 +        });
 +    }
 +
     private void recordLauncherShortcutAction(boolean isIncognito) {
         if (isIncognito) {
             RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab");
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -17,6 +17,7 @@ import org.jni_zero.JniType;
- import org.jni_zero.NativeMethods;
- 
- import org.chromium.base.ContextUtils;
-+import org.chromium.base.Log;
- import org.chromium.base.ObserverList;
- import org.chromium.base.ThreadUtils;
- import org.chromium.base.metrics.RecordUserAction;
-@@ -24,6 +25,11 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
- import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
- import org.chromium.chrome.browser.profiles.Profile;
-+import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
-+import org.chromium.chrome.R;
- import org.chromium.components.bookmarks.BookmarkId;
- import org.chromium.components.bookmarks.BookmarkItem;
- import org.chromium.components.bookmarks.BookmarkType;
-@@ -83,6 +89,8 @@ import org.chromium.ui.modaldialog.DialogDismissalCause;
- class BookmarkBridge {
-     private final ObserverList<BookmarkModelObserver> mObservers = new ObserverList<>();
- 
-+    private static final String TAG = "BookmarkBridge";
-+
-     private long mNativeBookmarkBridge;
-     private Profile mProfile;
-     private boolean mIsDoingExtensiveChanges;
-@@ -411,6 +419,16 @@ class BookmarkBridge {
-         return mMobileFolderId;
-     }
- 
-+    /**
-+     * @return The BookmarkId for the Tabs collecction folder node
-+     */
-+    public BookmarkId getTabsCollectionFolderId() {
-+        ThreadUtils.assertOnUiThread();
-+        assert mIsNativeBookmarkModelLoaded;
-+        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
-+                mNativeBookmarkBridge, BookmarkBridge.this);
-+    }
-+
-     /** Returns Id representing the special "other" folder from bookmark model. */
-     public BookmarkId getOtherFolderId() {
-         ThreadUtils.assertOnUiThread();
-@@ -1132,6 +1150,50 @@ class BookmarkBridge {
-                 .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
-     }
- 
-+    // Used to bookmark all tabs in a specific folder, created if not existing
-+    public BookmarkId addToTabsCollection(Context context, Tab tab) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+        BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection(
-+                mNativeBookmarkBridge, tab.getOriginalUrl());
-+        if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
-+            BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL);
-+            BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
-+            if (parent.equals(existingBookmark.getParentId())) {
-+                // bookmark already exists in the tabs collection folder
-+                return existingBookmarkId;
-+            }
-+        }
-+        BookmarkId bookmarkId =
-+                addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl());
-+
-+        if (bookmarkId == null) {
-+            Log.e(TAG,
-+                    "Failed to add bookmarks: parentTypeAndId %s", parent);
-+        }
-+        return bookmarkId;
-+     }
-+
-+     public void finishedAddingToTabsCollection(Activity activity, SnackbarManager snackbarManager) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+
-+        BookmarkItem bookmarkItem = getBookmarkById(parent);
-+        String folderName;
-+        if (bookmarkItem != null) {
-+            folderName = bookmarkItem.getTitle();
-+        } else {
-+            folderName = "";
-+        }
-+        SnackbarController snackbarController = new SnackbarController() {
-+            @Override
-+            public void onAction(Object actionData) {
-+            }
-+        };
-+        Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
-+                        Snackbar.UMA_BOOKMARK_ADDED)
-+                        .setTemplateText(activity.getString(R.string.bookmark_page_saved_folder));
-+        snackbarManager.showSnackbar(snackbar);
-+    }
-+
-     /**
-      * Helper method to mark an item as read.
-      *
-@@ -1339,6 +1401,9 @@ class BookmarkBridge {
-         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
-                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
- 
-+        BookmarkId getBookmarkIdForTabsCollection(
-+                long nativeBookmarkBridge, GURL url);
-+
-         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
- 
-         void getTopLevelFolderIds(
-@@ -1360,6 +1425,8 @@ class BookmarkBridge {
- 
-         BookmarkId getRootFolderId(long nativeBookmarkBridge);
- 
-+        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-+
-         BookmarkId getMobileFolderId(long nativeBookmarkBridge);
- 
-         BookmarkId getOtherFolderId(long nativeBookmarkBridge);
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -185,7 +185,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
- 
-     JNIEnv* env = AttachCurrentThread();
-     Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
-                                          ConvertUTF8ToJavaString(env, export_path_),
-+                                          base::android::ConvertUTF8ToJavaString(env, export_path_),
-                                           result == Result::kSuccess);
-     delete this;
-   }
-@@ -363,6 +363,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
+@@ -390,6 +390,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
   return bookmark_model_->account_mobile_node() != nullptr;
 }
 
@@ -268,7 +174,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 base::android::ScopedJavaLocalRef<jobject>
 BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
                                                          const GURL& url) {
-@@ -475,6 +502,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -502,6 +529,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
   // Vector to temporarily contain all child bookmarks at same level for sorting
   std::vector<const BookmarkNode*> bookmarks = {
       bookmark_model_->mobile_node(),
@@ -276,7 +182,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
       bookmark_model_->bookmark_bar_node(),
       bookmark_model_->other_node(),
   };
-@@ -568,6 +596,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+@@ -610,6 +638,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
     top_level_folders.push_back(other_node);
   }
 
@@ -285,8 +191,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +
   const BookmarkNode* reading_list_node =
       local_or_syncable_reading_list_manager_->GetRoot();
-   if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
-@@ -1269,6 +1300,17 @@ void BookmarkBridge::GetBookmarksOfType(
+   if (IsPermanentFolderVisible(
+@@ -1337,6 +1368,17 @@ void BookmarkBridge::GetBookmarksOfType(
   AddBookmarkNodesToBookmarkIdList(env, j_list, results);
 }
 
@@ -307,7 +213,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.h
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
-@@ -79,6 +79,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -106,6 +106,10 @@ class BookmarkBridge : public ProfileObserver,
 
   jboolean AreAccountBookmarkFoldersActive(JNIEnv* env);
 
@@ -318,7 +224,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   base::android::ScopedJavaLocalRef<jobject>
   GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url);
   const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl(
-@@ -222,6 +226,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -250,6 +254,10 @@ class BookmarkBridge : public ProfileObserver,
                           const base::android::JavaParamRef<jobject>& j_list,
                           jint type);
 
@@ -329,63 +235,162 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   base::android::ScopedJavaLocalRef<jobject> AddFolder(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& j_parent_id_obj,
+diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+@@ -16,6 +16,7 @@ import org.jni_zero.JniType;
+ import org.jni_zero.NativeMethods;
+ 
+ import org.chromium.base.ContextUtils;
+import org.chromium.base.Log;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.metrics.RecordUserAction;
+@@ -26,6 +27,7 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkItem;
+ import org.chromium.components.bookmarks.BookmarkType;
+@@ -47,6 +49,7 @@ import java.util.function.BiConsumer;
+ class BookmarkBridge {
+     private static final OneshotSupplierImpl<BookmarkModel.PartnerBookmarkIteratorProvider>
+             sPartnerBookmarkIteratorSupplier = new OneshotSupplierImpl<>();
+    private static final String TAG = "BookmarkBridge";
+ 
+     private final ObserverList<BookmarkModelObserver> mObservers = new ObserverList<>();
+     private final Profile mProfile;
+@@ -385,6 +388,16 @@ class BookmarkBridge {
+         return mMobileFolderId;
+     }
+ 
+    /**
+     * @return The BookmarkId for the Tabs collecction folder node
+     */
+    public BookmarkId getTabsCollectionFolderId() {
+        ThreadUtils.assertOnUiThread();
+        assert mIsNativeBookmarkModelLoaded;
+        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
+                mNativeBookmarkBridge, BookmarkBridge.this);
+    }
+
+     /** Returns Id representing the special "other" folder from bookmark model. */
+     public @Nullable BookmarkId getOtherFolderId() {
+         ThreadUtils.assertOnUiThread();
+@@ -898,6 +911,29 @@ class BookmarkBridge {
+                 .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
+     }
+ 
+    // Used to bookmark all tabs in a specific folder, created if not existing
+    public BookmarkId addToTabsCollection(Tab tab) {
+        BookmarkId parent = getTabsCollectionFolderId();
+        BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection(
+                mNativeBookmarkBridge, tab.getOriginalUrl());
+        if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
+            BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL);
+            BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
+            if (parent.equals(existingBookmark.getParentId())) {
+                // bookmark already exists in the tabs collection folder
+                return existingBookmarkId;
+            }
+        }
+        BookmarkId bookmarkId =
+                addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl());
+
+        if (bookmarkId == null) {
+            Log.e(TAG,
+                    "Failed to add bookmarks: parentTypeAndId %s", parent);
+        }
+        return bookmarkId;
+     }
+
+     /**
+      * Helper method to mark an item as read.
+      *
+@@ -1115,6 +1151,9 @@ class BookmarkBridge {
+         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
+                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
+ 
+        BookmarkId getBookmarkIdForTabsCollection(
+                long nativeBookmarkBridge, GURL url);
+
+         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
+ 
+         void getTopLevelFolderIds(
+@@ -1136,6 +1175,8 @@ class BookmarkBridge {
+ 
+         BookmarkId getRootFolderId(long nativeBookmarkBridge);
+ 
+        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
+
+         BookmarkId getMobileFolderId(long nativeBookmarkBridge);
+ 
+         BookmarkId getOtherFolderId(long nativeBookmarkBridge);
 diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
 +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
-@@ -174,7 +174,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+@@ -169,14 +169,15 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
     BookmarkCodec codec;
-     bookmarks_ =
+     local_bookmarks_ =
         codec.Encode(model->bookmark_bar_node(), model->other_node(),
 -                     model->mobile_node(), /*sync_metadata_str=*/std::string());
 +                     model->mobile_node(), model->tabs_collection_node(),
 +                     /*sync_metadata_str=*/std::string());
-   }
 
-   Writer(const Writer&) = delete;
-@@ -201,15 +202,19 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
-         roots->FindDict(BookmarkCodec::kOtherBookmarkFolderNameKey);
-     base::Value::Dict* mobile_folder_value =
-         roots->FindDict(BookmarkCodec::kMobileBookmarkFolderNameKey);
+     if (model->account_bookmark_bar_node()) {
+       CHECK(model->account_other_node());
+       CHECK(model->account_mobile_node());
+       account_bookmarks_ = codec.Encode(
+           model->account_bookmark_bar_node(), model->account_other_node(),
+-          model->account_mobile_node(), /*sync_metadata_str=*/std::string());
+          model->account_mobile_node(), /*tabs_folder_node*/ nullptr, /*sync_metadata_str=*/std::string());
+     } else {
+       CHECK(!model->account_other_node());
+       CHECK(!model->account_mobile_node());
+@@ -210,6 +211,9 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+     base::Value::Dict* mobile_folder_value = local_permanent_folders->FindDict(
+         BookmarkCodec::kMobileBookmarkFolderNameKey);
+     CHECK(mobile_folder_value);
 +    base::Value::Dict* tabs_collection_value =
-+        roots->FindDict(BookmarkCodec::kTabsBookmarkFolderNameKey);
-     DCHECK(root_folder_value);
-     DCHECK(other_folder_value);
-     DCHECK(mobile_folder_value);
-+    DCHECK(tabs_collection_value);
+        local_permanent_folders->FindDict(BookmarkCodec::kTabsBookmarkFolderNameKey);
+    CHECK(tabs_collection_value);
 
-     IncrementIndent();
- 
-     if (!WriteNode(*root_folder_value, BookmarkNode::BOOKMARK_BAR) ||
-         !WriteNode(*other_folder_value, BookmarkNode::OTHER_NODE) ||
-        !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE)) {
-+        !WriteNode(*mobile_folder_value, BookmarkNode::MOBILE) ||
-+        !WriteNode(*tabs_collection_value, BookmarkNode::TABS_COLLECTION)) {
-       NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes);
-       return;
+     base::Value::Dict* account_permanent_folders =
+         account_bookmarks_.FindDict(BookmarkCodec::kRootsKey);
+@@ -285,6 +289,10 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+       return bookmark_html_writer::Result::kCouldNotWriteNodes;
     }
-@@ -460,6 +465,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
-       BookmarkModelFactory::GetForBrowserContext(profile_)->other_node());
-   ExtractUrls(
-       BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node());
-+  ExtractUrls(
-+      BookmarkModelFactory::GetForBrowserContext(profile_)->tabs_collection_node());
-   if (!bookmark_urls_.empty())
-     FetchNextFavicon();
-   else
-diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
--- a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
-+++ b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
-@@ -44,6 +44,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
 
-     case BookmarkNode::Type::URL:
-       NOTREACHED();
-+    case BookmarkNode::Type::TABS_COLLECTION:
-+      NOTREACHED();
-   }
-   NOTREACHED();
- }
-@@ -99,6 +101,7 @@ BookmarkParentFolder BookmarkParentFolder::FromFolderNode(
-   }
+    if (!WriteDescendants(*tabs_collection_value)) {
+      return bookmark_html_writer::Result::kCouldNotWriteNodes;
+    }
+
+     DecrementIndent();
+ 
+     if (!Write(kFolderChildrenEnd) || !Write(kNewline)) {
+@@ -431,6 +439,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+       case BookmarkNode::URL:
+       case BookmarkNode::OTHER_NODE:
+       case BookmarkNode::MOBILE:
+      case BookmarkNode::TABS_COLLECTION:
+         NOTREACHED();
+     }
+ 
+@@ -559,6 +568,7 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
+   ExtractUrls(model->bookmark_bar_node());
+   ExtractUrls(model->other_node());
+   ExtractUrls(model->mobile_node());
+  ExtractUrls(model->tabs_collection_node());
+ 
+   if (model->account_bookmark_bar_node()) {
+     CHECK(model->account_other_node());
+diff --git a/chrome/browser/bookmarks/bookmark_parent_folder.cc b/chrome/browser/bookmarks/bookmark_parent_folder.cc
+--- a/chrome/browser/bookmarks/bookmark_parent_folder.cc
+++ b/chrome/browser/bookmarks/bookmark_parent_folder.cc
+@@ -18,6 +18,7 @@ BookmarkParentFolder GetBookmarkParentFolderFromPermanentNode(
+   CHECK(node->is_permanent_node());
   switch (node->type()) {
     case bookmarks::BookmarkNode::URL:
 +    case bookmarks::BookmarkNode::TABS_COLLECTION:
@@ -395,7 +400,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrom
 diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
 --- a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
 +++ b/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc
-@@ -22,6 +22,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) {
+@@ -26,6 +26,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) {
   switch (type) {
     case bookmarks::BookmarkNode::URL:
     case bookmarks::BookmarkNode::FOLDER:
@@ -403,7 +408,7 @@ diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chr
       NOTREACHED();
 
     case bookmarks::BookmarkNode::BOOKMARK_BAR:
-@@ -168,6 +169,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() {
+@@ -303,6 +304,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() {
   switch (tracked_type_) {
     case bookmarks::BookmarkNode::URL:
     case bookmarks::BookmarkNode::FOLDER:
@@ -414,7 +419,7 @@ diff --git a/chrome/browser/bookmarks/permanent_folder_ordering_tracker.cc b/chr
 diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 --- a/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
 +++ b/chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/dialogs/DownloadLocationCustomView.java
-@@ -85,7 +85,7 @@ public class DownloadLocationCustomView extends ScrollView
+@@ -88,7 +88,7 @@ public class DownloadLocationCustomView extends ScrollView
         mDirectoryAdapter.update();
     }
 
@@ -423,7 +428,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
         mTitle.setText(title);
     }
 
-@@ -93,7 +93,7 @@ public class DownloadLocationCustomView extends ScrollView
+@@ -96,7 +96,7 @@ public class DownloadLocationCustomView extends ScrollView
         mSubtitleView.setText(subtitle);
     }
 
@@ -435,7 +440,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
-@@ -4515,6 +4515,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4541,6 +4541,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>
@@ -448,7 +453,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
 --- a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
 +++ b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc
-@@ -137,6 +137,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
+@@ -104,6 +104,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
   if (is_reorder) {
     base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target);
     switch (target_parent()->GetType()) {
@@ -641,16 +646,17 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
 
 void UpdateUserFolderStatsRecursively(const BookmarkNode& node,
                                       bool top_level,
-@@ -60,6 +60,8 @@ BookmarkLoadDetails::BookmarkLoadDetails()
-       root_node_->Add(BookmarkPermanentNode::CreateOtherBookmarks(/*id=*/0)));
+@@ -63,6 +63,9 @@ BookmarkLoadDetails::BookmarkLoadDetails()
   mobile_folder_node_ = static_cast<BookmarkPermanentNode*>(
-       root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks(/*id=*/0)));
+       root_node_->Add(BookmarkPermanentNode::CreateMobileBookmarks(
+           /*id=*/0, /*is_account_node=*/false)));
 +  tabs_collection_folder_node_ = static_cast<BookmarkPermanentNode*>(
-+      root_node_->Add(BookmarkPermanentNode::CreateTabsCollectionBookmarks(/*id=*/0)));
+      root_node_->Add(BookmarkPermanentNode::CreateTabsCollectionBookmarks(
+          /*id=*/0, /*is_account_node=*/false)));
 
-   CHECK_EQ(kNumDefaultTopLevelPermanentFolders, root_node_->children().size());
- }
-@@ -106,6 +108,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
+   // Set the nodes' `date_added` to the same time so that there is no inherent
+   // hierarchy in terms of their added time between them. This is relevant for
+@@ -119,6 +122,10 @@ void BookmarkLoadDetails::PopulateNodeIdsForLocalOrSyncablePermanentNodes() {
   if (mobile_folder_node_->id() == 0) {
     mobile_folder_node_->set_id(max_id_++);
   }
@@ -661,7 +667,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
 }
 
 void BookmarkLoadDetails::AddManagedNode(
-@@ -118,6 +124,7 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -131,6 +138,7 @@ void BookmarkLoadDetails::AddManagedNode(
   CHECK_NE(bb_node_->id(), 0);
   CHECK_NE(other_folder_node_->id(), 0);
   CHECK_NE(mobile_folder_node_->id(), 0);
@@ -669,7 +675,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
 
   has_managed_node_ = true;
   root_node_->Add(std::move(managed_node));
-@@ -125,8 +132,8 @@ void BookmarkLoadDetails::AddManagedNode(
+@@ -138,8 +146,8 @@ void BookmarkLoadDetails::AddManagedNode(
 
 void BookmarkLoadDetails::CreateIndices() {
   local_or_syncable_uuid_index_.insert(root_node_.get());
@@ -680,7 +686,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/
   for (const auto& child : root_node_->children()) {
     if (child.get() == account_bb_node_ ||
         child.get() == account_other_folder_node_ ||
-@@ -145,6 +152,7 @@ void BookmarkLoadDetails::ResetPermanentNodePointers() {
+@@ -158,6 +166,7 @@ void BookmarkLoadDetails::ResetPermanentNodePointers() {
   bb_node_ = nullptr;
   other_folder_node_ = nullptr;
   mobile_folder_node_ = nullptr;
@@ -710,16 +716,16 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
 --- a/components/bookmarks/browser/bookmark_model.cc
 +++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -825,7 +825,7 @@ bool BookmarkModel::HasBookmarks() const {
- bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   return bookmark_bar_node_->children().empty() &&
-         other_node_->children().empty() && mobile_node_->children().empty();
-+         other_node_->children().empty() && mobile_node_->children().empty() && tabs_collection_node_->children().empty();
+@@ -908,7 +908,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
+          (account_bookmark_bar_node_ &&
+           !account_bookmark_bar_node_->children().empty()) ||
+          (account_other_node_ && !account_other_node_->children().empty()) ||
+-         (account_mobile_node_ && !account_mobile_node_->children().empty());
+         (account_mobile_node_ && !account_mobile_node_->children().empty() && tabs_collection_node_->children().empty());
 }
 
 bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1147,6 +1147,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1240,6 +1240,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
   bookmark_bar_node_ = details->bb_node();
   other_node_ = details->other_folder_node();
   mobile_node_ = details->mobile_folder_node();
@@ -730,12 +736,12 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -151,6 +151,12 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -150,6 +150,12 @@ class BookmarkModel : public BookmarkUndoProvider,
   // bookmarks in the account storage).
-   const BookmarkNode* account_mobile_node() const;
+   const BookmarkPermanentNode* account_mobile_node() const;
 
 +  // Returns the 'mobile' node. This is NULL until loaded.
-+  const BookmarkNode* tabs_collection_node() const {
+  const BookmarkPermanentNode* tabs_collection_node() const {
 +    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +    return tabs_collection_node_;
 +  }
@@ -743,7 +749,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
   bool is_root_node(const BookmarkNode* node) const {
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     return node == root_;
-@@ -592,6 +598,7 @@ class BookmarkModel : public BookmarkUndoProvider,
+@@ -628,6 +634,7 @@ class BookmarkModel : public BookmarkUndoProvider,
   raw_ptr<BookmarkPermanentNode> account_bookmark_bar_node_ = nullptr;
   raw_ptr<BookmarkPermanentNode> account_other_node_ = nullptr;
   raw_ptr<BookmarkPermanentNode> account_mobile_node_ = nullptr;
@@ -763,17 +769,19 @@ diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmark
     case BookmarkNode::URL:
       NOTREACHED();
     case BookmarkNode::FOLDER:
-@@ -211,6 +213,15 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id) {
-       l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME)));
+@@ -213,6 +215,17 @@ BookmarkPermanentNode::CreateMobileBookmarks(int64_t id,
+       is_account_node));
 }
 
 +// static
 +std::unique_ptr<BookmarkPermanentNode>
-+BookmarkPermanentNode::CreateTabsCollectionBookmarks(int64_t id) {
+BookmarkPermanentNode::CreateTabsCollectionBookmarks(int64_t id,
+                                                     bool is_account_node) {
 +  // base::WrapUnique() used because the constructor is private.
 +  return base::WrapUnique(new BookmarkPermanentNode(
 +      id, TABS_COLLECTION, base::Uuid::ParseLowercase(kTabsCollectionBookmarksNodeUuid),
-+      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME)));
+      l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_TABS_COLLECTION_FOLDER_NAME),
+      is_account_node));
 +}
 +
 BookmarkPermanentNode::BookmarkPermanentNode(int64_t id,
@@ -790,12 +798,13 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
     MOBILE
   };
 
-@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode {
-       int64_t id);
+@@ -249,6 +250,9 @@ class BookmarkPermanentNode : public BookmarkNode {
   static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
-       int64_t id);
+       int64_t id,
+       bool is_account_node);
 +  static std::unique_ptr<BookmarkPermanentNode> CreateTabsCollectionBookmarks(
-+      int64_t id);
+      int64_t id,
+      bool is_account_node);
 
   // Returns whether the permanent node of type `type` should be visible even
   // when it is empty (i.e. no children).
@@ -845,16 +854,17 @@ diff --git a/components/bookmarks/browser/bookmark_uuids.h b/components/bookmark
 diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc
 --- a/components/bookmarks/browser/model_loader.cc
 +++ b/components/bookmarks/browser/model_loader.cc
-@@ -71,6 +71,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
-         BookmarkPermanentNode::CreateOtherBookmarks(0);
+@@ -74,6 +74,9 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
     std::unique_ptr<BookmarkPermanentNode> account_mobile_folder_node =
-         BookmarkPermanentNode::CreateMobileBookmarks(0);
+         BookmarkPermanentNode::CreateMobileBookmarks(
+             0, /*is_account_node=*/true);
 +    std::unique_ptr<BookmarkPermanentNode> tabs_collection_folder_node =
-+        BookmarkPermanentNode::CreateTabsCollectionBookmarks(0);
+        BookmarkPermanentNode::CreateTabsCollectionBookmarks(
+            0, /*is_account_node=*/true);
 
     std::optional<base::Value::Dict> root_dict =
         LoadFileToDict(account_file_path);
-@@ -78,7 +80,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -81,7 +84,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
     if (root_dict.has_value() &&
         codec.Decode(*root_dict, /*already_assigned_ids=*/{},
                      account_bb_node.get(), account_other_folder_node.get(),
@@ -864,7 +874,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();
 
-@@ -120,7 +123,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -123,7 +127,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
     if (root_dict.has_value() &&
         codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
                      details->bb_node(), details->other_folder_node(),
@@ -874,6 +884,27 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
                      &sync_metadata_str)) {
       details->set_local_or_syncable_sync_metadata_str(
           std::move(sync_metadata_str));
+diff --git a/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc b/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
+--- a/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
+++ b/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
+@@ -38,6 +38,7 @@ const char kOtherBookmarksTag[] = "other_bookmarks";
+ constexpr char16_t kBookmarkBarFolderName[] = u"__Bookmarks bar__";
+ constexpr char16_t kOtherBookmarksFolderName[] = u"__Other bookmarks__";
+ constexpr char16_t kMobileBookmarksFolderName[] = u"__Mobile bookmarks__";
+constexpr char16_t kTabsCollectionBookmarksFolderName[] = u"__Tabs collection__";
+ 
+ using RemoteForest = BookmarkModelMerger::RemoteForest;
+ using RemoteTreeNode = BookmarkModelMerger::RemoteTreeNode;
+@@ -129,6 +130,9 @@ std::u16string_view GetBookmarkNodeTitle(const bookmarks::BookmarkNode* node) {
+       return kOtherBookmarksFolderName;
+     case bookmarks::BookmarkNode::MOBILE:
+       return kMobileBookmarksFolderName;
+    case bookmarks::BookmarkNode::TABS_COLLECTION:
+      return kTabsCollectionBookmarksFolderName;
+
+   }
+   NOTREACHED();
+ }
 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
@@ -4,19 +4,20 @@ Subject: Add menu item to view source

 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../android/java/res/menu/custom_tabs_menu.xml |  3 +++
- chrome/android/java/res/menu/main_menu.xml     |  3 +++
- .../chrome/browser/ChromeTabbedActivity.java   |  2 ++
- .../chrome/browser/app/ChromeActivity.java     |  5 +++++
- .../appmenu/AppMenuPropertiesDelegateImpl.java | 18 ++++++++++++++++++
- .../CustomTabAppMenuPropertiesDelegate.java    |  1 +
- .../android/strings/android_chrome_strings.grd |  4 ++++
- 7 files changed, 36 insertions(+)
+ .../android/java/res/menu/custom_tabs_menu.xml  |  3 +++
+ chrome/android/java/res/menu/main_menu.xml      |  3 +++
+ .../chrome/browser/ChromeTabbedActivity.java    |  2 ++
+ .../chrome/browser/app/ChromeActivity.java      |  5 +++++
+ .../appmenu/AppMenuPropertiesDelegateImpl.java  | 17 +++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java     |  2 +-
+ .../TabbedAppMenuPropertiesDelegate.java        |  6 +++---
+ .../android/strings/android_chrome_strings.grd  |  4 ++++
+ 8 files changed, 38 insertions(+), 4 deletions(-)

 diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
 --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
 +++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
-@@ -58,6 +58,9 @@ found in the LICENSE file.
+@@ -73,6 +73,9 @@ found in the LICENSE file.
         <item android:id="@+id/universal_install"
             android:title="@string/menu_add_to_homescreen"
             android:orderInCategory="2" />
@@ -29,7 +30,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -116,6 +116,9 @@ found in the LICENSE file.
+@@ -131,6 +131,9 @@ found in the LICENSE file.
         <item android:id="@+id/universal_install"
             android:title="@string/menu_add_to_homescreen"
             android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +43,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -3065,6 +3065,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3434,6 +3434,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +55,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
-@@ -2518,6 +2518,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2576,6 +2576,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return doOpenWebApk(currentTab);
         }
 
@@ -69,16 +70,8 @@ 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
-@@ -580,6 +580,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
- 
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
-+        updateViewSourceMenuItem(menu, currentTab);
- 
-         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
- 
-@@ -1281,6 +1282,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
-         findInPageMenuRow.setVisible(itemVisible);
+@@ -864,6 +864,23 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+         }
     }
 
 +    /**
@@ -104,18 +97,49 @@ 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
-@@ -303,6 +303,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
- 
+@@ -331,7 +331,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             // --- Request Desktop Site ---
             updateRequestDesktopSiteMenuItem(
                     menu, currentTab, requestDesktopSiteVisible, isNativePage);
+-
 +            updateViewSourceMenuItem(menu, currentTab);
-             prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
+             // --- Translate ---
+             prepareTranslateMenuItem(menu, currentTab);
+ 
+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
+@@ -173,7 +173,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+         if (menuGroup == MenuGroup.PAGE_MENU) {
+             preparePageMenu(menu, currentTab, handler, isIncognito);
         }
+-        prepareCommonMenuItems(menu, menuGroup, isIncognito);
+        prepareCommonMenuItems(menu, menuGroup, isIncognito, currentTab);
     }
+ 
+     private void setMenuGroupVisibility(@MenuGroup int menuGroup, Menu menu) {
+@@ -338,7 +338,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
+ 
+         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
+-
+        updateViewSourceMenuItem(menu, currentTab);
+         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
+ 
+         // Only display reader mode settings menu option if the current page is in reader mode.
+@@ -371,7 +371,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+                 && UrlUtilities.isNtpUrl(currentTab.getUrl());
+     }
+ 
+-    private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
+    private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito, Tab currentTab) {
+         boolean always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
+         if (always_incognito) {
+             final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id);
 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
-@@ -315,6 +315,10 @@ CHAR_LIMIT guidelines:
+@@ -321,6 +321,10 @@ CHAR_LIMIT guidelines:
         Collaboration
       </message>
 
@@ -7,15 +7,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../tab_management/TabGridViewBinder.java     |  8 +++-
 .../tasks/tab_management/TabProperties.java   |  5 +++
 .../java/res/xml/privacy_preferences.xml      |  5 +++
- .../chrome/browser/app/ChromeActivity.java    |  3 +-
+ .../chrome/browser/app/ChromeActivity.java    |  4 +-
 .../privacy/settings/PrivacySettings.java     | 44 ++++++++++++++++++-
 .../strings/android_chrome_strings.grd        |  8 ++++
- 6 files changed, 70 insertions(+), 3 deletions(-)
+ 6 files changed, 71 insertions(+), 3 deletions(-)

 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
-@@ -408,7 +408,12 @@ class TabGridViewBinder {
+@@ -457,7 +457,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) {
-@@ -449,6 +454,7 @@ class TabGridViewBinder {
+@@ -498,6 +503,7 @@ class TabGridViewBinder {
      */
     private static void setFavicon(
             ImageView faviconView, PropertyModel model, TabListFaviconProvider.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
-@@ -72,6 +72,9 @@ public class TabProperties {
+@@ -85,6 +85,9 @@ public class TabProperties {
     public static final WritableBooleanPropertyKey FAVICON_FETCHED =
             new WritableBooleanPropertyKey();
 
@@ -50,15 +50,15 @@ 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<>();
-@@ -155,6 +158,7 @@ public class TabProperties {
+@@ -174,6 +177,7 @@ public class TabProperties {
                 CARD_TYPE,
                 CONTENT_DESCRIPTION_TEXT_RESOLVER,
                 ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
 +                FAVICON,
-                 SHOPPING_PERSISTED_TAB_DATA_FETCHER,
-                 SHOULD_SHOW_PRICE_DROP_TOOLTIP,
                 QUICK_DELETE_ANIMATION_STATUS,
-@@ -173,6 +177,7 @@ public class TabProperties {
+                 TAB_GROUP_COLOR_VIEW_PROVIDER,
+                 VISIBILITY,
+@@ -210,6 +214,7 @@ public class TabProperties {
                 TAB_ACTION_BUTTON_DATA,
                 FAVICON_FETCHED,
                 FAVICON_FETCHER,
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -78,6 +78,11 @@ found in the LICENSE file.
+@@ -73,6 +73,11 @@ found in the LICENSE file.
         android:title="@string/open_external_links_incognito_title"
         android:summary="@string/open_external_links_incognito_summary"
         android:defaultValue="false" />
@@ -84,35 +84,36 @@ 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
-@@ -140,6 +140,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -145,6 +145,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;
-@@ -615,7 +616,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -637,7 +638,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                     new TabContentManager(
                             this,
                             mBrowserControlsManagerSupplier.get(),
-                            !SysUtils.isLowEndDevice(),
-+                            !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
+-                            !TabUiFeatureUtilities.shouldUseListMode(),
+                            !TabUiFeatureUtilities.shouldUseListMode()
+                                && !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
                             tabModelSelector != null ? tabModelSelector::getTabById : null,
                             TabWindowManagerSingleton.getInstance()));
 
 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
-@@ -21,6 +21,7 @@ import androidx.preference.Preference;
- 
+@@ -28,6 +28,7 @@ import org.chromium.base.ContextUtils;
+ import org.chromium.base.IntentUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 +import org.chromium.base.supplier.Supplier;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.ObservableSupplierImpl;
- import org.chromium.base.ContextUtils;
-@@ -79,12 +80,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.build.annotations.Nullable;
+@@ -98,12 +99,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
@@ -140,7 +141,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";
-@@ -175,6 +190,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -206,6 +221,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             }
         }
 
@@ -162,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
         // Record the launch of PG from the S&P link-row entry point
         privacyGuidePreference.setOnPreferenceClickListener(
-@@ -405,6 +435,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -432,6 +462,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
 
     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
     public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -170,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -451,6 +482,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -478,6 +509,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
             sharedPreferencesEditor.apply();
@@ -184,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -517,6 +555,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -528,6 +566,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             : R.string.text_off);
         }
 
@@ -198,7 +199,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
-@@ -6014,6 +6014,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6198,6 +6198,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>
 
@@ -14,6 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../chrome/browser/app/ChromeActivity.java    |  4 +++-
 .../overlays/strip/StripLayoutHelper.java     | 10 ++++++++--
 .../strip/StripLayoutHelperManager.java       |  6 +++++-
+ .../scene_layer/TabStripSceneLayer.java       |  8 ++++++++
 .../init/ChromeBrowserInitializer.java        |  2 ++
 .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +++-
 .../chrome/browser/ui/RootUiCoordinator.java  |  6 +++++-
@@ -37,7 +38,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../accessibility/AccessibilitySettings.java  | 13 ++++++++++++
 .../AccessibilitySettingsDelegate.java        |  2 ++
 .../chromium/ui/base/DeviceFormFactor.java    | 14 +++++++++++++
- 33 files changed, 163 insertions(+), 26 deletions(-)
+ 34 files changed, 171 insertions(+), 26 deletions(-)

 diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
 --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
@@ -80,7 +81,7 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -125,9 +125,13 @@ found in the LICENSE file.
+@@ -117,9 +117,13 @@ found in the LICENSE file.
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 
     <!-- Should match toolbar_height_no_shadow -->
@@ -98,7 +99,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-@@ -57,6 +57,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
+@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
 import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
 import org.chromium.chrome.browser.night_mode.NightModeUtils;
@@ -106,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
 import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager;
 import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
-@@ -128,6 +129,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
+@@ -133,6 +134,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(newBase);
 
@@ -118,7 +119,7 @@ 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
-@@ -63,6 +63,7 @@ import org.chromium.content_public.browser.WebContents;
+@@ -66,6 +66,7 @@ import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.net.NetId;
 import org.chromium.ui.LayoutInflaterUtils;
@@ -126,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.display.DisplayUtil;
 import org.chromium.url.GURL;
-@@ -473,7 +474,9 @@ public class WarmupManager {
+@@ -481,7 +482,9 @@ public class WarmupManager {
             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
 
             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -140,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -62,6 +62,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -65,6 +65,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
         }
     }
 
@@ -169,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
-@@ -757,7 +757,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -787,7 +787,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) {
@@ -183,17 +184,17 @@ 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
-@@ -112,6 +112,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
- import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -120,6 +120,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.MotionEventUtils;
+ import org.chromium.ui.accessibility.AccessibilityState;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -3999,8 +4000,13 @@ public class StripLayoutHelper
-         mTabMenu.setAnchorView(tabView);
-         // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
+ import org.chromium.ui.util.ColorUtils;
+@@ -4472,8 +4473,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();
 -        int verticalOffset =
 -                -(tabHeight - (int) mContext.getResources().getDimension(R.dimen.tab_strip_height));
@@ -204,13 +205,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 +                (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_tabletui);
 +        }
 +        int verticalOffset = -(tabHeight - tab_strip_height);
-         mTabMenu.setVerticalOffset(verticalOffset);
+         mCloseButtonMenu.setVerticalOffset(verticalOffset);
 
-         // 4. Set the horizontal offset to align the tab menu with the right side of the tab
+         // 4. Set the horizontal offset to align the close button menu with the right side of the
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-@@ -91,6 +91,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
+@@ -98,6 +98,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.components.browser_ui.widget.scrim.ScrimProperties;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -218,10 +219,10 @@ 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;
-@@ -438,7 +439,10 @@ public class StripLayoutHelperManager
- 
+@@ -467,7 +468,10 @@ public class StripLayoutHelperManager
         mIsLayoutOptimizationsEnabled =
-                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
+                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
+                         /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
 -        mScrollableStripHeight = res.getDimension(R.dimen.tab_strip_height) / mDensity;
 +        mScrollableStripHeight =
 +            (DeviceFormFactor.isForceTabletUI()
@@ -230,6 +231,24 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
         mHeight =
                 mIsLayoutOptimizationsEnabled
                         ? toolbarManager.getTabStripHeightSupplier().get() / mDensity
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
+@@ -111,6 +111,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
+         if (mNativePtr == 0) return;
+         final boolean visible = yOffset > -layoutHelper.getHeight();
+ 
+        if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(ContextUtils.getApplicationContext())) {
+                TintedCompositorButton newTabButton = layoutHelper.getNewTabButton();
+                if (newTabButton.isVisible()) {
+                   rightPaddingDp += newTabButton.getWidth() + layoutHelper.getNewTabBtnVisualOffset()
+                        + StripLayoutGroupTitle.REORDER_BACKGROUND_PADDING_END;
+                }
+        }
+
+         // This will hide the tab strips if necessary.
+         TabStripSceneLayerJni.get()
+                 .beginBuildingFrame(mNativePtr, TabStripSceneLayer.this, visible);
 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
@@ -252,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
-@@ -602,7 +602,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -725,7 +725,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
 
     @Override
     public int getControlContainerHeightResource() {
@@ -266,16 +285,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -105,6 +105,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -104,6 +104,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;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
- import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController;
- import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
- import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
-@@ -1788,7 +1790,9 @@ public class RootUiCoordinator
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
+@@ -1645,7 +1647,9 @@ public class RootUiCoordinator
         if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
 
         int stubId = R.id.find_toolbar_stub;
@@ -300,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
-@@ -274,6 +274,7 @@ public final class ChromePreferenceKeys {
+@@ -313,6 +313,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";
@@ -311,16 +330,16 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromeSharedPreferences.java
-@@ -12,6 +12,8 @@ import org.chromium.base.shared_preferences.SharedPreferencesManager;
- import org.chromium.build.BuildConfig;
- import org.chromium.build.annotations.AssumeNonNull;
+@@ -14,6 +14,8 @@ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.build.annotations.OptimizeAsNonNull;
 
 +import org.chromium.ui.base.DeviceFormFactor;
 +
 @JNINamespace("android::shared_preferences")
+ @NullMarked
 public class ChromeSharedPreferences {
-     public static final PreferenceKeyRegistry REGISTRY =
-@@ -23,6 +25,16 @@ public class ChromeSharedPreferences {
+@@ -26,6 +28,16 @@ public class ChromeSharedPreferences {
                             LegacyChromePreferenceKeys.getPrefixesInUse())
                     : null);
 
@@ -340,7 +359,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -55,6 +55,7 @@ public class LegacyChromePreferenceKeys {
+@@ -56,6 +56,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE,
                 ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP,
                 ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
@@ -351,18 +370,18 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
 --- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
 +++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing
- import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
+@@ -39,6 +39,7 @@ import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
 import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
 import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
+ import org.chromium.ui.CaptionBarInsetsRectProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.InsetObserver;
 import org.chromium.ui.InsetObserver.WindowInsetsConsumer;
 import org.chromium.ui.InsetsRectProvider;
-@@ -259,6 +260,7 @@ public class AppHeaderCoordinator
-     private static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
+@@ -267,6 +268,7 @@ public class AppHeaderCoordinator
             InsetsRectProvider insetsRectProvider,
-             @DesktopWindowHeuristicResult int currentResult) {
+             @DesktopWindowHeuristicResult int currentResult,
+             boolean isOnExternalDisplay) {
 +        if (DeviceFormFactor.isForceTabletUI()) return DesktopWindowHeuristicResult.IN_DESKTOP_WINDOW;
         @DesktopWindowHeuristicResult int newResult;
 
@@ -370,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
-@@ -814,7 +814,7 @@ public class LocationBarCoordinator
+@@ -857,7 +857,7 @@ public class LocationBarCoordinator
     }
 
     private boolean isTabletWindow() {
@@ -382,8 +401,8 @@ 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
-@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a
-         Hide your IP address
+@@ -1654,6 +1654,13 @@ Your Google account may have other forms of browsing history like searches and a
+         Privacy guide explanation closed
       </message>
 
 +      <message name="IDS_FORCE_TABLET_UI_SUMMARY" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
@@ -464,7 +483,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 --- a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml
@@ -10,8 +10,10 @@ found in the LICENSE file.
-     <dimen name="toolbar_tab_count_text_size_2_digit">10dp</dimen>
+     <dimen name="toolbar_tab_count_text_size_2_digit">9dp</dimen>
 
     <!-- Tab Strip Dimensions -->
 -    <dimen name="tab_strip_height">0dp</dimen>
@@ -479,8 +498,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 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
-@@ -23,7 +23,7 @@ public interface ControlContainer {
-      * Initialize the control container with the specified toolbar.
+@@ -27,7 +27,7 @@ public interface ControlContainer {
+      *
      * @param toolbarLayoutId The ID of the toolbar layout to use.
      */
 -    void initWithToolbar(int toolbarLayoutId);
@@ -491,18 +510,18 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
-@@ -5,6 +5,7 @@
- package org.chromium.chrome.browser.toolbar.top;
+@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.toolbar.top;
+ import static org.chromium.build.NullUtil.assumeNonNull;
 
 import android.content.Context;
 +import android.content.res.Resources;
 import android.graphics.Canvas;
+ import android.graphics.Color;
 import android.graphics.PorterDuff;
- import android.graphics.Rect;
-@@ -143,8 +144,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
-     }
+@@ -157,8 +158,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
 
     @Override
+     @Initializer
 -    public void initWithToolbar(int toolbarLayoutId) {
 +    public void initWithToolbar(int toolbarLayoutId, int controlContainerHeightOverrideId) {
         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -523,21 +542,21 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 +                if (view != null)
 +                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
 +            }
-             mToolbarContainer =
-                     (ToolbarViewResourceFrameLayout) findViewById(R.id.toolbar_container);
+             mToolbarContainer = findViewById(R.id.toolbar_container);
             ViewStub toolbarStub = findViewById(R.id.toolbar_stub);
+             toolbarStub.setLayoutResource(toolbarLayoutId);
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils;
- import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -68,6 +68,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;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.util.TokenHolder;
 import org.chromium.url.GURL;
 
-@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -586,7 +587,9 @@ public abstract class ToolbarLayout extends FrameLayout
      * not have a tab strip.
      */
     protected int getTabStripHeightFromResource() {
@@ -551,7 +570,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/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
-@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
+@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
 import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
 import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
 import org.chromium.ui.base.ViewUtils;
@@ -559,7 +578,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
 import org.chromium.ui.util.TokenHolder;
 
-@@ -544,6 +545,7 @@ class HeightTransitionHandler {
+@@ -559,6 +560,7 @@ class HeightTransitionHandler {
         if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
             return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
         }
@@ -577,8 +596,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 +import org.chromium.ui.base.DeviceFormFactor;
 
 /** Class used to manage tab strip visibility and height updates. */
- public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver {
-@@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+ @NullMarked
+@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
         mTabStripReservedTopPadding =
                 controlContainerView()
                         .getResources()
@@ -608,15 +627,15 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -25,6 +25,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
+@@ -29,6 +29,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
 import org.chromium.content_public.browser.ContentFeatureMap;
 
 import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
 
 /** Fragment to keep track of all the accessibility related preferences. */
- public class AccessibilitySettings extends ChromeBaseSettingsFragment
-@@ -39,6 +40,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+ @NullMarked
+@@ -44,6 +45,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
     public static final String PREF_ZOOM_INFO = "zoom_info";
     public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
 
@@ -626,7 +645,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
     private PageZoomPreference mPageZoomDefaultZoomPref;
     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -105,6 +109,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -108,6 +112,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
                 mDelegate.getReaderAccessibilityDelegate().getValue());
         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
 
@@ -639,7 +658,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
         Preference captions = findPreference(PREF_CAPTIONS);
         captions.setOnPreferenceClickListener(
                 preference -> {
-@@ -165,6 +175,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -167,6 +177,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);
@@ -647,12 +666,12 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 +            mForceTabletUIDelegate.setValue((Boolean) newValue);
 +            mDelegate.requestRestart(getActivity());
         } else if (PREF_READER_FOR_ACCESSIBILITY.equals(preference.getKey())) {
-             mDelegate.getReaderAccessibilityDelegate().setValue((Boolean) newValue);
-         } else if (PREF_PAGE_ZOOM_DEFAULT_ZOOM.equals(preference.getKey())) {
+             boolean readerModeEnabled = (Boolean) newValue;
+             mDelegate.getReaderAccessibilityDelegate().setValue(readerModeEnabled);
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -39,6 +39,8 @@ public interface AccessibilitySettingsDelegate {
+@@ -41,6 +41,8 @@ public interface AccessibilitySettingsDelegate {
      */
     BrowserContextHandle getBrowserContextHandle();
 
@@ -664,7 +683,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
-@@ -69,6 +69,14 @@ public class DeviceFormFactor {
+@@ -83,6 +83,14 @@ public class DeviceFormFactor {
         return BuildConfig.IS_DESKTOP_ANDROID;
     }
 
@@ -679,7 +698,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
-@@ -77,6 +85,7 @@ public class DeviceFormFactor {
+@@ -91,6 +99,7 @@ public class DeviceFormFactor {
     @CalledByNative
     @Deprecated
     public static boolean isTablet() {
@@ -687,7 +706,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
         if (sIsTabletForTesting != null) {
             return sIsTabletForTesting;
         }
-@@ -107,6 +116,7 @@ public class DeviceFormFactor {
+@@ -121,6 +130,7 @@ public class DeviceFormFactor {
      *     E.g. http://developer.samsung.com/samsung-dex/testing
      */
     public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -695,7 +714,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 {
+@@ -156,6 +166,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) {
@@ -703,7 +722,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 {
+@@ -163,6 +174,7 @@ public class DeviceFormFactor {
         ThreadUtils.assertOnUiThread();
         Context context = windowAndroid.getContext().get();
         if (context == null) return 0;
@@ -711,7 +730,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 {
+@@ -172,6 +184,7 @@ public class DeviceFormFactor {
      */
     @UiThread
     public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
@@ -719,7 +738,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 {
+@@ -180,6 +193,7 @@ public class DeviceFormFactor {
      *         layout.
      */
     public static int getMinimumTabletWidthPx(DisplayAndroid display) {
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -102,6 +102,11 @@ found in the LICENSE file.
+@@ -95,6 +95,11 @@ found in the LICENSE file.
         android:title="@string/incognito_settings_title"
         android:summary="@string/incognito_settings_summary"
         android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
@@ -28,7 +28,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
-@@ -44,6 +44,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 +36,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;
-@@ -1652,8 +1653,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -1849,8 +1850,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
             boolean hadCipherData =
                     CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
 
@@ -51,33 +51,34 @@ 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
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.privacy.settings;
- import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS_MODE;
+@@ -8,6 +8,7 @@ import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS
 
- import android.os.Build;
+ import android.content.Context;
+ import android.content.Intent;
 +import android.content.SharedPreferences;
+ import android.graphics.drawable.Drawable;
+ import android.os.Build;
 import android.os.Bundle;
- import android.text.SpannableString;
- import android.text.style.ClickableSpan;
-@@ -22,6 +23,8 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.ObservableSupplierImpl;
-+import org.chromium.base.ContextUtils;
+@@ -21,7 +22,9 @@ import android.view.View;
+ import androidx.annotation.VisibleForTesting;
+ import androidx.preference.Preference;
+ 
 +import org.chromium.base.BuildInfo;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -94,6 +97,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+ 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;
+@@ -113,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private final SharedPreferencesManager mSharedPreferencesManager =
             ChromeSharedPreferences.getInstance();
 
 +    private static final String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
 +
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
-     @VisibleForTesting static final String PREF_FP_PROTECTION = "fp_protection";
-     @VisibleForTesting static final String PREF_IP_PROTECTION = "ip_protection";
-@@ -346,7 +351,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
+     @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";
+@@ -373,7 +378,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
@@ -90,7 +91,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)) {
-@@ -422,6 +431,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -433,6 +442,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             getContext(), getProfile()));
         }
 
@@ -105,7 +106,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
-@@ -5539,6 +5539,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -5714,6 +5714,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
       <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
         IMAGE
       </message>
@@ -24,9 +24,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -94,6 +94,9 @@ import java.util.Map;
- import java.util.Objects;
+@@ -114,6 +114,9 @@ import java.util.Objects;
 import java.util.Optional;
+ import java.util.Set;
 
 +import org.chromium.chrome.browser.homepage.HomepageManager;
 +import org.chromium.url.GURL;
@@ -34,7 +34,7 @@ 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.
-@@ -914,9 +917,15 @@ public class TabGridDialogMediator
+@@ -1028,9 +1031,15 @@ public class TabGridDialogMediator
                 return;
             }
 
@@ -54,15 +54,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/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
-@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory;
- 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.flags.ChromeFeatureList;
-+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
+import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
 import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -367,10 +368,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver,
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -415,10 +416,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                     assert relatedTabs.size() > 0;
 
                     Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -97,7 +97,7 @@ 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
-@@ -63,6 +63,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
+@@ -71,6 +71,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
 import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation;
 import org.chromium.ui.widget.RectProvider;
 
@@ -107,9 +107,9 @@ 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.
-@@ -191,9 +194,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+@@ -208,9 +211,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
                         /* didCloseCallback= */ null);
-                 recordUserAction("DeleteGroup");
+                 RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
             } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) {
 +                String url = UrlConstants.NTP_URL;
 +                if (UrlConstants.NTP_URL.equals(url)
@@ -123,11 +123,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 +                        url,
                         tabId,
                         TabLaunchType.FROM_TAB_GROUP_UI);
-                 recordUserAction("NewTabInGroup");
+                 RecordUserAction.record("MobileToolbarTabGroupMenu.NewTabInGroup");
 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
-@@ -237,6 +237,22 @@ public class HomepageManager
+@@ -231,6 +231,22 @@ public class HomepageManager
         notifyHomepageUpdated();
     }
 
@@ -153,7 +153,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -24,6 +24,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -25,6 +25,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.url.GURL;
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 
 /** Fragment that allows the user to configure homepage related preferences. */
 public class HomepageSettings extends ChromeBaseSettingsFragment {
-@@ -32,6 +33,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -33,6 +34,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
     @VisibleForTesting
     public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
 
@@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
     private HomepageManager mHomepageManager;
     private RadioButtonGroupHomepagePreference mRadioButtons;
     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-@@ -67,6 +70,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -69,6 +72,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
                 });
         mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
 
@@ -200,15 +200,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
+@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
+ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.new_tab_url.DseNewTabUrlManager;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
 import org.chromium.chrome.browser.profiles.Profile;
-@@ -485,6 +486,13 @@ public class ChromeTabCreator extends TabCreator {
+@@ -530,6 +531,13 @@ public class ChromeTabCreator extends TabCreator
      * @return the created tab.
      */
     public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@@ -225,7 +225,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
-@@ -287,6 +287,7 @@ public final class ChromePreferenceKeys {
+@@ -326,6 +326,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";
 
@@ -236,7 +236,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -59,6 +59,7 @@ public class LegacyChromePreferenceKeys {
+@@ -60,6 +60,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                 ChromePreferenceKeys.HOMEPAGE_ENABLED,
                 ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -247,7 +247,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
-@@ -1528,6 +1528,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1480,6 +1480,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,10 +260,10 @@ 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
-@@ -91,6 +91,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kShowForwardButton, true,
-       GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags());
+@@ -107,6 +107,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+ 
+   registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
+                                 pref_registration_flags);
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
 +                                PrefRegistry::NO_REGISTRATION_FLAGS);
 
@@ -272,9 +272,9 @@ 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
-@@ -1342,6 +1342,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
- // toolbar.
- inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
+@@ -1328,6 +1328,10 @@ inline constexpr char kPinSplitTabButton[] = "browser.pin_split_tab_button";
+ // by enterprise policy.
+ inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
 
 +// A boolean specifying whether opening a new tab should open the Home page
 +// instead of the New Tab page.
@@ -9,15 +9,21 @@ Add DuckDuckGo Lite
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../search_engine_choice/default_favicon.png  | Bin 0 -> 903 bytes
- ...search_engine_choice_scaled_resources.grdp |   1 +
- .../search_engines/prepopulated_engines.json  |  31 ++++++++++++++++++
+ components/search_engines/BUILD.gn            |   3 ++
+ components/search_engines/cromite/BUILD.gn    |  12 ++++++
+ .../cromite/cromite_prepopulated_engines.json |  37 ++++++++++++++++++
 .../search_engine_choice_utils.cc             |   5 +--
- .../search_engine_countries-inc.cc            |   3 ++
 .../search_engines/search_engine_type.h       |   5 +++
- .../template_url_prepopulate_data.cc          |   1 -
- .../template_url_prepopulate_data.h           |   7 ----
- 8 files changed, 41 insertions(+), 12 deletions(-)
+ .../template_url_prepopulate_data.cc          |  21 +++++++++-
+ .../template_url_prepopulate_data.h           |   9 -----
+ tools/json_to_struct/json_to_struct.gni       |   9 +++++
+ tools/json_to_struct/json_to_struct.py        |  26 ++++++++----
+ tools/json_to_struct/struct_generator.py      |  10 +++--
+ tools/variations/fieldtrial_to_struct.py      |   4 +-
+ 12 files changed, 113 insertions(+), 28 deletions(-)
 create mode 100644 components/resources/default_100_percent/search_engine_choice/default_favicon.png
+ create mode 100644 components/search_engines/cromite/BUILD.gn
+ create mode 100644 components/search_engines/cromite/cromite_prepopulated_engines.json

 diff --git a/components/resources/default_100_percent/search_engine_choice/default_favicon.png b/components/resources/default_100_percent/search_engine_choice/default_favicon.png
 new file mode 100644
@@ -46,69 +52,96 @@ d#;<tA>kFnu^?NN9uE_uZ002ovPDHLkV1m60sc!%P
 literal 0
 HcmV?d00001

-diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/components/resources/search_engine_choice_scaled_resources.grdp
--- a/components/resources/search_engine_choice_scaled_resources.grdp
-+++ b/components/resources/search_engine_choice_scaled_resources.grdp
-@@ -5,6 +5,7 @@
-   <if expr="_google_chrome">
-     <structure type="chrome_scaled_image" name="IDR_GOOGLE_COM_PNG" file="google_chrome/google_search_logo.png" />
-   </if>
-+  <structure type="chrome_scaled_image" name="IDR_GOOGLEEN_PNG" file="search_engine_choice/default_favicon.png" />
-   <structure type="chrome_scaled_image" name="IDR_AR_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
-   <structure type="chrome_scaled_image" name="IDR_AT_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
-   <structure type="chrome_scaled_image" name="IDR_AU_YAHOO_COM_PNG" file="search_engine_choice/yahoo_com.png" />
-diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
--- a/components/search_engines/prepopulated_engines.json
-+++ b/components/search_engines/prepopulated_engines.json
-@@ -130,6 +130,16 @@
-       ]
-     },
+diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
+--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
+@@ -72,6 +72,7 @@ static_library("search_engines") {
+     "//third_party/metrics_proto",
+     "//third_party/omnibox_proto",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+   ]
 
-+    "duckduckgo_light": {
-+      "name": "DuckDuckGo Light",
-+      "keyword": "duckduckgo.com/lite",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
-+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
-+      "id": 12
-+    },
-+
-     "ecosia": {
-       "name": "Ecosia",
-       "keyword": "ecosia.org",
-@@ -205,6 +215,27 @@
-       "id": 111
-     },
+   deps = [
+@@ -163,6 +164,7 @@ source_set("search_engine_utils") {
+     ":search_engine_type",
+     "//components/google/core/common",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+   ]
 
-+    "googleen": {
-+      "name": "Google in English",
-+      "keyword": "googleen",
-+      "favicon_url": "https://www.google.com/favicon.ico",
-+      "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en",
-+      "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en",
-+      "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
-+      "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
-+      "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
-+      "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
-+      "alternate_urls": [
-+        "{google:baseURL}?hl=en#q={searchTerms}",
-+        "{google:baseURL}search?hl=en#q={searchTerms}",
-+        "{google:baseURL}webhp?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en#q={searchTerms}",
-+        "{google:baseURL}s?hl=en&q={searchTerms}"
-+      ],
-+      "type": "SEARCH_ENGINE_GOOGLE_EN",
-+      "id": 13
-+    },
+   deps = [ "//url" ]
+@@ -252,6 +254,7 @@ source_set("unit_tests") {
+     "//testing/gmock",
+     "//testing/gtest",
+     "//third_party/search_engines_data:prepopulated_engines",
+    "cromite:cromite_prepopulated_engines",
+     "//ui/base",
+     "//url",
+   ]
+diff --git a/components/search_engines/cromite/BUILD.gn b/components/search_engines/cromite/BUILD.gn
+new file mode 100644
+--- /dev/null
+++ b/components/search_engines/cromite/BUILD.gn
+@@ -0,0 +1,12 @@
+import("//tools/json_to_struct/json_to_struct.gni")
 +
-     "mail_ru": {
-       "name": "@MAIL.RU",
-       "keyword": "mail.ru",
+json_to_struct("cromite_prepopulated_engines") {
+  visibility = [ "//components/search_engines:*" ]
+
+  source = "cromite_prepopulated_engines.json"
+  schema_file = "//third_party/search_engines_data/prepopulated_engines_schema.json"
+  namespace = "TemplateURLPrepopulateData"
+  excludetype = true
+
+  deps = [ "//base" ]
+}
+diff --git a/components/search_engines/cromite/cromite_prepopulated_engines.json b/components/search_engines/cromite/cromite_prepopulated_engines.json
+new file mode 100644
+--- /dev/null
+++ b/components/search_engines/cromite/cromite_prepopulated_engines.json
+@@ -0,0 +1,37 @@
+{
+    "additionals_includes": {
+        "third_party/search_engines_data/resources/definitions/prepopulated_engines.h": ""
+    },
+    "elements": {
+        "duckduckgo_light": {
+            "name": "DuckDuckGo Light",
+            "keyword": "duckduckgo.com/lite",
+            "favicon_url": "https://duckduckgo.com/favicon.ico",
+            "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
+            "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
+            "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
+            "id": 12
+        },
+
+        "googleen": {
+            "name": "Google in English",
+            "keyword": "googleen",
+            "favicon_url": "https://www.google.com/favicon.ico",
+            "search_url": "{google:baseURL}search?q={searchTerms}&ie={inputEncoding}&hl=en",
+            "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&q={searchTerms}&hl=en",
+            "image_url": "{google:baseURL}searchbyimage/upload?hl=en",
+            "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}",
+            "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en",
+            "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}",
+            "alternate_urls": [
+              "{google:baseURL}?hl=en#q={searchTerms}",
+              "{google:baseURL}search?hl=en#q={searchTerms}",
+              "{google:baseURL}webhp?hl=en#q={searchTerms}",
+              "{google:baseURL}s?hl=en#q={searchTerms}",
+              "{google:baseURL}s?hl=en&q={searchTerms}"
+            ],
+            "type": "SEARCH_ENGINE_GOOGLE_EN",
+            "id": 13
+        }
+    }
+}
 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
-@@ -186,10 +186,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+@@ -182,10 +182,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
 }
 
 void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -120,37 +153,19 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
 }
 
 void RecordChoiceScreenPositionsCountryMismatch(bool has_mismatch) {
-diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc
--- a/components/search_engines/search_engine_countries-inc.cc
-+++ b/components/search_engines/search_engine_countries-inc.cc
-@@ -38,6 +38,7 @@ struct EngineAndTier {
- 
- // Default (for countries with no better engine set)
- constexpr EngineAndTier engines_default[] = {
-+    {SearchEngineTier::kTopEngines, &googleen},
-     {SearchEngineTier::kTopEngines, &google},
-     {SearchEngineTier::kTopEngines, &bing},
-     {SearchEngineTier::kTopEngines, &yahoo},
-@@ -1452,5 +1453,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
-   for (size_t i = 0; i < num_engines; i++) {
-     t_url.push_back(engines[i]);
-   }
-+  t_url.push_back({SearchEngineTier::kTopEngines, &googleen});
-+  t_url.push_back({SearchEngineTier::kTopEngines, &duckduckgo_light});
-   return t_url;
- }
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -91,10 +91,15 @@ enum SearchEngineType {
-   SEARCH_ENGINE_YOU = 72,
-   SEARCH_ENGINE_STARTER_PACK_GEMINI = 73,
-   SEARCH_ENGINE_LILO = 74,
-+  SEARCH_ENGINE_GOOGLE_EN = 75,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
+@@ -97,11 +97,16 @@ enum SearchEngineType {
+   SEARCH_ENGINE_MCAFEE = 77,
+   SEARCH_ENGINE_FREESPOKE = 78,
+   SEARCH_ENGINE_KAGI = 79,
+  SEARCH_ENGINE_GOOGLE_EN = 80,
+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 81,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };
+ // LINT.ThenChange(//tools/metrics/histograms/enums.xml:OmniboxSearchEngineType)
 
 +static_assert(SEARCH_ENGINE_DUCKDUCKGOLIGHT == (SEARCH_ENGINE_MAX - 1),
 +              "Please check this patch");
@@ -161,18 +176,61 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -78,7 +78,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
-   generator.seed(profile_seed);
-   std::shuffle(t_urls.begin(), t_urls.end(), generator);
+@@ -28,6 +28,8 @@
+ #include "components/search_engines/template_url_data_util.h"
+ #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h"
 
-  CHECK_LE(t_urls.size(), kMaxEeaPrepopulatedEngines);
-   return t_urls;
+#include "components/search_engines/cromite/cromite_prepopulated_engines.h"
+
+ namespace TemplateURLPrepopulateData {
+ 
+ // Helpers --------------------------------------------------------------------
+@@ -123,7 +125,7 @@ int GetDataVersion(PrefService* prefs) {
+       kCurrentDataVersion;
 }
 
+-std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEnginesChromium(
+     PrefService& prefs,
+     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+         regional_prepopulated_engines) {
+@@ -139,6 +141,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+                         &PrepopulatedEngineToTemplateURLData);
+ }
+ 
+std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+    PrefService& prefs,
+    std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+        regional_prepopulated_engines) {
+  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
+    GetPrepopulatedEnginesChromium(prefs, regional_prepopulated_engines);
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));
+  return t_urls;
+}
+
+ std::unique_ptr<TemplateURLData> GetPrepopulatedEngine(
+     PrefService& prefs,
+     std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
+@@ -160,9 +173,13 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+     return std::vector<std::unique_ptr<TemplateURLData>>();
+   }
+ 
+-  return base::ToVector(
+  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
+    base::ToVector(
+       regional_capabilities::GetPrepopulatedEngines(country_id, prefs),
+       &PrepopulatedEngineToTemplateURLData);
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
+  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));
+  return t_urls;
+ }
+ 
+ #endif
 diff --git a/components/search_engines/template_url_prepopulate_data.h b/components/search_engines/template_url_prepopulate_data.h
 --- a/components/search_engines/template_url_prepopulate_data.h
 +++ b/components/search_engines/template_url_prepopulate_data.h
-@@ -32,13 +32,6 @@ struct PrepopulatedEngine;
+@@ -27,15 +27,6 @@ struct PrepopulatedEngine;
 
 extern const int kMaxPrepopulatedEngineID;
 
@@ -181,9 +239,179 @@ diff --git a/components/search_engines/template_url_prepopulate_data.h b/compone
 -//
 -// Note: If this is increased, please also increase the declared variant count
 -// for the `Search.ChoiceScreenShowedEngineAt.Index{Index}` histogram.
+-// TODO(crbug.com/408932087): Investigate moving it to the file that actually
+-// populates these, `//c/regional_capabilities/r*c*_util.cc`.
 -inline constexpr size_t kMaxEeaPrepopulatedEngines = 8;
 -
 // The maximum number of prepopulated search engines that can be returned in
 // in the rest of the world by `GetPrepopulatedEngines()`.
- inline constexpr size_t kMaxRowPrepopulatedEngines = 5;
+ // TODO(crbug.com/408932087): Investigate deduping it with the constant
+diff --git a/tools/json_to_struct/json_to_struct.gni b/tools/json_to_struct/json_to_struct.gni
+--- a/tools/json_to_struct/json_to_struct.gni
+++ b/tools/json_to_struct/json_to_struct.gni
+@@ -39,6 +39,11 @@ template("json_to_struct") {
+   action_name = target_name + "_action"
+   source_set_name = target_name
+ 
+  excludetype = false
+  if (defined(invoker.excludetype)) {
+    excludetype = invoker.excludetype
+  }
+
+   action(action_name) {
+     visibility = [ ":$source_set_name" ]
+     script = "//build/gn_run_binary.py"
+@@ -63,6 +68,10 @@ template("json_to_struct") {
+       "--namespace=" + invoker.namespace,
+       "--schema=" + rebase_path(invoker.schema_file, root_build_dir),
+     ]
+
+    if (excludetype) {
+      args += [ "--excludetype=yes" ]
+    }
+   }
+ 
+   source_set(source_set_name) {
+diff --git a/tools/json_to_struct/json_to_struct.py b/tools/json_to_struct/json_to_struct.py
+--- a/tools/json_to_struct/json_to_struct.py
+++ b/tools/json_to_struct/json_to_struct.py
+@@ -103,7 +103,7 @@ def _GenerateHeaderGuard(h_filename):
+   return re.sub(u'^_*', '', result) + u'_'  # Remove leading underscores.
+ 
+ 
+-def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+def _GenerateH(basepath, fileroot, head, namespace, schema, description, excludetype):
+   """Generates the .h file containing the definition of the structure specified
+   by the schema.
+ 
+@@ -147,11 +147,15 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+       f.write(u'#include "%s"\n' % header)
+     f.write(u'\n')
+ 
+    for header in description.get(u'additionals_includes', []):
+      f.write(u'#include "%s"\n' % header)
+    f.write(u'\n')
+
+     if namespace:
+       f.write(u'namespace %s {\n' % namespace)
+       f.write(u'\n')
+ 
+-    f.write(struct_generator.GenerateStruct(
+    f.write(struct_generator.GenerateStruct(excludetype,
+       schema['type_name'], schema['schema']))
+     f.write(u'\n')
+ 
+@@ -176,7 +180,7 @@ def _GenerateH(basepath, fileroot, head, namespace, schema, description):
+     f.write(u'#endif  // %s\n' % header_guard)
+ 
+ 
+-def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+def _GenerateCC(basepath, fileroot, head, namespace, schema, description, excludetype):
+   """Generates the .cc file containing the static initializers for the
+   of the elements specified in the description.
+ 
+@@ -211,7 +215,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+     f.write(element_generator.GenerateElements(schema['type_name'],
+         schema['schema'], description))
+ 
+-    if not aggregation.export_items:
+    if excludetype == False and not aggregation.export_items:
+       f.write('\n}  // anonymous namespace \n\n')
+ 
+     aggregated = GenerateCCAggregation(schema['type_name'], aggregation)
+@@ -298,7 +302,7 @@ def GenerateClass(basepath,
+ 
+ 
+ def GenerateStruct(basepath, output_root, namespace, schema, description,
+-                   description_filename, schema_filename, year=None):
+                   description_filename, schema_filename, excludetype, year):
+   """Generates a C++ struct from a JSON description.
+ 
+   Args:
+@@ -317,8 +321,8 @@ def GenerateStruct(basepath, output_root, namespace, schema, description,
+   """
+   year = int(year) if year else datetime.now().year
+   head = HEAD % (year, schema_filename, description_filename)
+-  _GenerateH(basepath, output_root, head, namespace, schema, description)
+-  _GenerateCC(basepath, output_root, head, namespace, schema, description)
+  _GenerateH(basepath, output_root, head, namespace, schema, description, excludetype)
+  _GenerateCC(basepath, output_root, head, namespace, schema, description, excludetype)
+ 
+ if __name__ == '__main__':
+   parser = optparse.OptionParser(
+@@ -333,11 +337,17 @@ if __name__ == '__main__':
+   parser.add_option('-s', '--schema', help='path to the schema file, '
+       'mandatory.')
+   parser.add_option('-o', '--output', help='output filename, ')
+  parser.add_option('-x', '--excludetype', help='exclude type generator, ')
+   (opts, args) = parser.parse_args()
+ 
+   if not opts.schema:
+     parser.error('You must specify a --schema.')
+ 
+  if not opts.excludetype:
+    opts.excludetype = False
+  else:
+    opts.excludetype = True
+
+   description_filename = os.path.normpath(args[0])
+   root, ext = os.path.splitext(description_filename)
+   shortroot = opts.output if opts.output else os.path.split(root)[1]
+@@ -354,4 +364,4 @@ if __name__ == '__main__':
+   schema = _Load(opts.schema)
+   description = _Load(description_filename)
+   GenerateStruct(basepath, output_root, opts.namespace, schema, description,
+-                 description_filename, opts.schema)
+                 description_filename, opts.schema, opts.excludetype, datetime.now().year)
+diff --git a/tools/json_to_struct/struct_generator.py b/tools/json_to_struct/struct_generator.py
+--- a/tools/json_to_struct/struct_generator.py
+++ b/tools/json_to_struct/struct_generator.py
+@@ -30,20 +30,24 @@ def GenerateField(field_info):
+   else:
+     raise RuntimeError('Unknown field type "%s"' % type)
+ 
+-def GenerateStruct(type_name, schema):
+def GenerateStruct(excludetype, type_name, schema):
+   """Generate a string defining a structure containing the fields specified in
+   the schema list.
+   """
+   lines = []
+  if excludetype:
+    lines.append('struct %s;' % type_name)
+    return '\n'.join(lines) + '\n'
+
+   lines.append('struct %s {' % type_name)
+   for field_info in schema:
+     if field_info['type'] == 'struct':
+-      lines.insert(0, GenerateStruct(field_info['type_name'],
+      lines.insert(0, GenerateStruct(excludetype, field_info['type_name'],
+                                      field_info['fields']))
+     elif (field_info['type'] == 'array'
+           and field_info['contents']['type'] == 'struct'):
+       contents = field_info['contents']
+-      lines.insert(0, GenerateStruct(contents['type_name'],
+      lines.insert(0, GenerateStruct(excludetype, contents['type_name'],
+                                      contents['fields']))
+     lines.append('  ' + GenerateField(field_info) + ';')
+   lines.append('};')
+diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py
+--- a/tools/variations/fieldtrial_to_struct.py
+++ b/tools/variations/fieldtrial_to_struct.py
+@@ -235,14 +235,14 @@ def main(arguments):
+   json_to_struct.GenerateStruct(
+       basepath, output_root, opts.namespace, schema, description,
+       os.path.split(description_filename)[1], os.path.split(opts.schema)[1],
+-      opts.year)
+      False, opts.year)
+ 
+   # TODO(peilinwang) filter the schema by platform, form_factor, etc.
+   if opts.java:
+     json_to_struct.GenerateClass(basepath, output_root, opts.namespace, schema,
+                                  description,
+                                  os.path.split(description_filename)[1],
+-                                 os.path.split(opts.schema)[1], opts.year)
+                                 os.path.split(opts.schema)[1], False, opts.year)
+ 
+ 
+ if __name__ == '__main__':
 --
@@ -5,53 +5,76 @@ Subject: Add setting to clear data on exit
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/android/chrome_java_sources.gni        |  1 +
+ .../java/res/xml/privacy_preferences.xml      |  5 ++
 .../chrome/browser/ChromeTabbedActivity.java  |  7 +-
- .../ClearBrowsingDataFragment.java            | 12 +++
- .../ClearBrowsingDataFragmentAtStart.java     | 74 +++++++++++++++++++
- .../ClearBrowsingDataTabsFragment.java        |  7 +-
- .../privacy/settings/PrivacySettings.java     |  2 +-
+ .../browsing_data/BrowsingDataBridge.java     | 12 +--
+ .../ClearBrowsingDataFragment.java            | 31 ++++++--
+ .../ClearBrowsingDataFragmentAtStart.java     | 79 +++++++++++++++++++
 chrome/app/settings_strings.grdp              | 10 +++
- .../browsing_data/browsing_data_bridge.cc     |  2 +-
+ chrome/browser/about_flags.cc                 |  1 +
+ .../browsing_data/browsing_data_bridge.cc     | 17 +++-
 .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
 .../chrome_browsing_data_remover_delegate.cc  | 15 ++++
- .../api/settings_private/prefs_util.cc        | 17 +++++
+ .../api/settings_private/prefs_util.cc        | 17 ++++
 .../browser/profiles/ProfileManagerUtils.java |  5 ++
 .../profiles/android/profile_manager_utils.cc |  5 ++
 chrome/browser/profiles/profile_manager.cc    | 15 +++-
 chrome/browser/profiles/profile_manager.h     |  2 +
 .../clear_browsing_data_dialog.html           | 44 +++++++++++
 .../clear_browsing_data_dialog.ts             |  2 +
- .../strings/android_chrome_strings.grd        |  5 +-
+ .../strings/android_chrome_strings.grd        |  3 +
+ .../Add-setting-to-clear-data-on-exit.grdp    |  9 +++
 .../settings_localized_strings_provider.cc    |  1 +
 .../content/browsing_data_helper.cc           |  9 ++-
+ components/browsing_data/core/BUILD.gn        |  5 ++
 .../core/browsing_data_policies_utils.cc      | 20 ++---
 .../core/browsing_data_policies_utils.h       | 11 +++
 .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
- .../core/clear_browsing_data_tab.h            |  2 +-
- components/browsing_data/core/pref_names.cc   | 17 +++++
+ .../core/clear_browsing_data_tab.h            |  3 +-
+ components/browsing_data/core/pref_names.cc   | 17 ++++
 components/browsing_data/core/pref_names.h    | 10 +++
+ components/favicon/core/favicon_database.cc   |  9 +++
+ components/favicon/core/favicon_database.h    |  2 +
 .../search_engines/template_url_service.cc    |  1 +
- content/browser/dips/dips_service_impl.cc     |  2 +-
+ content/browser/btm/btm_service_impl.cc       |  2 +-
 content/browser/storage_partition_impl.cc     |  1 +
 .../public/browser/browsing_data_remover.h    |  7 +-
- 30 files changed, 336 insertions(+), 23 deletions(-)
+ .../Add-setting-to-clear-data-on-exit.inc     |  8 ++
+ 36 files changed, 406 insertions(+), 33 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc

 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
-@@ -316,6 +316,7 @@ chrome_java_sources = [
-   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java",
-   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java",
-   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java",
+@@ -257,6 +257,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",
 +  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ConfirmImportantSitesDialogFragment.java",
   "java/src/org/chromium/chrome/browser/browsing_data/OtherFormsOfHistoryDialogFragment.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilter.java",
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -19,6 +19,11 @@ found in the LICENSE file.
+         android:title="@string/clear_browsing_data_title"
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
+    <Preference
+        android:key="clear_browsing_data_advanced"
+        android:title="@string/clear_browsing_data_at_start_title"
+        android:summary="@string/clear_browsing_data_at_start_summary"
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAtStart" />
+     <Preference
+         android:key="privacy_guide"
+         app:isPreferenceVisible="false"
 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
-@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -198,6 +198,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
@@ -59,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;
-@@ -1652,7 +1653,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -1854,7 +1855,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
             Intent intent = getIntent();
 
             boolean hadCipherData =
@@ -72,13 +95,51 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 
             String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
             boolean noRestoreState =
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
+@@ -218,8 +218,8 @@ public final class BrowsingDataBridge implements Destroyable {
+      *     BrowsingDataType}).
+      * @return The state of the corresponding deletion preference.
+      */
+-    public boolean getBrowsingDataDeletionPreference(int dataType) {
+-        return BrowsingDataBridgeJni.get().getBrowsingDataDeletionPreference(mProfile, dataType);
+    public boolean getBrowsingDataDeletionPreference(int dataType, int clearBrowsingDataTab) {
+        return BrowsingDataBridgeJni.get().getBrowsingDataDeletionPreference(mProfile, dataType, clearBrowsingDataTab);
+     }
+ 
+     /**
+@@ -229,8 +229,8 @@ public final class BrowsingDataBridge implements Destroyable {
+      *     BrowsingDataType}).
+      * @param value The state to be set.
+      */
+-    public void setBrowsingDataDeletionPreference(int dataType, boolean value) {
+-        BrowsingDataBridgeJni.get().setBrowsingDataDeletionPreference(mProfile, dataType, value);
+    public void setBrowsingDataDeletionPreference(int dataType, int clearBrowsingDataTab, boolean value) {
+        BrowsingDataBridgeJni.get().setBrowsingDataDeletionPreference(mProfile, dataType, clearBrowsingDataTab, value);
+     }
+ 
+     /**
+@@ -338,10 +338,10 @@ public final class BrowsingDataBridge implements Destroyable {
+                 @JniType("Profile*") Profile profile, @JniType("std::string") String origin);
+ 
+         boolean getBrowsingDataDeletionPreference(
+-                @JniType("Profile*") Profile profile, int dataType);
+                @JniType("Profile*") Profile profile, int dataType, int clearBrowsingDataTab);
+ 
+         void setBrowsingDataDeletionPreference(
+-                @JniType("Profile*") Profile profile, int dataType, boolean value);
+                @JniType("Profile*") Profile profile, int dataType, int clearBrowsingDataTab, boolean value);
+ 
+         int getBrowsingDataDeletionTimePeriod(@JniType("Profile*") Profile profile);
+ 
 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
-@@ -163,6 +163,12 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
+@@ -161,6 +161,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+             assert mCheckbox == preference;
 
             mParent.updateButtonState();
-             mShouldAnnounceCounterResult = true;
 +
 +            BrowsingDataBridge.getForProfile(mParent.getProfile())
 +                    .setBrowsingDataDeletionPreference(
@@ -88,9 +149,49 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
             return true;
         }
 
-@@ -475,6 +481,10 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
-     /** Returns whether is a basic or advanced Clear Browsing Data tab. */
-     protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
+@@ -242,7 +248,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+     private @TimePeriod int mLastSelectedTimePeriod;
+     private boolean mShouldShowPostDeleteFeedback;
+ 
+-    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+    protected final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+ 
+     /**
+      * @return All available {@link DialogOption} entries.
+@@ -348,7 +354,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+     }
+ 
+     /** Called when browsing data is about to be cleared. */
+-    private void onClearBrowsingData() {
+    protected void onClearBrowsingData() {
+         RecordUserAction.record("ClearBrowsingData_AdvancedTab");
+ 
+         if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
+@@ -438,6 +444,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+             BrowsingDataBridge.getForProfile(getProfile())
+                     .setBrowsingDataDeletionPreference(
+                             ClearBrowsingDataFragment.getDataType(item.getOption()),
+                            getClearBrowsingDataTabType(),
+                             item.isSelected());
+         }
+ 
+@@ -445,8 +452,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                 .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
+     }
+ 
+    protected int getClearBrowsingDataTabType() {
+        return ClearBrowsingDataTab.ADVANCED;
+    }
+
+     /** Returns the list of supported {@link DialogOption}. */
+-    private List<Integer> getDialogOptions(Bundle fragmentArgs) {
+    protected List<Integer> getDialogOptions(Bundle fragmentArgs) {
+         String referrer =
+                 fragmentArgs.getString(
+                         ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
+@@ -472,6 +483,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                 DialogOption.CLEAR_SITE_SETTINGS);
+     }
 
 +    protected boolean shouldClearBrowsingData() {
 +        return true;
@@ -99,7 +200,16 @@ 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.
      *
-@@ -555,6 +565,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
+@@ -480,7 +495,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+      */
+     private boolean isOptionSelectedByDefault(@DialogOption int option) {
+         return BrowsingDataBridge.getForProfile(getProfile())
+-                .getBrowsingDataDeletionPreference(getDataType(option));
+                .getBrowsingDataDeletionPreference(getDataType(option), getClearBrowsingDataTabType());
+     }
+ 
+     /**
+@@ -548,6 +563,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      * options.
      */
     private void onClearButtonClicked() {
@@ -107,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         if (shouldShowImportantSitesDialog()) {
             showImportantDialogThenClear();
             return;
-@@ -585,6 +596,7 @@ public abstract class ClearBrowsingDataFragment extends ChromeBaseSettingsFragme
+@@ -577,6 +593,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
         Button clearButton = (Button) getView().findViewById(R.id.clear_button);
         boolean isEnabled = !getSelectedOptions().isEmpty();
         clearButton.setEnabled(isEnabled);
@@ -115,11 +225,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     }
 
     private int getSpinnerIndex(
+@@ -652,7 +669,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                             .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
+                 enabled = false;
+                 browsingDataBridge.setBrowsingDataDeletionPreference(
+-                        getDataType(DialogOption.CLEAR_HISTORY), false);
+                        getDataType(DialogOption.CLEAR_HISTORY), getClearBrowsingDataTabType(), false);
+             }
+ 
+             // Disable tabs closure if the user is in multi-window mode.
+@@ -682,8 +699,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+         mSigninManager.addSignInStateObserver(this);
+ 
+         setHasOptionsMenu(true);
+
+        onCustomizePreferences(savedInstanceState, rootKey);
+     }
+ 
+    protected void onCustomizePreferences(Bundle savedInstanceState, String rootKey) {}
+
+     @Override
+     public ObservableSupplier<String> getPageTitle() {
+         return mPageTitle;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,79 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -174,6 +306,11 @@ new file mode 100644
 +    }
 +
 +    @Override
+    protected void onCustomizePreferences(Bundle savedInstanceState, String rootKey) {
+        mPageTitle.set(getString(R.string.clear_browsing_data_at_start_title));
+    }
+
+    @Override
 +    protected int getClearBrowsingDataTabType() {
 +        return ClearBrowsingDataTab.AT_START;
 +    }
@@ -186,7 +323,7 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    protected void onClearBrowsingData() {
+    public void onClearBrowsingData() {
 +    }
 +
 +    @Override
@@ -194,53 +331,10 @@ new file mode 100644
 +        return false;
 +    }
 +}
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-@@ -32,7 +32,7 @@ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
-  */
- public class ClearBrowsingDataTabsFragment extends Fragment
-         implements ProfileDependentSetting, EmbeddableSettingsPage {
-    public static final int CBD_TAB_COUNT = 2;
-+    public static final int CBD_TAB_COUNT = 3;
- 
-     private Profile mProfile;
-     private ClearBrowsingDataFetcher mFetcher;
-@@ -115,6 +115,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment
-                 return getActivity().getString(R.string.clear_browsing_data_basic_tab_title);
-             case 1:
-                 return getActivity().getString(R.string.prefs_section_advanced);
-+            case 2:
-+                return getActivity().getString(R.string.clear_browsing_data_atstart_tab_title);
-             default:
-                 throw new RuntimeException("invalid position: " + position);
-         }
-@@ -166,6 +168,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment
-                 case 1:
-                     fragment = new ClearBrowsingDataFragmentAdvanced();
-                     break;
-+                case 2:
-+                    fragment = new ClearBrowsingDataFragmentAtStart();
-+                    break;
-                 default:
-                     throw new RuntimeException("invalid position: " + position);
-             }
-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
-@@ -336,7 +336,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-                             thirdPartyCookies.getTitle().toString());
-         }
- 
-        if (QuickDeleteController.isQuickDeleteFollowupEnabled()) {
-+        if (((false)) && QuickDeleteController.isQuickDeleteFollowupEnabled()) {
-             Preference clearBrowsingDataPreference = findPreference(PREF_CLEAR_BROWSING_DATA);
-             Preference clearBrowsingDataAdvancedPreference =
-                     findPreference(PREF_CLEAR_BROWSING_DATA_ADVANCED);
 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
-@@ -2220,6 +2220,16 @@
+@@ -1973,6 +1973,16 @@
   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
     Delete browsing data
   </message>
@@ -257,22 +351,76 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
   <message name="IDS_SETTINGS_CLEAR_DATA_DESCRIPTION" desc="Description for delete browsing data button in Privacy options. 'History' refers to browsing history. 'Cookies' refers to the technical meaning of a cookie, i.e. data saved by a website on the user's computer, as in when a website saves your preferences.">
     Delete history, cookies, cache, and more
   </message>
+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
+@@ -105,6 +105,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"
+#include "components/favicon/core/favicon_database.h"
+ #include "components/feature_engagement/public/feature_constants.h"
+ #include "components/feature_engagement/public/feature_list.h"
+ #include "components/feed/feed_feature_list.h"
 diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-@@ -304,7 +304,7 @@ static void JNI_BrowsingDataBridge_SetLastClearBrowsingDataTab(JNIEnv* env,
-                                                                Profile* profile,
-                                                                jint tab_index) {
-   DCHECK_GE(tab_index, 0);
-  DCHECK_LT(tab_index, 2);
-+  DCHECK_LT(tab_index, 3);
-   GetPrefService(profile)->SetInteger(
-       browsing_data::prefs::kLastClearBrowsingDataTab, tab_index);
+@@ -70,6 +70,15 @@ PrefService* GetPrefService(Profile* profile) {
+   return profile->GetOriginalProfile()->GetPrefs();
 }
+ 
+browsing_data::ClearBrowsingDataTab ToTabEnum(jint clear_browsing_data_tab) {
+  DCHECK_GE(clear_browsing_data_tab, 0);
+  DCHECK_LE(clear_browsing_data_tab,
+            static_cast<int>(browsing_data::ClearBrowsingDataTab::MAX_VALUE));
+
+  return static_cast<browsing_data::ClearBrowsingDataTab>(
+      clear_browsing_data_tab);
+}
+
+ void OnBrowsingDataModelBuilt(JNIEnv* env,
+                               const ScopedJavaGlobalRef<jobject>& java_callback,
+                               std::unique_ptr<BrowsingDataModel> model) {
+@@ -222,7 +231,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
+ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+     JNIEnv* env,
+     Profile* profile,
+-    jint data_type) {
+    jint data_type,
+    jint clear_browsing_data_tab) {
+   DCHECK_GE(data_type, 0);
+   DCHECK_LE(data_type,
+             static_cast<int>(browsing_data::BrowsingDataType::MAX_VALUE));
+@@ -234,7 +244,7 @@ static jboolean JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+   std::string pref;
+   if (!browsing_data::GetDeletionPreferenceFromDataType(
+           static_cast<browsing_data::BrowsingDataType>(data_type),
+-          browsing_data::ClearBrowsingDataTab::ADVANCED, &pref)) {
+          ToTabEnum(clear_browsing_data_tab), &pref)) {
+     return false;
+   }
+ 
+@@ -245,6 +255,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+     JNIEnv* env,
+     Profile* profile,
+     jint data_type,
+    jint clear_browsing_data_tab,
+     jboolean value) {
+   DCHECK_GE(data_type, 0);
+   DCHECK_LE(data_type,
+@@ -253,7 +264,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+   std::string pref;
+   if (!browsing_data::GetDeletionPreferenceFromDataType(
+           static_cast<browsing_data::BrowsingDataType>(data_type),
+-          browsing_data::ClearBrowsingDataTab::ADVANCED, &pref)) {
+          ToTabEnum(clear_browsing_data_tab), &pref)) {
+     return;
+   }
+ 
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -311,8 +311,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -324,8 +324,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
 
 void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
     bool keep_browser_alive) {
@@ -300,7 +448,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 
   if (!data_types.empty() &&
       IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -421,6 +438,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -434,6 +451,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
 bool ChromeBrowsingDataLifetimeManager::
     IsConditionSatisfiedForBrowsingDataRemoval(
         const syncer::UserSelectableTypeSet sync_types) {
@@ -311,7 +459,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -355,6 +355,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -359,6 +359,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     uint64_t origin_type_mask,
     base::OnceCallback<void(uint64_t)> callback) {
   CHECK(((remove_mask &
@@ -319,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());
-@@ -462,6 +463,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -466,6 +467,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           CreateTaskCompletionClosure(TracingDataType::kHistory),
           &history_task_tracker_);
     }
@@ -329,7 +477,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     if (ClipboardRecentContent::GetInstance())
       ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
 
-@@ -570,6 +574,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -574,6 +578,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()) {
@@ -341,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&)>()
-@@ -598,9 +607,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -602,9 +611,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     }
 
     device_event_log::Clear(delete_begin_, delete_end_);
@@ -355,7 +503,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
         delete_begin_, delete_end_);
 
-@@ -1281,6 +1294,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1324,6 +1337,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
 
     if (should_clear_zero_suggest_and_session_token && template_url_service)
       template_url_service->ClearSessionToken();
@@ -367,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
-@@ -535,6 +535,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -543,6 +543,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
   (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
       settings_api::PrefType::kNumber;
 
@@ -394,7 +542,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
 diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 --- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 +++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
-@@ -52,10 +52,15 @@ public class ProfileManagerUtils {
+@@ -56,11 +56,16 @@ public class ProfileManagerUtils {
         }
     }
 
@@ -402,8 +550,9 @@ diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browse
 +        ProfileManagerUtilsJni.get().removeBrowsingDataAtStart();
 +    }
 +
+     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     @NativeMethods
-     interface Natives {
+     public interface Natives {
         void flushPersistentDataForAllProfiles();
 
         void removeSessionCookiesForAllProfiles();
@@ -425,12 +574,12 @@ 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
-@@ -1427,6 +1427,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1446,6 +1446,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
   }
 }
 
 +void ProfileManager::RemoveBrowsingDataAtStart() {
-+  base::ranges::for_each(
+  std::ranges::for_each(
 +      GetLoadedProfiles(),
 +      [](Profile* profile) {
 +        auto* browsing_data_lifetime_manager =
@@ -445,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_ ||
-@@ -2109,7 +2122,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2122,7 +2135,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()) {
@@ -457,7 +606,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -195,6 +195,8 @@ class ProfileManager : public Profile::Delegate {
+@@ -215,6 +215,8 @@ class ProfileManager : public Profile::Delegate {
   //   profiles.
   std::vector<Profile*> GetLoadedProfiles() const;
 
@@ -523,7 +672,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -239,6 +239,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -214,6 +214,7 @@ export class SettingsClearBrowsingDataDialogElement extends
         value: () =>
             [loadTimeData.getString('basicPageTitle'),
              loadTimeData.getString('advancedPageTitle'),
@@ -531,7 +680,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
     ],
       },
 
-@@ -363,6 +364,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -336,6 +337,7 @@ export class SettingsClearBrowsingDataDialogElement extends
     }
     this.clearButtonDisabled_ =
         this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -542,16 +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
-@@ -1462,7 +1462,7 @@ For example, some websites may respond to this request by showing you ads that a
-         Delete browsing data
-       </message>
-       <message name="IDS_CLEAR_BROWSING_DATA_SUMMARY" desc="Summary of the settings item that opens the Delete Browsing Data dialog.">
-        Delete history, cookies, site data, cache…
-+        Delete immediately or choose when to delete browsing data
-       </message>
-       <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_DIALOG_TITLE" desc="Title of a dialog that is shown after the deletion of browsing history finished.">
-         Deleted Chrome data
-@@ -1623,6 +1623,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1575,6 +1575,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>
@@ -561,10 +701,24 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       <message name="IDS_ANDROID_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
         Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
       </message>
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_CLEAR_BROWSING_DATA_AT_START_TITLE" desc="Title of the Delete Browsing Data screen at start.">
+        Clear the data at opening
+    </message>
+    <message name="IDS_CLEAR_BROWSING_DATA_AT_START_SUMMARY" desc="Summary of the settings item that opens the Delete Browsing Data dialog.">
+        Choose what to delete when the browser opens
+    </message>
+</grit-part>
 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
-@@ -1895,6 +1895,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1925,6 +1925,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
       {"clearedData", IDS_SETTINGS_CLEARED_DATA},
       {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
       {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -591,6 +745,28 @@ diff --git a/components/browsing_data/content/browsing_data_helper.cc b/componen
   return predicate.Run(url);
 }
 
+diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/core/BUILD.gn
+--- a/components/browsing_data/core/BUILD.gn
+++ b/components/browsing_data/core/BUILD.gn
+@@ -62,6 +62,10 @@ if (is_android) {
+     visibility = [ ":*" ]
+     sources = [ "browsing_data_utils.h" ]
+   }
+  java_cpp_enum("clear_browsing_data_tab_javagen") {
+    visibility = [ ":*" ]
+    sources = [ "clear_browsing_data_tab.h" ]
+  }
+   java_cpp_enum("cookie_or_cache_deletion_choice_javagen") {
+     # External code should depend on ":java" instead.
+     visibility = [ ":*" ]
+@@ -71,6 +75,7 @@ if (is_android) {
+   android_library("java") {
+     srcjar_deps = [
+       ":browsing_data_utils_javagen",
+      ":clear_browsing_data_tab_javagen",
+       ":cookie_or_cache_deletion_choice_javagen",
+     ]
+     deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
 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
@@ -650,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
-@@ -346,6 +346,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -407,6 +407,37 @@ bool GetDeletionPreferenceFromDataType(
     BrowsingDataType data_type,
     ClearBrowsingDataTab clear_browsing_data_tab,
     std::string* out_pref) {
@@ -691,11 +867,12 @@ diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/b
 diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/components/browsing_data/core/clear_browsing_data_tab.h
 --- a/components/browsing_data/core/clear_browsing_data_tab.h
 +++ b/components/browsing_data/core/clear_browsing_data_tab.h
-@@ -18,7 +18,7 @@ namespace browsing_data {
- //
- // A Java counterpart will be generated for this enum.
- // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
+@@ -13,7 +13,8 @@ namespace browsing_data {
+ // value for dialogs without separate tabs is advanced.
+ // TODO(dullweber): Maybe rename "ADVANCED" to "DEFAULT" because it is used in
+ //   multiple places without a differentiation between advanced and basic.
 -enum class ClearBrowsingDataTab { BASIC, ADVANCED, MAX_VALUE = ADVANCED };
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.browsing_data
 +enum class ClearBrowsingDataTab { BASIC, ADVANCED, AT_START, MAX_VALUE = AT_START };
 
 }  // namespace browsing_data
@@ -747,10 +924,48 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
 // Clear browsing data deletion time period.
 inline constexpr char kDeleteTimePeriod[] = "browser.clear_data.time_period";
 inline constexpr char kDeleteTimePeriodBasic[] =
+diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc
+--- a/components/favicon/core/favicon_database.cc
+++ b/components/favicon/core/favicon_database.cc
+@@ -38,6 +38,10 @@
+ 
+ namespace favicon {
+ 
+CROMITE_FEATURE(kClearFaviconsData,
+                "ClearFaviconsData",
+                base::FEATURE_DISABLED_BY_DEFAULT);
+
+ // Description of database tables:
+ //
+ // icon_mapping
+@@ -507,6 +511,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
+ 
+ bool FaviconDatabase::SetFaviconsOutOfDateBetween(base::Time begin,
+                                                   base::Time end) {
+  if (begin.is_null() && base::FeatureList::IsEnabled(kClearFaviconsData)) {
+    std::ignore = db_.Execute("DELETE FROM favicon_bitmaps");
+    std::ignore = db_.Execute("DELETE FROM favicons");
+    std::ignore = db_.Execute("DELETE FROM icon_mapping");
+  }
+   if (end.is_null())
+     end = base::Time::Max();
+   sql::Statement statement(
+diff --git a/components/favicon/core/favicon_database.h b/components/favicon/core/favicon_database.h
+--- a/components/favicon/core/favicon_database.h
+++ b/components/favicon/core/favicon_database.h
+@@ -33,6 +33,8 @@ namespace favicon {
+ // All earlier updates are ignored.
+ static const int kFaviconUpdateLastRequestedAfterDays = 10;
+ 
+BASE_DECLARE_FEATURE(kClearFaviconsData);
+
+ // This database interface is owned by the history backend and runs on the
+ // history thread.
+ class FaviconDatabase {
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -778,6 +778,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -885,6 +885,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
     if (turl->date_created() >= created_after &&
         (created_before.is_null() || turl->date_created() < created_before) &&
         turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -758,22 +973,22 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
         turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
         (url_filter.is_null() ||
          url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
-diff --git a/content/browser/dips/dips_service_impl.cc b/content/browser/dips/dips_service_impl.cc
--- a/content/browser/dips/dips_service_impl.cc
-+++ b/content/browser/dips/dips_service_impl.cc
-@@ -198,7 +198,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
-     remove_mask &= ~content::BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
+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
+@@ -210,7 +210,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+     remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
     remover->RemoveWithFilterAndReply(
         base::Time::Min(), base::Time::Max(),
-        remove_mask |
-+        remove_mask | content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE |
-             content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
-         content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
-             content::BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
+-        remove_mask | BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
+        remove_mask | content::BrowsingDataRemover::DATA_TYPE_SKIP_SSL_HOST_STATE | BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS,
+         BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB |
+             BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB,
+         std::move(filter), clearer);
 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(
+@@ -1514,6 +1514,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
@@ -784,25 +999,35 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h
 --- a/content/public/browser/browsing_data_remover.h
 +++ b/content/public/browser/browsing_data_remover.h
-@@ -151,14 +151,19 @@ class BrowsingDataRemover {
-   static constexpr DataType DATA_TYPE_RELATED_WEBSITE_SETS_PERMISSIONS = 1
-                                                                          << 24;
+@@ -162,11 +162,16 @@ class BrowsingDataRemover {
 
-+  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 25;
-+
-   // Device bound sessions
-   // (https://github.com/WICG/dbsc/blob/main/README.md)
-  static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 25;
-+  static constexpr DataType DATA_TYPE_DEVICE_BOUND_SESSIONS = 1 << 26;
+   // Clear-Site-Data Interaction with Prefetch and Prerender.
+   static constexpr DataType DATA_TYPE_PREFETCH_CACHE = 1 << 27;
+-  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 28;
+  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 29;
 
   // Embedders can add more datatypes beyond this point.
-   static constexpr DataType DATA_TYPE_CONTENT_END =
-       DATA_TYPE_DEVICE_BOUND_SESSIONS;
+   static constexpr DataType DATA_TYPE_CONTENT_END = DATA_TYPE_PRERENDER_CACHE;
 
-+  static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_DEVICE_BOUND_SESSIONS,
+  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 28;
+
+  static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_PRERENDER_CACHE,
 +              "Please check.");
 +
   // All data stored by the Attribution Reporting API.
   static constexpr DataType DATA_TYPE_ATTRIBUTION_REPORTING =
       DATA_TYPE_ATTRIBUTION_REPORTING_SITE_CREATED |
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
+@@ -0,0 +1,8 @@
+#ifdef FLAG_SECTION
+
+    {"clear-favicons-data",
+     "Clear favicons data",
+     "deletes all data from the favicons db when deleting at startup/close with cache selection.", kOsAll,
+     FEATURE_VALUE_TYPE(favicon::kClearFaviconsData)},
+
+#endif
 --
@@ -38,15 +38,15 @@ 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/contextmenu/AwContextMenuItemDelegate.java b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
 --- a/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
 +++ b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
-@@ -11,6 +11,7 @@ import android.net.Uri;
- import org.chromium.base.IntentUtils;
+@@ -12,6 +12,7 @@ import org.chromium.base.IntentUtils;
+ import org.chromium.build.annotations.NullMarked;
 import org.chromium.components.embedder_support.contextmenu.ContextMenuItemDelegate;
 import org.chromium.components.embedder_support.contextmenu.ContextMenuParams;
 +import org.chromium.content_public.common.Referrer;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.Clipboard;
 import org.chromium.url.GURL;
-@@ -52,6 +53,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -54,6 +55,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
         IntentUtils.safeStartActivity(mActivity, intent);
     }
 
@@ -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
-@@ -88,6 +88,7 @@ found in the LICENSE file.
+@@ -104,6 +104,7 @@ found in the LICENSE file.
 
     <!-- Menu item IDs for FullscreenActivities -->
     <item type="id" name="contextmenu_open_in_chrome" />
@@ -70,7 +70,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/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -162,6 +162,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -165,6 +165,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
             mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
     }
 
@@ -98,38 +98,38 @@ 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
-@@ -111,8 +111,9 @@ class ChromeContextMenuItem {
-         int SHARE_HIGHLIGHT = 32;
-         int REMOVE_HIGHLIGHT = 33;
-         int LEARN_MORE = 34;
-+        int FOLLOW_LINK = 35;
+@@ -123,8 +123,9 @@ class ChromeContextMenuItem {
+         int PRINT_PAGE = 38;
+         // Developer Group
+         int INSPECT_ELEMENT = 39;
+        int FOLLOW_LINK = 40;
         // ALWAYS UPDATE!
-        int NUM_ENTRIES = 35;
-+        int NUM_ENTRIES = 36;
+-        int NUM_ENTRIES = 40;
+        int NUM_ENTRIES = 41;
     }
 
     /** Mapping from {@link Item} to the ID found in the ids.xml. */
-@@ -152,6 +153,7 @@ class ChromeContextMenuItem {
-         R.id.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
-         R.id.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
-         R.id.contextmenu_learn_more, // Item.LEARN_MORE
-+            R.id.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
+@@ -169,6 +170,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
+        R.id.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
     };
 
     /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
-@@ -191,6 +193,7 @@ class ChromeContextMenuItem {
-         R.string.contextmenu_share_highlight, // Item.SHARE_HIGHLIGHT
-         R.string.contextmenu_remove_highlight, // Item.REMOVE_HIGHLIGHT
-         R.string.contextmenu_learn_more, // Item.LEARN_MORE
-+            R.string.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB:
+@@ -213,6 +215,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
+        R.string.contextmenu_open_in_tab, // Item.OPEN_IN_NEW_CHROME_TAB
     };
 
     /**
 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
-@@ -337,6 +337,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
- 
+@@ -369,6 +369,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+         }
         if (mParams.isAnchor()) {
             ModelList linkGroup = new ModelList();
 +            if (ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled()) {
@@ -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())) {
-@@ -725,6 +728,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -834,6 +837,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
-@@ -301,6 +301,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -356,6 +356,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
         mTab.loadUrl(loadUrlParams);
     }
 
@@ -168,27 +168,27 @@ 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
-@@ -340,6 +340,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kTabDragDropAndroid,
+@@ -382,6 +382,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabGroupParityBottomSheetAndroid,
+     &kTabletTabStripAnimation,
     &kToolbarPhoneCleanup,
-     &kTabGroupCreationDialogAndroid,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
-     &kTabResumptionModuleAndroid,
     &kTabStateFlatBuffer,
-     &kTabStripGroupCollapseAndroid,
+     &kTabStripContextMenuAndroid,
+     &kTabStripDensityChangeAndroid,
 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
-@@ -407,6 +407,8 @@ public abstract class ChromeFeatureList {
+@@ -455,6 +455,8 @@ public abstract class ChromeFeatureList {
             "DisableToolbarSwipeUp";
     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
             "MoveTopToolbarToBottom";
 +    public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS =
 +            "ShowAlwaysContextMenuOnLinks";
-     public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
-     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
-             "NotificationPermissionBottomSheet";
-@@ -761,6 +763,8 @@ public abstract class ChromeFeatureList {
+     public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
+             "NewTabPageCustomizationToolbarButton";
+     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
+@@ -868,6 +870,8 @@ public abstract class ChromeFeatureList {
             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
     public static final CachedFlag sMoveTopToolbarToBottom =
             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -196,19 +196,19 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +            newCachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false);
     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
     public static final CachedFlag sPostGetMyMemoryStateToBackground =
-             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, false);
-@@ -941,6 +945,7 @@ public abstract class ChromeFeatureList {
+             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
+@@ -1072,6 +1076,7 @@ public abstract class ChromeFeatureList {
                     sTabWindowManagerReportIndicesMismatch,
+                     sTopControlsRefactor,
                     sTraceBinderIpc,
-                     sUseChimeAndroidSdk,
 +                    sShowAlwaysContextMenuOnLinks,
+                     sUseChimeAndroidSdk,
+                     sUseActivityManagerForTabActivation,
                     sUseLibunwindstackNativeUnwinderAndroid,
-                     sWebApkMinShellApkVersion);
- 
 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
-@@ -1775,6 +1775,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1719,6 +1719,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]">
-@@ -3314,6 +3320,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3330,6 +3336,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>
@@ -249,7 +249,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -48,6 +48,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -53,6 +53,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
 
@@ -259,7 +259,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
     private PageZoomPreference mPageZoomDefaultZoomPref;
     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -136,6 +139,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -139,6 +142,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
 
@@ -272,10 +272,10 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
         Preference captions = findPreference(PREF_CAPTIONS);
         captions.setOnPreferenceClickListener(
                 preference -> {
-@@ -213,6 +222,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
-             mDelegate.requestRestart(getActivity());
+@@ -220,6 +229,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
             mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
+             mDelegate.requestRestart(getActivity());
 +        } else if (PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS.equals(preference.getKey())) {
 +            mShowAlwaysContextMenuOnLinksDelegate.setValue((Boolean) newValue);
 +            mDelegate.requestRestart(getActivity());
@@ -285,7 +285,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -42,6 +42,8 @@ public interface AccessibilitySettingsDelegate {
+@@ -45,6 +45,8 @@ public interface AccessibilitySettingsDelegate {
     BooleanPreferenceDelegate getMoveTopToolbarToBottomDelegate();
     BooleanPreferenceDelegate getDisableToolbarSwipeUpDelegate();
 
@@ -297,15 +297,15 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
-@@ -9,6 +9,7 @@ import android.net.Uri;
- import androidx.annotation.IntDef;
+@@ -10,6 +10,7 @@ import androidx.annotation.IntDef;
 
+ import org.chromium.build.annotations.NullMarked;
 import org.chromium.content_public.browser.WebContents;
 +import org.chromium.content_public.common.Referrer;
 import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
-@@ -148,6 +149,8 @@ public interface ContextMenuItemDelegate {
+@@ -150,6 +151,8 @@ public interface ContextMenuItemDelegate {
      */
     GURL getPageUrl();
 
@@ -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
-@@ -62,6 +62,7 @@
+@@ -66,6 +66,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/speculation_rules/document_speculation_rules.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
-@@ -502,6 +503,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -500,6 +501,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
     bool is_trusted,
     base::TimeTicks platform_time_stamp,
     KURL completed_url) {
@@ -370,8 +370,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   LocalDOMWindow* window = GetDocument().domWindow();
   if (!window) {
     return;
-@@ -582,6 +594,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
-             request.GetReferrerPolicy()));
+@@ -590,6 +602,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+     frame_request.SetImpression(impression);
   }
 
 +  if (!do_not_show_context_menu &&
@@ -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;
 
-@@ -636,7 +657,7 @@ AtomicString HTMLAnchorElementBase::interestAction() const {
-   return g_empty_atom;
+@@ -633,7 +654,7 @@ Element* HTMLAnchorElementBase::InterestTargetElement() const {
+       html_names::kInteresttargetAttr);
 }
 
 -void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
@@ -395,7 +395,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   event.SetDefaultHandled();
 
   LocalDOMWindow* window = GetDocument().domWindow();
-@@ -732,13 +753,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -729,13 +750,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     return;
   }
 
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
     // We distinguish single/double click with some modifiers.
     // See the comment of `EventHandler.delayed_navigation_task_handle_`.
     auto task_handle = PostDelayedCancellableTask(
-@@ -748,7 +768,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -745,7 +765,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     frame->GetEventHandler().SetDelayedNavigationTaskHandle(
         std::move(task_handle));
   } else {
@@ -427,15 +427,15 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_party/blink/renderer/core/html/html_anchor_element.h
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
-@@ -117,6 +117,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
-   AtomicString interestAction() const override;
+@@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
+   Element* InterestTargetElement() const override;
 
   void Trace(Visitor*) const override;
 +  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
 
  protected:
   HTMLAnchorElementBase(const QualifiedName& tag_name, Document&);
-@@ -148,7 +149,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
+@@ -143,7 +144,11 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
                            bool is_trusted,
                            base::TimeTicks platform_time_stamp,
                            KURL);
@@ -451,7 +451,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
 --- a/third_party/blink/renderer/core/html/html_image_element.cc
 +++ b/third_party/blink/renderer/core/html/html_image_element.cc
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
 #include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h"
 #include "third_party/blink/renderer/core/dom/node_traversal.h"
 #include "third_party/blink/renderer/core/dom/shadow_root.h"
@@ -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"
-@@ -63,6 +64,7 @@
+@@ -64,6 +65,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"
-@@ -797,6 +799,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -815,6 +817,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
   }
 }
 
@@ -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
-@@ -218,6 +218,8 @@ class CORE_EXPORT HTMLImageElement
+@@ -217,6 +217,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
-@@ -196,14 +196,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -200,14 +200,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
   }
 }
 
@@ -524,7 +524,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
     mouse_event->SetDefaultHandled();
 }
 
-@@ -427,7 +429,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -432,7 +434,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
 bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                             const PhysicalOffset& point,
                                             WebMenuSourceType source_type,
@@ -534,7 +534,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,
-@@ -450,6 +453,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -455,6 +458,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
   if (!result.InnerNodeOrImageMapImage())
     return false;
 
@@ -551,7 +551,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;
-@@ -793,11 +806,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -830,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
 
   SetAutofillData(result.InnerNode(), data);
 
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
 --- a/chrome/browser/engagement/important_sites_util.cc
 +++ b/chrome/browser/engagement/important_sites_util.cc
-@@ -33,6 +33,7 @@
+@@ -31,6 +31,7 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/site_engagement/content/site_engagement_score.h"
 #include "components/site_engagement/content/site_engagement_service.h"
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
 #include "components/site_engagement/core/mojom/site_engagement_details.mojom.h"
 #include "components/webapps/browser/banners/app_banner_settings_helper.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-@@ -350,6 +351,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
+@@ -344,6 +345,10 @@ void ImportantSitesUtil::RegisterProfilePrefs(
 // static
 std::set<std::string> ImportantSitesUtil::GetInstalledRegisterableDomains(
     Profile* profile) {
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/
   std::set<GURL> installed_origins = GetOriginsWithInstalledWebApps(profile);
   std::set<std::string> registerable_domains;
 
-@@ -364,6 +369,10 @@ std::vector<ImportantDomainInfo>
+@@ -358,6 +363,10 @@ std::vector<ImportantDomainInfo>
 ImportantSitesUtil::GetImportantRegisterableDomains(Profile* profile,
                                                     size_t max_results) {
   SCOPED_UMA_HISTOGRAM_TIMER("Storage.ImportantSites.GenerationTime");
@@ -76,7 +76,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"
-@@ -211,6 +212,8 @@ TrackerImpl::TrackerImpl(
+@@ -236,6 +237,8 @@ TrackerImpl::TrackerImpl(
 TrackerImpl::~TrackerImpl() = default;
 
 void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -88,7 +88,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
-@@ -6,6 +6,7 @@
+@@ -11,6 +11,7 @@
 
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
@@ -96,7 +96,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 #include "components/feature_engagement/public/configuration.h"
 #include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/feature_constants.h"
-@@ -113,6 +114,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
+@@ -118,6 +119,12 @@ std::optional<FeatureConfig> GetClientSideFeatureConfig(
   }
 
 #endif  // BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
@@ -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
-@@ -55,6 +55,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+@@ -56,6 +56,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.util.TraceEventVectorDrawableCompat;
-@@ -458,8 +459,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+ import org.chromium.components.browser_ui.settings.SettingsFragment;
+@@ -466,8 +467,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
             finishCurrentSettings(mainFragment);
             return true;
         } else if (item.getItemId() == R.id.menu_id_general_help) {
@@ -38,13 +38,15 @@ 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
-@@ -91,4 +91,8 @@ public class SettingsUtils {
-         ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility);
-         return true;
-     }
-+
+@@ -28,6 +28,10 @@ import org.chromium.ui.drawable.StateListDrawableBuilder;
+ /** A helper class for Settings. */
+ @NullMarked
+ public class SettingsUtils {
 +    public interface ISupportHelpAndFeedback {
 +        void onHelpAndFeebackPressed();
 +    }
- }
+
+     /**
+      * A helper that is used to load preferences from XML resources without causing a
+      * StrictModeViolation. See http://crbug.com/692125.
 --
@@ -9,13 +9,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 base/android/content_uri_utils.cc             | 10 ++++++
 base/android/content_uri_utils.h              |  4 +++
- .../org/chromium/base/ContentUriUtils.java    | 34 +++++++++++++++++++
- 3 files changed, 48 insertions(+)
+ .../org/chromium/base/ContentUriUtils.java    | 33 +++++++++++++++++++
+ 3 files changed, 47 insertions(+)

 diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.cc
 --- a/base/android/content_uri_utils.cc
 +++ b/base/android/content_uri_utils.cc
-@@ -119,6 +119,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
+@@ -134,6 +134,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
                        Time::FromMillisecondsSinceUnixEpoch(last_modified));
 }
 
@@ -35,9 +35,9 @@ diff --git a/base/android/content_uri_utils.cc b/base/android/content_uri_utils.
 diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
 --- a/base/android/content_uri_utils.h
 +++ b/base/android/content_uri_utils.h
-@@ -33,6 +33,10 @@ BASE_EXPORT std::optional<std::string> TranslateOpenFlagsToJavaMode(
- // Returns -1 if the URI is invalid.
- int OpenContentUri(const FilePath& content_uri, uint32_t open_flags);
+@@ -46,6 +46,10 @@ int ContentUriGetFd(
+ void ContentUriClose(
+     const base::android::JavaRef<jobject>& java_parcel_file_descriptor);
 
 +// Opens a content URI for write and returns the file descriptor to the caller.
 +// Returns -1 if the URI is invalid.
@@ -49,15 +49,7 @@ diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
 diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java
 --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java
 +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java
-@@ -12,6 +12,7 @@ import android.content.res.AssetFileDescriptor;
- import android.database.Cursor;
- import android.net.Uri;
- import android.os.Build;
-+import android.os.ParcelFileDescriptor;
- import android.provider.DocumentsContract;
- import android.provider.MediaStore;
- import android.text.TextUtils;
-@@ -30,6 +31,9 @@ import org.chromium.build.annotations.Nullable;
+@@ -31,6 +31,9 @@ import org.chromium.build.annotations.Nullable;
 import java.io.IOException;
 import java.util.List;
 
@@ -67,8 +59,8 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
 /** This class provides methods to access content URI schemes. */
 @JNINamespace("base")
 @NullMarked
-@@ -64,6 +68,36 @@ public abstract class ContentUriUtils {
-         return -1;
+@@ -72,6 +75,36 @@ public abstract class ContentUriUtils {
+         StreamUtil.closeQuietly(parcelFileDescriptor);
     }
 
 +    @CalledByNative
@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -480,6 +480,10 @@ vars = {
+@@ -507,6 +507,10 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -95,7 +95,7 @@ diff --git a/DEPS b/DEPS
   'highway_revision': '00fe003dac355b979f36157f9407c7c46448958e',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ffmpeg
-@@ -1833,6 +1837,9 @@ deps = {
+@@ -1902,6 +1906,9 @@ deps = {
   'src/third_party/dawn':
     Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
 
@@ -147,8 +147,8 @@ new file mode 100644
 diff --git a/build/linux/unbundle/replace_gn_files.py b/build/linux/unbundle/replace_gn_files.py
 --- a/build/linux/unbundle/replace_gn_files.py
 +++ b/build/linux/unbundle/replace_gn_files.py
-@@ -56,6 +56,7 @@ REPLACEMENTS = {
-     'libavif': 'third_party/libavif/BUILD.gn',
+@@ -55,6 +55,7 @@ REPLACEMENTS = {
+     'libaom': 'third_party/libaom/BUILD.gn',
     'libdrm': 'third_party/libdrm/BUILD.gn',
     'libjpeg': 'third_party/libjpeg.gni',
 +    'libjxl' : 'third_party/libjxl/BUILD.gn',
@@ -207,9 +207,9 @@ diff --git a/cc/tiles/image_decode_cache.h b/cc/tiles/image_decode_cache.h
 diff --git a/content/common/content_constants_internal.cc b/content/common/content_constants_internal.cc
 --- a/content/common/content_constants_internal.cc
 +++ b/content/common/content_constants_internal.cc
-@@ -19,13 +19,16 @@ const int kTraceEventGpuProcessSortIndex = -1;
- 
- const int kTraceEventRendererMainThreadSortIndex = -1;
+@@ -11,13 +11,16 @@ namespace content {
+ // 20MiB
+ const size_t kMaxLengthOfDataURLString = 1024 * 1024 * 20;
 
 +const char kFrameAcceptHeaderValue_Prefix[] =
 +    "text/html,application/xhtml+xml,application/xml;q=0.9,";
@@ -231,8 +231,8 @@ diff --git a/content/common/content_constants_internal.cc b/content/common/conte
 diff --git a/content/common/content_constants_internal.h b/content/common/content_constants_internal.h
 --- a/content/common/content_constants_internal.h
 +++ b/content/common/content_constants_internal.h
-@@ -39,7 +39,8 @@ CONTENT_EXPORT extern const int kTraceEventGpuProcessSortIndex;
- CONTENT_EXPORT extern const int kTraceEventRendererMainThreadSortIndex;
+@@ -17,7 +17,8 @@ namespace content {
+ extern const size_t kMaxLengthOfDataURLString;
 
 // Accept header used for frame requests.
 -CONTENT_EXPORT extern const char kFrameAcceptHeaderValue[];
@@ -316,7 +316,7 @@ diff --git a/media/BUILD.gn b/media/BUILD.gn
 diff --git a/media/media_options.gni b/media/media_options.gni
 --- a/media/media_options.gni
 +++ b/media/media_options.gni
-@@ -137,6 +137,9 @@ declare_args() {
+@@ -140,6 +140,9 @@ declare_args() {
   # `enable_libaom` should likely also be overriddent to false.
   enable_av1_decoder = enable_dav1d_decoder
 
@@ -324,12 +324,12 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 +  enable_jxl_decoder = is_android || is_win
 +
   # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
-   # platform. Always enable this for Lacros, it determines support at runtime.
+   # platform.
   # TODO(crbug.com/1336055): Revisit the default value for this setting as it
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
 +++ b/net/base/mime_util.cc
-@@ -178,6 +178,7 @@ static const MimeInfo kPrimaryMappings[] = {
+@@ -181,6 +181,7 @@ static const MimeInfo kPrimaryMappings[] = {
     {"image/avif", "avif"},
     {"image/gif", "gif"},
     {"image/jpeg", "jpeg,jpg"},
@@ -337,7 +337,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
     {"image/png", "png"},
     {"image/apng", "png,apng"},
     {"image/svg+xml", "svg,svgz"},
-@@ -682,6 +683,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
+@@ -699,6 +700,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
                                                   "image/heif",
                                                   "image/ief",
                                                   "image/jpeg",
@@ -348,7 +348,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 --- a/net/base/mime_util_unittest.cc
 +++ b/net/base/mime_util_unittest.cc
-@@ -40,6 +40,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
+@@ -39,6 +39,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
       {FILE_PATH_LITERAL("webm"), "video/webm"},
       {FILE_PATH_LITERAL("weba"), "audio/webm"},
       {FILE_PATH_LITERAL("avif"), "image/avif"},
@@ -356,15 +356,15 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
       {FILE_PATH_LITERAL("epub"), "application/epub+zip"},
       {FILE_PATH_LITERAL("apk"), "application/vnd.android.package-archive"},
       {FILE_PATH_LITERAL("cer"), "application/x-x509-ca-cert"},
-@@ -81,6 +82,7 @@ TEST(MimeUtilTest, ExtensionTest) {
+@@ -80,6 +81,7 @@ TEST(MimeUtilTest, ExtensionTest) {
     {FILE_PATH_LITERAL("webm"), {"video/webm"}},
     {FILE_PATH_LITERAL("weba"), {"audio/webm"}},
     {FILE_PATH_LITERAL("avif"), {"image/avif"}},
 +    {FILE_PATH_LITERAL("jxl"), {"image/jxl"}},
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
     // These are test cases for testing platform mime types on ChromeOS.
     {FILE_PATH_LITERAL("epub"), {"application/epub+zip"}},
-@@ -497,6 +499,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
+@@ -504,6 +506,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
       {"MeSsAge/*", 1, "eml"},
       {"message/", 0, nullptr, true},
       {"image/avif", 1, "avif"},
@@ -375,7 +375,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 diff --git a/third_party/.gitignore b/third_party/.gitignore
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
-@@ -80,6 +80,7 @@
+@@ -81,6 +81,7 @@
 /libjingle/source
 /libupnp
 /libva-fake-driver/src
@@ -464,7 +464,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -4690,6 +4690,7 @@ domain Emulation
+@@ -4856,6 +4856,7 @@ domain Emulation
   experimental type DisabledImageType extends string
     enum
       avif
@@ -475,7 +475,7 @@ diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/t
 diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 --- a/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
 +++ b/third_party/blink/renderer/core/inspector/inspector_emulation_agent.cc
-@@ -497,10 +497,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
+@@ -565,10 +565,10 @@ AtomicString InspectorEmulationAgent::OverrideAcceptImageHeader(
   String header(network_utils::ImageAcceptHeader());
   for (String type : *disabled_image_types) {
     // The header string is expected to be like
@@ -489,7 +489,7 @@ diff --git a/third_party/blink/renderer/core/inspector/inspector_emulation_agent
     header.Replace(String(type + ","), "");
   }
   return AtomicString(header);
-@@ -844,6 +844,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
+@@ -939,6 +939,7 @@ protocol::Response InspectorEmulationAgent::setDisabledImageTypes(
   namespace DisabledImageTypeEnum = protocol::Emulation::DisabledImageTypeEnum;
   for (protocol::Emulation::DisabledImageType type : *disabled_types) {
     if (DisabledImageTypeEnum::Avif == type ||
@@ -605,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2398,6 +2398,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2433,6 +2433,10 @@ source_set("blink_platform_unittests_sources") {
     sources += [ "text/locale_icu_test.cc" ]
   }
 
@@ -616,7 +616,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
   sources += [ "testing/run_all_tests.cc" ]
 
   configs += [
-@@ -2444,6 +2448,7 @@ source_set("blink_platform_unittests_sources") {
+@@ -2479,6 +2483,7 @@ source_set("blink_platform_unittests_sources") {
     "//third_party/blink/renderer/platform/wtf",
     "//third_party/dawn/src/dawn/native",
     "//third_party/dawn/src/dawn/wire",
@@ -689,7 +689,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third
 +
   if (enable_av1_decoder) {
     sources += [
-       "avif/avif_image_decoder.cc",
+       "avif/crabbyavif_image_decoder.cc",
 diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
@@ -701,7 +701,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 #include "base/numerics/byte_conversions.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/trace_event/trace_event.h"
-@@ -56,6 +57,10 @@
+@@ -55,6 +56,10 @@
 #include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.h"
 #endif
 
@@ -712,7 +712,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 namespace blink {
 
 namespace {
-@@ -83,6 +88,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
+@@ -82,6 +87,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
   if (image_extension == "avif") {
     return cc::ImageType::kAVIF;
   }
@@ -724,7 +724,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 #endif
   return cc::ImageType::kInvalid;
 }
-@@ -204,6 +214,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
+@@ -201,6 +211,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
     return "image/avif";
   }
 #endif
@@ -737,10 +737,10 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 
   return String();
 }
-@@ -319,6 +335,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
-           alpha_option, high_bit_depth_decoding_option, color_behavior,
-           aux_image, max_decoded_bytes, animation_option);
-     }
+@@ -310,6 +326,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
+     decoder = std::make_unique<CrabbyAVIFImageDecoder>(
+         alpha_option, high_bit_depth_decoding_option, color_behavior, aux_image,
+         max_decoded_bytes, animation_option);
 +#endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
 +  } else if (base::FeatureList::IsEnabled(blink::features::kJXL) &&
@@ -2204,7 +2204,7 @@ new file mode 100644
 diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/blink/tools/commit_stats/git-dirs.txt
 --- a/third_party/blink/tools/commit_stats/git-dirs.txt
 +++ b/third_party/blink/tools/commit_stats/git-dirs.txt
-@@ -34,6 +34,7 @@
+@@ -33,6 +33,7 @@
 ./third_party/angle/third_party/rapidjson/src,ANGLE
 ./third_party/angle/third_party/VK-GL-CTS/src,ANGLE
 ./third_party/angle/third_party/glmark2/src,ANGLE
@@ -2215,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
 diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
 --- a/third_party/blink/web_tests/TestExpectations
 +++ b/third_party/blink/web_tests/TestExpectations
-@@ -5454,6 +5454,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -5720,6 +5720,12 @@ crbug.com/40761284 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fa
 # Started failing after rolling new version of check-layout-th.js
 css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
 
@@ -2226,12 +2226,12 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
 +crbug.com/1358616 virtual/jxl-enabled/images/jxl/progressive.html [ Crash Failure Pass Timeout ]
 +
 # Sheriff 2021-11-15
- crbug.com/1270362 http/tests/devtools/sources/debugger-ui/debugger-inline-values.js [ Failure Pass Timeout ]
+ crbug.com/40205355 http/tests/devtools/sources/debugger-ui/debugger-inline-values.js [ Failure Pass Timeout ]
 
 diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
 --- a/third_party/blink/web_tests/VirtualTestSuites
 +++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -437,6 +437,15 @@
+@@ -491,6 +491,15 @@
     "args": ["--enable-blink-features=FractionalScrollOffsets"],
     "expires": "Jun 1, 2025"
   },
@@ -2646,7 +2646,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -20910,6 +20910,7 @@ from previous Chrome versions.
+@@ -14421,6 +14421,7 @@ from previous Chrome versions.
   <int value="188610022" label="NewMessageListView:enabled"/>
   <int value="189728101" label="FasterLocationReload:disabled"/>
   <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
@@ -2657,7 +2657,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
 diff --git a/tools/metrics/histograms/metadata/blink/enums.xml b/tools/metrics/histograms/metadata/blink/enums.xml
 --- a/tools/metrics/histograms/metadata/blink/enums.xml
 +++ b/tools/metrics/histograms/metadata/blink/enums.xml
-@@ -214,7 +214,7 @@ chromium-metrics-reviews@google.com.
+@@ -240,7 +240,7 @@ chromium-metrics-reviews@google.com.
   <int value="5" label="kImageICO"/>
   <int value="6" label="kImageBMP"/>
   <int value="7" label="kImageAVIF"/>
@@ -189,7 +189,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -85,6 +85,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
+@@ -86,6 +86,13 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
   return settings;
 }
 
@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -116,6 +116,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
-@@ -291,6 +291,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -339,6 +339,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
   }
 }
 
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
   base::AutoLock locker(WebGLContextLimitLock());
   DCHECK(webgl_context_limits_initialized_);
-@@ -560,25 +567,6 @@ static String ExtractWebGLContextCreationError(
+@@ -608,25 +615,6 @@ static String ExtractWebGLContextCreationError(
     const Platform::GraphicsInfo& info) {
   StringBuilder builder;
   builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                           builder);
   builder.Append('.');
-@@ -638,6 +626,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -686,6 +674,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
     const CanvasContextCreationAttributesCore& attributes,
     Platform::ContextType context_type,
     Platform::GraphicsInfo* graphics_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
-@@ -1926,6 +1926,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
+@@ -1932,6 +1932,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                         DOMArrayBufferView* pixels,
                         int64_t offset);
 
@@ -210,7 +210,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
-@@ -13,6 +13,8 @@
+@@ -16,6 +16,8 @@
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
@@ -219,7 +219,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"
-@@ -284,6 +286,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -288,6 +290,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -237,7 +237,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
-@@ -18,6 +18,8 @@
+@@ -21,6 +21,8 @@
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
@@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
 #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1031,6 +1033,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1035,6 +1037,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -3,12 +3,26 @@ Date: Mon, 7 Aug 2023 11:02:18 +0000
 Subject: Allow DocumentPiP if PopupsAndRedirects are active

 Allow documentPiP api use only with content setting popup allowed
+and disables the possibility of verifying the activation of PIP
+in the device with document.pictureInPictureEnabled

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../chromium/chrome/browser/media/PictureInPicture.java    | 1 +
 .../picture_in_picture_controller_impl.cc                  | 7 +++++++
- 1 file changed, 7 insertions(+)
+ 2 files changed, 8 insertions(+)

+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
+@@ -27,6 +27,7 @@ public abstract class PictureInPicture {
+      * @return boolean true if Picture-In-Picture is enabled, otherwise false.
+      */
+     public static boolean isEnabled(Context context) {
+        if ((true)) return true;
+         // Some versions of Android crash when the activity enters Picture-in-Picture
+         // immediately after it exits Picture-in-Picture. See b/143784148
+         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
 diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 --- a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 +++ b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
@@ -20,7 +34,7 @@ diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/pict
 #include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -377,6 +378,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -392,6 +393,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
     return;
   }
 
@@ -10,6 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/network/reporting_service_proxy.cc   |  3 +++
 .../renderer_host/render_frame_host_impl.cc      |  6 ------
 .../coop/cross_origin_opener_policy_reporter.cc  | 16 +++++++---------
+ .../dip/document_isolation_policy_reporter.cc    |  3 +++
 .../web_package/signed_exchange_reporter.cc      |  2 ++
 ...content_switch_dependent_feature_overrides.cc |  1 +
 .../Allow-building-without-enable_reporting.inc  |  2 ++
@@ -21,11 +22,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../network/public/mojom/network_context.mojom   |  3 +++
 .../core/frame/csp/content_security_policy.cc    |  3 +++
 .../blink/renderer/core/frame/local_frame.cc     |  3 +++
- .../blink/renderer/core/frame/local_frame.h      |  4 +++-
+ .../blink/renderer/core/frame/local_frame.h      |  3 +++
 .../renderer/core/frame/reporting_context.cc     |  9 +++++++++
 .../renderer/core/frame/reporting_context.h      |  7 +++++--
 .../renderer/core/frame/reporting_observer.cc    |  3 +--
- 21 files changed, 61 insertions(+), 26 deletions(-)
+ 22 files changed, 64 insertions(+), 25 deletions(-)
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc

 diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
@@ -42,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
-@@ -1470,6 +1470,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1484,6 +1484,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
   }
 }
 
@@ -50,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(
-@@ -1483,6 +1484,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1497,6 +1498,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
       });
   return urls;
 }
@@ -107,7 +108,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 #include "content/browser/service_worker/service_worker_host.h"
 #include "content/browser/worker_host/dedicated_worker_host.h"
 #include "content/browser/worker_host/shared_worker_host.h"
-@@ -190,12 +191,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+@@ -240,12 +241,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
                    const std::string& group,
                    const std::string& type,
                    base::Value::Dict body) {
@@ -125,19 +126,19 @@ 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
-@@ -15258,12 +15258,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -15928,12 +15928,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
       }
     }
   }
 -
 -  // Send the crash report to the Reporting API.
 -  GetProcess()->GetStoragePartition()->GetNetworkContext()->QueueReport(
-      /*type=*/"crash", /*group=*/"default", last_committed_url_,
+-      /*type=*/"crash", crash_reporting_group_, last_committed_url_,
 -      GetReportingSource(), isolation_info_.network_anonymization_key(),
 -      std::move(body));
 }
 
- void RenderFrameHostImpl::SendCommitNavigation(
+ void RenderFrameHostImpl::UpdateOrDisableCompositorMetricRecorder() const {
 diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 --- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 +++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
@@ -176,7 +177,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
   switch (coop_value) {
     case network::mojom::CrossOriginOpenerPolicyValue::kUnsafeNone:
-@@ -64,6 +57,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
+@@ -59,6 +52,7 @@ std::string ToString(network::mojom::CrossOriginOpenerPolicyValue coop_value) {
       return "noopener-allow-popups";
   }
 }
@@ -184,7 +185,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 
 FrameTreeNode* TopLevelOpener(FrameTreeNode* frame) {
   FrameTreeNode* opener =
-@@ -235,6 +229,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -230,6 +224,7 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
     network::mojom::SourceLocationPtr source_location,
     const std::string& reported_window_url,
     const std::string& initial_popup_url) const {
@@ -192,7 +193,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
   // Cross-Origin-Opener-Policy-Report-Only is not required to provide
   // endpoints.
   if (!coop_.report_only_reporting_endpoint)
-@@ -282,12 +277,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
+@@ -277,12 +272,14 @@ void CrossOriginOpenerPolicyReporter::QueueAccessReport(
   storage_partition_->GetNetworkContext()->QueueReport(
       "coop", endpoint, context_url_, reporting_source_,
       network_anonymization_key_, std::move(body));
@@ -207,7 +208,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
   body.Set(kDisposition,
            is_report_only ? kDispositionReporting : kDispositionEnforce);
   body.Set(kEffectivePolicy,
-@@ -295,6 +292,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
+@@ -290,6 +287,7 @@ void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
   storage_partition_->GetNetworkContext()->QueueReport(
       "coop", endpoint, context_url_, reporting_source_,
       network_anonymization_key_, std::move(body));
@@ -215,6 +216,31 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 }
 
 }  // namespace content
+diff --git a/content/browser/security/dip/document_isolation_policy_reporter.cc b/content/browser/security/dip/document_isolation_policy_reporter.cc
+--- a/content/browser/security/dip/document_isolation_policy_reporter.cc
+++ b/content/browser/security/dip/document_isolation_policy_reporter.cc
+@@ -7,6 +7,7 @@
+ #include <string_view>
+ 
+ #include "base/values.h"
+#include "net/net_buildflags.h"
+ #include "content/public/browser/storage_partition.h"
+ #include "services/network/public/cpp/request_destination.h"
+ #include "services/network/public/mojom/network_context.mojom.h"
+@@ -94,11 +95,13 @@ void DocumentIsolationPolicyReporter::QueueAndNotify(
+     }
+     body_to_pass.Set("disposition", disposition);
+ 
+#if BUILDFLAG(ENABLE_REPORTING)
+     if (auto* storage_partition = storage_partition_.get()) {
+       storage_partition->GetNetworkContext()->QueueReport(
+           kType, *endpoint, context_url_, reporting_source_,
+           network_anonymization_key_, std::move(body_to_pass));
+     }
+#endif
+   }
+ }
+ 
 diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
@@ -255,7 +281,7 @@ new file mode 100644
 diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
 --- a/net/reporting/reporting_header_parser.cc
 +++ b/net/reporting/reporting_header_parser.cc
-@@ -332,6 +332,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
+@@ -337,6 +337,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
     const NetworkAnonymizationKey& network_anonymization_key,
     const url::Origin& origin,
     base::flat_map<std::string, std::string> header) {
@@ -266,7 +292,7 @@ diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_
 diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
 --- a/net/reporting/reporting_service.cc
 +++ b/net/reporting/reporting_service.cc
-@@ -225,6 +225,12 @@ class ReportingServiceImpl : public ReportingService {
+@@ -236,6 +236,12 @@ class ReportingServiceImpl : public ReportingService {
       int depth,
       base::TimeTicks queued_ticks,
       ReportingTargetType target_type) {
@@ -277,12 +303,12 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 +#error Attempting to build with enable_reporting
 +#endif
     DCHECK(initialized_);
-     context_->cache()->AddReport(reporting_source, network_anonymization_key,
-                                  sanitized_url, user_agent, group, type,
+     context_->cache()->AddReport(
+         reporting_source, network_anonymization_key, sanitized_url, user_agent,
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -486,14 +486,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
       const GURL& url,
       const std::optional<base::UnguessableToken>& reporting_source,
       const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -303,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
-@@ -115,6 +115,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+@@ -125,6 +125,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
   }
 
 #if BUILDFLAG(ENABLE_REPORTING)
@@ -314,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1557,7 +1557,6 @@ mojom("mojom") {
+@@ -1791,7 +1791,6 @@ mojom("mojom") {
     export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
     export_header_blink = "third_party/blink/public/platform/web_common.h"
     if (enable_reporting) {
@@ -325,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
-@@ -1208,6 +1208,7 @@ interface NetworkContext {
+@@ -1234,6 +1234,7 @@ interface NetworkContext {
   // provided `network_anonymization_key`.
   //
   // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -333,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,
-@@ -1215,6 +1216,7 @@ interface NetworkContext {
+@@ -1241,6 +1242,7 @@ interface NetworkContext {
               NetworkAnonymizationKey network_anonymization_key,
               mojo_base.mojom.DictionaryValue body);
 
@@ -341,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,
-@@ -1225,6 +1227,7 @@ interface NetworkContext {
+@@ -1251,6 +1253,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`.
@@ -352,15 +378,15 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
 diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 --- a/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
 +++ b/third_party/blink/renderer/core/frame/csp/content_security_policy.cc
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
 #include <set>
 #include <utility>
 
 +#include "net/net_buildflags.h"
 #include "base/containers/contains.h"
 #include "base/debug/dump_without_crashing.h"
- #include "base/ranges/algorithm.h"
-@@ -1284,6 +1285,7 @@ void ContentSecurityPolicy::ReportViolation(
+ #include "base/feature_list.h"
+@@ -1260,6 +1261,7 @@ void ContentSecurityPolicy::ReportViolation(
     return;
   }
 
@@ -368,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);
 
-@@ -1291,6 +1293,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1267,6 +1269,7 @@ void ContentSecurityPolicy::ReportViolation(
   // `context_frame` (i.e. we're not processing 'frame-ancestors').
   if (delegate_ && !context_frame)
     delegate_->DispatchViolationEvent(*violation_data, element);
@@ -379,7 +405,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -46,6 +46,7 @@
+@@ -47,6 +47,7 @@
 #include "build/build_config.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "mojo/public/cpp/system/message_pipe.h"
@@ -387,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"
-@@ -2791,9 +2792,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2740,9 +2741,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
   return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
 }
 
@@ -402,19 +428,18 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
 --- a/third_party/blink/renderer/core/frame/local_frame.h
 +++ b/third_party/blink/renderer/core/frame/local_frame.h
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
 #include "base/time/time.h"
 #include "base/unguessable_token.h"
 #include "build/build_config.h"
 +#include "net/net_buildflags.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
- #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -660,8 +661,9 @@ class CORE_EXPORT LocalFrame final
-   void FinishedScrollSequence();
+ #include "net/storage_access_api/status.h"
+@@ -667,7 +668,9 @@ class CORE_EXPORT LocalFrame final
+     return client_hints_preferences_;
+   }
 
-   SmoothScrollSequencer* GetSmoothScrollSequencer() const;
-
 +#if BUILDFLAG(ENABLE_REPORTING)
   mojom::blink::ReportingServiceProxy* GetReportingService();
 +#endif
@@ -432,14 +457,14 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
-@@ -58,7 +59,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
+@@ -59,7 +60,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
 ReportingContext::ReportingContext(ExecutionContext& context)
     : Supplement<ExecutionContext>(context),
       execution_context_(context),
 +#if BUILDFLAG(ENABLE_REPORTING)
       reporting_service_(&context),
 +#endif
-       receiver_(this, &context) {}
+       receivers_(this, &context) {}
 
 // static
@@ -126,7 +129,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
@@ -449,10 +474,10 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 +#if BUILDFLAG(ENABLE_REPORTING)
   visitor->Trace(reporting_service_);
 +#endif
-   visitor->Trace(receiver_);
+   visitor->Trace(receivers_);
   Supplement<ExecutionContext>::Trace(visitor);
 }
-@@ -148,6 +153,7 @@ void ReportingContext::CountReport(Report* report) {
+@@ -149,6 +154,7 @@ void ReportingContext::CountReport(Report* report) {
   UseCounter::Count(execution_context_, feature);
 }
 
@@ -460,7 +485,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
 ReportingContext::GetReportingService() const {
   if (!reporting_service_.is_bound()) {
-@@ -157,6 +163,7 @@ ReportingContext::GetReportingService() const {
+@@ -158,6 +164,7 @@ ReportingContext::GetReportingService() const {
   }
   return reporting_service_;
 }
@@ -468,7 +493,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 
 void ReportingContext::NotifyInternal(Report* report) {
   if (!ShouldReportBeVisibleToObservers(report)) {
-@@ -183,6 +190,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+@@ -184,6 +191,7 @@ void ReportingContext::NotifyInternal(Report* report) {
 
 void ReportingContext::SendToReportingAPI(Report* report,
                                           const String& endpoint) const {
@@ -476,7 +501,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
   const String& type = report->type();
   if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
         type == ReportType::kDeprecation ||
-@@ -246,6 +254,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+@@ -263,6 +271,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
         url, endpoint, body->featureId(), body->disposition(), body->message(),
         body->sourceFile(), line_number, column_number);
   }
@@ -495,7 +520,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
 #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
 #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
 #include "third_party/blink/renderer/core/core_export.h"
-@@ -55,10 +56,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -56,10 +57,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
  private:
   // Counts the use of a report type via UseCounter.
   void CountReport(Report*);
@@ -508,7 +533,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
   void NotifyInternal(Report* report);
   // Send |report| via the Reporting API to |endpoint|.
   void SendToReportingAPI(Report* report, const String& endpoint) const;
-@@ -69,8 +70,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+@@ -71,8 +72,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
 
   // This is declared mutable so that the service endpoint can be cached by
   // const methods.
@@ -517,8 +542,8 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_p
       reporting_service_;
 +#endif
 
-   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
- };
+   // There might be up to two ReportingObservers stored here: one that is called
+   // from the CrossOriginEmbedderPolicyReporter and one that is called from the
 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
@@ -11,19 +11,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/browser/profiles/profile_attributes_entry.cc        | 2 +-
 chrome/browser/profiles/profile_impl.cc                    | 5 +----
 chrome/browser/profiles/profile_manager.cc                 | 7 -------
+ .../supervised_user/supervised_user_browser_utils.cc       | 1 +
 chrome/browser/ui/webui/managed_ui_handler.cc              | 4 ----
 .../browser/ui/webui/management/management_ui_handler.cc   | 4 ----
 .../core/browser/supervised_user_pref_store.cc             | 1 +
 .../core/browser/supervised_user_preferences.cc            | 6 +++++-
- .../core/browser/supervised_user_service.cc                | 5 +----
- .../supervised_user/core/browser/supervised_user_utils.cc  | 1 +
- components/supervised_user/core/common/features.cc         | 6 ++++++
- 14 files changed, 17 insertions(+), 30 deletions(-)
+ .../core/browser/supervised_user_service.cc                | 1 +
+ components/supervised_user/core/common/features.cc         | 2 +-
+ extensions/browser/api/management/management_api.cc        | 1 +
+ 15 files changed, 13 insertions(+), 27 deletions(-)

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -774,7 +774,6 @@ if (current_toolchain == default_toolchain) {
+@@ -805,7 +805,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",
@@ -34,7 +35,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
-@@ -91,7 +91,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
+@@ -93,7 +93,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
         // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
         // incognito profile.
         if (!initParams.profile.isOffTheRecord()) {
@@ -64,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
-@@ -331,7 +331,7 @@ void PrepareFactory(
+@@ -328,7 +328,7 @@ void PrepareFactory(
     policy::BrowserPolicyConnector* policy_connector) {
   factory->SetManagedPolicies(policy_service, policy_connector);
   factory->SetRecommendedPolicies(policy_service, policy_connector);
@@ -76,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
-@@ -459,7 +459,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -467,7 +467,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
 }
 
 std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -88,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
-@@ -670,10 +670,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -674,10 +674,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
     prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
 
   pref_change_registrar_.Init(prefs);
@@ -99,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(
-@@ -1625,6 +1621,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1619,6 +1615,7 @@ GURL ProfileImpl::GetHomePage() {
 }
 
 void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -110,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
-@@ -1178,10 +1178,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1192,10 +1192,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
   }
 
@@ -121,7 +122,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 #if !BUILDFLAG(IS_ANDROID)
   if (profile->IsNewProfile()) {
     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
-@@ -1962,9 +1958,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -1978,9 +1974,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
   init_params.icon_index =
       profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
 
@@ -131,10 +132,21 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 #if BUILDFLAG(IS_CHROMEOS)
   user_manager::User* user =
       ash::ProfileHelper::Get()->GetUserByProfile(profile);
+diff --git a/chrome/browser/supervised_user/supervised_user_browser_utils.cc b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+--- a/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+++ b/chrome/browser/supervised_user/supervised_user_browser_utils.cc
+@@ -99,6 +99,7 @@ bool SupervisedUserCanSkipExtensionParentApprovals(const Profile* profile) {
+ }
+ 
+ bool AreExtensionsPermissionsEnabled(Profile* profile) {
+  if ((true)) return false;
+ #if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
+   return profile->IsChild();
+ #else
 diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc
 --- a/chrome/browser/ui/webui/managed_ui_handler.cc
 +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
-@@ -90,10 +90,6 @@ void ManagedUIHandler::AddObservers() {
+@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() {
     auto domain = static_cast<policy::PolicyDomain>(i);
     policy_service->AddObserver(domain, this);
   }
@@ -148,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
-@@ -578,10 +578,6 @@ bool ManagementUIHandler::managed() const {
+@@ -595,10 +595,6 @@ bool ManagementUIHandler::managed() const {
 
 void ManagementUIHandler::RegisterPrefChange(
     PrefChangeRegistrar& pref_registrar) {
@@ -162,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
-@@ -126,6 +126,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() = default;
+@@ -142,6 +142,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() = default;
 
 void SupervisedUserPrefStore::OnNewSettingsAvailable(
     const base::Value::Dict& settings) {
@@ -173,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
-@@ -155,6 +155,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -164,6 +164,10 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
 }
 
 void EnableParentalControls(PrefService& pref_service) {
@@ -183,8 +195,8 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 +  }
   pref_service.SetString(prefs::kSupervisedUserId,
                          supervised_user::kChildAccountSUID);
-   SetIsChildAccountStatusKnown(pref_service);
-@@ -177,7 +181,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
+ #if BUILDFLAG(IS_CHROMEOS)
+@@ -197,7 +201,7 @@ bool IsSafeSitesEnabled(const PrefService& pref_service) {
 }
 
 bool IsSubjectToParentalControls(const PrefService& pref_service) {
@@ -192,52 +204,44 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 +  return false;
 }
 
- }  // namespace supervised_user
+ bool IsGoogleSafeSearchEnforced(const PrefService& pref_service) {
 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
-@@ -49,10 +49,6 @@ void SupervisedUserService::Init() {
-   DCHECK(settings_service_->IsReady());
- 
-   pref_change_registrar_.Init(&user_prefs_.get());
-  pref_change_registrar_.Add(
-      prefs::kSupervisedUserId,
-      base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged,
-                          base::Unretained(this)));
-   SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get()));
+@@ -168,6 +168,7 @@ SupervisedUserService::SupervisedUserService(
 }
 
-@@ -138,6 +134,7 @@ SupervisedUserService::SupervisedUserService(
- }
- 
- void SupervisedUserService::SetActive(bool active) {
+ void SupervisedUserService::SetSettingsServiceActive(bool active) {
 +  active = false;
-   if (active_ == active) {
-     return;
-   }
-diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/components/supervised_user/core/browser/supervised_user_utils.cc
--- a/components/supervised_user/core/browser/supervised_user_utils.cc
-+++ b/components/supervised_user/core/browser/supervised_user_utils.cc
-@@ -145,6 +145,7 @@ GURL NormalizeUrl(const GURL& url) {
- }
+   settings_service_->SetActive(active);
 
- bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
-+  if ((true)) return true;
-   return pref_service
-              .FindPreference(prefs::kDefaultSupervisedUserFilteringBehavior)
-              ->IsDefaultValue() ||
+   // Trigger a sync reconfig to enable/disable the right SU data types.
 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
-@@ -196,4 +196,10 @@ bool IsKidFriendlyContentFeedAvailable() {
-   return base::FeatureList::IsEnabled(kKidFriendlyContentFeed);
+@@ -35,7 +35,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
+ #else
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+-
+ #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+     BUILDFLAG(IS_WIN)
+ const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
+@@ -148,4 +147,5 @@ BASE_FEATURE(kDecoupleSafeSitesFromMainSwitch,
+              "DecoupleSafeSitesFromMainSwitch",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ 
+SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
+ }  // namespace supervised_user
+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
+@@ -310,6 +310,7 @@ void AddExtensionInfo(const Extension* source_extension,
 }
 
-+SET_CROMITE_FEATURE_DISABLED(kKidFriendlyContentFeed);
-+SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
-+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
-+SET_CROMITE_FEATURE_DISABLED(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
-+#endif
-+
- }  // namespace supervised_user
+ bool PlatformSupportsApprovalFlowForExtensions() {
+  if ((true)) return false;
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+     BUILDFLAG(IS_WIN)
+   return true;
 --
@@ -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
-@@ -1309,6 +1309,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
+@@ -1340,6 +1340,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
   pipeline_controller_->OnSelectedVideoTrackChanged(selected);
 }
 
@@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +}
 +
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const WebVector<WebMediaPlayer::TrackId>& enabled_track_ids) {
+     const std::vector<WebMediaPlayer::TrackId>& enabled_track_ids) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
@@ -3710,7 +3716,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
           : HasAudio();
@@ -35,7 +35,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +  if (!HasVideoNonEmptySize() && preserve_audio)
     return false;
 
-   // MediaPlayer always signals audio and video, so use an empty natural size to
+   // Video PiP is the only exception when background video playback is disabled.
 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
@@ -47,6 +47,6 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b
 +  bool HasVideoNonEmptySize() const;
 +
   void EnabledAudioTracksChanged(
-       const WebVector<WebMediaPlayer::TrackId>& enabled_track_ids) override;
+       const std::vector<WebMediaPlayer::TrackId>& enabled_track_ids) override;
   void SelectedVideoTrackChanged(
 --
@@ -17,16 +17,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 +import org.chromium.cc.input.BrowserControlsState;
 import org.chromium.chrome.browser.DefaultBrowserInfo;
 import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -34,6 +35,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
- import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
- import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
+ import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
+@@ -38,6 +39,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;
 +import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-@@ -235,6 +237,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -290,6 +292,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
             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());
-@@ -255,6 +258,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -310,6 +313,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
      * @param url The URL to open.
      */
     public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
@@ -7,18 +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 +
 .../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         | 2 ++
- 6 files changed, 6 insertions(+), 5 deletions(-)
+ .../always-use-new-tab-page-for-default-home-page.inc         | 1 +
+ 7 files changed, 6 insertions(+), 5 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
-@@ -155,10 +155,6 @@ public class HomepageManager
+@@ -148,10 +148,6 @@ public class HomepageManager
      *     tab page if the homepage button is force enabled via flag.
      */
     public GURL getDefaultHomepageGurl() {
@@ -29,21 +30,32 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
         String homepagePartnerDefaultGurlSerialized =
                 ChromeSharedPreferences.getInstance()
                         .readString(
+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
+@@ -54,6 +54,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()
 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
-@@ -61,6 +61,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
-      * @return Iterator over bookmarks or null.
-      */
-     public static PartnerBookmarksProviderIterator createIfAvailable() {
-+        if ((true)) return null;
-         try {
-             Cursor cursor =
-                     ContextUtils.getApplicationContext()
+@@ -70,6 +70,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
+         new AsyncTask<@Nullable Cursor>() {
+             @Override
+             protected @Nullable Cursor doInBackground() {
+                if ((true)) return null;
+                 try {
+                     return ContextUtils.getApplicationContext()
+                             .getContentResolver()
 diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -210,7 +210,7 @@ public class PartnerBrowserCustomizations {
+@@ -213,7 +213,7 @@ public class PartnerBrowserCustomizations {
                                                             & ApplicationInfo.FLAG_SYSTEM)
                                                     == 1
                                             || !VersionInfo.isStableBuild();
@@ -55,7 +67,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -72,6 +72,7 @@ public class TemplateUrl {
+@@ -85,6 +85,7 @@ public class TemplateUrl {
      *     prepopulated_engines.json.
      */
     public String getNewTabURL() {
@@ -66,19 +78,18 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
 diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
 --- a/components/search_engines/android/template_url_service_android.cc
 +++ b/components/search_engines/android/template_url_service_android.cc
-@@ -404,6 +404,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -403,6 +403,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
         jimage_translate_source_language_param_key,
     const base::android::JavaParamRef<jstring>&
         jimage_translate_target_language_param_key) {
 +  if ((true)) return false;
   // The function is scheduled to run only when the service is loaded, see
   // `TemplateUrlService#runWhenLoaded()`.
-   CHECK(template_url_service_->loaded(), base::NotFatalUntil::M128);
+   CHECK(template_url_service_->loaded());
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
 new file mode 100755
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/always-use-new-tab-page-for-default-home-page.inc
-@@ -0,0 +1,2 @@
-+SET_CROMITE_FEATURE_DISABLED(kNewTabSearchEngineUrlAndroid);
+@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kPartnerCustomizationsUma);
 --
@@ -0,0 +1,353 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 26 May 2025 12:17:48 +0000
+Subject: Android Import Passwords
+
+Adds the possibility of importing a csv file containing the list of passwords,
+with the same functionality available on desktops.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ ...e_password_preferences_action_bar_menu.xml |  6 ++
+ .../settings/PasswordSettings.java            | 34 +++++++++
+ .../settings/PasswordManagerHandler.java      |  3 +
+ .../settings/PasswordUiView.java              |  8 +++
+ .../android/password_ui_view_android.cc       | 71 +++++++++++++++++++
+ .../android/password_ui_view_android.h        | 20 +++++-
+ .../Import-Password-Android.grdp              |  9 +++
+ .../core/browser/import/password_importer.cc  | 11 +++
+ 8 files changed, 161 insertions(+), 1 deletion(-)
+ create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
+
+diff --git a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
+--- a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
+++ b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
+@@ -22,6 +22,12 @@ found in the LICENSE file.
+         android:visibility="gone"
+         app:showAsAction="ifRoom"/>
+ 
+    <item
+        android:id="@+id/import_passwords"
+        android:title="@string/password_settings_import_action_title"
+        android:contentDescription="@string/password_settings_import_action_description"
+        app:showAsAction="never"/>
+
+     <item
+         android:id="@+id/export_passwords"
+         android:title="@string/password_settings_export_action_title"
+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
+@@ -57,6 +57,9 @@ import org.chromium.components.sync.PassphraseType;
+ import org.chromium.components.sync.SyncService;
+ import org.chromium.components.user_prefs.UserPrefs;
+ import org.chromium.ui.text.SpanApplier;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.ActivityIntentRequestTrackerDelegate;
+import org.chromium.ui.base.IntentRequestTracker;
+ 
+ import java.lang.annotation.Retention;
+ import java.lang.annotation.RetentionPolicy;
+@@ -151,6 +154,8 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+ 
+     /** For controlling the UX flow of exporting passwords. */
+     private final ExportFlow mExportFlow = new ExportFlow(PasswordAccessLossWarningType.NONE);
+    private ActivityWindowAndroid mWindowAndroid;
+    private IntentRequestTracker mIntentRequestTracker;
+ 
+     public ExportFlow getExportFlowForTesting() {
+         return mExportFlow;
+@@ -199,6 +204,19 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+ 
+         mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState);
+ 
+        mIntentRequestTracker = IntentRequestTracker.createFromDelegate(
+                                new ActivityIntentRequestTrackerDelegate(getActivity()) {
+                                    @Override
+                                    public boolean startActivityForResult(@Nullable Intent intent, int requestCode) {
+                                        PasswordSettings.this.startActivityForResult(intent, requestCode);
+                                        return true;
+                                    }
+                                });
+        mWindowAndroid = new ActivityWindowAndroid(
+            getActivity(), /* listenToActivityState */ true,
+            mIntentRequestTracker, /*InsetObserver*/ null,
+            /* trackOcclusion= */ true);
+
+         if (savedInstanceState == null) return;
+ 
+         if (savedInstanceState.containsKey(SAVED_STATE_SEARCH_QUERY)) {
+@@ -263,6 +281,12 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+     @Override
+     public boolean onOptionsItemSelected(MenuItem item) {
+         int id = item.getItemId();
+        if (id == R.id.import_passwords) {
+            PasswordManagerHandlerProvider.getForProfile(getProfile())
+                    .getPasswordManagerHandler()
+                    .startImporting(mWindowAndroid);
+            return true;
+        }
+         if (id == R.id.export_passwords) {
+             RecordHistogram.recordEnumeratedHistogram(
+                     mExportFlow.getExportEventHistogramName(),
+@@ -506,6 +530,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+     @Override
+     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+         super.onActivityResult(requestCode, resultCode, intent);
+        mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, intent);
+         if (requestCode != PASSWORD_EXPORT_INTENT_REQUEST_CODE) return;
+         if (resultCode != Activity.RESULT_OK) return;
+         if (intent == null || intent.getData() == null) return;
+@@ -517,12 +542,21 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+     public void onSaveInstanceState(Bundle outState) {
+         super.onSaveInstanceState(outState);
+         mExportFlow.onSaveInstanceState(outState);
+        mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState);
+         if (mSearchQuery != null) {
+             outState.putString(SAVED_STATE_SEARCH_QUERY, mSearchQuery);
+         }
+         outState.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer);
+     }
+ 
+    @Override
+    public void onRequestPermissionsResult(
+            int requestCode, String[] permissions, int[] grantResults) {
+        if (mWindowAndroid.handlePermissionResult(requestCode, permissions, grantResults))
+            return;
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+     @Override
+     public void onDestroy() {
+         super.onDestroy();
+diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
+--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
+@@ -9,6 +9,7 @@ import android.content.Context;
+ import org.chromium.base.Callback;
+ import org.chromium.base.IntStringCallback;
+ import org.chromium.build.annotations.NullMarked;
+import org.chromium.ui.base.WindowAndroid;
+ 
+ /**
+  * Interface for retrieving passwords and password exceptions (websites for which Chrome should not
+@@ -80,4 +81,6 @@ public interface PasswordManagerHandler {
+      * @return Returns true if the request to fetch the passwords is still pending.
+      */
+     boolean isWaitingForPasswordStore();
+
+    boolean startImporting(WindowAndroid window);
+ }
+diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
+--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
+@@ -12,6 +12,7 @@ import org.jni_zero.NativeMethods;
+ 
+ import org.chromium.base.Callback;
+ import org.chromium.base.IntStringCallback;
+import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.chrome.browser.profiles.Profile;
+ 
+@@ -158,6 +159,12 @@ public final class PasswordUiView implements PasswordManagerHandler {
+         }
+     }
+ 
+    @Override
+    public boolean startImporting(WindowAndroid window) {
+        return PasswordUiViewJni.get()
+                .startImporting(mNativePasswordUiViewAndroid, PasswordUiView.this, window);
+    }
+
+     @NativeMethods
+     interface Natives {
+         long init(PasswordUiView caller, @JniType("Profile*") Profile profile);
+@@ -190,6 +197,7 @@ public final class PasswordUiView implements PasswordManagerHandler {
+         String getTrustedVaultLearnMoreURL();
+ 
+         boolean isWaitingForPasswordStore(long nativePasswordUiViewAndroid, PasswordUiView caller);
+        boolean startImporting(long nativePasswordUiViewAndroid, PasswordUiView caller, WindowAndroid window);
+ 
+         void destroy(long nativePasswordUiViewAndroid, PasswordUiView caller);
+ 
+diff --git a/chrome/browser/password_manager/android/password_ui_view_android.cc b/chrome/browser/password_manager/android/password_ui_view_android.cc
+--- a/chrome/browser/password_manager/android/password_ui_view_android.cc
+++ b/chrome/browser/password_manager/android/password_ui_view_android.cc
+@@ -41,6 +41,11 @@
+ #include "ui/base/l10n/l10n_util.h"
+ #include "url/gurl.h"
+ 
+#include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "ui/shell_dialogs/selected_file_info.h"
+#include "ui/shell_dialogs/select_file_dialog.h"
+#include "ui/android/window_android.h"
+
+ // Must come after other includes, because FromJniType() uses Profile.
+ #include "chrome/browser/password_manager/android/jni_headers/PasswordUiView_jni.h"
+ 
+@@ -123,6 +128,8 @@ PasswordUiViewAndroid::PasswordUiViewAndroid(
+ 
+ PasswordUiViewAndroid::~PasswordUiViewAndroid() {
+   saved_passwords_presenter_.RemoveObserver(this);
+  if (select_file_dialog_)
+    select_file_dialog_->ListenerDestroyed();
+ }
+ 
+ void PasswordUiViewAndroid::Destroy(JNIEnv*, const JavaRef<jobject>&) {
+@@ -314,6 +321,70 @@ jboolean PasswordUiViewAndroid::IsWaitingForPasswordStore(
+   return saved_passwords_presenter_.IsWaitingForPasswordStore();
+ }
+ 
+void PasswordUiViewAndroid::ImportFinished(
+    const password_manager::ImportResults& results) {
+  std::string error;
+  if (results.status == password_manager::ImportResults::Status::SUCCESS)
+    error = "Success.";
+  else if (results.status == password_manager::ImportResults::Status::IO_ERROR)
+    error = "Failed to read provided file.";
+  else if (results.status == password_manager::ImportResults::Status::BAD_FORMAT)
+    error = "Header is missing, invalid or could not be read.";
+  else if (results.status == password_manager::ImportResults::Status::NUM_PASSWORDS_EXCEEDED)
+    error = "Too many passwords.";
+  else
+    error = "UNKNOWN ERROR.";
+
+  std::stringstream message;
+  message << error << " Imported " << results.number_imported << " passwords.";
+  auto result = message.str();
+
+  select_file_dialog_->ShowToast(result);
+
+  importer_.reset();
+}
+
+jboolean PasswordUiViewAndroid::StartImporting(
+    JNIEnv* env,
+    const base::android::JavaRef<jobject>& obj,
+    const JavaParamRef<jobject>& java_window) {
+  ui::WindowAndroid* window =
+      ui::WindowAndroid::FromJavaWindowAndroid(java_window);
+  CHECK(window);
+
+  select_file_dialog_ = ui::SelectFileDialog::Create(
+    this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
+
+  ui::SelectFileDialog::FileTypeInfo file_type_info;
+
+  const std::vector<std::u16string> v_accept_types = { u"application/octet-stream" };
+  select_file_dialog_->SetAcceptTypes(v_accept_types);
+
+  select_file_dialog_->SelectFile(
+        ui::SelectFileDialog::SELECT_OPEN_FILE,
+        std::u16string(),
+        base::FilePath(),
+        &file_type_info,
+        0,
+        base::FilePath::StringType(),
+        window);
+
+  return true;
+}
+
+void PasswordUiViewAndroid::FileSelectionCanceled() {}
+
+void PasswordUiViewAndroid::FileSelected(const ui::SelectedFileInfo& file, int index) {
+  base::FilePath path = file.path();
+
+  importer_ =
+    std::make_unique<password_manager::PasswordImporter>(&saved_passwords_presenter_);
+  importer_->Import(path,
+    password_manager::PasswordForm::Store::kProfileStore,
+    base::BindOnce(&PasswordUiViewAndroid::ImportFinished,
+                     base::Unretained(this)));
+}
+
+ // static
+ static jlong JNI_PasswordUiView_Init(JNIEnv* env,
+                                      const JavaParamRef<jobject>& obj,
+diff --git a/chrome/browser/password_manager/android/password_ui_view_android.h b/chrome/browser/password_manager/android/password_ui_view_android.h
+--- a/chrome/browser/password_manager/android/password_ui_view_android.h
+++ b/chrome/browser/password_manager/android/password_ui_view_android.h
+@@ -21,6 +21,8 @@
+ #include "chrome/browser/signin/identity_manager_factory.h"
+ #include "components/password_manager/core/browser/password_store/password_store_consumer.h"
+ #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
+#include "components/password_manager/core/browser/import/password_importer.h"
+#include "ui/shell_dialogs/select_file_dialog.h"
+ 
+ class Profile;
+ 
+@@ -31,7 +33,8 @@ class CredentialProviderInterface;
+ // PasswordUIView for Android, contains jni hooks that allows Android UI to
+ // display passwords and route UI commands back to SavedPasswordsPresenter.
+ class PasswordUiViewAndroid
+-    : public password_manager::SavedPasswordsPresenter::Observer {
+    : public password_manager::SavedPasswordsPresenter::Observer,
+      public ui::SelectFileDialog::Listener {
+  public:
+   // Result of transforming a vector of PasswordForms into their CSV
+   // description and writing that to disk.
+@@ -95,6 +98,18 @@ class PasswordUiViewAndroid
+       const base::android::JavaParamRef<jobject>& obj);
+   jboolean IsWaitingForPasswordStore(JNIEnv* env,
+                                      const base::android::JavaRef<jobject>&);
+
+  void FileSelected(const ui::SelectedFileInfo& file,
+                    int index) override;
+  void FileSelectionCanceled() override;
+
+  void ImportFinished(
+       const password_manager::ImportResults& results);
+
+  jboolean StartImporting(JNIEnv* env,
+                          const base::android::JavaRef<jobject>& obj,
+                          const base::android::JavaParamRef<jobject>& java_window);
+
+   // Destroy the native implementation.
+   void Destroy(JNIEnv*, const base::android::JavaRef<jobject>&);
+ 
+@@ -162,6 +177,9 @@ class PasswordUiViewAndroid
+   std::vector<password_manager::CredentialUIEntry> passwords_;
+   std::vector<password_manager::CredentialUIEntry> blocked_sites_;
+ 
+  scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
+  std::unique_ptr<password_manager::PasswordImporter> importer_;
+
+   // If not null, passwords for exporting will be obtained from
+   // |*credential_provider_for_testing_|, otherwise from
+   // |saved_passwords_presenter_|. This must remain null in production code.
+diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
+new file mode 100644
+--- /dev/null
+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+    <message name="IDS_PASSWORD_SETTINGS_IMPORT_ACTION_TITLE" desc="The title of a menu item to trigger importing passwords from the password settings.">
+        Import passwords…
+    </message>
+    <message name="IDS_PASSWORD_SETTINGS_IMPORT_ACTION_DESCRIPTION" desc="The description of a menu item to trigger importing passwords from the password settings.">
+        Import passwords stored with Chrome
+    </message>
+</grit-part>
+diff --git a/components/password_manager/core/browser/import/password_importer.cc b/components/password_manager/core/browser/import/password_importer.cc
+--- a/components/password_manager/core/browser/import/password_importer.cc
+++ b/components/password_manager/core/browser/import/password_importer.cc
+@@ -75,6 +75,17 @@ const int32_t kMaxFileSizeBytes = 150 * 1024;
+ // optional string. The string will be present if the status is SUCCESS.
+ base::expected<std::string, ImportResults::Status> ReadFileToString(
+     const base::FilePath& path) {
+#if BUILDFLAG(IS_ANDROID)
+  if (path.IsContentUri()) {
+    base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
+    auto fileLength = file.GetLength();
+    std::vector<char> buffer(fileLength);
+    file.ReadAtCurrentPos(base::as_writable_byte_span(buffer));
+
+    std::string file_contents(buffer.begin(), buffer.end());
+    return std::move(file_contents);
+  }
+#endif
+   std::optional<int64_t> file_size = base::GetFileSize(path);
+ 
+   if (file_size.has_value()) {
+--
@@ -7,13 +7,35 @@ Adds a setting for blocking the toolbar hiding
 need: Add-cromite-flags-support.patch
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ ...rowserStateBrowserControlsVisibilityDelegate.java |  4 +++-
 .../Toolbar-Scroll-Ablation-flag.grdp                |  9 +++++++++
 .../java/res/xml/accessibility_preferences.xml       |  6 ++++++
 .../about_flags_cc/Toolbar-Scroll-Ablation-flag.inc  | 12 ++++++++++++
- 3 files changed, 27 insertions(+)
+ 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Toolbar-Scroll-Ablation-flag.inc

+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
+     private final Supplier<Boolean> mPersistentFullscreenMode;
+ 
+     private long mCurrentShowingStartTime;
+    private int temporaryToken;
+ 
+     /**
+      * Constructs a BrowserControlsVisibilityDelegate designed to deal with overrides driven by
+@@ -65,7 +66,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+         long currentShowingTime = SystemClock.uptimeMillis() - mCurrentShowingStartTime;
+         if (currentShowingTime >= MINIMUM_SHOW_DURATION_MS) return;
+ 
+-        final int temporaryToken = mTokenHolder.acquireToken();
+        mTokenHolder.releaseToken(temporaryToken);
+        temporaryToken = mTokenHolder.acquireToken();
+         mHandler.postDelayed(
+                 () -> mTokenHolder.releaseToken(temporaryToken),
+                 MINIMUM_SHOW_DURATION_MS - currentShowingTime);
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Toolbar-Scroll-Ablation-flag.grdp
 new file mode 100644
 --- /dev/null
@@ -31,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
-@@ -73,6 +73,12 @@ found in the LICENSE file.
+@@ -79,6 +79,12 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -29,9 +29,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../sAskForRestartOnConnectionChange.java     |  32 +++++
 .../browser/tabmodel/TabModelSelector.java    |   2 +
 .../browser/tabmodel/TabModelUtils.java       |  18 +++
- .../browser/tabmodel/TabWindowManager.java    |   2 +
- .../tabmodel/TabWindowManagerImpl.java        |  10 ++
+ .../browser/tabwindow/TabWindowManager.java   |   2 +
+ .../tabwindow/TabWindowManagerImpl.java       |  10 ++
 .../Ask-for-restart-on-connection-change.grdp |  15 +++
+ .../java/res/layout/floating_snackbar.xml     |  10 ++
 .../android/java/res/layout/snackbar.xml      |  10 ++
 .../ui/messages/snackbar/Snackbar.java        |  16 +++
 .../ui/messages/snackbar/SnackbarManager.java |   6 +
@@ -49,7 +50,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../blink/renderer/core/frame/local_frame.cc  |   2 +
 .../main_thread/frame_scheduler_impl.cc       |   2 +
 .../main_thread/page_scheduler_impl.cc        |   9 +-
- 29 files changed, 322 insertions(+), 10 deletions(-)
+ 30 files changed, 332 insertions(+), 10 deletions(-)
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
@@ -98,7 +99,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +import org.chromium.base.supplier.ObservableSupplier;
 +import org.chromium.url.GURL;
 +import org.chromium.chrome.R;
-+import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
+import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
 +import org.chromium.chrome.browser.layouts.LayoutManager;
 +import org.chromium.chrome.browser.compositor.layouts.Layout;
 +import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
@@ -111,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +import org.chromium.chrome.browser.tab.Tab;
 +import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 +import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-+import org.chromium.chrome.browser.tabmodel.TabWindowManager;
+import org.chromium.chrome.browser.tabwindow.TabWindowManager;
 +import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +import org.chromium.content_public.browser.WebContentsObserver;
 +import org.chromium.content_public.browser.WebContents;
@@ -181,7 +182,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +                    new WebContentsObserver(webContents) {
 +                        @Override
 +                        public void didStartLoading(GURL url) {
-+                            webContents.removeObserver(this);
+                            observe(null);
 +                            SnackbarManager snackbarManager = mSnackbarManagerSupplier.get();
 +                            snackbarManager.dismissSnackbars(controller);
 +                        }
@@ -281,7 +282,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
-@@ -1233,7 +1233,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1373,7 +1373,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                         mActivity,
                         mStatusIndicatorCoordinator,
                         isUrlBarFocusedSupplier,
@@ -296,7 +297,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-@@ -199,6 +199,13 @@ public abstract class TabModelSelectorBase
+@@ -195,6 +195,13 @@ public abstract class TabModelSelectorBase
         return null;
     }
 
@@ -350,7 +351,7 @@ new file mode 100644
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
 --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
 +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelector.java
-@@ -147,6 +147,8 @@ public interface TabModelSelector {
+@@ -146,6 +146,8 @@ public interface TabModelSelector {
     /** Get total tab count across all tab models */
     int getTotalTabCount();
 
@@ -358,11 +359,11 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 +
     /**
      * Search all TabModels for a tab with the specified id.
-      * @return specified tab or null if tab is not found
+      *
 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
-@@ -17,12 +17,16 @@ import org.chromium.base.supplier.SupplierUtils;
+@@ -16,12 +16,16 @@ 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;
@@ -400,11 +401,11 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
     /**
      * Find the {@link Tab} index whose URL matches the specified URL.
      *
-diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
-+++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
-@@ -107,6 +107,8 @@ public interface TabWindowManager {
-      */
+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
+@@ -138,6 +138,8 @@ public interface TabWindowManager {
+     /** Returns the total number of incognito tabs across all tab model selectors. */
     int getIncognitoTabCount();
 
 +    void setPagesFrozen(boolean frozen);
@@ -412,17 +413,17 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
     /**
      * @param tab The tab to look for in each model.
      * @return The TabModel containing the given Tab or null if one doesn't exist.
-diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
--- a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
-+++ b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
-@@ -459,6 +459,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
-         return null;
+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
+@@ -555,6 +555,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+         return tabGroupModelFilter.getTabsInGroup(tabGroupId);
     }
 
 +    @Override
 +    public void setPagesFrozen(boolean frozen) {
-+        for (int i = 0; i < mSelectors.size(); i++) {
-+            TabModelSelector selector = mSelectors.get(i);
+        for (int i : mWindowIdToSelectors.keySet()) {
+            TabModelSelector selector = mWindowIdToSelectors.get(i);
 +            if (selector != null) {
 +                selector.setPagesFrozen(frozen);
 +            }
@@ -430,8 +431,8 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro
 +    }
 +
     @Override
-     public TabModelSelector getTabModelSelectorById(int index) {
-         return mSelectors.get(index);
+     public @Nullable TabModelSelector getTabModelSelectorById(@WindowId int windowId) {
+         return mWindowIdToSelectors.get(windowId);
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
 new file mode 100644
 --- /dev/null
@@ -452,6 +453,25 @@ new file mode 100644
 +        Not now
 +    </message>
 +</grit-part>
+diff --git a/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml b/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+--- a/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+++ b/chrome/browser/ui/messages/android/java/res/layout/floating_snackbar.xml
+@@ -50,5 +50,15 @@ found in the LICENSE file.
+       android:paddingEnd="@dimen/snackbar_button_padding"
+       android:paddingStart="@dimen/snackbar_button_padding"
+       style="@style/TextButton" />
+
+  <org.chromium.ui.widget.ButtonCompat
+      android:id="@+id/snackbar_dismiss"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_vertical"
+      android:paddingEnd="24dp"
+      android:paddingStart="24dp"
+      android:visibility="gone"
+      style="@style/TextButton" />
+ </LinearLayout>
+ 
 diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
 --- a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
 +++ b/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml
@@ -474,16 +494,16 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/c
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
-@@ -133,6 +133,8 @@ public class Snackbar {
-     private String mTemplateText;
-     private String mActionText;
-     private Object mActionData;
+@@ -136,6 +136,8 @@ public class Snackbar {
+     private @Nullable String mTemplateText;
+     private @Nullable String mActionText;
+     private @Nullable Object mActionData;
 +    private String mDismissActionText;
 +    private Object mDismissActionData;
     private int mBackgroundColor;
     private int mTextApperanceResId;
     private boolean mSingleLine = true;
-@@ -235,6 +237,20 @@ public class Snackbar {
+@@ -241,6 +243,20 @@ public class Snackbar {
         return this;
     }
 
@@ -507,7 +527,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
-@@ -318,6 +318,12 @@ public class SnackbarManager
+@@ -326,6 +326,12 @@ public class SnackbarManager
                         new SnackbarView(
                                 mActivity,
                                 this,
@@ -523,7 +543,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
-@@ -51,6 +51,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -55,6 +55,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
     protected final ViewGroup mSnackbarView;
     protected final TemplatePreservingTextView mMessageView;
     private final TextView mActionButtonView;
@@ -531,7 +551,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;
-@@ -97,11 +98,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -101,11 +102,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
     public SnackbarView(
             Activity activity,
             OnClickListener listener,
@@ -545,7 +565,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
     }
 
     /**
-@@ -120,6 +122,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -124,6 +126,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
     public SnackbarView(
             Activity activity,
             OnClickListener listener,
@@ -553,7 +573,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
             Snackbar snackbar,
             ViewGroup parentView,
             @Nullable WindowAndroid windowAndroid,
-@@ -147,6 +150,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -154,6 +157,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);
@@ -562,7 +582,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()) {
-@@ -394,6 +399,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -428,6 +433,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
             mActionButtonView.setVisibility(View.VISIBLE);
             mActionButtonView.setContentDescription(snackbar.getActionText());
             setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -578,7 +598,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
 --- a/content/browser/web_contents/web_contents_android.cc
 +++ b/content/browser/web_contents/web_contents_android.cc
-@@ -898,6 +898,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
+@@ -899,6 +899,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
   view->SetFocus(focused);
 }
 
@@ -615,7 +635,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
-@@ -3727,8 +3727,10 @@ void WebContentsImpl::Stop() {
+@@ -3991,8 +3991,10 @@ void WebContentsImpl::Stop() {
 void WebContentsImpl::SetPageFrozen(bool frozen) {
   TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
 
@@ -629,7 +649,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
-@@ -1157,6 +1157,12 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+@@ -1130,6 +1130,12 @@ public class WebContentsImpl
         WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
     }
 
@@ -642,7 +662,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
     @Override
     public void setDisplayCutoutSafeArea(Rect insets) {
         if (mNativeWebContentsAndroid == 0) return;
-@@ -1451,6 +1457,8 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+@@ -1450,6 +1456,8 @@ public class WebContentsImpl
 
         void setFocus(long nativeWebContentsAndroid, boolean focused);
 
@@ -654,7 +674,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
 diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 --- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 +++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
-@@ -289,6 +289,8 @@ public interface WebContents extends Parcelable {
+@@ -283,6 +283,8 @@ public interface WebContents extends Parcelable {
      */
     void setFocus(boolean hasFocus);
 
@@ -666,7 +686,7 @@ diff --git a/content/public/android/java/src/org/chromium/content_public/browser
 diff --git a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
 --- a/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
 +++ b/content/public/test/android/javatests/src/org/chromium/content_public/browser/test/mock/MockWebContents.java
-@@ -187,6 +187,9 @@ public class MockWebContents implements WebContents {
+@@ -188,6 +188,9 @@ public class MockWebContents implements WebContents, WebContentsObserver.Observa
     @Override
     public void setFocus(boolean hasFocus) {}
 
@@ -711,7 +731,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
-@@ -4289,6 +4289,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4387,6 +4387,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
 }
 
 void Document::DispatchFreezeEvent() {
@@ -722,7 +742,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
-@@ -3233,6 +3233,7 @@ void LocalFrame::DidFreeze() {
+@@ -3178,6 +3178,7 @@ void LocalFrame::DidFreeze() {
   LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
   GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
   Loader().SetDefersLoading(freeze_mode);
@@ -730,7 +750,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 }
 
 void LocalFrame::DidResume() {
-@@ -3247,6 +3248,7 @@ void LocalFrame::DidResume() {
+@@ -3192,6 +3193,7 @@ void LocalFrame::DidResume() {
   GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
   Loader().SetDefersLoading(LoaderFreezeMode::kNone);
 
@@ -741,7 +761,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
-@@ -979,7 +979,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -998,7 +998,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
   if (!parent_page_scheduler_)
     return SchedulingLifecycleState::kNotThrottled;
   if (parent_page_scheduler_->IsFrozen()) {
@@ -767,7 +787,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_sche
   PolicyUpdater policy_updater;
   SetPageFrozenImpl(frozen, policy_updater);
 }
-@@ -799,7 +801,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+@@ -801,7 +803,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.
@@ -52,7 +52,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
-@@ -197,6 +197,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
+@@ -199,6 +199,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
   }
 }
 
@@ -76,7 +76,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.h
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.h
-@@ -115,6 +115,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
+@@ -116,6 +116,8 @@ class MODULES_EXPORT AudioBuffer final : public ScriptWrappable {
 
   std::unique_ptr<SharedAudioBuffer> CreateSharedAudioBuffer();
 
@@ -88,7 +88,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -13,6 +13,7 @@
+@@ -15,6 +15,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"
-@@ -637,7 +638,9 @@ double AudioContext::baseLatency() const {
+@@ -660,7 +661,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"
-@@ -709,6 +710,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -715,6 +716,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
   return To<LocalDOMWindow>(GetExecutionContext());
 }
 
@@ -146,7 +146,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
 +  static float ShuffleAudioData(float data, unsigned index);
 +
  protected:
-   enum ContextType { kRealtimeContext, kOfflineContext };
+   enum class ContextType { kRealtimeContext, kOfflineContext };
 
 diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
@@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -481,9 +481,8 @@
+@@ -562,9 +562,8 @@
     {
       // AudioContext.playoutStats interface.
       // https://chromestatus.com/feature/5172818344148992
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -707,6 +707,21 @@ void ExecutionContext::WriteIntoTrace(
+@@ -713,6 +713,21 @@ void ExecutionContext::WriteIntoTrace(
   proto->set_world_type(GetWorldType(*this));
 }
 
@@ -49,7 +49,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
-@@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -396,6 +396,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
 
   HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -60,7 +60,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/base_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/base_fetch_context.h
-@@ -84,6 +84,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
+@@ -86,6 +86,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
 
   virtual SubresourceFilter* GetSubresourceFilter() const = 0;
   virtual bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const = 0;
@@ -71,7 +71,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
-@@ -996,6 +996,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1033,6 +1033,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -101,7 +101,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
-@@ -182,6 +182,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -184,6 +184,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
@@ -176,7 +176,7 @@ diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.c
 diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
-@@ -102,6 +102,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+@@ -103,6 +103,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
          request_url.ProtocolIsInHTTPFamily();
 }
 
@@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 scoped_refptr<BlobDataHandle> ExtractBlobHandle(
     Request* request,
     ExceptionState& exception_state) {
-@@ -189,6 +213,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
+@@ -190,6 +214,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
                                  exception_state);
     }
 
@@ -224,7 +224,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
-@@ -288,6 +288,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -284,6 +284,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
     return false;
   }
 
@@ -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
-@@ -4678,7 +4678,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -5023,7 +5023,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
 }
 
 void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -82,7 +82,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
 #include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/core/dom/document.h"
-@@ -125,8 +126,20 @@ DOMStringList* Location::ancestorOrigins() const {
+@@ -126,8 +127,20 @@ DOMStringList* Location::ancestorOrigins() const {
   auto* origins = MakeGarbageCollected<DOMStringList>();
   if (!IsAttached())
     return origins;
@@ -106,7 +106,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -820,6 +820,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -832,6 +832,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_;
 }
 
-@@ -2902,6 +2907,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2897,6 +2902,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
-@@ -780,7 +780,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -775,7 +775,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;
@@ -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
-@@ -128,6 +128,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
+@@ -136,6 +136,11 @@ int GetIndexOfExistingTab(Browser* browser, const NavigateParams& params) {
       continue;
     }
 
@@ -80,7 +80,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
   return url::FindAndCompareScheme(utf8_input, scheme, nullptr);
 }
 
-@@ -568,7 +573,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
+@@ -578,7 +583,8 @@ void AutocompleteInput::ParseForEmphasizeComponents(
   // For the view-source and blob schemes, we should emphasize the host of the
   // URL qualified by the view-source or blob prefix.
   if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -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
-@@ -951,6 +951,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -950,6 +950,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
-@@ -1079,6 +1079,8 @@ component("net") {
+@@ -1115,6 +1115,8 @@ component("net") {
     "url_request/url_request_http_job.cc",
     "url_request/url_request_http_job.h",
     "url_request/url_request_interceptor.cc",
@@ -203,7 +203,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 #include "base/synchronization/lock.h"
 #include "base/task/single_thread_task_runner.h"
 #include "base/types/optional_util.h"
-@@ -53,6 +54,7 @@
+@@ -55,6 +56,7 @@
 #include "net/url_request/url_request_redirect_job.h"
 #include "url/gurl.h"
 #include "url/origin.h"
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 
 namespace net {
 
-@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -653,6 +655,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
   // Sanity check out environment.
   DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
 
@@ -227,7 +227,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -49,6 +49,7 @@
+@@ -53,6 +53,7 @@
 #include "net/socket/network_binding_client_socket_factory.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
@@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "url/url_constants.h"
-@@ -601,6 +602,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -610,6 +611,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     job_factory->SetProtocolHandler(scheme_handler.first,
                                     std::move(scheme_handler.second));
   }
@@ -28,36 +28,30 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
         <item
             android:id="@+id/import_menu_id"
             android:icon="@drawable/ic_folder_blue_24dp"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -26,6 +26,8 @@ import java.util.ArrayList;
+diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+@@ -28,6 +28,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
- 
 +import java.util.HashSet;
-+
+ 
 /**
  * Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
-  * the current context.
-@@ -186,12 +188,16 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -190,6 +191,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
     void setCurrentFolder(BookmarkId folder) {
         mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
         enableImportExportMenu();
 +        enableSelectAllMenu();
-     }
- 
-     void enableImportExportMenu() {
-         getMenu().findItem(R.id.import_menu_id).setVisible(true);
-         getMenu().findItem(R.id.export_menu_id).setVisible(true);
-     }
+    }
 +
 +    void enableSelectAllMenu() {
 +        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
     }
 
-     void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -218,6 +224,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+     void enableImportExportMenu() {
+@@ -226,6 +232,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
             mExportBookmarkRunnable.run();
             return true;
         }
@@ -72,10 +66,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +            }
 +            return true;
 +        }
-         return mMenuIdClickedFunction.apply(menuItem.getItemId());
+         return assumeNonNull(mMenuIdClickedFunction).apply(menuItem.getItemId());
     }
 
-@@ -235,6 +252,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -248,6 +265,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
 
         getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
         getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);
@@ -86,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 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
-@@ -246,6 +246,9 @@ CHAR_LIMIT guidelines:
+@@ -249,6 +249,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>
@@ -35,11 +35,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../omaha/inline/InlineUpdateController.java  |  57 ++++
 .../safety_hub/SafetyHubFetchService.java     |   5 -
 .../strings/android_chrome_strings.grd        |  23 +-
- .../endpoint_fetcher/endpoint_fetcher.cc      | 125 ++++++--
- .../endpoint_fetcher/endpoint_fetcher.h       |  23 +-
+ .../ui/lens/lens_overlay_query_controller.cc  |   1 +
+ .../endpoint_fetcher/endpoint_fetcher.cc      | 132 ++++++--
+ .../endpoint_fetcher/endpoint_fetcher.h       |  24 ++
+ components/manta/base_provider.cc             |   1 +
 .../Bromite-auto-updater.inc                  |   3 +
 .../Bromite-auto-updater.inc                  |   1 +
- 31 files changed, 1226 insertions(+), 98 deletions(-)
+ 33 files changed, 1239 insertions(+), 95 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
@@ -56,8 +58,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/android/java/templates/BuildConfig.template b/build/android/java/templates/BuildConfig.template
 --- a/build/android/java/templates/BuildConfig.template
 +++ b/build/android/java/templates/BuildConfig.template
-@@ -77,6 +77,8 @@ public class BuildConfig {
-     public static boolean IS_CRONET_BUILD;
+@@ -83,6 +83,8 @@ public class BuildConfig {
+     public static boolean CRONET_FOR_AOSP_BUILD;
 #endif
 
 +    public static String BUILD_TARGET_CPU = QUOTE(_BUILD_TARGET_CPU);
@@ -68,7 +70,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
-@@ -1950,6 +1950,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1936,6 +1936,9 @@ if (!is_robolectric && enable_java_templates) {
       sources = [ "//build/android/java/templates/BuildConfig.template" ]
       defines = []
 
@@ -81,7 +83,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
-@@ -856,6 +856,8 @@ chrome_java_sources = [
+@@ -820,6 +820,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",
@@ -108,7 +110,7 @@ diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/a
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
-@@ -24,12 +24,18 @@ import org.chromium.ui.widget.Toast;
+@@ -29,13 +29,19 @@ import org.chromium.ui.widget.Toast;
 
 import java.util.Calendar;
 
@@ -117,6 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
 +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 +
 /** Settings fragment that displays information about Chrome. */
+ @NullMarked
 public class AboutChromeSettings extends PreferenceFragmentCompat
 -        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener {
 +        implements EmbeddableSettingsPage, Preference.OnPreferenceClickListener,
@@ -128,8 +131,8 @@ 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";
 
-@@ -63,6 +69,13 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
-         p = findPreference(PREF_LEGAL_INFORMATION);
+@@ -72,6 +78,13 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
+         assumeNonNull(p);
         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
         p.setSummary(getString(R.string.legal_information_summary, currentYear));
 +
@@ -142,11 +145,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
     }
 
     @Override
-@@ -132,4 +145,17 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
-         }
+@@ -142,6 +155,19 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
         return true;
     }
-+
+ 
 +    @Override
 +    public boolean onPreferenceChange(Preference preference, Object newValue) {
 +        String key = preference.getKey();
@@ -159,7 +161,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
 +        }
 +        return true;
 +    }
- }
+
+     @Override
+     public @SettingsFragment.AnimationType int getAnimationType() {
+         return SettingsFragment.AnimationType.PROPERTY;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java
 new file mode 100644
 --- /dev/null
@@ -672,7 +677,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
-@@ -2491,6 +2491,12 @@ static_library("browser") {
+@@ -2620,6 +2620,12 @@ static_library("browser") {
   }
 
   if (is_android) {
@@ -766,8 +771,8 @@ new file mode 100644
 +    // Passing the endpoint_fetcher ensures the endpoint_fetcher's
 +    // lifetime extends to the callback and is not destroyed
 +    // prematurely (which would result in cancellation of the request).
-+    std::unique_ptr<EndpointFetcher> endpoint_fetcher,
-+    std::unique_ptr<EndpointResponse> endpoint_response) {
+    std::unique_ptr<endpoint_fetcher::EndpointFetcher> endpoint_fetcher,
+    std::unique_ptr<endpoint_fetcher::EndpointResponse> endpoint_response) {
 +  base::android::RunObjectCallbackAndroid(
 +      jcaller, Java_EndpointResponse_createEndpointResponse(
 +                   base::android::AttachCurrentThread(),
@@ -781,8 +786,8 @@ new file mode 100644
 +    // Passing the endpoint_fetcher ensures the endpoint_fetcher's
 +    // lifetime extends to the callback and is not destroyed
 +    // prematurely (which would result in cancellation of the request).
-+    std::unique_ptr<EndpointFetcher> endpoint_fetcher,
-+    std::unique_ptr<EndpointResponse> endpoint_response) {
+    std::unique_ptr<endpoint_fetcher::EndpointFetcher> endpoint_fetcher,
+    std::unique_ptr<endpoint_fetcher::EndpointResponse> endpoint_response) {
 +  base::android::RunObjectCallbackAndroid(
 +      jcaller, Java_EndpointHeaderResponse_createEndpointResponse(
 +                   base::android::AttachCurrentThread(),
@@ -812,7 +817,7 @@ new file mode 100644
 +    const base::android::JavaParamRef<jobject>& jcallback) {
 +  std::vector<std::string> scopes;
 +  base::android::AppendJavaStringArrayToStringVector(env, jscopes, &scopes);
-+  auto endpoint_fetcher = std::make_unique<EndpointFetcher>(
+  auto endpoint_fetcher = std::make_unique<endpoint_fetcher::EndpointFetcher>(
 +      Profile::FromJavaObject(jprofile)
 +          ->GetDefaultStoragePartition()
 +          ->GetURLLoaderFactoryForBrowserProcess(),
@@ -844,7 +849,7 @@ new file mode 100644
 +    jlong jtimeout, jboolean intercept_redirect,
 +    jint jannotation_hash_code,
 +    const base::android::JavaParamRef<jobject>& jcallback) {
-+  auto endpoint_fetcher = std::make_unique<EndpointFetcher>(
+  auto endpoint_fetcher = std::make_unique<endpoint_fetcher::EndpointFetcher>(
 +      Profile::FromJavaObject(jprofile)
 +          ->GetDefaultStoragePartition()
 +          ->GetURLLoaderFactoryForBrowserProcess(),
@@ -871,7 +876,7 @@ new file mode 100644
 +    jlong jtimeout, jboolean intercept_redirect,
 +    jint jannotation_hash_code,
 +    const base::android::JavaParamRef<jobject>& jcallback) {
-+  auto endpoint_fetcher = std::make_unique<EndpointFetcher>(
+  auto endpoint_fetcher = std::make_unique<endpoint_fetcher::EndpointFetcher>(
 +      Profile::FromJavaObject(jprofile)
 +        ->GetDefaultStoragePartition()
 +        ->GetURLLoaderFactoryForBrowserProcess(),
@@ -1085,25 +1090,25 @@ 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
-@@ -299,6 +299,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kPriceChangeModule,
+@@ -336,6 +336,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kProtectedTabsAndroid,
     &kPwaRestoreUi,
     &kPwaRestoreUiAtStartup,
 +    &kInlineUpdateFlow,
     &kOmahaMinSdkVersionAndroid,
     &kShortCircuitUnfocusAnimation,
-     &kShowNewTabAnimations,
+     &kShowHomeButtonPolicyAndroid,
 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
-@@ -370,6 +370,7 @@ public abstract class ChromeFeatureList {
-     public static final String HISTORY_PANE_ANDROID = "HistoryPaneAndroid";
+@@ -417,6 +417,7 @@ public abstract class ChromeFeatureList {
+             "HomepageIsNewTabPagePolicyAndroid";
     public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode";
     public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
 +    public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
-     public static final String INSTALL_MESSAGE_THROTTLE = "InstallMessageThrottle";
-     public static final String IP_PROTECTION_V1 = "IpProtectionV1";
+     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/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
@@ -1120,17 +1125,18 @@ diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/androi
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
-@@ -7,7 +7,9 @@ package org.chromium.chrome.browser.omaha;
+@@ -7,8 +7,10 @@ package org.chromium.chrome.browser.omaha;
 import android.content.Context;
 import android.content.SharedPreferences;
 
 +import org.chromium.base.Log;
 import org.chromium.base.ContextUtils;
+ import org.chromium.build.annotations.NullMarked;
 +import org.chromium.base.version_info.VersionInfo;
 
+ @NullMarked
 public class OmahaPrefUtils {
-     // Flags for retrieving the OmahaClient's state after it's written to disk.
-@@ -22,7 +24,55 @@ public class OmahaPrefUtils {
+@@ -24,7 +26,55 @@ public class OmahaPrefUtils {
     static final String PREF_TIMESTAMP_FOR_NEW_REQUEST = "timestampForNewRequest";
     static final String PREF_TIMESTAMP_FOR_NEXT_POST_ATTEMPT = "timestampForNextPostAttempt";
     static final String PREF_TIMESTAMP_OF_INSTALL = "timestampOfInstall";
@@ -1190,15 +1196,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 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
-@@ -11,6 +11,7 @@ import androidx.annotation.IntDef;
- import androidx.annotation.Nullable;
- 
+@@ -12,6 +12,7 @@ import androidx.annotation.IntDef;
 import org.chromium.base.CommandLine;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
 import org.chromium.components.variations.VariationsAssociatedData;
-@@ -36,10 +37,12 @@ public class UpdateConfigs {
+@@ -38,10 +39,12 @@ public class UpdateConfigs {
     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
 
@@ -1212,7 +1218,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
     @Retention(RetentionPolicy.SOURCE)
     public @interface UpdateFlowConfiguration {
         /** Turns off all update indicators. */
-@@ -49,6 +52,12 @@ public class UpdateConfigs {
+@@ -51,6 +54,12 @@ public class UpdateConfigs {
          * Requires Omaha to say an update is available, and only ever Intents out to Play Store.
          */
         int INTENT_ONLY = 2;
@@ -1225,7 +1231,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
     }
 
     /**
-@@ -124,6 +133,13 @@ public class UpdateConfigs {
+@@ -126,6 +135,13 @@ public class UpdateConfigs {
         return DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS;
     }
 
@@ -1239,7 +1245,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
     /**
      * Gets a String VariationsAssociatedData parameter. Also checks for a command-line switch
      * with the same name, for easy local testing.
-@@ -137,4 +153,13 @@ public class UpdateConfigs {
+@@ -139,4 +155,13 @@ public class UpdateConfigs {
         }
         return value;
     }
@@ -1256,18 +1262,18 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
-@@ -4,6 +4,7 @@
+@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.omaha;
 
- package org.chromium.chrome.browser.omaha;
+ import static org.chromium.build.NullUtil.assumeNonNull;
 
 +import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-@@ -15,9 +16,11 @@ import android.text.TextUtils;
+@@ -15,9 +16,11 @@ import android.os.StatFs;
+ import android.text.TextUtils;
+ 
 import androidx.annotation.IntDef;
- import androidx.annotation.NonNull;
- import androidx.annotation.Nullable;
 +import androidx.annotation.VisibleForTesting;
 
 -import com.google.android.gms.common.GooglePlayServicesUtil;
@@ -1278,15 +1284,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 import org.chromium.base.BuildInfo;
 import org.chromium.base.Callback;
 import org.chromium.base.ObserverList;
-@@ -27,6 +30,7 @@ import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.AsyncTask.Status;
- import org.chromium.base.task.PostTask;
- import org.chromium.base.task.TaskTraits;
+@@ -30,6 +33,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;
 +import org.chromium.chrome.browser.omaha.inline.InlineUpdateController;
 import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics;
 import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
-@@ -36,30 +40,37 @@ import java.io.File;
+@@ -39,6 +43,11 @@ import java.io.File;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -1298,9 +1304,10 @@ 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;
  * For manually testing this functionality, see {@link UpdateConfigs}.
  */
+ @NullMarked
 -public class UpdateStatusProvider {
 +public abstract class UpdateStatusProvider implements ActivityStateListener {
     /**
@@ -1332,7 +1339,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. */
-@@ -93,6 +104,12 @@ public class UpdateStatusProvider {
+@@ -97,6 +108,12 @@ public class UpdateStatusProvider {
          */
         private boolean mIsSimulated;
 
@@ -1345,7 +1352,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
         public UpdateStatus() {}
 
         UpdateStatus(UpdateStatus other) {
-@@ -101,11 +118,13 @@ public class UpdateStatusProvider {
+@@ -105,11 +122,13 @@ public class UpdateStatusProvider {
             latestVersion = other.latestVersion;
             latestUnsupportedVersion = other.latestUnsupportedVersion;
             mIsSimulated = other.mIsSimulated;
@@ -1359,7 +1366,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;
-@@ -113,11 +132,6 @@ public class UpdateStatusProvider {
+@@ -117,11 +136,6 @@ public class UpdateStatusProvider {
     /** Whether or not we've recorded the initial update status yet. */
     private boolean mRecordedInitialStatus;
 
@@ -1371,7 +1378,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
-@@ -173,6 +187,30 @@ public class UpdateStatusProvider {
+@@ -177,6 +191,30 @@ public class UpdateStatusProvider {
         pingObservers();
     }
 
@@ -1402,7 +1409,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.
-@@ -180,12 +218,11 @@ public class UpdateStatusProvider {
+@@ -184,12 +222,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) {
@@ -1416,7 +1423,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);
-@@ -196,9 +233,15 @@ public class UpdateStatusProvider {
+@@ -200,9 +237,15 @@ public class UpdateStatusProvider {
         return true;
     }
 
@@ -1433,8 +1440,8 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 +        ApplicationStatus.registerStateListenerForAllActivities(this);
     }
 
-     private void pingObservers() {
-@@ -206,35 +249,52 @@ public class UpdateStatusProvider {
+     @RequiresNonNull("mStatus")
+@@ -211,35 +254,52 @@ public class UpdateStatusProvider {
     }
 
     private void resolveStatus() {
@@ -1444,10 +1451,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
         }
 
         // We pull the Omaha result once as it will never change.
-         if (mStatus == null) mStatus = new UpdateStatus(mOmahaQuery.getResult());
+         if (mStatus == null) mStatus = new UpdateStatus(assumeNonNull(mOmahaQuery.getResult()));
 
 -        if (!mStatus.mIsSimulated) {
-            mStatus.updateState = mOmahaQuery.getResult().updateState;
+-            mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState;
 +        if (mStatus.mIsSimulated) { // used only during tests
 +            if (mStatus.mIsInlineSimulated) {
 +                @UpdateState
@@ -1455,7 +1462,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 +                String updateUrl = mInlineController.getUpdateUrl();
 +
 +                if (inlineState == UpdateState.NONE) {
-+                    mStatus.updateState = mOmahaQuery.getResult().updateState;
+                    mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState;
 +                } else {
 +                    mStatus.updateState = inlineState;
 +                    mStatus.updateUrl = updateUrl;
@@ -1488,15 +1495,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 
         private @Nullable UpdateStatus mStatus;
 
-        public UpdateQuery(@NonNull Runnable resultReceiver) {
+-        public UpdateQuery(Runnable resultReceiver) {
 +        private InlineUpdateController mInlineController;
 +
-+        public UpdateQuery(InlineUpdateController inlineController, @NonNull Runnable resultReceiver) {
+        public UpdateQuery(InlineUpdateController inlineController, Runnable resultReceiver) {
 +            mInlineController = inlineController;
             mCallback = resultReceiver;
         }
 
-@@ -246,7 +306,7 @@ public class UpdateStatusProvider {
+@@ -251,7 +311,7 @@ public class UpdateStatusProvider {
         protected UpdateStatus doInBackground() {
             UpdateStatus testStatus = getTestStatus();
             if (testStatus != null) return testStatus;
@@ -1505,7 +1512,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
         }
 
         @Override
-@@ -264,6 +324,8 @@ public class UpdateStatusProvider {
+@@ -269,6 +329,8 @@ public class UpdateStatusProvider {
             status.mIsSimulated = true;
             status.updateState = forcedUpdateState;
 
@@ -1514,7 +1521,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:
-@@ -281,31 +343,33 @@ public class UpdateStatusProvider {
+@@ -286,31 +348,33 @@ public class UpdateStatusProvider {
             return status;
         }
 
@@ -1574,7 +1581,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
-@@ -22,8 +22,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -24,8 +24,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
 public class VersionNumberGetter {
     private static VersionNumberGetter sInstance = new VersionNumberGetter();
 
@@ -1650,9 +1657,9 @@ new file mode 100644
 diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
 --- a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
 +++ b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
-@@ -78,9 +78,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
-             mSigninManager.addSignInStateObserver(this);
-         }
+@@ -84,9 +84,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+         mLocalPasswordsFetchService =
+                 new SafetyHubPasswordsFetchService(passwordManagerHelper, prefService, null);
 
 -        // Fetch latest update status.
 -        UpdateStatusProvider.getInstance().addObserver(mUpdateCallback);
@@ -1660,7 +1667,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
         recordMetricForUnusedSitePermissionsSettingState();
     }
 
-@@ -109,8 +106,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -115,8 +112,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
         if (mSigninManager != null) {
             mSigninManager.removeSignInStateObserver(this);
         }
@@ -1672,7 +1679,7 @@ diff --git a/chrome/browser/safety_hub/android/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
-@@ -2409,6 +2409,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2420,6 +2420,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>
@@ -1685,7 +1692,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]">
-@@ -4369,7 +4375,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4383,7 +4389,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]">
@@ -1697,7 +1704,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
-@@ -4380,6 +4389,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4394,6 +4403,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>
@@ -1716,11 +1723,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       <message name="IDS_MENU_NEW_WINDOW" desc="Menu item for opening a new window. [CHAR_LIMIT=27]">
         New window
       </message>
+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
+@@ -923,6 +923,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)
 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
-@@ -20,6 +20,11 @@
- #include "services/network/public/cpp/simple_url_loader.h"
+@@ -21,6 +21,11 @@
+ #include "services/network/public/mojom/referrer_policy.mojom-shared.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"
 
 +// used for the Bromite customization
@@ -1728,50 +1746,66 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +#include "net/http/http_status_code.h"
 +#include "services/network/public/cpp/resource_request.h"
 +
+ namespace endpoint_fetcher {
+ 
 namespace {
- const char kContentTypeKey[] = "Content-Type";
- const char kDeveloperKey[] = "X-Developer-Key";
-@@ -83,6 +88,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
+@@ -37,6 +42,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
+       return "POST";
+     case HttpMethod::kDelete:
+       return "DELETE";
+    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;
+ }
+@@ -117,9 +126,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),
-       post_data_(post_data),
-       headers_(headers),
-       cors_exempt_headers_(cors_exempt_headers),
-@@ -103,6 +109,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_("GET"),
-       content_type_(std::string()),
-       timeout_(base::Milliseconds(0)),
+       consent_level_(std::nullopt),
+       sanitize_response_(true),
+       channel_(channel),
+@@ -139,6 +150,7 @@ EndpointFetcher::EndpointFetcher(
+     const net::NetworkTrafficAnnotationTag& annotation_tag)
+     : url_loader_factory_(url_loader_factory),
+       identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       post_data_(std::string()),
-       annotation_tag_(annotation_tag),
+       consent_level_(std::nullopt),
+       sanitize_response_(false),
+       request_params_(EndpointFetcher::RequestParams::Builder(HttpMethod::kGet,
+@@ -163,6 +175,7 @@ EndpointFetcher::EndpointFetcher(
+     : oauth_consumer_name_(oauth_consumer_name),
       url_loader_factory_(url_loader_factory),
-@@ -128,6 +135,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
+       identity_manager_(identity_manager),
 +      intercept_redirect_(false),
-       post_data_(post_data),
-       annotation_tag_(annotation_tag),
-       url_loader_factory_(url_loader_factory),
-@@ -155,6 +163,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
-+      intercept_redirect_(false),
-       post_data_(post_data),
-       headers_(headers),
-       cors_exempt_headers_(cors_exempt_headers),
-@@ -167,11 +176,29 @@ EndpointFetcher::EndpointFetcher(
+       consent_level_(consent_level),
+       sanitize_response_(true),
+       request_params_(
+@@ -182,6 +195,7 @@ EndpointFetcher::EndpointFetcher(
 EndpointFetcher::EndpointFetcher(
     const net::NetworkTrafficAnnotationTag& annotation_tag)
-     : timeout_(kDefaultTimeOut),
+     : identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       annotation_tag_(annotation_tag),
-       identity_manager_(nullptr),
       consent_level_(std::nullopt),
-       sanitize_response_(true) {}
+       sanitize_response_(true),
+       request_params_(
+@@ -190,6 +204,27 @@ EndpointFetcher::EndpointFetcher(
+               .SetTimeout(kDefaultTimeOut)
+               .Build()) {}
 
 +// constructor used by Bromite
 +EndpointFetcher::EndpointFetcher(
@@ -1781,34 +1815,39 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +    int64_t timeout_ms,
 +    const bool intercept_redirect,
 +    const net::NetworkTrafficAnnotationTag& annotation_tag)
-+    : url_(url),
-+      http_method_(http_method),
-+      timeout_(base::Milliseconds(timeout_ms)),
-+      intercept_redirect_(intercept_redirect),
-+      annotation_tag_(annotation_tag),
-+      url_loader_factory_(url_loader_factory),
+    : url_loader_factory_(url_loader_factory),
 +      identity_manager_(nullptr),
-+      sanitize_response_(false) {}
+      intercept_redirect_(intercept_redirect),
+      consent_level_(std::nullopt),
+      sanitize_response_(false),
+      request_params_(
+          EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method),
+                                                  annotation_tag)
+              .SetAuthType(NO_AUTH)
+              .SetTimeout(base::Milliseconds(timeout_ms))
+              .SetUrl(url)
+              .Build()) {}
 +
 EndpointFetcher::~EndpointFetcher() = default;
 
 void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -229,11 +256,9 @@ void EndpointFetcher::PerformRequest(
+@@ -247,12 +282,9 @@ void EndpointFetcher::PerformRequest(
   auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->method = http_method_;
-   resource_request->url = url_;
+   resource_request->method = GetHttpMethodString(request_params_.http_method());
+   resource_request->url = request_params_.url();
 -  resource_request->credentials_mode = GetCredentialsMode();
 -  if (GetSetSiteForCookies()) {
-    resource_request->site_for_cookies = net::SiteForCookies::FromUrl(url_);
+-    resource_request->site_for_cookies =
+-        net::SiteForCookies::FromUrl(request_params_.url());
 -  }
 -
 +  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
 +  resource_request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE
 +                                  | net::LOAD_DO_NOT_SAVE_COOKIES;
-   if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
-     resource_request->headers.SetHeader(kContentTypeKey, content_type_);
-   }
-@@ -261,10 +286,27 @@ void EndpointFetcher::PerformRequest(
+   if (request_params_.http_method() == HttpMethod::kPost) {
+     resource_request->headers.SetHeader(kContentTypeKey,
+                                         request_params_.content_type());
+@@ -280,10 +312,26 @@ void EndpointFetcher::PerformRequest(
     default:
       break;
   }
@@ -1821,8 +1860,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
   // TODO(crbug.com/40641804) Make simple_url_loader_ local variable passed to
   // callback
   simple_url_loader_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), annotation_tag_);
-+  simple_url_loader_->SetTimeoutDuration(timeout_);
+       std::move(resource_request), request_params_.annotation_tag());
 +  simple_url_loader_->SetAllowHttpErrorResults(true);
 +
 +  if (!response_)
@@ -1834,17 +1872,19 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +      &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this)));
 +  }
 
-   if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
-     simple_url_loader_->AttachStringForUpload(post_data_, content_type_);
-@@ -275,15 +317,23 @@ void EndpointFetcher::PerformRequest(
+   if (request_params_.http_method() == HttpMethod::kPost) {
+     simple_url_loader_->AttachStringForUpload(
+@@ -295,15 +343,25 @@ void EndpointFetcher::PerformRequest(
   }
   simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                       network::SimpleURLLoader::RETRY_ON_5XX);
-  simple_url_loader_->SetTimeoutDuration(timeout_);
+-  simple_url_loader_->SetTimeoutDuration(request_params_.timeout());
 -  simple_url_loader_->SetAllowHttpErrorResults(true);
 -  network::SimpleURLLoader::BodyAsStringCallbackDeprecated
-+  LOG(INFO) << "performing " << http_method_ << " request to " << url_;
-+  if (base::EqualsCaseInsensitiveASCII(http_method_, "HEAD")) {
+  LOG(INFO) << "performing "
+            << GetHttpMethodString(request_params_.http_method())
+            << " request to " << url_;
+  if (request_params_.http_method() == HttpMethod::kHead) {
 +    endpoint_fetcher_callback_ = std::move(endpoint_fetcher_callback);
 +
 +    simple_url_loader_->DownloadHeadersOnly(
@@ -1866,18 +1906,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 }
 
 void EndpointFetcher::OnResponseFetched(
-@@ -361,24 +411,6 @@ void EndpointFetcher::OnSanitizationResult(
+@@ -381,21 +439,6 @@ void EndpointFetcher::OnSanitizationResult(
   std::move(endpoint_fetcher_callback).Run(std::move(response));
 }
 
-network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() {
-  if (!request_params_.has_value()) {
+-network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() const {
+-  if (!request_params_.credentials_mode.has_value()) {
 -    return network::mojom::CredentialsMode::kOmit;
 -  }
-  if (!request_params_.value().credentials_mode.has_value()) {
-    return network::mojom::CredentialsMode::kOmit;
-  }
-  switch (request_params_.value().credentials_mode.value()) {
+-  switch (request_params_.credentials_mode.value()) {
 -    case CredentialsMode::kOmit:
 -      return network::mojom::CredentialsMode::kOmit;
 -    case CredentialsMode::kInclude:
@@ -1885,17 +1922,16 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 -  }
 -  DCHECK(0) << base::StringPrintf(
 -      "Credentials mode %d not currently supported by EndpointFetcher\n",
-      static_cast<int>(request_params_.value().credentials_mode.value()));
+-      static_cast<int>(request_params_.credentials_mode.value()));
 -}
 -
- int EndpointFetcher::GetMaxRetries() {
-   if (!request_params_.has_value()) {
+ int EndpointFetcher::GetMaxRetries() const {
+   if (!request_params_.max_retries.has_value()) {
     return kNumRetries;
-@@ -412,3 +444,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() {
- std::string EndpointFetcher::GetUrlForTesting() {
-   return url_.spec();
+@@ -421,4 +464,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
+   return request_params_.url().spec();
 }
-+
+ 
 +void EndpointFetcher::OnSimpleLoaderRedirect(
 +    const GURL& url_before_redirect,
 +    const net::RedirectInfo& redirect_info,
@@ -1930,10 +1966,12 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +  response_->response = net_error;
 +  std::move(endpoint_fetcher_callback_).Run(std::move(response_));
 +}
+
+ }  // namespace endpoint_fetcher
 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
-@@ -32,6 +32,8 @@ class EndpointFetcherTest;
+@@ -21,6 +21,8 @@
 namespace base {
 class TimeDelta;
 }  // namespace base
@@ -1942,7 +1980,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 
 namespace network {
 struct ResourceRequest;
-@@ -58,6 +60,8 @@ enum class FetchErrorType {
+@@ -59,6 +61,7 @@ enum class HttpMethod {
+   kGet = 0,
+   kPost = 1,
+   kDelete = 2,
+  kHead = 3,
+ };
+ 
+ enum AuthType {
+@@ -74,6 +77,8 @@ enum AuthType {
 
 struct EndpointResponse {
   std::string response;
@@ -1951,7 +1997,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
   int http_status_code{-1};
   std::optional<FetchErrorType> error_type;
 };
-@@ -175,6 +179,14 @@ class EndpointFetcher {
+@@ -294,6 +299,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);
+ 
+   // Constructor if no authentication is needed.
+@@ -302,6 +308,14 @@ class EndpointFetcher {
       const GURL& url,
       const net::NetworkTrafficAnnotationTag& annotation_tag);
 
@@ -1966,7 +2020,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
   // Used for tests. Can be used if caller constructs their own
   // url_loader_factory and identity_manager.
   EndpointFetcher(
-@@ -231,6 +243,11 @@ class EndpointFetcher {
+@@ -344,6 +358,11 @@ class EndpointFetcher {
   void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
                             EndpointFetcherCallback endpoint_fetcher_callback,
                             data_decoder::JsonSanitizer::Result result);
@@ -1976,22 +2030,24 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 +                              const network::mojom::URLResponseHead& response_head,
 +                              std::vector<std::string>* removed_headers);
 
-   network::mojom::CredentialsMode GetCredentialsMode();
-   int GetMaxRetries();
-@@ -243,10 +260,11 @@ class EndpointFetcher {
-   // Members set in constructor to be passed to network::ResourceRequest or
+   network::mojom::CredentialsMode GetCredentialsMode() const;
+   int GetMaxRetries() const;
+@@ -354,12 +373,14 @@ class EndpointFetcher {
   // network::SimpleURLLoader.
   const std::string oauth_consumer_name_;
-  const GURL url_;
+   signin::ScopeSet oauth_scopes_;
 +  GURL url_;
-   const std::string http_method_;
-   const std::string content_type_;
-   base::TimeDelta timeout_;
+ 
+   // Members set in constructor
+   const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
+   // `identity_manager_` can be null if it is not needed for authentication (in
+   // this case, callers should invoke `PerformRequest` directly).
+   const raw_ptr<signin::IdentityManager> identity_manager_;
 +  const bool intercept_redirect_;
-   const std::string post_data_;
-   const std::vector<std::string> headers_;
-   const std::vector<std::string> cors_exempt_headers_;
-@@ -270,6 +288,9 @@ class EndpointFetcher {
+   // `consent_level_` is used together with `identity_manager_`, so it can be
+   // null if `identity_manager_` is null.
+   const std::optional<signin::ConsentLevel> consent_level_;
+@@ -372,6 +393,9 @@ class EndpointFetcher {
       access_token_fetcher_;
   std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
 
@@ -2001,6 +2057,17 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
   base::WeakPtrFactory<EndpointFetcher> weak_ptr_factory_{this};
 };
 
+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());
+ }
 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
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -26,7 +26,7 @@ declare_args() {
+@@ -27,7 +27,7 @@ declare_args() {
   # WebView providers which declare one of a handful of package names. See
   # https://chromium.googlesource.com/chromium/src/+/HEAD/android_webview/docs/build-instructions.md#Changing-package-name
   # for details.
@@ -44,14 +44,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../component_updater/download_filters_task.h | 129 ++++++++
 ...ent_subresource_filter_throttle_manager.cc |  15 +
 ...tent_subresource_filter_throttle_manager.h |   2 +
- .../content/shared/browser/ruleset_service.cc |  47 ++-
+ .../content/shared/browser/ruleset_service.cc |  44 ++-
 .../content/shared/browser/ruleset_service.h  |   8 +-
 .../unindexed_ruleset_stream_generator.cc     |   3 +
 .../core/browser/ruleset_version.h            |   4 +
- .../browser/subresource_filter_features.cc    | 114 +------
+ .../browser/subresource_filter_features.cc    | 118 +-------
 .../core/browser/verified_ruleset_dealer.cc   |   4 +
 .../core/common/indexed_ruleset.cc            |   5 +-
- 39 files changed, 1271 insertions(+), 129 deletions(-)
+ 39 files changed, 1269 insertions(+), 132 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -66,7 +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
-@@ -322,6 +322,7 @@ if (current_toolchain == default_toolchain) {
+@@ -328,6 +328,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
-@@ -433,6 +433,7 @@ chrome_java_resources = [
+@@ -440,6 +440,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,18 +85,18 @@ 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",
-@@ -621,6 +622,7 @@ chrome_java_resources = [
-   "java/res/xml/about_chrome_preferences.xml",
+@@ -634,6 +635,7 @@ chrome_java_resources = [
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.xml",
+   "java/res/xml/appearance_preferences.xml",
 +  "java/res/xml/adblock_preferences.xml",
   "java/res/xml/bookmark_widget_info.xml",
-   "java/res/xml/clear_browsing_data_preferences_tab.xml",
+   "java/res/xml/clear_browsing_data_preferences.xml",
   "java/res/xml/contextual_search_preferences.xml",
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -928,6 +928,8 @@ chrome_java_sources = [
+@@ -893,6 +893,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
-@@ -256,6 +256,24 @@ found in the LICENSE file.
-         </item>
+@@ -263,6 +263,24 @@ found in the LICENSE file.
+         <item name="android:textSize">20sp</item>
     </style>
 
 +    <style name="ButtonBarTopSpacer" parent="ButtonBarTopSpacerLight">
@@ -426,21 +426,21 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-@@ -924,9 +924,7 @@ public class TabModelImpl extends TabModelJniBridge {
-                 .createTabWithWebContents(
-                         parent,
-                         webContents,
-                        select
-                                ? TabLaunchType.FROM_RECENT_TABS_FOREGROUND
-                                : TabLaunchType.FROM_RECENT_TABS);
-+                        TabLaunchType.FROM_LINK);
+@@ -942,9 +942,7 @@ public class TabModelImpl extends TabModelJniBridge {
+                         .createTabWithWebContents(
+                                 parent,
+                                 webContents,
+-                                select
+-                                        ? TabLaunchType.FROM_RECENT_TABS_FOREGROUND
+-                                        : TabLaunchType.FROM_RECENT_TABS)
+                                TabLaunchType.FROM_LINK)
+                 != null;
     }
 
-     @Override
 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
-@@ -16566,6 +16566,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -16713,6 +16713,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Never show this again.
     </message>
 
@@ -460,16 +460,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
-@@ -29,6 +29,8 @@
- #include "chromeos/startup/browser_params_proxy.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -24,6 +24,8 @@
+ #include "chrome/browser/ui/ash/login/login_display_host.h"
+ #endif
 
 +#include "chrome/browser/browser_process.h"
 +
 using content::BrowserThread;
 
 namespace {
-@@ -134,6 +136,8 @@ void SetBrowserStartupIsComplete() {
+@@ -129,6 +131,8 @@ void SetBrowserStartupIsComplete() {
   }
   GetAfterStartupTasks().clear();
   GetAfterStartupTasks().shrink_to_fit();
@@ -482,14 +482,14 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
@@ -31,6 +31,7 @@
- #include "build/chromeos_buildflags.h"
 #include "chrome/common/buildflags.h"
+ #include "components/safe_browsing/buildflags.h"
 #include "media/media_buildflags.h"
 +#include "components/component_updater/adblock_updater_service.h"
 
 class BackgroundModeManager;
 class BrowserProcessPlatformPart;
-@@ -86,6 +87,10 @@ namespace component_updater {
+@@ -88,6 +89,10 @@ namespace component_updater {
 class ComponentUpdateService;
 }
 
@@ -500,7 +500,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 namespace gcm {
 class GCMDriver;
 }
-@@ -264,6 +269,7 @@ class BrowserProcess {
+@@ -271,6 +276,7 @@ class BrowserProcess {
 #endif
 
   virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -511,7 +511,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
-@@ -1220,6 +1220,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1271,6 +1271,34 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -557,7 +557,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
   MediaFileSystemRegistry* media_file_system_registry() override;
   WebRtcLogUploader* webrtc_log_uploader() override;
   network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -421,6 +422,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -431,6 +432,7 @@ class BrowserProcessImpl : public BrowserProcess,
   // to concerns over integrity of data shared between profiles,
   // but some users of component updater only install per-user.
   std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -568,7 +568,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
-@@ -468,6 +468,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -387,6 +387,9 @@ StartupProfileInfo CreateInitialProfile(
   // missing code in the above test.
   CHECK(profile_info.profile) << "Cannot get default profile.";
 
@@ -576,8 +576,8 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 +  g_browser_process->adblock_updater();
 +
 #else
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   // Lacros has a special "primary" profile that is tied to the active ChromeOS
+   profile_info =
+       GetStartupProfile(/*cur_dir=*/base::FilePath(), parsed_command_line);
 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
@@ -679,7 +679,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
-@@ -651,6 +651,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -653,6 +653,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
   StubResolverConfigReader::RegisterPrefs(registry);
   DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
 
@@ -710,8 +710,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
-@@ -218,6 +218,20 @@ CHAR_LIMIT guidelines:
-         Advanced
+@@ -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>
       </message>
 
 +      <!-- AdBlock settings -->
@@ -734,7 +734,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
-@@ -2846,6 +2846,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2895,6 +2895,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 inline constexpr char kAudioCaptureAllowedUrls[] =
     "hardware.audio_capture_allowed_urls";
 
@@ -749,7 +749,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
-@@ -373,6 +373,9 @@
+@@ -379,6 +379,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>
@@ -1574,16 +1574,16 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
@@ -18,6 +18,9 @@
- #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/traced_value.h"
+ #include "base/tracing/protos/chrome_track_event.pbzero.h"
 +#include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
 #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
 #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
 #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
-@@ -112,6 +115,7 @@ ContentSubresourceFilterThrottleManager::
+@@ -114,6 +117,7 @@ ContentSubresourceFilterThrottleManager::
       profile_interaction_manager_(
           std::make_unique<subresource_filter::ProfileInteractionManager>(
               profile_context)),
@@ -1591,17 +1591,17 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
       web_contents_helper_(web_contents_helper) {}
 
 ContentSubresourceFilterThrottleManager::
-@@ -672,6 +676,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -628,6 +632,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
 +
-+    const GURL& url(navigation_handle->GetURL());
+    const GURL& url(navigation_handle.GetURL());
 +    if (profile_context_->settings_manager()->GetSitePermission(url) != CONTENT_SETTING_ALLOW) {
 +      subresource_filter::ActivationDecision ignored_decision;
 +      mojom::ActivationState ad_filtering_state;
 +      ad_filtering_state.activation_level = profile_interaction_manager_->OnPageActivationComputed(
-+	      navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
+	      &navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
 +      throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
 +                                                ad_filtering_state);
 +    }
@@ -1612,7 +1612,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
-@@ -414,6 +414,8 @@ class ContentSubresourceFilterThrottleManager
+@@ -403,6 +403,8 @@ class ContentSubresourceFilterThrottleManager
 
   std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
 
@@ -1624,7 +1624,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.cc b/components/subresource_filter/content/shared/browser/ruleset_service.cc
 --- a/components/subresource_filter/content/shared/browser/ruleset_service.cc
 +++ b/components/subresource_filter/content/shared/browser/ruleset_service.cc
-@@ -51,12 +51,7 @@ namespace {
+@@ -50,12 +50,7 @@ namespace {
 void RecordIndexAndWriteRulesetResult(
     std::string_view uma_tag,
     RulesetService::IndexAndWriteRulesetResult result) {
@@ -1638,23 +1638,22 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 }
 
 // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -237,10 +232,13 @@ RulesetService::RulesetService(
+@@ -237,11 +232,13 @@ RulesetService::RulesetService(
 RulesetService::~RulesetService() = default;
 
 void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
 -    const UnindexedRulesetInfo& unindexed_ruleset_info) {
-  if (unindexed_ruleset_info.content_version.empty())
 +    const UnindexedRulesetInfo& unindexed_ruleset_info, bool ignore_recent_version) {
-+  if (unindexed_ruleset_info.content_version.empty()) {
+   if (unindexed_ruleset_info.content_version.empty()) {
 +    LOG(INFO) << "RulesetService: ignoring update with empty version.";
     return;
-+  }
+   }
 
 +  if (!ignore_recent_version) {
   // Trying to store a ruleset with the same version for a second time would
   // not only be futile, but would fail on Windows due to "File System
   // Tunneling" as long as the previously stored copy of the rules is still
-@@ -250,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -251,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
   if (most_recently_indexed_version.IsCurrentFormatVersion() &&
       most_recently_indexed_version.content_version ==
           unindexed_ruleset_info.content_version) {
@@ -1671,7 +1670,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     return;
   }
 
-@@ -276,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -277,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
     const RulesetConfig& config,
     const base::FilePath& indexed_ruleset_base_dir,
     const UnindexedRulesetInfo& unindexed_ruleset_info) {
@@ -1695,7 +1694,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-@@ -283,6 +301,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -284,6 +301,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
       unindexed_ruleset_info);
 
   if (!unindexed_ruleset_stream_generator.ruleset_stream()) {
@@ -1703,7 +1702,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedOpeningUnindexedRuleset);
-@@ -297,6 +316,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -298,6 +316,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
           indexed_ruleset_base_dir, indexed_version);
 
   if (!base::CreateDirectory(indexed_ruleset_version_dir)) {
@@ -1711,7 +1710,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     RecordIndexAndWriteRulesetResult(
         config.uma_tag, IndexAndWriteRulesetResult::kFailedCreatingVersionDir);
     return IndexedRulesetVersion(config.filter_tag);
-@@ -304,13 +324,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -305,13 +324,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
 
   SentinelFile sentinel_file(indexed_ruleset_version_dir);
   if (sentinel_file.IsPresent()) {
@@ -1727,7 +1726,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedCreatingSentinelFile);
-@@ -325,6 +343,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -326,6 +343,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
   RulesetIndexer indexer;
   if (!(*g_index_ruleset_func)(config, &unindexed_ruleset_stream_generator,
                                &indexer)) {
@@ -1735,7 +1734,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedParsingUnindexedRuleset);
-@@ -345,9 +364,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -346,9 +364,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
                    unindexed_ruleset_info.license_path, indexer.data());
   RecordIndexAndWriteRulesetResult(config.uma_tag, result);
   if (result != IndexAndWriteRulesetResult::kSuccess) {
@@ -1745,17 +1744,17 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 
 +  LOG(INFO) << "RulesetService: successful parsing.";
 +
-   CHECK(indexed_version.IsValid(), base::NotFatalUntil::M129);
+   CHECK(indexed_version.IsValid());
   return indexed_version;
 }
-@@ -470,6 +492,7 @@ void RulesetService::IndexAndStoreRuleset(
+@@ -472,6 +493,7 @@ void RulesetService::IndexAndStoreRuleset(
 void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback,
                                       const IndexedRulesetVersion& version) {
-   CHECK(!result_callback.is_null(), base::NotFatalUntil::M129);
+   CHECK(!result_callback.is_null());
 +  LOG(INFO) << "RulesetService: valid version: " << version.IsValid();
-   if (!version.IsValid())
+   if (!version.IsValid()) {
     return;
-   version.SaveToPrefs(local_state_);
+   }
 diff --git a/components/subresource_filter/content/shared/browser/ruleset_service.h b/components/subresource_filter/content/shared/browser/ruleset_service.h
 --- a/components/subresource_filter/content/shared/browser/ruleset_service.h
 +++ b/components/subresource_filter/content/shared/browser/ruleset_service.h
@@ -1784,7 +1783,7 @@ diff --git a/components/subresource_filter/content/shared/browser/ruleset_servic
 diff --git a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
 --- a/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
 +++ b/components/subresource_filter/content/shared/browser/unindexed_ruleset_stream_generator.cc
-@@ -13,6 +13,7 @@
+@@ -12,6 +12,7 @@
 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h"
 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -1792,7 +1791,7 @@ diff --git a/components/subresource_filter/content/shared/browser/unindexed_rule
 
 namespace subresource_filter {
 
-@@ -49,6 +50,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
+@@ -46,6 +47,8 @@ void UnindexedRulesetStreamGenerator::GenerateStreamFromFile(
 
   ruleset_size_ = unindexed_ruleset_file.GetLength();
 
@@ -1804,7 +1803,7 @@ diff --git a/components/subresource_filter/content/shared/browser/unindexed_rule
 diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/components/subresource_filter/core/browser/ruleset_version.h
 --- a/components/subresource_filter/core/browser/ruleset_version.h
 +++ b/components/subresource_filter/core/browser/ruleset_version.h
-@@ -54,6 +54,10 @@ struct UnindexedRulesetInfo {
+@@ -53,6 +53,10 @@ struct UnindexedRulesetInfo {
   // can be indicated not only by setting |license_path| to empty, but also by
   // setting it to any non existent path.
   base::FilePath license_path;
@@ -1818,7 +1817,7 @@ diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/comp
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,71 +55,8 @@ class CommaSeparatedStrings {
+@@ -55,75 +55,8 @@ class CommaSeparatedStrings {
   const std::vector<std::string_view> pieces_;
 };
 
@@ -1826,8 +1825,9 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -    std::map<std::string, std::string>* params,
 -    const std::string& key) {
 -  auto it = params->find(key);
-  if (it == params->end())
+-  if (it == params->end()) {
 -    return std::string();
+-  }
 -  std::string value = std::move(it->second);
 -  params->erase(it);
 -  return value;
@@ -1835,21 +1835,23 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -
 -mojom::ActivationLevel ParseActivationLevel(std::string_view activation_level) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_level,
-                                       kActivationLevelEnabled))
+-                                       kActivationLevelEnabled)) {
 -    return mojom::ActivationLevel::kEnabled;
-  else if (base::EqualsCaseInsensitiveASCII(activation_level,
-                                            kActivationLevelDryRun))
+-  } else if (base::EqualsCaseInsensitiveASCII(activation_level,
+-                                              kActivationLevelDryRun)) {
 -    return mojom::ActivationLevel::kDryRun;
+-  }
 -  return mojom::ActivationLevel::kDisabled;
 -}
 -
 -ActivationScope ParseActivationScope(std::string_view activation_scope) {
 -  if (base::EqualsCaseInsensitiveASCII(activation_scope,
-                                       kActivationScopeAllSites))
+-                                       kActivationScopeAllSites)) {
 -    return ActivationScope::ALL_SITES;
-  else if (base::EqualsCaseInsensitiveASCII(activation_scope,
-                                            kActivationScopeActivationList))
+-  } else if (base::EqualsCaseInsensitiveASCII(activation_scope,
+-                                              kActivationScopeActivationList)) {
 -    return ActivationScope::ACTIVATION_LIST;
+-  }
 -  return ActivationScope::NO_SITES;
 -}
 -
@@ -1874,8 +1876,9 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -// Will return a value between 0 and 1 inclusive.
 -double ParsePerformanceMeasurementRate(const std::string& rate) {
 -  double value = 0.0;
-  if (!base::StringToDouble(rate, &value) || value < 0)
+-  if (!base::StringToDouble(rate, &value) || value < 0) {
 -    return 0.0;
+-  }
 -  return value < 1 ? value : 1;
 -}
 -
@@ -1884,14 +1887,14 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  base::StringToInt(value, &result);
 -  return result;
 -}
- 
-std::vector<Configuration> FillEnabledPresetConfigurations(
+-
+ std::vector<Configuration> FillEnabledPresetConfigurations(
 -    std::map<std::string, std::string>* params) {
-+std::vector<Configuration> FillEnabledPresetConfigurations() {
+    /*std::map<std::string, std::string>* params*/) {
   // If ad tagging is enabled, turn on the dryrun automatically.
   bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
   const struct {
-@@ -127,23 +64,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -131,23 +64,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
     bool enabled_by_default;
     Configuration (*factory_method)();
   } kAvailablePresetConfigurations[] = {
@@ -1917,7 +1920,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
       enabled_configurations.push_back(available_preset.factory_method());
     }
   }
-@@ -151,46 +81,10 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -155,48 +81,12 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
   return enabled_configurations;
 }
 
@@ -1956,15 +1959,17 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
 -  base::GetFieldTrialParamsByFeature(kSafeBrowsingSubresourceFilter, &params);
 -
   std::vector<Configuration> configs;
-   if (base::FeatureList::IsEnabled(kSafeBrowsingSubresourceFilter))
+   if (base::FeatureList::IsEnabled(kSafeBrowsingSubresourceFilter)) {
 -    configs = FillEnabledPresetConfigurations(&params);
-
+    configs = FillEnabledPresetConfigurations();
+   }
+ 
 -  Configuration experimental_config = ParseExperimentalConfiguration(&params);
 -  configs.push_back(std::move(experimental_config));
-+    configs = FillEnabledPresetConfigurations();
- 
+-
   return configs;
 }
+ 
 diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
 --- a/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
 +++ b/components/subresource_filter/core/browser/verified_ruleset_dealer.cc
@@ -1973,10 +1978,10 @@ diff --git a/components/subresource_filter/core/browser/verified_ruleset_dealer.
 #include "base/functional/callback_helpers.h"
 #include "base/location.h"
 +#include "base/logging.h"
- #include "base/not_fatal_until.h"
 #include "base/notreached.h"
 #include "base/task/sequenced_task_runner.h"
-@@ -40,6 +41,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
+ #include "base/trace_event/trace_event.h"
+@@ -39,6 +40,9 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
   TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("loading"),
                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
                file->IsValid());
@@ -1995,9 +2000,9 @@ diff --git a/components/subresource_filter/core/common/indexed_ruleset.cc b/comp
 #include "base/hash/hash.h"
 +#include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
- #include "base/not_fatal_until.h"
 #include "base/strings/strcat.h"
-@@ -38,7 +39,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
+ #include "base/trace_event/trace_event.h"
+@@ -37,7 +38,9 @@ VerifyStatus GetVerifyStatus(base::span<const uint8_t> buffer,
   // least once.  The verifier detects a subset of the errors detected by the
   // checksum, and is unneeded once expected_checksum is consistently nonzero.
   flatbuffers::Verifier verifier(buffer.data(), buffer.size());
@@ -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
-@@ -1310,6 +1310,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
- 
+@@ -1406,6 +1406,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   void UpdateAccessibleNameForRootView();
+   void UpdateAccessibleURLForRootView(const GURL& url);
 
 +  // Type of ways to ignore activation changes.
 +  enum class DisableActivationChangeHandlingType {
@@ -53,7 +53,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
  protected:
   // Creates the RootView to be used within this Widget. Subclasses may override
   // to create custom RootViews that do specialized event processing.
-@@ -1348,13 +1361,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1444,13 +1457,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   ui::ColorProviderKey GetColorProviderKey() const override;
 
  private:
@@ -67,7 +67,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
   class PaintAsActiveLockImpl;
 
   friend class ButtonTest;
-@@ -1365,11 +1371,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1461,11 +1467,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   friend class ui_devtools::BubbleLocking;
   friend void DisableActivationChangeHandlingForTests();
 
@@ -23,7 +23,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -142,9 +142,14 @@ TabUnderNavigationThrottle::MaybeBlockNavigation() {
+@@ -143,9 +143,14 @@ TabUnderNavigationThrottle::MaybeBlockNavigation() {
 
   LogTabUnderAttempt(navigation_handle());
 
@@ -14,14 +14,16 @@ Auto-update is disabled by default: it is possible to activate it with chrome://
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/app/extensions_strings.grdp            |  6 ++
- .../developer_private_api.cc                  | 38 +++++++++++-
+ .../developer_private_api.cc                  | 28 +++++++++
 .../developer_private/developer_private_api.h |  3 +
+ .../developer_private_functions_shared.cc     |  8 ++-
+ .../profile_info_generator.cc                 |  3 +
 .../webstore_private/webstore_private_api.cc  | 15 ++++-
+ .../extensions/chrome_extension_system.cc     |  1 +
 .../extensions/cws_info_service_factory.cc    |  3 +-
 .../extensions/extension_management.cc        |  1 +
 .../extension_safety_check_utils.cc           |  3 +-
 .../browser/extensions/extension_service.cc   |  4 +-
- .../extensions/extension_system_impl.cc       |  2 +
 .../chrome_extension_downloader_factory.cc    |  1 -
 .../extensions/updater/extension_updater.cc   | 40 ++++++++-----
 .../extensions/updater/extension_updater.h    |  4 ++
@@ -34,7 +36,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../resources/extensions/toolbar.html.ts      |  7 +++
 .../browser/resources/extensions/toolbar.ts   | 17 ++++++
 .../resources/webstore_app/manifest.json      |  7 +--
- .../ui/webui/extensions/extensions_ui.cc      |  8 +++
+ .../ui/webui/extensions/extensions_ui.cc      |  7 +++
 .../chrome_update_query_params_delegate.cc    | 13 ++--
 .../extensions/api/developer_private.idl      |  2 +
 .../update_client/update_query_params.cc      |  7 +--
@@ -45,9 +47,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../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        |  4 ++
+ extensions/common/extension_features.h        |  2 +
 .../definitions/developer_private.d.ts        |  2 +
- 34 files changed, 254 insertions(+), 109 deletions(-)
+ 36 files changed, 252 insertions(+), 108 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
@@ -69,26 +71,21 @@ 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
-@@ -136,6 +136,12 @@
- #include "url/gurl.h"
- #include "url/origin.h"
+@@ -24,6 +24,12 @@
+ #include "extensions/browser/app_window/app_window_registry.h"
+ #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
 +#include "chrome/browser/about_flags.h"
 +#include "chrome/browser/browser_process.h"
-+#include "components/flags_ui/pref_service_flags_storage.h"
-+#include "components/flags_ui/feature_entry.h"
-+#include "components/flags_ui/flags_storage.h"
+#include "components/webui/flags/pref_service_flags_storage.h"
+#include "components/webui/flags/feature_entry.h"
+#include "components/webui/flags/flags_storage.h"
 +
 namespace extensions {
 
 namespace developer = api::developer_private;
-@@ -490,10 +496,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
-   info->is_mv2_deprecation_notice_dismissed =
-       ManifestV2ExperimentManager::Get(profile)
-           ->DidUserAcknowledgeNoticeGlobally();
-
-+  info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
-   return info;
+@@ -65,6 +71,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
+   return g_developer_private_api_factory.Pointer();
 }
 
 +// static
@@ -116,7 +113,23 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 template <>
 void BrowserContextKeyedAPIFactory<
     DeveloperPrivateAPI>::DeclareFactoryDependencies() {
-@@ -934,6 +962,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+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
+@@ -33,6 +33,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+   static BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
+   GetFactoryInstance();
+ 
+  static bool IsExtensionAutoupdateEnabled();
+  static void SetExtensionAutoupdateEnabled(bool enable);
+
+   // Convenience method to get the DeveloperPrivateAPI for a profile.
+   static DeveloperPrivateAPI* Get(content::BrowserContext* context);
+ 
+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
+@@ -301,6 +301,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
     ExtensionUpdater::CheckParams params;
     params.fetch_priority = DownloadFetchPriority::kForeground;
     params.install_immediately = true;
@@ -124,7 +137,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
     params.callback =
         base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
     updater->CheckNow(std::move(params));
-@@ -1068,7 +1097,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -439,7 +440,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
 
   const developer::ProfileConfigurationUpdate& update = params->update;
 
@@ -133,9 +146,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
     Profile* profile = Profile::FromBrowserContext(browser_context());
     CHECK(profile);
     if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -1082,6 +1111,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
-         ->MarkNoticeAsAcknowledgedGlobally();
+@@ -456,6 +457,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
   }
+ #endif  // !BUILDFLAG(IS_ANDROID)
 
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
 +    DeveloperPrivateAPI::SetExtensionAutoupdateEnabled(
@@ -145,23 +158,30 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
   return RespondNow(NoArguments());
 }
 
-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
-@@ -234,6 +234,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
-   static std::unique_ptr<api::developer_private::ProfileInfo> CreateProfileInfo(
-       Profile* profile);
+diff --git a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+--- a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+++ b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+@@ -9,6 +9,7 @@
+ #include "chrome/browser/prefs/incognito_mode_prefs.h"
+ #include "chrome/browser/profiles/profile.h"
+ #include "chrome/browser/supervised_user/supervised_user_browser_utils.h"
+#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/policy/core/common/policy_pref_names.h"
+ #include "components/prefs/pref_service.h"
+@@ -44,6 +45,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
+           ->DidUserAcknowledgeNoticeGlobally();
+ #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
-+  static bool IsExtensionAutoupdateEnabled();
-+  static void SetExtensionAutoupdateEnabled(bool enable);
-+
-   // Convenience method to get the DeveloperPrivateAPI for a profile.
-   static DeveloperPrivateAPI* Get(content::BrowserContext* context);
+  info.is_extension_autoupdate_enabled =
+    DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
+   return info;
+ }
 
 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
-@@ -66,6 +66,7 @@
+@@ -60,6 +60,7 @@
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
@@ -169,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -219,6 +220,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -223,6 +224,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) {
@@ -178,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);
   }
-@@ -226,11 +229,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -230,11 +233,15 @@ std::string GetWebstoreLogin(Profile* profile) {
 }
 
 void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -194,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;
-@@ -1153,7 +1160,8 @@ ExtensionFunction::ResponseAction
+@@ -1157,7 +1164,8 @@ ExtensionFunction::ResponseAction
 WebstorePrivateIsInIncognitoModeFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -204,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 }
 
 WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1248,11 +1256,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1253,11 +1261,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
   request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
       recent_navigations_to_collect);
 
@@ -217,9 +237,20 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
       ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
 -          base::Base64Encode(request.SerializeAsString()))));
 +          base::Base64Encode(serialized_referrer_proto))));
- }
- 
- WebstorePrivateGetExtensionStatusFunction::
+ #else
+   return RespondNow(ArgumentList(
+       api::webstore_private::GetReferrerChain::Results::Create("")));
+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(
+     Profile* profile,
+     const Extension* extension,
+     UninstallReason reason) {
+  if ((true)) return UninstallPingSender::DO_NOT_SEND_PING;
+   ExtensionManagement* extension_management =
+       ExtensionManagementFactory::GetForBrowserContext(profile);
+   if (extension && (extension->from_webstore() ||
 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
@@ -236,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
-@@ -379,6 +379,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+@@ -391,6 +391,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
 
 bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
     const Extension* extension) {
@@ -260,16 +291,16 @@ 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
-@@ -443,8 +443,6 @@ ExtensionService::ExtensionService(
- 
+@@ -244,8 +244,6 @@ ExtensionService::ExtensionService(
   UpgradeDetector::GetInstance()->AddObserver(this);
+ #endif
 
 -  cws_info_service_observation_.Observe(CWSInfoService::Get(profile_));
 -
   ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
 
-   // Set up the ExtensionUpdater.
-@@ -1900,7 +1898,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+   if (autoupdate_enabled) {
+@@ -756,7 +754,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.
@@ -278,25 +309,6 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
           pref_names::kExtensionUnpublishedAvailability) !=
       kAllowUnpublishedExtensions) {
     CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo();
-diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
--- a/chrome/browser/extensions/extension_system_impl.cc
-+++ b/chrome/browser/extensions/extension_system_impl.cc
-@@ -56,6 +56,7 @@
- #include "extensions/browser/updater/uninstall_ping_sender.h"
- #include "extensions/browser/user_script_manager.h"
- #include "extensions/common/constants.h"
-+#include "extensions/common/extension_features.h"
- #include "extensions/common/features/feature_channel.h"
- #include "extensions/common/manifest_url_handlers.h"
- #include "ui/message_center/public/cpp/notifier_id.h"
-@@ -83,6 +84,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
-     Profile* profile,
-     const Extension* extension,
-     UninstallReason reason) {
-+  if ((true)) return UninstallPingSender::DO_NOT_SEND_PING;
-   ExtensionManagement* extension_management =
-       ExtensionManagementFactory::GetForBrowserContext(profile);
-   if (extension && (extension->from_webstore() ||
 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
@@ -311,15 +323,15 @@ 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
-@@ -47,6 +47,7 @@
- #include "extensions/browser/updater/extension_update_data.h"
+@@ -55,6 +55,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+ #include "extensions/common/extension_id.h"
 +#include "extensions/common/extension_features.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_updater_uma.h"
 #include "extensions/common/extension_urls.h"
-@@ -201,6 +202,10 @@ void ExtensionUpdater::Start() {
+@@ -228,6 +229,10 @@ void ExtensionUpdater::Start() {
   DCHECK(!weak_ptr_factory_.HasWeakPtrs());
   DCHECK(registry_);
   alive_ = true;
@@ -330,7 +342,7 @@ 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)
-@@ -333,7 +338,8 @@ void ExtensionUpdater::AddToDownloader(
+@@ -385,7 +390,8 @@ void ExtensionUpdater::AddToDownloader(
     const Extension& extension = **extension_iter;
     const ExtensionId& extension_id = extension.id();
     if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -340,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
-@@ -347,7 +353,7 @@ void ExtensionUpdater::AddToDownloader(
+@@ -399,7 +405,7 @@ void ExtensionUpdater::AddToDownloader(
       continue;
     }
 
@@ -349,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,
-@@ -386,6 +392,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
+@@ -436,6 +442,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
 }
 
 void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -359,10 +371,10 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 +    LOG(INFO) << "Extensions autoupdate is disabled.";
 +    return;
 +  }
+   CHECK(enabled_);
   if (params.ids.empty()) {
     // Checking all extensions. Cancel pending DoCheckSoon() call if there's
-     // one, as it would be redundant.
-@@ -394,7 +406,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -445,7 +457,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
 
   int request_id = next_request_id_++;
 
@@ -371,7 +383,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   if (params.ids.empty())
     NotifyStarted();
 
-@@ -467,7 +479,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -513,7 +525,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
         update_check_params.update_info[pending_id] =
             GetExtensionUpdateData(pending_id);
       } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {
@@ -380,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
-@@ -477,7 +489,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -523,7 +535,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();
@@ -389,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 =
-@@ -500,6 +512,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -546,6 +558,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
           LOG(WARNING) << "Corrupt extension with id " << pending_id
                        << " will be reinstalled with ExtensionDownloader.";
         }
@@ -398,7 +410,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
       } else {
         InstallStageTracker::Get(profile_)->ReportFailure(
             pending_id,
-@@ -512,13 +526,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -558,13 +572,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
     AddToDownloader(&registry_->disabled_extensions(), pending_ids, request_id,
                     params.fetch_priority, &update_check_params);
     ExtensionSet remotely_disabled_extensions;
@@ -412,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 {
-@@ -526,7 +533,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+@@ -572,7 +579,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
       const Extension* extension =
           registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
       if (extension) {
@@ -421,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)) {
-@@ -667,7 +674,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -716,7 +723,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
       file.extension_id, InstallStageTracker::Stage::INSTALLING);
   UpdatePingData(file.extension_id, ping);
 
@@ -430,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));
-@@ -678,6 +685,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -727,6 +734,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
 
 bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                DownloadPingData* ping_data) {
@@ -438,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));
-@@ -790,7 +798,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -839,7 +847,7 @@ bool ExtensionUpdater::CanUseUpdateService(
 void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
   std::set<int> request_ids;
 
@@ -446,8 +458,8 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 +  LOG(INFO) << "Updating " << crx_file.info.extension_id << " with "
           << crx_file.info.path.value();
 
-   // The ExtensionService is now responsible for cleaning up the temp file
-@@ -899,7 +907,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+   // 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)
     return;  // This request is not done yet.
@@ -459,7 +471,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 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
-@@ -82,6 +82,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -92,6 +92,8 @@ class ExtensionUpdater : public KeyedService,
     // right away.
     bool install_immediately = false;
 
@@ -468,15 +480,15 @@ 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.
-@@ -333,6 +335,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -401,6 +403,8 @@ class ExtensionUpdater : public KeyedService,
   base::TimeDelta frequency_;
   bool will_check_soon_ = false;
 
 +  bool first_start_ = true;
 +
-   raw_ptr<ExtensionPrefs, DanglingUntriaged> extension_prefs_ = nullptr;
-   raw_ptr<PrefService, DanglingUntriaged> prefs_ = nullptr;
-   raw_ptr<Profile, DanglingUntriaged> profile_ = nullptr;
+   raw_ptr<ExtensionPrefs> extension_prefs_ = nullptr;
+   raw_ptr<PrefService> prefs_ = nullptr;
+   raw_ptr<Profile> profile_ = nullptr;
 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
@@ -492,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
-@@ -625,7 +625,7 @@ void WebstoreInstaller::StartDownload(
+@@ -591,7 +591,7 @@ void WebstoreInstaller::StartDownload(
       traffic_annotation));
   params->set_file_path(file);
   params->set_initiator(render_frame_host->GetLastCommittedOrigin());
@@ -525,15 +537,15 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 
       showDrawer_: {type: Boolean},
@@ -167,6 +169,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-   inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
-   isMv2DeprecationNoticeDismissed: boolean =
+   accessor inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
+   accessor isMv2DeprecationNoticeDismissed: boolean =
       loadTimeData.getBoolean('MV2DeprecationNoticeDismissed');
-+  isExtUpdateEnabled: boolean =
+  accessor isExtUpdateEnabled: boolean =
 +      loadTimeData.getBoolean('isExtUpdateEnabled');
-   showActivityLog: boolean = loadTimeData.getBoolean('showActivityLog');
-   enableEnhancedSiteControls: boolean =
-       loadTimeData.getBoolean('enableEnhancedSiteControls');
-@@ -228,6 +232,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+   accessor showActivityLog: boolean =
+       loadTimeData.getBoolean('showActivityLog');
+   accessor enableEnhancedSiteControls: boolean =
+@@ -231,6 +235,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
           this.canLoadUnpacked = profileInfo.canLoadUnpacked;
           this.isMv2DeprecationNoticeDismissed =
               profileInfo.isMv2DeprecationNoticeDismissed;
@@ -544,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
-@@ -293,6 +293,11 @@ export class Service implements ServiceInterface {
+@@ -311,6 +311,11 @@ export class Service implements ServiceInterface {
         {inDeveloperMode: inDevMode});
   }
 
@@ -574,10 +586,10 @@ diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/re
 diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browser/resources/extensions/toolbar.html.ts
 --- a/chrome/browser/resources/extensions/toolbar.html.ts
 +++ b/chrome/browser/resources/extensions/toolbar.html.ts
-@@ -25,6 +25,13 @@ export function getHtml(this: ToolbarElement) {
-         aria-labelledby="devModeLabel">
-     </cr-toggle>
-   </div>
+@@ -32,6 +32,13 @@ export function getHtml(this: ToolbarElement) {
+       <img srcset="images/product_logo.png" role="presentation">
+     </picture>
+   </if>
 +  <div class="more-actions">
 +    <span>$i18n{toolbarExtensionUpdateEnabled}
 +      <span id="need-update" ?hidden="${!this.shouldShowRelaunchDialog}">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
@@ -629,13 +641,13 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
       /**
        * Prevents initiating update while update is in progress.
@@ -103,6 +112,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
-   extensions: chrome.developerPrivate.ExtensionInfo[] = [];
-   delegate: ToolbarDelegate = new DummyToolbarDelegate();
-   inDevMode: boolean = false;
-+  isExtUpdateEnabled: boolean = false;
-+  shouldShowRelaunchDialog: boolean = false;
-   devModeControlledByPolicy: boolean = false;
-   isChildAccount: boolean = false;
+   accessor extensions: chrome.developerPrivate.ExtensionInfo[] = [];
+   accessor delegate: ToolbarDelegate = new DummyToolbarDelegate();
+   accessor inDevMode: boolean = false;
+  accessor isExtUpdateEnabled: boolean = false;
+  accessor shouldShowRelaunchDialog: boolean = false;
+   accessor devModeControlledByPolicy: boolean = false;
+   accessor isChildAccount: boolean = false;
 
@@ -155,6 +166,12 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
         'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
@@ -669,16 +681,15 @@ diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browse
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -53,6 +53,8 @@
- #include "ui/base/webui/web_ui_util.h"
- #include "ui/webui/webui_util.h"
- 
+@@ -17,6 +17,7 @@
+ #include "base/values.h"
+ #include "build/build_config.h"
+ #include "chrome/browser/browser_process.h"
 +#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
-+
- namespace extensions {
- 
- namespace {
-@@ -372,6 +374,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+ #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,
       {"itemSuspiciousInstallLearnMore",
        IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
       {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -687,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},
-@@ -445,6 +449,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -472,6 +475,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
       "hostPermissionsLearnMoreLink",
       extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
   source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -724,15 +735,15 @@ 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
-@@ -295,6 +295,7 @@ namespace developerPrivate {
+@@ -272,6 +272,7 @@ namespace developerPrivate {
     boolean isIncognitoAvailable;
     boolean isChildAccount;
     boolean isMv2DeprecationNoticeDismissed;
 +    boolean isExtensionAutoupdateEnabled;
   };
 
-   // DEPRECATED: Prefer ExtensionInfo.
-@@ -354,6 +355,7 @@ namespace developerPrivate {
+   dictionary GetExtensionsInfoOptions {
+@@ -295,6 +296,7 @@ namespace developerPrivate {
   dictionary ProfileConfigurationUpdate {
     boolean? inDeveloperMode;
     boolean? isMv2DeprecationNoticeDismissed;
@@ -791,7 +802,7 @@ new file mode 100644
 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
-@@ -25,6 +25,9 @@
+@@ -26,6 +26,9 @@
 #include "components/supervised_user/core/common/buildflags.h"
 #include "components/supervised_user/core/common/features.h"
 #include "content/public/browser/browser_context.h"
@@ -801,7 +812,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"
-@@ -40,6 +43,7 @@
+@@ -41,6 +44,7 @@
 #include "extensions/common/api/management.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
@@ -809,7 +820,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"
-@@ -91,6 +95,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
+@@ -92,6 +96,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
   return warnings_list;
 }
 
@@ -835,9 +846,9 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
 +}
 +
 std::vector<management::LaunchType> GetAvailableLaunchTypes(
-     const Extension& extension,
-     const ManagementAPIDelegate* delegate) {
-@@ -268,6 +293,8 @@ void AddExtensionInfo(const Extension* source_extension,
+     const Extension& extension) {
+   std::vector<management::LaunchType> launch_type_list;
+@@ -269,6 +294,8 @@ void AddExtensionInfo(const Extension* source_extension,
                       const ExtensionSet& extensions,
                       ExtensionInfoList* extension_list,
                       content::BrowserContext* context) {
@@ -846,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;
-@@ -313,10 +340,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
+@@ -311,10 +338,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
   std::optional<management::Get::Params> params =
       management::Get::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
@@ -858,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));
   }
-@@ -337,8 +363,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
+@@ -335,8 +361,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const Extension* extension =
@@ -868,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));
   }
-@@ -406,8 +431,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
+@@ -404,8 +429,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
   }
 
   const Extension* extension =
@@ -931,7 +942,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                              ExtensionRegistry::EVERYTHING);
   std::string error;
   bool success = false;
-@@ -906,8 +928,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -909,8 +931,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
       management::CreateAppShortcut::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -941,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)));
-@@ -960,8 +981,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -964,8 +985,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
       management::SetLaunchType::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -1148,7 +1159,7 @@ diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/brow
 diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc
 --- a/extensions/browser/updater/manifest_fetch_data.cc
 +++ b/extensions/browser/updater/manifest_fetch_data.cc
-@@ -105,7 +105,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
+@@ -108,7 +108,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
     : base_url_(update_url),
       full_url_(update_url),
       brand_code_(brand_code),
@@ -1157,7 +1168,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
       fetch_priority_(fetch_priority) {
   UpdateFullUrl(base_query_params);
   request_ids_.insert(request_id);
-@@ -158,18 +158,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
+@@ -161,18 +161,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
   // Compute the string we'd append onto the full_url_, and see if it fits.
   std::vector<std::string> parts;
   parts.push_back("id=" + id);
@@ -1190,9 +1201,9 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
 diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc
 --- a/extensions/common/extension_features.cc
 +++ b/extensions/common/extension_features.cc
-@@ -199,4 +199,18 @@ BASE_FEATURE(kRemoveCoreSiteInstance,
-              "RemoveCoreSiteInstance",
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -233,4 +233,18 @@ BASE_FEATURE(kExtensionBrowserNamespaceAlternative,
+              "ExtensionBrowserNamespaceAlternative",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.
@@ -1212,21 +1223,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
-@@ -241,6 +241,10 @@ BASE_DECLARE_FEATURE(kSilentDebuggerExtensionAPI);
- // nothing breaks.
- BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance);
+@@ -273,6 +273,8 @@ BASE_DECLARE_FEATURE(kDebuggerAPIRestrictedToDevMode);
+ // `loadTimes` , `csi`, etc. or deprecated APIs (e.g. `app`).
+ BASE_DECLARE_FEATURE(kExtensionBrowserNamespaceAlternative);
 
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
-+
 +BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore);
-+
 }  // namespace extensions_features
 
 #endif  // EXTENSIONS_COMMON_EXTENSION_FEATURES_H_
 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
-@@ -280,6 +280,7 @@ declare global {
+@@ -264,6 +264,7 @@ declare global {
         isIncognitoAvailable: boolean;
         isChildAccount: boolean;
         isMv2DeprecationNoticeDismissed: boolean;
@@ -1234,7 +1243,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr
       }
 
       export interface ExtensionConfigurationUpdate {
-@@ -296,6 +297,7 @@ declare global {
+@@ -281,6 +282,7 @@ declare global {
       export interface ProfileConfigurationUpdate {
         inDeveloperMode?: boolean;
         isMv2DeprecationNoticeDismissed?: boolean;
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc
 --- a/services/network/cors/preflight_cache.cc
 +++ b/services/network/cors/preflight_cache.cc
-@@ -200,6 +200,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
+@@ -204,6 +204,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
   MayPurge(max_entries, purge_unit);
 }
 
@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
 diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
 --- a/services/network/cors/preflight_controller.cc
 +++ b/services/network/cors/preflight_controller.cc
-@@ -835,6 +835,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -834,6 +834,10 @@ void PreflightController::ClearCorsPreflightCache(
   cache_.ClearCache(std::move(url_filter));
 }
 
@@ -51,7 +51,7 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co
 +
 void PreflightController::RemoveLoader(PreflightLoader* loader) {
   auto it = loaders_.find(loader);
-   CHECK(it != loaders_.end(), base::NotFatalUntil::M130);
+   CHECK(it != loaders_.end());
 diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
 --- a/services/network/cors/preflight_controller.h
 +++ b/services/network/cors/preflight_controller.h
@@ -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
-@@ -1317,6 +1317,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1356,6 +1356,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
                                     base::Time end_time,
                                     mojom::ClearDataFilterPtr filter,
                                     ClearHttpCacheCallback callback) {
@@ -21,8 +21,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../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       |  5 +++++
- 15 files changed, 55 insertions(+), 13 deletions(-)
+ .../platform/runtime_enabled_features.json5       |  8 ++++++--
+ 15 files changed, 56 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
@@ -30,7 +30,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -190,9 +190,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -203,9 +203,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
   bool parse_result = base::StringToInt(major_version, &major_version_number);
   DCHECK(parse_result);
   std::optional<std::string> brand;
@@ -44,15 +44,15 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -60,6 +60,7 @@
- #include "third_party/blink/public/common/permissions_policy/origin_with_possible_wildcards.h"
- #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
+@@ -57,6 +57,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"
 +#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "url/origin.h"
-@@ -704,7 +705,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
+@@ -703,7 +704,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
     // value, disable them. This overwrites previous decision from UI.
     disable_due_to_custom_ua = !ua_metadata.has_value();
   }
@@ -62,7 +62,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
   if (!disable_due_to_custom_ua) {
     if (!ua_metadata.has_value())
       ua_metadata = delegate->GetUserAgentMetadata();
-@@ -886,10 +888,12 @@ void AddRequestClientHintsHeaders(
+@@ -885,10 +887,12 @@ void AddRequestClientHintsHeaders(
     AddEctHeader(headers, network_quality_tracker, url);
   }
 
@@ -79,7 +79,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 
   if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
     AddPrefersColorSchemeHeader(headers, frame_tree_node);
-@@ -975,6 +979,7 @@ ParseAndPersistAcceptCHForNavigation(
+@@ -969,6 +973,7 @@ ParseAndPersistAcceptCHForNavigation(
     BrowserContext* context,
     ClientHintsControllerDelegate* delegate,
     FrameTreeNode* frame_tree_node) {
@@ -90,7 +90,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1283,6 +1283,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1380,6 +1380,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
     return;
   }
 
@@ -131,7 +131,7 @@ new file mode 100644
 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
-@@ -109,6 +109,7 @@ const size_t kMaxRestarts = 32;
+@@ -111,6 +111,7 @@ const size_t kMaxRestarts = 32;
 
 // Returns true when Early Hints are allowed on the given protocol.
 bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -156,12 +156,12 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
@@ -14,6 +14,7 @@
 #include "base/strings/string_util.h"
 #include "services/network/public/cpp/client_hints.h"
- #include "third_party/blink/public/common/features.h"
+ #include "services/network/public/cpp/permissions_policy/client_hints_permissions_policy_mapping.h"
 +#include "third_party/blink/public/common/features_generated.h"
- #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
+ #include "services/network/public/cpp/permissions_policy/permissions_policy.h"
+ #include "third_party/blink/public/common/features.h"
 #include "url/origin.h"
- 
-@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+@@ -22,11 +23,12 @@ namespace blink {
 
 bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
   switch (type) {
@@ -208,14 +208,14 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -219,6 +219,7 @@ ScriptPromise<UADataValues> NavigatorUAData::getHighEntropyValues(
-   Dactyloscoper::RecordDirectSurface(
-       GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform());
+@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const {
+ }
 
-+  if ((false))
-   for (const String& hint : hints) {
-     if (hint == "platformVersion") {
-       values->setPlatformVersion(platform_version_);
+ bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
+  if ((true)) return false;
+   // To determine whether a document is allowed to use the get high-entropy
+   // client hints returned by navigator.userAgentData.getHighEntropyValues(),
+   // check the following:
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
@@ -234,7 +234,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
-@@ -217,6 +217,8 @@ bool ShouldSendClientHint(const PermissionsPolicy& policy,
+@@ -226,6 +226,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
                           bool is_1p_origin,
                           network::mojom::blink::WebClientHintsType type,
                           const ClientHintsPreferences& hints_preferences) {
@@ -243,7 +243,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(
-@@ -610,7 +612,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -606,7 +608,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
   }
 
   // Only send User Agent hints if the info is available
@@ -255,9 +255,9 @@ 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
-@@ -417,6 +417,11 @@
-       name: "AriaNotify",
-       status: "test",
+@@ -517,6 +517,11 @@
+       name: "AriaNotifyV2",
+       status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
     },
 +    {
 +      name: "UserAgentClientHint",
@@ -267,4 +267,14 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "AriaRowColIndexText",
       status: "stable",
+@@ -903,8 +908,7 @@
+       // Allows top-level sites to restrict collection of high-entropy UA client
+       // hints (from 3Ps, or itself) via the getHighEntropyValues API.
+       // crbug.com/385161047
+-      name: "ClientHintUAHighEntropyValuesPermissionPolicy",
+-      status: "test",
+      name: "ClientHintUAHighEntropyValuesPermissionPolicy",  // disabled by default
+     },
+     {
+       // Enables clipboardchange event API for listening for changes to the
 --
@@ -87,7 +87,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
-@@ -472,7 +472,7 @@ const base::FeatureParam<bool> kIpPrivacyOnlyInIncognito{
+@@ -548,7 +548,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI,
 // NetworkChangeNotifier::AreNetworkHandlesSupported).
 #if BUILDFLAG(IS_ANDROID)
 inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -663,6 +663,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -665,6 +665,7 @@ template("chrome_common_apk_or_module_tmpl") {
           [ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
       loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
       library_always_compress += [ "libchrome_crashpad_handler.so" ]
@@ -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   | 198 ++++++++++++++++++
- .../privacy/settings/PrivacySettings.java     |   4 +-
+ .../res/xml/privacy_preferences_cromite.xml   | 191 ++++++++++++++++++
+ .../privacy/settings/PrivacySettings.java     |   6 +-
 .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 218 insertions(+), 5 deletions(-)
+ 5 files changed, 213 insertions(+), 5 deletions(-)
 create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp

 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -640,7 +640,7 @@ chrome_java_resources = [
+@@ -653,7 +653,7 @@ chrome_java_resources = [
   "java/res/xml/manage_sync_preferences.xml",
   "java/res/xml/personalize_google_services_preferences.xml",
   "java/res/xml/incognito_preferences.xml",
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,191 @@
 +<?xml version="1.0" encoding="utf-8"?><!--
 +Copyright 2022 The Chromium Authors
 +Use of this source code is governed by a BSD-style license that can be
@@ -68,13 +68,12 @@ new file mode 100644
 +        android:key="clear_browsing_data"
 +        android:title="@string/clear_browsing_data_title"
 +        android:summary="@string/clear_browsing_data_summary"
-+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment" />
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
 +    <Preference
 +        android:key="clear_browsing_data_advanced"
-+        android:title="@string/clear_browsing_data_title"
-+        android:summary="@string/clear_browsing_data_summary"
-+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAdvanced"
-+        app:isPreferenceVisible="false" />
+        android:title="@string/clear_browsing_data_at_start_title"
+        android:summary="@string/clear_browsing_data_at_start_summary"
+        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAtStart" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="close_tabs_on_exit"
 +        android:title="@string/close_tabs_on_exit_title"
@@ -189,13 +188,12 @@ new file mode 100644
 +        android:title="@string/improve_search_suggestions_title"
 +        android:summary="@string/improve_search_suggestions_summary"
 +        android:persistent="false"/>
-+    <Preference
-+        android:key="phone_as_a_security_key"
-+        android:title="@string/cablev2_paask_title"
-+        android:summary="@string/cablev2_paask_body"
-+        android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />
 +
 +    <!--Always hidden-->
+    <org.chromium.chrome.browser.safety_hub.SafetyHubExpandablePreference
+        android:key="advanced_protection_info"
+        android:title="@string/settings_privacy_and_security_advanced_protection_section_title"
+        app:isPreferenceVisible="false" />
 +    <Preference
 +        android:key="safe_browsing"
 +        android:title="@string/prefs_safe_browsing_title"
@@ -219,14 +217,10 @@ new file mode 100644
 +        android:fragment="org.chromium.components.privacy_sandbox.TrackingProtectionSettings"
 +        app:isPreferenceVisible="false" />
 +    <Preference
-+        android:key="ip_protection"
-+        android:title="@string/ip_protection_title"
-+        android:fragment="org.chromium.components.privacy_sandbox.IpProtectionSettingsFragment"
-+        app:isPreferenceVisible="false" />
-+    <Preference
-+        android:key="fp_protection"
-+        android:title="@string/tracking_protection_fingerprinting_protection_title"
-+        android:fragment="org.chromium.components.privacy_sandbox.FingerprintingProtectionSettingsFragment"
+        android:key="incognito_tracking_protections"
+        android:title="@string/incognito_tracking_protections_page_title"
+        android:summary="@string/incognito_tracking_protections_page_entrypoint_description"
+        android:fragment="org.chromium.components.privacy_sandbox.IncognitoTrackingProtectionsFragment"
 +        app:isPreferenceVisible="false" />
 +    <Preference
 +        android:key="privacy_sandbox"
@@ -247,31 +241,32 @@ new file mode 100644
 +    <org.chromium.components.browser_ui.settings.ChromeBasePreference
 +        android:key="javascript_optimizer"
 +        android:title="@string/website_settings_privacy_and_security_javascript_optimizer_row_label"
-+        android:summary="@string/website_settings_privacy_and_security_javascript_optimizer_summary"
 +        android:fragment="org.chromium.components.browser_ui.site_settings.SingleCategorySettings"
 +        app:isPreferenceVisible="false" />
 +</PreferenceScreen>
 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
-@@ -152,7 +152,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
+@@ -189,7 +189,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
 
 -        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
 
-         Preference fpProtectionPreference = findPreference(PREF_FP_PROTECTION);
-         fpProtectionPreference.setVisible(shouldShowFpProtectionUi());
-@@ -249,7 +249,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
-                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
-         if (ChromeFeatureList.isEnabled(ChromeFeatureList.PASSWORD_LEAK_TOGGLE_MOVE)) {
-             passwordLeakTogglePref.setOnPreferenceChangeListener(this);
-        } else {
-+        } else if (passwordLeakTogglePref != null) {
-             passwordLeakTogglePref.setVisible(false);
-         }
+         Preference incognitoTrackingProtectionsPreference =
+                 findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
+@@ -280,7 +280,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
 
+         ChromeSwitchPreference passwordLeakTogglePref =
+                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
+-        passwordLeakTogglePref.setOnPreferenceChangeListener(this);
+        if (passwordLeakTogglePref != null) {
+                passwordLeakTogglePref.setVisible(false);
+        }
+ 
+         mSearchSuggestions = (ChromeSwitchPreference) findPreference(PREF_SEARCH_SUGGESTIONS);
+         mSearchSuggestions.setOnPreferenceChangeListener(this);
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
 new file mode 100644
 --- /dev/null
@@ -35,6 +35,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../theme/chromium/win/tiles/SmallLogo.png    | Bin 9784 -> 12363 bytes
 .../chromium/product_logo_32.png              | Bin 822 -> 2301 bytes
 chrome/browser/BUILD.gn                       |   1 +
+ .../browser/flags/ChromeFeatureList.java      |   2 +-
 .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
 chrome/browser/prefs/BUILD.gn                 |   1 +
 .../prefs/chrome_pref_service_factory.cc      |   6 +-
@@ -55,17 +56,19 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
 .../chromium/product_logo.png                 | Bin 2714 -> 7923 bytes
 .../chromium/product_logo_white.png           | Bin 2512 -> 6790 bytes
- .../version_ui/resources/about_version.ts     |   2 +-
+ .../webui/version/resources/about_version.ts  |   4 +-
 .../resources/about_version_mobile.css        |   9 ++
- content/child/runtime_features.cc             |  26 +++--
+ content/child/runtime_features.cc             |  44 ++++-----
+ .../Cromite-Branding.inc                      |   1 +
 tools/grit/grit/grd_reader.py                 |  35 +++++++
- 55 files changed, 189 insertions(+), 120 deletions(-)
+ 57 files changed, 203 insertions(+), 129 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
 --- a/build/BUILD.gn
 +++ b/build/BUILD.gn
-@@ -55,6 +55,14 @@ buildflag_header("branding_buildflags") {
-   }
+@@ -56,6 +56,14 @@ buildflag_header("branding_buildflags") {
+   flags += [ "ENABLE_BUILTIN_SEARCH_PROVIDER_ASSETS=$enable_builtin_search_provider_assets" ]
 }
 
 +buildflag_header("cromite_buildflags") {
@@ -82,8 +85,8 @@ 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
-@@ -186,6 +186,10 @@ declare_args() {
-   clang_unsafe_buffers_paths = ""
+@@ -187,6 +187,10 @@ declare_args() {
+   clang_warning_suppression_file = ""
 }
 
 +declare_args() {
@@ -96,7 +99,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -178,7 +178,7 @@ by a child template that "extends" this file.
+@@ -182,7 +182,7 @@ by a child template that "extends" this file.
       <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
         android:icon="@drawable/ic_launcher"
         android:roundIcon="@drawable/ic_launcher_round"
@@ -152,7 +155,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 +        android:order="1004"
         android:layout="@layout/account_management_account_row"
         android:title="@string/prefs_google_services"
-         android:icon="@drawable/ic_google_services_48dp"
+         android:icon="@drawable/ic_google_services_48dp_with_bg"
 diff --git a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
 --- a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
 +++ b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
@@ -9180,7 +9183,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 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
-@@ -392,7 +392,7 @@
+@@ -398,7 +398,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.">
@@ -9189,27 +9192,27 @@ 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
-@@ -530,7 +530,7 @@
+@@ -536,7 +536,7 @@
     My extensions
   </message>
-   <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar to open the Chrome Web Store to get more extensions.">
+   <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.">
 -    Discover more extensions and themes on the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Chrome Web Store<ph name="END_LINK">&lt;/a&gt; <ex>&lt;/a&gt;</ex> </ph>
 +    Discover more extensions and themes on the <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Chromedontreplace Web Store<ph name="END_LINK">&lt;/a&gt; <ex>&lt;/a&gt;</ex> </ph>
   </message>
-   <message name="IDS_EXTENSIONS_SIDEBAR_KEYBOARD_SHORTCUTS" desc="The text for the link to manage keyboard shortcuts for extensions.">
-     Keyboard shortcuts
+   <message name="IDS_EXTENSIONS_WHATS_NEW_SIDEBAR_PROMO" desc="The text displayed in the sidebar of the chrome://extensions page to promote the extension documenation, for when the user is in developer mode.">
+     Developing extensions? Stay up to date on <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>What's New<ph name="END_LINK">&lt;/a&gt;</ph> with Chrome Extension developer documentation.
 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
-@@ -275,7 +275,7 @@
-     Change
+@@ -81,7 +81,7 @@
+     Accessibility
   </message>
-   <message name="IDS_SETTINGS_WEB_STORE" desc="Sub-label about choosing something from the Chrome Web Store.">
+   <message name="IDS_SETTINGS_ACCESSIBILITY_WEB_STORE" desc="Text for an external link explaining that additional accessibility features are found on the Chrome Web Store.">
 -    Open Chrome Web Store
 +    Open Chromedontreplace Web Store
   </message>
-   <if expr="is_macosx">
-     <message name="IDS_SETTINGS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
+   <message name="IDS_SETTINGS_MORE_FEATURES_LINK" desc="Link which opens page where users can install extensions which provide additional accessibility features.">
+     Add accessibility features
 diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
 --- a/chrome/app/theme/chromium/BRANDING
 +++ b/chrome/app/theme/chromium/BRANDING
@@ -13155,7 +13158,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
-@@ -1811,6 +1811,7 @@ static_library("browser") {
+@@ -1895,6 +1895,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//build/config/linux/dbus:buildflags",
@@ -13163,10 +13166,22 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "//cc",
     "//chrome:extra_resources",
     "//chrome:resources",
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+@@ -1173,7 +1173,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 sTabGroupEntryPointsAndroid =
+             newMutableFlagWithSafeDefault(TAB_GROUP_ENTRY_POINTS_ANDROID, false);
+     public static final MutableFlagWithSafeDefault sTabGroupParityBottomSheetAndroid =
 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
-@@ -37,7 +37,7 @@ public class UpdateConfigs {
+@@ -39,7 +39,7 @@ public class UpdateConfigs {
     private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
     private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
 
@@ -13178,7 +13193,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -52,6 +52,7 @@ source_set("impl") {
+@@ -59,6 +59,7 @@ source_set("impl") {
   deps = [
     ":prefs",
     ":util",
@@ -13189,15 +13204,15 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 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
-@@ -30,6 +30,7 @@
+@@ -26,6 +26,7 @@
+ #include "base/trace_event/trace_event.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
 +#include "build/cromite_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -291,10 +292,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
 #endif
   std::string seed;
   CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13243,7 +13258,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
       #menu {
         color: var(--google-grey-700);
         display: flex;
-@@ -173,7 +185,7 @@
+@@ -164,7 +176,7 @@
         </a>
         <a role="menuitem" id="about-menu" href="/help"
             class="cr-nav-menu-item">
@@ -13255,7 +13270,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -2474,7 +2474,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2485,7 +2485,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">
@@ -13267,7 +13282,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -144,6 +144,7 @@ bool AreNewChromeLabsExperimentsAvailable(const ChromeLabsModel* model,
+@@ -140,6 +140,7 @@ bool AreNewChromeLabsExperimentsAvailable(const ChromeLabsModel* model,
 }
 
 bool IsChromeLabsEnabled() {
@@ -13278,16 +13293,16 @@ diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -136,7 +136,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -135,7 +135,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
 inline constexpr char kChromeHelpViaWebUIURL[] =
 -    "https://support.google.com/chrome?p=help&ctx=settings";
 +    "https://github.com/uazo/cromite/issues";
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
 inline constexpr char kChromeOsHelpViaWebUIURL[] =
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -199,7 +199,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
     "chrome-untrusted://new-tab-page/";
 
 // The URL for the Chromium project used in the About dialog.
@@ -13299,7 +13314,7 @@ diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_static/chromium_install_modes.cc
 --- a/chrome/install_static/chromium_install_modes.cc
 +++ b/chrome/install_static/chromium_install_modes.cc
-@@ -16,7 +16,7 @@ namespace install_static {
+@@ -14,7 +14,7 @@ namespace install_static {
 
 const wchar_t kCompanyPathName[] = L"";
 
@@ -13311,7 +13326,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
-@@ -975,7 +975,7 @@
+@@ -992,7 +992,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]">
@@ -18225,15 +18240,15 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 -// found in the LICENSE file.
 -
 -CANVAS_DIMENSIONS, 15,
-MOVE_TO, 4.92f, 7.5f,
-R_CUBIC_TO, 0, 0.71f, 0.25f, 1.31f, 0.76f, 1.82f,
-R_CUBIC_TO, 0.51f, 0.51f, 1.12f, 0.76f, 1.82f, 0.76f,
-R_CUBIC_TO, 0.7f, 0, 1.31f, -0.25f, 1.82f, -0.76f,
-R_CUBIC_TO, 0.51f, -0.51f, 0.76f, -1.12f, 0.76f, -1.82f,
-R_CUBIC_TO, 0, -0.7f, -0.25f, -1.31f, -0.76f, -1.82f,
-R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -1.82f, -0.76f,
-R_CUBIC_TO, -0.7f, 0, -1.31f, 0.25f, -1.82f, 0.76f,
-R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -0.76f, 1.82f,
+-MOVE_TO, 4.92, 7.5,
+-R_CUBIC_TO, 0, 0.71, 0.25, 1.31, 0.76, 1.82,
+-R_CUBIC_TO, 0.51, 0.51, 1.12, 0.76, 1.82, 0.76,
+-R_CUBIC_TO, 0.7, 0, 1.31, -0.25, 1.82, -0.76,
+-R_CUBIC_TO, 0.51, -0.51, 0.76, -1.12, 0.76, -1.82,
+-R_CUBIC_TO, 0, -0.7, -0.25, -1.31, -0.76, -1.82,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -1.82, -0.76,
+-R_CUBIC_TO, -0.7, 0, -1.31, 0.25, -1.82, 0.76,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -0.76, 1.82,
 +CANVAS_DIMENSIONS, 16,
 +MOVE_TO, 15.99f, 8,
 +CUBIC_TO, 15.99f, 9.83f, 15.37f, 11.52f, 14.34f, 12.87f,
@@ -18245,47 +18260,47 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 +CUBIC_TO, 14.47f, 3.29f, 14.38f, 3.18f, 14.29f, 3.07f,
 +CUBIC_TO, 15.36f, 4.43f, 15.99f, 6.14f, 15.99f, 8,
 CLOSE,
-MOVE_TO, 7.5f, 11.48f,
-R_CUBIC_TO, 0.14f, 0, 0.28f, 0, 0.41f, -0.02f,
-R_CUBIC_TO, 0.13f, -0.01f, 0.26f, -0.04f, 0.39f, -0.07f,
-LINE_TO, 6.77f, 14.06f,
-R_CUBIC_TO, -1.65f, -0.19f, -3.04f, -0.89f, -4.15f, -2.12f,
-CUBIC_TO, 1.5f, 10.71f, 0.94f, 9.24f, 0.94f, 7.55f,
-R_CUBIC_TO, 0, -0.46f, 0.05f, -0.9f, 0.13f, -1.33f,
-R_CUBIC_TO, 0.08f, -0.44f, 0.22f, -0.85f, 0.39f, -1.25f,
-R_LINE_TO, 2.63f, 4.55f,
-R_CUBIC_TO, 0.34f, 0.59f, 0.81f, 1.07f, 1.41f, 1.43f,
-R_CUBIC_TO, 0.6f, 0.36f, 1.26f, 0.54f, 2.01f, 0.54f,
+-MOVE_TO, 7.5, 11.48,
+-R_CUBIC_TO, 0.14, 0, 0.28, 0, 0.41, -0.02,
+-R_CUBIC_TO, 0.13, -0.01, 0.26, -0.04, 0.39, -0.07,
+-LINE_TO, 6.77, 14.06,
+-R_CUBIC_TO, -1.65, -0.19, -3.04, -0.89, -4.15, -2.12,
+-CUBIC_TO, 1.5, 10.71, 0.94, 9.24, 0.94, 7.55,
+-R_CUBIC_TO, 0, -0.46, 0.05, -0.9, 0.13, -1.33,
+-R_CUBIC_TO, 0.08, -0.44, 0.22, -0.85, 0.39, -1.25,
+-R_LINE_TO, 2.63, 4.55,
+-R_CUBIC_TO, 0.34, 0.59, 0.81, 1.07, 1.41, 1.43,
+-R_CUBIC_TO, 0.6, 0.36, 1.26, 0.54, 2.01, 0.54,
 +MOVE_TO, 14.29f, 3.07f,
 +CUBIC_TO, 14.29f, 3.06f, 14.28f, 3.05f, 14.27f, 3.04f,
 +CUBIC_TO, 14.28f, 3.05f, 14.29f, 3.06f, 14.29f, 3.07f,
 CLOSE,
-R_MOVE_TO, 0, -7.87f,
-R_CUBIC_TO, -0.87f, 0, -1.65f, 0.25f, -2.33f, 0.77f,
-R_ARC_TO, 3.95f, 3.95f, 0, 0, 0, -1.42f, 1.94f,
-LINE_TO, 2.21f, 3.66f,
-R_ARC_TO, 6.79f, 6.79f, 0, 0, 1, 2.27f, -1.94f,
-CUBIC_TO, 5.4f, 1.22f, 6.4f, 0.98f, 7.5f, 0.98f,
-R_CUBIC_TO, 1.1f, 0, 2.08f, 0.24f, 2.99f, 0.72f,
-ARC_TO, 6.66f, 6.66f, 0, 0, 1, 12.76f, 3.6f,
-H_LINE_TO, 7.51f,
-R_LINE_TO, -0.01f, 0.01f,
+-R_MOVE_TO, 0, -7.87,
+-R_CUBIC_TO, -0.87, 0, -1.65, 0.25, -2.33, 0.77,
+-R_ARC_TO, 3.95, 3.95, 0, 0, 0, -1.42, 1.94,
+-LINE_TO, 2.21, 3.66,
+-R_ARC_TO, 6.79, 6.79, 0, 0, 1, 2.27, -1.94,
+-CUBIC_TO, 5.4, 1.22, 6.4, 0.98, 7.5, 0.98,
+-R_CUBIC_TO, 1.1, 0, 2.08, 0.24, 2.99, 0.72,
+-ARC_TO, 6.66, 6.66, 0, 0, 1, 12.76, 3.6,
+-H_LINE_TO, 7.51,
+-R_LINE_TO, -0.01, 0.01,
 +MOVE_TO, 14.34f, 12.87f,
 +CUBIC_TO, 14.29f, 12.93f, 14.24f, 12.99f, 14.2f, 13.05f,
 +CUBIC_TO, 14.24f, 12.99f, 14.29f, 12.93f, 14.34f, 12.87f,
 CLOSE,
-R_MOVE_TO, 6.01f, 1.31f,
-R_CUBIC_TO, 0.19f, 0.4f, 0.32f, 0.83f, 0.41f, 1.27f,
-R_CUBIC_TO, 0.09f, 0.44f, 0.15f, 0.89f, 0.15f, 1.36f,
-R_CUBIC_TO, 0, 1.7f, -0.55f, 3.16f, -1.68f, 4.38f,
-R_CUBIC_TO, -1.11f, 1.23f, -2.47f, 1.93f, -4.1f, 2.13f,
-R_LINE_TO, 2.63f, -4.55f,
-R_CUBIC_TO, 0.17f, -0.28f, 0.29f, -0.59f, 0.38f, -0.92f,
-R_CUBIC_TO, 0.09f, -0.34f, 0.15f, -0.69f, 0.15f, -1.05f,
-R_CUBIC_TO, 0, -0.52f, -0.09f, -0.99f, -0.28f, -1.42f,
-R_ARC_TO, 3.96f, 3.96f, 0, 0, 0, -0.74f, -1.2f,
-R_H_LINE_TO, 3.08f,
-R_V_LINE_TO, 0.01f,
+-R_MOVE_TO, 6.01, 1.31,
+-R_CUBIC_TO, 0.19, 0.4, 0.32, 0.83, 0.41, 1.27,
+-R_CUBIC_TO, 0.09, 0.44, 0.15, 0.89, 0.15, 1.36,
+-R_CUBIC_TO, 0, 1.7, -0.55, 3.16, -1.68, 4.38,
+-R_CUBIC_TO, -1.11, 1.23, -2.47, 1.93, -4.1, 2.13,
+-R_LINE_TO, 2.63, -4.55,
+-R_CUBIC_TO, 0.17, -0.28, 0.29, -0.59, 0.38, -0.92,
+-R_CUBIC_TO, 0.09, -0.34, 0.15, -0.69, 0.15, -1.05,
+-R_CUBIC_TO, 0, -0.52, -0.09, -0.99, -0.28, -1.42,
+-R_ARC_TO, 3.96, 3.96, 0, 0, 0, -0.74, -1.2,
+-R_H_LINE_TO, 3.08,
+-R_V_LINE_TO, 0.01,
 +MOVE_TO, 14.27f, 3.04f,
 +CUBIC_TO, 14.19f, 2.94f, 14.11f, 2.84f, 14.02f, 2.74f,
 +CUBIC_TO, 14.11f, 2.84f, 14.19f, 2.94f, 14.27f, 3.04f,
@@ -18917,9 +18932,18 @@ z%lwlC#@8v20MrdyXS4Cd9v0(a*!707Mi)DWKCPo$-?g#BRX!@}3RwzBwgOM1&^{Rc
 z3=3bI32q;3&^A^#@RQ;k{^t41Rq+f34W3u|*@1288y{>q;|6&;qJI})ZE0^oH1|#U
 EKU(of)Bpeg

-diff --git a/components/version_ui/resources/about_version.ts b/components/version_ui/resources/about_version.ts
--- a/components/version_ui/resources/about_version.ts
-+++ b/components/version_ui/resources/about_version.ts
+diff --git a/components/webui/version/resources/about_version.ts b/components/webui/version/resources/about_version.ts
+--- a/components/webui/version/resources/about_version.ts
+++ b/components/webui/version/resources/about_version.ts
+@@ -51,7 +51,7 @@ function handleVariationInfo(
+         .appendChild(document.createElement('br'));
+   }
+ 
+-  const includeVariationsCmd = location.search.includes('show-variations-cmd');
+  const includeVariationsCmd = true;
+   if (variationsCmd !== '') {
+     getRequiredElement('variations-cmd-section').hidden = false;
+     getRequiredElement('copy-variations-to-clipboard').hidden =
@@ -180,7 +180,7 @@ function initialize() {
   // </if>
 
@@ -18929,9 +18953,9 @@ diff --git a/components/version_ui/resources/about_version.ts b/components/versi
   sendWithPromise('requestVariationInfo', includeVariationsCmd)
       .then(handleVariationInfo);
   sendWithPromise('requestPathInfo').then(handlePathInfo);
-diff --git a/components/version_ui/resources/about_version_mobile.css b/components/version_ui/resources/about_version_mobile.css
--- a/components/version_ui/resources/about_version_mobile.css
-+++ b/components/version_ui/resources/about_version_mobile.css
+diff --git a/components/webui/version/resources/about_version_mobile.css b/components/webui/version/resources/about_version_mobile.css
+--- a/components/webui/version/resources/about_version_mobile.css
+++ b/components/webui/version/resources/about_version_mobile.css
@@ -17,3 +17,12 @@
   margin-left: auto;
   margin-right: auto;
@@ -18948,7 +18972,7 @@ diff --git a/components/version_ui/resources/about_version_mobile.css b/componen
 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
-@@ -574,7 +574,7 @@ void ResolveInvalidConfigurations() {
+@@ -570,19 +570,22 @@ void ResolveInvalidConfigurations() {
        base::FeatureList::IsEnabled(
            features::kPrivacySandboxAdsAPIsM1Override)) &&
       !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -18957,7 +18981,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "Fenced frames cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
         << blink::features::kFencedFrames.name << " instead.";
-@@ -584,9 +584,8 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableFencedFrames(false);
+   }
+  CHECK(!base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIsOverride))
+    << "kPrivacySandboxAdsAPIsOverride is enabled!";
+  CHECK(!base::FeatureList::IsEnabled(features::kPrivacySandboxAdsAPIsM1Override))
+    << "kPrivacySandboxAdsAPIsM1Override is enabled!";
+ 
   if (!base::FeatureList::IsEnabled(blink::features::kFencedFrames) &&
       base::FeatureList::IsEnabled(
           blink::features::kFencedFramesLocalUnpartitionedDataAccess)) {
@@ -18969,36 +18999,51 @@ 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 << "="
-@@ -599,7 +598,7 @@ void ResolveInvalidConfigurations() {
+@@ -590,12 +593,14 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableFeatureFromString(
+         "FencedFramesLocalUnpartitionedDataAccess", false);
+   }
+  CHECK(!base::FeatureList::IsEnabled(blink::features::kFencedFrames))
+    << "kFencedFrames is enabled!";
+ 
+   // Topics API cannot be enabled without the support of the browser process.
   // The Document API should be additionally gated by the
   // `kBrowsingTopicsDocumentAPI` feature.
-   if (!base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+   if (!base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) {
 -    LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsAPIEnabled())
 +    CHECK(!WebRuntimeFeatures::IsTopicsAPIEnabled())
         << "Topics cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
-         << blink::features::kBrowsingTopics.name << " in addition.";
-@@ -609,7 +608,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kBrowsingTopics.name << " in addition.";
+@@ -603,30 +608,23 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+     WebRuntimeFeatures::EnableTopicsImgAPI(false);
   } else {
-     if (!base::FeatureList::IsEnabled(
-             blink::features::kBrowsingTopicsDocumentAPI)) {
+-    if (!base::FeatureList::IsEnabled(
+-            blink::features::kBrowsingTopicsDocumentAPI)) {
 -      LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
-+      CHECK(!WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
-           << "Topics Document API cannot be enabled in this configuration. Use "
-              "--"
-           << switches::kEnableFeatures << "="
-@@ -620,8 +619,8 @@ void ResolveInvalidConfigurations() {
+-          << "Topics Document API cannot be enabled in this configuration. Use "
+-             "--"
+-          << switches::kEnableFeatures << "="
+-          << blink::features::kBrowsingTopicsDocumentAPI.name
+-          << " in addition.";
+-      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+-    }
+    CHECK(false) << "kBrowsingTopics is enabled!";
   }
 
-   if (!base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI)) {
+   if (!base::FeatureList::IsEnabled(network::features::kSharedStorageAPI)) {
 -    LOG_IF(WARNING, WebRuntimeFeatures::IsSharedStorageAPIEnabled())
 -        << "SharedStorage cannot be enabled in this "
 +    CHECK(!WebRuntimeFeatures::IsSharedStorageAPIEnabled())
 +        << "SharedStorage for M118+ cannot be enabled in this "
            "configuration. Use --"
         << switches::kEnableFeatures << "="
-         << blink::features::kSharedStorageAPI.name << " in addition.";
-@@ -630,7 +629,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kSharedStorageAPI.name << " in addition.";
+     WebRuntimeFeatures::EnableSharedStorageAPI(false);
+  } else {
+    CHECK(false) << "kSharedStorageAPI is enabled!";
+   }
 
   if (!base::FeatureList::IsEnabled(
           attribution_reporting::features::kConversionMeasurement)) {
@@ -19007,27 +19052,27 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "AttributionReporting cannot be enabled in this "
            "configuration. Use --"
         << switches::kEnableFeatures << "="
-@@ -643,8 +642,7 @@ void ResolveInvalidConfigurations() {
-           attribution_reporting::features::kConversionMeasurement) ||
-       !base::FeatureList::IsEnabled(
-           network::features::kAttributionReportingCrossAppWeb)) {
-    LOG_IF(WARNING,
-           WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
-+    CHECK(!WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
-         << "AttributionReportingCrossAppWeb cannot be enabled in this "
-            "configuration. Use --"
-         << switches::kEnableFeatures << "="
-@@ -655,8 +653,7 @@ void ResolveInvalidConfigurations() {
+@@ -634,23 +632,25 @@ void ResolveInvalidConfigurations() {
+         << " in addition.";
+     WebRuntimeFeatures::EnableAttributionReporting(false);
   }
+  CHECK(!base::FeatureList::IsEnabled(attribution_reporting::features::kConversionMeasurement))
+    << "kConversionMeasurement is enabled!";
 
-   if (!base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+   if (!base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
 -    LOG_IF(WARNING,
 -           WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
 +    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
         << "AdInterestGroupAPI cannot be enabled in this "
            "configuration. Use --"
         << switches::kEnableFeatures << "="
-@@ -668,8 +665,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kInterestGroupStorage.name << " in addition.";
+     WebRuntimeFeatures::EnableAdInterestGroupAPI(false);
+     WebRuntimeFeatures::EnableFledge(false);
+  } else {
+    CHECK(false) << "kInterestGroupStorage is enabled!";
+   }
+ 
   // PermissionElement cannot be enabled without the support of the
   // browser process.
   if (!base::FeatureList::IsEnabled(blink::features::kPermissionElement)) {
@@ -19037,10 +19082,16 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "PermissionElement cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
         << blink::features::kPermissionElement.name << " instead.";
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
+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);
 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
-@@ -126,6 +126,7 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
+@@ -129,6 +129,7 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
   def characters(self, content):
     if self.ignore_depth == 0:
       if self.stack[-1]:
@@ -19048,7 +19099,7 @@ diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
         self.stack[-1].AppendContent(content)
 
   def ignorableWhitespace(self, whitespace):
-@@ -133,6 +134,40 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
+@@ -136,6 +137,40 @@ class GrdContentHandler(xml.sax.handler.ContentHandler):
     # parser?
     pass
 
@@ -23,7 +23,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/ChromeActionModeHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java
-@@ -158,9 +158,7 @@ public class ChromeActionModeHandler {
+@@ -166,9 +166,7 @@ public class ChromeActionModeHandler {
                             | ActionModeCallbackHelper.MENU_ITEM_SHARE;
             // Disable options that expose additional Chrome functionality prior to the FRE being
             // completed (i.e. creation of a new tab).
@@ -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
-@@ -777,10 +777,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -803,10 +803,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
-@@ -191,12 +191,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -202,6 +202,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
         // Skip opening a new Tab if it doesn't make sense.
         if (mTab.isClosing()) return false;
 
@@ -74,16 +74,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 +            tabLaunchType = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
 +        }
 +
-         // Creating new Tabs asynchronously requires starting a new Activity to create the Tab,
-         // so the Tab returned will always be null.  There's no way to know synchronously
-         // whether the Tab is created, so assume it's always successful.
-         boolean success =
+         boolean openingPopup =
+                 PopupCreator.arePopupsEnabled(mActivity)
+                         && (disposition == WindowOpenDisposition.NEW_POPUP);
+@@ -225,7 +233,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
                 tabCreator.createTabWithWebContents(
-                        mTab, webContents, TabLaunchType.FROM_LONGPRESS_FOREGROUND, url);
-+                        mTab, webContents, tabLaunchType, url);
- 
-         if (success) {
-             if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) {
+                         mTab,
+                         webContents,
+-                        TabLaunchType.FROM_LONGPRESS_FOREGROUND,
+                        tabLaunchType,
+                         url,
+                         !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
 --- 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
@@ -95,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;
-@@ -237,6 +238,13 @@ public class LayoutManagerImpl
+@@ -246,6 +247,13 @@ public class LayoutManagerImpl
                                                 != TabLaunchType
                                                         .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                 || (!getTabModelSelector().isIncognitoSelected() && incognito);
@@ -112,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
-@@ -317,8 +317,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -372,8 +372,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
         loadUrlParams.setReferrer(referrer);
@@ -130,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -27,6 +27,7 @@ import androidx.appcompat.content.res.AppCompatResources;
+@@ -29,6 +29,7 @@ import androidx.core.view.WindowInsetsCompat;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
@@ -138,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 import org.chromium.base.TraceEvent;
 import org.chromium.base.lifetime.Destroyable;
 import org.chromium.base.metrics.RecordUserAction;
-@@ -825,11 +826,16 @@ public class RootUiCoordinator
+@@ -795,11 +796,16 @@ public class RootUiCoordinator
                     TrackerFactory.getTrackerForProfile(tab.getProfile())
                             .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
 
@@ -198,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
-@@ -73,4 +73,28 @@ found in the LICENSE file.
+@@ -79,4 +79,28 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -462,8 +464,8 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.UserData;
- import org.chromium.build.annotations.NullMarked;
-@@ -86,6 +87,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
+ import org.chromium.build.annotations.Initializer;
+@@ -84,6 +85,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
             return null;
         }
 
@@ -472,5 +474,5 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 +
         SmartSelectionClient client =
                 assumeNonNull(
-                         ((WebContentsImpl) webContents)
+                         webContents.getOrSetUserData(
 --
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
 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
-@@ -292,8 +292,17 @@ class LocationBarMediator
+@@ -318,8 +318,17 @@ class LocationBarMediator
             if (!mUrlFocusedWithPastedText
                     && !shouldRetainOmniboxOnFocus
                     && mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/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
-@@ -9,6 +9,7 @@ import android.graphics.Canvas;
+@@ -11,6 +11,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.os.Build;
@@ -58,15 +58,15 @@ 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;
-@@ -107,6 +108,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -113,6 +114,7 @@ public class UrlBar extends AutocompleteEditText {
     private boolean mAllowFocus = true;
     private boolean mShouldSendTypingStartedEvent;
 
 +    private boolean mPendingSelectAll;
     private boolean mPendingScroll;
+     private boolean mIsInCct;
 
-     // Captures the current intended text scroll type.
-@@ -332,6 +334,28 @@ public class UrlBar extends AutocompleteEditText {
+@@ -339,6 +341,28 @@ public class UrlBar extends AutocompleteEditText {
         fixupTextDirection();
 
         mShouldSendTypingStartedEvent = focused;
@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1095,6 +1095,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1101,6 +1101,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
             structure.setChildCount(0);
             return;
         }
@@ -21,26 +21,26 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -20,6 +20,7 @@ android_library("java") {
+@@ -21,6 +21,7 @@ android_library("java") {
     "//build/android:build_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/profiles/android:java",
 +    "//components/policy/android:policy_java",
+     "//content/public/android:content_java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/jni_zero:jni_zero_java",
-   ]
 diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 --- a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 +++ b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
-@@ -23,6 +23,7 @@ import org.chromium.base.metrics.RecordHistogram;
- import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.TaskTraits;
+@@ -28,6 +28,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 +import org.chromium.components.policy.AppRestrictionsProvider;
 
 import java.util.LinkedList;
 import java.util.Queue;
-@@ -104,6 +105,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
+@@ -109,6 +110,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
             new AsyncTask<OwnedState>() {
                 // TODO: Unit test this function. https://crbug.com/1099262
                 private OwnedState calculateIsRunningOnManagedProfile(Context context) {
@@ -109,8 +109,8 @@ new file mode 100644
 diff --git a/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java b/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
 --- a/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
 +++ b/components/policy/android/java/src/org/chromium/components/policy/AppRestrictionsProvider.java
-@@ -17,6 +17,15 @@ import org.chromium.base.Log;
-  */
+@@ -19,6 +19,15 @@ import org.chromium.build.annotations.NullMarked;
+ @NullMarked
 public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
     private static final String TAG = "AppResProvider";
 +    private static boolean mEnabled = false;
@@ -125,7 +125,7 @@ diff --git a/components/policy/android/java/src/org/chromium/components/policy/A
 
     /**
      * Get the app restriction information from provided user manager, and record some timing
-@@ -28,6 +37,9 @@ public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
+@@ -30,6 +39,9 @@ public class AppRestrictionsProvider extends AbstractAppRestrictionsProvider {
      */
     public static Bundle getApplicationRestrictionsFromUserManager(
             UserManager userManager, String packageName) {
@@ -0,0 +1,50 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 1 Apr 2025 11:37:52 +0000
+Subject: Disable Android Tab Declutter
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ chrome/android/java/res/xml/main_preferences.xml               | 3 ++-
+ .../org/chromium/chrome/browser/tab/TabArchiveSettings.java    | 3 ++-
+ .../chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc   | 1 +
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+
+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
+@@ -105,7 +105,8 @@ for the previous order (main_preferences_legacy). -->
+         android:fragment="org.chromium.chrome.browser.tasks.tab_management.TabsSettings"
+         android:key="tabs"
+         android:order="18"
+-        android:title="@string/tabs_settings_title"/>
+        android:title="@string/tabs_settings_title"
+        app:isPreferenceVisible="false"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
+         android:key="homepage"
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
+@@ -104,11 +104,12 @@ public class TabArchiveSettings {
+         // are created, and tabs disappearing from tests is very unexpected. For archive tests,
+         // this will need to be turned on manually.
+         return mPrefsManager.readBoolean(
+-                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, !BuildConfig.IS_FOR_TEST);
+                ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, false);
+     }
+ 
+     /** Sets whether archive is enabled in settings. */
+     public void setArchiveEnabled(boolean enabled) {
+        enabled = false;
+         mPrefsManager.writeBoolean(ChromePreferenceKeys.TAB_DECLUTTER_ARCHIVE_ENABLED, enabled);
+     }
+ 
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+@@ -0,0 +1 @@
+// empty
+--
@@ -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
-@@ -389,7 +389,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -393,7 +393,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
-@@ -585,7 +585,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+@@ -581,7 +581,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
     HeapVector<CSSSelector> arena;
     CSSPropertyValueSet* empty_properties =
         ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),
@@ -0,0 +1,27 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 2 May 2025 14:20:38 +0000
+Subject: Disable CSSDynamicRangeLimit
+
+Disables the ability for pages to limit the maximum brightness of HDR content
+since use as screen fingerprinting is possible.
+
+see https://www.github.com/w3ctag/design-reviews/issues/1027
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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
+@@ -1250,7 +1250,7 @@
+     },
+     {
+       name: "CSSDynamicRangeLimit",
+-      status: "stable",
+      status: "experimental",
+     },
+     {
+       // Include custom properties in CSSComputedStyleDeclaration::item/length.
+--
@@ -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
-@@ -8383,6 +8383,12 @@ static_library("browser") {
+@@ -8372,6 +8372,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",
-@@ -8398,7 +8404,6 @@ static_library("browser") {
+@@ -8387,7 +8393,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:browser",
-@@ -8845,7 +8850,7 @@ source_set("font_pref") {
+@@ -8848,7 +8853,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
-@@ -378,7 +378,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -372,7 +372,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
       base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
 
 #if BUILDFLAG(ENABLE_COMPOSE)
@@ -60,7 +60,7 @@ diff --git a/components/compose/core/browser/compose_features.cc b/components/co
 +++ b/components/compose/core/browser/compose_features.cc
@@ -104,4 +104,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
              "ComposeUpfrontInputModes",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kEnableCompose);
 +SET_CROMITE_FEATURE_DISABLED(kComposeEligible);
@@ -10,7 +10,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
-@@ -874,12 +874,14 @@
+@@ -1007,12 +1007,14 @@
       }
     },
     {
@@ -4,13 +4,26 @@ Subject: Disable FedCm

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ .../content_settings/core/browser/content_settings_registry.cc  | 2 +-
 .../content/public/common/content_features_cc/Disable-FedCm.inc | 1 +
 .../third_party/blink/common/features_cc/Disable-FedCm.inc      | 1 +
 .../blink/renderer/platform/runtime_enabled_features.json5      | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
+ 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc

+diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
+--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
+@@ -674,7 +674,7 @@ void ContentSettingsRegistry::Init() {
+            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+ 
+   Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
+-           "webid-auto-reauthn", CONTENT_SETTING_ALLOW,
+           "webid-auto-reauthn", CONTENT_SETTING_BLOCK, // requires user mediation
+            WebsiteSettingsInfo::UNSYNCABLE,
+            /*allowlisted_primary_schemes=*/{},
+            /*valid_settings=*/{CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK},
 diff --git a/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc b/cromite_flags/content/public/common/content_features_cc/Disable-FedCm.inc
 new file mode 100644
 --- /dev/null
@@ -22,11 +35,11 @@ new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-FedCm.inc
@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kFedCmWithStorageAccessAPI);
+// empty
 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
-@@ -1780,7 +1780,7 @@
+@@ -2075,7 +2075,7 @@
     {
       name: "FedCm",
       public: true,
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn
 diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
-@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
+@@ -29,6 +29,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
 import org.chromium.components.signin.identitymanager.IdentityManager;
 
 import java.util.HashMap;
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browse
 import java.util.List;
 import java.util.Map;
 
-@@ -69,31 +70,8 @@ public abstract class FeedbackCollector<T> implements Runnable {
+@@ -73,31 +74,8 @@ public abstract class FeedbackCollector<T> implements Runnable {
             @Nullable ScreenshotSource screenshotTask,
             T initParams,
             Profile profile) {
@@ -4,20 +4,31 @@ Subject: Disable GSA by default

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../chrome/browser/IntentHandler.java         |  6 ------
- .../provider/PageContentProviderImpl.java     |  6 ------
- .../chrome/browser/share/LensUtils.java       | 14 ++------------
- .../chromium/chrome/browser/gsa/GSAUtils.java | 10 +++-------
- .../GoogleBottomBarActionsHandler.java        | 19 ++-----------------
- .../chrome/browser/pdf/PdfCoordinator.java    |  4 +---
+ .../src/org/chromium/base/PackageUtils.java   |  1 +
+ .../chrome/browser/IntentHandler.java         |  6 ----
+ .../chrome/browser/share/LensUtils.java       | 14 ++-------
+ .../chromium/chrome/browser/gsa/GSAUtils.java | 29 ++++---------------
+ .../GoogleBottomBarActionsHandler.java        | 19 ++----------
+ .../chrome/browser/pdf/PdfCoordinator.java    |  2 +-
 .../Disable-GSA-by-default.inc                |  1 +
- 7 files changed, 9 insertions(+), 51 deletions(-)
+ 7 files changed, 12 insertions(+), 60 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 {
+      * @return Package name of assistant app, or null if unable to get.
+      */
+     public static @Nullable String getDefaultAssistantPackageName(Context context) {
+        if ((true)) return null;
+         @Nullable String defaultAssistantSetting =
+                 Settings.Secure.getString(context.getContentResolver(), DEFAULT_ASSISTANT_SETTING);
+         if (defaultAssistantSetting == null || defaultAssistantSetting.isBlank()) {
 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
-@@ -45,7 +45,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -47,7 +47,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;
@@ -25,9 +36,9 @@ 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.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -263,9 +262,6 @@ public class IntentHandler {
-     public static final String EXTRA_SKIP_PRECONNECT =
-             "org.chromium.chrome.browser.skip_preconnect";
+@@ -279,9 +278,6 @@ public class IntentHandler {
+ 
+     public static final String EXTRA_CCT_EARLY_NAV = "org.chromium.chrome.browser.cct_early_nav";
 
 -    /** The package name for the Google Search App. */
 -    public static final String PACKAGE_GSA = GSAUtils.GSA_PACKAGE_NAME;
@@ -35,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
     private static Pair<Integer, String> sPendingReferrer;
     private static int sReferrerId;
     private static String sPendingIncognitoUrl;
-@@ -539,8 +535,6 @@ public class IntentHandler {
+@@ -557,8 +553,6 @@ public class IntentHandler {
             return ExternalAppId.LINE;
         } else if (packageName.equals(PACKAGE_WHATSAPP)) {
             return ExternalAppId.WHATSAPP;
@@ -44,29 +55,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
         } else if (packageName.equals(ContextUtils.getApplicationContext().getPackageName())) {
             return ExternalAppId.CHROME;
         } else if (packageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/provider/PageContentProviderImpl.java
-@@ -56,8 +56,6 @@ import java.util.UUID;
- public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
- 
-     private static final int INVALIDATE_URI_DELAY_MS = 10_000;
-    private static final String[] AUTHORIZED_PACKAGE_NAMES =
-            new String[] {GSAUtils.GSA_PACKAGE_NAME};
- 
-     static final class PageContentInvocationState {
- 
-@@ -339,10 +337,6 @@ public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
-     }
- 
-     private static void grantAccessToUri(Uri uri) {
-        for (String packageName : AUTHORIZED_PACKAGE_NAMES) {
-            ContextUtils.getApplicationContext()
-                    .grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        }
-     }
- 
-     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
 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
@@ -112,15 +100,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
 diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
 --- a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
 +++ b/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtils.java
-@@ -13,16 +13,11 @@ import org.chromium.base.PackageUtils;
- 
+@@ -14,19 +14,12 @@ import org.chromium.build.annotations.Nullable;
 /** This class provides utilities for the state of Google Search App. */
+ @NullMarked
 public class GSAUtils {
+-    private static final Object sPackageInfoLock = new Object();
+-    @Nullable private static volatile PackageInfo sPackageInfo;
+-
 -    public static final String GSA_PACKAGE_NAME = "com.google.android.googlequicksearchbox";
 -    public static final String GSA_CLASS_NAME =
 -            "com.google.android.apps.search.googleapp.activity.GoogleAppActivity";
 -    public static final String VOICE_SEARCH_INTENT_ACTION = "android.intent.action.VOICE_ASSIST";
-
+ 
     /**
      * @return Whether the given package name is the package name for Google Search App.
      */
@@ -130,21 +121,44 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
     }
 
     /**
-@@ -34,6 +29,7 @@ public class GSAUtils {
+@@ -38,6 +31,7 @@ public class GSAUtils {
      */
     public static boolean isAgsaVersionBelowMinimum(
-             String installedVersionName, String minimumVersionName) {
+             @Nullable String installedVersionName, @Nullable String minimumVersionName) {
 +        if ((true)) return false;
         if (TextUtils.isEmpty(installedVersionName) || TextUtils.isEmpty(minimumVersionName)) {
             return true;
         }
-@@ -64,7 +60,7 @@ public class GSAUtils {
+@@ -68,8 +62,8 @@ public class GSAUtils {
      * @return The version name of the Agsa package or null if it can't be found.
      */
     public static @Nullable String getAgsaVersionName() {
-        PackageInfo packageInfo = PackageUtils.getPackageInfo(GSA_PACKAGE_NAME, 0);
+-        PackageInfo info = getAgsaPackageInfo();
+-        return info == null ? null : info.versionName;
 +        PackageInfo packageInfo = null;
-         return packageInfo == null ? null : packageInfo.versionName;
+        return packageInfo == null ? null : packageInfo.versionName;
+     }
+ 
+     /**
+@@ -78,19 +72,6 @@ public class GSAUtils {
+      * @return Whether the AGSA is enabled
+      */
+     public static boolean isAgsaEnabled() {
+-        PackageInfo info = getAgsaPackageInfo();
+-        return info != null && info.applicationInfo != null && info.applicationInfo.enabled;
+-    }
+-
+-    @Nullable
+-    private static PackageInfo getAgsaPackageInfo() {
+-        if (sPackageInfo == null) {
+-            synchronized (sPackageInfoLock) {
+-                if (sPackageInfo == null) {
+-                    sPackageInfo = PackageUtils.getPackageInfo(GSA_PACKAGE_NAME, 0);
+-                }
+-            }
+-        }
+-        return sPackageInfo;
+        return false;
     }
 }
 diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java b/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
@@ -160,7 +174,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;
-@@ -102,11 +99,6 @@ class GoogleBottomBarActionsHandler {
+@@ -105,11 +102,6 @@ class GoogleBottomBarActionsHandler {
     }
 
     void onSearchboxMicTap() {
@@ -172,7 +186,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
     }
 
     void onSearchboxLensTap(View buttonView) {
-@@ -145,21 +137,13 @@ class GoogleBottomBarActionsHandler {
+@@ -148,21 +140,13 @@ class GoogleBottomBarActionsHandler {
     }
 
     private void openGoogleAppSearch() {
@@ -195,7 +209,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)) {
-@@ -271,6 +255,7 @@ class GoogleBottomBarActionsHandler {
+@@ -274,6 +258,7 @@ class GoogleBottomBarActionsHandler {
     }
 
     private void sendPendingIntentWithUrl(PendingIntent pendingIntent) {
@@ -206,24 +220,15 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
-@@ -246,7 +246,7 @@ public class PdfCoordinator {
+@@ -265,7 +265,7 @@ public class PdfCoordinator {
     }
 
-     String requestAssistContent(String filename, boolean isWorkProfile) {
+     @Nullable String requestAssistContent(String filename, boolean isWorkProfile) {
 -        if (mUri == null) {
 +        if ((true)) {
             return null;
         }
         String structuredData;
-@@ -264,8 +264,6 @@ public class PdfCoordinator {
-         } catch (JSONException e) {
-             return null;
-         }
-        mActivity.grantUriPermission(
-                GSAUtils.GSA_PACKAGE_NAME, mUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
-         PdfUtils.recordIsWorkProfile(isWorkProfile);
-         return structuredData;
-     }
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc
 new file mode 100644
 --- /dev/null
@@ -16,9 +16,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 --- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 +++ b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
-@@ -153,6 +153,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
-             final RelatedApplication[] relatedApps,
+@@ -162,6 +162,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
             final Url manifestUrl,
+             final boolean addSavedRelatedApplications,
             final FilterInstalledApps_Response callback) {
 +        assert false;
         GURL url = mRenderFrameHost.getLastCommittedURL();
@@ -27,8 +27,8 @@ diff --git a/components/installedapp/android/java/src/org/chromium/components/in
 diff --git a/content/browser/installedapp/installed_app_provider_impl.cc b/content/browser/installedapp/installed_app_provider_impl.cc
 --- a/content/browser/installedapp/installed_app_provider_impl.cc
 +++ b/content/browser/installedapp/installed_app_provider_impl.cc
-@@ -59,7 +59,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
-     const GURL& manifest_url,
+@@ -62,7 +62,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
+     bool add_saved_related_applications,
     FilterInstalledAppsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 -  if (!base::FeatureList::IsEnabled(features::kInstalledAppProvider)) {
@@ -58,8 +58,8 @@ 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
-@@ -2499,9 +2499,8 @@
-       name: "InspectorGhostRules",
+@@ -2766,9 +2766,8 @@
+       status: "stable",
     },
     {
 -      name: "InstalledApp",
@@ -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
-@@ -107,7 +107,7 @@ public class StartupPaintPreviewHelper {
+@@ -114,7 +114,7 @@ public class StartupPaintPreviewHelper implements Destroyable {
 
     /** Enables Paint Preview show attempt on restoration of a tab. */
     public static void enableShowOnRestore() {
@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -27,6 +27,7 @@ found in the LICENSE file.
-         app:isPreferenceVisible="false" />
+@@ -21,6 +21,7 @@ found in the LICENSE file.
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
     <Preference
         android:key="privacy_guide"
 +        app:isPreferenceVisible="false"
@@ -22,12 +22,12 @@ 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
-@@ -347,8 +347,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -346,8 +346,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+ #endif  // BUILDFLAG(IS_CHROMEOS)
 
   bool show_privacy_guide =
 -      base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) ||
-      (!chrome::ShouldDisplayManagedUi(profile) && !profile->IsChild());
+-      (!ShouldDisplayManagedUi(profile) && !profile->IsChild());
 +      false;
   html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
 
@@ -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         | 8 --------
- chrome/browser/ui/webui/searchbox/searchbox_handler.cc | 1 +
- components/search/ntp_features.cc                      | 6 +++---
- 4 files changed, 5 insertions(+), 12 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc                  |  2 +-
+ chrome/browser/resources/new_tab_page/app.html         | 10 ----------
+ chrome/browser/ui/webui/searchbox/searchbox_handler.cc |  1 +
+ components/search/ntp_features.cc                      |  6 +++---
+ 4 files changed, 5 insertions(+), 14 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
-@@ -2395,7 +2395,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2276,7 +2276,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   registry->RegisterBooleanPref(
       prefs::kLensRegionSearchEnabled, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -21,11 +21,11 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 +  registry->RegisterBooleanPref(prefs::kLensDesktopNTPSearchEnabled, false);
 #endif
 
- #if !BUILDFLAG(IS_ANDROID)
+   registry->RegisterListPref(
 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
-@@ -19,14 +19,6 @@
+@@ -19,16 +19,6 @@
       ?hidden="${!this.logoEnabled_}">
   </ntp-logo>
   <div id="searchboxContainer">
@@ -35,7 +35,9 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
 -        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
-        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}">
+-        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
+-        ?compose-button-enabled="${this.composeButtonEnabled}"
+-        ?composebox-enabled="${this.composeboxEnabled}">
 -    </cr-searchbox>
     ${this.showLensUploadDialog_ ? html`
       <ntp-lens-upload-dialog id="lensUploadDialog"
@@ -43,7 +45,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
 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
-@@ -420,6 +420,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+@@ -438,6 +438,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                             Profile* profile,
                                             bool enable_voice_search,
                                             bool enable_lens_search) {
@@ -54,7 +56,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -121,7 +121,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
+@@ -138,7 +138,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
 
 // If enabled, logo will be shown.
 // This is a kill switch. Keep indefinitely.
@@ -63,7 +65,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
 
 // If enabled, middle slot promo will be shown.
 // This is a kill switch. Keep indefinitely.
-@@ -179,8 +179,8 @@ BASE_FEATURE(kNtpModulesLoad,
+@@ -191,8 +191,8 @@ BASE_FEATURE(kNtpModulesLoad,
 // If enabled, OneGoogleBar will be shown.
 // This is a kill switch. Keep indefinitely.
 BASE_FEATURE(kNtpOneGoogleBar,
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/embedder_support/content_settings_utils.cc b/components/embedder_support/content_settings_utils.cc
 --- a/components/embedder_support/content_settings_utils.cc
 +++ b/components/embedder_support/content_settings_utils.cc
-@@ -29,16 +29,7 @@ namespace {
+@@ -30,16 +30,7 @@ namespace {
 //  allowed by default, and access is only blocked due to general third-party
 //  cookie blocking (and not due to a user specified pattern) then storage
 //  access can be allowed.
@@ -32,9 +32,9 @@ diff --git a/components/embedder_support/content_settings_utils.cc b/components/
 bool AllowWorkerStorageAccess(
     StorageType storage_type,
     const GURL& url,
-@@ -53,17 +44,11 @@ bool AllowWorkerStorageAccess(
-       url, net::SiteForCookies::FromUrl(url), url::Origin::Create(url),
-       net::CookieSettingOverrides(), &cookie_settings_metadata);
+@@ -56,17 +47,11 @@ bool AllowWorkerStorageAccess(
+       net::CookieSettingOverrides(), storage_key.ToCookiePartitionKey(),
+       &cookie_settings_metadata);
 
 -  if (!allow && PartitionedStorageByDefaultAllowed(cookie_settings_metadata)) {
 -    allow = true;
@@ -51,9 +51,9 @@ diff --git a/components/embedder_support/content_settings_utils.cc b/components/
 
   for (const auto& it : render_frames) {
     auto* rfh = content::RenderFrameHost::FromID(it);
-@@ -108,19 +93,16 @@ content::AllowServiceWorkerResult AllowServiceWorker(
-       scope, site_for_cookies, top_frame_origin,
-       cookie_settings->SettingOverridesForStorage(), &cookie_settings_metadata);
+@@ -126,19 +111,16 @@ content::AllowServiceWorkerResult AllowServiceWorker(
+ 
+       &cookie_settings_metadata);
 
 -  if (!allow_cookies &&
 -      PartitionedStorageByDefaultAllowed(cookie_settings_metadata)) {
@@ -75,9 +75,9 @@ diff --git a/components/embedder_support/content_settings_utils.cc b/components/
 
   return content::AllowServiceWorkerResult::FromPolicy(!allow_javascript,
                                                        !allow_cookies);
-@@ -143,17 +125,16 @@ bool AllowSharedWorker(
-       worker_url, site_for_cookies, top_frame_origin,
-       cookie_settings->SettingOverridesForStorage(), &cookie_settings_metadata);
+@@ -174,17 +156,16 @@ bool AllowSharedWorker(
+       net::CookieSettingOverrides(), cookie_partition_key,
+       &cookie_settings_metadata);
 
 -  if (!allow && PartitionedStorageByDefaultAllowed(cookie_settings_metadata)) {
 -    allow = true;
@@ -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
-@@ -223,6 +223,7 @@ HttpNetworkSession::HttpNetworkSession(const HttpNetworkSessionParams& params,
+@@ -222,6 +222,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
-@@ -84,6 +84,7 @@
+@@ -85,6 +85,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"
-@@ -332,6 +333,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
+@@ -371,6 +372,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
 
 }  // namespace
 
@@ -137,10 +137,10 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
 
 QuicSessionRequest::~QuicSessionRequest() {
-@@ -2229,7 +2262,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -2365,7 +2398,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
               cert_verifier_, transport_security_state_, sct_auditing_delegate_,
               HostsFromOrigins(params_.origins_to_force_quic_on),
-               actual_network_anonymization_key),
+               key.network_anonymization_key),
 -          std::make_unique<quic::QuicClientSessionCache>(), this);
 +          std::make_unique<BromiteSessionCache>(), this);
 
@@ -149,7 +149,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
 --- a/net/socket/ssl_client_socket_impl.cc
 +++ b/net/socket/ssl_client_socket_impl.cc
-@@ -284,7 +284,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -290,7 +290,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
   CHECK(context_);
 }
 
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   Disconnect();
 }
 
-@@ -671,6 +697,8 @@ int SSLClientSocketImpl::Init() {
+@@ -681,6 +707,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>(
-@@ -957,6 +985,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -966,6 +994,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
-@@ -1588,6 +1645,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1582,6 +1639,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
 }
 
 bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -22,7 +22,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
 #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
 #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
-@@ -64,6 +66,16 @@ void MaybeRecordMetric(bool record_identifiability,
+@@ -65,6 +67,16 @@ void MaybeRecordMetric(bool record_identifiability,
                     execution_context);
 }
 
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 }  // namespace
 
 NavigatorUAData::NavigatorUAData(ExecutionContext* context)
-@@ -102,7 +114,7 @@ void NavigatorUAData::SetFullVersionList(
+@@ -103,7 +115,7 @@ void NavigatorUAData::SetFullVersionList(
     const UserAgentBrandList& full_version_list) {
   for (const auto& brand_version : full_version_list) {
     AddBrandFullVersion(String::FromUTF8(brand_version.brand),
@@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
   }
 }
 
-@@ -124,7 +136,7 @@ void NavigatorUAData::SetModel(const String& model) {
+@@ -125,7 +137,7 @@ void NavigatorUAData::SetModel(const String& model) {
 }
 
 void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {
@@ -0,0 +1,34 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Sat, 28 Jun 2025 08:17:07 +0000
+Subject: Disable Viewport Segments
+
+Disable Viewport Segments API, specifically for foldable devices,
+since it exposes the geometry of the fold.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../blink/common/features_cc/Disable-ViewportSegments.inc      | 1 +
+ .../blink/renderer/platform/runtime_enabled_features.json5     | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-ViewportSegments.inc
+
+diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-ViewportSegments.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-ViewportSegments.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/third_party/blink/common/features_cc/Disable-ViewportSegments.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kViewportSegments);
+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
+@@ -5200,8 +5200,7 @@
+       status: "stable",
+     },
+     {
+-      name: "ViewportSegments",
+-      status: "stable",
+      name: "ViewportSegments", status: "test", public: true
+     },
+     {
+       name: "ViewTransitionLongCallbackTimeoutForTesting",
+--
@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -371,8 +371,13 @@ void ContentSettingsRegistry::Init() {
+@@ -372,8 +372,13 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 
@@ -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
-@@ -559,6 +559,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -555,6 +555,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
 
   WebRuntimeFeatures::EnableRemotePlayback(false);
 
@@ -24,9 +24,9 @@ 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
-@@ -243,7 +243,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDrDc,
 // enabled by default on supported platforms.
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
     BUILDFLAG(IS_ANDROID)
 -#define WEBGPU_ENABLED base::FEATURE_ENABLED_BY_DEFAULT
 +#define WEBGPU_ENABLED base::FEATURE_DISABLED_BY_DEFAULT
@@ -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)
+@@ -157,6 +157,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();
 }
 
-@@ -439,6 +441,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -427,6 +429,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
         "WebGPU is experimental on this platform. See "
         "https://github.com/gpuweb/gpuweb/wiki/"
         "Implementation-Status#implementation-status"));
@@ -5,15 +5,21 @@ Subject: Disable all predictors code
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/BUILD.gn                          |  3 ---
+ chrome/browser/BUILD.gn                          |  4 +---
 .../preloading_model_keyed_service.cc            |  3 +++
 .../preloading_model_keyed_service_factory.cc    |  4 +---
 .../optimization_guide/chrome_hints_manager.cc   |  1 +
 .../model_validator_keyed_service.cc             |  6 +++++-
 .../optimization_guide_keyed_service.cc          |  1 -
+ chrome/browser/permissions/BUILD.gn              |  2 --
+ .../permissions/chrome_permissions_client.cc     |  2 --
+ .../prediction_model_handler_provider.cc         |  2 +-
 .../predictors/autocomplete_action_predictor.cc  |  2 ++
 .../predictors/loading_predictor_config.cc       |  4 ++--
 chrome/browser/predictors/predictors_features.cc |  3 +--
+ .../search_prefetch/field_trial_settings.cc      |  4 ++++
+ .../search_prefetch_url_loader_interceptor.cc    |  1 +
+ .../chrome_browser_main_extra_parts_profiles.cc  |  1 -
 chrome/browser/safe_browsing/BUILD.gn            |  1 -
 ...fication_content_detection_service_factory.cc |  5 +++++
 chrome/browser/ui/tab_helpers.cc                 |  1 -
@@ -23,8 +29,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../read_anything/read_anything_app_controller.h |  4 ++++
 chrome/utility/BUILD.gn                          |  2 +-
 chrome/utility/services.cc                       |  8 --------
- .../integrators/autofill_optimization_guide.cc   |  5 +++--
+ components/BUILD.gn                              |  2 +-
+ .../autofill_optimization_guide.cc               |  5 +++--
 .../omnibox/browser/autocomplete_controller.cc   |  4 ++++
+ .../omnibox/browser/base_search_provider.cc      |  4 ++--
 .../optimization_guide/core/hints_fetcher.cc     |  1 +
 .../optimization_guide/core/hints_manager.cc     |  5 +++++
 .../core/optimization_guide_features.cc          | 15 +++++++++------
@@ -33,29 +41,33 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/optimization_guide/features.gni       |  3 +--
 .../core/page_content_annotations_features.cc    |  4 ++++
 .../page_content_annotations_model_manager.cc    |  1 +
+ .../notification_content_detection/BUILD.gn      |  7 +++++++
 components/safe_browsing/core/common/features.cc |  1 +
- .../Disable-all-predictors-code.inc              |  3 +++
+ .../service_worker_main_resource_loader.cc       |  1 +
+ .../Disable-all-predictors-code.inc              |  2 ++
 .../Disable-all-predictors-code.inc              |  1 +
 .../Disable-all-predictors-code.inc              |  1 +
 .../features_cc/Disable-all-predictors-code.inc  |  3 +++
 .../features_cc/Disable-all-predictors-code.inc  |  1 +
+ .../features_cc/Disable-all-predictors-code.inc  |  1 +
 .../features_cc/Disable-all-predictors-code.inc  |  2 ++
 services/webnn/features.gni                      |  2 +-
 .../core/html/parser/html_document_parser.cc     |  1 +
 .../document_speculation_rules.cc                |  1 +
 .../platform/runtime_enabled_features.json5      |  2 +-
- 39 files changed, 106 insertions(+), 40 deletions(-)
+ 50 files changed, 124 insertions(+), 49 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
+ create mode 100644 cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc

 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -727,8 +727,6 @@ static_library("browser") {
+@@ -775,8 +775,6 @@ static_library("browser") {
     "navigation_predictor/navigation_predictor_keyed_service_factory.h",
     "navigation_predictor/navigation_predictor_metrics_document_data.cc",
     "navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -64,14 +76,15 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "navigation_predictor/preloading_model_keyed_service.cc",
     "navigation_predictor/preloading_model_keyed_service.h",
     "navigation_predictor/preloading_model_keyed_service_factory.cc",
-@@ -2226,7 +2224,6 @@ static_library("browser") {
+@@ -2343,7 +2341,7 @@ static_library("browser") {
+     "//components/resources",
     "//components/safe_browsing/content/browser",
-     "//components/safe_browsing/content/browser:client_side_detection",
     "//components/safe_browsing/content/browser:safe_browsing_service",
 -    "//components/safe_browsing/content/browser/notification_content_detection",
+    "//components/safe_browsing/content/browser/notification_content_detection:constants",
     "//components/safe_browsing/content/browser/password_protection",
     "//components/safe_browsing/content/browser/web_ui",
-     "//components/safe_browsing/core/browser",
+     "//components/safe_browsing/content/common/proto:download_file_types_proto",
 diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
@@ -175,7 +188,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -498,7 +498,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -516,7 +516,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
 void OptimizationGuideKeyedService::RegisterOptimizationTypes(
     const std::vector<optimization_guide::proto::OptimizationType>&
         optimization_types) {
@@ -183,10 +196,49 @@ diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.
 }
 
 optimization_guide::OptimizationGuideDecision
+diff --git a/chrome/browser/permissions/BUILD.gn b/chrome/browser/permissions/BUILD.gn
+--- a/chrome/browser/permissions/BUILD.gn
+++ b/chrome/browser/permissions/BUILD.gn
+@@ -40,8 +40,6 @@ source_set("permissions") {
+     "permission_revocation_request.h",
+     "permissions_aiv1_handler.cc",
+     "permissions_aiv1_handler.h",
+-    "prediction_based_permission_ui_selector.cc",
+-    "prediction_based_permission_ui_selector.h",
+     "prediction_model_handler_provider.cc",
+     "prediction_model_handler_provider.h",
+     "prediction_service_factory.cc",
+diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
+--- a/chrome/browser/permissions/chrome_permissions_client.cc
+++ b/chrome/browser/permissions/chrome_permissions_client.cc
+@@ -428,8 +428,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
+ #endif
+   selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
+       Profile::FromBrowserContext(browser_context)));
+-  selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
+-      Profile::FromBrowserContext(browser_context)));
+   return selectors;
+ }
+ 
+diff --git a/chrome/browser/permissions/prediction_model_handler_provider.cc b/chrome/browser/permissions/prediction_model_handler_provider.cc
+--- a/chrome/browser/permissions/prediction_model_handler_provider.cc
+++ b/chrome/browser/permissions/prediction_model_handler_provider.cc
+@@ -13,10 +13,10 @@
+ #include "chrome/browser/permissions/permissions_aiv1_handler.h"
+ #include "components/optimization_guide/core/optimization_guide_model_provider.h"
+ #include "components/permissions/features.h"
+-#include "components/permissions/prediction_service/permissions_aiv3_handler.h"
+ #include "components/permissions/request_type.h"
+ 
+ #if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+#include "components/permissions/prediction_service/permissions_aiv3_handler.h"
+ #include "components/permissions/prediction_service/prediction_model_handler.h"
+ #endif  // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+ 
 diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc
 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc
 +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc
-@@ -209,6 +209,8 @@ void AutocompleteActionPredictor::StartPrerendering(
+@@ -210,6 +210,8 @@ void AutocompleteActionPredictor::StartPrerendering(
 
   SetIsNavigationInDomainCallback(preloading_data);
 
@@ -222,21 +274,54 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p
 
 }  // namespace
 
+diff --git a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
+--- a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
+++ b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
+@@ -146,3 +146,7 @@ const base::FeatureParam<base::TimeDelta>
+     kSuppressesSearchPrefetchOnSlowNetworkThreshold{
+         &kSuppressesSearchPrefetchOnSlowNetwork,
+         "slow_network_threshold_for_search_prefetch", base::Milliseconds(208)};
+
+SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchServicePrefetching);
+SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchWithNoVarySearchDiskCache);
+SET_CROMITE_FEATURE_DISABLED(kSearchNavigationPrefetch);
+diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
+--- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
+++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
+@@ -85,6 +85,7 @@ SearchPrefetchURLLoader::RequestHandler
+ SearchPrefetchURLLoaderInterceptor::MaybeCreateLoaderForRequest(
+     const network::ResourceRequest& tentative_resource_request,
+     content::FrameTreeNodeId frame_tree_node_id) {
+  if ((true)) return {};
+   // Do not intercept non-main frame navigations.
+   if (!tentative_resource_request.is_outermost_main_frame) {
+     // Use the is_outermost_main_frame flag instead of obtaining the
+diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -1177,7 +1177,6 @@ void ChromeBrowserMainExtraPartsProfiles::
+       base::FeatureList::IsEnabled(
+           permissions::features::kPermissionOnDeviceGeolocationPredictions) ||
+       base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
+-    PredictionModelHandlerProviderFactory::GetInstance();
+   }
+   PredictionServiceFactory::GetInstance();
+   predictors::AutocompleteActionPredictorFactory::GetInstance();
 diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -51,7 +51,6 @@ static_library("safe_browsing") {
+@@ -47,7 +47,6 @@ static_library("safe_browsing") {
+     "//components/resources:components_resources_grit",
+     "//components/safe_browsing:buildflags",
     "//components/safe_browsing/content/browser",
-     "//components/safe_browsing/content/browser:client_side_detection",
-     "//components/safe_browsing/content/browser:client_side_detection_service",
 -    "//components/safe_browsing/content/browser/notification_content_detection:notification_content_detection",
     "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger",
     "//components/safe_browsing/content/browser/web_ui",
     "//components/safe_browsing/core/browser",
-diff --git a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
--- a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
-+++ b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
-@@ -14,6 +14,7 @@
+diff --git a/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc
+--- a/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc
+++ b/chrome/browser/safe_browsing/notification_content_detection/notification_content_detection_service_factory.cc
+@@ -15,6 +15,7 @@
 #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h"
 #include "components/safe_browsing/core/browser/db/database_manager.h"
 #include "components/safe_browsing/core/common/features.h"
@@ -244,15 +329,15 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection_service
 #include "content/public/browser/browser_context.h"
 
 namespace safe_browsing {
-@@ -63,6 +64,7 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
-     return nullptr;
-   }
- 
+@@ -85,6 +86,7 @@ NotificationContentDetectionServiceFactory::
+         content::BrowserContext* context) const {
+   CHECK(opt_guide);
+   CHECK(context);
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
   auto database_manager =
       g_browser_process->safe_browsing_service()->database_manager();
   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
-@@ -70,6 +72,9 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
+@@ -92,6 +94,9 @@ NotificationContentDetectionServiceFactory::
           {base::MayBlock(), base::TaskPriority::BEST_EFFORT});
   return std::make_unique<NotificationContentDetectionService>(
       opt_guide, background_task_runner, database_manager, context);
@@ -265,7 +350,7 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection_service
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -426,7 +426,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -444,7 +444,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   }
   MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
   NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -276,7 +361,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 --- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 +++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
-@@ -15,7 +15,9 @@
+@@ -16,7 +16,9 @@
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "base/values.h"
@@ -286,7 +371,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 #include "chrome/renderer/accessibility/phrase_segmentation/dependency_tree.h"
 #include "chrome/renderer/accessibility/phrase_segmentation/phrase_segmenter.h"
 #include "chrome/renderer/accessibility/phrase_segmentation/token_boundaries.h"
-@@ -25,6 +27,7 @@
+@@ -26,6 +28,7 @@
 
 namespace {
 
@@ -294,7 +379,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 // Returns the dependency parser model for this renderer process.
 DependencyParserModel& GetDependencyParserModel_() {
   static base::NoDestructor<DependencyParserModel> instance;
-@@ -37,6 +40,7 @@ std::vector<size_t> GetDependencyHeads(base::span<const std::string> input) {
+@@ -38,6 +41,7 @@ std::vector<size_t> GetDependencyHeads(base::span<const std::string> input) {
              ? dependency_parser_model.GetDependencyHeads(input)
              : std::vector<size_t>();
 }
@@ -302,7 +387,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 
 }  // namespace
 
-@@ -148,10 +152,13 @@ void ReadAloudAppModel::PreprocessTextForSpeech(
+@@ -153,10 +157,13 @@ void ReadAloudAppModel::PreprocessTextForSpeech(
   }
 }
 
@@ -316,7 +401,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 void ReadAloudAppModel::CalculatePhrases(
     a11y::ReadAloudCurrentGranularity& granularity) {
   if (!features::IsReadAnythingReadAloudPhraseHighlightingEnabled()) {
-@@ -206,19 +213,23 @@ void ReadAloudAppModel::CalculatePhrases(
+@@ -213,19 +220,23 @@ void ReadAloudAppModel::CalculatePhrases(
       base::BindOnce(&ReadAloudAppModel::UpdatePhraseBoundaries,
                      weak_ptr_factory_.GetWeakPtr(), phrase_tokens));
 }
@@ -342,7 +427,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
   // Reset the phrase calculation flag, so that the next phrase calculation can
   // be scheduled, if needed.
   is_calculating_phrases = false;
-@@ -279,6 +290,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector<std::string> tokens,
+@@ -287,6 +298,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector<std::string> tokens,
     current_phrase_calculation_index_ = -1;
     LOG(WARNING) << "All phrases calculated!";
   }
@@ -353,10 +438,10 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 --- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 +++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
-@@ -9,7 +9,10 @@
+@@ -8,7 +8,10 @@
+ #include "base/metrics/single_sample_metrics.h"
 #include "base/values.h"
 #include "chrome/common/read_anything/read_anything.mojom.h"
- #include "chrome/common/read_anything/read_anything_constants.h"
 +#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
 #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
@@ -364,7 +449,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
 #include "ui/accessibility/ax_node_position.h"
 
-@@ -87,8 +90,10 @@ class ReadAloudAppModel {
+@@ -116,8 +119,10 @@ class ReadAloudAppModel {
                                bool is_docs,
                                const std::set<ui::AXNodeID>* current_nodes);
 
@@ -375,7 +460,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 
   // Increments the processed_granularity_index_, updating ReadAloud's state of
   // the current granularity to refer to the next granularity. The current
-@@ -242,9 +247,11 @@ class ReadAloudAppModel {
+@@ -274,9 +279,11 @@ class ReadAloudAppModel {
   //      still needs to be read.
   bool NoValidTextRemainingInCurrentNode(bool is_pdf, bool is_docs) const;
 
@@ -387,7 +472,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 
   // Once the phrase segmentation has completed for a given sentence, update the
   // granularity with the phrase boundaries, and calculate phrases for the next
-@@ -306,7 +313,7 @@ class ReadAloudAppModel {
+@@ -344,7 +351,7 @@ class ReadAloudAppModel {
 
   // Whether a phrase calculation for a sentence is currently underway. (We
   // do not initiate a second calculation before the first has completed.)
@@ -399,17 +484,17 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
 --- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
 +++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
-@@ -21,7 +21,9 @@
- #include "base/strings/utf_string_conversions.h"
- #include "chrome/common/read_anything/read_anything_constants.h"
+@@ -31,7 +31,9 @@
+ #include "build/build_config.h"
+ #include "chrome/common/read_anything/read_anything_util.h"
 #include "chrome/renderer/accessibility/ax_tree_distiller.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
 #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
 +#endif
 #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
+ #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h"
 #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"
- #include "components/language/core/common/locale_util.h"
-@@ -1444,6 +1446,7 @@ void ReadAnythingAppController::OnConnected() {
+@@ -1589,6 +1591,7 @@ void ReadAnythingAppController::OnConnected() {
   render_frame()->GetBrowserInterfaceBroker().GetInterface(
       std::move(page_handler_factory_receiver));
 
@@ -417,7 +502,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
   // Get the dependency parser model used by phrase-based highlighting.
   if (read_aloud_model_.GetDependencyParserModel().IsAvailable()) {
     return;
-@@ -1452,6 +1455,7 @@ void ReadAnythingAppController::OnConnected() {
+@@ -1597,6 +1600,7 @@ void ReadAnythingAppController::OnConnected() {
   page_handler_->GetDependencyParserModel(
       base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
                      weak_ptr_factory_.GetWeakPtr()));
@@ -425,21 +510,18 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
 }
 
 void ReadAnythingAppController::OnCopy() const {
-@@ -1661,11 +1665,13 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
+@@ -1828,8 +1832,10 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
 }
 
 void ReadAnythingAppController::PreprocessTextForSpeech() {
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
-   const std::set<ui::AXNodeID>* node_ids = model_.selection_node_ids().empty()
-                                                ? &model_.display_node_ids()
-                                                : &model_.selection_node_ids();
   read_aloud_model_.PreprocessTextForSpeech(model_.is_pdf(), model_.IsDocs(),
-                                             node_ids);
+                                             model_.GetCurrentlyVisibleNodes());
 +#endif
 }
 
 void ReadAnythingAppController::MovePositionToNextGranularity() {
-@@ -1843,14 +1849,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
+@@ -2044,14 +2050,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
 
 void ReadAnythingAppController::UpdateDependencyParserModel(
     base::File model_file) {
@@ -471,7 +553,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
 class ReadAnythingAppControllerTest;
 class ReadAnythingAppControllerScreen2xDataCollectionModeTest;
 
-@@ -378,7 +380,9 @@ class ReadAnythingAppController
+@@ -285,7 +287,9 @@ class ReadAnythingAppController
   // available.
   void UpdateDependencyParserModel(base::File model_file);
 
@@ -479,12 +561,12 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
   DependencyParserModel& GetDependencyParserModelForTesting();
 +#endif
 
-   std::unique_ptr<AXTreeDistiller> distiller_;
-   mojo::Remote<read_anything::mojom::UntrustedPageHandlerFactory>
+   // Called when distillation has completed.
+   void OnAXTreeDistilled(const ui::AXTreeID& tree_id,
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -65,7 +65,7 @@ static_library("utility") {
+@@ -64,7 +64,7 @@ static_library("utility") {
     "//printing/buildflags",
     "//services/data_decoder:lib",
     "//services/network:network_service",
@@ -496,7 +578,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -243,13 +243,6 @@ auto RunMirroringService(
+@@ -241,13 +241,6 @@ auto RunMirroringService(
       std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
 }
 
@@ -510,7 +592,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 #endif  // !BUILDFLAG(IS_ANDROID)
 
 #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-@@ -466,7 +459,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
+@@ -464,7 +457,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
 #if !BUILDFLAG(IS_ANDROID)
   services.Add(RunProfileImporter);
   services.Add(RunMirroringService);
@@ -518,10 +600,22 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
   services.Add(RunScreenAIServiceFactory);
 #endif  // !BUILDFLAG(IS_ANDROID)
 
-diff --git a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
--- a/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
-+++ b/components/autofill/core/browser/integrators/autofill_optimization_guide.cc
-@@ -206,6 +206,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
+diff --git a/components/BUILD.gn b/components/BUILD.gn
+--- a/components/BUILD.gn
+++ b/components/BUILD.gn
+@@ -600,7 +600,7 @@ test("components_unittests") {
+       "//components/media_router/common/providers/cast/channel:unit_tests",
+       "//components/page_info:unit_tests",
+       "//components/permissions:unit_tests",
+-      "//components/permissions/prediction_service:unit_tests",
+      # "//components/permissions/prediction_service:unit_tests",
+       "//components/privacy_sandbox:unit_tests",
+       "//components/privacy_sandbox/privacy_sandbox_attestations:unit_tests",
+       "//components/safety_check:unit_tests",
+diff --git a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc
+--- a/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc
+++ b/components/autofill/core/browser/integrators/optimization_guide/autofill_optimization_guide.cc
+@@ -259,6 +259,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
   // If we do not have any optimization types to register, do not do anything.
   if (!optimization_types.empty()) {
     // Register all optimization types that we need based on `form_structure`.
@@ -529,7 +623,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_
     decider_->RegisterOptimizationTypes(
         std::vector<optimization_guide::proto::OptimizationType>(
             std::move(optimization_types).extract()));
-@@ -257,7 +258,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
+@@ -336,7 +337,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
     const AutofillField* field) const {
   // If the field's storable type is `IBAN_VALUE`, check whether IBAN
   // suggestions should be blocked based on `url`.
@@ -538,7 +632,7 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_
     optimization_guide::OptimizationGuideDecision decision =
         decider_->CanApplyOptimization(
             url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED,
-@@ -283,7 +284,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
+@@ -362,7 +363,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
     const CreditCard& card) const {
   if (auto optimization_type =
           GetVcnMerchantOptOutOptimizationTypeForCard(card);
@@ -550,8 +644,8 @@ diff --git a/components/autofill/core/browser/integrators/autofill_optimization_
 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
-@@ -49,7 +49,9 @@
- #include "components/omnibox/browser/autocomplete_input.h"
+@@ -51,7 +51,9 @@
+ #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
@@ -560,7 +654,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 #include "components/omnibox/browser/autocomplete_scoring_signals_annotator.h"
 #include "components/omnibox/browser/bookmark_provider.h"
 #include "components/omnibox/browser/bookmark_scoring_signals_annotator.h"
-@@ -119,6 +121,7 @@ using ProviderType = AutocompleteProvider::Type;
+@@ -125,6 +127,7 @@ using ProviderType = AutocompleteProvider::Type;
 
 constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
 
@@ -568,7 +662,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 void RecordMlScoreCoverage(size_t matches_with_non_null_scores,
                            size_t total_scored_matches) {
   int percent_score_coverage =
-@@ -227,6 +230,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
+@@ -233,6 +236,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
   base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches",
                                num_scored);
 }
@@ -576,10 +670,30 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 
 // Appends available autocompletion of the given type, subtype, and number to
 // the existing available autocompletions string, encoding according to the
+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
+@@ -99,14 +99,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
+ bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) {
+   // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
+   //   non-debugging purposes.
+-  return match.GetAdditionalInfoForDebugging(kShouldPrefetchKey) == kTrue;
+  return false;
+ }
+ 
+ // static
+ bool BaseSearchProvider::ShouldPrerender(const AutocompleteMatch& match) {
+   // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
+   //   non-debugging purposes.
+-  return match.GetAdditionalInfoForDebugging(kShouldPrerenderKey) == kTrue;
+  return false;
+ }
+ 
+ // static
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -196,6 +196,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -202,6 +202,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
     bool skip_cache,
     HintsFetchedCallback hints_fetched_callback,
     std::optional<proto::RequestContextMetadata> request_context_metadata) {
@@ -590,7 +704,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -391,6 +391,7 @@ void HintsManager::Shutdown() {
+@@ -397,6 +397,7 @@ void HintsManager::Shutdown() {
 OptimizationGuideDecision
 HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
     OptimizationTypeDecision optimization_type_decision) {
@@ -598,15 +712,15 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
   switch (optimization_type_decision) {
     case OptimizationTypeDecision::kAllowedByOptimizationFilter:
     case OptimizationTypeDecision::kAllowedByHint:
-@@ -1100,6 +1101,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1106,6 +1107,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
     OnDemandOptimizationGuideDecisionRepeatingCallback callback,
     std::optional<proto::RequestContextMetadata> request_context_metadata) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 +  if ((true)) return; // no consent on bromite
- 
-   InsertionOrderedSet<GURL> urls_to_fetch;
-   InsertionOrderedSet<std::string> hosts_to_fetch;
-@@ -1403,6 +1405,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+   if (!on_demand_hints_for_testing_.empty()) {
+     for (const GURL& url : urls) {
+       const auto& all_hints = on_demand_hints_for_testing_[url];
+@@ -1425,6 +1427,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
     bool skip_cache,
     OptimizationMetadata* optimization_metadata) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -631,7 +745,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 
 }  // namespace
 
-@@ -450,8 +446,7 @@ size_t MaxURLKeyedHintCacheSize() {
+@@ -460,8 +456,7 @@ size_t MaxURLKeyedHintCacheSize() {
 }
 
 bool ShouldPersistHintsToDisk() {
@@ -641,7 +755,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 }
 
 RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
-@@ -897,5 +892,13 @@ bool IsPrivacyGuideAiSettingsEnabled() {
+@@ -904,5 +899,13 @@ bool IsPrivacyGuideAiSettingsEnabled() {
   return base::FeatureList::IsEnabled(kPrivacyGuideAiSettings);
 }
 
@@ -660,7 +774,7 @@ diff --git a/components/optimization_guide/core/prediction_model_download_manage
 +++ b/components/optimization_guide/core/prediction_model_download_manager.cc
@@ -46,7 +46,7 @@ namespace {
 // we require models to come from.
- constexpr uint8_t kPublisherKeyHash[] = {
+ constexpr std::array<uint8_t, crypto::hash::kSha256Size> kPublisherKeyHash = {
     0x66, 0xa1, 0xd9, 0x3e, 0x4e, 0x5a, 0x66, 0x8a, 0x0f, 0xd3, 0xfa,
 -    0xa3, 0x70, 0x71, 0x42, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
 +    0x01, 0x02, 0x03, 0x04, 0x16, 0x0d, 0x2d, 0x68, 0xb0, 0x53, 0x02,
@@ -706,7 +820,7 @@ diff --git a/components/optimization_guide/core/prediction_model_fetcher_impl.cc
 diff --git a/components/optimization_guide/features.gni b/components/optimization_guide/features.gni
 --- a/components/optimization_guide/features.gni
 +++ b/components/optimization_guide/features.gni
-@@ -11,8 +11,7 @@ declare_args() {
+@@ -12,8 +12,7 @@ declare_args() {
   # This enables build with TFLite library.
   # TODO(b/269198471): Make sure the internal archive files for opt guide get
   #   updated when win arm64 gets added as a supported platform for TFLite.
@@ -719,8 +833,8 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
 --- a/components/page_content_annotations/core/page_content_annotations_features.cc
 +++ b/components/page_content_annotations/core/page_content_annotations_features.cc
-@@ -255,4 +255,8 @@ size_t MaxRelatedSearchesCacheSize() {
-       "max_related_searches_cache_size", 10);
+@@ -302,4 +302,8 @@ bool ShouldIncludeHiddenButSearchableContent() {
+   return kIncludeHiddenButSearchableContent.Get();
 }
 
 +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
@@ -739,25 +853,52 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_m
   if (page_visibility_model_handler_)
     return;
 
+diff --git a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn
+--- a/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn
+++ b/components/safe_browsing/content/browser/notification_content_detection/BUILD.gn
+@@ -27,6 +27,13 @@ source_set("notification_content_detection") {
+   ]
+ }
+ 
+source_set("constants") {
+  sources = [
+    "notification_content_detection_constants.cc",
+    "notification_content_detection_constants.h",
+  ]
+}
+
+ source_set("test_utils") {
+   testonly = true
+   sources = [
 diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
 --- a/components/safe_browsing/core/common/features.cc
 +++ b/components/safe_browsing/core/common/features.cc
-@@ -234,6 +234,7 @@ BASE_FEATURE(kLocalListsUseSBv5,
+@@ -268,6 +268,7 @@ constexpr base::FeatureParam<std::string>
 BASE_FEATURE(kOnDeviceNotificationContentDetectionModel,
              "OnDeviceNotificationContentDetectionModel",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
 +SET_CROMITE_FEATURE_DISABLED(kOnDeviceNotificationContentDetectionModel);
 
- constexpr base::FeatureParam<int>
-     kOnDeviceNotificationContentDetectionModelAllowlistSamplingRate{
+ BASE_FEATURE(kNotificationTelemetry,
+              "NotificationTelemetry",
+diff --git a/content/browser/service_worker/service_worker_main_resource_loader.cc b/content/browser/service_worker/service_worker_main_resource_loader.cc
+--- a/content/browser/service_worker/service_worker_main_resource_loader.cc
+++ b/content/browser/service_worker/service_worker_main_resource_loader.cc
+@@ -516,6 +516,7 @@ bool ServiceWorkerMainResourceLoader::MaybeStartAutoPreload(
+ bool ServiceWorkerMainResourceLoader::StartRaceNetworkRequest(
+     scoped_refptr<ServiceWorkerContextWrapper> context,
+     scoped_refptr<ServiceWorkerVersion> version) {
+  if ((true)) return false;
+   // Set fetch_handler_bypass_option to tell the renderer that
+   // RaceNetworkRequest is enabled.
+   version->set_fetch_handler_bypass_option(
 diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kBookmarkTriggerForPrerender2);
 +SET_CROMITE_FEATURE_DISABLED(kNewTabPageTriggerForPrerender2);
-+SET_CROMITE_FEATURE_DISABLED(kSupportSearchSuggestionForPrerender2);
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -778,6 +919,12 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceNotificationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceGeolocationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2);
+diff --git a/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
+new file mode 100644
+--- /dev/null
+++ b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
+@@ -0,0 +1 @@
+SET_CROMITE_FEATURE_DISABLED(kHttpCacheNoVarySearch);
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -794,19 +941,19 @@ new file mode 100644
 diff --git a/services/webnn/features.gni b/services/webnn/features.gni
 --- a/services/webnn/features.gni
 +++ b/services/webnn/features.gni
-@@ -5,7 +5,7 @@
- import("//build/config/features.gni")
+@@ -9,7 +9,7 @@ assert(use_blink)
 
 declare_args() {
-  webnn_use_tflite = is_android || is_chromeos || is_linux || is_win
-+  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_win
+   # TFLite is used as a fallback option on Apple and Windows.
+-  webnn_use_tflite = is_android || is_chromeos || is_linux || is_apple || is_win
+  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_apple || is_win
 
-   # Enable logging of TFLite profiling information on MLGraph destruction.
-   webnn_enable_tflite_profiler = false
+   # Enable the GPU delegate provided by the Optimization Guide library.
+   webnn_use_chrome_ml_api = enable_ml_internal
 diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
 --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc
 +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
-@@ -1764,6 +1764,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
+@@ -1798,6 +1798,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
 }
 
 bool HTMLDocumentParser::ShouldSkipPreloadScan() {
@@ -817,18 +964,18 @@ diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
-@@ -641,6 +641,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
+@@ -642,6 +642,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
     return;
   }
 
 +  if ((true)) return;
   HeapVector<Member<SpeculationCandidate>> candidates;
-   auto push_candidates = [&candidates, &document](
+   auto push_candidates = [&candidates, &document, this](
                              mojom::blink::SpeculationAction action,
 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
-@@ -3388,7 +3388,7 @@
+@@ -3734,7 +3734,7 @@
       //
       // It also has some feature params defined throughout the codebase.
       name: "Prerender2",
@@ -9,15 +9,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../views/profiles/profile_picker_feature_promo_controller.cc  | 1 +
 .../user_education/impl/browser_feature_promo_controller_20.cc | 1 +
 .../chrome/browser/user_education/UserEducationHelper.java     | 1 +
+ .../browser/user_education/user_education_service_factory.cc   | 1 +
 .../common/feature_promo/feature_promo_registry.cc             | 2 ++
 .../common/feature_promo/impl/feature_promo_controller_20.cc   | 1 +
 .../common/feature_promo/impl/feature_promo_controller_25.cc   | 3 ++-
- 8 files changed, 10 insertions(+), 2 deletions(-)
+ 9 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1465,6 +1465,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1699,6 +1699,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
     }
 
     private boolean maybeShowPromo(Profile profile) {
@@ -28,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
-@@ -151,7 +151,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -167,7 +167,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                 false);
@@ -40,29 +41,29 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
 --- a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
 +++ b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
-@@ -38,6 +38,7 @@ ui::ElementContext ProfilePickerFeaturePromoController::GetAnchorContext()
- 
- bool ProfilePickerFeaturePromoController::CanShowPromoForElement(
+@@ -40,6 +40,7 @@ ui::ElementContext ProfilePickerFeaturePromoController::GetAnchorContext()
+ user_education::FeaturePromoResult
+ ProfilePickerFeaturePromoController::CanShowPromoForElement(
     ui::TrackedElement* anchor_element) const {
-+  if ((true)) return false;
-   return ProfilePicker::IsOpen();
- }
- 
+  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
+   return ProfilePicker::IsOpen()
+              ? user_education::FeaturePromoResult::Success()
+              : user_education::FeaturePromoResult::kBlockedByUi;
 diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 --- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 +++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
-@@ -59,6 +59,7 @@ ui::ElementContext BrowserFeaturePromoController20::GetAnchorContext() const {
- 
- bool BrowserFeaturePromoController20::CanShowPromoForElement(
+@@ -63,6 +63,7 @@ ui::ElementContext BrowserFeaturePromoController20::GetAnchorContext() const {
+ user_education::FeaturePromoResult
+ BrowserFeaturePromoController20::CanShowPromoForElement(
     ui::TrackedElement* anchor_element) const {
-+  if ((true)) return false;
+  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
   // Trying to show an IPH while the browser is closing can cause problems;
-   // see crbug.com/346461762 for an example. This can also crash unit_tests that
-   // use a BrowserWindow but not a browser, so also check if the browser view's
+   // see https://crbug.com/346461762 for an example. This can also crash
+   // unit_tests that use a BrowserWindow but not a browser, so also check if
 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
-@@ -117,6 +117,7 @@ public class UserEducationHelper {
+@@ -119,6 +119,7 @@ public class UserEducationHelper {
     }
 
     private void showIph(Tracker tracker, IphCommand iphCommand) {
@@ -70,6 +71,17 @@ diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/
         // Activity was destroyed; don't show IPH.
         View anchorView = iphCommand.anchorView;
         if (mActivity == null
+diff --git a/chrome/browser/user_education/user_education_service_factory.cc b/chrome/browser/user_education/user_education_service_factory.cc
+--- a/chrome/browser/user_education/user_education_service_factory.cc
+++ b/chrome/browser/user_education/user_education_service_factory.cc
+@@ -109,6 +109,7 @@ UserEducationServiceFactory::BuildServiceInstanceForBrowserContextImpl(
+ 
+ // static
+ bool UserEducationServiceFactory::ProfileAllowsUserEducation(Profile* profile) {
+  if ((true)) return false;
+ #if BUILDFLAG(CHROME_FOR_TESTING)
+   // IPH is always disabled in Chrome for Testing.
+   return false;
 diff --git a/components/user_education/common/feature_promo/feature_promo_registry.cc b/components/user_education/common/feature_promo/feature_promo_registry.cc
 --- a/components/user_education/common/feature_promo/feature_promo_registry.cc
 +++ b/components/user_education/common/feature_promo/feature_promo_registry.cc
@@ -92,7 +104,7 @@ diff --git a/components/user_education/common/feature_promo/feature_promo_regist
 diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
 --- a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
 +++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
-@@ -99,6 +99,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
+@@ -100,6 +100,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
     const FeaturePromoParams& params,
     ShowSource source,
     CanShowPromoOutputs* outputs) const {
@@ -103,15 +115,15 @@ diff --git a/components/user_education/common/feature_promo/impl/feature_promo_c
 diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
 --- a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
 +++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
-@@ -172,6 +172,7 @@ FeaturePromoController25::~FeaturePromoController25() {
+@@ -189,6 +189,7 @@ FeaturePromoController25::~FeaturePromoController25() {
 
 FeaturePromoResult FeaturePromoController25::CanShowPromo(
     const FeaturePromoParams& params) const {
 +  if ((true)) return FeaturePromoResult::kBlockedByContext;
   auto* const spec = registry()->GetParamsForFeature(*params.feature);
-   return spec ? private_->queues.CanShow(*spec, params)
-               : FeaturePromoResult::kError;
-@@ -184,7 +185,7 @@ void FeaturePromoController25::MaybeShowStartupPromo(
+   if (!spec) {
+     return FeaturePromoResult::kError;
+@@ -209,7 +210,7 @@ void FeaturePromoController25::MaybeShowStartupPromo(
 
 void FeaturePromoController25::MaybeShowPromo(FeaturePromoParams params) {
   auto* const spec = registry()->GetParamsForFeature(*params.feature);
@@ -26,8 +26,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../origin_trials/features.cc                 |   1 +
 .../render_view_context_menu_base.cc          |   3 -
 .../aggregatable_report_sender.cc             |  15 +-
- .../attribution_data_host_manager_impl.cc     |   2 +
- .../attribution_reporting/attribution_host.cc |   1 +
+ .../attribution_data_host_manager_impl.cc     |   8 +-
+ .../attribution_reporting/attribution_host.cc |   3 +-
+ .../attribution_manager_impl.cc               |   4 -
 .../attribution_os_level_manager.cc           |   3 +-
 .../attribution_report_network_sender.cc      |   9 +
 .../attribution_storage_sql.cc                |   8 +-
@@ -37,22 +38,23 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/AttributionOsLevelManager.java    | 349 +-----------------
 .../public/browser/content_browser_client.cc  |   7 +-
 .../public/browser/navigation_controller.cc   |   1 -
- .../Disable-conversion-measurement-api.inc    |   1 +
+ .../Disable-conversion-measurement-api.inc    |   2 +
 .../Disable-conversion-measurement-api.inc    |   8 +
 .../attribution/request_headers_internal.cc   |   1 +
- services/network/network_context.cc           |   2 +
+ services/network/network_context.cc           |  24 +-
 .../network/public/cpp/attribution_utils.cc   |   2 +
+ .../core/frame/attribution_src_loader.cc      |   2 -
 third_party/blink/renderer/core/page/page.cc  |   2 +-
- .../platform/runtime_enabled_features.json5   |  14 +-
+ .../platform/runtime_enabled_features.json5   |  20 +-
 ui/events/android/motion_event_android.cc     |   8 +-
- 34 files changed, 96 insertions(+), 395 deletions(-)
+ 36 files changed, 104 insertions(+), 430 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
-@@ -1298,6 +1298,7 @@ network::mojom::AttributionSupport
+@@ -1339,6 +1339,7 @@ network::mojom::AttributionSupport
 AwContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
     bool client_os_disabled) {
@@ -60,7 +62,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
   // WebView only supports OS-level attribution and not web-attribution.
   switch (state) {
     case AttributionReportingOsApiState::kDisabled:
-@@ -1316,6 +1317,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1357,6 +1358,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -83,7 +85,7 @@ diff --git a/android_webview/browser/component_updater/trust_token_key_commitmen
 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
-@@ -172,7 +172,7 @@ public class AwSettings {
+@@ -171,7 +171,7 @@ public class AwSettings {
     private boolean mSpatialNavigationEnabled; // Default depends on device features.
     private boolean mEnableSupportedHardwareAcceleratedFeatures;
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
@@ -92,7 +94,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
 
     @SpeculativeLoadingAllowedFlags
     private int mSpeculativeLoadingAllowedFlags =
-@@ -1778,7 +1778,7 @@ public class AwSettings {
+@@ -1789,7 +1789,7 @@ public class AwSettings {
     public void setAttributionBehavior(@AttributionBehavior int behavior) {
         synchronized (mAwSettingsLock) {
             if (mAttributionBehavior != behavior) {
@@ -112,7 +114,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"/>
     <!--
-@@ -1135,9 +1134,6 @@ by a child template that "extends" this file.
+@@ -1169,9 +1168,6 @@ by a child template that "extends" this file.
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
         </activity>
 
@@ -125,7 +127,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
-@@ -152,6 +152,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -149,6 +149,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
                 // not great to dynamically remove the preference in this way.
             case SiteSettingsCategory.Type.ADS:
                 return SiteSettingsCategory.adsCategoryEnabled();
@@ -149,7 +151,7 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.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
-@@ -635,11 +635,6 @@
+@@ -592,11 +592,6 @@
           </category-setting-exceptions>
         </settings-subpage>
       </template>
@@ -170,9 +172,9 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
   // </if>
 -  r.SITE_SETTINGS_AUTO_VERIFY = r.SITE_SETTINGS.createChild('autoVerify');
 +  // r.SITE_SETTINGS_AUTO_VERIFY = r.SITE_SETTINGS.createChild('autoVerify');
-   if (!loadTimeData.getBoolean('enableAiSettingsPageRefresh') &&
-       loadTimeData.getBoolean('enableComposeProactiveNudge')) {
-     r.OFFER_WRITING_HELP = r.SITE_SETTINGS.createChild('offerWritingHelp');
+   r.SITE_SETTINGS_BACKGROUND_SYNC =
+       r.SITE_SETTINGS.createChild('backgroundSync');
+   r.SITE_SETTINGS_CAMERA = r.SITE_SETTINGS.createChild('camera');
 diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
 +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -199,8 +201,8 @@ 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
-@@ -17,4 +17,5 @@ BASE_FEATURE(kAttributionAggregatableNamedBudgets,
-              "AttributionAggregatableNamedBudgets",
+@@ -13,4 +13,5 @@ BASE_FEATURE(kConversionMeasurement,
+              "ConversionMeasurement",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +SET_CROMITE_FEATURE_DISABLED(kConversionMeasurement);
@@ -208,7 +210,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -689,7 +689,7 @@ void ContentSettingsRegistry::Init() {
+@@ -683,7 +683,7 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
@@ -242,7 +244,7 @@ diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b
 diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b/content/browser/aggregation_service/aggregatable_report_sender.cc
 --- a/content/browser/aggregation_service/aggregatable_report_sender.cc
 +++ b/content/browser/aggregation_service/aggregatable_report_sender.cc
-@@ -179,20 +179,19 @@ void AggregatableReportSender::SendReport(const GURL& url,
+@@ -192,13 +192,8 @@ void AggregatableReportSender::SendReport(GURL url,
   // Allow bodies of non-2xx responses to be returned.
   simple_url_loader_ptr->SetAllowHttpErrorResults(true);
 
@@ -252,15 +254,16 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 -      url_loader_factory_.get(),
 -      base::BindOnce(&AggregatableReportSender::OnReportSent,
 -                     base::Unretained(this), std::move(it), std::move(callback),
-                     delay_type));
+-                     delay_type, std::move(serialized_url)));
 +  // this is never called on Bromite but nothing would be sent if it were
-+  OnReportSent(std::move(it), std::move(callback), delay_type, nullptr);
+  OnReportSent(std::move(it), std::move(callback), delay_type, std::move(serialized_url), nullptr);
 }
 
 void AggregatableReportSender::OnReportSent(
-     UrlLoaderList::iterator it,
+@@ -206,7 +201,11 @@ void AggregatableReportSender::OnReportSent(
     ReportSentCallback callback,
     std::optional<DelayType> delay_type,
+     std::string serialized_url,
 -    scoped_refptr<net::HttpResponseHeaders> headers) {
 +    scoped_refptr<net::HttpResponseHeaders> headers) { // disable in Bromite
 +  if ((true)) {
@@ -273,7 +276,21 @@ 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
-@@ -1151,6 +1151,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -806,11 +806,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
+         headers->GetNormalizedHeader(
+             attribution_reporting::kAttributionReportingRegisterTriggerHeader);
+ 
+-    std::optional<std::string> os_source_header = headers->GetNormalizedHeader(
+-        attribution_reporting::kAttributionReportingRegisterOsSourceHeader);
+    std::optional<std::string> os_source_header;
+ 
+-    std::optional<std::string> os_trigger_header = headers->GetNormalizedHeader(
+-        attribution_reporting::kAttributionReportingRegisterOsTriggerHeader);
+    std::optional<std::string> os_trigger_header;
+ 
+     const bool has_source =
+         web_source_header.has_value() || os_source_header.has_value();
+@@ -1169,6 +1167,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
     Registrations& registrations,
     HeaderPendingDecode pending_decode,
     Registrar registrar) {
@@ -285,7 +302,16 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager
 diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
 --- a/content/browser/attribution_reporting/attribution_host.cc
 +++ b/content/browser/attribution_reporting/attribution_host.cc
-@@ -315,6 +315,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -132,8 +132,6 @@ AttributionHost::AttributionHost(WebContents* web_contents)
+       attribution_reporting::features::kConversionMeasurement));
+ 
+ #if BUILDFLAG(IS_ANDROID)
+-  input_event_tracker_android_ =
+-      std::make_unique<AttributionInputEventTrackerAndroid>(web_contents);
+ #endif
+ }
+ 
+@@ -347,6 +345,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
     return;
   }
 
@@ -293,6 +319,21 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
   auto* attribution_manager =
       AttributionManager::FromWebContents(web_contents());
   DCHECK(attribution_manager);
+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
+@@ -593,11 +593,7 @@ bool IsOperationAllowed(
+ }
+ 
+ std::unique_ptr<AttributionOsLevelManager> CreateOsLevelManager() {
+-#if BUILDFLAG(IS_ANDROID)
+-  return std::make_unique<AttributionOsLevelManagerAndroid>();
+-#else
+   return std::make_unique<NoOpAttributionOsLevelManager>();
+-#endif
+ }
+ 
+ // Returns new report time if any.
 diff --git a/content/browser/attribution_reporting/attribution_os_level_manager.cc b/content/browser/attribution_reporting/attribution_os_level_manager.cc
 --- a/content/browser/attribution_reporting/attribution_os_level_manager.cc
 +++ b/content/browser/attribution_reporting/attribution_os_level_manager.cc
@@ -316,7 +357,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
-@@ -173,6 +173,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
+@@ -159,6 +159,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
                                                 url::Origin origin,
                                                 std::string body,
                                                 UrlLoaderCallback callback) {
@@ -326,7 +367,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;
-@@ -248,6 +251,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -234,6 +237,12 @@ void AttributionReportNetworkSender::OnReportSent(
     ReportSentCallback sent_callback,
     UrlLoaderList::iterator it,
     scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -338,11 +379,11 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 +  }
   network::SimpleURLLoader* loader = it->get();
 
-   // Consider a non-200 HTTP code as a non-internal error.
+   const int net_error = loader->NetError();
 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
-@@ -532,6 +532,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -541,6 +541,8 @@ void AssignSourceForDeactivationOrDeletion(
   }
 }
 
@@ -351,7 +392,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 }  // namespace
 
 // static
-@@ -554,9 +556,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -563,9 +565,9 @@ bool AttributionStorageSql::Transaction::Commit() {
 AttributionStorageSql::AttributionStorageSql(
     const base::FilePath& user_data_directory,
     AttributionResolverDelegate* delegate)
@@ -361,13 +402,13 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 +    : path_to_database_(user_data_directory.empty() || g_run_in_memory
 +                             ? base::FilePath()
 +                             : DatabasePath(user_data_directory)),
-       db_(sql::DatabaseOptions{.page_size = 4096, .cache_size = 32},
+       db_(sql::DatabaseOptions().set_cache_size(32),
           /*tag=*/"Conversions"),
       delegate_(delegate),
 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
-@@ -9888,6 +9888,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
+@@ -10374,6 +10374,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
     return false;
   }
 
@@ -375,14 +416,14 @@ 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.
-@@ -13641,6 +13642,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
+@@ -14256,6 +14257,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
     return;
   }
 
 +  // flags are enforced in benign renderers by the
 +  // RuntimeEnabled=PrivateStateTokens IDL attribute (the base::Feature's value
 +  // is tied to the RuntimeEnabledFeature's).
-+  if ((false)) {
+  if ((true)) {
 +    mojo::ReportBadMessage(
 +        "Attempted to get a TrustTokenQueryAnswerer with Private State Tokens "
 +        "disabled.");
@@ -395,7 +436,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(
+@@ -1469,15 +1469,6 @@ void StoragePartitionImpl::Initialize(
 
   bucket_manager_ = std::make_unique<BucketManager>(this);
 
@@ -408,10 +449,10 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 -        this, path, special_storage_policy_);
 -  }
 -
-   if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+   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(
+@@ -1529,9 +1520,6 @@ void StoragePartitionImpl::Initialize(
 
   font_access_manager_ = FontAccessManager::Create();
 
@@ -424,7 +465,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
-@@ -197,8 +197,6 @@ android_library("content_full_java") {
+@@ -202,8 +202,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",
@@ -615,7 +656,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -                        onRegistrationCompleted(requestId, type, convertToOperationResult(thrown));
 -                    }
 -                },
-                ContextUtils.getApplicationContext().getMainExecutor());
+-                PostTask.getUiBestEffortExecutor());
 -    }
 -
     @CalledByNative
@@ -828,7 +869,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -                                    originUris));
 -
 -            Futures.addCallback(
-                    future, callback, ContextUtils.getApplicationContext().getMainExecutor());
+-                    future, callback, PostTask.getUiUserVisibleExecutor());
 -        }
 +        onDataDeletionCompleted(requestId);
     }
@@ -891,14 +932,14 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 -                                /* status= */ 0, convertToOperationResult(thrown));
 -                    }
 -                },
-                ContextUtils.getApplicationContext().getMainExecutor());
+-                PostTask.getUiUserBlockingExecutor());
     }
 
     @CalledByNative
 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
-@@ -586,6 +586,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -622,6 +622,7 @@ void ContentBrowserClient::OnAuctionComplete(
 network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
     bool client_os_disabled) {
@@ -906,7 +947,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;
-@@ -603,13 +604,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -639,13 +640,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -922,7 +963,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
 }
 
 bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -617,7 +618,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -653,7 +654,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
     content::RenderFrameHost* rfh,
     const url::Origin& context_origin,
     const url::Origin& reporting_origin) {
@@ -946,21 +987,22 @@ diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-conve
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kAttributionReportingCrossAppWeb);
+@@ -0,0 +1,2 @@
+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
@@ -0,0 +1,8 @@
 +SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
-+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsDocumentAPI);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsParameters);
 +SET_CROMITE_FEATURE_DISABLED(kFledge);
 +SET_CROMITE_FEATURE_DISABLED(kFledgeBiddingAndAuctionServer);
-+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 +SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
+SET_CROMITE_FEATURE_DISABLED(kAllowURNsInIframes);
+SET_CROMITE_FEATURE_DISABLED(kFledgeSampleDebugReports);
 diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc
 --- a/services/network/attribution/request_headers_internal.cc
 +++ b/services/network/attribution/request_headers_internal.cc
@@ -975,19 +1017,41 @@ 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
-@@ -2647,6 +2647,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
-     builder.SetCookieStore(std::move(cookie_store));
-   }
+@@ -1300,6 +1300,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
 
-+  if ((false)) {
-     trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
- 
-     base::FilePath trust_token_path;
-@@ -2667,6 +2668,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
-           std::make_unique<ExpiryInspectingRecordExpiryDelegate>(
-               network_service()->trust_token_key_commitments())));
-     }
+ void NetworkContext::ClearTrustTokenSessionOnlyData(
+     ClearTrustTokenSessionOnlyDataCallback callback) {
+  if (!trust_token_store_) {
+    std::move(callback).Run(false);
+    return;
 +  }
+   // Only called when Private State Tokens is enabled, i.e.,
+   // `trust_token_store_` is non-null.
+   DCHECK(trust_token_store_);
+@@ -2688,26 +2692,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+     builder.set_network_quality_estimator(
+         network_service_->network_quality_estimator());
+   }
+-  trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
+-
+-  base::FilePath trust_token_path;
+-  if (GetFullDataFilePath(
+-          params_->file_paths,
+-          &network::mojom::NetworkContextFilePaths::trust_token_database_name,
+-          trust_token_path)) {
+-    SQLiteTrustTokenPersister::CreateForFilePath(
+-        base::ThreadPool::CreateSequencedTaskRunner(
+-            {base::MayBlock(), kTrustTokenDatabaseTaskPriority,
+-             base::TaskShutdownBehavior::BLOCK_SHUTDOWN}),
+-        trust_token_path, kTrustTokenWriteBufferingWindow,
+-        base::BindOnce(&NetworkContext::FinishConstructingTrustTokenStore,
+-                       weak_factory_.GetWeakPtr()));
+-  } else {
+-    trust_token_store_->OnStoreReady(std::make_unique<TrustTokenStore>(
+-        std::make_unique<InMemoryTrustTokenPersister>(),
+-        std::make_unique<ExpiryInspectingRecordExpiryDelegate>(
+-            network_service()->trust_token_key_commitments())));
+-  }
 
   std::unique_ptr<net::StaticHttpUserAgentSettings> user_agent_settings =
       std::make_unique<net::StaticHttpUserAgentSettings>(
@@ -1010,10 +1074,22 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
   switch (attribution_support) {
     case mojom::AttributionSupport::kWeb:
     case mojom::AttributionSupport::kWebAndOs:
+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 {
+                      uint64_t request_id)
+       : web_source(map.Get(http_names::kAttributionReportingRegisterSource)),
+         web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
+-        os_source(map.Get(http_names::kAttributionReportingRegisterOSSource)),
+-        os_trigger(map.Get(http_names::kAttributionReportingRegisterOSTrigger)),
+         request_url(request_url),
+         request_id(request_id) {}
+ 
 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
-@@ -1574,7 +1574,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1630,7 +1630,7 @@ void Page::UpdateBrowsingContextGroup(
 
 void Page::SetAttributionSupport(
     network::mojom::AttributionSupport attribution_support) {
@@ -1025,34 +1101,29 @@ 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
-@@ -281,7 +281,7 @@
+@@ -285,8 +285,8 @@
+     },
     {
       // Interest Group JS API/runtimeflag.
-       name: "AdInterestGroupAPI",
+-      name: "AdInterestGroupAPI",
 -      status: "stable",
-+      status: "experimental",
+      name: "AdInterestGroupAPI", // keep disabled
+      status: "experimental",     // keep disabled
       origin_trial_feature_name: "AdInterestGroupAPI",
       implied_by: ["Fledge", "Parakeet"],
       public: true,
-@@ -444,15 +444,15 @@
+@@ -541,8 +541,8 @@
+       name: "AtomicMoveRangePreservation",
     },
     {
-       name: "AttributionReporting",
+-      name: "AttributionReporting",
 -      status: "stable",
-+      status: "experimental",
+      name: "AttributionReporting", // keep disabled
+      status: "experimental",       // keep disabled
       base_feature: "none",
       public: true,
     },
-     {
-       name: "AttributionReportingCrossAppWeb",
-+      status: "experimental",
-       base_feature: "none",
-       public: true,
-      status: "stable",
-     },
-     {
-       // This only exists so we can use RuntimeEnabled in the IDL file
-@@ -3425,8 +3425,8 @@
+@@ -3781,8 +3781,8 @@
       base_feature: "none",
     },
     {
@@ -1063,18 +1134,21 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       base_feature: "none",
       public: true,
     },
-@@ -4314,15 +4314,15 @@
+@@ -4901,16 +4901,16 @@
+       status: "experimental",
     },
     {
-       name: "TopicsAPI",
-+      status: "experimental",
+-      name: "TopicsAPI",
+      name: "TopicsAPI",       // keep disabled
+      status: "experimental",  // keep disabled
       base_feature: "none",
       public: true,
 -      status: "stable",
     },
     {
-       name: "TopicsDocumentAPI",
-+      status: "experimental",
+-      name: "TopicsDocumentAPI",
+      name: "TopicsDocumentAPI", // keep disabled
+      status: "experimental",    // keep disabled
       base_feature: "none",
       public: true,
 -      status: "stable",
@@ -1084,7 +1158,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motion_event_android.cc
 --- a/ui/events/android/motion_event_android.cc
 +++ b/ui/events/android/motion_event_android.cc
-@@ -390,8 +390,12 @@ MotionEventAndroid::ToolType MotionEventAndroid::FromAndroidToolType(
+@@ -365,8 +365,12 @@ MotionEventAndroid::ToolType MotionEventAndroid::FromAndroidToolType(
 #undef TOOL_TYPE_CASE
 
 base::TimeTicks MotionEventAndroid::FromAndroidTime(base::TimeTicks time) {
@@ -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
-@@ -2710,15 +2710,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2644,15 +2644,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
         base::NumberToString(pid));
   }
 #endif
@@ -27,11 +27,11 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 -  command_line->AppendSwitchASCII(switches::kEnableCrashReporter, switch_value);
 #endif
 
-   if (logging::DialogsAreSuppressed())
+   if (logging::DialogsAreSuppressed()) {
 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
-@@ -15206,6 +15206,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -15869,6 +15869,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
-@@ -9715,7 +9715,7 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -10221,7 +10221,7 @@ void WebContentsImpl::RendererUnresponsive(
   base::UmaHistogramEnumeration(
       "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
 
@@ -54,7 +54,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 --- a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 +++ b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
-@@ -84,7 +84,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
+@@ -107,7 +107,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
     return;
   }
   ExecutionContext* execution_context = ToExecutionContext(script_state);
--- a/Show More
+++ b/Show More