Patches for 134.0.6998.178

[AUTO][FILECONTROL] - version 134.0.6998.108 (#1911 )
[AUTO][FILECONTROL] - version 134.0.6998.108
2025-03-28 09:47:00 +01:00 · 2025-03-19 05:23:22 -03:00 · 2025-03-19 05:21:30 -03:00 · 2025-03-19 08:01:31 +00:00 · 2025-03-19 08:54:01 +01:00 · 2025-03-19 03:02:08 +00:00
391 changed files with 8327 additions and 6220 deletions
@@ -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 $?)
@@ -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
@@ -1 +1 @@
-133.0.6943.127
+134.0.6998.178
@@ -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
+								}
+							]
+						}
+					}
+				}
+			}
+		]
+	}
+}
@@ -1,4 +1,5 @@
 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
 Fix-chromium-vanilla.patch
@@ -170,7 +171,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 +292,8 @@ 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

 # temporary or wip patches
 Temp-PerformanceNavigationTiming-privacy-fix.patch
@@ -301,9 +303,8 @@ 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

 # adblock patches
 eyeo-beta-118.0.5993.48-base.patch
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3219,6 +3219,10 @@
+@@ -3224,6 +3224,10 @@
     "name": "enable-identity-in-auth-error",
     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
     "expiry_milestone": 135
@@ -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 @@
+@@ -2593,6 +2593,22 @@
         "no_downscaled_overlay_promotion"
       ]
     },
@@ -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,
+@@ -375,6 +378,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,
+@@ -715,6 +716,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
   }
 #endif  // BUILDFLAG(IS_WIN)
 
@@ -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
+@@ -968,6 +969,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         super.onStartWithNative();
 
         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -169,6 +169,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -164,6 +164,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &feed::kFeedPerformanceStudy,
     &feed::kFeedShowSignInCommand,
     &feed::kFeedSignedOutViewDemotion,
@@ -51,15 +51,15 @@ 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 {
- 
+@@ -158,6 +158,7 @@ public abstract class ChromeFeatureList {
     // Feature names.
     /* Alphabetical: */
+     public static final String ACT_USER_BYPASS_UX = "ActUserBypassUx";
 +    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 {
+@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,14 +68,14 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
     public static final CachedFlag sAsyncNotificationManager =
             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
     public static final CachedFlag sBlockIntentsWhileLocked =
-@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {
+@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList {
     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
             List.of(
                     sAndroidAppIntegration,
 +                    sAllowUserCertificates,
                     sAndroidAppIntegrationModule,
                     sAndroidAppIntegrationV2,
-                     sNewTabPageCustomization,
+                     sAndroidAppIntegrationWithFavicon,
 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 {
+@@ -542,6 +542,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,
+@@ -642,6 +644,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);
 +
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -114,6 +114,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
+@@ -123,6 +123,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
              FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_ANDROID)
 
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7587,9 +7587,9 @@
+@@ -7665,9 +7665,9 @@
     "expiry_milestone": 140
   },
   {
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -267,6 +267,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -258,6 +258,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
            raw_ref(features::kPeriodicBackgroundSync)},
           {wf::EnablePushMessagingSubscriptionChange,
            raw_ref(features::kPushSubscriptionChangeEvent)},
@@ -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);
 
@@ -77,7 +77,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
+@@ -81,6 +81,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";
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -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>
@@ -140,9 +140,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 +161,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,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -198,6 +198,8 @@
+@@ -200,6 +200,8 @@
 #include "printing/buildflags/buildflags.h"
 #include "rlz/buildflags/buildflags.h"
 
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
-@@ -1714,6 +1716,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1644,6 +1646,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -217,7 +217,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() {
+@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
     SetValue(proxy_config::prefs::kProxy,
              base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -660,7 +660,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") {
+@@ -222,6 +222,8 @@ static_library("ui") {
     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -682,7 +682,7 @@ 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() {
+@@ -388,4 +391,5 @@ void RegisterChromeWebUIConfigs() {
 #if BUILDFLAG(ENABLE_GLIC)
   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
 #endif
@@ -1150,7 +1150,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -159,6 +159,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";
+@@ -160,6 +160,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";
 inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
 inline constexpr char kChromeUINewTabHost[] = "newtab";
@@ -1316,7 +1316,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()
@@ -98,7 +98,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -633,6 +633,7 @@ chrome_java_resources = [
+@@ -636,6 +636,7 @@ chrome_java_resources = [
   "java/res/xml/main_preferences_legacy.xml",
   "java/res/xml/manage_sync_preferences.xml",
   "java/res/xml/personalize_google_services_preferences.xml",
@@ -117,7 +117,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
   "java/src/org/chromium/chrome/browser/ActivityUtils.java",
-@@ -933,6 +934,7 @@ chrome_java_sources = [
+@@ -946,6 +947,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -170,7 +170,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -97,6 +97,11 @@ found in the LICENSE file.
+@@ -91,6 +91,11 @@ found in the LICENSE file.
         android:key="secure_dns"
         android:title="@string/settings_secure_dns_title"
         android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
@@ -244,7 +244,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -70,6 +70,10 @@ import org.chromium.base.task.TaskTraits;
+@@ -71,6 +71,10 @@ import org.chromium.base.task.TaskTraits;
 import org.chromium.build.annotations.UsedByReflection;
 import org.chromium.cc.input.BrowserControlsState;
 import org.chromium.chrome.R;
@@ -255,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 import org.chromium.chrome.browser.IntentHandler.TabOpenType;
 import org.chromium.chrome.browser.app.ChromeActivity;
 import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;
-@@ -711,14 +715,19 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -715,14 +719,19 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
 
             Profile profile = mTabModelSelector.getCurrentModel().getProfile();
             // For saving non-incognito tab closures for Recent Tabs.
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
             // Defer creation of this helper so it triggers after TabGroupModelFilter observers.
             mUndoRefocusHelper =
                     new UndoRefocusHelper(
-@@ -2550,8 +2559,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -2571,8 +2580,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
 
         // We determine the model as soon as possible so every systems get initialized coherently.
         boolean startIncognito =
@@ -297,7 +297,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
-@@ -93,6 +93,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
+@@ -92,6 +92,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.chrome.browser.device.DeviceClassManager;
@@ -338,7 +338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 /**
  * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
  * items based on activity state.
-@@ -597,6 +603,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -599,6 +605,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
     }
 
     private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -352,7 +352,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
         // We have to iterate all menu items since same menu item ID may be associated with more
         // than one menu items.
         boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
-@@ -660,7 +673,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -662,7 +675,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
             }
 
             if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -369,7 +369,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
             }
             if (item.getItemId() == R.id.menu_select_tabs) {
                 item.setVisible(isMenuSelectTabsVisible);
-@@ -865,8 +886,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -867,8 +888,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                 && !isNativePage
                 && !isFileScheme
                 && !isContentScheme
@@ -392,7 +392,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
 import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
 import org.chromium.chrome.browser.download.DownloadUtils;
-@@ -329,6 +330,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -339,6 +340,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
     public List<Pair<Integer, ModelList>> buildContextMenu() {
         mShowEphemeralTabNewLabel = null;
 
@@ -402,7 +402,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
         List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
 
         if (mParams.isAnchor()) {
-@@ -339,6 +343,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -349,6 +353,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                 if (mMode == ContextMenuMode.NORMAL) {
                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
@@ -410,7 +410,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
                     if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
                         linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
                     }
-@@ -369,7 +374,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -379,7 +384,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                 }
             }
             if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -519,7 +519,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/download/DownloadUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java
-@@ -35,6 +35,7 @@ import org.chromium.base.FileUtils;
+@@ -36,6 +36,7 @@ import org.chromium.base.FileUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
@@ -527,7 +527,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.app.download.home.DownloadActivityLauncher;
-@@ -76,6 +77,10 @@ import org.chromium.url.GURL;
+@@ -78,6 +79,10 @@ import org.chromium.url.GURL;
 
 import java.io.File;
 
@@ -538,7 +538,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 /** A class containing some utility static methods. */
 public class DownloadUtils {
     private static final String TAG = "download";
-@@ -298,7 +303,16 @@ public class DownloadUtils {
+@@ -299,7 +304,16 @@ public class DownloadUtils {
         // Offline pages isn't supported in Incognito. This should be checked before calling
         // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found
         // for incognito profile.
@@ -697,7 +697,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
-@@ -43,6 +43,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint;
+@@ -40,6 +40,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint;
 import org.chromium.components.sync.SyncService;
 import org.chromium.url.GURL;
 
@@ -713,7 +713,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-@@ -111,7 +120,8 @@ public class RecentTabsManager
+@@ -108,7 +117,8 @@ public class RecentTabsManager
             Profile profile,
             Context context,
             Runnable showHistoryManager) {
@@ -723,7 +723,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
         mActiveTab = tab;
         mTabModelSelector = tabModelSelector;
         mShowHistoryManager = showHistoryManager;
-@@ -295,6 +305,22 @@ public class RecentTabsManager
+@@ -291,6 +301,22 @@ public class RecentTabsManager
      */
     public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
         if (mIsDestroyed) return;
@@ -916,7 +916,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
-@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
+@@ -53,6 +53,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
 import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -924,7 +924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation;
-@@ -243,6 +244,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -238,6 +239,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
                             mModalDialogManagerSupplier,
                             SigninAndHistorySyncActivityLauncherImpl.get()));
         }
@@ -937,7 +937,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
-@@ -22,6 +22,8 @@ import java.util.HashMap;
+@@ -29,6 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -946,7 +946,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 /** A tab model observer for managing bulk closures. */
 public class HistoricalTabModelObserver implements TabModelObserver {
     private final TabGroupModelFilter mTabGroupModelFilter;
-@@ -70,9 +72,10 @@ public class HistoricalTabModelObserver implements TabModelObserver {
+@@ -77,9 +79,10 @@ public class HistoricalTabModelObserver implements TabModelObserver {
         if (tabs.isEmpty() || !canRestore) return;
 
         if (tabs.size() == 1) {
@@ -1043,7 +1043,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/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
-@@ -169,6 +169,8 @@ import org.chromium.ui.InsetObserver;
+@@ -180,6 +180,8 @@ import org.chromium.ui.InsetObserver;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.ActivityWindowAndroid;
 import org.chromium.ui.base.DeviceFormFactor;
@@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 import org.chromium.ui.base.IntentRequestTracker;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.dragdrop.DragDropGlobalState;
-@@ -1072,7 +1074,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1078,7 +1080,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                             () -> {
                                 mTabCreatorManagerSupplier
                                         .get()
@@ -1115,7 +1115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
-@@ -820,6 +822,13 @@ public class TabPersistentStore {
+@@ -821,6 +823,13 @@ public class TabPersistentStore {
                 }
             }
         }
@@ -1132,7 +1132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-@@ -43,6 +43,7 @@ import org.chromium.base.supplier.Supplier;
+@@ -44,6 +44,7 @@ import org.chromium.base.supplier.Supplier;
 import org.chromium.cc.input.BrowserControlsState;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
@@ -1140,7 +1140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
 import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -702,7 +703,7 @@ public class ToolbarManager
+@@ -752,7 +753,7 @@ public class ToolbarManager
                                 TraceEvent.end("isOfflinePage");
                                 return ret;
                             }
@@ -1301,8 +1301,8 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
 +#include "build/build_config.h"
 #include "base/no_destructor.h"
 #include "chrome/browser/autocomplete/document_suggestions_service_factory.h"
- #include "chrome/browser/profiles/profile.h"
-@@ -40,9 +41,13 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory()
+ #include "chrome/browser/autocomplete/enterprise_search_aggregator_suggestions_service_factory.h"
+@@ -43,9 +44,13 @@ RemoteSuggestionsServiceFactory::RemoteSuggestionsServiceFactory()
     : ProfileKeyedServiceFactory(
           "RemoteSuggestionsService",
           ProfileSelections::Builder()
@@ -1319,15 +1319,15 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -33,6 +33,7 @@
- #include "base/notreached.h"
+@@ -35,6 +35,7 @@
+ #include "base/numerics/safe_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/uuid.h"
 +#include "chrome/common/pref_names.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/commerce/shopping_service_factory.h"
-@@ -247,6 +248,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
+@@ -215,6 +216,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
   if (!profile)
     return nullptr;
 
@@ -1391,7 +1391,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
 --- a/chrome/browser/history/history_tab_helper.cc
 +++ b/chrome/browser/history/history_tab_helper.cc
-@@ -44,6 +44,9 @@
+@@ -45,6 +45,9 @@
 #include "components/feed/core/v2/public/feed_api.h"      // nogncheck
 #include "components/feed/core/v2/public/feed_service.h"  // nogncheck
 #include "content/public/browser/web_contents.h"
@@ -1401,7 +1401,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
 #else
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
-@@ -489,6 +492,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -492,6 +495,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
 history::HistoryService* HistoryTabHelper::GetHistoryService() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1415,7 +1415,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
   if (profile->IsOffTheRecord())
     return nullptr;
 
-@@ -496,6 +506,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -499,6 +509,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
       profile, ServiceAccessType::IMPLICIT_ACCESS);
 }
 
@@ -1764,7 +1764,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -247,6 +247,7 @@
+@@ -250,6 +250,7 @@
 
 #if BUILDFLAG(IS_ANDROID)
 #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1772,7 +1772,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
 #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
 #include "chrome/browser/android/preferences/browser_prefs_android.h"
-@@ -2177,6 +2178,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
   variations::VariationsService::RegisterProfilePrefs(registry);
   webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1849,16 +1849,16 @@ diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/
 diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
 --- a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
 +++ b/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/browser/ui/native_page/NativePage.java
-@@ -15,6 +15,8 @@ import org.chromium.url.GURL;
+@@ -17,6 +17,8 @@ import org.chromium.url.GURL;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 +import org.chromium.base.ContextUtils;
 +
 /** An interface for pages that will be using Android views instead of html/rendered Web content. */
+ @NullMarked
 public interface NativePage {
- 
-@@ -176,7 +178,8 @@ public interface NativePage {
+@@ -179,7 +181,8 @@ public interface NativePage {
      */
     static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) {
         return url != null
@@ -1868,7 +1868,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
     }
 
     /**
-@@ -186,7 +189,7 @@ public interface NativePage {
+@@ -189,7 +192,7 @@ public interface NativePage {
      *     not have chrome or chrome-native scheme.
      */
     static boolean isChromePageUrl(GURL url, boolean isIncognito) {
@@ -1877,7 +1877,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
     }
 
     /**
-@@ -198,11 +201,12 @@ public interface NativePage {
+@@ -201,11 +204,12 @@ public interface NativePage {
      */
     // TODO(crbug.com/40549331) - Convert to using GURL.
     static @NativePageType int nativePageType(
@@ -1892,17 +1892,17 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
     }
 
     /**
-@@ -213,7 +217,8 @@ public interface NativePage {
-      * @return Type of the native page defined in {@link NativePageType}.
-      */
-     private static @NativePageType int nativePageType(
-            GURL url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload) {
-+            GURL url, NativePage candidatePage, boolean isIncognito, boolean hasPdfDownload,
+@@ -219,7 +223,8 @@ public interface NativePage {
+             GURL url,
+             @Nullable NativePage candidatePage,
+             boolean isIncognito,
+-            boolean hasPdfDownload) {
+            boolean hasPdfDownload,
 +            boolean isAlwaysIncognito) {
         if (hasPdfDownload) {
             // For navigation with associated pdf download (e.g. open a pdf link), pdf page should
             // be created.
-@@ -231,7 +236,7 @@ public interface NativePage {
+@@ -237,7 +242,7 @@ public interface NativePage {
             // created after the pdf document is re-downloaded in other parts of the code.
             return NativePageType.NONE;
         } else {
@@ -1911,16 +1911,16 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
         }
     }
 
-@@ -243,7 +248,7 @@ public interface NativePage {
+@@ -249,7 +254,7 @@ public interface NativePage {
      *     which do not have chrome or chrome-native scheme.
      */
     private static @NativePageType int chromePageType(
-            GURL url, NativePage candidatePage, boolean isIncognito) {
-+            GURL url, NativePage candidatePage, boolean isIncognito, boolean isAlwaysIncognito) {
+-            GURL url, @Nullable NativePage candidatePage, boolean isIncognito) {
+            GURL url, @Nullable NativePage candidatePage, boolean isIncognito, boolean isAlwaysIncognito) {
         String host = url.getHost();
         String scheme = url.getScheme();
         if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme)
-@@ -263,7 +268,8 @@ public interface NativePage {
+@@ -269,7 +274,8 @@ public interface NativePage {
             return NativePageType.DOWNLOADS;
         } else if (UrlConstants.HISTORY_HOST.equals(host)) {
             return NativePageType.HISTORY;
@@ -1933,9 +1933,9 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
 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
-@@ -1419,6 +1419,31 @@ Your Google account may have other forms of browsing history like searches and a
-       <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
-         Deletes history from all synced devices
+@@ -6460,6 +6460,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+       <message name="IDS_QUICK_DELETE_DIALOG_COOKIES_CACHE_AND_OTHER_SITE_DATA_TEXT" desc="Text indicating that browsing data like cookies, cache, and other site data would be deleted.">
+         Cookies, cache, and other site data
       </message>
 +      <!-- always incognito -->
 +      <message name="IDS_INCOGNITO_SETTINGS_TITLE" desc="Title for incognito mode settings">
@@ -1962,8 +1962,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      <message name="IDS_INCOGNITO_SAVE_SITE_SETTING_ENABLED_SUMMARY" desc="Summary for save site setting flag in incognito mode">
 +        Remember site settings changes in incognito mode
 +      </message>
-       <message name="IDS_CLEAR_SEARCH_HISTORY_LINK" desc="Text informing the user that they can clear search history and other data using MyActivity.">
-         <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Search history<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>other forms of activity<ph name="END_LINK2">&lt;/link2&gt;</ph> may be saved in your Google Account when you’re signed in. You can delete them anytime.
+       <message name="IDS_QUICK_DELETE_DIALOG_SEARCH_HISTORY_DISAMBIGUATION_TEXT" desc="Text for signed in users only in the Quick Delete dialog, that is shown when the user clicks on 'Clear browsing data' option in the three dots menu, informing signed in users that search history and other forms of Activity saved in their Google account will not be deleted.">
+         <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Search history<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>other forms of activity<ph name="END_LINK2">&lt;/link2&gt;</ph> may be saved in your Google Account
       </message>
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
@@ -2034,7 +2034,7 @@ new file mode 100644
 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
-@@ -4138,6 +4138,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -4149,6 +4149,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
     "net.out_of_process_system_dns_resolution_enabled";
 #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
 
@@ -2100,7 +2100,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
 diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
 --- a/components/content_settings/core/browser/host_content_settings_map.cc
 +++ b/components/content_settings/core/browser/host_content_settings_map.cc
-@@ -265,6 +265,7 @@ struct ContentSettingEntry {
+@@ -264,6 +264,7 @@ struct ContentSettingEntry {
 
 HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
                                                bool is_off_the_record,
@@ -2108,7 +2108,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                                                bool store_last_modified,
                                                bool restore_session,
                                                bool should_record_metrics)
-@@ -274,6 +275,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -273,6 +274,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
 #endif
       prefs_(prefs),
       is_off_the_record_(is_off_the_record),
@@ -2116,7 +2116,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
       store_last_modified_(store_last_modified),
       allow_invalid_secondary_pattern_for_testing_(false),
       clock_(base::DefaultClock::GetInstance()) {
-@@ -287,7 +289,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -286,7 +288,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
   policy_provider->AddObserver(this);
 
   auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2170,7 +2170,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
 diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
 --- a/components/omnibox/browser/base_search_provider.cc
 +++ b/components/omnibox/browser/base_search_provider.cc
-@@ -395,7 +395,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
+@@ -394,7 +394,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
 
   // Don't make a suggest request if in incognito mode; unless for the Lens
   // searchboxes.
@@ -2182,7 +2182,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
 diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
 --- a/components/omnibox/browser/search_provider.cc
 +++ b/components/omnibox/browser/search_provider.cc
-@@ -912,7 +912,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
+@@ -913,7 +913,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
   // is required.
   // Request for suggestions in OTR contexts is not allowed; except for the Lens
   // searchboxes.
@@ -26,9 +26,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bookmarks/BookmarkToolbarViewBinder.java  |   6 +
 .../native_page/NativePageFactory.java        |  11 +-
 chrome/browser/BUILD.gn                       |  11 +-
- .../bookmarks/android/bookmark_bridge.cc      | 277 +++++++++++++++++
- .../bookmarks/android/bookmark_bridge.h       |  29 +-
- .../browser/bookmarks/bookmark_html_writer.cc |   3 +
+ .../bookmarks/android/bookmark_bridge.cc      | 267 ++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.h       |  30 +-
 .../dialogs/DownloadLocationCustomView.java   |   8 +-
 .../DownloadLocationDialogCoordinator.java    |  10 +-
 .../flags/android/chrome_feature_list.cc      |   1 +
@@ -53,7 +52,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 42 files changed, 900 insertions(+), 30 deletions(-)
+ 41 files changed, 888 insertions(+), 30 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -492,7 +491,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /**
      * Synchronously gets a list of bookmarks that match the specified search query.
      *
-@@ -1102,6 +1383,10 @@ class BookmarkBridge {
+@@ -1108,6 +1389,10 @@ class BookmarkBridge {
         void getChildIds(
                 long nativeBookmarkBridge, long id, int type, List<BookmarkId> bookmarksList);
 
@@ -535,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-@@ -334,6 +336,13 @@ public class BookmarkManagerCoordinator
+@@ -326,6 +328,13 @@ public class BookmarkManagerCoordinator
 
     // Public API implementation.
 
@@ -552,7 +551,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -59,6 +59,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
+@@ -58,6 +58,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
 import org.chromium.components.power_bookmarks.PowerBookmarkType;
@@ -571,7 +570,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /** Keeps track of whether drag is enabled / active for bookmark lists. */
     private class BookmarkDragStateDelegate implements DragStateDelegate {
         private BookmarkDelegate mBookmarkDelegate;
-@@ -571,6 +576,14 @@ class BookmarkManagerMediator
+@@ -574,6 +579,14 @@ class BookmarkManagerMediator
         mNativePage = nativePage;
     }
 
@@ -586,7 +585,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /** See BookmarkManager(Coordinator)#updateForUrl */
     void updateForUrl(String url) {
         // Bookmark model is null if the manager has been destroyed.
-@@ -752,6 +765,16 @@ class BookmarkManagerMediator
+@@ -766,6 +779,16 @@ class BookmarkManagerMediator
         }
     }
 
@@ -807,7 +806,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -207,6 +207,8 @@ static_library("browser") {
+@@ -218,6 +218,8 @@ static_library("browser") {
     "bluetooth/chrome_bluetooth_delegate_impl_client.h",
     "bookmarks/bookmark_model_factory.cc",
     "bookmarks/bookmark_model_factory.h",
@@ -816,9 +815,9 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "bookmarks/chrome_bookmark_client.cc",
     "bookmarks/chrome_bookmark_client.h",
     "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1661,6 +1663,13 @@ static_library("browser") {
-     "webid/identity_provider_permission_request.h",
-   ]
+@@ -1698,6 +1700,13 @@ static_library("browser") {
+     ]
+   }
 
 +  if (is_android) {
 +    sources += [
@@ -830,7 +829,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     "//build/config:precompiled_headers",
-@@ -3475,8 +3484,6 @@ static_library("browser") {
+@@ -3507,8 +3516,6 @@ static_library("browser") {
       "bookmarks/bookmark_expanded_state_tracker.h",
       "bookmarks/bookmark_expanded_state_tracker_factory.cc",
       "bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -842,7 +841,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -64,6 +64,28 @@
+@@ -66,6 +66,28 @@
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
@@ -871,7 +870,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 // Must come after all headers that specialize FromJniType() / ToJniType().
 #include "chrome/android/chrome_jni_headers/BookmarkBridge_jni.h"
 
-@@ -82,12 +104,97 @@ using bookmarks::android::JavaBookmarkIdGetType;
+@@ -84,6 +106,57 @@ using bookmarks::android::JavaBookmarkIdGetType;
 using content::BrowserThread;
 using power_bookmarks::PowerBookmarkMeta;
 
@@ -910,7 +909,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +      }
 +    }
 +
-+    if (base::Contains(chrome::ChromeDebugURLs(), fixed_url)) {
+    if (base::Contains(chrome::ChromeDebugURLs(), fixed_url.spec())) {
 +      return true;
 +    }
 +
@@ -929,47 +928,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 namespace {
 // The key used to connect the instance of the bookmark bridge to the bookmark
 // model.
- const char kBookmarkBridgeUserDataKey[] = "bookmark_bridge";
- 
- // Compares titles of different instance of BookmarkNode.
-+class FileBookmarksExportObserver: public BookmarksExportObserver {
-+  public:
-+  FileBookmarksExportObserver(
-+           const JavaParamRef<jobject>& obj,
-+           ui::WindowAndroid* window,
-+           const std::string& export_path) :
-+    obj_(ScopedJavaGlobalRef<jobject>(obj)),
-+    window_(window),
-+    export_path_(export_path) {}
-+
-+  void OnExportFinished(Result result) override {
-+    if (result == Result::kSuccess) {
-+      LOG(INFO) << "Bookmarks exported successfully to " << export_path_;
-+    } else if (result == Result::kCouldNotCreateFile) {
-+      LOG(ERROR) << "Bookmarks export: could not create file " << export_path_;
-+    } else if (result == Result::kCouldNotWriteHeader) {
-+      LOG(ERROR) << "Bookmarks export: could not write header";
-+    } else if (result == Result::kCouldNotWriteNodes) {
-+      LOG(ERROR) << "Bookmarks export: could not write nodes";
-+    }
-+
-+    JNIEnv* env = AttachCurrentThread();
-+    Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
-+                                          ConvertUTF8ToJavaString(env, export_path_),
-+                                          result == Result::kSuccess);
-+    delete this;
-+  }
-+
-+  private:
-+  const ScopedJavaGlobalRef<jobject> obj_;
-+  raw_ptr<ui::WindowAndroid> window_;
-+  const std::string export_path_;
-+};
-+
- class BookmarkTitleComparer {
-  public:
-   explicit BookmarkTitleComparer(BookmarkBridge* bookmark_bridge,
-@@ -229,6 +336,10 @@ BookmarkBridge::~BookmarkBridge() {
+@@ -231,6 +304,10 @@ BookmarkBridge::~BookmarkBridge() {
   partner_bookmarks_shim_observation_.Reset();
   bookmark_model_observation_.Reset();
   profile_observation_.Reset();
@@ -980,7 +939,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 }
 
 void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -768,6 +879,172 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -765,6 +842,196 @@ jint BookmarkBridge::GetTotalBookmarkCount(
   return count;
 }
 
@@ -1038,8 +997,32 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +    export_path_ = export_path_.Append(FILE_PATH_LITERAL("bookmarks.html"));
 +  }
 +
-+  observer_ = new FileBookmarksExportObserver(obj, window, export_path_.MaybeAsASCII());
-+  bookmark_html_writer::WriteBookmarks(profile_, export_path_, observer_);
+  bookmark_html_writer::WriteBookmarks(profile_, export_path_,
+    base::BindOnce(&BookmarkBridge::ExportBookmarksEnd,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   base::android::ScopedJavaGlobalRef<jobject>(obj),
+                   window));
+}
+
+void BookmarkBridge::ExportBookmarksEnd(const ScopedJavaGlobalRef<jobject>& obj,
+                                        ui::WindowAndroid* window,
+                                        bookmark_html_writer::Result result) const
+{
+  auto export_path = export_path_.MaybeAsASCII();
+  if (result == bookmark_html_writer::Result::kSuccess) {
+    LOG(INFO) << "Bookmarks exported successfully to " << export_path;
+  } else if (result == bookmark_html_writer::Result::kCouldNotCreateFile) {
+    LOG(ERROR) << "Bookmarks export: could not create file " << export_path;
+  } else if (result == bookmark_html_writer::Result::kCouldNotWriteHeader) {
+    LOG(ERROR) << "Bookmarks export: could not write header";
+  } else if (result == bookmark_html_writer::Result::kCouldNotWriteNodes) {
+    LOG(ERROR) << "Bookmarks export: could not write nodes";
+  }
+
+  JNIEnv* env = AttachCurrentThread();
+  Java_BookmarkBridge_bookmarksExported(env, obj, window->GetJavaObject(),
+    base::android::ConvertUTF8ToJavaString(env, export_path),
+    result == bookmark_html_writer::Result::kSuccess);
 +}
 +
 +// Attempts to create a TemplateURL from the provided data. |title| is optional.
@@ -1196,7 +1179,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   jboolean IsEditBookmarksEnabled(JNIEnv* env);
 
   void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env);
-@@ -93,6 +103,15 @@ class BookmarkBridge : public ProfileObserver,
+@@ -93,6 +103,17 @@ class BookmarkBridge : public ProfileObserver,
                                                              jlong id,
                                                              jint type);
 
@@ -1208,21 +1191,22 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 +                        const base::android::JavaParamRef<jobject>& obj,
 +                        const base::android::JavaParamRef<jobject>& java_window,
 +                        const base::android::JavaParamRef<jstring>& j_export_path);
+  void ExportBookmarksEnd(const base::android::ScopedJavaGlobalRef<jobject>& obj,
+                        ui::WindowAndroid* window, bookmark_html_writer::Result result) const;
 +
   void GetAllFoldersWithDepths(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& j_folders_obj,
-@@ -363,6 +382,9 @@ class BookmarkBridge : public ProfileObserver,
+@@ -362,6 +383,8 @@ class BookmarkBridge : public ProfileObserver,
   void CreateOrDestroyAccountReadingListManagerIfNeeded();
 
   const raw_ptr<Profile> profile_;  // weak
 +  base::FilePath export_path_;
-+  raw_ptr<BookmarksExportObserver> observer_; // weak
 +
   base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
   const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
   const raw_ptr<bookmarks::ManagedBookmarkService>
-@@ -377,6 +399,7 @@ class BookmarkBridge : public ProfileObserver,
+@@ -376,6 +399,7 @@ class BookmarkBridge : public ProfileObserver,
   std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
       grouped_bookmark_actions_;
   PrefChangeRegistrar pref_change_registrar_;
@@ -1230,7 +1214,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
-@@ -408,6 +431,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -407,6 +431,10 @@ class BookmarkBridge : public ProfileObserver,
 
   bool suppress_observer_notifications_ = false;
 
@@ -1241,19 +1225,6 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   // Weak pointers for creating callbacks that won't call into a destroyed
   // object.
   base::WeakPtrFactory<BookmarkBridge> weak_ptr_factory_;
-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
-@@ -33,6 +33,9 @@
- #include "base/task/thread_pool.h"
- #include "base/time/time.h"
- #include "base/values.h"
-+#if BUILDFLAG(IS_ANDROID)
-+#include "base/android/content_uri_utils.h"
-+#endif
- #include "chrome/browser/bookmarks/bookmark_model_factory.h"
- #include "chrome/browser/favicon/favicon_service_factory.h"
- #include "chrome/browser/profiles/profile.h"
 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
@@ -1331,7 +1302,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -216,6 +216,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -214,6 +214,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kCCTAuthTab,
     &kCCTAuthTabDisableAllExternalIntents,
     &kCCTAuthTabEnableHttpsRedirects,
@@ -1342,7 +1313,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -579,6 +579,7 @@ public abstract class ChromeFeatureList {
+@@ -585,6 +585,7 @@ public abstract class ChromeFeatureList {
     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
             "UseLibunwindstackNativeUnwinderAndroid";
     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1353,7 +1324,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
 --- a/chrome/browser/importer/profile_writer.cc
 +++ b/chrome/browser/importer/profile_writer.cc
-@@ -124,6 +124,16 @@ void ProfileWriter::AddBookmarks(
+@@ -125,6 +125,16 @@ void ProfileWriter::AddBookmarks(
     return;
 
   BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -1396,7 +1367,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -115,6 +115,8 @@ public final class ChromePreferenceKeys {
+@@ -121,6 +121,8 @@ public final class ChromePreferenceKeys {
             "enhanced_bookmark_last_used_parent_folder";
     public static final String BOOKMARKS_SORT_ORDER = "Chrome.Bookmarks.BookmarkRowSortOrder";
     public static final String BOOKMARKS_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay";
@@ -1405,7 +1376,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 
     /** Whether Chrome is set as the default browser. Default value is false. */
     public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
-@@ -935,6 +937,7 @@ public final class ChromePreferenceKeys {
+@@ -938,6 +940,7 @@ public final class ChromePreferenceKeys {
                 AUXILIARY_SEARCH_IS_SCHEMA_SET,
                 APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                 APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1444,7 +1415,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -360,6 +360,9 @@ static_library("common_lib") {
+@@ -356,6 +356,9 @@ static_library("common_lib") {
     sources += [
       "media/chrome_media_drm_bridge_client.cc",
       "media/chrome_media_drm_bridge_client.h",
@@ -1628,15 +1599,15 @@ new file mode 100644
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
-@@ -49,6 +49,7 @@ import org.chromium.build.annotations.NullMarked;
- import org.chromium.build.annotations.NullUnmarked;
+@@ -51,6 +51,7 @@ import org.chromium.build.annotations.Initializer;
+ import org.chromium.build.annotations.NullMarked;
 import org.chromium.build.annotations.Nullable;
 import org.chromium.ui.R;
 +import org.chromium.ui.widget.Toast;
 import org.chromium.ui.UiUtils;
 
 import java.io.File;
-@@ -72,6 +73,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -74,6 +75,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
     private static final String TAG = "SelectFileDialog";
     private static final String IMAGE_TYPE = "image";
     private static final String VIDEO_TYPE = "video";
@@ -1644,7 +1615,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
     private static final String AUDIO_TYPE = "audio";
     private static final String ALL_TYPES = "*/*";
     private static final String GENERIC_TYPE = "application/octet-stream";
-@@ -324,6 +326,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -323,6 +325,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         mMimeTypes = convertToSupportedMimeTypes(mFileTypes);
     }
 
@@ -1656,7 +1627,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
     /**
      * Creates and starts an intent based on the passed fileTypes and capture value.
      *
-@@ -399,7 +406,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -407,7 +414,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         List<String> missingPermissions = new ArrayList<>();
         String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
         boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1665,7 +1636,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
             // The permission scenario for accessing media has evolved a bit over the years:
             // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
             // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
-@@ -452,7 +459,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -460,7 +467,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
 
                                 // TODO(finnur): Remove once we figure out the cause of
                                 // crbug.com/950024.
@@ -1674,7 +1645,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                     if (permissions.length != requestPermissions.length) {
                                         throw new RuntimeException(
                                                 String.format(
-@@ -469,7 +476,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -477,7 +484,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                                     }
                                 }
 
@@ -1683,7 +1654,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                     if (permissions[i].equals(storagePermission)
                                             || permissions[i].equals(
                                                     Manifest.permission.READ_MEDIA_IMAGES)
-@@ -775,6 +782,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -783,6 +790,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                 mimeTypes.add(mimeType);
             }
         }
@@ -1691,7 +1662,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
         return mimeTypes;
     }
 
-@@ -1149,6 +1157,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1155,6 +1163,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         return countAcceptTypesFor(superType) == mMimeTypes.size();
     }
 
@@ -46,12 +46,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../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/flags_state.cc            |  59 ++++++
 components/flags_ui/resources/app.css         |  24 +++
 components/flags_ui/resources/app.html.ts     |  28 +++
 components/flags_ui/resources/app.ts          |  23 +++
@@ -65,7 +65,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 components/permissions/features.cc            |   1 +
 ...nthetic_trials_active_group_id_provider.cc |   4 +-
 ...ynthetic_trials_active_group_id_provider.h |   4 +-
- .../version_ui/version_handler_helper.cc      |   4 +-
+ .../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 +106,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 third_party/blink/public/common/features.h    |   1 +
 ui/base/ui_base_features.cc                   |   1 +
 ui/base/ui_base_features.h                    |   1 +
- 93 files changed, 808 insertions(+), 30 deletions(-)
+ 93 files changed, 811 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
@@ -152,7 +152,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") {
+@@ -1016,7 +1018,7 @@ component("base") {
     "//build/config/compiler:wglobal_constructors",
   ]
 
@@ -164,7 +164,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) {
@@ -436,7 +436,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.
+@@ -48,6 +48,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" />
@@ -462,7 +462,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -89,7 +89,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -84,7 +84,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
 
     @Override
@@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.chrome.browser.LaunchIntentDispatcher;
-@@ -76,18 +77,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -75,18 +76,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
     private final OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
     private final OneshotSupplier<BottomSheetController> mBottomSheetControllerSupplier;
     private final ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
@@ -505,7 +505,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
     }
 
     @Override
-@@ -96,6 +100,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -95,6 +99,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
             @NonNull Fragment fragment,
             @NonNull Context unusedContext) {
         // Common dependencies attachments.
@@ -632,7 +632,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;
+@@ -394,6 +394,10 @@ using flags_ui::kOsLinux;
 using flags_ui::kOsMac;
 using flags_ui::kOsWin;
 
@@ -643,9 +643,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)
+@@ -4383,6 +4387,10 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
+       std::size(kTabSwitcherColorBlendAnimateVariation3), nullptr}};
+ #endif  // BUILDFLAG(IS_ANDROID)
 
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -654,7 +654,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[] = {
+@@ -4409,6 +4417,9 @@ const FeatureEntry::FeatureVariation kTabSwitcherColorBlendAnimateVariations[] =
 const FeatureEntry kFeatureEntries[] = {
 // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
 // //tools/flags/generate_unexpire_flags.py.
@@ -667,7 +667,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,
+@@ -367,4 +367,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
              "RemovalOfIWAsFromTabCapture",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -726,7 +726,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,
+@@ -1182,5 +1182,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
              "WebOtpCrossDeviceSimpleString",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -736,7 +736,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(
+@@ -236,6 +236,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
     "trigger_id",
     /*default_value=*/"");
 
@@ -747,7 +747,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,7 +758,7 @@ 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 {
+@@ -830,7 +834,7 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sWebApkMinShellApkVersion =
             newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
 
@@ -767,7 +767,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
             List.of(
                     sAndroidAppIntegration,
                     sAndroidAppIntegrationModule,
-@@ -916,6 +920,13 @@ public abstract class ChromeFeatureList {
+@@ -933,6 +937,13 @@ public abstract class ChromeFeatureList {
                     sUseLibunwindstackNativeUnwinderAndroid,
                     sWebApkMinShellApkVersion);
 
@@ -957,16 +957,16 @@ 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);
+@@ -416,4 +416,5 @@ BASE_FEATURE(kFedCmContinueWithoutName,
+              "FedCmContinueWithoutName",
+              base::FEATURE_ENABLED_BY_DEFAULT);
 
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
 }  // namespace features
 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,
+@@ -1569,4 +1569,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
              "DisableShortcutsEnableDiy",
              base::FEATURE_ENABLED_BY_DEFAULT);
 
@@ -1037,17 +1037,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;
+@@ -15,6 +15,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;
+@@ -40,6 +42,11 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
     /** Indicates if the preference uses a custom layout. */
     private final boolean mHasCustomLayout;
 
@@ -1059,7 +1058,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 {
+@@ -59,6 +66,18 @@ public class ChromeSwitchPreference extends SwitchPreferenceCompat {
 
         mHasCustomLayout = ManagedPreferencesUtils.isCustomLayoutApplied(context, attrs);
         mUseSummaryAsTitle = true;
@@ -1081,16 +1080,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 +1089,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;
     }
 
@@ -1141,7 +1132,7 @@ new file mode 100644
 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(
+@@ -373,6 +373,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
 
   for (const std::string& entry_name : enabled_entries) {
     const auto& entry_it = name_to_switch_map.find(entry_name);
@@ -1163,7 +1154,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
     CHECK(entry_it != name_to_switch_map.end(), base::NotFatalUntil::M130);
 
     const SwitchEntry& entry = entry_it->second;
-@@ -680,6 +695,27 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -690,6 +705,27 @@ void FlagsState::GetFlagFeatureEntries(
       data.Set("links", std::move(links));
     }
 
@@ -1191,7 +1182,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(
+@@ -816,6 +852,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 +1199,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(
+@@ -1067,6 +1113,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
 bool FlagsState::IsSupportedFeature(const FlagsStorage* storage,
                                     const std::string& name,
                                     int platform_mask) const {
@@ -1223,6 +1214,18 @@ 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))
+@@ -1098,6 +1152,11 @@ void FlagsState::SetFlags(FlagsStorage* flags_storage,
+     std::string feature_internal_name = flag.substr(0, at_index);
+     const flags_ui::FeatureEntry* entry =
+         FindFeatureEntryByName(feature_internal_name);
+    if (!entry) {
+      if (base::FeatureList::IsCromiteFlag(feature_internal_name)) {
+        continue;
+      }
+    }
+     CHECK(entry);
+ 
+     if (entry->type == FeatureEntry::FEATURE_VALUE ||
 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
@@ -1510,7 +1513,7 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
 diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
 --- a/components/password_manager/core/browser/features/password_features.cc
 +++ b/components/password_manager/core/browser/features/password_features.cc
-@@ -188,4 +188,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
+@@ -182,4 +182,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
              "ImprovedPasswordChangeService",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -1519,7 +1522,7 @@ diff --git a/components/password_manager/core/browser/features/password_features
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -122,6 +122,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
+@@ -120,6 +120,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
 BASE_FEATURE(kCpssUseTfliteSignatureRunner,
              "CpssUseTfliteSignatureRunner",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -1569,9 +1572,9 @@ diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b
   // 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 +1596,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,
+@@ -490,4 +490,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
 
 // Please keep features in alphabetical order.
 
@@ -1602,7 +1605,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1421,4 +1421,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
+@@ -1425,4 +1425,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
          VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
 }
 
@@ -1611,7 +1614,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
 diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h
 --- a/content/public/common/content_features.h
 +++ b/content/public/common/content_features.h
-@@ -341,6 +341,7 @@ CONTENT_EXPORT extern const base::FeatureParam<std::string>
+@@ -339,6 +339,7 @@ CONTENT_EXPORT extern const base::FeatureParam<std::string>
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
 CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
 
@@ -1957,7 +1960,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() {
+@@ -1799,5 +1799,5 @@ uint32_t GetPassthroughAudioFormats() {
   return 0;
 #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
 }
@@ -1967,7 +1970,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();
+@@ -568,5 +568,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
 MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
 
 }  // namespace media
@@ -1977,18 +1980,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -666,4 +666,5 @@ BASE_FEATURE(kHstsTopLevelNavigationsOnly,
-              "HstsTopLevelNavigationsOnly",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -701,4 +701,5 @@ BASE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify,
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_ANDROID)
 
 +#include "cromite_flags/net_base_features_cc.inc"
 }  // namespace net::features
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -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);
+@@ -719,6 +719,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kReportingApiCorsOriginHeader);
+ NET_EXPORT BASE_DECLARE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify);
+ #endif  // BUILDFLAG(IS_ANDROID)
 
 +#include "cromite_flags/net_base_features_h.inc"
 }  // namespace net::features
@@ -1997,8 +2000,8 @@ 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",
+@@ -351,4 +351,5 @@ BASE_FEATURE(kAdAuctionEventRegistration,
+              "AdAuctionEventRegistration",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +#include "cromite_flags/services_network_public_cpp_features_cc.inc"
@@ -2006,9 +2009,9 @@ diff --git a/services/network/public/cpp/features.cc b/services/network/public/c
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -155,6 +155,7 @@ BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault);
- COMPONENT_EXPORT(NETWORK_CPP)
- BASE_DECLARE_FEATURE(kSRIMessageSignatureEnforcement);
+@@ -150,6 +150,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kCreateURLLoaderPipeAsync);
+ // requests be processed?
+ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kAdAuctionEventRegistration);
 
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
 }  // namespace network::features
@@ -2017,7 +2020,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) {
+@@ -2899,4 +2899,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
 //
 // DO NOT ADD NEW FEATURES HERE.
 
@@ -2026,7 +2029,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();
+@@ -1889,6 +1889,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
 //
 // DO NOT ADD NEW FEATURES HERE.
 
@@ -2037,7 +2040,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
 diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 --- a/ui/base/ui_base_features.cc
 +++ b/ui/base/ui_base_features.cc
-@@ -454,4 +454,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
+@@ -451,4 +451,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
              "AsyncFullscreenWindowState",
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -2046,7 +2049,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
 --- a/ui/base/ui_base_features.h
 +++ b/ui/base/ui_base_features.h
-@@ -235,6 +235,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle);
+@@ -230,6 +230,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle);
 COMPONENT_EXPORT(UI_BASE_FEATURES)
 BASE_DECLARE_FEATURE(kAsyncFullscreenWindowState);
 
@@ -18,20 +18,20 @@ 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 +
+ .../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(-)
+ 12 files changed, 144 insertions(+), 2 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.
+@@ -56,6 +56,21 @@ found in the LICENSE file.
         android:key="cromite_flags"
         android:title="@string/cromite_flags_title"
         app:url="@string/cromite_flags_url" />
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -60,6 +60,15 @@ import org.chromium.device.DeviceFeatureList;
+@@ -59,6 +59,15 @@ import org.chromium.device.DeviceFeatureList;
 import org.chromium.device.DeviceFeatureMap;
 import org.chromium.ui.text.SpanApplier;
 
@@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceCategory;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
-@@ -112,6 +121,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -107,6 +116,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private IncognitoLockSettings mIncognitoLockSettings;
     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
 
@@ -204,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -349,6 +361,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -336,6 +348,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
     }
 
@@ -214,7 +214,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
+@@ -356,6 +371,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 +246,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
+@@ -388,6 +428,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -266,18 +266,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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);
+@@ -730,6 +730,8 @@ public abstract class ChromeFeatureList {
     public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);
-+    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
+     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,
+@@ -897,6 +899,7 @@ public abstract class ChromeFeatureList {
                     sNotificationTrampoline,
                     sMagicStackAndroid,
+                     sMostVisitedTilesCustomization,
 +                    sMayLaunchurlUsesSeparateStoragePartition,
                     sMostVisitedTilesReselect,
                     sMultiInstanceApplicationStatusCleanup,
@@ -331,7 +332,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 +343,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.
+@@ -166,6 +166,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.
+@@ -195,6 +198,9 @@ found in the LICENSE file.
         <item android:id="@id/preferences_id"
             android:title="@string/menu_settings"
             android:icon="@drawable/settings_cog" />
@@ -39,7 +39,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
-@@ -292,6 +292,8 @@ import java.util.Set;
+@@ -293,6 +293,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.DoubleConsumer;
 
@@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 /**
  * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
  * accessible via a chrome specific tab switching UI.
-@@ -3000,6 +3002,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3021,6 +3023,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                     .closeTabs(
                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
             RecordUserAction.record("MobileTabClosed");
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
+@@ -60,6 +60,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.ActivityUtils;
 import org.chromium.chrome.browser.AppHooks;
@@ -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
+@@ -4345,6 +4345,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(
+@@ -540,6 +541,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,
+@@ -489,6 +489,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 #include "base/functional/callback.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
-@@ -628,6 +629,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -629,6 +630,9 @@ void SearchProvider::Run(bool query_is_private) {
 }
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -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(
+@@ -161,6 +165,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,7 +45,7 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1112,6 +1112,7 @@ component("net") {
+@@ -1118,6 +1118,7 @@ component("net") {
     "//build:chromeos_buildflags",
     "//components/miracle_parameter/common",
     "//components/network_time/time_tracker",
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
-@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1425,6 +1426,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.
+@@ -81,7 +81,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" />
@@ -142,7 +142,7 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
 --- 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[] = {
+ const base::Feature* const kFeaturesExposedToJava[] = {
     &kExternalNavigationDebugLogs, &kBlockFrameRenavigations,
     &kBlockIntentsToSelf, &kTrustedClientGestureBypass};
 -
@@ -193,7 +193,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -1530,6 +1530,12 @@ public class ExternalNavigationHandler {
+@@ -1529,6 +1529,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 {
+@@ -1585,6 +1591,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",
+@@ -858,6 +858,10 @@
+     {
+       name: "CompositingDecisionAtAnimationPhaseBoundaries"
     },
 +    {
 +      name: "Vibration",
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1980,7 +1980,6 @@ config("default_warnings") {
+@@ -1974,7 +1974,6 @@ config("default_warnings") {
         # TODO(crbug.com/40284799): Fix and re-enable.
         "-Wno-thread-safety-reference-return",
       ]
@@ -22,18 +22,18 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
       cflags_cc += [
         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
         "-Wenum-compare-conditional",
-@@ -2001,6 +2000,16 @@ config("default_warnings") {
+@@ -1992,6 +1991,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",
+          "-Wno-nontrivial-memcall",
 +        ]
 +        cflags_cc -= [
 +          "-Wno-c++11-narrowing-const-reference",
 +          "-Wno-missing-template-arg-list-after-template-kw",
-+          "-Wno-dangling-assignment-gsl",
 +        ]
 +      }
     }
@@ -57,7 +57,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../one_time_permissions_tracker.h            |  5 +-
 .../one_time_permissions_tracker_factory.cc   |  2 +-
 .../views/permissions/chip/chip_controller.cc |  2 +-
- .../permissions/embedded_permission_prompt.cc |  2 +-
 ...exclusive_access_permission_prompt_view.cc |  2 +-
 .../permission_prompt_bubble_base_view.cc     |  2 +-
 .../site_settings/PermissionInfo.java         |  1 +
@@ -74,6 +73,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/page_info/page_info.h              |  1 +
 .../permissions/PermissionDialogDelegate.java | 13 +++
 .../PermissionDialogModelFactory.java         | 82 ++++++++++++++++++-
+ .../embedded_permission_prompt_android.cc     |  3 +-
+ .../embedded_permission_prompt_android.h      |  2 +-
 .../permission_dialog_delegate.cc             | 24 +++++-
 .../permission_dialog_delegate.h              |  1 +
 .../permission_prompt_android.cc              |  8 +-
@@ -81,6 +82,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../android/permissions_android_strings.grd   | 17 ++++
 .../geolocation_permission_context_android.cc | 34 ++++++--
 .../geolocation_permission_context_android.h  | 13 ++-
+ .../embedded_permission_prompt_flow_model.cc  |  2 +-
 .../permissions/permission_context_base.cc    | 52 ++++++++++--
 .../permissions/permission_context_base.h     | 23 +++++-
 components/permissions/permission_prompt.h    |  3 +-
@@ -88,7 +90,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/permissions/permission_request.h   | 16 +++-
 .../permissions/permission_request_manager.cc | 45 ++++++----
 .../permissions/permission_request_manager.h  | 11 ++-
- 36 files changed, 490 insertions(+), 69 deletions(-)
+ 38 files changed, 493 insertions(+), 71 deletions(-)

 diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc
 --- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -230,7 +232,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
-@@ -234,7 +234,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
+@@ -235,7 +235,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
       active_chip_permission_request_manager_.value()->Accept();
       break;
     case permissions::PermissionAction::GRANTED_ONCE:
@@ -239,18 +241,6 @@ diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrom
       break;
     case permissions::PermissionAction::DENIED:
       active_chip_permission_request_manager_.value()->Deny();
-diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
--- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
-+++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
-@@ -664,7 +664,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) {
-       delegate_->Accept();
-       break;
-     case Action::kAllowThisTime:
-      delegate_->AcceptThisTime();
-+      delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
-       break;
-     case Action::kDeny:
-       delegate_->Deny();
 diff --git a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
 --- a/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
 +++ b/chrome/browser/ui/views/permissions/exclusive_access_permission_prompt_view.cc
@@ -342,7 +332,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -160,6 +160,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
+@@ -157,6 +157,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
   return constraints.session_model() == mojom::SessionModel::DURABLE;
 }
 
@@ -385,7 +375,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 bool CanTrackLastVisit(ContentSettingsType type) {
   // Last visit is not tracked for notification permission as it shouldn't be
   // auto-revoked.
-@@ -258,9 +294,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
+@@ -240,9 +276,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
       ContentSettingsType::CAPTURED_SURFACE_CONTROL,
 #endif
       ContentSettingsType::KEYBOARD_LOCK,
@@ -395,7 +385,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
       ContentSettingsType::HAND_TRACKING,
       ContentSettingsType::SMART_CARD_DATA,
   }};
-@@ -274,9 +307,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
+@@ -256,9 +289,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
       ContentSettingsType::CAPTURED_SURFACE_CONTROL,
 #endif
       ContentSettingsType::KEYBOARD_LOCK,
@@ -424,8 +414,8 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.h b
 diff --git a/components/content_settings/core/common/content_settings_enums.mojom b/components/content_settings/core/common/content_settings_enums.mojom
 --- a/components/content_settings/core/common/content_settings_enums.mojom
 +++ b/components/content_settings/core/common/content_settings_enums.mojom
-@@ -58,6 +58,15 @@ enum SessionModel {
-   ONE_TIME,
+@@ -63,6 +63,15 @@ enum SessionModel {
+   ONE_TIME = 3,
 };
 
 +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.content_settings
@@ -443,7 +433,7 @@ diff --git a/components/content_settings/core/common/content_settings_enums.mojo
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
-@@ -383,9 +383,9 @@ public class PageInfoController
+@@ -385,9 +385,9 @@ public class PageInfoController
             String name,
             String nameMidSentence,
             int type,
@@ -573,9 +563,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 
 import java.util.ArrayList;
 import java.util.List;
-@@ -60,6 +61,9 @@ public class PermissionDialogDelegate {
-     /** The {@link ContentSettingsType}s requested in this dialog. */
-     private int[] mContentSettingsTypes;
+@@ -63,6 +64,9 @@ public class PermissionDialogDelegate {
+     // Prompt(screen) variant we want to display on the dialog.
+     private @EmbeddedPromptVariant int mEmbeddedPromptVariant;
 
 +    /** Lifetime option selected by the user. */
 +    private int mSelectedLifetimeOption = LifetimeMode.ALWAYS;
@@ -583,7 +573,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
     /**
      * Defines a (potentially empty) list of ranges represented as pairs of <startIndex, endIndex>,
      * which shall be used by the UI to format the specified ranges as bold text.
-@@ -117,6 +121,15 @@ public class PermissionDialogDelegate {
+@@ -132,6 +136,15 @@ public class PermissionDialogDelegate {
                 .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this);
     }
 
@@ -596,9 +586,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 +        return mSelectedLifetimeOption;
 +    }
 +
-     public void onCancel() {
+     public void onDeny() {
         assert mNativeDelegatePtr != 0;
-         PermissionDialogDelegateJni.get().cancel(mNativeDelegatePtr, PermissionDialogDelegate.this);
+         PermissionDialogDelegateJni.get().deny(mNativeDelegatePtr, PermissionDialogDelegate.this);
 diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
 --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
 +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogModelFactory.java
@@ -621,9 +611,9 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 /** This class creates the model for the permission dialog. */
 class PermissionDialogModelFactory {
     public static PropertyModel getModel(
-@@ -72,6 +84,74 @@ class PermissionDialogModelFactory {
-                             ModalDialogProperties.NEGATIVE_BUTTON_TEXT,
-                             delegate.getNegativeButtonText());
+@@ -65,7 +77,75 @@ class PermissionDialogModelFactory {
+                             ModalDialogProperties.ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE)
+                     .with(ModalDialogProperties.CHANGE_CUSTOM_VIEW_OR_BUTTONS, true);
         }
 -        return builder.build();
 +
@@ -696,12 +686,38 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 +        }
 +        return false;
     }
+ 
+     public static ModalDialogProperties.ModalDialogButtonSpec[] getButtonSpecs(
+diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
+--- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
+++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
+@@ -105,7 +105,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
+   delegate()->FinalizeCurrentRequests();
 }
+ 
+-void EmbeddedPermissionPromptAndroid::AcceptThisTime() {
+void EmbeddedPermissionPromptAndroid::AcceptThisTime(
+        content_settings::mojom::LifetimeMode lifetimeOption) {
+   prompt_model_->PrecalculateVariantsForMetrics();
+   prompt_model_->RecordPermissionActionUKM(
+       permissions::ElementAnchoredBubbleAction::kGrantedOnce);
+diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h
+--- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h
+++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.h
+@@ -43,7 +43,7 @@ class EmbeddedPermissionPromptAndroid : public PermissionPromptAndroid {
+       const override;
+   void Closing() override;
+   void Accept() override;
+-  void AcceptThisTime() override;
+  void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption) override;
+   void Acknowledge() override;
+   void Deny() override;
+   void Resumed() override;
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
-@@ -158,6 +158,11 @@ void PermissionDialogJavaDelegate::DismissDialog() {
-   Java_PermissionDialogDelegate_dismissFromNative(env, j_delegate_);
+@@ -139,6 +139,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
+       static_cast<int>(permission_prompt_->GetEmbeddedPromptVariant()));
 }
 
 +int PermissionDialogJavaDelegate::GetSelectedLifetimeOption() {
@@ -710,9 +726,9 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 +}
 +
 // static
- void PermissionDialogDelegate::Create(
+ std::unique_ptr<PermissionDialogDelegate> PermissionDialogDelegate::Create(
     content::WebContents* web_contents,
-@@ -186,6 +191,13 @@ PermissionDialogDelegate* PermissionDialogDelegate::CreateForTesting(
+@@ -168,6 +173,13 @@ PermissionDialogDelegate::CreateForTesting(
 void PermissionDialogDelegate::Accept(JNIEnv* env,
                                       const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
@@ -726,7 +742,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
   permission_prompt_->Accept();
 }
 
-@@ -193,12 +205,22 @@ void PermissionDialogDelegate::AcceptThisTime(
+@@ -175,7 +187,10 @@ void PermissionDialogDelegate::AcceptThisTime(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
@@ -737,8 +753,10 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 +  permission_prompt_->AcceptThisTime(lifetimeOption);
 }
 
- void PermissionDialogDelegate::Cancel(JNIEnv* env,
-                                       const JavaParamRef<jobject>& obj) {
+ void PermissionDialogDelegate::Acknowledge(JNIEnv* env,
+@@ -187,6 +202,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env,
+ void PermissionDialogDelegate::Deny(JNIEnv* env,
+                                     const JavaParamRef<jobject>& obj) {
   CHECK(permission_prompt_);
 +  content_settings::mojom::LifetimeMode lifetimeOption =
 +    static_cast<content_settings::mojom::LifetimeMode>(
@@ -753,18 +771,18 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.h b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.h
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.h
-@@ -41,6 +41,7 @@ class PermissionDialogJavaDelegate {
+@@ -42,6 +42,7 @@ class PermissionDialogJavaDelegate {
       const favicon_base::FaviconRawBitmapResult& favicon_result);
 
   virtual void DismissDialog();
 +  virtual int GetSelectedLifetimeOption();
 
-  private:
-   base::android::ScopedJavaGlobalRef<jobject> j_delegate_;
+   virtual void UpdateDialog();
+ 
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.cc b/components/permissions/android/permission_prompt/permission_prompt_android.cc
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.cc
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.cc
-@@ -67,8 +67,12 @@ void PermissionPromptAndroid::Accept() {
+@@ -76,8 +76,12 @@ void PermissionPromptAndroid::Accept() {
   delegate_->Accept();
 }
 
@@ -782,17 +800,18 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.h
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h
-@@ -49,8 +49,9 @@ class PermissionPromptAndroid : public PermissionPrompt {
- 
-   void Closing();
-   void Accept();
-  void AcceptThisTime();
-+  void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
-   void Deny();
-+  void DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
-   void SetManageClicked();
-   void SetLearnMoreClicked();
-   bool ShouldCurrentRequestUseQuietUI();
+@@ -54,9 +54,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
+       const;
+   virtual void Closing();
+   virtual void Accept();
+-  virtual void AcceptThisTime();
+  virtual void AcceptThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
+   virtual void Acknowledge() {}
+   virtual void Deny();
+  virtual void DenyThisTime(content_settings::mojom::LifetimeMode lifetimeOption);
+   virtual void Resumed() {}
+   virtual void SystemSettingsShown() {}
+   virtual void SystemPermissionResolved(bool accepted) {}
 diff --git a/components/permissions/android/permissions_android_strings.grd b/components/permissions/android/permissions_android_strings.grd
 --- a/components/permissions/android/permissions_android_strings.grd
 +++ b/components/permissions/android/permissions_android_strings.grd
@@ -823,7 +842,7 @@ diff --git a/components/permissions/android/permissions_android_strings.grd b/co
 diff --git a/components/permissions/contexts/geolocation_permission_context_android.cc b/components/permissions/contexts/geolocation_permission_context_android.cc
 --- a/components/permissions/contexts/geolocation_permission_context_android.cc
 +++ b/components/permissions/contexts/geolocation_permission_context_android.cc
-@@ -162,7 +162,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -168,7 +168,20 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
     bool is_one_time,
     bool is_final_decision) {
   DCHECK(is_final_decision);
@@ -844,7 +863,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
   bool is_default_search = IsRequestingOriginDSE(requesting_origin);
   if (content_setting == CONTENT_SETTING_ALLOW &&
       !location_settings_->IsSystemLocationSettingEnabled()) {
-@@ -175,7 +188,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -181,7 +194,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
     if (IsInLocationSettingsBackOff(is_default_search)) {
       FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
                                 std::move(callback), false /* persist */,
@@ -854,7 +873,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
       return;
     }
 
-@@ -193,7 +207,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -199,7 +213,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
         !location_settings_dialog_callback_.is_null()) {
       FinishNotifyPermissionSet(id, requesting_origin, embedding_origin,
                                 std::move(callback), false /* persist */,
@@ -864,7 +883,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
       return;
     }
 
-@@ -205,13 +220,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -211,13 +226,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
         base::BindOnce(
             &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
             weak_factory_.GetWeakPtr(), requesting_origin, embedding_origin,
@@ -880,7 +899,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 }
 
 content::PermissionResult
-@@ -381,7 +396,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -390,7 +405,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
     const GURL& embedding_origin,
     bool persist,
     ContentSetting content_setting,
@@ -889,7 +908,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
     LocationSettingsDialogOutcome prompt_outcome) {
   bool is_default_search = IsRequestingOriginDSE(requesting_origin);
   if (prompt_outcome == GRANTED) {
-@@ -400,7 +415,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -409,7 +424,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
   FinishNotifyPermissionSet(location_settings_dialog_request_id_,
                             requesting_origin, embedding_origin,
                             std::move(location_settings_dialog_callback_),
@@ -899,7 +918,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 
   location_settings_dialog_request_id_ =
       PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
-@@ -414,10 +430,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+@@ -423,10 +439,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
     BrowserPermissionCallback callback,
     bool persist,
     ContentSetting content_setting,
@@ -930,9 +949,9 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +                           bool is_final_decision,
 +                           content_settings::mojom::LifetimeMode lifetime_option) override;
   content::PermissionResult UpdatePermissionStatusWithDeviceStatus(
+       content::WebContents* web_contents,
       content::PermissionResult result,
-       const GURL& requesting_origin,
-@@ -133,6 +142,7 @@ class GeolocationPermissionContextAndroid
+@@ -134,6 +143,7 @@ class GeolocationPermissionContextAndroid
       bool persist,
       ContentSetting content_setting,
       bool is_one_time,
@@ -940,7 +959,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
       LocationSettingsDialogOutcome prompt_outcome);
 
   void FinishNotifyPermissionSet(const PermissionRequestID& id,
-@@ -141,7 +151,8 @@ class GeolocationPermissionContextAndroid
+@@ -142,7 +152,8 @@ class GeolocationPermissionContextAndroid
                                  BrowserPermissionCallback callback,
                                  bool persist,
                                  ContentSetting content_setting,
@@ -950,11 +969,23 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 
   std::unique_ptr<LocationSettings> location_settings_;
 
+diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/components/permissions/embedded_permission_prompt_flow_model.cc
+--- a/components/permissions/embedded_permission_prompt_flow_model.cc
+++ b/components/permissions/embedded_permission_prompt_flow_model.cc
+@@ -295,7 +295,7 @@ void EmbeddedPermissionPromptFlowModel::SetDelegateAction(
+       delegate_->Accept();
+       break;
+     case DelegateAction::kAllowThisTime:
+-      delegate_->AcceptThisTime();
+      delegate_->AcceptThisTime(content_settings::mojom::LifetimeMode::ONLY_THIS_TIME);
+       break;
+     case DelegateAction::kDeny:
+       delegate_->Deny();
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -251,6 +251,17 @@ bool PermissionContextBase::UsesAutomaticEmbargo() const {
-   return true;
+@@ -267,6 +267,17 @@ const PermissionRequest* PermissionContextBase::FindPermissionRequest(
+   return request->second.first.get();
 }
 
 +std::unique_ptr<PermissionRequest>
@@ -971,7 +1002,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 content::PermissionResult PermissionContextBase::GetPermissionStatus(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
-@@ -497,7 +508,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -526,7 +537,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
                                               const GURL& embedding_origin,
                                               ContentSetting content_setting,
                                               bool is_one_time,
@@ -981,7 +1012,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK ||
          content_setting == CONTENT_SETTING_DEFAULT);
-@@ -512,13 +524,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
+@@ -541,13 +553,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
   // missing if a permission prompt was preignored and we already notified an
   // origin about it.
   if (request->second.second) {
@@ -1000,7 +1031,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   }
 }
 
-@@ -586,11 +599,27 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -628,11 +641,27 @@ void PermissionContextBase::NotifyPermissionSet(
     ContentSetting content_setting,
     bool is_one_time,
     bool is_final_decision) {
@@ -1029,7 +1060,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   }
 
   if (is_final_decision) {
-@@ -630,6 +659,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -673,6 +702,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
                                                  const GURL& embedding_origin,
                                                  ContentSetting content_setting,
                                                  bool is_one_time) {
@@ -1045,19 +1076,19 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
   DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
   DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-@@ -639,6 +677,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
+@@ -682,6 +720,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
   constraints.set_session_model(
       is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
                   : content_settings::mojom::SessionModel::DURABLE);
 +  if (is_one_time)
 +    constraints = content_settings::GetConstraintSessionExpiration(lifetime_option);
 
- #if BUILDFLAG(IS_ANDROID)
-   if (base::FeatureList::IsEnabled(
+   // The Permissions module in Safety check will revoke permissions after
+   // a finite amount of time if the permission can be revoked.
 diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
 --- a/components/permissions/permission_context_base.h
 +++ b/components/permissions/permission_context_base.h
-@@ -163,6 +163,15 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -166,6 +166,15 @@ class PermissionContextBase : public content_settings::Observer {
 
   // Updates stored content setting if persist is set, updates tab indicators
   // and runs the callback to finish the request.
@@ -1073,7 +1104,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
   virtual void NotifyPermissionSet(const PermissionRequestID& id,
                                    const GURL& requesting_origin,
                                    const GURL& embedding_origin,
-@@ -184,6 +193,11 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -187,6 +196,11 @@ class PermissionContextBase : public content_settings::Observer {
   // Store the decided permission as a content setting.
   // virtual since the permission might be stored with different restrictions
   // (for example for desktop notifications).
@@ -1086,8 +1117,8 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
                                     const GURL& embedding_origin,
                                     ContentSetting content_setting,
@@ -217,6 +231,12 @@ class PermissionContextBase : public content_settings::Observer {
-   // Implementors can override this method to avoid using automatic embargo.
-   virtual bool UsesAutomaticEmbargo() const;
+       PermissionRequest::PermissionDecidedCallback permission_decided_callback,
+       base::OnceClosure delete_callback) const;
 
 +  virtual std::unique_ptr<PermissionRequest> CreatePermissionRequest(
 +      content::WebContents* web_contents,
@@ -1095,10 +1126,10 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 +      PermissionRequest::PermissionDecidedCallbackWithLifetime permission_decided_callback,
 +      base::OnceClosure delete_callback) const;
 +
-   base::ObserverList<permissions::Observer> permission_observers_;
+   // Implementors can override this method to avoid using automatic embargo.
+   virtual bool UsesAutomaticEmbargo() const;
 
-   // Set by subclasses to inform the base class that they will handle adding
-@@ -240,7 +260,8 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -249,7 +269,8 @@ class PermissionContextBase : public content_settings::Observer {
                          const GURL& embedding_origin,
                          ContentSetting content_setting,
                          bool is_one_time,
@@ -1304,13 +1335,13 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
   }
 
   NotifyRequestDecided(PermissionAction::DENIED);
-@@ -1255,32 +1266,32 @@ PermissionRequestManager::VisitDuplicateRequests(
+@@ -1267,32 +1278,32 @@ PermissionRequestManager::VisitDuplicateRequests(
 
 void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
     PermissionRequest* request,
 -    bool is_one_time) {
 +    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
-   DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+   DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
                      pending_permission_requests_.Count(request))
       << "Only requests in [pending_permission_]requests_ can have duplicates";
 -  request->PermissionGranted(is_one_time);
@@ -1331,7 +1362,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 void PermissionRequestManager::PermissionDeniedIncludingDuplicates(
 -    PermissionRequest* request) {
 +    PermissionRequest* request, bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
-   DCHECK_EQ(1ul, base::ranges::count(requests_, request) +
+   DCHECK_EQ(1ul, std::ranges::count(requests_, request) +
                      pending_permission_requests_.Count(request))
       << "Only requests in [pending_permission_]requests_ can have duplicates";
 -  request->PermissionDenied();
@@ -1347,7 +1378,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
       request);
 }
 
-@@ -1541,7 +1552,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
+@@ -1558,7 +1569,7 @@ void PermissionRequestManager::DoAutoResponseForTesting() {
   }
   switch (auto_response_for_test_) {
     case ACCEPT_ONCE:
@@ -1371,7 +1402,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
   void Dismiss() override;
   void Ignore() override;
   void FinalizeCurrentRequests() override;
-@@ -375,9 +377,12 @@ class PermissionRequestManager
+@@ -374,9 +376,12 @@ class PermissionRequestManager
 
   // Calls PermissionGranted on a request and all its duplicates.
   void PermissionGrantedIncludingDuplicates(PermissionRequest* request,
@@ -7,9 +7,9 @@ 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.cc      | 42 ++++++++++++
 .../bookmarks/android/bookmark_bridge.h       |  8 +++
- .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
+ .../browser/bookmarks/bookmark_html_writer.cc | 14 +++-
 .../bookmark_merged_surface_service.cc        |  3 +
 .../permanent_folder_ordering_tracker.cc      |  2 +
 .../dialogs/DownloadLocationCustomView.java   |  4 +-
@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/bookmarks/browser/bookmark_uuids.h |  1 +
 components/bookmarks/browser/model_loader.cc  |  8 ++-
 .../bookmark_specifics_conversions.cc         |  1 +
- 25 files changed, 248 insertions(+), 15 deletions(-)
+ 25 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
@@ -45,7 +45,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.
+@@ -189,6 +193,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 +58,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;
+@@ -97,6 +97,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,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -3032,6 +3033,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3053,6 +3054,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                     getTabModelSelectorSupplier().get(),
                     closeAllTabsRunnable);
             RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -75,7 +75,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
         } else if (id == R.id.close_all_incognito_tabs_menu_id) {
             // Close only incognito tabs
             Runnable closeAllTabsRunnable =
-@@ -3117,6 +3120,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3138,6 +3141,27 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
     }
 
@@ -203,7 +203,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
     /**
      * Helper method to mark an item as read.
      *
-@@ -1339,6 +1401,9 @@ class BookmarkBridge {
+@@ -1345,6 +1407,9 @@ class BookmarkBridge {
         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
 
@@ -213,7 +213,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
 
         void getTopLevelFolderIds(
-@@ -1360,6 +1425,8 @@ class BookmarkBridge {
+@@ -1366,6 +1431,8 @@ class BookmarkBridge {
 
         BookmarkId getRootFolderId(long nativeBookmarkBridge);
 
@@ -225,16 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -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) {
+@@ -326,6 +326,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
   return bookmark_model_->account_mobile_node() != nullptr;
 }
 
@@ -268,7 +259,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(
+@@ -438,6 +465,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 +267,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(
+@@ -531,6 +559,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
     top_level_folders.push_back(other_node);
   }
 
@@ -286,7 +277,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
   const BookmarkNode* reading_list_node =
       local_or_syncable_reading_list_manager_->GetRoot();
   if (IsPermanentFolderVisible(ignore_visibility, reading_list_node)) {
-@@ -1269,6 +1300,17 @@ void BookmarkBridge::GetBookmarksOfType(
+@@ -1256,6 +1287,17 @@ void BookmarkBridge::GetBookmarksOfType(
   AddBookmarkNodesToBookmarkIdList(env, j_list, results);
 }
 
@@ -318,7 +309,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,
+@@ -223,6 +227,10 @@ class BookmarkBridge : public ProfileObserver,
                           const base::android::JavaParamRef<jobject>& j_list,
                           jint type);
 
@@ -332,50 +323,73 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 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> {
+@@ -173,14 +173,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());
+@@ -214,6 +215,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);
+@@ -289,6 +293,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
+ 
+    if (!WriteDescendants(*tabs_collection_value)) {
+      return bookmark_html_writer::Result::kCouldNotWriteNodes;
+    }
+
+     DecrementIndent();
+ 
+     if (!Write(kFolderChildrenEnd) || !Write(kNewline)) {
+@@ -435,6 +443,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+       case BookmarkNode::URL:
+       case BookmarkNode::OTHER_NODE:
+       case BookmarkNode::MOBILE:
+      case BookmarkNode::TABS_COLLECTION:
+         NOTREACHED();
+     }
+ 
+@@ -563,6 +572,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_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(
+@@ -29,6 +29,7 @@ BookmarkParentFolder GetBookmarkParentFolderFromPermanentType(
+     BookmarkNode::Type type) {
+   switch (type) {
+     case bookmarks::BookmarkNode::URL:
+    case bookmarks::BookmarkNode::TABS_COLLECTION:
+       NOTREACHED();
+     case bookmarks::BookmarkNode::FOLDER:
+       // TODO(crbug.com/381252292): Consider extending type with a value
+@@ -67,6 +68,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
 
     case BookmarkNode::Type::URL:
       NOTREACHED();
@@ -384,18 +398,10 @@ diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrom
   }
   NOTREACHED();
 }
-@@ -99,6 +101,7 @@ BookmarkParentFolder BookmarkParentFolder::FromFolderNode(
-   }
-   switch (node->type()) {
-     case bookmarks::BookmarkNode::URL:
-+    case bookmarks::BookmarkNode::TABS_COLLECTION:
-       NOTREACHED();
-     case bookmarks::BookmarkNode::FOLDER:
-       // TODO(crbug.com/381252292): Consider extending type with a value
 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) {
+@@ -23,6 +23,7 @@ bool IsValidTrackedType(BookmarkNode::Type type) {
   switch (type) {
     case bookmarks::BookmarkNode::URL:
     case bookmarks::BookmarkNode::FOLDER:
@@ -403,7 +409,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() {
+@@ -226,6 +227,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() {
   switch (tracked_type_) {
     case bookmarks::BookmarkNode::URL:
     case bookmarks::BookmarkNode::FOLDER:
@@ -435,7 +441,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
+@@ -4447,6 +4447,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 +454,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()) {
@@ -710,7 +716,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
 --- a/components/bookmarks/browser/bookmark_model.cc
 +++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -825,7 +825,7 @@ bool BookmarkModel::HasBookmarks() const {
+@@ -809,7 +809,7 @@ bool BookmarkModel::HasBookmarks() const {
 bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   return bookmark_bar_node_->children().empty() &&
@@ -719,7 +725,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 }
 
 bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1147,6 +1147,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1141,6 +1141,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,7 +736,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
 --- a/components/bookmarks/browser/bookmark_model.h
 +++ b/components/bookmarks/browser/bookmark_model.h
-@@ -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;
 
@@ -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,
+@@ -602,6 +608,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;
@@ -790,7 +796,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
     MOBILE
   };
 
-@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -241,6 +242,8 @@ class BookmarkPermanentNode : public BookmarkNode {
       int64_t id);
   static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
       int64_t id);
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -116,6 +116,9 @@ found in the LICENSE file.
+@@ -119,6 +119,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 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -3065,6 +3065,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
+@@ -3086,6 +3086,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2518,6 +2518,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2524,6 +2524,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return doOpenWebApk(currentTab);
         }
 
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 
         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
 
-@@ -1281,6 +1282,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1293,6 +1294,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
         findInPageMenuRow.setVisible(itemVisible);
     }
 
@@ -7,10 +7,10 @@ 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
@@ -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.
+@@ -77,6 +77,11 @@ found in the LICENSE file.
         android:title="@string/open_external_links_incognito_title"
         android:summary="@string/open_external_links_incognito_summary"
         android:defaultValue="false" />
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -140,6 +140,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+@@ -139,6 +139,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,12 +92,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileManager;
 import org.chromium.chrome.browser.profiles.ProfileProvider;
-@@ -615,7 +616,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -612,7 +613,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()));
 
@@ -112,7 +113,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.ContextUtils;
-@@ -79,12 +80,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -78,12 +79,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
+@@ -170,6 +185,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
+@@ -392,6 +422,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
+@@ -438,6 +469,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
+@@ -504,6 +542,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
+@@ -5954,6 +5954,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>
 
@@ -80,7 +80,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 +98,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-@@ -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 +106,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
+@@ -131,6 +132,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(newBase);
 
@@ -126,7 +126,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 {
+@@ -476,7 +477,9 @@ public class WarmupManager {
             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
 
             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -169,7 +169,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
+@@ -758,7 +758,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,7 +183,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -112,6 +112,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
+@@ -114,6 +114,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
 import org.chromium.components.tab_group_sync.TabGroupSyncService;
 import org.chromium.components.tab_groups.TabGroupColorId;
 import org.chromium.ui.MotionEventUtils;
@@ -191,7 +191,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -3999,8 +4000,13 @@ public class StripLayoutHelper
+@@ -4060,8 +4061,13 @@ public class StripLayoutHelper
         mTabMenu.setAnchorView(tabView);
         // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
         int tabHeight = mManagerHost.getHeight();
@@ -210,7 +210,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/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
+@@ -94,6 +94,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,7 +218,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.ui.base.WindowAndroid;
-@@ -438,7 +439,10 @@ public class StripLayoutHelperManager
+@@ -453,7 +454,10 @@ public class StripLayoutHelperManager
 
         mIsLayoutOptimizationsEnabled =
                 ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
@@ -252,7 +252,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 {
+@@ -620,7 +620,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
 
     @Override
     public int getControlContainerHeightResource() {
@@ -266,7 +266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -105,6 +105,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -109,6 +109,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;
@@ -275,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 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
+@@ -1777,7 +1779,9 @@ public class RootUiCoordinator
         if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
 
         int stubId = R.id.find_toolbar_stub;
@@ -300,7 +300,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 {
+@@ -280,6 +280,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 +311,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 +340,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 {
+@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys {
                 ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE,
                 ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP,
                 ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
@@ -359,7 +359,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c
 import org.chromium.ui.InsetObserver;
 import org.chromium.ui.InsetObserver.WindowInsetsConsumer;
 import org.chromium.ui.InsetsRectProvider;
-@@ -259,6 +260,7 @@ public class AppHeaderCoordinator
+@@ -260,6 +261,7 @@ public class AppHeaderCoordinator
     private static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
             InsetsRectProvider insetsRectProvider,
             @DesktopWindowHeuristicResult int currentResult) {
@@ -370,7 +370,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
+@@ -799,7 +799,7 @@ public class LocationBarCoordinator
     }
 
     private boolean isTabletWindow() {
@@ -382,7 +382,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1657,6 +1657,13 @@ Your Google account may have other forms of browsing history like searches and a
         Hide your IP address
       </message>
 
@@ -559,7 +559,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;
         }
@@ -578,7 +578,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 
 /** Class used to manage tab strip visibility and height updates. */
 public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver {
-@@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
+@@ -153,7 +154,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
         mTabStripReservedTopPadding =
                 controlContainerView()
                         .getResources()
@@ -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.
+@@ -96,6 +96,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;
+@@ -45,6 +45,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
+@@ -1666,8 +1667,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
             boolean hadCipherData =
                     CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
 
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 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
+@@ -92,6 +95,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private final SharedPreferencesManager mSharedPreferencesManager =
             ChromeSharedPreferences.getInstance();
 
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     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
+@@ -333,7 +338,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
             UserPrefs.get(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
+@@ -409,6 +418,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             getContext(), getProfile()));
         }
 
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5539,6 +5539,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -5479,6 +5479,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,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -94,6 +94,9 @@ import java.util.Map;
+@@ -99,6 +99,9 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -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
+@@ -918,9 +921,15 @@ public class TabGridDialogMediator
                 return;
             }
 
@@ -62,7 +62,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
 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,
+@@ -366,10 +367,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver,
                     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;
+@@ -66,6 +66,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
 import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation;
 import org.chromium.ui.widget.RectProvider;
 
@@ -107,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 /**
  * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
  * responsible for creating a list of menu items, setting up the menu and displaying the menu.
-@@ -191,9 +194,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+@@ -197,9 +200,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
                         /* didCloseCallback= */ null);
                 recordUserAction("DeleteGroup");
             } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) {
@@ -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 {
+@@ -293,6 +293,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 {
+@@ -61,6 +61,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
+@@ -1478,6 +1478,9 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_CLEAR_BROWSING_DATA_TAB_PERIOD_HOUR" desc="The option to delete browsing data from the last hour.">
         Last hour
       </message>
@@ -260,7 +260,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -91,6 +91,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -90,6 +90,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kShowForwardButton, true,
       GetHomeAndForwardButtonAndHomePageIsNewTabPageFlags());
@@ -272,7 +272,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1342,6 +1342,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
+@@ -1326,6 +1326,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
 // toolbar.
 inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
 
@@ -10,14 +10,22 @@ 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_engine_countries-inc.cc            |   2 +
 .../search_engines/search_engine_type.h       |   5 +++
- .../template_url_prepopulate_data.cc          |   1 -
+ .../template_url_prepopulate_data.cc          |   3 +-
 .../template_url_prepopulate_data.h           |   7 ----
- 8 files changed, 41 insertions(+), 12 deletions(-)
+ 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 +-
+ 14 files changed, 99 insertions(+), 25 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
@@ -57,58 +65,96 @@ diff --git a/components/resources/search_engine_choice_scaled_resources.grdp b/c
   <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
+@@ -70,6 +70,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 = [
+@@ -155,6 +156,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" ]
+@@ -235,6 +237,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) {
@@ -123,15 +169,7 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
 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(
+@@ -1452,5 +1452,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
   for (size_t i = 0; i < num_engines; i++) {
     t_url.push_back(engines[i]);
   }
@@ -161,7 +199,16 @@ 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,
+@@ -29,6 +29,8 @@
+ #include "components/version_info/version_info.h"
+ #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h"
+ 
+#include "components/search_engines/cromite/cromite_prepopulated_engines.h"
+
+ namespace TemplateURLPrepopulateData {
+ 
+ // Helpers --------------------------------------------------------------------
+@@ -78,7 +80,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,
   generator.seed(profile_seed);
   std::shuffle(t_urls.begin(), t_urls.end(), generator);
 
@@ -186,4 +233,172 @@ diff --git a/components/search_engines/template_url_prepopulate_data.h b/compone
 // 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;
+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
+@@ -25,6 +25,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 = "//tools/json_to_struct/json_to_struct.py"
+@@ -49,6 +54,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
+@@ -97,7 +97,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.
+ 
+@@ -133,11 +133,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')
+ 
+@@ -162,7 +166,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.
+ 
+@@ -191,7 +195,7 @@ def _GenerateCC(basepath, fileroot, head, namespace, schema, description):
+     f.write(element_generator.GenerateElements(schema['type_name'],
+         schema['schema'], description))
+ 
+-    if 'generate_array' in description:
+    if excludetype == False and 'generate_array' in description:
+       f.write(u'\n')
+       f.write(
+           u'const %s* const array_%s[] = {\n' %
+@@ -283,7 +287,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:
+@@ -302,8 +306,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(
+@@ -318,11 +322,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]
+@@ -339,4 +349,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
+@@ -232,14 +232,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,49 +5,67 @@ 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 +-
+ .../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 +++
 .../search_engines/template_url_service.cc    |  1 +
 content/browser/dips/dips_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(-)
+ 32 files changed, 386 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

 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",
+@@ -322,6 +322,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
@@ -59,7 +77,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
+@@ -1666,7 +1667,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
             Intent intent = getIntent();
 
             boolean hadCipherData =
@@ -72,10 +90,48 @@ 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
+@@ -163,6 +163,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
 
             mParent.updateButtonState();
             mShouldAnnounceCounterResult = true;
@@ -88,9 +144,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();
+@@ -255,7 +261,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.
+@@ -361,7 +367,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()) {
+@@ -451,6 +457,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+             BrowsingDataBridge.getForProfile(getProfile())
+                     .setBrowsingDataDeletionPreference(
+                             ClearBrowsingDataFragment.getDataType(item.getOption()),
+                            getClearBrowsingDataTabType(),
+                             item.isSelected());
+         }
+ 
+@@ -458,8 +465,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);
+@@ -485,6 +496,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+                 DialogOption.CLEAR_SITE_SETTINGS);
+     }
 
 +    protected boolean shouldClearBrowsingData() {
 +        return true;
@@ -99,7 +195,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
+@@ -493,7 +508,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+      */
+     private boolean isOptionSelectedByDefault(@DialogOption int option) {
+         return BrowsingDataBridge.getForProfile(getProfile())
+-                .getBrowsingDataDeletionPreference(getDataType(option));
+                .getBrowsingDataDeletionPreference(getDataType(option), getClearBrowsingDataTabType());
+     }
+ 
+     /**
+@@ -561,6 +576,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      * options.
      */
     private void onClearButtonClicked() {
@@ -107,7 +212,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
+@@ -591,6 +607,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
         Button clearButton = (Button) getView().findViewById(R.id.clear_button);
         boolean isEnabled = !getSelectedOptions().isEmpty();
         clearButton.setEnabled(isEnabled);
@@ -115,11 +220,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     }
 
     private int getSpinnerIndex(
+@@ -666,7 +683,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.
+@@ -696,8 +713,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 +301,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 +318,7 @@ new file mode 100644
 +    }
 +
 +    @Override
-+    protected void onClearBrowsingData() {
+    public void onClearBrowsingData() {
 +    }
 +
 +    @Override
@@ -194,53 +326,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 @@
+@@ -2203,6 +2203,16 @@
   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
     Delete browsing data
   </message>
@@ -260,15 +349,58 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 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,7 +443,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(
+@@ -360,6 +360,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     uint64_t origin_type_mask,
     base::OnceCallback<void(uint64_t)> callback) {
   CHECK(((remove_mask &
@@ -319,7 +451,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(
+@@ -467,6 +468,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           CreateTaskCompletionClosure(TracingDataType::kHistory),
           &history_task_tracker_);
     }
@@ -329,7 +461,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(
+@@ -575,6 +579,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 +473,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(
+@@ -603,9 +612,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     }
 
     device_event_log::Clear(delete_begin_, delete_end_);
@@ -355,7 +487,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(
+@@ -1309,6 +1322,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
 
     if (should_clear_zero_suggest_and_session_token && template_url_service)
       template_url_service->ClearSessionToken();
@@ -425,12 +557,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,
+@@ -1431,6 +1431,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 +577,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) {
+@@ -2117,7 +2130,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 +589,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;
 
@@ -542,16 +674,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
+@@ -1570,6 +1570,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 +684,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,
+@@ -1911,6 +1911,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 +728,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
@@ -691,11 +850,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
@@ -750,7 +910,7 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
 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(
+@@ -810,6 +810,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 &&
@@ -761,19 +921,19 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
 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;
+@@ -221,7 +221,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(
+@@ -1527,6 +1527,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -337,6 +337,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -347,6 +347,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
 
         if (mParams.isAnchor()) {
             ModelList linkGroup = new ModelList();
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
             if (FirstRunStatus.getFirstRunFlowComplete()
                     && !isEmptyUrl(mParams.getUrl())
                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -725,6 +728,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -738,6 +741,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                 getProfile(),
                                 false);
                     });
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -340,6 +340,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -343,6 +343,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kTabDragDropAndroid,
     &kToolbarPhoneCleanup,
     &kTabGroupCreationDialogAndroid,
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -407,6 +407,8 @@ public abstract class ChromeFeatureList {
+@@ -410,6 +410,8 @@ public abstract class ChromeFeatureList {
             "DisableToolbarSwipeUp";
     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
             "MoveTopToolbarToBottom";
@@ -188,7 +188,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
     public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
     public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
             "NotificationPermissionBottomSheet";
-@@ -761,6 +763,8 @@ public abstract class ChromeFeatureList {
+@@ -773,6 +775,8 @@ public abstract class ChromeFeatureList {
             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
     public static final CachedFlag sMoveTopToolbarToBottom =
             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -196,8 +196,8 @@ 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);
+@@ -959,6 +963,7 @@ public abstract class ChromeFeatureList {
                     sTabWindowManagerReportIndicesMismatch,
                     sTraceBinderIpc,
                     sUseChimeAndroidSdk,
@@ -208,7 +208,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1775,6 +1775,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1722,6 +1722,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
+@@ -3281,6 +3287,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>
@@ -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());
+@@ -214,6 +223,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());
@@ -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 @@
+@@ -63,6 +63,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(
+@@ -503,6 +504,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
     bool is_trusted,
     base::TimeTicks platform_time_stamp,
     KURL completed_url) {
@@ -370,7 +370,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   LocalDOMWindow* window = GetDocument().domWindow();
   if (!window) {
     return;
-@@ -582,6 +594,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -585,6 +597,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
             request.GetReferrerPolicy()));
   }
 
@@ -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;
+@@ -627,7 +648,7 @@ Element* HTMLAnchorElementBase::interestTargetElement() {
+       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) {
+@@ -723,13 +744,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) {
+@@ -739,7 +759,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() 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);
@@ -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) {
+@@ -197,14 +197,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(
+@@ -428,7 +430,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,
+@@ -451,6 +454,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,
+@@ -782,11 +795,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
 
   SetAutofillData(result.InnerNode(), data);
 
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -164,6 +164,7 @@
+@@ -166,6 +166,7 @@
 #include "components/sensitive_content/features.h"
 #include "components/services/heap_profiling/public/cpp/switches.h"
 #include "components/services/storage/public/cpp/buckets/bucket_info.h"
@@ -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 @@
+@@ -32,6 +32,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(
+@@ -349,6 +350,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>
+@@ -363,6 +368,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)
@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
 import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
 import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
-@@ -458,8 +459,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -442,8 +443,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
             finishCurrentSettings(mainFragment);
             return true;
         } else if (item.getItemId() == R.id.menu_id_general_help) {
@@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 --- a/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
 +++ b/components/browser_ui/settings/android/java/src/org/chromium/components/browser_ui/settings/SettingsUtils.java
-@@ -91,4 +91,8 @@ public class SettingsUtils {
+@@ -93,4 +93,8 @@ public class SettingsUtils {
         ToolbarUtils.setOverflowMenuVisibility(toolbar, visibility);
         return true;
     }
@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -480,6 +480,10 @@ vars = {
+@@ -476,6 +476,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 = {
+@@ -1842,6 +1846,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() {
+@@ -142,6 +142,9 @@ declare_args() {
   # `enable_libaom` should likely also be overriddent to false.
   enable_av1_decoder = enable_dav1d_decoder
 
@@ -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
+@@ -4652,6 +4652,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(
+@@ -498,10 +498,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(
+@@ -845,6 +845,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") {
+@@ -2394,6 +2394,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") {
+@@ -2440,6 +2444,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
+@@ -5510,6 +5510,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
 # Started failing after rolling new version of check-layout-th.js
 css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
 
@@ -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.
+@@ -14593,6 +14593,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.
+@@ -239,7 +239,7 @@ chromium-metrics-reviews@google.com.
   <int value="5" label="kImageICO"/>
   <int value="6" label="kImageBMP"/>
   <int value="7" label="kImageAVIF"/>
@@ -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(
+@@ -297,6 +297,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(
+@@ -566,25 +573,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(
+@@ -644,6 +632,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,
+@@ -1936,6 +1936,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
                         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 @@
+@@ -14,6 +14,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,
+@@ -286,6 +288,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 @@
+@@ -19,6 +19,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,
+@@ -1033,6 +1035,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -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    |  2 ++
 .../web_package/signed_exchange_reporter.cc      |  2 ++
 ...content_switch_dependent_feature_overrides.cc |  1 +
 .../Allow-building-without-enable_reporting.inc  |  2 ++
@@ -25,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../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, 63 insertions(+), 26 deletions(-)
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc

 diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
@@ -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) {
+@@ -1473,6 +1473,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) {
+@@ -1486,6 +1487,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 {
+@@ -222,12 +223,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
                    const std::string& group,
                    const std::string& type,
                    base::Value::Dict body) {
@@ -125,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -15258,12 +15258,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -15703,12 +15703,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
       }
     }
   }
@@ -215,6 +216,23 @@ 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
+@@ -94,11 +94,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 +273,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) {
@@ -282,7 +300,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -470,14 +470,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
       const GURL& url,
       const std::optional<base::UnguessableToken>& reporting_source,
       const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -314,7 +332,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") {
+@@ -1590,7 +1590,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 +343,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 {
+@@ -1205,6 +1205,7 @@ interface NetworkContext {
   // provided `network_anonymization_key`.
   //
   // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -333,7 +351,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 {
+@@ -1212,6 +1213,7 @@ interface NetworkContext {
               NetworkAnonymizationKey network_anonymization_key,
               mojo_base.mojom.DictionaryValue body);
 
@@ -341,7 +359,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 {
+@@ -1222,6 +1224,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 +370,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 "services/network/public/cpp/web_sandbox_flags.h"
+@@ -1295,6 +1296,7 @@ void ContentSecurityPolicy::ReportViolation(
     return;
   }
 
@@ -368,7 +386,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(
+@@ -1302,6 +1304,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 +397,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 +405,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() {
+@@ -2796,9 +2797,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
   return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
 }
 
@@ -402,7 +420,7 @@ 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"
@@ -410,7 +428,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -660,8 +661,9 @@ class CORE_EXPORT LocalFrame final
+@@ -659,8 +660,9 @@ class CORE_EXPORT LocalFrame final
   void FinishedScrollSequence();
 
   SmoothScrollSequencer* GetSmoothScrollSequencer() const;
@@ -439,17 +457,17 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
 +#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 {
+@@ -125,7 +128,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
   visitor->Trace(observers_);
   visitor->Trace(report_buffer_);
   visitor->Trace(execution_context_);
 +#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) {
@@ -476,7 +494,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,
+@@ -254,6 +262,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
         url, endpoint, body->featureId(), body->disposition(), body->message(),
         body->sourceFile(), line_number, column_number);
   }
@@ -517,8 +535,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
@@ -23,7 +23,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
-@@ -774,7 +774,6 @@ if (current_toolchain == default_toolchain) {
+@@ -784,7 +784,6 @@ if (current_toolchain == 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 +34,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
+@@ -92,7 +92,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 +64,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 +76,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 {
+@@ -469,7 +469,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
 }
 
 std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -88,7 +88,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) {
+@@ -675,10 +675,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
     prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
 
   pref_change_registrar_.Init(prefs);
@@ -99,7 +99,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() {
+@@ -1623,6 +1619,7 @@ GURL ProfileImpl::GetHomePage() {
 }
 
 void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -110,7 +110,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) {
+@@ -1181,10 +1181,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
   }
 
@@ -121,7 +121,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) {
+@@ -1970,9 +1966,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
   init_params.icon_index =
       profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
 
@@ -134,7 +134,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 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 +148,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) {
@@ -196,7 +196,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
 --- a/components/supervised_user/core/browser/supervised_user_service.cc
 +++ b/components/supervised_user/core/browser/supervised_user_service.cc
-@@ -49,10 +49,6 @@ void SupervisedUserService::Init() {
+@@ -50,10 +50,6 @@ void SupervisedUserService::Init() {
   DCHECK(settings_service_->IsReady());
 
   pref_change_registrar_.Init(&user_prefs_.get());
@@ -207,7 +207,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
   SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get()));
 }
 
-@@ -138,6 +134,7 @@ SupervisedUserService::SupervisedUserService(
+@@ -139,6 +135,7 @@ SupervisedUserService::SupervisedUserService(
 }
 
 void SupervisedUserService::SetActive(bool active) {
@@ -218,7 +218,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 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) {
+@@ -300,6 +300,7 @@ GURL NormalizeUrl(const GURL& url) {
 }
 
 bool AreWebFilterPrefsDefault(const PrefService& pref_service) {
@@ -229,11 +229,11 @@ diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/
 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);
- }
- 
-+SET_CROMITE_FEATURE_DISABLED(kKidFriendlyContentFeed);
+@@ -171,4 +171,10 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS,
+              "ReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
+
 +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +SET_CROMITE_FEATURE_DISABLED(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);
@@ -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(
+@@ -1311,6 +1311,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();
@@ -39,7 +39,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
-@@ -212,6 +212,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
   bool HasVideo() const override;
   bool HasAudio() const override;
 
@@ -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(
 --
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrom
 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 +55,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 {
+@@ -74,6 +74,7 @@ public class TemplateUrl {
      *     prepopulated_engines.json.
      */
     public String getNewTabURL() {
@@ -181,7 +181,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 +281,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 {
+@@ -1239,7 +1239,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                         mActivity,
                         mStatusIndicatorCoordinator,
                         isUrlBarFocusedSupplier,
@@ -296,7 +296,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;
     }
 
@@ -403,7 +403,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/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 {
+@@ -109,6 +109,8 @@ public interface TabWindowManager {
      */
     int getIncognitoTabCount();
 
@@ -415,7 +415,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 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
+@@ -458,6 +458,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
         return null;
     }
 
@@ -615,7 +615,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() {
+@@ -3748,8 +3748,10 @@ void WebContentsImpl::Stop() {
 void WebContentsImpl::SetPageFrozen(bool frozen) {
   TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
 
@@ -629,7 +629,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
+@@ -1161,6 +1161,12 @@ public class WebContentsImpl
         WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
     }
 
@@ -642,7 +642,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
+@@ -1459,6 +1465,8 @@ public class WebContentsImpl
 
         void setFocus(long nativeWebContentsAndroid, boolean focused);
 
@@ -666,7 +666,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 {
+@@ -187,6 +187,9 @@ public class MockWebContents implements WebContents, WebContentsObserver.Observa
     @Override
     public void setFocus(boolean hasFocus) {}
 
@@ -711,7 +711,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) {
+@@ -4307,6 +4307,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
 }
 
 void Document::DispatchFreezeEvent() {
@@ -722,7 +722,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() {
+@@ -3231,6 +3231,7 @@ void LocalFrame::DidFreeze() {
   LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
   GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
   Loader().SetDefersLoading(freeze_mode);
@@ -730,7 +730,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() {
+@@ -3245,6 +3246,7 @@ void LocalFrame::DidResume() {
   GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
   Loader().SetDefersLoading(LoaderFreezeMode::kNone);
 
@@ -741,7 +741,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(
+@@ -986,7 +986,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
   if (!parent_page_scheduler_)
     return SchedulingLifecycleState::kNotThrottled;
   if (parent_page_scheduler_->IsFrozen()) {
@@ -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)
+@@ -202,6 +202,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
   }
 }
 
@@ -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 {
+@@ -639,7 +640,9 @@ double AudioContext::baseLatency() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
   DCHECK(destination());
 
@@ -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 @@
+@@ -485,9 +485,8 @@
     {
       // AudioContext.playoutStats interface.
       // https://chromestatus.com/feature/5172818344148992
@@ -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();
@@ -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(
+@@ -4967,7 +4967,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
 }
 
 void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -106,7 +106,7 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -820,6 +820,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -827,6 +827,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() {
+@@ -2930,6 +2935,13 @@ void DocumentLoader::CommitNavigation() {
         response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
   }
 
@@ -64,7 +64,7 @@ diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_t
 diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc
 --- a/components/omnibox/browser/autocomplete_input.cc
 +++ b/components/omnibox/browser/autocomplete_input.cc
-@@ -92,10 +92,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
+@@ -96,10 +96,15 @@ void OffsetComponentsExcludingScheme(url::Parsed* parts, int offset) {
 bool HasScheme(const std::u16string& input, const char* scheme) {
   std::string utf8_input(base::UTF16ToUTF8(input));
   url::Component view_source_scheme;
@@ -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(
+@@ -582,7 +587,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) ||
@@ -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") {
+@@ -1085,6 +1085,8 @@ component("net") {
     "url_request/url_request_http_job.cc",
     "url_request/url_request_http_job.h",
     "url_request/url_request_interceptor.cc",
@@ -68,7 +68,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) {
+@@ -1928,6 +1928,9 @@ if (!is_robolectric && enable_java_templates) {
       sources = [ "//build/android/java/templates/BuildConfig.template" ]
       defines = []
 
@@ -81,7 +81,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 = [
+@@ -870,6 +870,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",
@@ -672,7 +672,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") {
+@@ -2525,6 +2525,12 @@ static_library("browser") {
   }
 
   if (is_android) {
@@ -1085,7 +1085,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -299,6 +299,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -302,6 +302,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kPriceChangeModule,
     &kPwaRestoreUi,
     &kPwaRestoreUiAtStartup,
@@ -1096,7 +1096,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -370,6 +370,7 @@ public abstract class ChromeFeatureList {
+@@ -373,6 +373,7 @@ public abstract class ChromeFeatureList {
     public static final String HISTORY_PANE_ANDROID = "HistoryPaneAndroid";
     public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode";
     public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
@@ -1672,7 +1672,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
+@@ -2360,6 +2360,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 +1685,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
+@@ -4298,7 +4304,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 +1697,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
+@@ -4309,6 +4318,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>
@@ -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 = [
+@@ -436,6 +436,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 = [
+@@ -624,6 +625,7 @@ chrome_java_resources = [
   "java/res/xml/about_chrome_preferences.xml",
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.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 = [
+@@ -941,6 +941,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",
@@ -426,7 +426,7 @@ 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 {
+@@ -923,9 +923,7 @@ public class TabModelImpl extends TabModelJniBridge {
                 .createTabWithWebContents(
                         parent,
                         webContents,
@@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -16566,6 +16566,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -16490,6 +16490,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Never show this again.
     </message>
 
@@ -481,15 +481,15 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 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"
+@@ -32,6 +32,7 @@
 #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 {
+@@ -89,6 +90,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 {
+@@ -269,6 +274,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() {
+@@ -1240,6 +1240,34 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -549,7 +549,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -217,6 +217,7 @@ class BrowserProcessImpl : public BrowserProcess,
 #endif
 
   component_updater::ComponentUpdateService* component_updater() override;
@@ -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,
+@@ -429,6 +430,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_;
@@ -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) {
+@@ -640,6 +640,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
   StubResolverConfigReader::RegisterPrefs(registry);
   DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
 
@@ -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";
+@@ -2868,6 +2868,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 inline constexpr char kAudioCaptureAllowedUrls[] =
     "hardware.audio_capture_allowed_urls";
 
@@ -1591,7 +1591,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
       web_contents_helper_(web_contents_helper) {}
 
 ContentSubresourceFilterThrottleManager::
-@@ -672,6 +676,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -679,6 +683,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
@@ -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,
- 
+@@ -1362,6 +1362,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,
+@@ -1400,13 +1413,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,
+@@ -1417,11 +1423,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   friend class ui_devtools::BubbleLocking;
   friend void DisableActivationChangeHandlingForTests();
 
@@ -69,7 +69,7 @@ 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 @@
+@@ -138,6 +138,12 @@
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 namespace extensions {
 
 namespace developer = api::developer_private;
-@@ -490,10 +496,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
+@@ -492,10 +498,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
   info->is_mv2_deprecation_notice_dismissed =
       ManifestV2ExperimentManager::Get(profile)
           ->DidUserAcknowledgeNoticeGlobally();
@@ -116,7 +116,7 @@ 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() {
+@@ -959,6 +987,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
     ExtensionUpdater::CheckParams params;
     params.fetch_priority = DownloadFetchPriority::kForeground;
     params.install_immediately = true;
@@ -124,7 +124,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() {
+@@ -1093,7 +1122,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
 
   const developer::ProfileConfigurationUpdate& update = params->update;
 
@@ -133,7 +133,7 @@ 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() {
+@@ -1107,6 +1136,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
         ->MarkNoticeAsAcknowledgedGlobally();
   }
 
@@ -148,7 +148,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -234,6 +234,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+@@ -244,6 +244,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
   static std::unique_ptr<api::developer_private::ProfileInfo> CreateProfileInfo(
       Profile* profile);
 
@@ -161,7 +161,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 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 @@
+@@ -65,6 +65,7 @@
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
@@ -169,7 +169,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;
+@@ -224,6 +225,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 +178,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) {
+@@ -231,11 +234,15 @@ std::string GetWebstoreLogin(Profile* profile) {
 }
 
 void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -194,7 +194,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
+@@ -1158,7 +1165,8 @@ ExtensionFunction::ResponseAction
 WebstorePrivateIsInIncognitoModeFunction::Run() {
   Profile* profile = Profile::FromBrowserContext(browser_context());
   return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -204,7 +204,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 }
 
 WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1248,11 +1256,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1254,11 +1262,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
   request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
       recent_navigations_to_collect);
 
@@ -217,9 +217,9 @@ 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/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 +236,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(
+@@ -387,6 +387,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
 
 bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
     const Extension* extension) {
@@ -260,7 +260,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/
 diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
 --- a/chrome/browser/extensions/extension_service.cc
 +++ b/chrome/browser/extensions/extension_service.cc
-@@ -443,8 +443,6 @@ ExtensionService::ExtensionService(
+@@ -446,8 +446,6 @@ ExtensionService::ExtensionService(
 
   UpgradeDetector::GetInstance()->AddObserver(this);
 
@@ -269,7 +269,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
   ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
 
   // Set up the ExtensionUpdater.
-@@ -1900,7 +1898,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+@@ -1762,7 +1760,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.
@@ -311,7 +311,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto
 diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
 --- a/chrome/browser/extensions/updater/extension_updater.cc
 +++ b/chrome/browser/extensions/updater/extension_updater.cc
-@@ -47,6 +47,7 @@
+@@ -49,6 +49,7 @@
 #include "extensions/browser/updater/extension_update_data.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -319,7 +319,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_updater_uma.h"
 #include "extensions/common/extension_urls.h"
-@@ -201,6 +202,10 @@ void ExtensionUpdater::Start() {
+@@ -203,6 +204,10 @@ void ExtensionUpdater::Start() {
   DCHECK(!weak_ptr_factory_.HasWeakPtrs());
   DCHECK(registry_);
   alive_ = true;
@@ -330,7 +330,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(
+@@ -335,7 +340,8 @@ void ExtensionUpdater::AddToDownloader(
     const Extension& extension = **extension_iter;
     const ExtensionId& extension_id = extension.id();
     if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -340,7 +340,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(
+@@ -349,7 +355,7 @@ void ExtensionUpdater::AddToDownloader(
       continue;
     }
 
@@ -349,7 +349,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(
+@@ -388,6 +394,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
 }
 
 void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -362,7 +362,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   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) {
+@@ -396,7 +408,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
 
   int request_id = next_request_id_++;
 
@@ -371,7 +371,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) {
+@@ -469,7 +481,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 +380,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) {
+@@ -479,7 +491,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 +389,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) {
+@@ -502,6 +514,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
           LOG(WARNING) << "Corrupt extension with id " << pending_id
                        << " will be reinstalled with ExtensionDownloader.";
         }
@@ -398,7 +398,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) {
+@@ -514,13 +528,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 +412,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) {
+@@ -528,7 +535,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
       const Extension* extension =
           registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
       if (extension) {
@@ -421,7 +421,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(
+@@ -669,7 +676,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
       file.extension_id, InstallStageTracker::Stage::INSTALLING);
   UpdatePingData(file.extension_id, ping);
 
@@ -430,7 +430,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(
+@@ -680,6 +687,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
 
 bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                DownloadPingData* ping_data) {
@@ -438,7 +438,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(
+@@ -796,7 +804,7 @@ bool ExtensionUpdater::CanUseUpdateService(
 void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
   std::set<int> request_ids;
 
@@ -447,7 +447,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
           << 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) {
+@@ -905,7 +913,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.
@@ -492,7 +492,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(
+@@ -626,7 +626,7 @@ void WebstoreInstaller::StartDownload(
       traffic_annotation));
   params->set_file_path(file);
   params->set_initiator(render_frame_host->GetLastCommittedOrigin());
@@ -544,7 +544,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 {
+@@ -299,6 +299,11 @@ export class Service implements ServiceInterface {
         {inDeveloperMode: inDevMode});
   }
 
@@ -678,7 +678,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
 namespace extensions {
 
 namespace {
-@@ -372,6 +374,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -374,6 +376,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
       {"itemSuspiciousInstallLearnMore",
        IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
       {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -687,7 +687,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,
+@@ -449,6 +453,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
       "hostPermissionsLearnMoreLink",
       extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
   source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -724,7 +724,7 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
 --- a/chrome/common/extensions/api/developer_private.idl
 +++ b/chrome/common/extensions/api/developer_private.idl
-@@ -295,6 +295,7 @@ namespace developerPrivate {
+@@ -296,6 +296,7 @@ namespace developerPrivate {
     boolean isIncognitoAvailable;
     boolean isChildAccount;
     boolean isMv2DeprecationNoticeDismissed;
@@ -732,7 +732,7 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/
   };
 
   // DEPRECATED: Prefer ExtensionInfo.
-@@ -354,6 +355,7 @@ namespace developerPrivate {
+@@ -355,6 +356,7 @@ namespace developerPrivate {
   dictionary ProfileConfigurationUpdate {
     boolean? inDeveloperMode;
     boolean? isMv2DeprecationNoticeDismissed;
@@ -1190,9 +1190,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);
+@@ -200,4 +200,18 @@ BASE_FEATURE(kUserScriptUserExtensionToggle,
+              "UserScriptUserExtensionToggle",
+              base::FEATURE_DISABLED_BY_DEFAULT);
 
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.
@@ -1212,9 +1212,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -241,6 +241,10 @@ BASE_DECLARE_FEATURE(kSilentDebuggerExtensionAPI);
- // nothing breaks.
- BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance);
+@@ -240,6 +240,10 @@ BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance);
+ // rather than the developer mode toggle on chrome://extensions.
+ BASE_DECLARE_FEATURE(kUserScriptUserExtensionToggle);
 
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
 +
@@ -1226,7 +1226,7 @@ diff --git a/extensions/common/extension_features.h b/extensions/common/extensio
 diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
 --- a/tools/typescript/definitions/developer_private.d.ts
 +++ b/tools/typescript/definitions/developer_private.d.ts
-@@ -280,6 +280,7 @@ declare global {
+@@ -281,6 +281,7 @@ declare global {
         isIncognitoAvailable: boolean;
         isChildAccount: boolean;
         isMv2DeprecationNoticeDismissed: boolean;
@@ -1234,7 +1234,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr
       }
 
       export interface ExtensionConfigurationUpdate {
-@@ -296,6 +297,7 @@ declare global {
+@@ -297,6 +298,7 @@ declare global {
       export interface ProfileConfigurationUpdate {
         inDeveloperMode?: boolean;
         isMv2DeprecationNoticeDismissed?: boolean;
@@ -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,
+@@ -1320,6 +1320,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(
+@@ -188,9 +188,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
   bool parse_result = base::StringToInt(major_version, &major_version_number);
   DCHECK(parse_result);
   std::optional<std::string> brand;
@@ -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(
+@@ -1301,6 +1301,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
     return;
   }
 
@@ -161,7 +161,7 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
 #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
 #include "url/origin.h"
 
-@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+@@ -108,11 +109,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
 
 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
@@ -255,7 +255,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -417,6 +417,11 @@
+@@ -438,6 +438,11 @@
       name: "AriaNotify",
       status: "test",
     },
@@ -267,4 +267,14 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "AriaRowColIndexText",
       status: "stable",
+@@ -804,8 +809,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
+     },
+     // This ensures that clipboard event fires on a target node which is
+     // focused in case no visible selection is present.
 --
@@ -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{
+@@ -485,7 +485,7 @@ const base::FeatureParam<bool> kIpPrivacyOnlyInIncognito{
 // NetworkChangeNotifier::AreNetworkHandlesSupported).
 #if BUILDFLAG(IS_ANDROID)
 inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
@@ -98,7 +98,7 @@ Require: bromite-build-utils.patch
 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
-@@ -69,6 +69,10 @@ import org.chromium.url.GURL;
+@@ -68,6 +68,10 @@ import org.chromium.url.GURL;
 import java.util.List;
 import java.util.Set;
 
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
 /** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */
 public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
     public static final String EMBEDDED_CONTENT_HELP_CENTER_URL =
-@@ -243,7 +247,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -242,7 +246,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
 
     @Override
     public boolean isHelpAndFeedbackEnabled() {
@@ -118,7 +118,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
     }
 
     @Override
-@@ -400,6 +404,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -399,6 +403,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
         return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin);
     }
 
@@ -151,7 +151,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele
 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
-@@ -1457,4 +1457,5 @@
+@@ -1432,4 +1432,5 @@
           </settings-subpage>
         </template>
       </template>
@@ -263,7 +263,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
 
 /**
  * Add all of the child routes that originate from the privacy route,
-@@ -165,6 +166,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -166,6 +167,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
     r.SITE_SETTINGS_WEB_APP_INSTALLATION =
         r.SITE_SETTINGS.createChild('webApplications');
   }
@@ -370,7 +370,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
 --- a/chrome/browser/resources/settings/site_settings/site_details.html
 +++ b/chrome/browser/resources/settings/site_settings/site_details.html
-@@ -331,4 +331,5 @@
+@@ -326,4 +326,5 @@
             label="$i18n{siteSettingsWebAppInstallation}">
         </site-details-permission>
       </template>
@@ -589,7 +589,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
     {
       route: routes.SITE_SETTINGS_ADS,
       id: Id.ADS,
-@@ -451,10 +451,36 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
+@@ -440,10 +440,36 @@ function getCategoryItemMap(): Map<ContentSettingsTypes, CategoryListItem> {
       icon: 'privacy:cookie',
     },
   ];
@@ -626,7 +626,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
 function buildItemListFromIds(orderedIdList: ContentSettingsTypes[]):
     CategoryListItem[] {
   const map = getCategoryItemMap();
-@@ -544,7 +570,7 @@ export class SettingsSiteSettingsPageElement extends
+@@ -532,7 +558,7 @@ export class SettingsSiteSettingsPageElement extends
               Id.IMAGES,
               Id.POPUPS,
             ]),
@@ -710,7 +710,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
 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
-@@ -1767,6 +1767,7 @@ static_library("ui") {
+@@ -1791,6 +1791,7 @@ static_library("ui") {
       "//components/commerce/core/mojom:mojo_bindings",
       "//components/commerce/core/webui",
       "//components/endpoint_fetcher:endpoint_fetcher",
@@ -718,7 +718,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
       "//components/enterprise/common:files_scan_data",
       "//components/feedback/proto",
       "//components/headless/policy",
-@@ -4962,6 +4963,7 @@ static_library("ui") {
+@@ -5006,6 +5007,7 @@ static_library("ui") {
       "//components/prefs",
       "//components/reading_list/features:flags",
       "//components/segmentation_platform/embedder/default_model:default_model",
@@ -746,7 +746,7 @@ diff --git a/chrome/browser/ui/views/controls/rich_controls_container_view.h b/c
 diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
-@@ -54,6 +54,7 @@
+@@ -56,6 +56,7 @@
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/flex_layout.h"
@@ -754,7 +754,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
 #include "ui/views/view_class_properties.h"
 
 #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -254,8 +255,20 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -256,8 +257,20 @@ void PageInfoMainView::SetPermissionInfo(
   scroll_view->SetDrawOverflowIndicator(false);
   auto* content_view =
       scroll_view->SetContents(std::make_unique<views::View>());
@@ -777,7 +777,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
   content_view->SetID(PageInfoViewFactory::VIEW_ID_PAGE_INFO_PERMISSION_VIEW);
   content_view->SetProperty(views::kElementIdentifierKey,
                             kPermissionsElementId);
-@@ -270,11 +283,16 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -272,11 +285,16 @@ void PageInfoMainView::SetPermissionInfo(
     }
   }
 
@@ -794,7 +794,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
     toggle_row->SetProperty(views::kCrossAxisAlignmentKey,
                             views::LayoutAlignment::kStretch);
     syncable_permission_rows_.emplace(permission.type, toggle_row);
-@@ -282,6 +300,8 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -284,6 +302,8 @@ void PageInfoMainView::SetPermissionInfo(
   }
 
   for (auto& object : chosen_object_info_list) {
@@ -803,7 +803,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
     // The view takes ownership of the object info.
     auto object_view = std::make_unique<ChosenObjectView>(
         std::move(object),
-@@ -292,6 +312,10 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -294,6 +314,10 @@ void PageInfoMainView::SetPermissionInfo(
         content_view->AddChildView(std::move(object_view)));
   }
 
@@ -817,7 +817,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
-@@ -28,6 +28,8 @@
+@@ -27,6 +27,8 @@
 #include "chrome/browser/ui/views/page_info/page_info_permission_content_view.h"
 #include "chrome/browser/ui/views/page_info/page_info_security_content_view.h"
 #include "components/content_settings/core/common/content_settings_types.h"
@@ -1177,7 +1177,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "build/buildflag.h"
-@@ -74,6 +75,9 @@
+@@ -73,6 +74,9 @@
 #include "components/dom_distiller/core/dom_distiller_features.h"
 #include "components/google/core/common/google_util.h"
 #include "components/history/core/common/pref_names.h"
@@ -1187,7 +1187,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
 #include "components/password_manager/core/browser/manage_passwords_referrer.h"
 #include "components/password_manager/core/common/password_manager_features.h"
-@@ -3779,6 +3783,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3802,6 +3806,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
   policy_indicator::AddLocalizedStrings(html_source);
   AddSecurityKeysStrings(html_source);
 
@@ -1247,7 +1247,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-@@ -49,6 +49,8 @@
+@@ -47,6 +47,8 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -1256,8 +1256,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-@@ -247,13 +249,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
-     {ContentSettingsType::LEGACY_COOKIE_SCOPE, nullptr},
+@@ -249,13 +251,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
+     {ContentSettingsType::POINTER_LOCK, nullptr},
 });
 
 -static_assert(
@@ -1277,7 +1277,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 
 struct SiteSettingSourceStringMapping {
   SiteSettingSource source;
-@@ -501,6 +503,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
+@@ -503,6 +505,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
       return true;
     }
   }
@@ -1291,7 +1291,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   return false;
 }
 
-@@ -514,11 +523,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
+@@ -516,11 +525,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
       return entry.type;
     }
   }
@@ -1317,7 +1317,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   for (const auto& entry : kContentSettingsTypeGroupNames) {
     if (type == entry.type) {
       // Content setting types that aren't represented in the settings UI
-@@ -533,7 +555,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
+@@ -535,7 +557,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
       return entry.name ? entry.name : std::string_view();
     }
   }
@@ -1325,7 +1325,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   NOTREACHED() << static_cast<int32_t>(type)
                << " is not a recognized content settings type.";
 }
-@@ -643,6 +664,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
+@@ -644,6 +665,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
       base_types->push_back(ContentSettingsType::WEB_APP_INSTALLATION);
     }
 
@@ -1450,15 +1450,15 @@ new file mode 100644
 diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java
 --- a/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java
 +++ b/components/browser_ui/settings/android/widget/java/src/org/chromium/components/browser_ui/settings/SpinnerPreference.java
-@@ -23,6 +23,7 @@ public class SpinnerPreference extends Preference {
-     private ArrayAdapter<Object> mAdapter;
+@@ -29,6 +29,7 @@ public class SpinnerPreference extends Preference {
+     private @Nullable ArrayAdapter<Object> mAdapter;
     private int mSelectedIndex;
     private final boolean mSingleLine;
 +    private boolean mIsWidget = false;
 
     /** Constructor for inflating from XML. */
     public SpinnerPreference(Context context, AttributeSet attrs) {
-@@ -37,6 +38,19 @@ public class SpinnerPreference extends Preference {
+@@ -43,6 +44,19 @@ public class SpinnerPreference extends Preference {
         }
     }
 
@@ -1478,7 +1478,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
     /**
      * Provides a list of arbitrary objects to be shown in the spinner. Visually, each option will
      * be presented as its toString() text. Alternative to {@link #setAdapter(ArrayAdapter, int)}.
-@@ -56,6 +70,12 @@ public class SpinnerPreference extends Preference {
+@@ -62,6 +76,12 @@ public class SpinnerPreference extends Preference {
         mSelectedIndex = selectedIndex;
     }
 
@@ -1489,9 +1489,9 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 +    }
 +
     /** Returns the Spinner instance for introspection during tests. */
-     public Spinner getSpinnerForTesting() {
+     public @Nullable Spinner getSpinnerForTesting() {
         return mSpinner;
-@@ -88,6 +108,10 @@ public class SpinnerPreference extends Preference {
+@@ -94,6 +114,10 @@ public class SpinnerPreference extends Preference {
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
@@ -1499,7 +1499,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 +            holder.setDividerAllowedAbove(true);
 +            holder.setDividerAllowedBelow(true);
 +        }
-         ((TextView) holder.findViewById(R.id.title)).setText(getTitle());
+         ((TextView) assumeNonNull(holder.findViewById(R.id.title))).setText(getTitle());
         CharSequence summary = getSummary();
         TextView summaryView = ((TextView) holder.findViewById(R.id.summary));
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
@@ -2842,7 +2842,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 
 namespace content_settings {
 
-@@ -848,6 +849,7 @@ void ContentSettingsRegistry::Init() {
+@@ -858,6 +859,7 @@ void ContentSettingsRegistry::Init() {
            WebsiteSettingsRegistry::DESKTOP,
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -2853,7 +2853,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc
 --- a/components/content_settings/core/browser/content_settings_uma_util.cc
 +++ b/components/content_settings/core/browser/content_settings_uma_util.cc
-@@ -207,11 +207,7 @@ void RecordContentSettingsHistogram(const std::string& name,
+@@ -212,11 +212,7 @@ void RecordContentSettingsHistogram(const std::string& name,
 }
 
 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
@@ -2869,7 +2869,7 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -20,6 +20,7 @@
+@@ -16,6 +16,7 @@
 #include "build/build_config.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -2877,7 +2877,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/content_settings/core/common/content_settings_utils.h"
-@@ -128,6 +129,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) {
+@@ -125,6 +126,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) {
 
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
@@ -3185,10 +3185,10 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom
 --- a/components/content_settings/core/common/content_settings_types.mojom
 +++ b/components/content_settings/core/common/content_settings_types.mojom
-@@ -468,5 +468,7 @@ enum ContentSettingsType {
-   // Checks whether cookies scope is handled according to origin-bound cookies
-   // or legacy behavior.
-   LEGACY_COOKIE_SCOPE,
+@@ -475,5 +475,7 @@ enum ContentSettingsType {
+ 
+   // Content settings for access to the Controlled Frame API.
+   CONTROLLED_FRAME,
 +
 +#include "components/content_settings/core/common/bromite_content_settings.inc"
 };
@@ -3572,7 +3572,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
@@ -44,6 +44,7 @@
- #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom-blink-forward.h"
+ #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/permissions_policy/policy_disposition.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/v8_cache_options.mojom-blink-forward.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
@@ -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 ++++++++++++++++++
+ .../res/xml/privacy_preferences_cromite.xml   | 197 ++++++++++++++++++
 .../privacy/settings/PrivacySettings.java     |   4 +-
 .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 218 insertions(+), 5 deletions(-)
+ 5 files changed, 217 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 = [
+@@ -643,7 +643,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,197 @@
 +<?xml version="1.0" encoding="utf-8"?><!--
 +Copyright 2022 The Chromium Authors
 +Use of this source code is governed by a BSD-style license that can be
@@ -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"
@@ -254,7 +253,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -152,7 +152,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -147,7 +147,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
 
@@ -263,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
         Preference fpProtectionPreference = findPreference(PREF_FP_PROTECTION);
         fpProtectionPreference.setVisible(shouldShowFpProtectionUi());
-@@ -249,7 +249,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -244,7 +244,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.PASSWORD_LEAK_TOGGLE_MOVE)) {
             passwordLeakTogglePref.setOnPreferenceChangeListener(this);
@@ -55,11 +55,11 @@ 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 ++++-----
 tools/grit/grit/grd_reader.py                 |  35 +++++++
- 55 files changed, 189 insertions(+), 120 deletions(-)
+ 55 files changed, 201 insertions(+), 128 deletions(-)

 diff --git a/build/BUILD.gn b/build/BUILD.gn
 --- a/build/BUILD.gn
@@ -152,7 +152,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
@@ -13155,7 +13155,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") {
+@@ -1844,6 +1844,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//build/config/linux/dbus:buildflags",
@@ -13189,7 +13189,7 @@ 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 @@
+@@ -27,6 +27,7 @@
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
@@ -13197,7 +13197,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -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());
@@ -13255,7 +13255,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
+@@ -2425,7 +2425,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">
@@ -18917,9 +18917,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 +18938,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 +18957,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() {
+@@ -564,19 +564,22 @@ void ResolveInvalidConfigurations() {
        base::FeatureList::IsEnabled(
            features::kPrivacySandboxAdsAPIsM1Override)) &&
       !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -18957,7 +18966,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,7 +18984,14 @@ 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() {
+@@ -584,12 +587,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)) {
@@ -18978,16 +19000,21 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "Topics cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
         << blink::features::kBrowsingTopics.name << " in addition.";
-@@ -609,7 +608,7 @@ void ResolveInvalidConfigurations() {
+@@ -597,30 +602,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)) {
@@ -18998,7 +19025,10 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
            "configuration. Use --"
         << switches::kEnableFeatures << "="
         << blink::features::kSharedStorageAPI.name << " in addition.";
-@@ -630,7 +629,7 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableSharedStorageAPI(false);
+  } else {
+    CHECK(false) << "kSharedStorageAPI is enabled!";
+   }
 
   if (!base::FeatureList::IsEnabled(
           attribution_reporting::features::kConversionMeasurement)) {
@@ -19007,18 +19037,12 @@ 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() {
+@@ -628,23 +626,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)) {
 -    LOG_IF(WARNING,
@@ -19027,7 +19051,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "AdInterestGroupAPI cannot be enabled in this "
            "configuration. Use --"
         << switches::kEnableFeatures << "="
-@@ -668,8 +665,7 @@ void ResolveInvalidConfigurations() {
+         << blink::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)) {
@@ -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
+@@ -781,10 +781,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                                 @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
+@@ -195,12 +195,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
         // Skip opening a new Tab if it doesn't make sense.
         if (mTab.isClosing()) return false;
 
@@ -130,7 +130,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;
+@@ -28,6 +28,7 @@ import androidx.appcompat.content.res.AppCompatResources;
 import org.chromium.base.BuildInfo;
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
@@ -138,7 +138,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
+@@ -823,11 +824,16 @@ public class RootUiCoordinator
                     TrackerFactory.getTrackerForProfile(tab.getProfile())
                             .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
 
@@ -462,8 +462,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;
+@@ -85,6 +86,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
             return null;
         }
 
@@ -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
+@@ -297,8 +297,17 @@ class LocationBarMediator
             if (!mUrlFocusedWithPastedText
                     && !shouldRetainOmniboxOnFocus
                     && mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -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 {
+@@ -110,6 +111,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 {
+@@ -336,6 +338,28 @@ public class UrlBar extends AutocompleteEditText {
         fixupTextDirection();
 
         mShouldSendTypingStartedEvent = focused;
@@ -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) {
@@ -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();
@@ -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") {
+@@ -8151,6 +8151,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") {
+@@ -8166,7 +8172,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") {
+@@ -8609,7 +8614,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)
+@@ -382,7 +382,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 @@
+@@ -878,12 +878,14 @@
       }
     },
     {
@@ -26,7 +26,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1780,7 +1780,7 @@
+@@ -1833,7 +1833,7 @@
     {
       name: "FedCm",
       public: true,
@@ -47,16 +47,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 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 {
+@@ -57,8 +57,6 @@ public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
 
-     private static final int INVALIDATE_URI_DELAY_MS = 10_000;
+     private static final int INVALIDATE_URI_DELAY_MS = 60_000;
+     private static final int PAGE_EXTRACTION_TIMEOUT_MS = 30_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 {
+@@ -354,10 +352,6 @@ public class PageContentProviderImpl extends SplitCompatContentProvider.Impl {
     }
 
     private static void grantAccessToUri(Uri uri) {
@@ -112,9 +112,9 @@ 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,16 +14,11 @@ import org.chromium.build.annotations.Nullable;
 /** This class provides utilities for the state of Google Search App. */
+ @NullMarked
 public class GSAUtils {
 -    public static final String GSA_PACKAGE_NAME = "com.google.android.googlequicksearchbox";
 -    public static final String GSA_CLASS_NAME =
@@ -130,15 +130,15 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
     }
 
     /**
-@@ -34,6 +29,7 @@ public class GSAUtils {
+@@ -35,6 +30,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 {
+@@ -65,7 +61,7 @@ public class GSAUtils {
      * @return The version name of the Agsa package or null if it can't be found.
      */
     public static @Nullable String getAgsaVersionName() {
@@ -27,7 +27,7 @@ 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(
+@@ -60,7 +60,7 @@ void InstalledAppProviderImpl::FilterInstalledApps(
     const GURL& manifest_url,
     FilterInstalledAppsCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -58,7 +58,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2499,9 +2499,8 @@
+@@ -2514,9 +2514,8 @@
       name: "InspectorGhostRules",
     },
     {
@@ -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)
+@@ -352,8 +352,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);
 
@@ -13,7 +13,7 @@ Real-box is search box in ntp
 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,
+@@ -2323,7 +2323,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   registry->RegisterBooleanPref(
       prefs::kLensRegionSearchEnabled, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -63,7 +63,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,
+@@ -174,8 +174,8 @@ BASE_FEATURE(kNtpModulesLoad,
 // If enabled, OneGoogleBar will be shown.
 // This is a kill switch. Keep indefinitely.
 BASE_FEATURE(kNtpOneGoogleBar,
@@ -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,
+@@ -370,6 +371,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
 
 }  // namespace
 
@@ -137,7 +137,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
 
 QuicSessionRequest::~QuicSessionRequest() {
-@@ -2229,7 +2262,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -2267,7 +2300,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
               cert_verifier_, transport_security_state_, sct_auditing_delegate_,
               HostsFromOrigins(params_.origins_to_force_quic_on),
               actual_network_anonymization_key),
@@ -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) {
@@ -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(
+@@ -549,6 +549,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
 
   WebRuntimeFeatures::EnableRemotePlayback(false);
 
@@ -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(
+@@ -438,6 +440,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,18 @@ 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 --
 .../predictors/autocomplete_action_predictor.cc  |  2 ++
 .../predictors/loading_predictor_config.cc       |  4 ++--
 chrome/browser/predictors/predictors_features.cc |  3 +--
+ .../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 -
@@ -33,6 +36,7 @@ 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 +++
 .../Disable-all-predictors-code.inc              |  1 +
@@ -44,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../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(-)
+ 43 files changed, 114 insertions(+), 45 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
@@ -55,7 +59,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -727,8 +727,6 @@ static_library("browser") {
+@@ -746,8 +746,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,11 +68,12 @@ 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") {
+@@ -2261,7 +2259,7 @@ static_library("browser") {
     "//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",
@@ -183,10 +188,34 @@ 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
+@@ -41,8 +41,6 @@ source_set("permissions") {
+     "permission_manager_factory.h",
+     "permission_revocation_request.cc",
+     "permission_revocation_request.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
+@@ -416,8 +416,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
+       std::make_unique<ContextualNotificationPermissionUiSelector>());
+   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/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,10 +251,21 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p
 
 }  // namespace
 
+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
+@@ -1134,7 +1134,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") {
+@@ -52,7 +52,6 @@ static_library("safe_browsing") {
     "//components/safe_browsing/content/browser",
     "//components/safe_browsing/content/browser:client_side_detection",
     "//components/safe_browsing/content/browser:client_side_detection_service",
@@ -265,7 +305,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) {
+@@ -419,7 +419,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   }
   MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
   NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -316,7 +356,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(
+@@ -208,19 +215,23 @@ void ReadAloudAppModel::CalculatePhrases(
       base::BindOnce(&ReadAloudAppModel::UpdatePhraseBoundaries,
                      weak_ptr_factory_.GetWeakPtr(), phrase_tokens));
 }
@@ -342,7 +382,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,
+@@ -282,6 +293,7 @@ void ReadAloudAppModel::UpdatePhraseBoundaries(std::vector<std::string> tokens,
     current_phrase_calculation_index_ = -1;
     LOG(WARNING) << "All phrases calculated!";
   }
@@ -399,7 +439,7 @@ 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 @@
+@@ -26,7 +26,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/read_anything/read_anything_constants.h"
 #include "chrome/renderer/accessibility/ax_tree_distiller.h"
@@ -409,7 +449,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
 #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.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() {
+@@ -1452,6 +1454,7 @@ void ReadAnythingAppController::OnConnected() {
   render_frame()->GetBrowserInterfaceBroker().GetInterface(
       std::move(page_handler_factory_receiver));
 
@@ -417,7 +457,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() {
+@@ -1460,6 +1463,7 @@ void ReadAnythingAppController::OnConnected() {
   page_handler_->GetDependencyParserModel(
       base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
                      weak_ptr_factory_.GetWeakPtr()));
@@ -425,7 +465,7 @@ 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() {
+@@ -1669,11 +1673,13 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
 }
 
 void ReadAnythingAppController::PreprocessTextForSpeech() {
@@ -439,7 +479,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
 }
 
 void ReadAnythingAppController::MovePositionToNextGranularity() {
-@@ -1843,14 +1849,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
+@@ -1851,14 +1857,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
 
 void ReadAnythingAppController::UpdateDependencyParserModel(
     base::File model_file) {
@@ -479,8 +519,8 @@ 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>
+   // Stores a screenshot of the page and triggers distillation to record protos.
+   // This function is not used in production and is behind the disabled
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
@@ -521,7 +561,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 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(
+@@ -229,6 +229,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 +569,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(
+@@ -280,7 +281,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 +578,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(
+@@ -306,7 +307,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
     const CreditCard& card) const {
   if (auto optimization_type =
           GetVcnMerchantOptOutOptimizationTypeForCard(card);
@@ -550,7 +590,7 @@ 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 @@
+@@ -48,7 +48,9 @@
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
@@ -560,7 +600,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;
+@@ -118,6 +120,7 @@ using ProviderType = AutocompleteProvider::Type;
 
 constexpr bool is_android = !!BUILDFLAG(IS_ANDROID);
 
@@ -568,7 +608,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) {
+@@ -226,6 +229,7 @@ void RecordTotalMatchesScored(size_t num_scored) {
   base::UmaHistogramCounts1000("Omnibox.URLScoringModelExecuted.Matches",
                                num_scored);
 }
@@ -631,7 +671,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 
 }  // namespace
 
-@@ -450,8 +446,7 @@ size_t MaxURLKeyedHintCacheSize() {
+@@ -445,8 +441,7 @@ size_t MaxURLKeyedHintCacheSize() {
 }
 
 bool ShouldPersistHintsToDisk() {
@@ -641,7 +681,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
 }
 
 RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
-@@ -897,5 +892,13 @@ bool IsPrivacyGuideAiSettingsEnabled() {
+@@ -888,5 +883,13 @@ bool IsPrivacyGuideAiSettingsEnabled() {
   return base::FeatureList::IsEnabled(kPrivacyGuideAiSettings);
 }
 
@@ -706,7 +746,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 +759,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);
+@@ -295,4 +295,8 @@ bool ShouldIncludeHiddenButSearchableContent() {
+   return kIncludeHiddenButSearchableContent.Get();
 }
 
 +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotations);
@@ -739,10 +779,27 @@ 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
+@@ -26,6 +26,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,
+@@ -233,6 +233,7 @@ BASE_FEATURE(kLocalListsUseSBv5,
 BASE_FEATURE(kOnDeviceNotificationContentDetectionModel,
              "OnDeviceNotificationContentDetectionModel",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -806,7 +863,7 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni
 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(
+@@ -1757,6 +1757,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
 }
 
 bool HTMLDocumentParser::ShouldSkipPreloadScan() {
@@ -817,7 +874,7 @@ 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;
   }
 
@@ -828,7 +885,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
 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 @@
+@@ -3404,7 +3404,7 @@
       //
       // It also has some feature params defined throughout the codebase.
       name: "Prerender2",
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1465,6 +1465,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1511,6 +1511,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
     }
 
     private boolean maybeShowPromo(Profile profile) {
@@ -28,7 +28,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) {
+@@ -150,7 +150,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                 false);
@@ -103,15 +103,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 +-
@@ -38,21 +39,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../public/browser/content_browser_client.cc  |   7 +-
 .../public/browser/navigation_controller.cc   |   1 -
 .../Disable-conversion-measurement-api.inc    |   1 +
- .../Disable-conversion-measurement-api.inc    |   8 +
+ .../Disable-conversion-measurement-api.inc    |  10 +
 .../attribution/request_headers_internal.cc   |   1 +
- services/network/network_context.cc           |   2 +
+ services/network/network_context.cc           |  20 -
 .../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, 101 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
+@@ -1302,6 +1302,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(
+@@ -1320,6 +1321,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -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.
+@@ -1149,9 +1148,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 {
+@@ -151,6 +151,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
                 // not great to dynamically remove the preference in this way.
             case SiteSettingsCategory.Type.ADS:
                 return SiteSettingsCategory.adsCategoryEnabled();
@@ -164,7 +166,7 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -92,7 +92,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -94,7 +94,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
         r.SITE_SETTINGS.createChild('smartCardReaders');
   }
   // </if>
@@ -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);
@@ -273,7 +275,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(
+@@ -758,11 +758,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();
+@@ -1121,6 +1119,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
     Registrations& registrations,
     HeaderPendingDecode pending_decode,
     Registrar registrar) {
@@ -285,7 +301,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(
+@@ -119,8 +119,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
+ }
+ 
+@@ -318,6 +316,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
     return;
   }
 
@@ -293,6 +318,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
+@@ -573,11 +573,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
@@ -361,13 +401,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_page_size(4096).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(
+@@ -10242,6 +10242,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
     return false;
   }
 
@@ -375,14 +415,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(
+@@ -14046,6 +14047,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 +435,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(
+@@ -1482,15 +1482,6 @@ void StoragePartitionImpl::Initialize(
 
   bucket_manager_ = std::make_unique<BucketManager>(this);
 
@@ -411,7 +451,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
   if (base::FeatureList::IsEnabled(blink::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(
+@@ -1542,9 +1533,6 @@ void StoragePartitionImpl::Initialize(
 
   font_access_manager_ = FontAccessManager::Create();
 
@@ -424,7 +464,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") {
+@@ -203,8 +203,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",
@@ -898,7 +938,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/Attrib
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -586,6 +586,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -601,6 +601,7 @@ void ContentBrowserClient::OnAuctionComplete(
 network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
     bool client_os_disabled) {
@@ -906,7 +946,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(
+@@ -618,13 +619,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -922,7 +962,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(
+@@ -632,7 +633,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
     content::RenderFrameHost* rfh,
     const url::Origin& context_origin,
     const url::Origin& reporting_origin) {
@@ -947,12 +987,12 @@ 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);
+// none
 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 @@
+@@ -0,0 +1,10 @@
 +SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsDocumentAPI);
@@ -961,6 +1001,8 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kFledgeBiddingAndAuctionServer);
 +SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 +SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
+SET_CROMITE_FEATURE_DISABLED(kBiddingAndScoringDebugReportingAPI);
+SET_CROMITE_FEATURE_DISABLED(kAllowURNsInIframes);
 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,30 @@ 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));
+@@ -2637,26 +2637,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+     builder.set_network_quality_estimator(
+         network_service_->network_quality_estimator());
   }
- 
-+  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())));
-     }
-+  }
+-  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 +1063,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
+@@ -209,8 +209,6 @@ struct AttributionSrcLoader::AttributionHeaders {
+                      uint64_t request_id)
+       : web_source(map.Get(http_names::kAttributionReportingRegisterSource)),
+         web_trigger(map.Get(http_names::kAttributionReportingRegisterTrigger)),
+-        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(
+@@ -1575,7 +1575,7 @@ void Page::UpdateBrowsingContextGroup(
 
 void Page::SetAttributionSupport(
     network::mojom::AttributionSupport attribution_support) {
@@ -1025,34 +1090,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 @@
+@@ -286,8 +286,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 @@
+@@ -464,8 +464,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 @@
+@@ -3448,8 +3448,8 @@
       base_feature: "none",
     },
     {
@@ -1063,18 +1123,21 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       base_feature: "none",
       public: true,
     },
-@@ -4314,15 +4314,15 @@
+@@ -4359,16 +4359,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 +1147,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(
+@@ -394,8 +394,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(
+@@ -2708,15 +2708,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
         base::NumberToString(pid));
   }
 #endif
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -15206,6 +15206,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -15651,6 +15651,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(
+@@ -9851,7 +9851,7 @@ void WebContentsImpl::RendererUnresponsive(
   base::UmaHistogramEnumeration(
       "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
 
@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
 --- a/android_webview/browser/aw_browser_context.cc
 +++ b/android_webview/browser/aw_browser_context.cc
-@@ -540,6 +540,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -537,6 +537,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
 
 content::OriginTrialsControllerDelegate*
 AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -157,7 +157,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -865,7 +865,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
+@@ -848,7 +848,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
 
 void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
     network::mojom::NetworkContextParams* network_context_params) {
@@ -284,7 +284,7 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
 diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
 --- a/components/variations/service/variations_field_trial_creator_base.cc
 +++ b/components/variations/service/variations_field_trial_creator_base.cc
-@@ -124,6 +124,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
+@@ -130,6 +130,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
 }
 
 #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,8 +292,8 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c
 // Determines whether the field trial testing config defined in
 // testing/variations/fieldtrial_testing_config.json should be applied. If the
 // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing
-@@ -323,9 +324,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
-                              safe_seed_manager, synthetic_trial_registry);
+@@ -337,9 +338,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
+         synthetic_trial_registry, std::move(client_filterable_state));
   }
 
 -  platform_field_trials->SetUpClientSideFieldTrials(
@@ -302,15 +302,15 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c
   platform_field_trials->RegisterFeatureOverrides(feature_list.get());
 
   base::FeatureList::SetInstance(std::move(feature_list));
-@@ -622,6 +620,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
-     base::FeatureList* feature_list,
+@@ -651,6 +649,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
     SafeSeedManagerBase* safe_seed_manager,
-     SyntheticTrialRegistry* synthetic_trial_registry) {
+     SyntheticTrialRegistry* synthetic_trial_registry,
+     std::unique_ptr<ClientFilterableState> client_state) {
 +  if ((true)) return false;
   // This histogram name uses "VariationsFieldTrialCreator" rather than
   // "VariationsFieldTrialCreatorBase" for consistency with historical data
   TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
-@@ -742,6 +741,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
+@@ -763,6 +762,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
 
 void VariationsFieldTrialCreatorBase::LoadSeedFromJsonFile(
     const base::FilePath& json_seed_path) {
@@ -321,7 +321,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -221,17 +221,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -222,17 +222,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -341,7 +341,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
 }
 
 // Returns the already downloaded first run seed, and clear the seed from the
-@@ -632,7 +623,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -626,7 +617,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
   // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
   // had a chance to run yet from the previous request. In this case, don't
   // start a new request and just let the previous one finish.
@@ -389,7 +389,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -849,6 +849,7 @@ void PersistOriginTrialsFromHeaders(
+@@ -836,6 +836,7 @@ void PersistOriginTrialsFromHeaders(
     const network::mojom::URLResponseHead* response,
     BrowserContext* browser_context,
     ukm::SourceId source_id) {
@@ -433,10 +433,10 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -208,13 +208,6 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -209,13 +209,6 @@ std::vector<int> CopyInitiatorOriginTrials(
     const Vector<mojom::blink::OriginTrialFeature>&
         initiator_origin_trial_features) {
-   WebVector<int> result;
+   std::vector<int> result;
 -  for (auto feature : initiator_origin_trial_features) {
 -    // Convert from OriginTrialFeature to int. These values are passed between
 -    // blink navigations. OriginTrialFeature isn't visible outside of blink (and
@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-@@ -333,6 +333,7 @@
+@@ -339,6 +339,7 @@
     {
       name: "IdleDetection",
       permissions_policy_name: "idle-detection",
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -427,7 +427,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -430,7 +430,7 @@ void ProfileImpl::RegisterProfilePrefs(
 #endif
 
   registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -552,6 +552,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -542,6 +542,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
     WebRuntimeFeatures::EnableV8IdleTasks(true);
   }
 
@@ -79,7 +79,7 @@ diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3541,14 +3541,10 @@
+@@ -3561,14 +3561,10 @@
       base_feature: "none",
     },
     {
@@ -96,5 +96,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      status: "experimental",        // by default
     },
     {
-       // See https://issues.chromium.org/40805258
+       name: "RemoveDanglingMarkupInTarget",
 --
@@ -23,7 +23,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 diff --git a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
 --- a/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
 +++ b/components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploadJobService.java
-@@ -52,7 +52,10 @@ public abstract class MinidumpUploadJobService extends JobService
+@@ -57,7 +57,10 @@ public abstract class MinidumpUploadJobService extends JobService
      *     to build an upload job for scheduling.
      */
     public static void scheduleUpload(JobInfo.Builder jobInfoBuilder) {
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c
 diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
-@@ -589,38 +589,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
+@@ -600,38 +600,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
 }
 
 std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
@@ -133,7 +133,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
 diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
 --- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
 +++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
-@@ -61,6 +61,7 @@ public class BookmarkItem {
+@@ -63,6 +63,7 @@ public class BookmarkItem {
 
     /** Returns the string to display for the item's url. */
     public String getUrlForDisplay() {
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -2287,9 +2287,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -2292,9 +2292,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
 }
 
 PluginData* LocalFrame::GetPluginData() const {
@@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
 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
-@@ -3381,6 +3381,10 @@
+@@ -3397,6 +3397,10 @@
       name: "PrefersReducedData",
       status: "experimental",
     },
@@ -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/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -463,15 +463,6 @@ by a child template that "extends" this file.
+@@ -475,15 +475,6 @@ by a child template that "extends" this file.
             </intent-filter>
         </receiver>
 
@@ -113,17 +113,17 @@ diff --git a/components/affiliations/core/browser/affiliation_backend.cc b/compo
 diff --git a/components/affiliations/core/browser/affiliation_service_impl.cc b/components/affiliations/core/browser/affiliation_service_impl.cc
 --- a/components/affiliations/core/browser/affiliation_service_impl.cc
 +++ b/components/affiliations/core/browser/affiliation_service_impl.cc
-@@ -128,6 +128,10 @@ void AffiliationServiceImpl::Shutdown() {
- void AffiliationServiceImpl::PrefetchChangePasswordURLs(
-     const std::vector<GURL>& urls,
+@@ -331,6 +331,10 @@ void AffiliationServiceImpl::GetPSLExtensions(
+ void AffiliationServiceImpl::UpdateAffiliationsAndBranding(
+     const std::vector<FacetURI>& facets,
     base::OnceClosure callback) {
 +  if ((true)) {
 +    std::move(callback).Run();
 +    return;
 +  }
-   std::vector<FacetURI> facets;
-   std::vector<url::SchemeHostPort> tuple_origins;
-   for (const auto& url : urls) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(backend_);
+   auto callback_in_main_sequence =
 diff --git a/components/affiliations/core/browser/facet_manager.cc b/components/affiliations/core/browser/facet_manager.cc
 --- a/components/affiliations/core/browser/facet_manager.cc
 +++ b/components/affiliations/core/browser/facet_manager.cc
@@ -37,7 +37,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -3470,6 +3470,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -3486,6 +3486,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
 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
-@@ -1380,7 +1380,7 @@ void RegisterProfilePrefsForMigration(
+@@ -1296,7 +1296,7 @@ void RegisterProfilePrefsForMigration(
   registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());
 
   // Deprecated 03/2024.
@@ -94,7 +94,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
-@@ -1247,7 +1247,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
+@@ -1261,7 +1261,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
 void PrivacySandboxServiceImpl::SetRelatedWebsiteSetsDataAccessEnabled(
     bool enabled) {
   pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
@@ -162,7 +162,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san
 diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
 --- a/components/privacy_sandbox/privacy_sandbox_features.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_features.cc
-@@ -286,4 +286,8 @@ BASE_FEATURE(kPrivacySandboxAllowPromptForBlocked3PCookies,
+@@ -283,4 +283,8 @@ BASE_FEATURE(kPrivacySandboxAllowPromptForBlocked3PCookies,
 BASE_FEATURE(kPrivacySandboxEqualizedPromptButtons,
              "PrivacySandboxEqualizedPromptButtons",
              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -242,7 +242,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   ScopedDictPrefUpdate scoped_pref_update(
       pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
   auto& pref_data = scoped_pref_update.Get();
-@@ -906,7 +910,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
+@@ -905,7 +909,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
   delegate_ = std::move(delegate);
 }
 
@@ -254,7 +254,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                          base::Time::Now());
 
-@@ -919,6 +926,7 @@ PrivacySandboxSettingsImpl::Status
+@@ -918,6 +925,7 @@ PrivacySandboxSettingsImpl::Status
 PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
     const url::Origin& top_frame_origin,
     const GURL& url) const {
@@ -262,7 +262,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
   // Relying on |host_content_settings_map_| instead of |cookie_settings_|
   // allows to query whether the site associated with the |url| is allowed to
   // access Site data (aka ContentSettingsType::COOKIES) without considering any
-@@ -933,6 +941,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
+@@ -932,6 +940,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
 PrivacySandboxSettingsImpl::Status
 PrivacySandboxSettingsImpl::GetPrivacySandboxAllowedStatus(
     bool should_ignore_restriction /*=false*/) const {
@@ -300,7 +300,7 @@ diff --git a/components/signin/public/identity_manager/account_capabilities.cc b
 diff --git a/content/browser/shared_storage/shared_storage_document_service_impl.cc b/content/browser/shared_storage/shared_storage_document_service_impl.cc
 --- a/content/browser/shared_storage/shared_storage_document_service_impl.cc
 +++ b/content/browser/shared_storage/shared_storage_document_service_impl.cc
-@@ -127,6 +127,15 @@ void SharedStorageDocumentServiceImpl::CreateWorklet(
+@@ -128,6 +128,15 @@ void SharedStorageDocumentServiceImpl::CreateWorklet(
       render_frame_host().GetLastCommittedOrigin().IsSameOriginWith(
           data_origin);
 
@@ -338,7 +338,7 @@ new file mode 100644
 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
-@@ -2842,6 +2842,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
+@@ -2843,6 +2843,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
 // constants for features in the section above.
 
 bool IsAllowURNsInIframeEnabled() {
@@ -29,7 +29,7 @@ diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything_too
 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -297,7 +297,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
 std::string DomDistillerViewerSource::GetContentSecurityPolicy(
     network::mojom::CSPDirectiveName directive) {
   if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
@@ -81,10 +81,10 @@ diff --git a/third_party/crashpad/crashpad/doc/support/crashpad_doxygen.css b/th
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic-ext,greek-ext,cyrillic,greek,vietnamese,latin-ext";
-@import "https://fonts.googleapis.com/css?family=Source+Code+Pro";
+-@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');
+-@import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap');
 +@import "chrome://resources/css/roboto.css";
 
- body,
- table,
+ :root {
+   --font-family-normal: 'Noto Sans',
 --
@@ -21,36 +21,36 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -446,7 +446,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/recent_tabs:helper_java",
+@@ -451,7 +451,6 @@ if (current_toolchain == default_toolchain) {
       "//chrome/browser/recent_tabs:java",
+       "//chrome/browser/regional_capabilities/android:java",
       "//chrome/browser/safe_browsing/android:java",
 -      "//chrome/browser/safety_check/android:java",
       "//chrome/browser/safety_hub/android:java",
       "//chrome/browser/screenshot_monitor:java",
       "//chrome/browser/search_engines/android:java",
-@@ -1119,8 +1118,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/recent_tabs:java",
+@@ -1078,8 +1077,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/readaloud/android:junit",
       "//chrome/browser/recent_tabs:junit",
       "//chrome/browser/recent_tabs/internal:junit",
-      "//chrome/browser/safety_check/android:java",
 -      "//chrome/browser/safety_check/android:junit",
-       "//chrome/browser/safety_hub/android:java",
-       "//chrome/browser/safety_hub/android:junit",
-       "//chrome/browser/screenshot_monitor:java",
-@@ -1810,8 +1807,6 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/browser/readaloud/android:java",
-       "//chrome/browser/safe_browsing/android:java",
+-      "//chrome/browser/safety_hub/android:junit",
+       "//chrome/browser/search_engines/android:junit",
+       "//chrome/browser/search_resumption:junit",
+       "//chrome/browser/signin/services/android:junit",
+@@ -1347,8 +1344,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/privacy_sandbox/android:javatests",
+       "//chrome/browser/quick_delete:javatests",
       "//chrome/browser/safe_browsing/android:javatests",
-      "//chrome/browser/safety_check/android:java",
 -      "//chrome/browser/safety_check/android:javatests",
-       "//chrome/browser/safety_hub/android:java",
-       "//chrome/browser/safety_hub/android:javatests",
-       "//chrome/browser/screenshot_monitor:java",
+-      "//chrome/browser/safety_hub/android:javatests",
+       "//chrome/browser/segmentation_platform:javatests",
+       "//chrome/browser/selection/android:javatests",
+       "//chrome/browser/ssl/android:javatests",
 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
-@@ -968,7 +968,6 @@ chrome_java_sources = [
+@@ -981,7 +981,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
   "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsNavigation.java",
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
-@@ -39,13 +39,6 @@ import org.chromium.chrome.browser.privacy_sandbox.ChromeTrackingProtectionDeleg
+@@ -38,13 +38,6 @@ import org.chromium.chrome.browser.privacy_sandbox.ChromeTrackingProtectionDeleg
 import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsBaseFragment;
 import org.chromium.chrome.browser.privacy_sandbox.TopicsManageFragment;
 import org.chromium.chrome.browser.profiles.Profile;
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
 import org.chromium.chrome.browser.signin.SigninAndHistorySyncActivityLauncherImpl;
 import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
-@@ -131,20 +124,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -130,20 +123,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
             delegate.setSnackbarManagerSupplier(mSnackbarManagerSupplier);
             baseSiteSettingsFragment.setSiteSettingsDelegate(delegate);
         }
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
         if (fragment instanceof PasswordCheckFragmentView) {
             PasswordCheckComponentUiFactory.create(
                     (PasswordCheckFragmentView) fragment,
-@@ -237,13 +216,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -232,13 +211,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
             ((AutofillLocalIbanEditor) fragment)
                     .setModalDialogManagerSupplier(mModalDialogManagerSupplier);
         }
@@ -123,7 +123,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
         if (fragment instanceof INeedSnackbarManager) {
             ((INeedSnackbarManager)fragment).setSnackbarManagerSupplier(mSnackbarManagerSupplier);
         }
-@@ -258,8 +230,5 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -253,8 +225,5 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
         if (fragment instanceof ManageSyncSettings) {
             ((ManageSyncSettings) fragment).setSnackbarManagerSupplier(mSnackbarManagerSupplier);
         }
@@ -135,7 +135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
-@@ -277,7 +277,7 @@ public class MainSettings extends ChromeBaseSettingsFragment
+@@ -274,7 +274,7 @@ public class MainSettings extends ChromeBaseSettingsFragment
                                     .removePreference(findPreference(PREF_TOOLBAR_SHORTCUT));
                         });
 
@@ -147,8 +147,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsNavigationImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsNavigationImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsNavigationImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsNavigationImpl.java
-@@ -20,8 +20,6 @@ import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAdvanc
- import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment;
+@@ -18,8 +18,6 @@ import org.chromium.chrome.browser.autofill.settings.FinancialAccountsManagement
+ import org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.password_manager.settings.PasswordSettings;
 -import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
@@ -156,8 +156,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
 import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
 import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
-@@ -55,10 +53,7 @@ public class SettingsNavigationImpl implements SettingsNavigation {
-                                 /* isFetcherSuppliedFromOutside= */ false);
+@@ -46,10 +44,7 @@ public class SettingsNavigationImpl implements SettingsNavigation {
+                         ClearBrowsingDataFragment.createFragmentArgs(context.getClass().getName());
                 break;
             case SettingsFragment.SAFETY_CHECK:
 -                if (!ChromeFeatureList.sSafetyHub.isEnabled()) {
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
             case SettingsFragment.MAIN:
             case SettingsFragment.PAYMENT_METHODS:
             case SettingsFragment.SITE:
-@@ -118,11 +113,7 @@ public class SettingsNavigationImpl implements SettingsNavigation {
+@@ -107,11 +102,7 @@ public class SettingsNavigationImpl implements SettingsNavigation {
             case SettingsFragment.PAYMENT_METHODS:
                 return AutofillPaymentMethodsFragment.class;
             case SettingsFragment.SAFETY_CHECK:
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3253,7 +3253,6 @@ static_library("browser") {
+@@ -3285,7 +3285,6 @@ static_library("browser") {
       "//chrome/browser/reading_list/android",
       "//chrome/browser/recent_tabs:jni_headers",
       "//chrome/browser/safe_browsing/android:safe_browsing_enums",
@@ -208,7 +208,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 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
-@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -544,7 +544,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
   tpcd::trial::ValidityService::MaybeCreateForWebContents(web_contents);
   TrustedVaultEncryptionKeysTabHelper::CreateForWebContents(web_contents);
 #if BUILDFLAG(IS_ANDROID)
@@ -44,8 +44,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -223,6 +223,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kCCTExtendTrustedCdnPublisher,
+@@ -222,6 +222,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kCCTEphemeralMediaViewerExperiment,
     &kCCTEphemeralMode,
     &kCCTFreInSameTask,
 +    &kChromeSmartSelection,
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1568,7 +1568,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1558,7 +1558,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
       site_isolation::prefs::kWebTriggeredIsolatedOrigins);
   registry->RegisterDictionaryPref(
       prefs::kDevToolsBackgroundServicesExpirationDict);
@@ -31,7 +31,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -1671,7 +1671,7 @@ ChromeContentRendererClient::CreateWorkerContentSettingsClient(
+@@ -1667,7 +1667,7 @@ ChromeContentRendererClient::CreateWorkerContentSettingsClient(
 std::unique_ptr<media::SpeechRecognitionClient>
 ChromeContentRendererClient::CreateSpeechRecognitionClient(
     content::RenderFrame* render_frame) {
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -278,6 +278,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -269,6 +269,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
 #endif
           {wf::EnableTouchDragAndContextMenu,
            raw_ref(features::kTouchDragAndContextMenu)},
@@ -74,7 +74,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
-@@ -4558,9 +4558,14 @@ void Document::SetURL(const KURL& url) {
+@@ -4578,9 +4578,14 @@ void Document::SetURL(const KURL& url) {
                          TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT,
                          "url", new_url.GetString().Utf8());
 
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -4256,10 +4256,9 @@
+@@ -4303,10 +4303,9 @@
     },
     {
       name: "TextFragmentIdentifiers",
@@ -9,13 +9,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../origin_trials/origin_trial_policy_impl.h  |  2 +-
 .../renderer_host/navigation_request.cc       |  1 -
 .../origin_trial_state_host_impl.cc           | 19 -------------------
- content/renderer/render_frame_impl.cc         | 17 +----------------
+ content/renderer/render_frame_impl.cc         | 10 +++-------
 .../shell/common/shell_origin_trial_policy.cc | 10 ++++------
 .../origin_trials/trial_token_validator.cc    |  1 +
- .../renderer/core/loader/document_loader.cc   | 17 -----------------
+ .../renderer/core/loader/document_loader.cc   | 18 ++----------------
 .../blink/renderer/core/loader/http_equiv.cc  |  2 +-
 .../origin_trials/origin_trial_context.cc     |  6 ++++--
- 11 files changed, 16 insertions(+), 67 deletions(-)
+ 11 files changed, 20 insertions(+), 57 deletions(-)

 diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
 --- a/android_webview/common/aw_content_client.cc
@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -9187,7 +9187,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
+@@ -9295,7 +9295,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
 void NavigationRequest::ForceEnableOriginTrials(
     const std::vector<std::string>& trials) {
   DCHECK(!HasCommitted());
@@ -127,36 +127,22 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
   navigation_params->was_discarded = commit_params.was_discarded;
   navigation_params->document_ukm_source_id =
       commit_params.document_ukm_source_id;
-@@ -569,12 +565,6 @@ void FillNavigationParamsRequest(
+@@ -564,8 +560,8 @@ void FillNavigationParamsRequest(
   navigation_params->had_transient_user_activation =
       common_params.has_user_gesture;
 
-  WebVector<WebString> web_origin_trials;
-  web_origin_trials.reserve(commit_params.force_enabled_origin_trials.size());
-  for (const auto& trial : commit_params.force_enabled_origin_trials)
-    web_origin_trials.emplace_back(WebString::FromASCII(trial));
-  navigation_params->force_enabled_origin_trials = web_origin_trials;
-
-   if (!commit_params.early_hints_preloaded_resources.empty()) {
-     navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
-     for (const auto& resource : commit_params.early_hints_preloaded_resources) {
-@@ -635,11 +625,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
-           info->url_request.GetURLRequestExtraData().get());
-   DCHECK(url_request_extra_data);
+-  navigation_params->force_enabled_origin_trials = base::ToVector(
+-      commit_params.force_enabled_origin_trials, &WebString::FromASCII);
+  std::vector<WebString> force_enabled_origin_trials;
+  navigation_params->force_enabled_origin_trials = force_enabled_origin_trials;
 
-  // Convert from WebVector<int> to std::vector<int>.
-  std::vector<int> initiator_origin_trial_features(
-      info->initiator_origin_trial_features.begin(),
-      info->initiator_origin_trial_features.end());
-
-   blink::NavigationDownloadPolicy download_policy;
-   download_policy.ApplyDownloadFramePolicy(
-       info->is_opener_navigation, info->url_request.HasUserGesture(),
-@@ -667,7 +652,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+   navigation_params->early_hints_preloaded_resources = base::ToVector(
+       commit_params.early_hints_preloaded_resources, blink::ToWebURL);
+@@ -650,7 +646,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
       info->url_request.HasUserGesture(),
       info->url_request.HasTextFragmentToken(),
       info->should_check_main_world_content_security_policy,
-      initiator_origin_trial_features, info->href_translate.Latin1(),
+-      info->initiator_origin_trial_features, info->href_translate.Latin1(),
 +      /*initiator_origin_trial_features*/std::vector<int>(), info->href_translate.Latin1(),
       is_history_navigation_in_new_child_frame, info->input_start,
       request_destination);
@@ -204,9 +190,9 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -194,13 +194,6 @@ namespace {
+@@ -195,13 +195,6 @@ namespace {
 Vector<mojom::blink::OriginTrialFeature> CopyInitiatorOriginTrials(
-     const WebVector<int>& initiator_origin_trial_features) {
+     const std::vector<int>& initiator_origin_trial_features) {
   Vector<mojom::blink::OriginTrialFeature> result;
 -  for (auto feature : initiator_origin_trial_features) {
 -    // Convert from int to OriginTrialFeature. These values are passed between
@@ -218,9 +204,9 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
   return result;
 }
 
-@@ -214,18 +207,12 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -215,16 +208,13 @@ std::vector<int> CopyInitiatorOriginTrials(
 Vector<String> CopyForceEnabledOriginTrials(
-     const WebVector<WebString>& force_enabled_origin_trials) {
+     const std::vector<WebString>& force_enabled_origin_trials) {
   Vector<String> result;
 -  result.ReserveInitialCapacity(
 -      base::checked_cast<wtf_size_t>(force_enabled_origin_trials.size()));
@@ -229,15 +215,15 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
   return result;
 }
 
- WebVector<WebString> CopyForceEnabledOriginTrials(
+ std::vector<WebString> CopyForceEnabledOriginTrials(
     const Vector<String>& force_enabled_origin_trials) {
-   WebVector<String> result;
-  for (const auto& trial : force_enabled_origin_trials)
-    result.emplace_back(trial);
-   return result;
+-  return base::ToVector(force_enabled_origin_trials, ToWebString);
+  std::vector<WebString> result;
+  return result;
 }
 
-@@ -3252,10 +3239,6 @@ void DocumentLoader::CreateParserPostCommit() {
+ bool IsPagePopupRunningInWebTest(LocalFrame* frame) {
+@@ -3271,10 +3261,6 @@ void DocumentLoader::CreateParserPostCommit() {
     }
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
@@ -263,7 +249,7 @@ diff --git a/third_party/blink/renderer/core/loader/http_equiv.cc b/third_party/
 diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
 --- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
 +++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-@@ -312,6 +312,9 @@ void OriginTrialContext::AddToken(const String& token) {
+@@ -313,6 +313,9 @@ void OriginTrialContext::AddToken(const String& token) {
 void OriginTrialContext::AddTokenFromExternalScript(
     const String& token,
     const Vector<scoped_refptr<SecurityOrigin>>& external_origins) {
@@ -273,7 +259,7 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
   Vector<OriginInfo> script_origins;
   for (const scoped_refptr<SecurityOrigin>& origin : external_origins) {
     OriginInfo origin_info = {.origin = origin,
-@@ -467,8 +470,6 @@ bool OriginTrialContext::InstallSettingFeature(
+@@ -468,8 +471,6 @@ bool OriginTrialContext::InstallSettingFeature(
 }
 
 void OriginTrialContext::AddFeature(mojom::blink::OriginTrialFeature feature) {
@@ -282,7 +268,7 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
 }
 
 bool OriginTrialContext::IsFeatureEnabled(
-@@ -512,6 +513,7 @@ void OriginTrialContext::AddForceEnabledTrials(
+@@ -513,6 +514,7 @@ void OriginTrialContext::AddForceEnabledTrials(
 }
 
 bool OriginTrialContext::CanEnableTrialFromName(const StringView& trial_name) {
@@ -92,7 +92,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1118,7 +1118,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -1132,7 +1132,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
   registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -104,7 +104,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -89,7 +89,6 @@
+@@ -91,7 +91,6 @@
 #include "chrome/browser/interstitials/enterprise_util.h"
 #include "chrome/browser/language_detection/language_detection_model_service_factory.h"
 #include "chrome/browser/lifetime/browser_shutdown.h"
@@ -112,7 +112,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 #include "chrome/browser/media/audio_service_util.h"
 #include "chrome/browser/media/prefs/capture_device_ranking.h"
 #include "chrome/browser/media/router/media_router_feature.h"
-@@ -5231,16 +5230,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -5236,16 +5235,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
     content::NavigationHandle* handle) {
   std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
 
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 #if BUILDFLAG(IS_ANDROID)
   // TODO(davidben): This is insufficient to integrate with prerender properly.
   // https://crbug.com/370595
-@@ -5366,10 +5355,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -5378,10 +5367,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
     }
   }
 
@@ -211,7 +211,7 @@ diff --git a/components/ntp_tiles/custom_links_manager_impl.cc b/components/ntp_
 diff --git a/components/ntp_tiles/most_visited_sites.cc b/components/ntp_tiles/most_visited_sites.cc
 --- a/components/ntp_tiles/most_visited_sites.cc
 +++ b/components/ntp_tiles/most_visited_sites.cc
-@@ -775,8 +775,6 @@ void MostVisitedSites::SaveTilesAndNotify(
+@@ -734,8 +734,6 @@ void MostVisitedSites::SaveTilesAndNotify(
                                    : new_tiles;
 
   if (fixed_tiles.size() != new_tiles.size()) {
@@ -54,7 +54,7 @@ diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/v
 diff --git a/components/visitedlink/common/visitedlink_common.cc b/components/visitedlink/common/visitedlink_common.cc
 --- a/components/visitedlink/common/visitedlink_common.cc
 +++ b/components/visitedlink/common/visitedlink_common.cc
-@@ -78,6 +78,7 @@ bool VisitedLinkCommon::IsVisited(const GURL& link_url,
+@@ -83,6 +83,7 @@ bool VisitedLinkCommon::IsVisited(const GURL& link_url,
 }
 
 bool VisitedLinkCommon::IsVisited(Fingerprint fingerprint) const {
@@ -9,7 +9,7 @@ Subject: Disallow Android App Scheme as referrer
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -566,11 +566,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
+@@ -573,11 +573,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
   // TODO(nyquist): Add test to ensure this happens when the flag is set.
   WebSecurityPolicy::RegisterURLSchemeAsDisplayIsolated(dom_distiller_scheme);
 
@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1166,8 +1166,6 @@ static_library("ui") {
+@@ -1178,8 +1178,6 @@ static_library("ui") {
       "startup/default_browser_prompt/default_browser_prompt_manager.h",
       "startup/default_browser_prompt/default_browser_prompt_prefs.cc",
       "startup/default_browser_prompt/default_browser_prompt_prefs.h",
@@ -0,0 +1,25 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 3 Mar 2025 12:04:53 +0000
+Subject: Do not check for the presence of use_remoteexec
+
+---
+ build/toolchain/rbe.gni | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/build/toolchain/rbe.gni b/build/toolchain/rbe.gni
+--- a/build/toolchain/rbe.gni
+++ b/build/toolchain/rbe.gni
+@@ -4,11 +4,7 @@
+ 
+ # Defines the configuration of Remote Build Execution (RBE).
+ 
+-use_remoteexec_default =
+-    exec_script(rebase_path("//build/toolchain/use_remoteexec_value.py"),
+-                [],
+-                "value",
+-                [])
+use_remoteexec_default = false
+ 
+ declare_args() {
+   # Deprecated: Please use reclient_bin_dir instead.
+--
@@ -19,7 +19,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
-@@ -3714,7 +3714,6 @@ generate_jni("chrome_jni_headers") {
+@@ -2986,7 +2986,6 @@ generate_jni("chrome_jni_headers") {
     "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",
     "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
     "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
@@ -30,15 +30,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 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
-@@ -124,7 +124,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
+@@ -126,7 +126,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
+ import org.chromium.chrome.browser.share.ShareDelegate;
+ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
 import org.chromium.chrome.browser.share.ShareUtils;
- import org.chromium.chrome.browser.share.page_info_sheet.PageInfoSharingControllerImpl;
- import org.chromium.chrome.browser.share.page_info_sheet.PageSummaryButtonController;
 -import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
 import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
 import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
 import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -589,10 +588,6 @@ public class RootUiCoordinator
+@@ -587,10 +586,6 @@ public class RootUiCoordinator
     }
 
     public void onAttachFragment(Fragment fragment) {
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 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
-@@ -1998,7 +1998,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1925,7 +1925,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kUiAutomationProviderEnabled, false);
 #endif
 
@@ -83,7 +83,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
 import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
 import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
 import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
-@@ -292,9 +291,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
+@@ -306,9 +305,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
     }
 
     private void maybeAddQrCodeFirstPartyOption() {
@@ -93,7 +93,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
     }
 
     private void maybeAddLongScreenshotFirstPartyOption() {
-@@ -428,25 +424,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
+@@ -442,25 +438,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
                 .build();
     }
 
@@ -155,7 +155,7 @@ diff --git a/chrome/browser/sharing_hub/sharing_hub_features.cc b/chrome/browser
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -1811,10 +1811,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
+@@ -1798,10 +1798,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
   command_updater_.UpdateCommandEnabled(IDC_CHROME_WHATS_NEW, show_main_ui);
 #endif
   command_updater_.UpdateCommandEnabled(IDC_CONTENT_CONTEXT_SHARING_SUBMENU,
@@ -172,7 +172,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -1681,6 +1681,7 @@ void SendTabToSelf(Browser* browser) {
+@@ -1660,6 +1660,7 @@ void SendTabToSelf(Browser* browser) {
 }
 
 bool CanGenerateQrCode(const Browser* browser) {
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1091,7 +1091,7 @@ component("base") {
+@@ -1090,7 +1090,7 @@ component("base") {
   # more robust check for this.
   if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
       host_toolchain != "//build/toolchain/cros:host") {
@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -331,7 +331,7 @@ bool HasManuallyFilledFields(const PasswordForm& form) {
+@@ -364,7 +364,7 @@ bool HasManuallyFilledFields(const PasswordForm& form) {
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
@@ -19,7 +19,7 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
 #if BUILDFLAG(IS_IOS)
   // Deprecated pref in profile prefs.
-@@ -339,7 +339,7 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -372,7 +372,7 @@ void PasswordManager::RegisterProfilePrefs(
                                 false);
 #endif  // BUILDFLAG(IS_IOS)
   registry->RegisterBooleanPref(
@@ -28,7 +28,7 @@ diff --git a/components/password_manager/core/browser/password_manager.cc b/comp
       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
   registry->RegisterBooleanPref(
       prefs::kWasAutoSignInFirstRunExperienceShown, false,
-@@ -375,9 +375,9 @@ void PasswordManager::RegisterProfilePrefs(
+@@ -409,9 +409,9 @@ void PasswordManager::RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kPasswordsPrefWithNewLabelUsed, false);
 #if BUILDFLAG(IS_ANDROID)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carmelo Messina	cc1a82b970	Patches for 134.0.6998.178	2025-03-28 09:47:00 +01:00
uazoandGitHub	ee9852e97e	[AUTO][FILECONTROL] - version 134.0.6998.108 (#1911 ) [AUTO][FILECONTROL] - version 134.0.6998.108	2025-03-19 05:23:22 -03:00
uazoandGitHub	3fe3b3e182	[AUTO] Patches auto-rebase for master branch (#1929 ) [AUTO] Patches auto-rebase for master branch	2025-03-19 05:21:30 -03:00
uazoandgithub-actions[bot]	eff32b5313	[AUTO] Patches auto-rebase	2025-03-19 08:01:31 +00:00
Carmelo Messina	baf72ad3f0	Bump to 134.0.6998.108	2025-03-19 08:54:01 +01:00
uazoandgithub-actions[bot]	4a18e4d739	[AUTO][FILECONTROL] - version 134.0.6998.108	2025-03-19 03:02:08 +00:00
Carmelo Messina	f13b33b73e	[TOOLS] Try to fix proxy issue when checking for docker hub metadata	2025-03-11 10:37:31 +01:00
uazoandGitHub	dd884d1d5a	[AUTO][FILECONTROL] - version 134.0.6998.89 (#1903 ) [AUTO][FILECONTROL] - version 134.0.6998.89	2025-03-11 00:30:53 -09:00
uazoandGitHub	bf60633c93	[AUTO] Patches auto-rebase for master branch (#1907 ) [AUTO] Patches auto-rebase for master branch	2025-03-11 00:30:35 -09:00
uazoandgithub-actions[bot]	a4c08f8b05	[AUTO] Patches auto-rebase	2025-03-11 09:05:34 +00:00
Carmelo Messina	000a8d6bc2	Bump to 134.0.6998.89	2025-03-11 09:57:30 +01:00
Carmelo Messina	4f44c23396	Add cromite flags support: fix crash when editing flags (#1890 )	2025-03-11 09:56:30 +01:00
Carmelo Messina	1a3d349a09	Android fonts fingerprinting mitigation: fix webview build (#1829 )	2025-03-11 09:55:00 +01:00
Carmelo Messina	317f1f0b5c	Eyeo Adblock for Cromite: stricter verification for strict blocking (#1850 )	2025-03-11 09:53:54 +01:00
uazoandgithub-actions[bot]	67db5e23a0	[AUTO][FILECONTROL] - version 134.0.6998.89	2025-03-11 03:02:24 +00:00
Carmelo Messina	387be3e56b	[DOCS] webview links moved (#1864 ) make it clear that the webview may not be available	2025-03-05 09:05:58 +01:00
uazoandGitHub	8685e1c283	[AUTO][FILECONTROL] - version 134.0.6998.39 (#1865 ) [AUTO][FILECONTROL] - version 134.0.6998.39	2025-03-05 02:41:10 -05:00
uazoandGitHub	4f7055b1d8	[AUTO][DOC] Generate patches doc for master branch (#1884 ) [AUTO][DOC] Generate patches doc for master branch	2025-03-05 02:40:37 -05:00
uazoandgithub-actions[bot]	68a9e09151	[AUTO][DOC] Generate patches doc for master branch	2025-03-05 07:39:37 +00:00
uazoandGitHub	171c71c6eb	Rebase to v134 (#1875 ) Rebase to v134	2025-03-05 02:39:19 -05:00
Carmelo Messina	1bad20f750	Move navigation bar to bottom: fix toolbar padding when closing the keyboard fix tab switcher animation (#1433)	2025-03-05 08:32:44 +01:00
Carmelo Messina	d4bc3ee1a2	Cromite Branding: fix version page	2025-03-04 18:10:54 +01:00
uazoandGitHub	a8a2e236e8	[AUTO] Patches auto-rebase for next-134 branch (#1878 ) [AUTO] Patches auto-rebase for next-134 branch	2025-03-03 15:31:29 -01:00
uazoandgithub-actions[bot]	934cc7f365	[AUTO] Patches auto-rebase	2025-03-03 16:24:24 +00:00
Carmelo Messina	2a5f5e750a	Patches for 134 - Added "Do-not-check-for-the-presence-of-use-remoteexec" - Added "Temporarily-disable-Tab-Group-Sync-Android"	2025-03-03 17:21:14 +01:00
Carmelo Messina	f402e19a5e	Patches for 134 (no changes)	2025-03-03 17:20:09 +01:00
Carmelo Messina	f74f2df981	Patches for v134 (changed)	2025-03-03 17:18:52 +01:00
uazoandGitHub	c5a85ab067	[AUTO] Patches auto-rebase for next-134 branch (#1876 ) [AUTO] Patches auto-rebase for next-134 branch	2025-02-27 13:38:28 -01:00
uazoandgithub-actions[bot]	e30a8991a3	[AUTO] Patches auto-rebase	2025-02-27 14:22:55 +00:00
Carmelo Messina	6c7b6ba544	Bump to 134.0.6998.39	2025-02-27 15:13:10 +01:00
Carmelo Messina	5cb904e621	Patches for v134 (need some work)	2025-02-27 15:12:39 +01:00
Carmelo Messina	0715958a45	Patches for v134	2025-02-27 15:11:47 +01:00
uazoandgithub-actions[bot]	864c72f269	[AUTO][FILECONTROL] - version 134.0.6998.39	2025-02-27 03:02:29 +00:00
Carmelo Messina	21ab0728db	Restore Simplified NTP launch: fix crash with MagicStackAndroid enabled (#1814 )	2025-02-26 10:12:34 +01:00
Carmelo Messina	1c3ff57f30	Android fonts fingerprinting mitigation: fix crash on arm device (#1853 ) fix bold sans-serif is not correctly displayed (#1851)	2025-02-26 10:11:31 +01:00
Carmelo Messina	3269abe792	[TOOLS] Add components folder (#1829 )	2025-02-25 08:57:53 +01:00