[TOOLS] Update fdroid repo: try with no-proxy (drop test)

Lately I find some problems with updating the fdroid repo via ftp. this is an attempt to see if it is a server problem.

.github/workflows/build_cromite.yaml

@@ -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 $?)

.github/workflows/update_fdroid_repo.yaml

@@ -2,6 +2,11 @@ name: Update fdroid repo
 
 on:
   workflow_dispatch:
+    inputs:
+      type:
+        description: 'runner? [dev/ci]'
+        required: true
+        default: 'ci'
 
 env:
   REMOVEDOCKERSUPPORT: true
@@ -10,7 +15,7 @@ env:
 
 jobs:
   update-fdroid:
-    runs-on: ci2
+    runs-on: ${{ github.event.inputs.type }}
 
     container:
       image: uazo/fdroidserver:latest

README.md

@@ -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

build/RELEASE

@@ -1 +1 @@
-133.0.6943.127
+135.0.7049.52

build/components/query.json

@@ -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
+								}
+							]
+						}
+					}
+				}
+			}
+		]
+	}
+}

build/cromite_patches_list.txt

@@ -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,9 @@ Disable-Web-Bluetooth-by-default-in-desktop-platforms.patch
 Enable-Cert-Management-UI.patch
 Enable-ProcessBoundStringEncryption-by-default.patch
 Prevent-mouse-wheel-fingerprinting-on-Windows.patch
+Enable-component-updater.patch
+Android-fonts-fingerprinting-mitigation.patch
+Disable-Android-Tab-Declutter.patch
 
 # temporary or wip patches
 Temp-PerformanceNavigationTiming-privacy-fix.patch
@@ -301,14 +304,13 @@ 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
-eyeo-beta-118.0.5993.48-chrome_integration.patch
-eyeo-beta-118.0.5993.48-android_api.patch
-eyeo-beta-118.0.5993.48-android_settings.patch
-eyeo-beta-118.0.5993.48-extension_api.patch
+eyeo-133.0.6943.49-base.patch
+eyeo-133.0.6943.49-chrome_integration.patch
+eyeo-133.0.6943.49-android_api.patch
+eyeo-133.0.6943.49-android_settings.patch
+eyeo-133.0.6943.49-extension_api.patch
 Eyeo-Adblock-for-Cromite.patch

build/patches/AImageReader-CFI-crash-mitigations.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 @@
+@@ -3268,6 +3268,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"
        ]
      },
@@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
+@@ -58,6 +58,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_ANDROID)
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
+@@ -348,6 +351,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
            kGpuFeatureStatusSoftware;
      }
    }
@@ -196,7 +196,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt
 --- a/gpu/config/gpu_workaround_list.txt
 +++ b/gpu/config/gpu_workaround_list.txt
-@@ -7,6 +7,7 @@ check_egl_fence_before_wait
+@@ -6,6 +6,7 @@ check_egl_fence_before_wait
  check_ycbcr_studio_g22_left_p709_for_nv12_support
  disable_2d_canvas_auto_flush
  disable_accelerated_av1_decode
@@ -207,7 +207,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list
 diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
 --- a/gpu/ipc/service/gpu_init.cc
 +++ b/gpu/ipc/service/gpu_init.cc
-@@ -69,6 +69,7 @@
+@@ -70,6 +70,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "ui/gfx/android/android_surface_control_compat.h"
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
  #endif
  
  #if BUILDFLAG(ENABLE_VULKAN)
-@@ -716,6 +717,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -692,6 +693,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  

build/patches/Add-AllowUserCertificates-flag.patch

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -225,6 +225,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.printing.PrintManagerDelegateImpl;
  import org.chromium.printing.PrintingController;
  import org.chromium.printing.PrintingControllerImpl;
-@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -969,6 +970,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[] = {
+@@ -160,6 +160,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
@@ -51,31 +51,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -157,6 +157,7 @@ public abstract class ChromeFeatureList {
- 
+@@ -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 {
-     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
-             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
+@@ -642,6 +643,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidMinimalUiLargeScreen =
+             newCachedFlag(ANDROID_MINIMAL_UI_LARGE_SCREEN, false);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
      public static final CachedFlag sAsyncNotificationManager =
              newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
-     public static final CachedFlag sBlockIntentsWhileLocked =
-@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAsyncNotificationManagerForDownload =
+@@ -877,6 +880,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);
 +

build/patches/Add-IsCleartextPermitted-flag.patch

@@ -44,7 +44,7 @@ new file mode 100644
 diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
 --- a/net/url_request/url_request_http_job.cc
 +++ b/net/url_request/url_request_http_job.cc
-@@ -372,6 +372,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -387,6 +387,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
  

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -114,6 +114,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
+@@ -120,6 +120,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
               FEATURE_ENABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -25,7 +25,7 @@ diff --git a/base/features.cc b/base/features.cc
 +
  void Init(EmitThreadControllerProfilerMetadata
                emit_thread_controller_profiler_metadata) {
-   InitializeCpuReductionExperiment();
+   sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
 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

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

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7587,9 +7587,9 @@
+@@ -7693,9 +7693,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);
  

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

@@ -29,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/resources/proxy_config.html    |  77 ++++
  chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
  chrome/browser/ui/BUILD.gn                    |   2 +
- .../browser/ui/webui/chrome_web_ui_configs.cc |   4 +
+ .../browser/ui/webui/chrome_web_ui_configs.cc |   5 +-
  chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
  chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++
  chrome/common/webui_url_constants.cc          |   2 +
@@ -40,7 +40,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../proxy_config/proxy_policy_handler.cc      |   2 +-
  net/proxy_resolution/proxy_config.cc          |  51 ++-
  net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 984 insertions(+), 17 deletions(-)
+ 25 files changed, 984 insertions(+), 18 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -77,7 +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,14 +99,14 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -231,6 +231,9 @@
+@@ -221,6 +221,9 @@
          <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
          <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />
        </if>
 +      <!-- Bromite Proxy Configuration UI -->
 +      <include name="IDR_PROXY_CONFIG_HTML" file="resources\proxy_config.html" flattenhtml="true" type="BINDATA" compress="gzip" />
 +      <include name="IDR_PROXY_CONFIG_JS" file="resources\proxy_config.js" type="BINDATA" compress="gzip" />
-       <if expr="not is_android">
+       <if expr="not is_android or enable_extensions_core">
          <!-- Page not available for guest. -->
          <include name="IDR_PAGE_NOT_AVAILABLE_FOR_GUEST_APP_HTML" file="resources\page_not_available_for_guest\app.html" type="BINDATA" />
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -140,9 +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,16 +196,16 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -198,6 +198,8 @@
+@@ -196,6 +196,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
  
 +#include "chrome/browser/net/proxy_service_factory.h"
 +
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
- #include "chrome/browser/background/background_mode_manager.h"
+ #include "chrome/browser/background/extensions/background_mode_manager.h"
  #endif
-@@ -1714,6 +1716,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1561,6 +1563,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -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") {
+@@ -224,6 +224,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -672,7 +672,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -55,6 +55,9 @@
+@@ -54,6 +54,9 @@
  #include "extensions/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  
@@ -682,12 +682,15 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
  #if BUILDFLAG(ENABLE_NACL)
  #include "chrome/browser/ui/webui/nacl_ui.h"
  #endif
-@@ -401,4 +404,5 @@ void RegisterChromeWebUIConfigs() {
- #if BUILDFLAG(ENABLE_GLIC)
+@@ -391,7 +394,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
+   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
  #endif
+-
 +  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
- }
+ #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
+   map.AddWebUIConfig(
+       std::make_unique<safe_browsing::ChromeSafeBrowsingUIConfig>());
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
@@ -1150,7 +1153,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";
+@@ -161,6 +161,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 +1319,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()

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

@@ -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 = [
+@@ -643,6 +643,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 = [
+@@ -879,6 +880,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
+@@ -727,14 +731,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
+@@ -2614,8 +2623,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;
+@@ -94,6 +94,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;
@@ -305,7 +305,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dom_distiller.DomDistillerUiUtils;
  import org.chromium.chrome.browser.download.DownloadManagerService;
  import org.chromium.chrome.browser.download.DownloadUtils;
-@@ -1952,6 +1953,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -1953,6 +1954,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -327,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
  import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils;
  import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
-@@ -101,6 +103,10 @@ import java.util.ArrayList;
+@@ -102,6 +104,10 @@ import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
  
@@ -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
+@@ -609,6 +615,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
+@@ -672,7 +685,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
+@@ -877,8 +898,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                  && !isNativePage
                  && !isFileScheme
                  && !isContentScheme
@@ -384,15 +384,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -30,6 +30,7 @@ import org.chromium.base.metrics.RecordHistogram;
+@@ -29,6 +29,7 @@ import org.chromium.base.ContextUtils;
  import org.chromium.base.shared_preferences.SharedPreferencesManager;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
+ import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  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 {
+@@ -277,6 +278,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 {
+@@ -287,6 +291,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 {
+@@ -317,7 +322,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -502,7 +502,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.ArrayList;
-@@ -1180,6 +1183,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1183,6 +1186,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          return getInitialActivityWidth() > 0;
      }
  
@@ -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;
  
@@ -559,7 +559,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
-@@ -277,7 +277,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -300,7 +300,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.generateFooterItems();
  
          // Listen to changes in sign in state.
@@ -570,7 +570,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  
          // Create PrefChangeRegistrar to receive notifications on preference changes.
          mPrefChangeRegistrar = PrefServiceUtil.createFor(profile);
-@@ -353,7 +355,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -376,7 +378,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.onDestroyed();
          mLargeIconBridge.destroy();
          mLargeIconBridge = null;
@@ -578,8 +578,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 +        if (IdentityServicesProvider.get().getSigninManager(mProfile) != null)
 +            IdentityServicesProvider.get().getSigninManager(mProfile).removeSignInStateObserver(this);
          mPrefChangeRegistrar.destroy();
-     }
- 
+         if (mHistorySyncPromoCoordinator != null) {
+             mHistorySyncPromoCoordinator.destroy();
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
@@ -684,7 +684,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
  import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
  import org.chromium.chrome.browser.bookmarks.BookmarkPage;
-@@ -319,7 +320,8 @@ public class NativePageFactory {
+@@ -326,7 +327,8 @@ public class NativePageFactory {
              String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) {
          NativePage page;
  
@@ -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;
+@@ -191,6 +191,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 {
+@@ -1148,7 +1150,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              () -> {
                                  mTabCreatorManagerSupplier
                                          .get()
@@ -1075,7 +1075,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */
  public class ChromeTabCreator extends TabCreator {
      private final Activity mActivity;
-@@ -500,7 +504,6 @@ public class ChromeTabCreator extends TabCreator {
+@@ -502,7 +506,6 @@ public class ChromeTabCreator extends TabCreator {
      // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome.
      public Tab launchUrlFromExternalApp(
              LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
@@ -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 {
+@@ -832,6 +834,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
+@@ -748,7 +749,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;
  
@@ -1351,10 +1351,10 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
  #include "components/content_settings/core/browser/content_settings_pref_provider.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
  #include "components/permissions/features.h"
-@@ -103,9 +104,25 @@ scoped_refptr<RefcountedKeyedService>
-   if (profile->IsOffTheRecord() && !profile->IsGuestSession())
+@@ -105,9 +106,25 @@ scoped_refptr<RefcountedKeyedService>
      GetForProfile(original_profile);
  
+   bool should_record_metrics = profiles::IsRegularUserProfile(profile);
 +  bool always_incognito_enabled = false;
 +  bool force_save_site_settings = false;
 +
@@ -1376,9 +1376,9 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
 +      !force_save_site_settings && (profile->IsOffTheRecord() || profile->IsGuestSession()),
 +      force_save_site_settings,
        /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(),
-       profiles::IsRegularUserProfile(profile)));
+       should_record_metrics));
  
-@@ -114,6 +131,9 @@ scoped_refptr<RefcountedKeyedService>
+@@ -116,6 +133,9 @@ scoped_refptr<RefcountedKeyedService>
    settings_map->RegisterProvider(ProviderType::kWebuiAllowlistProvider,
                                   std::move(allowlist_provider));
  
@@ -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) {
+@@ -511,6 +514,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() {
+@@ -518,6 +528,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 @@
+@@ -245,6 +245,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,
+@@ -2010,6 +2011,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
+@@ -6528,6 +6528,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
@@ -1990,7 +1990,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn
 --- a/chrome/browser/ui/messages/android/BUILD.gn
 +++ b/chrome/browser/ui/messages/android/BUILD.gn
-@@ -27,6 +27,7 @@ android_library("java") {
+@@ -28,6 +28,7 @@ android_library("java") {
    srcjar_deps = [ ":jni_headers" ]
    sources = [
      "java/src/org/chromium/chrome/browser/ui/messages/infobar/SimpleConfirmInfoBarBuilder.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[] =
+@@ -4071,6 +4071,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 {
+@@ -247,6 +247,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,
+@@ -256,6 +257,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,
+@@ -269,7 +271,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2136,7 +2136,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -502,6 +503,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -505,6 +506,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -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.

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

@@ -292,8 +292,8 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc
 @@ -9,6 +9,7 @@
+ #include "third_party/blink/public/mojom/autoplay/autoplay.mojom-blink.h"
  #include "third_party/blink/public/mojom/frame/lifecycle.mojom-blink.h"
- #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
  #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom-blink.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
  #include "third_party/blink/public/platform/web_media_player.h"

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

@@ -46,26 +46,26 @@ 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/resources/app.css         |  24 +++
- components/flags_ui/resources/app.html.ts     |  28 +++
- components/flags_ui/resources/app.ts          |  23 +++
- components/flags_ui/resources/experiment.css  |   9 +-
- .../flags_ui/resources/experiment.html.ts     |   7 +-
- components/flags_ui/resources/experiment.ts   |  14 +-
- .../flags_ui/resources/flags_browser_proxy.ts |   5 +
  .../core/offline_page_feature.cc              |   1 +
  .../offline_pages/core/offline_page_feature.h |   1 +
  .../browser/features/password_features.cc     |   1 +
- components/permissions/features.cc            |   1 +
+ components/permissions/features.cc            |   2 +
  ...nthetic_trials_active_group_id_provider.cc |   4 +-
  ...ynthetic_trials_active_group_id_provider.h |   4 +-
- .../version_ui/version_handler_helper.cc      |   4 +-
+ components/webui/flags/flags_state.cc         |  59 ++++++
+ components/webui/flags/resources/app.css      |  24 +++
+ components/webui/flags/resources/app.html.ts  |  28 +++
+ components/webui/flags/resources/app.ts       |  24 +++
+ .../webui/flags/resources/experiment.css      |   9 +-
+ .../webui/flags/resources/experiment.html.ts  |   7 +-
+ .../webui/flags/resources/experiment.ts       |  12 +-
+ .../flags/resources/flags_browser_proxy.ts    |   5 +
+ .../webui/version/version_handler_helper.cc   |   4 +-
  content/common/features.cc                    |   1 +
  content/public/common/content_features.cc     |   1 +
  content/public/common/content_features.h      |   1 +
@@ -106,7 +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, 812 insertions(+), 29 deletions(-)
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -143,7 +143,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -165,6 +165,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -164,6 +164,8 @@ use_epoll = is_linux || is_chromeos || is_android
  # This does not include test code (test support and anything in the test
  # directory) which should use source_set as is recommended for GN targets).
  component("base") {
@@ -152,7 +152,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
    sources = [
      "allocator/allocator_check.cc",
      "allocator/allocator_check.h",
-@@ -1017,7 +1019,7 @@ component("base") {
+@@ -1019,7 +1021,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) {
@@ -191,7 +191,7 @@ diff --git a/base/android/java/src/org/chromium/base/cached_flags/ValuesReturned
 diff --git a/base/feature_list.cc b/base/feature_list.cc
 --- a/base/feature_list.cc
 +++ b/base/feature_list.cc
-@@ -42,6 +42,31 @@
+@@ -41,6 +41,31 @@
  
  namespace base {
  
@@ -223,7 +223,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  namespace {
  
  // Pointer to the FeatureList instance singleton that was set via
-@@ -473,6 +498,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
    return g_feature_list_instance->IsFeatureEnabled(feature);
  }
  
@@ -270,7 +270,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  // static
  bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
    return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
-@@ -743,6 +808,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -742,6 +807,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
  
  void FeatureList::FinalizeInitialization() {
    DCHECK(!initialized_);
@@ -291,7 +291,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 diff --git a/base/feature_list.h b/base/feature_list.h
 --- a/base/feature_list.h
 +++ b/base/feature_list.h
-@@ -170,8 +170,10 @@ enum class FeatureMacroHandshake { kSecret };
+@@ -167,8 +167,10 @@ enum class FeatureMacroHandshake { kSecret };
  struct BASE_EXPORT LOGICALLY_CONST Feature {
    constexpr Feature(const char* name,
                      FeatureState default_state,
@@ -304,7 +304,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
  #if BUILDFLAG(ENABLE_BANNED_BASE_FEATURE_PREFIX)
      if (std::string_view(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) ==
          0) {
-@@ -198,6 +200,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
+@@ -195,6 +197,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
    // command line switch.
    const FeatureState default_state;
  
@@ -314,7 +314,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
   private:
    friend class FeatureList;
  
-@@ -477,6 +482,11 @@ class BASE_EXPORT FeatureList {
+@@ -474,6 +479,11 @@ class BASE_EXPORT FeatureList {
    // instance, which is checked in builds with DCHECKs enabled.
    static bool IsEnabled(const Feature& feature);
  
@@ -326,7 +326,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
    // Some characters are not allowed to appear in feature names or the
    // associated field trial names, as they are used as special characters for
    // command-line serialization. This function checks that the strings are ASCII
-@@ -746,4 +756,62 @@ class BASE_EXPORT FeatureList {
+@@ -743,4 +753,62 @@ class BASE_EXPORT FeatureList {
  
  }  // namespace base
  
@@ -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;
+@@ -396,6 +396,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)
+@@ -4428,6 +4432,10 @@ const FeatureEntry::FeatureVariation
+          std::size(kStandardBoundSessionCredentialsEnabledOriginTrialToken),
+          nullptr}};
  
 +#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[] = {
+@@ -4454,6 +4462,9 @@ const FeatureEntry::FeatureVariation
  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,
+@@ -357,4 +357,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
               "RemovalOfIWAsFromTabCapture",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -676,7 +676,7 @@ diff --git a/chrome/browser/browser_features.cc b/chrome/browser/browser_feature
 diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h
 --- a/chrome/browser/browser_features.h
 +++ b/chrome/browser/browser_features.h
-@@ -136,6 +136,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+@@ -134,6 +134,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
  // module, e.g.
  // //chrome/browser/<foo_module>/features.h
  //
@@ -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,
+@@ -1202,5 +1202,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(
+@@ -240,6 +240,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 {
+@@ -862,7 +866,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 {
+@@ -967,6 +971,13 @@ public abstract class ChromeFeatureList {
                      sUseLibunwindstackNativeUnwinderAndroid,
                      sWebApkMinShellApkVersion);
  
@@ -778,9 +778,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +            concatenateLists(CromiteCachedFlagImplBase.getList(), sFlagsCachedFullBrowserChromium);
 +
-     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser = List.of();
+     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser =
+             List.of(sAsyncNotificationManagerForDownload);
  
-     public static final List<CachedFlag> sTestCachedFlags =
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
 new file mode 100644
 --- /dev/null
@@ -853,10 +853,10 @@ diff --git a/chrome/browser/settings/BUILD.gn b/chrome/browser/settings/BUILD.gn
 diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
 --- a/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
 +++ b/chrome/browser/settings/android/java/src/org/chromium/chrome/browser/settings/ChromeBaseSettingsFragment.java
-@@ -7,12 +7,19 @@ package org.chromium.chrome.browser.settings;
- import androidx.annotation.NonNull;
- import androidx.preference.PreferenceFragmentCompat;
+@@ -8,12 +8,19 @@ import androidx.preference.PreferenceFragmentCompat;
  
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherFactory;
@@ -873,9 +873,9 @@ diff --git a/chrome/browser/settings/android/java/src/org/chromium/chrome/browse
  /**
   * Base class for settings in Chrome.
   *
-@@ -26,6 +33,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
-     private Profile mProfile;
-     private SettingsCustomTabLauncher mCustomTabLauncher;
+@@ -28,6 +35,49 @@ public abstract class ChromeBaseSettingsFragment extends PreferenceFragmentCompa
+     private @Nullable Profile mProfile;
+     private @Nullable SettingsCustomTabLauncher mCustomTabLauncher;
  
 +    private Supplier<ChromeBaseSettingsFragment.RequireRestartDelegate> mRequireRestartDelegateSupplier;
 +
@@ -957,8 +957,8 @@ 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",
+@@ -371,4 +371,5 @@ BASE_FEATURE(kByDateHistoryInSidePanel,
+              "ByDateHistoryInSidePanel",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
@@ -966,7 +966,7 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1561,4 +1561,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
+@@ -1591,4 +1591,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;
      }
  
@@ -1138,10 +1129,93 @@ new file mode 100644
 +++ b/components/cromite_components_strings_grd/placeholder.txt
 @@ -0,0 +1 @@
 +this file is intentionally empty
-diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_state.cc
---- a/components/flags_ui/flags_state.cc
-+++ b/components/flags_ui/flags_state.cc
-@@ -363,6 +363,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
+diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
+--- a/components/offline_pages/core/offline_page_feature.cc
++++ b/components/offline_pages/core/offline_page_feature.cc
+@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
+   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
+ }
+ 
++#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc"
+ }  // namespace offline_pages
+diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
+--- a/components/offline_pages/core/offline_page_feature.h
++++ b/components/offline_pages/core/offline_page_feature.h
+@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
+ // offline pages to avoid showing them even when the device is online.
+ bool IsOfflinePagesNetworkStateLikelyUnknown();
+ 
++#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc"
+ }  // namespace offline_pages
+ 
+ #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_
+diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
+--- a/components/password_manager/core/browser/features/password_features.cc
++++ b/components/password_manager/core/browser/features/password_features.cc
+@@ -187,4 +187,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
+              "ImprovedPasswordChangeService",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ 
++#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
+ }  // namespace password_manager::features
+diff --git a/components/permissions/features.cc b/components/permissions/features.cc
+--- a/components/permissions/features.cc
++++ b/components/permissions/features.cc
+@@ -137,6 +137,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
+              "OsAdditionalSecurityPermissionKillSwitch",
+              base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif
++
++#include "cromite_flags/components_permissions_features_cc.inc"
+ }  // namespace features
+ namespace feature_params {
+ 
+diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc
+--- a/components/variations/synthetic_trials_active_group_id_provider.cc
++++ b/components/variations/synthetic_trials_active_group_id_provider.cc
+@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() {
+   return group_ids_;
+ }
+ 
+-#if !defined(NDEBUG)
++#if true
+ std::vector<SyntheticTrialGroup>
+ SyntheticTrialsActiveGroupIdProvider::GetGroups() {
+   base::AutoLock scoped_lock(lock_);
+@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged(
+     for (const auto& group : groups) {
+       group_ids_.push_back(group.id());
+     }
+-#if !defined(NDEBUG)
++#if true
+     groups_ = groups;
+ #endif  // !defined(NDEBUG)
+   }
+diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h
+--- a/components/variations/synthetic_trials_active_group_id_provider.h
++++ b/components/variations/synthetic_trials_active_group_id_provider.h
+@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
+   // Returns currently active synthetic trial group IDs.
+   std::vector<ActiveGroupId> GetActiveGroupIds();
+ 
+-#if !defined(NDEBUG)
++#if true
+   // In debug mode, not only the group IDs are tracked but also the full group
+   // info, to display the names unhashed in chrome://version.
+   std::vector<SyntheticTrialGroup> GetGroups();
+@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
+ 
+   base::Lock lock_;
+   std::vector<ActiveGroupId> group_ids_;  // GUARDED_BY(lock_);
+-#if !defined(NDEBUG)
++#if true
+   // In debug builds, keep the full group information to be able to display it
+   // in chrome://version.
+   std::vector<SyntheticTrialGroup> groups_;  // GUARDED_BY(lock_);
+diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flags_state.cc
+--- a/components/webui/flags/flags_state.cc
++++ b/components/webui/flags/flags_state.cc
+@@ -377,6 +377,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 +1237,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(
+@@ -705,6 +720,27 @@ void FlagsState::GetFlagFeatureEntries(
        data.Set("links", std::move(links));
      }
  
@@ -1191,7 +1265,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(
+@@ -832,6 +868,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 +1282,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(
+@@ -1088,6 +1134,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
  bool FlagsState::IsSupportedFeature(const FlagsStorage* storage,
                                      const std::string& name,
                                      int platform_mask) const {
@@ -1222,10 +1296,22 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +  }
    for (const auto& entry : feature_entries_) {
      DCHECK(entry.IsValid());
-     if (!(entry.supported_platforms & platform_mask))
-diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resources/app.css
---- a/components/flags_ui/resources/app.css
-+++ b/components/flags_ui/resources/app.css
+     if (!(entry.supported_platforms & platform_mask)) {
+@@ -1122,6 +1176,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/webui/flags/resources/app.css b/components/webui/flags/resources/app.css
+--- a/components/webui/flags/resources/app.css
++++ b/components/webui/flags/resources/app.css
 @@ -383,3 +383,27 @@ cr-tabs {
      padding-top: 1.5rem;
    }
@@ -1254,9 +1340,9 @@ diff --git a/components/flags_ui/resources/app.css b/components/flags_ui/resourc
 +.cromite .section-header-title {
 +  display: none;
 +}
-diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/resources/app.html.ts
---- a/components/flags_ui/resources/app.html.ts
-+++ b/components/flags_ui/resources/app.html.ts
+diff --git a/components/webui/flags/resources/app.html.ts b/components/webui/flags/resources/app.html.ts
+--- a/components/webui/flags/resources/app.html.ts
++++ b/components/webui/flags/resources/app.html.ts
 @@ -9,6 +9,7 @@ import type {AppElement} from './app.js';
  export function getHtml(this: AppElement) {
    // clang-format off
@@ -1306,9 +1392,9 @@ diff --git a/components/flags_ui/resources/app.html.ts b/components/flags_ui/res
  <!--_html_template_end_-->`;
    // clang-format on
  }
-diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resources/app.ts
---- a/components/flags_ui/resources/app.ts
-+++ b/components/flags_ui/resources/app.ts
+diff --git a/components/webui/flags/resources/app.ts b/components/webui/flags/resources/app.ts
+--- a/components/webui/flags/resources/app.ts
++++ b/components/webui/flags/resources/app.ts
 @@ -132,6 +132,7 @@ export class FlagsAppElement extends CrLitElement {
      // <if expr="not is_ios">
      loadTimeData.getString('unavailable'),
@@ -1330,13 +1416,13 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
    private announceStatusDelayMs: number = 100;
    private featuresResolver: PromiseResolver<void> = new PromiseResolver();
    private flagSearch: FlagSearch|null = null;
-@@ -186,10 +190,24 @@ export class FlagsAppElement extends CrLitElement {
+@@ -186,10 +190,25 @@ export class FlagsAppElement extends CrLitElement {
      if (changedPrivateProperties.has('data')) {
        const defaultFeatures: Feature[] = [];
        const nonDefaultFeatures: Feature[] = [];
 +      const defaultCromiteFeatures: Feature[] = [];
 +      const nonDefaultCromiteFeatures: Feature[] = [];
- 
++
 +      if (this.onlyCromiteFlags) {
 +        this.data.supportedFeatures =
 +          this.data.supportedFeatures.filter(item => item.is_new);
@@ -1347,6 +1433,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
 +                : undefined));
 +      this.data.supportedFeatures.sort(
 +        (a,b) => (a.internal_name.localeCompare(b.internal_name)));
+ 
        this.data.supportedFeatures.forEach(
            f => (f.is_default ? defaultFeatures : nonDefaultFeatures).push(f));
  
@@ -1355,7 +1442,7 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
        this.defaultFeatures = defaultFeatures;
        this.nonDefaultFeatures = nonDefaultFeatures;
  
-@@ -233,6 +251,11 @@ export class FlagsAppElement extends CrLitElement {
+@@ -233,6 +252,11 @@ export class FlagsAppElement extends CrLitElement {
    override connectedCallback() {
      super.connectedCallback();
  
@@ -1367,9 +1454,9 @@ diff --git a/components/flags_ui/resources/app.ts b/components/flags_ui/resource
      // <if expr="not is_ios">
      const pathname = new URL(window.location.href).pathname;
      this.isFlagsDeprecatedUrl_ =
-diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/resources/experiment.css
---- a/components/flags_ui/resources/experiment.css
-+++ b/components/flags_ui/resources/experiment.css
+diff --git a/components/webui/flags/resources/experiment.css b/components/webui/flags/resources/experiment.css
+--- a/components/webui/flags/resources/experiment.css
++++ b/components/webui/flags/resources/experiment.css
 @@ -12,6 +12,7 @@
  }
  
@@ -1414,9 +1501,9 @@ diff --git a/components/flags_ui/resources/experiment.css b/components/flags_ui/
      width: 100%;
    }
  
-diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags_ui/resources/experiment.html.ts
---- a/components/flags_ui/resources/experiment.html.ts
-+++ b/components/flags_ui/resources/experiment.html.ts
+diff --git a/components/webui/flags/resources/experiment.html.ts b/components/webui/flags/resources/experiment.html.ts
+--- a/components/webui/flags/resources/experiment.html.ts
++++ b/components/webui/flags/resources/experiment.html.ts
 @@ -10,7 +10,8 @@ export function getHtml(this: ExperimentElement) {
    // clang-format off
    return html`<!--_html_template_start_-->
@@ -1438,9 +1525,9 @@ diff --git a/components/flags_ui/resources/experiment.html.ts b/components/flags
              </option>
            `)}
          </select>
-diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/resources/experiment.ts
---- a/components/flags_ui/resources/experiment.ts
-+++ b/components/flags_ui/resources/experiment.ts
+diff --git a/components/webui/flags/resources/experiment.ts b/components/webui/flags/resources/experiment.ts
+--- a/components/webui/flags/resources/experiment.ts
++++ b/components/webui/flags/resources/experiment.ts
 @@ -81,6 +81,11 @@ export class ExperimentElement extends CrLitElement {
      enabled: false,
      is_default: false,
@@ -1453,7 +1540,7 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
    };
  
    // Whether the controls to change the experiment state should be hidden.
-@@ -127,12 +132,15 @@ export class ExperimentElement extends CrLitElement {
+@@ -127,9 +132,12 @@ export class ExperimentElement extends CrLitElement {
    }
  
    protected getExperimentTitle_(): string {
@@ -1467,14 +1554,10 @@ diff --git a/components/flags_ui/resources/experiment.ts b/components/flags_ui/r
 +                               loadTimeData.getString('experiment-enabled')) + suffix;
      }
  
--    return '';
-+    return suffix;
-   }
- 
-   protected getPlatforms_(): string {
-diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/flags_ui/resources/flags_browser_proxy.ts
---- a/components/flags_ui/resources/flags_browser_proxy.ts
-+++ b/components/flags_ui/resources/flags_browser_proxy.ts
+     return '';
+diff --git a/components/webui/flags/resources/flags_browser_proxy.ts b/components/webui/flags/resources/flags_browser_proxy.ts
+--- a/components/webui/flags/resources/flags_browser_proxy.ts
++++ b/components/webui/flags/resources/flags_browser_proxy.ts
 @@ -16,6 +16,11 @@ export interface Feature {
    description: string;
    enabled: boolean;
@@ -1487,91 +1570,9 @@ diff --git a/components/flags_ui/resources/flags_browser_proxy.ts b/components/f
    supported_platforms: string[];
    origin_list_value?: string;
    string_value?: string;
-diff --git a/components/offline_pages/core/offline_page_feature.cc b/components/offline_pages/core/offline_page_feature.cc
---- a/components/offline_pages/core/offline_page_feature.cc
-+++ b/components/offline_pages/core/offline_page_feature.cc
-@@ -48,4 +48,5 @@ bool IsOfflinePagesNetworkStateLikelyUnknown() {
-   return base::FeatureList::IsEnabled(kOfflinePagesNetworkStateLikelyUnknown);
- }
- 
-+#include "cromite_flags/components_offline_pages_core_offline_page_feature_cc.inc"
- }  // namespace offline_pages
-diff --git a/components/offline_pages/core/offline_page_feature.h b/components/offline_pages/core/offline_page_feature.h
---- a/components/offline_pages/core/offline_page_feature.h
-+++ b/components/offline_pages/core/offline_page_feature.h
-@@ -42,6 +42,7 @@ bool IsOnTheFlyMhtmlHashComputationEnabled();
- // offline pages to avoid showing them even when the device is online.
- bool IsOfflinePagesNetworkStateLikelyUnknown();
- 
-+#include "cromite_flags/components_offline_pages_core_offline_page_feature_h.inc"
- }  // namespace offline_pages
- 
- #endif  // COMPONENTS_OFFLINE_PAGES_CORE_OFFLINE_PAGE_FEATURE_H_
-diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
---- a/components/password_manager/core/browser/features/password_features.cc
-+++ b/components/password_manager/core/browser/features/password_features.cc
-@@ -188,4 +188,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
-              "ImprovedPasswordChangeService",
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
-+#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
- }  // namespace password_manager::features
-diff --git a/components/permissions/features.cc b/components/permissions/features.cc
---- a/components/permissions/features.cc
-+++ b/components/permissions/features.cc
-@@ -122,6 +122,7 @@ BASE_FEATURE(kCpssQuietChipTextUpdate,
- BASE_FEATURE(kCpssUseTfliteSignatureRunner,
-              "CpssUseTfliteSignatureRunner",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+#include "cromite_flags/components_permissions_features_cc.inc"
- }  // namespace features
- namespace feature_params {
- 
-diff --git a/components/variations/synthetic_trials_active_group_id_provider.cc b/components/variations/synthetic_trials_active_group_id_provider.cc
---- a/components/variations/synthetic_trials_active_group_id_provider.cc
-+++ b/components/variations/synthetic_trials_active_group_id_provider.cc
-@@ -27,7 +27,7 @@ SyntheticTrialsActiveGroupIdProvider::GetActiveGroupIds() {
-   return group_ids_;
- }
- 
--#if !defined(NDEBUG)
-+#if true
- std::vector<SyntheticTrialGroup>
- SyntheticTrialsActiveGroupIdProvider::GetGroups() {
-   base::AutoLock scoped_lock(lock_);
-@@ -53,7 +53,7 @@ void SyntheticTrialsActiveGroupIdProvider::OnSyntheticTrialsChanged(
-     for (const auto& group : groups) {
-       group_ids_.push_back(group.id());
-     }
--#if !defined(NDEBUG)
-+#if true
-     groups_ = groups;
- #endif  // !defined(NDEBUG)
-   }
-diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b/components/variations/synthetic_trials_active_group_id_provider.h
---- a/components/variations/synthetic_trials_active_group_id_provider.h
-+++ b/components/variations/synthetic_trials_active_group_id_provider.h
-@@ -36,7 +36,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
-   // Returns currently active synthetic trial group IDs.
-   std::vector<ActiveGroupId> GetActiveGroupIds();
- 
--#if !defined(NDEBUG)
-+#if true
-   // In debug mode, not only the group IDs are tracked but also the full group
-   // info, to display the names unhashed in chrome://version.
-   std::vector<SyntheticTrialGroup> GetGroups();
-@@ -60,7 +60,7 @@ class COMPONENT_EXPORT(VARIATIONS) SyntheticTrialsActiveGroupIdProvider
- 
-   base::Lock lock_;
-   std::vector<ActiveGroupId> group_ids_;  // GUARDED_BY(lock_);
--#if !defined(NDEBUG)
-+#if true
-   // In debug builds, keep the full group information to be able to display it
-   // in chrome://version.
-   std::vector<SyntheticTrialGroup> groups_;  // GUARDED_BY(lock_);
-diff --git a/components/version_ui/version_handler_helper.cc b/components/version_ui/version_handler_helper.cc
---- a/components/version_ui/version_handler_helper.cc
-+++ b/components/version_ui/version_handler_helper.cc
+diff --git a/components/webui/version/version_handler_helper.cc b/components/webui/version/version_handler_helper.cc
+--- a/components/webui/version/version_handler_helper.cc
++++ b/components/webui/version/version_handler_helper.cc
 @@ -20,7 +20,7 @@
  namespace version_ui {
  namespace {
@@ -1593,7 +1594,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,
+@@ -509,4 +509,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
  
  // Please keep features in alphabetical order.
  
@@ -1602,7 +1603,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() {
+@@ -1485,4 +1485,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
           VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
  }
  
@@ -1611,7 +1612,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>
+@@ -350,6 +350,7 @@ CONTENT_EXPORT extern const base::FeatureParam<std::string>
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  
@@ -1957,7 +1958,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() {
+@@ -1807,5 +1807,5 @@ uint32_t GetPassthroughAudioFormats() {
    return 0;
  #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  }
@@ -1967,7 +1968,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();
+@@ -571,5 +571,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
  MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
  
  }  // namespace media
@@ -1977,8 +1978,8 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -666,4 +666,5 @@ BASE_FEATURE(kHstsTopLevelNavigationsOnly,
-              "HstsTopLevelNavigationsOnly",
+@@ -709,4 +709,5 @@ BASE_FEATURE(kSelfSignedLocalNetworkInterstitial,
+              "SelfSignedLocalNetworkInterstitial",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/net_base_features_cc.inc"
@@ -1986,9 +1987,9 @@ diff --git a/net/base/features.cc b/net/base/features.cc
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -687,6 +687,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kNewClientCertPathBuilding);
- // When enabled HSTS upgrades will only apply to top-level navigations.
- NET_EXPORT BASE_DECLARE_FEATURE(kHstsTopLevelNavigationsOnly);
+@@ -721,6 +721,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kUseCertTransparencyAwareApiForOsCertVerify);
+ // URLs.
+ NET_EXPORT BASE_DECLARE_FEATURE(kSelfSignedLocalNetworkInterstitial);
  
 +#include "cromite_flags/net_base_features_h.inc"
  }  // namespace net::features
@@ -1997,18 +1998,18 @@ diff --git a/net/base/features.h b/net/base/features.h
 diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
 --- a/services/network/public/cpp/features.cc
 +++ b/services/network/public/cpp/features.cc
-@@ -366,4 +366,5 @@ BASE_FEATURE(kSRIMessageSignatureEnforcement,
-              "SRIMessageSignatureEnforcement",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -544,4 +544,5 @@ BASE_FEATURE_PARAM(int,
+                    "max_ops_before_maintenance",
+                    1000);
  
 +#include "cromite_flags/services_network_public_cpp_features_cc.inc"
  }  // namespace network::features
 diff --git a/services/network/public/cpp/features.h b/services/network/public/cpp/features.h
 --- a/services/network/public/cpp/features.h
 +++ b/services/network/public/cpp/features.h
-@@ -155,6 +155,7 @@ BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault);
+@@ -261,6 +261,7 @@ BASE_DECLARE_FEATURE_PARAM(int, kInterestGroupStorageMaxNegativeGroupsPerOwner);
  COMPONENT_EXPORT(NETWORK_CPP)
- BASE_DECLARE_FEATURE(kSRIMessageSignatureEnforcement);
+ BASE_DECLARE_FEATURE_PARAM(int, kInterestGroupStorageMaxOpsBeforeMaintenance);
  
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
  }  // namespace network::features
@@ -2017,7 +2018,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) {
+@@ -2744,4 +2744,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2026,7 +2027,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();
+@@ -1793,6 +1793,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2037,7 +2038,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,
+@@ -456,4 +456,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
               "AsyncFullscreenWindowState",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -2046,7 +2047,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);
  

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

@@ -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" />
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -1187,7 +1187,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1190,7 +1190,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
      public @CustomTabProfileType int getCustomTabMode() {
          return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                  ? CustomTabProfileType.INCOGNITO
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -980,6 +980,7 @@ public class CustomTabsConnection {
+@@ -981,6 +981,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -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);
+@@ -766,6 +766,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,
+@@ -932,6 +934,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

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

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/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.
+@@ -175,6 +175,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.
+@@ -204,6 +207,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;
+@@ -297,6 +297,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
+@@ -3070,6 +3072,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                      .closeTabs(
                              TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
              RecordUserAction.record("MobileTabClosed");
@@ -60,15 +60,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -61,6 +61,7 @@ import org.chromium.chrome.R;
+@@ -59,6 +59,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
- import org.chromium.chrome.browser.AppHooks;
 +import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2374,6 +2375,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2375,6 +2376,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return true;
          }
  
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4388,6 +4388,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4382,6 +4382,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
          Dark theme
        </message>

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/functional/bind.h"
-@@ -535,6 +536,15 @@ AutocompleteController::AutocompleteController(
+@@ -536,6 +537,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"

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

@@ -92,7 +92,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -26,6 +26,10 @@
+@@ -22,6 +22,10 @@
  #include "net/socket/client_socket_handle.h"
  #include "net/socket/client_socket_pool.h"
  #include "net/socket/connect_job.h"
@@ -103,7 +103,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  #include "net/ssl/ssl_config.h"
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
-@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -164,6 +168,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
  int ClientSocketPoolManager::max_sockets_per_group(
      HttpNetworkSession::SocketPoolType pool_type) {
    DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);

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

@@ -45,8 +45,8 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1112,6 +1112,7 @@ component("net") {
-     "//build:chromeos_buildflags",
+@@ -1119,6 +1119,7 @@ component("net") {
+     ":net_deps",
      "//components/miracle_parameter/common",
      "//components/network_time/time_tracker",
 +    "//components/network_session_configurator/common",
@@ -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(
+@@ -1477,6 +1478,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -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" />
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
  import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
-@@ -133,6 +134,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+@@ -127,6 +128,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
  
          @Override
          public boolean shouldDisableAllExternalIntents() {
@@ -142,15 +142,15 @@ 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};
+     &kBlockIntentsToSelf};
 -
  }  // namespace
  
  // Alphabetical:
-@@ -48,7 +47,13 @@ BASE_FEATURE(kTrustedClientGestureBypass,
-              "TrustedClientGestureBypass",
+@@ -44,7 +43,13 @@ BASE_FEATURE(kBlockIntentsToSelf,
+              "BlockIntentsToSelf",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
 +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
@@ -177,9 +177,9 @@ diff --git a/components/external_intents/android/external_intents_features.h b/c
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
-@@ -18,6 +18,12 @@ import org.chromium.base.Features;
-  */
+@@ -20,6 +20,12 @@ import org.chromium.build.annotations.NullMarked;
  @JNINamespace("external_intents")
+ @NullMarked
  public class ExternalIntentsFeatures extends Features {
 +    public static final String INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE_NAME =
 +            "IntentBlockExternalFormRedirectsNoGesture";
@@ -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();
          }
  

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

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

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

@@ -14,26 +14,26 @@ 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") {
-         # TODO(crbug.com/40284799): Fix and re-enable.
-         "-Wno-thread-safety-reference-return",
+@@ -1978,7 +1978,6 @@ config("default_warnings") {
+         # TODO(crbug.com/376641662): Fix and re-enable.
+         "-Wno-nontrivial-memcall",
        ]
 -
        cflags_cc += [
          # TODO(crbug.com/328490295): Fix and re-enable for C flags.
          "-Wenum-compare-conditional",
-@@ -2001,6 +2000,16 @@ config("default_warnings") {
-         # TODO(crbug.com/376641662): Fix and re-enable.
-         cflags += [ "-Wno-nontrivial-memcall" ]
+@@ -1993,6 +1992,16 @@ config("default_warnings") {
+         # TODO(crbug.com/344680447): Fix and re-enable.
+         cflags_cc += [ "-Wno-missing-template-arg-list-after-template-kw" ]
        }
 +      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",
 +        ]
 +      }
      }

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

@@ -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) {
+@@ -224,7 +224,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
@@ -289,10 +279,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -591,6 +591,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-         }
+@@ -603,6 +603,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
      }
  
+     @RequiresNonNull({"mSite"})
 +    private boolean isSessionPermission(@ContentSettingsType.EnumType int type) {
 +        return mSite.getPermissionInfo(type) != null &&
 +               mSite.getPermissionInfo(type).getSessionModel() == SessionModel.USER_SESSION;
@@ -300,8 +290,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +
      private void setUpClearDataPreference() {
          ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
-         long usage = mSite.getTotalUsage();
-@@ -1156,6 +1161,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+         assumeNonNull(preference);
+@@ -1195,6 +1200,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
                      AppCompatResources.getColorStateList(getContext(), mHighlightColor)
                              .getDefaultColor());
          }
@@ -315,7 +305,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
 --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
 +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
-@@ -200,7 +200,7 @@ void GetOrigins(JNIEnv* env,
+@@ -208,7 +208,7 @@ void GetOrigins(JNIEnv* env,
        seen_origins.push_back(origin);
        insertionFunc(env, static_cast<int>(content_type), list,
                      ConvertOriginToJavaString(env, origin), jembedder,
@@ -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,
@@ -542,7 +532,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1206,6 +1206,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1197,6 +1197,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
@@ -565,17 +555,17 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
-@@ -13,6 +13,7 @@ import org.jni_zero.JNINamespace;
- import org.jni_zero.NativeMethods;
- 
+@@ -15,6 +15,7 @@ import org.jni_zero.NativeMethods;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.ui.base.WindowAndroid;
 +import org.chromium.components.content_settings.LifetimeMode;
  
  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;
+@@ -66,6 +67,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 {
+@@ -135,6 +139,15 @@ public class PermissionDialogDelegate {
                  .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this);
      }
  
@@ -596,13 +586,13 @@ 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
-@@ -12,6 +12,18 @@ import org.chromium.ui.UiUtils;
+@@ -13,6 +13,18 @@ import org.chromium.ui.UiUtils;
  import org.chromium.ui.modaldialog.ModalDialogProperties;
  import org.chromium.ui.modelutil.PropertyModel;
  
@@ -619,11 +609,11 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 +import org.chromium.components.content_settings.LifetimeMode;
 +
  /** This class creates the model for the permission dialog. */
+ @NullMarked
  class PermissionDialogModelFactory {
-     public static PropertyModel getModel(
-@@ -72,6 +84,74 @@ class PermissionDialogModelFactory {
-                             ModalDialogProperties.NEGATIVE_BUTTON_TEXT,
-                             delegate.getNegativeButtonText());
+@@ -67,7 +79,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
+@@ -109,7 +109,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
+@@ -44,7 +44,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() {
+@@ -1562,7 +1573,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
+@@ -383,9 +385,12 @@ class PermissionRequestManager
  
    // Calls PermissionGranted on a request and all its duplicates.
    void PermissionGrantedIncludingDuplicates(PermissionRequest* request,

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

@@ -4,32 +4,32 @@ Subject: Add menu item to bookmark all tabs
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/main_menu.xml    |  7 ++
- .../chrome/browser/ChromeTabbedActivity.java  | 24 +++++++
- .../browser/bookmarks/BookmarkBridge.java     | 67 +++++++++++++++++++
- .../bookmarks/android/bookmark_bridge.cc      | 44 +++++++++++-
- .../bookmarks/android/bookmark_bridge.h       |  8 +++
- .../browser/bookmarks/bookmark_html_writer.cc | 11 ++-
- .../bookmark_merged_surface_service.cc        |  3 +
+ chrome/android/java/res/menu/main_menu.xml    |  7 +++
+ .../chrome/browser/ChromeTabbedActivity.java  | 43 +++++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.cc      | 42 ++++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.h       |  8 ++++
+ .../browser/bookmarks/BookmarkBridge.java     | 41 ++++++++++++++++++
+ .../browser/bookmarks/bookmark_html_writer.cc | 14 +++++-
+ .../bookmark_merged_surface_service.cc        |  3 ++
  .../permanent_folder_ordering_tracker.cc      |  2 +
  .../dialogs/DownloadLocationCustomView.java   |  4 +-
- .../strings/android_chrome_strings.grd        |  3 +
+ .../strings/android_chrome_strings.grd        |  3 ++
  .../bookmark_ui_operations_helper.cc          |  2 +
- components/bookmark_bar_strings.grdp          |  6 ++
- .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
- components/bookmarks/browser/bookmark_codec.h |  7 +-
- .../browser/bookmark_load_details.cc          | 14 +++-
+ components/bookmark_bar_strings.grdp          |  6 +++
+ .../bookmarks/browser/bookmark_codec.cc       | 20 +++++++--
+ components/bookmarks/browser/bookmark_codec.h |  7 ++-
+ .../browser/bookmark_load_details.cc          | 14 ++++--
  .../bookmarks/browser/bookmark_load_details.h |  2 +
  .../bookmarks/browser/bookmark_model.cc       |  3 +-
- components/bookmarks/browser/bookmark_model.h |  7 ++
- components/bookmarks/browser/bookmark_node.cc | 11 +++
- components/bookmarks/browser/bookmark_node.h  |  3 +
+ components/bookmarks/browser/bookmark_model.h |  7 +++
+ components/bookmarks/browser/bookmark_node.cc | 11 +++++
+ components/bookmarks/browser/bookmark_node.h  |  3 ++
  .../bookmarks/browser/bookmark_storage.cc     |  2 +
- .../bookmarks/browser/bookmark_uuids.cc       |  3 +
+ .../bookmarks/browser/bookmark_uuids.cc       |  3 ++
  components/bookmarks/browser/bookmark_uuids.h |  1 +
- components/bookmarks/browser/model_loader.cc  |  8 ++-
+ components/bookmarks/browser/model_loader.cc  |  8 +++-
  .../bookmark_specifics_conversions.cc         |  1 +
- 25 files changed, 248 insertions(+), 15 deletions(-)
+ 25 files changed, 243 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.
+@@ -198,6 +202,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,25 @@ 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
+@@ -253,12 +254,17 @@ import org.chromium.chrome.browser.ui.RootUiCoordinator;
+ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
+ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
++import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
++import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
+ import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
+ import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
+ import org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController;
+ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
+ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
+ import org.chromium.chrome.browser.xr.XrLayoutStateObserver;
++import org.chromium.components.bookmarks.BookmarkId;
++import org.chromium.components.bookmarks.BookmarkItem;
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+ import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper;
+ import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper;
+@@ -3103,6 +3109,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
                      getTabModelSelectorSupplier().get(),
                      closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -75,7 +93,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
+@@ -3191,6 +3199,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -94,147 +112,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +                if (tab.isNativePage()) {
 +                    continue;
 +                }
-+                bookmarkModel.addToTabsCollection(this, tab);
++                bookmarkModel.addToTabsCollection(tab);
 +            }
-+            bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager());
++            BookmarkId parent = bookmarkModel.getTabsCollectionFolderId();
++            BookmarkItem bookmarkItem = bookmarkModel.getBookmarkById(parent);
++            String folderName = "";
++            if (bookmarkItem != null) {
++                folderName = bookmarkItem.getTitle();
++            }
++            SnackbarController snackbarController = new SnackbarController() {
++                @Override
++                public void onAction(Object actionData) {
++                }
++            };
++            Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
++                            Snackbar.UMA_BOOKMARK_ADDED)
++                            .setTemplateText(getString(R.string.bookmark_page_saved_folder));
++            getSnackbarManager().showSnackbar(snackbar);
 +        });
 +    }
 +
      private void recordLauncherShortcutAction(boolean isIncognito) {
          if (isIncognito) {
              RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab");
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
-@@ -17,6 +17,7 @@ import org.jni_zero.JniType;
- import org.jni_zero.NativeMethods;
- 
- import org.chromium.base.ContextUtils;
-+import org.chromium.base.Log;
- import org.chromium.base.ObserverList;
- import org.chromium.base.ThreadUtils;
- import org.chromium.base.metrics.RecordUserAction;
-@@ -24,6 +25,11 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmark;
- import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
- import org.chromium.chrome.browser.profiles.Profile;
-+import org.chromium.chrome.browser.tab.Tab;
-+import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-+import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
-+import org.chromium.chrome.R;
- import org.chromium.components.bookmarks.BookmarkId;
- import org.chromium.components.bookmarks.BookmarkItem;
- import org.chromium.components.bookmarks.BookmarkType;
-@@ -83,6 +89,8 @@ import org.chromium.ui.modaldialog.DialogDismissalCause;
- class BookmarkBridge {
-     private final ObserverList<BookmarkModelObserver> mObservers = new ObserverList<>();
- 
-+    private static final String TAG = "BookmarkBridge";
-+
-     private long mNativeBookmarkBridge;
-     private Profile mProfile;
-     private boolean mIsDoingExtensiveChanges;
-@@ -411,6 +419,16 @@ class BookmarkBridge {
-         return mMobileFolderId;
-     }
- 
-+    /**
-+     * @return The BookmarkId for the Tabs collecction folder node
-+     */
-+    public BookmarkId getTabsCollectionFolderId() {
-+        ThreadUtils.assertOnUiThread();
-+        assert mIsNativeBookmarkModelLoaded;
-+        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
-+                mNativeBookmarkBridge, BookmarkBridge.this);
-+    }
-+
-     /** Returns Id representing the special "other" folder from bookmark model. */
-     public BookmarkId getOtherFolderId() {
-         ThreadUtils.assertOnUiThread();
-@@ -1132,6 +1150,50 @@ class BookmarkBridge {
-                 .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
-     }
- 
-+    // Used to bookmark all tabs in a specific folder, created if not existing
-+    public BookmarkId addToTabsCollection(Context context, Tab tab) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+        BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection(
-+                mNativeBookmarkBridge, tab.getOriginalUrl());
-+        if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
-+            BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL);
-+            BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
-+            if (parent.equals(existingBookmark.getParentId())) {
-+                // bookmark already exists in the tabs collection folder
-+                return existingBookmarkId;
-+            }
-+        }
-+        BookmarkId bookmarkId =
-+                addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl());
-+
-+        if (bookmarkId == null) {
-+            Log.e(TAG,
-+                    "Failed to add bookmarks: parentTypeAndId %s", parent);
-+        }
-+        return bookmarkId;
-+     }
-+
-+     public void finishedAddingToTabsCollection(Activity activity, SnackbarManager snackbarManager) {
-+        BookmarkId parent = getTabsCollectionFolderId();
-+
-+        BookmarkItem bookmarkItem = getBookmarkById(parent);
-+        String folderName;
-+        if (bookmarkItem != null) {
-+            folderName = bookmarkItem.getTitle();
-+        } else {
-+            folderName = "";
-+        }
-+        SnackbarController snackbarController = new SnackbarController() {
-+            @Override
-+            public void onAction(Object actionData) {
-+            }
-+        };
-+        Snackbar snackbar = Snackbar.make(folderName, snackbarController, Snackbar.TYPE_ACTION,
-+                        Snackbar.UMA_BOOKMARK_ADDED)
-+                        .setTemplateText(activity.getString(R.string.bookmark_page_saved_folder));
-+        snackbarManager.showSnackbar(snackbar);
-+    }
-+
-     /**
-      * Helper method to mark an item as read.
-      *
-@@ -1339,6 +1401,9 @@ class BookmarkBridge {
-         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
-                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
- 
-+        BookmarkId getBookmarkIdForTabsCollection(
-+                long nativeBookmarkBridge, GURL url);
-+
-         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
- 
-         void getTopLevelFolderIds(
-@@ -1360,6 +1425,8 @@ class BookmarkBridge {
- 
-         BookmarkId getRootFolderId(long nativeBookmarkBridge);
- 
-+        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
-+
-         BookmarkId getMobileFolderId(long nativeBookmarkBridge);
- 
-         BookmarkId getOtherFolderId(long nativeBookmarkBridge);
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -185,7 +185,7 @@ class FileBookmarksExportObserver: public BookmarksExportObserver {
- 
-     JNIEnv* env = AttachCurrentThread();
-     Java_BookmarkBridge_bookmarksExported(env, obj_, window_->GetJavaObject(),
--                                          ConvertUTF8ToJavaString(env, export_path_),
-+                                          base::android::ConvertUTF8ToJavaString(env, export_path_),
-                                           result == Result::kSuccess);
-     delete this;
-   }
-@@ -363,6 +363,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
+@@ -326,6 +326,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
    return bookmark_model_->account_mobile_node() != nullptr;
  }
  
@@ -268,7 +172,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 +180,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 +190,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 +222,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);
  
@@ -329,53 +233,169 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    base::android::ScopedJavaLocalRef<jobject> AddFolder(
        JNIEnv* env,
        const base::android::JavaParamRef<jobject>& j_parent_id_obj,
+diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+@@ -18,6 +18,7 @@ import org.jni_zero.JniType;
+ import org.jni_zero.NativeMethods;
+ 
+ import org.chromium.base.ContextUtils;
++import org.chromium.base.Log;
+ import org.chromium.base.ObserverList;
+ import org.chromium.base.ThreadUtils;
+ import org.chromium.base.metrics.RecordUserAction;
+@@ -26,6 +27,7 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksShim;
+ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.profiles.Profile;
++import org.chromium.chrome.browser.tab.Tab;
+ import org.chromium.components.bookmarks.BookmarkId;
+ import org.chromium.components.bookmarks.BookmarkItem;
+ import org.chromium.components.bookmarks.BookmarkType;
+@@ -46,6 +48,7 @@ import java.util.function.BiConsumer;
+ class BookmarkBridge {
+     private static OneshotSupplierImpl<BookmarkModel.PartnerBookmarkIteratorProvider>
+             sPartnerBookmarkIteratorSupplier = new OneshotSupplierImpl<>();
++    private static final String TAG = "BookmarkBridge";
+ 
+     private final ObserverList<BookmarkModelObserver> mObservers = new ObserverList<>();
+     private final Profile mProfile;
+@@ -383,6 +386,16 @@ class BookmarkBridge {
+         return mMobileFolderId;
+     }
+ 
++    /**
++     * @return The BookmarkId for the Tabs collecction folder node
++     */
++    public BookmarkId getTabsCollectionFolderId() {
++        ThreadUtils.assertOnUiThread();
++        assert mIsNativeBookmarkModelLoaded;
++        return BookmarkBridgeJni.get().getTabsCollectionFolderId(
++                mNativeBookmarkBridge, BookmarkBridge.this);
++    }
++
+     /** Returns Id representing the special "other" folder from bookmark model. */
+     public BookmarkId getOtherFolderId() {
+         ThreadUtils.assertOnUiThread();
+@@ -894,6 +907,29 @@ class BookmarkBridge {
+                 .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
+     }
+ 
++    // Used to bookmark all tabs in a specific folder, created if not existing
++    public BookmarkId addToTabsCollection(Tab tab) {
++        BookmarkId parent = getTabsCollectionFolderId();
++        BookmarkId existingId = BookmarkBridgeJni.get().getBookmarkIdForTabsCollection(
++                mNativeBookmarkBridge, tab.getOriginalUrl());
++        if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
++            BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL);
++            BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
++            if (parent.equals(existingBookmark.getParentId())) {
++                // bookmark already exists in the tabs collection folder
++                return existingBookmarkId;
++            }
++        }
++        BookmarkId bookmarkId =
++                addBookmark(parent, getChildCount(parent), tab.getTitle(), tab.getUrl());
++
++        if (bookmarkId == null) {
++            Log.e(TAG,
++                    "Failed to add bookmarks: parentTypeAndId %s", parent);
++        }
++        return bookmarkId;
++     }
++
+     /**
+      * Helper method to mark an item as read.
+      *
+@@ -1111,6 +1147,9 @@ class BookmarkBridge {
+         BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
+                 long nativeBookmarkBridge, @JniType("GURL") GURL url);
+ 
++        BookmarkId getBookmarkIdForTabsCollection(
++                long nativeBookmarkBridge, GURL url);
++
+         BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
+ 
+         void getTopLevelFolderIds(
+@@ -1132,6 +1171,8 @@ class BookmarkBridge {
+ 
+         BookmarkId getRootFolderId(long nativeBookmarkBridge);
+ 
++        BookmarkId getTabsCollectionFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
++
+         BookmarkId getMobileFolderId(long nativeBookmarkBridge);
+ 
+         BookmarkId getOtherFolderId(long nativeBookmarkBridge);
 diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc
 +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
-@@ -174,7 +174,8 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
+@@ -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(
+@@ -32,6 +32,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
+@@ -70,6 +71,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
  
      case BookmarkNode::Type::URL:
        NOTREACHED();
@@ -384,18 +404,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 +415,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() {
+@@ -235,6 +236,7 @@ void PermanentFolderOrderingTracker::SetTrackedPermanentNodes() {
    switch (tracked_type_) {
      case bookmarks::BookmarkNode::URL:
      case bookmarks::BookmarkNode::FOLDER:
@@ -435,7 +447,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
+@@ -4487,6 +4487,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 +460,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 +722,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 {
+@@ -835,7 +835,7 @@ bool BookmarkModel::HasBookmarks() const {
  bool BookmarkModel::HasNoUserCreatedBookmarksOrFolders() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    return bookmark_bar_node_->children().empty() &&
@@ -719,7 +731,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) {
+@@ -1167,6 +1167,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 +742,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 +755,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,
+@@ -611,6 +617,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 +802,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
      MOBILE
    };
  
-@@ -236,6 +237,8 @@ class BookmarkPermanentNode : public BookmarkNode {
+@@ -247,6 +248,8 @@ class BookmarkPermanentNode : public BookmarkNode {
        int64_t id);
    static std::unique_ptr<BookmarkPermanentNode> CreateMobileBookmarks(
        int64_t id);

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

@@ -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.
+@@ -125,6 +125,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
+@@ -3135,6 +3135,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
+@@ -2531,6 +2531,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return doOpenWebApk(currentTab);
          }
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -580,6 +580,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -587,6 +587,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                          isNativePage, isFileScheme, isContentScheme, isIncognito, url));
  
          updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
@@ -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
+@@ -1328,6 +1329,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          findInPageMenuRow.setVisible(itemVisible);
      }
  
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -303,6 +303,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -304,6 +304,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  
              updateRequestDesktopSiteMenuItem(
                      menu, currentTab, requestDesktopSiteVisible, isNativePage);

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

@@ -7,15 +7,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../tab_management/TabGridViewBinder.java     |  8 +++-
  .../tasks/tab_management/TabProperties.java   |  5 +++
  .../java/res/xml/privacy_preferences.xml      |  5 +++
- .../chrome/browser/app/ChromeActivity.java    |  3 +-
+ .../chrome/browser/app/ChromeActivity.java    |  4 +-
  .../privacy/settings/PrivacySettings.java     | 44 ++++++++++++++++++-
  .../strings/android_chrome_strings.grd        |  8 ++++
- 6 files changed, 70 insertions(+), 3 deletions(-)
+ 6 files changed, 71 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -408,7 +408,12 @@ class TabGridViewBinder {
+@@ -404,7 +404,12 @@ class TabGridViewBinder {
                      if (result != null) {
                          TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                      } else {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -449,6 +454,7 @@ class TabGridViewBinder {
+@@ -445,6 +450,7 @@ class TabGridViewBinder {
       */
      private static void setFavicon(
              ImageView faviconView, PropertyModel model, TabListFaviconProvider.TabFavicon favicon) {
@@ -69,7 +69,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -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;
+@@ -141,6 +141,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
+@@ -613,7 +614,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
+@@ -6016,6 +6016,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
          Your <ph name="FQDN">%1$s<ex>www.amazon.com</ex></ph> timer ran out. It'll start again tomorrow.
        </message>
  

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

@@ -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
+@@ -759,7 +759,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,15 +183,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -112,6 +112,7 @@ import org.chromium.components.tab_group_sync.SavedTabGroup;
- import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -115,6 +115,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+ import org.chromium.components.tab_group_sync.TriggerSource;
  import org.chromium.components.tab_groups.TabGroupColorId;
  import org.chromium.ui.MotionEventUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.modaldialog.ModalDialogManager;
-@@ -3999,8 +4000,13 @@ public class StripLayoutHelper
+@@ -4113,8 +4114,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
+@@ -93,6 +93,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
+@@ -450,7 +451,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 {
+@@ -664,7 +664,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
      @Override
      public int getControlContainerHeightResource() {
@@ -266,16 +266,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -105,6 +105,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -100,6 +100,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.pdf.PdfPage;
 +import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
 +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
- import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController;
- import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
- import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
-@@ -1788,7 +1790,9 @@ public class RootUiCoordinator
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
+ import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
+@@ -1616,7 +1618,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 {
+@@ -286,6 +286,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,
@@ -351,7 +351,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
 --- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
 +++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
-@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing
+@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.Windowing
  import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
  import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
@@ -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
+@@ -266,6 +267,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
+@@ -790,7 +790,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
+@@ -1671,6 +1671,13 @@ Your Google account may have other forms of browsing history like searches and a
          Hide your IP address
        </message>
  
@@ -499,7 +499,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import android.graphics.Canvas;
  import android.graphics.PorterDuff;
  import android.graphics.Rect;
-@@ -143,8 +144,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+@@ -144,8 +145,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
      }
  
      @Override
@@ -529,15 +529,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils;
- import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
  import org.chromium.components.feature_engagement.Tracker;
+ import org.chromium.ui.MotionEventUtils;
  import org.chromium.ui.base.ViewUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.util.TokenHolder;
  import org.chromium.url.GURL;
  
-@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -583,7 +584,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -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 {
+@@ -556,6 +557,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
+@@ -154,7 +155,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
          mTabStripReservedTopPadding =
                  controlContainerView()
                          .getResources()
@@ -639,7 +639,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -165,6 +175,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -163,6 +173,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
              mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);

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

@@ -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
+@@ -1695,8 +1696,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
+@@ -5541,6 +5541,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>

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

@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -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
+@@ -930,9 +933,15 @@ public class TabGridDialogMediator
                  return;
              }
  
@@ -54,15 +54,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
-@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory;
+@@ -34,6 +34,7 @@ import org.chromium.chrome.browser.collaboration.CollaborationServiceFactory;
  import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
-+import org.chromium.chrome.browser.homepage.HomepageManager;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
++import org.chromium.chrome.browser.homepage.HomepageManager;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -367,10 +368,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver,
+ import org.chromium.chrome.browser.profiles.Profile;
+@@ -401,10 +402,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
+@@ -199,9 +202,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
                          /* didCloseCallback= */ null);
                  recordUserAction("DeleteGroup");
              } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) {
@@ -208,7 +208,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -485,6 +486,13 @@ public class ChromeTabCreator extends TabCreator {
+@@ -487,6 +488,13 @@ public class ChromeTabCreator extends TabCreator {
       * @return the created tab.
       */
      public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -287,6 +287,7 @@ public final class ChromePreferenceKeys {
+@@ -299,6 +299,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
+@@ -1492,6 +1492,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,9 +272,9 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1342,6 +1342,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
- // toolbar.
- inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
+@@ -1319,6 +1319,10 @@ inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
+ // by enterprise policy.
+ inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
  
 +// A boolean specifying whether opening a new tab should open the Home page
 +// instead of the New Tab page.

build/patches/Add-search-engine.patch

@@ -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
+@@ -72,6 +72,7 @@ static_library("search_engines") {
+     "//third_party/metrics_proto",
+     "//third_party/omnibox_proto",
+     "//third_party/search_engines_data:prepopulated_engines",
++    "cromite:cromite_prepopulated_engines",
+   ]
  
-+    "duckduckgo_light": {
-+      "name": "DuckDuckGo Light",
-+      "keyword": "duckduckgo.com/lite",
-+      "favicon_url": "https://duckduckgo.com/favicon.ico",
-+      "search_url": "https://duckduckgo.com/lite/?q={searchTerms}",
-+      "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list",
-+      "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT",
-+      "id": 12
-+    },
-+
-     "ecosia": {
-       "name": "Ecosia",
-       "keyword": "ecosia.org",
-@@ -205,6 +215,27 @@
-       "id": 111
-     },
+   deps = [
+@@ -157,6 +158,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" ]
+@@ -237,6 +239,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(
+@@ -1453,5 +1453,7 @@ const std::vector<EngineAndTier> GetPrepopulationSetFromCountryID(
    for (size_t i = 0; i < num_engines; i++) {
      t_url.push_back(engines[i]);
    }
@@ -142,12 +180,12 @@ diff --git a/components/search_engines/search_engine_countries-inc.cc b/componen
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -91,10 +91,15 @@ enum SearchEngineType {
-   SEARCH_ENGINE_YOU = 72,
-   SEARCH_ENGINE_STARTER_PACK_GEMINI = 73,
-   SEARCH_ENGINE_LILO = 74,
-+  SEARCH_ENGINE_GOOGLE_EN = 75,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,
+@@ -94,10 +94,15 @@ enum SearchEngineType {
+   SEARCH_ENGINE_STARTPAGE = 75,
+   SEARCH_ENGINE_STARTER_PACK_PAGE = 76,
+   SEARCH_ENGINE_MCAFEE = 77,
++  SEARCH_ENGINE_GOOGLE_EN = 78,
++  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 79,
  
    SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
  };
@@ -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,
+@@ -28,6 +28,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 --------------------------------------------------------------------
+@@ -67,7 +69,6 @@ GetPrepopulatedEnginesForEeaRegionCountries(CountryID country_id,
    generator.seed(profile_seed);
    std::shuffle(t_urls.begin(), t_urls.end(), generator);
  
@@ -172,7 +219,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 diff --git a/components/search_engines/template_url_prepopulate_data.h b/components/search_engines/template_url_prepopulate_data.h
 --- a/components/search_engines/template_url_prepopulate_data.h
 +++ b/components/search_engines/template_url_prepopulate_data.h
-@@ -32,13 +32,6 @@ struct PrepopulatedEngine;
+@@ -31,13 +31,6 @@ struct PrepopulatedEngine;
  
  extern const int kMaxPrepopulatedEngineID;
  
@@ -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__':
 --

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

@@ -5,53 +5,71 @@ 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/btm/btm_service_impl.cc       |  2 +-
  content/browser/storage_partition_impl.cc     |  1 +
  .../public/browser/browsing_data_remover.h    |  7 +-
- 30 files changed, 336 insertions(+), 23 deletions(-)
+ 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",
+@@ -253,6 +253,7 @@ chrome_java_sources = [
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
+   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
 +  "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ConfirmImportantSitesDialogFragment.java",
    "java/src/org/chromium/chrome/browser/browsing_data/OtherFormsOfHistoryDialogFragment.java",
    "java/src/org/chromium/chrome/browser/browsing_data/UrlFilter.java",
+diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
+--- a/chrome/android/java/res/xml/privacy_preferences.xml
++++ b/chrome/android/java/res/xml/privacy_preferences.xml
+@@ -19,6 +19,11 @@ found in the LICENSE file.
+         android:title="@string/clear_browsing_data_title"
+         android:summary="@string/clear_browsing_data_summary"
+         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragment" />
++    <Preference
++        android:key="clear_browsing_data_advanced"
++        android:title="@string/clear_browsing_data_at_start_title"
++        android:summary="@string/clear_browsing_data_at_start_summary"
++        android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataFragmentAtStart" />
+     <Preference
+         android:key="privacy_guide"
+         app:isPreferenceVisible="false"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -184,6 +184,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -186,6 +186,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
@@ -59,7 +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
+@@ -1700,7 +1701,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 @@
+@@ -2200,6 +2200,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(
+@@ -358,6 +358,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(
+@@ -465,6 +466,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(
+@@ -573,6 +577,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(
+@@ -601,9 +610,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(
+@@ -1308,6 +1321,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -367,7 +499,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -535,6 +535,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -538,6 +538,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -394,7 +526,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
 diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 --- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 +++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
-@@ -52,10 +52,15 @@ public class ProfileManagerUtils {
+@@ -54,10 +54,15 @@ public class ProfileManagerUtils {
          }
      }
  
@@ -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,
+@@ -1441,6 +1441,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) {
+@@ -2114,7 +2127,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;
  
@@ -523,7 +655,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 --- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
 +++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -239,6 +239,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -222,6 +222,7 @@ export class SettingsClearBrowsingDataDialogElement extends
          value: () =>
              [loadTimeData.getString('basicPageTitle'),
               loadTimeData.getString('advancedPageTitle'),
@@ -531,7 +663,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
      ],
        },
  
-@@ -363,6 +364,7 @@ export class SettingsClearBrowsingDataDialogElement extends
+@@ -343,6 +344,7 @@ export class SettingsClearBrowsingDataDialogElement extends
      }
      this.clearButtonDisabled_ =
          this.getSelectedDataTypes_(page as HTMLElement).length === 0;
@@ -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
+@@ -1584,6 +1584,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,
+@@ -1919,6 +1919,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
+@@ -61,6 +61,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 = [ ":*" ]
+@@ -70,6 +74,7 @@ if (is_android) {
+   android_library("java") {
+     srcjar_deps = [
+       ":browsing_data_utils_javagen",
++      ":clear_browsing_data_tab_javagen",
+       ":cookie_or_cache_deletion_choice_javagen",
+     ]
+     deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
 diff --git a/components/browsing_data/core/browsing_data_policies_utils.cc b/components/browsing_data/core/browsing_data_policies_utils.cc
 --- a/components/browsing_data/core/browsing_data_policies_utils.cc
 +++ b/components/browsing_data/core/browsing_data_policies_utils.cc
@@ -650,7 +809,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -346,6 +346,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -335,6 +335,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -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(
+@@ -862,6 +862,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
      if (turl->date_created() >= created_after &&
          (created_before.is_null() || turl->date_created() < created_before) &&
          turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -758,22 +918,22 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
          turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
          (url_filter.is_null() ||
           url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
-diff --git a/content/browser/dips/dips_service_impl.cc b/content/browser/dips/dips_service_impl.cc
---- a/content/browser/dips/dips_service_impl.cc
-+++ b/content/browser/dips/dips_service_impl.cc
-@@ -198,7 +198,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
-     remove_mask &= ~content::BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
+diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
+--- a/content/browser/btm/btm_service_impl.cc
++++ b/content/browser/btm/btm_service_impl.cc
+@@ -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);

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

@@ -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 {
+@@ -285,6 +285,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 {
+@@ -676,6 +679,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -168,18 +168,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -340,6 +340,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kTabDragDropAndroid,
+@@ -343,6 +343,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabGroupParityBottomSheetAndroid,
      &kToolbarPhoneCleanup,
-     &kTabGroupCreationDialogAndroid,
-+    &blink::features::kShowAlwaysContextMenuOnLinks,
      &kTabResumptionModuleAndroid,
++    &blink::features::kShowAlwaysContextMenuOnLinks,
      &kTabStateFlatBuffer,
+     &kTabStripContextMenuAndroid,
      &kTabStripGroupCollapseAndroid,
 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 {
+@@ -418,6 +418,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 {
+@@ -809,6 +811,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);
+@@ -993,6 +997,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
+@@ -1736,6 +1736,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
+@@ -3309,6 +3315,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());
+@@ -212,6 +221,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());
@@ -297,15 +297,15 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
-@@ -9,6 +9,7 @@ import android.net.Uri;
- import androidx.annotation.IntDef;
+@@ -10,6 +10,7 @@ import androidx.annotation.IntDef;
  
+ import org.chromium.build.annotations.NullMarked;
  import org.chromium.content_public.browser.WebContents;
 +import org.chromium.content_public.common.Referrer;
  import org.chromium.url.GURL;
  
  import java.lang.annotation.Retention;
-@@ -148,6 +149,8 @@ public interface ContextMenuItemDelegate {
+@@ -150,6 +151,8 @@ public interface ContextMenuItemDelegate {
       */
      GURL getPageUrl();
  
@@ -344,7 +344,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
 --- a/third_party/blink/renderer/core/html/html_anchor_element.cc
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
-@@ -62,6 +62,7 @@
+@@ -64,6 +64,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(
+@@ -504,6 +505,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      bool is_trusted,
      base::TimeTicks platform_time_stamp,
      KURL completed_url) {
@@ -370,8 +370,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    LocalDOMWindow* window = GetDocument().domWindow();
    if (!window) {
      return;
-@@ -582,6 +594,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
-             request.GetReferrerPolicy()));
+@@ -594,6 +606,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+     frame_request.SetImpression(impression);
    }
  
 +  if (!do_not_show_context_menu &&
@@ -386,8 +386,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    Frame* target_frame =
        frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
  
-@@ -636,7 +657,7 @@ AtomicString HTMLAnchorElementBase::interestAction() const {
-   return g_empty_atom;
+@@ -637,7 +658,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) {
+@@ -733,13 +754,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) {
+@@ -749,7 +769,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);
@@ -451,7 +451,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_party/blink/renderer/core/html/html_image_element.cc
 --- a/third_party/blink/renderer/core/html/html_image_element.cc
 +++ b/third_party/blink/renderer/core/html/html_image_element.cc
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
  #include "third_party/blink/renderer/core/dom/events/event_dispatch_forbidden_scope.h"
  #include "third_party/blink/renderer/core/dom/node_traversal.h"
  #include "third_party/blink/renderer/core/dom/shadow_root.h"
@@ -459,7 +459,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/frame/attribution_src_loader.h"
  #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h"
  #include "third_party/blink/renderer/core/frame/local_dom_window.h"
-@@ -63,6 +64,7 @@
+@@ -64,6 +65,7 @@
  #include "third_party/blink/renderer/core/media_type_names.h"
  #include "third_party/blink/renderer/core/page/chrome_client.h"
  #include "third_party/blink/renderer/core/page/page.h"
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
  #include "third_party/blink/renderer/core/probe/core_probes.h"
  #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
-@@ -797,6 +799,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -794,6 +796,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
    }
  }
  
@@ -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) {
+@@ -198,14 +198,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(
+@@ -430,7 +432,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,
+@@ -453,6 +456,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,
+@@ -798,11 +811,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
  
    SetAutofillData(result.InnerNode(), data);
  

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

@@ -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 @@
+@@ -161,6 +161,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)

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

@@ -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
+@@ -441,8 +442,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;
      }

build/patches/Add-support-to-jxl.patch

@@ -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 = {
+@@ -1846,6 +1850,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() {
+@@ -141,6 +141,9 @@ declare_args() {
    # `enable_libaom` should likely also be overriddent to false.
    enable_av1_decoder = enable_dav1d_decoder
  
@@ -324,7 +324,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 +  enable_jxl_decoder = is_android || is_win
 +
    # Enable HEVC/H265 demuxing. Actual decoding must be provided by the
-   # platform. Always enable this for Lacros, it determines support at runtime.
+   # platform.
    # TODO(crbug.com/1336055): Revisit the default value for this setting as it
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
@@ -348,7 +348,7 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 --- a/net/base/mime_util_unittest.cc
 +++ b/net/base/mime_util_unittest.cc
-@@ -40,6 +40,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
+@@ -39,6 +39,7 @@ TEST(MimeUtilTest, GetWellKnownMimeTypeFromExtension) {
        {FILE_PATH_LITERAL("webm"), "video/webm"},
        {FILE_PATH_LITERAL("weba"), "audio/webm"},
        {FILE_PATH_LITERAL("avif"), "image/avif"},
@@ -356,15 +356,15 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
        {FILE_PATH_LITERAL("epub"), "application/epub+zip"},
        {FILE_PATH_LITERAL("apk"), "application/vnd.android.package-archive"},
        {FILE_PATH_LITERAL("cer"), "application/x-x509-ca-cert"},
-@@ -81,6 +82,7 @@ TEST(MimeUtilTest, ExtensionTest) {
+@@ -80,6 +81,7 @@ TEST(MimeUtilTest, ExtensionTest) {
      {FILE_PATH_LITERAL("webm"), {"video/webm"}},
      {FILE_PATH_LITERAL("weba"), {"audio/webm"}},
      {FILE_PATH_LITERAL("avif"), {"image/avif"}},
 +    {FILE_PATH_LITERAL("jxl"), {"image/jxl"}},
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
      // These are test cases for testing platform mime types on ChromeOS.
      {FILE_PATH_LITERAL("epub"), {"application/epub+zip"}},
-@@ -497,6 +499,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
+@@ -496,6 +498,7 @@ TEST(MimeUtilTest, TestGetExtensionsForMimeType) {
        {"MeSsAge/*", 1, "eml"},
        {"message/", 0, nullptr, true},
        {"image/avif", 1, "avif"},
@@ -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
+@@ -4747,6 +4747,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") {
+@@ -2403,6 +2403,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") {
+@@ -2448,6 +2452,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
+@@ -5432,6 +5432,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 ]
  
@@ -2231,7 +2231,7 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
 diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
 --- a/third_party/blink/web_tests/VirtualTestSuites
 +++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -437,6 +437,15 @@
+@@ -409,6 +409,15 @@
      "args": ["--enable-blink-features=FractionalScrollOffsets"],
      "expires": "Jun 1, 2025"
    },
@@ -2646,7 +2646,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -20910,6 +20910,7 @@ from previous Chrome versions.
+@@ -14717,6 +14717,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"/>

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

@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -116,6 +116,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts {
  
  enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
  
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -291,6 +291,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -298,6 +298,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(
+@@ -567,25 +574,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(
+@@ -645,6 +633,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,
+@@ -1931,6 +1931,8 @@ class MODULES_EXPORT WebGLRenderingContextBase : public CanvasRenderingContext,
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -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;
  

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

@@ -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 ++
@@ -21,11 +22,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../network/public/mojom/network_context.mojom   |  3 +++
  .../core/frame/csp/content_security_policy.cc    |  3 +++
  .../blink/renderer/core/frame/local_frame.cc     |  3 +++
- .../blink/renderer/core/frame/local_frame.h      |  4 +++-
+ .../blink/renderer/core/frame/local_frame.h      |  3 +++
  .../renderer/core/frame/reporting_context.cc     |  9 +++++++++
  .../renderer/core/frame/reporting_context.h      |  7 +++++--
  .../renderer/core/frame/reporting_observer.cc    |  3 +--
- 21 files changed, 61 insertions(+), 26 deletions(-)
+ 22 files changed, 63 insertions(+), 25 deletions(-)
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Allow-building-without-enable_reporting.inc
 
 diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc
@@ -42,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1470,6 +1470,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1474,6 +1474,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) {
+@@ -1487,6 +1488,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 {
+@@ -226,12 +227,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(
+@@ -15759,12 +15759,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
        }
      }
    }
@@ -137,7 +138,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 -      std::move(body));
  }
  
- void RenderFrameHostImpl::SendCommitNavigation(
+ void RenderFrameHostImpl::UpdateOrDisableCompositorMetricRecorder() const {
 diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 --- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 +++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
@@ -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
+@@ -475,14 +475,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") {
+@@ -1668,7 +1668,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -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"
+@@ -1345,6 +1346,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(
+@@ -1352,6 +1354,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() {
+@@ -2752,9 +2753,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,11 +428,10 @@ 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
-   void FinishedScrollSequence();
+@@ -650,7 +651,9 @@ class CORE_EXPORT LocalFrame final
+     return client_hints_preferences_;
+   }
  
-   SmoothScrollSequencer* GetSmoothScrollSequencer() const;
--
 +#if BUILDFLAG(ENABLE_REPORTING)
    mojom::blink::ReportingServiceProxy* GetReportingService();
 +#endif
@@ -439,17 +456,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 +493,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,
+@@ -255,6 +263,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
          url, endpoint, body->featureId(), body->disposition(), body->message(),
          body->sourceFile(), line_number, column_number);
    }
@@ -517,8 +534,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

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

@@ -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) {
+@@ -786,7 +786,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
+@@ -93,7 +93,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
          // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
          // incognito profile.
          if (!initParams.profile.isOffTheRecord()) {
@@ -64,7 +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) {
+@@ -1191,10 +1191,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) {
+@@ -1976,9 +1972,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) {
+@@ -308,6 +308,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);
+@@ -185,4 +185,10 @@ BASE_FEATURE(kReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS,
+              "ReplaceSupervisionSystemCapabilitiesWithAccountCapabilitiesOnIOS",
+              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif
++
 +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
 +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
 +SET_CROMITE_FEATURE_DISABLED(kEnableExtensionsPermissionsForSupervisedUsersOnDesktop);

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1309,6 +1309,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
+@@ -1343,6 +1343,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
    pipeline_controller_->OnSelectedVideoTrackChanged(selected);
  }
  
@@ -22,9 +22,9 @@ 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 {
+@@ -3749,7 +3755,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
            : HasAudio();
  
    // Audio only stream is allowed to play when in background.
@@ -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(
 --

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

@@ -32,18 +32,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
 --- a/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
 +++ b/chrome/browser/partnerbookmarks/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java
-@@ -61,6 +61,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
-      * @return Iterator over bookmarks or null.
-      */
-     public static PartnerBookmarksProviderIterator createIfAvailable() {
-+        if ((true)) return null;
-         try {
-             Cursor cursor =
-                     ContextUtils.getApplicationContext()
+@@ -68,6 +68,7 @@ public class PartnerBookmarksProviderIterator implements PartnerBookmark.Bookmar
+         new AsyncTask<@Nullable Cursor>() {
+             @Override
+             protected @Nullable Cursor doInBackground() {
++                if ((true)) return null;
+                 try {
+                     return ContextUtils.getApplicationContext()
+                             .getContentResolver()
 diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 --- a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
 +++ b/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java
-@@ -210,7 +210,7 @@ public class PartnerBrowserCustomizations {
+@@ -213,7 +213,7 @@ public class PartnerBrowserCustomizations {
                                                              & ApplicationInfo.FLAG_SYSTEM)
                                                      == 1
                                              || !VersionInfo.isStableBuild();
@@ -55,7 +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() {

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

@@ -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 {
+@@ -1309,7 +1309,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 {
+@@ -110,6 +110,8 @@ public interface TabWindowManager {
       */
      int getIncognitoTabCount();
  
@@ -415,8 +415,8 @@ 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
-         return null;
+@@ -476,6 +476,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
+         return tabGroupModelFilter.getRelatedTabListForRootId(rootId);
      }
  
 +    @Override
@@ -430,7 +430,7 @@ diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chro
 +    }
 +
      @Override
-     public TabModelSelector getTabModelSelectorById(int index) {
+     public @Nullable TabModelSelector getTabModelSelectorById(int index) {
          return mSelectors.get(index);
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
 new file mode 100644
@@ -562,7 +562,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
          mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
          mEdgeToEdgeSupplier = edgeToEdgeSupplier;
          if (SnackbarManager.isFloatingSnackbarEnabled()) {
-@@ -394,6 +399,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -408,6 +413,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
              mActionButtonView.setVisibility(View.VISIBLE);
              mActionButtonView.setContentDescription(snackbar.getActionText());
              setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -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() {
+@@ -3779,8 +3779,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
+@@ -1453,6 +1459,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) {
+@@ -4308,6 +4308,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() {
+@@ -3187,6 +3187,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() {
+@@ -3201,6 +3202,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()) {

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

@@ -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 @@
+@@ -479,9 +479,8 @@
      {
        // AudioContext.playoutStats interface.
        // https://chromestatus.com/feature/5172818344148992

build/patches/Block-gateway-attacks-via-websockets.patch

@@ -49,7 +49,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -390,6 +390,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -396,6 +396,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -60,7 +60,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third_party/blink/renderer/core/loader/base_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/base_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/base_fetch_context.h
-@@ -84,6 +84,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
+@@ -86,6 +86,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
  
    virtual SubresourceFilter* GetSubresourceFilter() const = 0;
    virtual bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const = 0;
@@ -71,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -996,6 +996,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1000,6 +1000,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -101,7 +101,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -182,6 +182,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -183,6 +183,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;

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

@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -4678,7 +4678,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -4971,7 +4971,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 {
+@@ -834,6 +834,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() {
+@@ -2940,6 +2945,13 @@ void DocumentLoader::CommitNavigation() {
          response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
    }
  
@@ -135,7 +135,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
 diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
 --- a/third_party/blink/renderer/core/loader/document_loader.h
 +++ b/third_party/blink/renderer/core/loader/document_loader.h
-@@ -780,7 +780,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -782,7 +782,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
    // |archive_|, but won't have |loading_main_document_from_mhtml_archive_| set.
    bool loading_main_document_from_mhtml_archive_ = false;
    const bool loading_srcdoc_ = false;

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

@@ -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") {
+@@ -1087,6 +1087,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -203,7 +203,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  #include "base/synchronization/lock.h"
  #include "base/task/single_thread_task_runner.h"
  #include "base/types/optional_util.h"
-@@ -53,6 +54,7 @@
+@@ -54,6 +55,7 @@
  #include "net/url_request/url_request_redirect_job.h"
  #include "url/gurl.h"
  #include "url/origin.h"
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  namespace net {
  
-@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -642,6 +644,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
  
@@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_job_factory.h"
  #include "url/url_constants.h"
-@@ -601,6 +602,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -594,6 +595,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }

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

@@ -28,36 +28,30 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
          <item
              android:id="@+id/import_menu_id"
              android:icon="@drawable/ic_folder_blue_24dp"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
-@@ -26,6 +26,8 @@ import java.util.ArrayList;
+diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+--- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
++++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+@@ -24,6 +24,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelega
+ import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Function;
- 
 +import java.util.HashSet;
-+
+ 
  /**
   * Main toolbar of bookmark UI. It is responsible for displaying title and buttons associated with
-  * the current context.
-@@ -186,12 +188,16 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -184,6 +185,11 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
      void setCurrentFolder(BookmarkId folder) {
          mCurrentFolder = mBookmarkModel.getBookmarkById(folder);
          enableImportExportMenu();
 +        enableSelectAllMenu();
-     }
- 
-     void enableImportExportMenu() {
-         getMenu().findItem(R.id.import_menu_id).setVisible(true);
-         getMenu().findItem(R.id.export_menu_id).setVisible(true);
-     }
++    }
 +
 +    void enableSelectAllMenu() {
 +        getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
      }
  
-     void setNavigateBackRunnable(Runnable navigateBackRunnable) {
-@@ -218,6 +224,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+     void enableImportExportMenu() {
+@@ -215,6 +221,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
              mExportBookmarkRunnable.run();
              return true;
          }
@@ -75,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
          return mMenuIdClickedFunction.apply(menuItem.getItemId());
      }
  
-@@ -235,6 +252,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
+@@ -232,6 +249,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
  
          getMenu().findItem(R.id.import_menu_id).setVisible(mCurrentFolder != null);
          getMenu().findItem(R.id.export_menu_id).setVisible(mCurrentFolder != null);

build/patches/Bromite-auto-updater.patch

@@ -35,11 +35,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../omaha/inline/InlineUpdateController.java  |  57 ++++
  .../safety_hub/SafetyHubFetchService.java     |   5 -
  .../strings/android_chrome_strings.grd        |  23 +-
- .../endpoint_fetcher/endpoint_fetcher.cc      | 125 ++++++--
- .../endpoint_fetcher/endpoint_fetcher.h       |  23 +-
+ .../ui/lens/lens_overlay_query_controller.cc  |   1 +
+ .../endpoint_fetcher/endpoint_fetcher.cc      | 133 ++++++--
+ .../endpoint_fetcher/endpoint_fetcher.h       |  24 ++
+ components/manta/base_provider.cc             |   1 +
  .../Bromite-auto-updater.inc                  |   3 +
  .../Bromite-auto-updater.inc                  |   1 +
- 31 files changed, 1226 insertions(+), 98 deletions(-)
+ 33 files changed, 1240 insertions(+), 95 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
  create mode 100644 chrome/browser/endpoint_fetcher/BUILD.gn
@@ -68,7 +70,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -1950,6 +1950,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1928,6 +1928,9 @@ if (!is_robolectric && enable_java_templates) {
        sources = [ "//build/android/java/templates/BuildConfig.template" ]
        defines = []
  
@@ -81,7 +83,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -856,6 +856,8 @@ chrome_java_sources = [
+@@ -802,6 +802,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 +674,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") {
+@@ -2546,6 +2546,12 @@ static_library("browser") {
    }
  
    if (is_android) {
@@ -1085,7 +1087,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 +1098,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 {
+@@ -380,6 +380,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";
@@ -1120,17 +1122,18 @@ diff --git a/chrome/browser/omaha/android/BUILD.gn b/chrome/browser/omaha/androi
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/OmahaPrefUtils.java
-@@ -7,7 +7,9 @@ package org.chromium.chrome.browser.omaha;
+@@ -7,8 +7,10 @@ package org.chromium.chrome.browser.omaha;
  import android.content.Context;
  import android.content.SharedPreferences;
  
 +import org.chromium.base.Log;
  import org.chromium.base.ContextUtils;
+ import org.chromium.build.annotations.NullMarked;
 +import org.chromium.base.version_info.VersionInfo;
  
+ @NullMarked
  public class OmahaPrefUtils {
-     // Flags for retrieving the OmahaClient's state after it's written to disk.
-@@ -22,7 +24,55 @@ public class OmahaPrefUtils {
+@@ -24,7 +26,55 @@ public class OmahaPrefUtils {
      static final String PREF_TIMESTAMP_FOR_NEW_REQUEST = "timestampForNewRequest";
      static final String PREF_TIMESTAMP_FOR_NEXT_POST_ATTEMPT = "timestampForNextPostAttempt";
      static final String PREF_TIMESTAMP_OF_INSTALL = "timestampOfInstall";
@@ -1190,15 +1193,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
-@@ -11,6 +11,7 @@ import androidx.annotation.IntDef;
- import androidx.annotation.Nullable;
- 
+@@ -12,6 +12,7 @@ import androidx.annotation.IntDef;
  import org.chromium.base.CommandLine;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.flags.ChromeSwitches;
  import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
  import org.chromium.components.variations.VariationsAssociatedData;
-@@ -36,10 +37,12 @@ public class UpdateConfigs {
+@@ -38,10 +39,12 @@ public class UpdateConfigs {
      private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
      private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
  
@@ -1212,7 +1215,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      @Retention(RetentionPolicy.SOURCE)
      public @interface UpdateFlowConfiguration {
          /** Turns off all update indicators. */
-@@ -49,6 +52,12 @@ public class UpdateConfigs {
+@@ -51,6 +54,12 @@ public class UpdateConfigs {
           * Requires Omaha to say an update is available, and only ever Intents out to Play Store.
           */
          int INTENT_ONLY = 2;
@@ -1225,7 +1228,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      }
  
      /**
-@@ -124,6 +133,13 @@ public class UpdateConfigs {
+@@ -126,6 +135,13 @@ public class UpdateConfigs {
          return DEFAULT_UPDATE_ATTRIBUTION_WINDOW_MS;
      }
  
@@ -1239,7 +1242,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      /**
       * Gets a String VariationsAssociatedData parameter. Also checks for a command-line switch
       * with the same name, for easy local testing.
-@@ -137,4 +153,13 @@ public class UpdateConfigs {
+@@ -139,4 +155,13 @@ public class UpdateConfigs {
          }
          return value;
      }
@@ -1256,18 +1259,18 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java
-@@ -4,6 +4,7 @@
+@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.omaha;
  
- package org.chromium.chrome.browser.omaha;
+ import static org.chromium.build.NullUtil.assumeNonNull;
  
 +import android.app.Activity;
  import android.content.ActivityNotFoundException;
  import android.content.Context;
  import android.content.Intent;
-@@ -15,9 +16,11 @@ import android.text.TextUtils;
+@@ -15,9 +16,11 @@ import android.os.StatFs;
+ import android.text.TextUtils;
+ 
  import androidx.annotation.IntDef;
- import androidx.annotation.NonNull;
- import androidx.annotation.Nullable;
 +import androidx.annotation.VisibleForTesting;
  
 -import com.google.android.gms.common.GooglePlayServicesUtil;
@@ -1278,15 +1281,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
  import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
  import org.chromium.base.ObserverList;
-@@ -27,6 +30,7 @@ import org.chromium.base.task.AsyncTask;
- import org.chromium.base.task.AsyncTask.Status;
- import org.chromium.base.task.PostTask;
- import org.chromium.base.task.TaskTraits;
+@@ -30,6 +33,7 @@ import org.chromium.base.task.TaskTraits;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+ import org.chromium.build.annotations.RequiresNonNull;
 +import org.chromium.chrome.browser.omaha.inline.InlineUpdateController;
  import org.chromium.chrome.browser.omaha.metrics.UpdateSuccessMetrics;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
-@@ -36,30 +40,37 @@ import java.io.File;
+@@ -39,6 +43,11 @@ import java.io.File;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -1298,9 +1301,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
  /**
   * Provides the current update state for Chrome.  This update state is asynchronously determined and
   * can change as Chrome runs.
-  *
+@@ -46,24 +55,26 @@ import java.lang.annotation.RetentionPolicy;
   * For manually testing this functionality, see {@link UpdateConfigs}.
   */
+ @NullMarked
 -public class UpdateStatusProvider {
 +public abstract class UpdateStatusProvider implements ActivityStateListener {
      /**
@@ -1332,7 +1336,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      }
  
      /** A set of properties that represent the current update state for Chrome. */
-@@ -93,6 +104,12 @@ public class UpdateStatusProvider {
+@@ -97,6 +108,12 @@ public class UpdateStatusProvider {
           */
          private boolean mIsSimulated;
  
@@ -1345,7 +1349,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
          public UpdateStatus() {}
  
          UpdateStatus(UpdateStatus other) {
-@@ -101,11 +118,13 @@ public class UpdateStatusProvider {
+@@ -105,11 +122,13 @@ public class UpdateStatusProvider {
              latestVersion = other.latestVersion;
              latestUnsupportedVersion = other.latestUnsupportedVersion;
              mIsSimulated = other.mIsSimulated;
@@ -1359,7 +1363,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      private final UpdateQuery mOmahaQuery;
      private final UpdateSuccessMetrics mMetrics;
      private @Nullable UpdateStatus mStatus;
-@@ -113,11 +132,6 @@ public class UpdateStatusProvider {
+@@ -117,11 +136,6 @@ public class UpdateStatusProvider {
      /** Whether or not we've recorded the initial update status yet. */
      private boolean mRecordedInitialStatus;
  
@@ -1371,7 +1375,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      /**
       * Adds {@code observer} to notify about update state changes.  It is safe to call this multiple
       * times with the same {@code observer}.  This method will always notify {@code observer} of the
-@@ -173,6 +187,30 @@ public class UpdateStatusProvider {
+@@ -177,6 +191,30 @@ public class UpdateStatusProvider {
          pingObservers();
      }
  
@@ -1402,7 +1406,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
      /**
       * Starts the intent update process, if possible
       * @param context An {@link Context} that will be used to fire off the update intent.
-@@ -180,12 +218,11 @@ public class UpdateStatusProvider {
+@@ -184,12 +222,11 @@ public class UpdateStatusProvider {
       * @return        Whether or not the update intent was sent and had a valid handler.
       */
      public boolean startIntentUpdate(Context context, boolean newTask) {
@@ -1416,7 +1420,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
              Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStatus.updateUrl));
              if (newTask) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
              context.startActivity(intent);
-@@ -196,9 +233,15 @@ public class UpdateStatusProvider {
+@@ -200,9 +237,15 @@ public class UpdateStatusProvider {
          return true;
      }
  
@@ -1433,8 +1437,8 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 +        ApplicationStatus.registerStateListenerForAllActivities(this);
      }
  
-     private void pingObservers() {
-@@ -206,35 +249,52 @@ public class UpdateStatusProvider {
+     @RequiresNonNull("mStatus")
+@@ -211,35 +254,52 @@ public class UpdateStatusProvider {
      }
  
      private void resolveStatus() {
@@ -1444,10 +1448,10 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
          }
  
          // We pull the Omaha result once as it will never change.
-         if (mStatus == null) mStatus = new UpdateStatus(mOmahaQuery.getResult());
+         if (mStatus == null) mStatus = new UpdateStatus(assumeNonNull(mOmahaQuery.getResult()));
  
 -        if (!mStatus.mIsSimulated) {
--            mStatus.updateState = mOmahaQuery.getResult().updateState;
+-            mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState;
 +        if (mStatus.mIsSimulated) { // used only during tests
 +            if (mStatus.mIsInlineSimulated) {
 +                @UpdateState
@@ -1455,7 +1459,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 +                String updateUrl = mInlineController.getUpdateUrl();
 +
 +                if (inlineState == UpdateState.NONE) {
-+                    mStatus.updateState = mOmahaQuery.getResult().updateState;
++                    mStatus.updateState = assumeNonNull(mOmahaQuery.getResult()).updateState;
 +                } else {
 +                    mStatus.updateState = inlineState;
 +                    mStatus.updateUrl = updateUrl;
@@ -1488,15 +1492,15 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
  
          private @Nullable UpdateStatus mStatus;
  
--        public UpdateQuery(@NonNull Runnable resultReceiver) {
+-        public UpdateQuery(Runnable resultReceiver) {
 +        private InlineUpdateController mInlineController;
 +
-+        public UpdateQuery(InlineUpdateController inlineController, @NonNull Runnable resultReceiver) {
++        public UpdateQuery(InlineUpdateController inlineController, Runnable resultReceiver) {
 +            mInlineController = inlineController;
              mCallback = resultReceiver;
          }
  
-@@ -246,7 +306,7 @@ public class UpdateStatusProvider {
+@@ -251,7 +311,7 @@ public class UpdateStatusProvider {
          protected UpdateStatus doInBackground() {
              UpdateStatus testStatus = getTestStatus();
              if (testStatus != null) return testStatus;
@@ -1505,7 +1509,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
          }
  
          @Override
-@@ -264,6 +324,8 @@ public class UpdateStatusProvider {
+@@ -269,6 +329,8 @@ public class UpdateStatusProvider {
              status.mIsSimulated = true;
              status.updateState = forcedUpdateState;
  
@@ -1514,7 +1518,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
              // Push custom configurations for certain update states.
              switch (forcedUpdateState) {
                  case UpdateState.UPDATE_AVAILABLE:
-@@ -281,31 +343,33 @@ public class UpdateStatusProvider {
+@@ -286,31 +348,33 @@ public class UpdateStatusProvider {
              return status;
          }
  
@@ -1574,7 +1578,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/VersionNumberGetter.java
-@@ -22,8 +22,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+@@ -24,8 +24,8 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
  public class VersionNumberGetter {
      private static VersionNumberGetter sInstance = new VersionNumberGetter();
  
@@ -1650,9 +1654,9 @@ new file mode 100644
 diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
 --- a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
 +++ b/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/browser/safety_hub/SafetyHubFetchService.java
-@@ -78,9 +78,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
-             mSigninManager.addSignInStateObserver(this);
-         }
+@@ -82,9 +82,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+         mLocalPasswordsFetchService =
+                 new SafetyHubPasswordsFetchService(passwordManagerHelper, prefService, null);
  
 -        // Fetch latest update status.
 -        UpdateStatusProvider.getInstance().addObserver(mUpdateCallback);
@@ -1660,7 +1664,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
          recordMetricForUnusedSitePermissionsSettingState();
      }
  
-@@ -109,8 +106,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -113,8 +110,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
          if (mSigninManager != null) {
              mSigninManager.removeSignInStateObserver(this);
          }
@@ -1672,7 +1676,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
+@@ -2397,6 +2397,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 +1689,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
+@@ -4332,7 +4338,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 +1701,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
+@@ -4343,6 +4352,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_UPDATE_UNSUPPORTED_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that the Android version on the device is unsupported. [CHAR_LIMIT=30]">
          Android version is unsupported
        </message>
@@ -1716,11 +1720,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_MENU_NEW_WINDOW" desc="Menu item for opening a new window. [CHAR_LIMIT=27]">
          New window
        </message>
+diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
++++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+@@ -771,6 +771,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
+       /*post_data=*/request_string,
+       /*headers=*/request_headers,
+       /*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(),
++      kTrafficAnnotationTag,
+       /*request_params=*/
+       EndpointFetcher::RequestParams::Builder(http_method,
+                                               kTrafficAnnotationTag)
 diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
 --- a/components/endpoint_fetcher/endpoint_fetcher.cc
 +++ b/components/endpoint_fetcher/endpoint_fetcher.cc
-@@ -20,6 +20,11 @@
- #include "services/network/public/cpp/simple_url_loader.h"
+@@ -21,6 +21,11 @@
+ #include "services/network/public/mojom/referrer_policy.mojom-shared.h"
  #include "services/network/public/mojom/url_response_head.mojom.h"
  
 +// used for the Bromite customization
@@ -1731,47 +1746,71 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  namespace {
  const char kContentTypeKey[] = "Content-Type";
  const char kDeveloperKey[] = "X-Developer-Key";
-@@ -83,6 +88,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
+@@ -35,6 +40,8 @@ std::string GetHttpMethodString(const HttpMethod& http_method) {
+       return "POST";
+     case HttpMethod::kDelete:
+       return "DELETE";
++    case HttpMethod::kHead:
++      return "HEAD";
+     default:
+       DCHECK(0) << base::StringPrintf("Unknown HttpMethod %d\n",
+                                       static_cast<int>(http_method));
+@@ -49,6 +56,8 @@ HttpMethod GetHttpMethod(const std::string& http_method_string) {
+     return HttpMethod::kPost;
+   } else if (http_method_string == "DELETE") {
+     return HttpMethod::kDelete;
++  } else if (http_method_string == "HEAD") {
++    return HttpMethod::kHead;
+   }
+   return HttpMethod::kUndefined;
+ }
+@@ -115,9 +124,11 @@ EndpointFetcher::EndpointFetcher(
+     const std::vector<std::string>& headers,
+     const std::vector<std::string>& cors_exempt_headers,
+     version_info::Channel channel,
++    const net::NetworkTrafficAnnotationTag& annotation_tag,
+     const RequestParams request_params)
+     : url_loader_factory_(url_loader_factory),
+       identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       post_data_(post_data),
-       headers_(headers),
-       cors_exempt_headers_(cors_exempt_headers),
-@@ -103,6 +109,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_("GET"),
-       content_type_(std::string()),
-       timeout_(base::Milliseconds(0)),
+       consent_level_(std::nullopt),
+       sanitize_response_(true),
+       channel_(channel),
+@@ -137,6 +148,7 @@ EndpointFetcher::EndpointFetcher(
+     const net::NetworkTrafficAnnotationTag& annotation_tag)
+     : url_loader_factory_(url_loader_factory),
+       identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       post_data_(std::string()),
-       annotation_tag_(annotation_tag),
+       consent_level_(std::nullopt),
+       sanitize_response_(false),
+       request_params_(EndpointFetcher::RequestParams::Builder(HttpMethod::kGet,
+@@ -161,6 +173,7 @@ EndpointFetcher::EndpointFetcher(
+     : oauth_consumer_name_(oauth_consumer_name),
        url_loader_factory_(url_loader_factory),
-@@ -128,6 +135,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
+       identity_manager_(identity_manager),
 +      intercept_redirect_(false),
-       post_data_(post_data),
-       annotation_tag_(annotation_tag),
-       url_loader_factory_(url_loader_factory),
-@@ -155,6 +163,7 @@ EndpointFetcher::EndpointFetcher(
-       http_method_(http_method),
-       content_type_(content_type),
-       timeout_(timeout),
+       consent_level_(consent_level),
+       sanitize_response_(true),
+       request_params_(
+@@ -190,6 +203,7 @@ EndpointFetcher::EndpointFetcher(
+     bool is_oauth_fetch)
+     : url_loader_factory_(url_loader_factory),
+       identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       post_data_(post_data),
-       headers_(headers),
-       cors_exempt_headers_(cors_exempt_headers),
-@@ -167,11 +176,29 @@ EndpointFetcher::EndpointFetcher(
+       consent_level_(std::nullopt),
+       sanitize_response_(true),
+       request_params_(
+@@ -207,6 +221,7 @@ EndpointFetcher::EndpointFetcher(
  EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
-     : timeout_(kDefaultTimeOut),
+     : identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       annotation_tag_(annotation_tag),
-       identity_manager_(nullptr),
        consent_level_(std::nullopt),
-       sanitize_response_(true) {}
+       sanitize_response_(true),
+       request_params_(
+@@ -215,6 +230,27 @@ EndpointFetcher::EndpointFetcher(
+               .SetTimeout(kDefaultTimeOut)
+               .Build()) {}
  
 +// constructor used by Bromite
 +EndpointFetcher::EndpointFetcher(
@@ -1781,34 +1820,39 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +    int64_t timeout_ms,
 +    const bool intercept_redirect,
 +    const net::NetworkTrafficAnnotationTag& annotation_tag)
-+    : url_(url),
-+      http_method_(http_method),
-+      timeout_(base::Milliseconds(timeout_ms)),
-+      intercept_redirect_(intercept_redirect),
-+      annotation_tag_(annotation_tag),
-+      url_loader_factory_(url_loader_factory),
++    : url_loader_factory_(url_loader_factory),
 +      identity_manager_(nullptr),
-+      sanitize_response_(false) {}
++      intercept_redirect_(intercept_redirect),
++      consent_level_(std::nullopt),
++      sanitize_response_(false),
++      request_params_(
++          EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method),
++                                                  annotation_tag)
++              .SetAuthType(NO_AUTH)
++              .SetTimeout(base::Milliseconds(timeout_ms))
++              .SetUrl(url)
++              .Build()) {}
 +
  EndpointFetcher::~EndpointFetcher() = default;
  
  void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -229,11 +256,9 @@ void EndpointFetcher::PerformRequest(
+@@ -272,12 +308,9 @@ void EndpointFetcher::PerformRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
-   resource_request->method = http_method_;
-   resource_request->url = url_;
+   resource_request->method = GetHttpMethodString(request_params_.http_method());
+   resource_request->url = request_params_.url();
 -  resource_request->credentials_mode = GetCredentialsMode();
 -  if (GetSetSiteForCookies()) {
--    resource_request->site_for_cookies = net::SiteForCookies::FromUrl(url_);
+-    resource_request->site_for_cookies =
+-        net::SiteForCookies::FromUrl(request_params_.url());
 -  }
 -
 +  resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit;
 +  resource_request->load_flags = net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE
 +                                  | net::LOAD_DO_NOT_SAVE_COOKIES;
-   if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
-     resource_request->headers.SetHeader(kContentTypeKey, content_type_);
-   }
-@@ -261,10 +286,27 @@ void EndpointFetcher::PerformRequest(
+   if (request_params_.http_method() == HttpMethod::kPost) {
+     resource_request->headers.SetHeader(kContentTypeKey,
+                                         request_params_.content_type());
+@@ -305,10 +338,26 @@ void EndpointFetcher::PerformRequest(
      default:
        break;
    }
@@ -1821,8 +1865,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
    // TODO(crbug.com/40641804) Make simple_url_loader_ local variable passed to
    // callback
    simple_url_loader_ = network::SimpleURLLoader::Create(
-       std::move(resource_request), annotation_tag_);
-+  simple_url_loader_->SetTimeoutDuration(timeout_);
+       std::move(resource_request), request_params_.annotation_tag());
 +  simple_url_loader_->SetAllowHttpErrorResults(true);
 +
 +  if (!response_)
@@ -1834,17 +1877,19 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +      &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this)));
 +  }
  
-   if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
-     simple_url_loader_->AttachStringForUpload(post_data_, content_type_);
-@@ -275,15 +317,23 @@ void EndpointFetcher::PerformRequest(
+   if (request_params_.http_method() == HttpMethod::kPost) {
+     simple_url_loader_->AttachStringForUpload(
+@@ -320,15 +369,25 @@ void EndpointFetcher::PerformRequest(
    }
    simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                        network::SimpleURLLoader::RETRY_ON_5XX);
--  simple_url_loader_->SetTimeoutDuration(timeout_);
+-  simple_url_loader_->SetTimeoutDuration(request_params_.timeout());
 -  simple_url_loader_->SetAllowHttpErrorResults(true);
 -  network::SimpleURLLoader::BodyAsStringCallbackDeprecated
-+  LOG(INFO) << "performing " << http_method_ << " request to " << url_;
-+  if (base::EqualsCaseInsensitiveASCII(http_method_, "HEAD")) {
++  LOG(INFO) << "performing "
++            << GetHttpMethodString(request_params_.http_method())
++            << " request to " << url_;
++  if (request_params_.http_method() == HttpMethod::kHead) {
 +    endpoint_fetcher_callback_ = std::move(endpoint_fetcher_callback);
 +
 +    simple_url_loader_->DownloadHeadersOnly(
@@ -1866,18 +1911,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  }
  
  void EndpointFetcher::OnResponseFetched(
-@@ -361,24 +411,6 @@ void EndpointFetcher::OnSanitizationResult(
+@@ -406,21 +465,6 @@ void EndpointFetcher::OnSanitizationResult(
    std::move(endpoint_fetcher_callback).Run(std::move(response));
  }
  
--network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() {
--  if (!request_params_.has_value()) {
+-network::mojom::CredentialsMode EndpointFetcher::GetCredentialsMode() const {
+-  if (!request_params_.credentials_mode.has_value()) {
 -    return network::mojom::CredentialsMode::kOmit;
 -  }
--  if (!request_params_.value().credentials_mode.has_value()) {
--    return network::mojom::CredentialsMode::kOmit;
--  }
--  switch (request_params_.value().credentials_mode.value()) {
+-  switch (request_params_.credentials_mode.value()) {
 -    case CredentialsMode::kOmit:
 -      return network::mojom::CredentialsMode::kOmit;
 -    case CredentialsMode::kInclude:
@@ -1885,15 +1927,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 -  }
 -  DCHECK(0) << base::StringPrintf(
 -      "Credentials mode %d not currently supported by EndpointFetcher\n",
--      static_cast<int>(request_params_.value().credentials_mode.value()));
+-      static_cast<int>(request_params_.credentials_mode.value()));
 -}
 -
- int EndpointFetcher::GetMaxRetries() {
-   if (!request_params_.has_value()) {
+ int EndpointFetcher::GetMaxRetries() const {
+   if (!request_params_.max_retries.has_value()) {
      return kNumRetries;
-@@ -412,3 +444,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() {
+@@ -445,3 +489,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() const {
  std::string EndpointFetcher::GetUrlForTesting() {
-   return url_.spec();
+   return request_params_.url().spec();
  }
 +
 +void EndpointFetcher::OnSimpleLoaderRedirect(
@@ -1942,7 +1984,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
  namespace network {
  struct ResourceRequest;
-@@ -58,6 +60,8 @@ enum class FetchErrorType {
+@@ -61,6 +63,7 @@ enum class HttpMethod {
+   kGet = 0,
+   kPost = 1,
+   kDelete = 2,
++  kHead = 3,
+ };
+ 
+ enum AuthType {
+@@ -76,6 +79,8 @@ enum AuthType {
  
  struct EndpointResponse {
    std::string response;
@@ -1951,7 +2001,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    int http_status_code{-1};
    std::optional<FetchErrorType> error_type;
  };
-@@ -175,6 +179,14 @@ class EndpointFetcher {
+@@ -296,6 +301,7 @@ class EndpointFetcher {
+       const std::vector<std::string>& headers,
+       const std::vector<std::string>& cors_exempt_headers,
+       version_info::Channel channel,
++      const net::NetworkTrafficAnnotationTag& annotation_tag,
+       const RequestParams request_params);
+ 
+   // Constructor if no authentication is needed.
+@@ -304,6 +310,14 @@ class EndpointFetcher {
        const GURL& url,
        const net::NetworkTrafficAnnotationTag& annotation_tag);
  
@@ -1966,7 +2024,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    // Used for tests. Can be used if caller constructs their own
    // url_loader_factory and identity_manager.
    EndpointFetcher(
-@@ -231,6 +243,11 @@ class EndpointFetcher {
+@@ -360,6 +374,11 @@ class EndpointFetcher {
    void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
                              EndpointFetcherCallback endpoint_fetcher_callback,
                              data_decoder::JsonSanitizer::Result result);
@@ -1976,22 +2034,24 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 +                              const network::mojom::URLResponseHead& response_head,
 +                              std::vector<std::string>* removed_headers);
  
-   network::mojom::CredentialsMode GetCredentialsMode();
-   int GetMaxRetries();
-@@ -243,10 +260,11 @@ class EndpointFetcher {
-   // Members set in constructor to be passed to network::ResourceRequest or
+   network::mojom::CredentialsMode GetCredentialsMode() const;
+   int GetMaxRetries() const;
+@@ -370,12 +389,14 @@ class EndpointFetcher {
    // network::SimpleURLLoader.
    const std::string oauth_consumer_name_;
--  const GURL url_;
+   signin::ScopeSet oauth_scopes_;
 +  GURL url_;
-   const std::string http_method_;
-   const std::string content_type_;
-   base::TimeDelta timeout_;
+ 
+   // Members set in constructor
+   const scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
+   // `identity_manager_` can be null if it is not needed for authentication (in
+   // this case, callers should invoke `PerformRequest` directly).
+   const raw_ptr<signin::IdentityManager> identity_manager_;
 +  const bool intercept_redirect_;
-   const std::string post_data_;
-   const std::vector<std::string> headers_;
-   const std::vector<std::string> cors_exempt_headers_;
-@@ -270,6 +288,9 @@ class EndpointFetcher {
+   // `consent_level_` is used together with `identity_manager_`, so it can be
+   // null if `identity_manager_` is null.
+   const std::optional<signin::ConsentLevel> consent_level_;
+@@ -388,6 +409,9 @@ class EndpointFetcher {
        access_token_fetcher_;
    std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
  
@@ -2001,6 +2061,17 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    base::WeakPtrFactory<EndpointFetcher> weak_ptr_factory_{this};
  };
  
+diff --git a/components/manta/base_provider.cc b/components/manta/base_provider.cc
+--- a/components/manta/base_provider.cc
++++ b/components/manta/base_provider.cc
+@@ -160,6 +160,7 @@ std::unique_ptr<EndpointFetcher> BaseProvider::CreateEndpointFetcherForDemoMode(
+       /*cors_exempt_headers=*/std::vector<std::string>(),
+       // ChromeOS always uses the stable channel API key
+       version_info::Channel::STABLE,
++      annotation_tag,
+       EndpointFetcher::RequestParams::Builder(kHttpMethod, annotation_tag)
+           .Build());
+ }
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Bromite-auto-updater.inc
 new file mode 100644
 --- /dev/null

build/patches/Bromite-subresource-adblocker.patch

@@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -322,6 +322,7 @@ if (current_toolchain == default_toolchain) {
+@@ -320,6 +320,7 @@ if (current_toolchain == default_toolchain) {
        "//chrome/android/features/tab_ui/public:ui_java_resources",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
@@ -77,7 +77,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -433,6 +433,7 @@ chrome_java_resources = [
+@@ -443,6 +443,7 @@ chrome_java_resources = [
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
    "java/res/layout/app_history_filter.xml",
@@ -85,18 +85,18 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -621,6 +622,7 @@ chrome_java_resources = [
-   "java/res/xml/about_chrome_preferences.xml",
+@@ -631,6 +632,7 @@ chrome_java_resources = [
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
+   "java/res/xml/appearance_preferences.xml",
 +  "java/res/xml/adblock_preferences.xml",
    "java/res/xml/bookmark_widget_info.xml",
-   "java/res/xml/clear_browsing_data_preferences_tab.xml",
+   "java/res/xml/clear_browsing_data_preferences.xml",
    "java/res/xml/contextual_search_preferences.xml",
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -928,6 +928,8 @@ chrome_java_sources = [
+@@ -874,6 +874,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -180,7 +180,7 @@ new file mode 100644
 diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml
 --- a/chrome/android/java/res/values/styles.xml
 +++ b/chrome/android/java/res/values/styles.xml
-@@ -256,6 +256,24 @@ found in the LICENSE file.
+@@ -251,6 +251,24 @@ found in the LICENSE file.
          </item>
      </style>
  
@@ -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 {
+@@ -916,9 +916,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
+@@ -16534,6 +16534,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -460,16 +460,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
-@@ -29,6 +29,8 @@
- #include "chromeos/startup/browser_params_proxy.h"
- #endif  // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -24,6 +24,8 @@
+ #include "chrome/browser/ui/ash/login/login_display_host.h"
+ #endif
  
 +#include "chrome/browser/browser_process.h"
 +
  using content::BrowserThread;
  
  namespace {
-@@ -134,6 +136,8 @@ void SetBrowserStartupIsComplete() {
+@@ -129,6 +131,8 @@ void SetBrowserStartupIsComplete() {
    }
    GetAfterStartupTasks().clear();
    GetAfterStartupTasks().shrink_to_fit();
@@ -482,14 +482,14 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
 @@ -31,6 +31,7 @@
- #include "build/chromeos_buildflags.h"
  #include "chrome/common/buildflags.h"
+ #include "components/safe_browsing/buildflags.h"
  #include "media/media_buildflags.h"
 +#include "components/component_updater/adblock_updater_service.h"
  
  class BackgroundModeManager;
  class BrowserProcessPlatformPart;
-@@ -86,6 +87,10 @@ namespace component_updater {
+@@ -88,6 +89,10 @@ namespace component_updater {
  class ComponentUpdateService;
  }
  
@@ -500,7 +500,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
  namespace gcm {
  class GCMDriver;
  }
-@@ -264,6 +269,7 @@ class BrowserProcess {
+@@ -266,6 +271,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() {
+@@ -1236,6 +1236,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -557,7 +557,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
    MediaFileSystemRegistry* media_file_system_registry() override;
    WebRtcLogUploader* webrtc_log_uploader() override;
    network_time::NetworkTimeTracker* network_time_tracker() override;
-@@ -421,6 +422,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -423,6 +424,7 @@ class BrowserProcessImpl : public BrowserProcess,
    // to concerns over integrity of data shared between profiles,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -568,7 +568,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -468,6 +468,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -386,6 +386,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -576,8 +576,8 @@ diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_brows
 +  g_browser_process->adblock_updater();
 +
  #else
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
-   // Lacros has a special "primary" profile that is tied to the active ChromeOS
+   profile_info =
+       GetStartupProfile(/*cur_dir=*/base::FilePath(), parsed_command_line);
 diff --git a/chrome/browser/flags/BUILD.gn b/chrome/browser/flags/BUILD.gn
 --- a/chrome/browser/flags/BUILD.gn
 +++ b/chrome/browser/flags/BUILD.gn
@@ -679,7 +679,7 @@ new file mode 100755
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -651,6 +651,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -639,6 +639,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";
+@@ -2851,6 +2851,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -749,7 +749,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -373,6 +373,9 @@
+@@ -379,6 +379,9 @@
    <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
      This site shows intrusive or misleading ads
    </message>
@@ -1573,17 +1573,17 @@ new file mode 100644
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
-@@ -18,6 +18,9 @@
- #include "base/strings/stringprintf.h"
+@@ -19,6 +19,9 @@
  #include "base/trace_event/trace_event.h"
  #include "base/trace_event/traced_value.h"
+ #include "base/tracing/protos/chrome_track_event.pbzero.h"
 +#include "components/content_settings/core/common/content_settings_types.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_content_settings_manager.h"
 +#include "components/subresource_filter/content/browser/subresource_filter_profile_context.h"
  #include "components/subresource_filter/content/browser/ad_tagging_utils.h"
  #include "components/subresource_filter/content/browser/content_subresource_filter_web_contents_helper.h"
  #include "components/subresource_filter/content/browser/profile_interaction_manager.h"
-@@ -112,6 +115,7 @@ ContentSubresourceFilterThrottleManager::
+@@ -113,6 +116,7 @@ ContentSubresourceFilterThrottleManager::
        profile_interaction_manager_(
            std::make_unique<subresource_filter::ProfileInteractionManager>(
                profile_context)),
@@ -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::
+@@ -624,6 +628,17 @@ ContentSubresourceFilterThrottleManager::
        throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                  ad_tagging_state);
      }
@@ -1612,7 +1612,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 --- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
 +++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.h
-@@ -414,6 +414,8 @@ class ContentSubresourceFilterThrottleManager
+@@ -406,6 +406,8 @@ class ContentSubresourceFilterThrottleManager
  
    std::unique_ptr<ProfileInteractionManager> profile_interaction_manager_;
  

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

@@ -33,9 +33,9 @@ diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/u
 diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
 --- a/ui/views/widget/widget.h
 +++ b/ui/views/widget/widget.h
-@@ -1310,6 +1310,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
- 
+@@ -1361,6 +1361,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,
+@@ -1399,13 +1412,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,
+@@ -1416,11 +1422,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    friend class ui_devtools::BubbleLocking;
    friend void DisableActivationChangeHandlingForTests();
  

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

@@ -14,14 +14,17 @@ Auto-update is disabled by default: it is possible to activate it with chrome://
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/app/extensions_strings.grdp            |  6 ++
- .../developer_private_api.cc                  | 38 +++++++++++-
+ .../developer_private_api.cc                  | 28 +++++++++
  .../developer_private/developer_private_api.h |  3 +
+ .../developer_private_functions_desktop.cc    |  1 +
+ .../developer_private_functions_shared.cc     |  7 ++-
+ .../profile_info_generator.cc                 |  3 +
  .../webstore_private/webstore_private_api.cc  | 15 ++++-
+ .../extensions/chrome_extension_system.cc     |  1 +
  .../extensions/cws_info_service_factory.cc    |  3 +-
  .../extensions/extension_management.cc        |  1 +
  .../extension_safety_check_utils.cc           |  3 +-
  .../browser/extensions/extension_service.cc   |  4 +-
- .../extensions/extension_system_impl.cc       |  2 +
  .../chrome_extension_downloader_factory.cc    |  1 -
  .../extensions/updater/extension_updater.cc   | 40 ++++++++-----
  .../extensions/updater/extension_updater.h    |  4 ++
@@ -45,9 +48,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/updater/manifest_fetch_data.cc    |  8 +--
  .../browser/updater/safe_manifest_parser.cc   |  1 +
  extensions/common/extension_features.cc       | 14 +++++
- extensions/common/extension_features.h        |  4 ++
+ extensions/common/extension_features.h        |  2 +
  .../definitions/developer_private.d.ts        |  2 +
- 34 files changed, 254 insertions(+), 109 deletions(-)
+ 37 files changed, 253 insertions(+), 108 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
 
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
@@ -69,26 +72,21 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
-@@ -136,6 +136,12 @@
- #include "url/gurl.h"
- #include "url/origin.h"
+@@ -20,6 +20,12 @@
+ #include "extensions/browser/permissions_manager.h"
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
 +#include "chrome/browser/about_flags.h"
 +#include "chrome/browser/browser_process.h"
-+#include "components/flags_ui/pref_service_flags_storage.h"
-+#include "components/flags_ui/feature_entry.h"
-+#include "components/flags_ui/flags_storage.h"
++#include "components/webui/flags/pref_service_flags_storage.h"
++#include "components/webui/flags/feature_entry.h"
++#include "components/webui/flags/flags_storage.h"
 +
  namespace extensions {
  
  namespace developer = api::developer_private;
-@@ -490,10 +496,32 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo(
-   info->is_mv2_deprecation_notice_dismissed =
-       ManifestV2ExperimentManager::Get(profile)
-           ->DidUserAcknowledgeNoticeGlobally();
--
-+  info->is_extension_autoupdate_enabled = DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
-   return info;
+@@ -61,6 +67,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
+   return g_developer_private_api_factory.Pointer();
  }
  
 +// static
@@ -116,7 +114,23 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  template <>
  void BrowserContextKeyedAPIFactory<
      DeveloperPrivateAPI>::DeclareFactoryDependencies() {
-@@ -934,6 +962,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
+--- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
++++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
+@@ -32,6 +32,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+   static BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
+   GetFactoryInstance();
+ 
++  static bool IsExtensionAutoupdateEnabled();
++  static void SetExtensionAutoupdateEnabled(bool enable);
++
+   // Convenience method to get the DeveloperPrivateAPI for a profile.
+   static DeveloperPrivateAPI* Get(content::BrowserContext* context);
+ 
+diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc
+--- a/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc
++++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_desktop.cc
+@@ -209,6 +209,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
      ExtensionUpdater::CheckParams params;
      params.fetch_priority = DownloadFetchPriority::kForeground;
      params.install_immediately = true;
@@ -124,7 +138,10 @@ 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() {
+diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
+--- a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
++++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
+@@ -311,7 +311,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
  
    const developer::ProfileConfigurationUpdate& update = params->update;
  
@@ -133,9 +150,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
      Profile* profile = Profile::FromBrowserContext(browser_context());
      CHECK(profile);
      if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -1082,6 +1111,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
-         ->MarkNoticeAsAcknowledgedGlobally();
+@@ -328,6 +328,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
    }
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
 +    DeveloperPrivateAPI::SetExtensionAutoupdateEnabled(
@@ -145,18 +162,25 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
    return RespondNow(NoArguments());
  }
  
-diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
---- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
-+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -234,6 +234,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
-   static std::unique_ptr<api::developer_private::ProfileInfo> CreateProfileInfo(
-       Profile* profile);
+diff --git a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+--- a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
++++ b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
+@@ -7,6 +7,7 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/prefs/incognito_mode_prefs.h"
+ #include "chrome/browser/profiles/profile.h"
++#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
+ #include "chrome/common/pref_names.h"
+ #include "components/policy/core/common/policy_pref_names.h"
+ #include "components/prefs/pref_service.h"
+@@ -46,6 +47,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
+           ->DidUserAcknowledgeNoticeGlobally();
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
-+  static bool IsExtensionAutoupdateEnabled();
-+  static void SetExtensionAutoupdateEnabled(bool enable);
-+
-   // Convenience method to get the DeveloperPrivateAPI for a profile.
-   static DeveloperPrivateAPI* Get(content::BrowserContext* context);
++  info.is_extension_autoupdate_enabled =
++    DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
+   return info;
+ }
  
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -169,7 +193,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;
+@@ -222,6 +223,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 +202,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) {
+@@ -229,11 +232,15 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -194,7 +218,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
+@@ -1156,7 +1163,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -204,7 +228,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1248,11 +1256,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1252,11 +1260,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -217,9 +241,20 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
        ArgumentList(api::webstore_private::GetReferrerChain::Results::Create(
 -          base::Base64Encode(request.SerializeAsString()))));
 +          base::Base64Encode(serialized_referrer_proto))));
- }
- 
- WebstorePrivateGetExtensionStatusFunction::
+ #else
+   return RespondNow(ArgumentList(
+       api::webstore_private::GetReferrerChain::Results::Create("")));
+diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/browser/extensions/chrome_extension_system.cc
+--- a/chrome/browser/extensions/chrome_extension_system.cc
++++ b/chrome/browser/extensions/chrome_extension_system.cc
+@@ -84,6 +84,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
+     Profile* profile,
+     const Extension* extension,
+     UninstallReason reason) {
++  if ((true)) return UninstallPingSender::DO_NOT_SEND_PING;
+   ExtensionManagement* extension_management =
+       ExtensionManagementFactory::GetForBrowserContext(profile);
+   if (extension && (extension->from_webstore() ||
 diff --git a/chrome/browser/extensions/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 +271,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 +295,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(
+@@ -435,8 +435,6 @@ ExtensionService::ExtensionService(
  
    UpgradeDetector::GetInstance()->AddObserver(this);
  
@@ -269,7 +304,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() {
+@@ -1463,7 +1461,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
    // unpublished extensions should not be enabled. This update allows
    // unpublished extensions to be disabled sooner rather than waiting till the
    // next regularly scheduled fetch.
@@ -278,25 +313,6 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
            pref_names::kExtensionUnpublishedAvailability) !=
        kAllowUnpublishedExtensions) {
      CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo();
-diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
---- a/chrome/browser/extensions/extension_system_impl.cc
-+++ b/chrome/browser/extensions/extension_system_impl.cc
-@@ -56,6 +56,7 @@
- #include "extensions/browser/updater/uninstall_ping_sender.h"
- #include "extensions/browser/user_script_manager.h"
- #include "extensions/common/constants.h"
-+#include "extensions/common/extension_features.h"
- #include "extensions/common/features/feature_channel.h"
- #include "extensions/common/manifest_url_handlers.h"
- #include "ui/message_center/public/cpp/notifier_id.h"
-@@ -83,6 +84,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
-     Profile* profile,
-     const Extension* extension,
-     UninstallReason reason) {
-+  if ((true)) return UninstallPingSender::DO_NOT_SEND_PING;
-   ExtensionManagement* extension_management =
-       ExtensionManagementFactory::GetForBrowserContext(profile);
-   if (extension && (extension->from_webstore() ||
 diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
@@ -311,7 +327,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 @@
+@@ -50,6 +50,7 @@
  #include "extensions/browser/updater/extension_update_data.h"
  #include "extensions/common/constants.h"
  #include "extensions/common/extension.h"
@@ -319,7 +335,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() {
+@@ -205,6 +206,10 @@ void ExtensionUpdater::Start() {
    DCHECK(!weak_ptr_factory_.HasWeakPtrs());
    DCHECK(registry_);
    alive_ = true;
@@ -330,7 +346,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(
+@@ -338,7 +343,8 @@ void ExtensionUpdater::AddToDownloader(
      const Extension& extension = **extension_iter;
      const ExtensionId& extension_id = extension.id();
      if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
@@ -340,7 +356,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(
+@@ -352,7 +358,7 @@ void ExtensionUpdater::AddToDownloader(
        continue;
      }
  
@@ -349,7 +365,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(
+@@ -391,6 +397,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
  }
  
  void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -362,7 +378,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) {
+@@ -399,7 +411,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
  
    int request_id = next_request_id_++;
  
@@ -371,7 +387,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) {
+@@ -472,7 +484,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 +396,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) {
+@@ -482,7 +494,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 +405,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) {
+@@ -505,6 +517,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
            LOG(WARNING) << "Corrupt extension with id " << pending_id
                         << " will be reinstalled with ExtensionDownloader.";
          }
@@ -398,7 +414,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) {
+@@ -517,13 +531,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 +428,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) {
+@@ -531,7 +538,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
        const Extension* extension =
            registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
        if (extension) {
@@ -421,7 +437,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(
+@@ -672,7 +679,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
        file.extension_id, InstallStageTracker::Stage::INSTALLING);
    UpdatePingData(file.extension_id, ping);
  
@@ -430,7 +446,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(
+@@ -683,6 +690,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
  
  bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                 DownloadPingData* ping_data) {
@@ -438,7 +454,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 +463,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.
@@ -459,7 +475,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
 --- a/chrome/browser/extensions/updater/extension_updater.h
 +++ b/chrome/browser/extensions/updater/extension_updater.h
-@@ -82,6 +82,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -83,6 +83,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
      // right away.
      bool install_immediately = false;
  
@@ -468,7 +484,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
      // An extension update check can be originated by a user or by a scheduled
      // task. When the value of |fetch_priority| is FOREGROUND, the update
      // request was initiated by a user.
-@@ -333,6 +335,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
+@@ -334,6 +336,8 @@ class ExtensionUpdater : public ExtensionDownloaderDelegate {
    base::TimeDelta frequency_;
    bool will_check_soon_ = false;
  
@@ -492,7 +508,7 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows
 diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -625,7 +625,7 @@ void WebstoreInstaller::StartDownload(
+@@ -591,7 +591,7 @@ void WebstoreInstaller::StartDownload(
        traffic_annotation));
    params->set_file_path(file);
    params->set_initiator(render_frame_host->GetLastCommittedOrigin());
@@ -544,7 +560,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 {
+@@ -306,6 +306,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -678,7 +694,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,
+@@ -375,6 +377,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        {"itemSuspiciousInstallLearnMore",
         IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
        {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -687,7 +703,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,
+@@ -459,6 +463,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        "hostPermissionsLearnMoreLink",
        extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
    source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -724,7 +740,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 {
+@@ -300,6 +300,7 @@ namespace developerPrivate {
      boolean isIncognitoAvailable;
      boolean isChildAccount;
      boolean isMv2DeprecationNoticeDismissed;
@@ -732,7 +748,7 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/
    };
  
    // DEPRECATED: Prefer ExtensionInfo.
-@@ -354,6 +355,7 @@ namespace developerPrivate {
+@@ -360,6 +361,7 @@ namespace developerPrivate {
    dictionary ProfileConfigurationUpdate {
      boolean? inDeveloperMode;
      boolean? isMv2DeprecationNoticeDismissed;
@@ -1148,7 +1164,7 @@ diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/brow
 diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc
 --- a/extensions/browser/updater/manifest_fetch_data.cc
 +++ b/extensions/browser/updater/manifest_fetch_data.cc
-@@ -105,7 +105,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
+@@ -108,7 +108,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
      : base_url_(update_url),
        full_url_(update_url),
        brand_code_(brand_code),
@@ -1157,7 +1173,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
        fetch_priority_(fetch_priority) {
    UpdateFullUrl(base_query_params);
    request_ids_.insert(request_id);
-@@ -158,18 +158,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
+@@ -161,18 +161,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
    // Compute the string we'd append onto the full_url_, and see if it fits.
    std::vector<std::string> parts;
    parts.push_back("id=" + id);
@@ -1190,9 +1206,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(kDebuggerAPIRestrictedToDevMode,
+              "DebuggerAPIRestrictedToDevMode",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.
@@ -1212,21 +1228,19 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -241,6 +241,10 @@ BASE_DECLARE_FEATURE(kSilentDebuggerExtensionAPI);
- // nothing breaks.
- BASE_DECLARE_FEATURE(kRemoveCoreSiteInstance);
+@@ -242,6 +242,8 @@ BASE_DECLARE_FEATURE(kUserScriptUserExtensionToggle);
+ // capability, even when no other API/feature might be restricted by it.
+ BASE_DECLARE_FEATURE(kDebuggerAPIRestrictedToDevMode);
  
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
-+
 +BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore);
-+
  }  // namespace extensions_features
  
  #endif  // EXTENSIONS_COMMON_EXTENSION_FEATURES_H_
 diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
 --- a/tools/typescript/definitions/developer_private.d.ts
 +++ b/tools/typescript/definitions/developer_private.d.ts
-@@ -280,6 +280,7 @@ declare global {
+@@ -284,6 +284,7 @@ declare global {
          isIncognitoAvailable: boolean;
          isChildAccount: boolean;
          isMv2DeprecationNoticeDismissed: boolean;
@@ -1234,7 +1248,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr
        }
  
        export interface ExtensionConfigurationUpdate {
-@@ -296,6 +297,7 @@ declare global {
+@@ -301,6 +302,7 @@ declare global {
        export interface ProfileConfigurationUpdate {
          inDeveloperMode?: boolean;
          isMv2DeprecationNoticeDismissed?: boolean;

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

@@ -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) {

build/patches/Client-hints-overrides.patch

@@ -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(
+@@ -185,9 +185,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
    bool parse_result = base::StringToInt(major_version, &major_version_number);
    DCHECK(parse_result);
    std::optional<std::string> brand;
@@ -44,15 +44,15 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
 --- a/content/browser/client_hints/client_hints.cc
 +++ b/content/browser/client_hints/client_hints.cc
-@@ -60,6 +60,7 @@
- #include "third_party/blink/public/common/permissions_policy/origin_with_possible_wildcards.h"
- #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
+@@ -62,6 +62,7 @@
+ #include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/common/page/page_zoom.h"
  #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
 +#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
  #include "ui/display/display.h"
  #include "ui/display/screen.h"
  #include "url/origin.h"
-@@ -704,7 +705,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
+@@ -708,7 +709,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
      // value, disable them. This overwrites previous decision from UI.
      disable_due_to_custom_ua = !ua_metadata.has_value();
    }
@@ -62,7 +62,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
    if (!disable_due_to_custom_ua) {
      if (!ua_metadata.has_value())
        ua_metadata = delegate->GetUserAgentMetadata();
-@@ -886,10 +888,12 @@ void AddRequestClientHintsHeaders(
+@@ -890,10 +892,12 @@ void AddRequestClientHintsHeaders(
      AddEctHeader(headers, network_quality_tracker, url);
    }
  
@@ -79,7 +79,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  
    if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
      AddPrefersColorSchemeHeader(headers, frame_tree_node);
-@@ -975,6 +979,7 @@ ParseAndPersistAcceptCHForNavigation(
+@@ -974,6 +978,7 @@ ParseAndPersistAcceptCHForNavigation(
      BrowserContext* context,
      ClientHintsControllerDelegate* delegate,
      FrameTreeNode* frame_tree_node) {
@@ -90,7 +90,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1283,6 +1283,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1305,6 +1305,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -131,7 +131,7 @@ new file mode 100644
 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
 --- a/net/http/http_network_transaction.cc
 +++ b/net/http/http_network_transaction.cc
-@@ -109,6 +109,7 @@ const size_t kMaxRestarts = 32;
+@@ -105,6 +105,7 @@ const size_t kMaxRestarts = 32;
  
  // Returns true when Early Hints are allowed on the given protocol.
  bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -156,12 +156,12 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party
 @@ -14,6 +14,7 @@
  #include "base/strings/string_util.h"
  #include "services/network/public/cpp/client_hints.h"
- #include "third_party/blink/public/common/features.h"
+ #include "services/network/public/cpp/permissions_policy/client_hints_permissions_policy_mapping.h"
 +#include "third_party/blink/public/common/features_generated.h"
- #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
+ #include "services/network/public/cpp/permissions_policy/permissions_policy.h"
+ #include "third_party/blink/public/common/features.h"
  #include "url/origin.h"
- 
-@@ -106,11 +107,12 @@ const PolicyFeatureToClientHintMap& GetPolicyFeatureToClientHintMap() {
+@@ -22,11 +23,12 @@ namespace blink {
  
  bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) {
    switch (type) {
@@ -208,14 +208,14 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -219,6 +219,7 @@ ScriptPromise<UADataValues> NavigatorUAData::getHighEntropyValues(
-   Dactyloscoper::RecordDirectSurface(
-       GetExecutionContext(), WebFeature::kNavigatorUAData_Platform, platform());
+@@ -186,6 +186,7 @@ const String& NavigatorUAData::platform() const {
+ }
  
-+  if ((false))
-   for (const String& hint : hints) {
-     if (hint == "platformVersion") {
-       values->setPlatformVersion(platform_version_);
+ bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
++  if ((true)) return false;
+   // To determine whether a document is allowed to use the get high-entropy
+   // client hints returned by navigator.userAgentData.getHighEntropyValues(),
+   // check the following:
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
@@ -234,7 +234,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -217,6 +217,8 @@ bool ShouldSendClientHint(const PermissionsPolicy& policy,
+@@ -224,6 +224,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
                            bool is_1p_origin,
                            network::mojom::blink::WebClientHintsType type,
                            const ClientHintsPreferences& hints_preferences) {
@@ -243,7 +243,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
    // For subresource requests, sending the hint in the fetch request based on
    // the permissions policy.
    if (!policy.IsFeatureEnabledForOrigin(
-@@ -610,7 +612,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -604,7 +606,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
    }
  
    // Only send User Agent hints if the info is available
@@ -255,8 +255,8 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -417,6 +417,11 @@
-       name: "AriaNotify",
+@@ -439,6 +439,11 @@
+       name: "AriaNotifyV2",
        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
+     },
+     {
+       // Enables the API for getting a unique token of the system clipboard's
 --

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

@@ -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 @@ BASE_FEATURE_PARAM(size_t,
  // NetworkChangeNotifier::AreNetworkHandlesSupported).
  #if BUILDFLAG(IS_ANDROID)
  inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =

build/patches/Content-settings-infrastructure.patch

@@ -44,9 +44,9 @@ Require: bromite-build-utils.patch
  .../BromiteCustomContentSettingImpl.java      | 412 ++++++++++++++++++
  ...tomTriStateSiteSettingsPreferenceImpl.java |  24 +
  .../ContentSettingsResources.java             |  16 +-
- .../site_settings/SingleCategorySettings.java |  55 ++-
+ .../site_settings/SingleCategorySettings.java |  56 ++-
  .../site_settings/SingleWebsiteSettings.java  |  58 ++-
- .../site_settings/SiteSettings.java           |  31 +-
+ .../site_settings/SiteSettings.java           |  33 +-
  .../site_settings/SiteSettingsCategory.java   |  18 +-
  .../site_settings/SiteSettingsDelegate.java   |   2 +
  .../TriStateSiteSettingsPreference.java       |  13 +-
@@ -84,7 +84,7 @@ Require: bromite-build-utils.patch
  .../platform/web_content_settings_client.h    |  13 +
  .../execution_context/execution_context.cc    |  16 +
  .../execution_context/execution_context.h     |   5 +
- 73 files changed, 1941 insertions(+), 104 deletions(-)
+ 73 files changed, 1942 insertions(+), 106 deletions(-)
  create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
@@ -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;
+@@ -67,6 +67,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 {
+@@ -236,7 +240,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 {
+@@ -393,6 +397,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 @@
+@@ -1526,4 +1526,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") {
+@@ -1789,6 +1789,7 @@ static_library("ui") {
        "//components/commerce/core/mojom:mojo_bindings",
        "//components/commerce/core/webui",
        "//components/endpoint_fetcher:endpoint_fetcher",
@@ -718,10 +718,10 @@ 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") {
+@@ -5001,6 +5002,7 @@ static_library("ui") {
+       "//components/power_bookmarks/storage",
        "//components/prefs",
        "//components/reading_list/features:flags",
-       "//components/segmentation_platform/embedder/default_model:default_model",
 +      "//components/strings:components_strings_grit",
        "//components/services/app_service",
        "//components/soda",
@@ -729,7 +729,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/views/controls/rich_controls_container_view.h b/chrome/browser/ui/views/controls/rich_controls_container_view.h
 --- a/chrome/browser/ui/views/controls/rich_controls_container_view.h
 +++ b/chrome/browser/ui/views/controls/rich_controls_container_view.h
-@@ -48,6 +48,13 @@ class RichControlsContainerView : public views::FlexLayoutView {
+@@ -50,6 +50,13 @@ class RichControlsContainerView : public views::FlexLayoutView {
      return AddChildView(std::move(control_view));
    }
  
@@ -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(
+@@ -258,8 +259,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(
+@@ -274,11 +287,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(
+@@ -286,6 +304,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(
+@@ -296,6 +316,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"
@@ -862,7 +862,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.h
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h
-@@ -94,6 +94,11 @@ class PageInfoViewFactory {
+@@ -95,6 +95,11 @@ class PageInfoViewFactory {
        const PageInfo::PermissionInfo& info,
        bool blocked_on_system_level = false);
  
@@ -1071,7 +1071,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
 +  if (choose_button_) {
 +    choose_button_->SetEnabledTextColors(std::nullopt);
 +    if (permission_.setting == CONTENT_SETTING_DEFAULT) {
-+      choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL,
++      choose_button_->SetTextColor(views::Button::ButtonState::STATE_NORMAL,
 +        ui::kColorLabelForeground);
 +    }
 +  }
@@ -1110,7 +1110,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
 +    }
 +    choose_button_->SetText(caption);
 +    if (permission_.setting == CONTENT_SETTING_DEFAULT) {
-+      choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL,
++      choose_button_->SetTextColor(views::Button::ButtonState::STATE_NORMAL,
 +        ui::kColorLabelForeground);
 +    }
 +  }
@@ -1120,7 +1120,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
 diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/chrome/browser/ui/views/page_info/permission_toggle_row_view.h
 --- a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h
 +++ b/chrome/browser/ui/views/page_info/permission_toggle_row_view.h
-@@ -16,6 +16,11 @@
+@@ -17,6 +17,11 @@
  #include "ui/views/controls/label.h"
  #include "ui/views/view.h"
  
@@ -1132,7 +1132,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch
  class ChromePageInfoUiDelegate;
  class PageInfoNavigationHandler;
  
-@@ -31,7 +36,8 @@ class PageInfoBubbleViewTestApi;
+@@ -32,7 +37,8 @@ class PageInfoBubbleViewTestApi;
  // A view that shows a permission that a site is able to access, and
  // allows the user to control via toggle whether that access is granted. Has a
  // button that opens a subpage with more controls.
@@ -1142,7 +1142,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch
    METADATA_HEADER(PermissionToggleRowView, views::View)
  
   public:
-@@ -68,6 +74,12 @@ class PermissionToggleRowView : public views::View {
+@@ -69,6 +75,12 @@ class PermissionToggleRowView : public views::View {
   private:
    friend class test::PageInfoBubbleViewTestApi;
  
@@ -1155,7 +1155,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch
    void OnToggleButtonPressed();
    void AddToggleButton(const std::u16string& toggle_accessible_name,
                         int icon_label_spacing);
-@@ -86,6 +98,10 @@ class PermissionToggleRowView : public views::View {
+@@ -87,6 +99,10 @@ class PermissionToggleRowView : public views::View {
    raw_ptr<views::ToggleButton, DanglingUntriaged> toggle_button_ = nullptr;
    raw_ptr<views::View, DanglingUntriaged> spacer_view_ = nullptr;
  
@@ -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,
+@@ -3812,6 +3816,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},
+@@ -250,13 +252,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
+     {ContentSettingsType::REVOKED_DISRUPTIVE_NOTIFICATION_PERMISSIONS, 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) {
+@@ -504,6 +506,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) {
+@@ -517,11 +526,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) {
+@@ -536,7 +558,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(
+@@ -645,6 +666,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,13 +1499,13 @@ 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
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -147,6 +147,23 @@ android_library("java") {
+@@ -148,6 +148,23 @@ android_library("java") {
      ":site_settings_jni_headers",
      "//components/content_settings/android:java_pref_names_srcjar",
    ]
@@ -1529,7 +1529,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
  }
  
  android_library("javatests") {
-@@ -195,6 +212,7 @@ robolectric_library("junit") {
+@@ -196,6 +213,7 @@ robolectric_library("junit") {
  }
  
  android_resources("java_resources") {
@@ -1555,7 +1555,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_setti
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
-@@ -386,7 +386,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
+@@ -397,7 +397,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
                      if (queryHasChanged) getInfoForOrigins();
                  });
  
@@ -1565,7 +1565,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              MenuItem help =
                      menu.add(
                              Menu.NONE,
-@@ -398,6 +399,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
+@@ -409,6 +410,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
                              getResources(),
                              R.drawable.ic_help_and_feedback,
                              getContext().getTheme()));
@@ -2183,8 +2183,8 @@ new file mode 100644
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
-@@ -37,7 +37,7 @@ import org.chromium.device.DeviceFeatureMap;
- @SuppressLint("UseSparseArrays")
+@@ -40,7 +40,7 @@ import org.chromium.device.DeviceFeatureMap;
+ @NullMarked
  public class ContentSettingsResources {
      /** An inner class contains all the resources for a ContentSettingsType */
 -    private static class ResourceItem {
@@ -2192,7 +2192,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          private final int mIcon;
          private final int mTitle;
          private final @ContentSettingValues @Nullable Integer mDefaultEnabledValue;
-@@ -46,7 +46,7 @@ public class ContentSettingsResources {
+@@ -49,7 +49,7 @@ public class ContentSettingsResources {
          private final int mDisabledSummary;
          private final int mSummaryOverrideForScreenReader;
  
@@ -2201,16 +2201,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                  int icon,
                  int title,
                  @ContentSettingValues @Nullable Integer defaultEnabledValue,
-@@ -445,6 +445,8 @@ public class ContentSettingsResources {
+@@ -450,6 +450,8 @@ public class ContentSettingsResources {
                          R.string.website_settings_category_vr_blocked,
                          R.string.website_settings_category_vr_a11y);
          }
 +        ResourceItem ri = BromiteCustomContentSettingImpl.getResourceItem(contentType);
 +        if (ri != null) return ri;
          assert false; // NOTREACHED
-         return null;
+         return assumeNonNull(null);
      }
-@@ -603,6 +605,14 @@ public class ContentSettingsResources {
+@@ -608,6 +610,14 @@ public class ContentSettingsResources {
          return getResourceItem(contentType).getDefaultDisabledValue();
      }
  
@@ -2225,10 +2225,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      /**
       * Returns the string resource id for a given ContentSetting to show with a permission category.
       *
-@@ -776,6 +786,8 @@ public class ContentSettingsResources {
+@@ -781,6 +791,8 @@ public class ContentSettingsResources {
       *         Blocked states, in that order.
       */
-     public static int[] getTriStateSettingDescriptionIDs(int contentType) {
+     public static int @Nullable [] getTriStateSettingDescriptionIDs(int contentType) {
 +        int[] value = BromiteCustomContentSettingImpl.getTriStateSettingDescriptionIDs(contentType);
 +        if (value != null) return value;
          if (contentType == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) {
@@ -2237,7 +2237,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -324,6 +324,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -334,6 +334,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                  website.site()
                          .getContentSetting(
                                  browserContextHandle, mCategory.getContentSettingsType());
@@ -2248,7 +2248,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (contentSetting != null) {
              return ContentSettingValues.BLOCK == contentSetting;
          }
-@@ -488,6 +492,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -519,6 +523,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                          ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS))
                          : null;
  
@@ -2256,7 +2256,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          configureGlobalToggles();
          if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
              RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
-@@ -523,7 +528,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -554,7 +559,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                      if (queryHasChanged) getInfoForOrigins();
                  });
  
@@ -2266,7 +2266,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              MenuItem help =
                      menu.add(
                              Menu.NONE,
-@@ -535,12 +541,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -566,12 +572,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                              getResources(),
                              R.drawable.ic_help_and_feedback,
                              getContext().getTheme()));
@@ -2287,7 +2287,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (mCategory.getType() == SiteSettingsCategory.Type.PROTECTED_MEDIA) {
                  getSiteSettingsDelegate()
                          .launchProtectedContentHelpAndFeedbackActivity(getActivity());
-@@ -612,6 +626,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -644,6 +658,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          BrowserContextHandle browserContextHandle =
                  getSiteSettingsDelegate().getBrowserContextHandle();
          PrefService prefService = UserPrefs.get(browserContextHandle);
@@ -2299,7 +2299,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (BINARY_TOGGLE_KEY.equals(preference.getKey())) {
              assert !mCategory.isManaged();
              boolean toggleValue = (boolean) newValue;
-@@ -789,7 +808,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -827,7 +846,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                          ? R.string.website_settings_add_site_description_javascript_optimizer_block
                          : R.string.website_settings_add_site_description_javascript_optimizer_allow;
          }
@@ -2308,7 +2308,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      // OnPreferenceClickListener:
-@@ -903,10 +922,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -947,10 +966,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
              default:
                  break;
          }
@@ -2323,7 +2323,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              getPreferenceScreen()
                      .addPreference(
                              new AddExceptionPreference(
-@@ -1091,8 +1111,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1138,9 +1158,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
      private boolean isBlocked() {
          switch (mGlobalToggleLayout) {
              case GlobalToggleLayout.TRI_STATE_TOGGLE:
@@ -2336,13 +2336,14 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +                }
                  TriStateSiteSettingsPreference triStateToggle =
                          getPreferenceScreen().findPreference(TRI_STATE_TOGGLE_KEY);
+-                assumeNonNull(triStateToggle);
 +                if (triStateToggle == null) return true;
                  return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
              case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE:
                  TriStateCookieSettingsPreference triStateCookieToggle =
-@@ -1162,7 +1190,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
-             infoText.setSummary(
-                     R.string.website_settings_category_javascript_optimizer_page_description);
+@@ -1269,7 +1296,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+         } else if (res_id != -1) {
+             infoText.setSummary(res_id);
          } else {
 -            screen.removePreference(infoText);
 +            int infoMessage = BromiteCustomContentSettingImpl.getCategoryDescription(mCategory);
@@ -2353,7 +2354,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
  
          // Hide the anti-abuse text preferences, as needed.
-@@ -1199,6 +1231,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1314,6 +1345,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          } else {
              screen.removePreference(mLocationTriStatePref);
          }
@@ -2361,7 +2362,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
          if (permissionBlockedByOs) {
              maybeShowOsWarning(screen);
-@@ -1357,7 +1390,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1491,7 +1523,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                          getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
          int[] descriptionIds =
                  ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@@ -2370,7 +2371,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private void configureBinaryToggle(ChromeSwitchPreference binaryToggle, int contentType) {
-@@ -1481,6 +1514,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1615,6 +1647,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          @ContentSettingValues
          Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
  
@@ -2388,15 +2389,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
-@@ -51,6 +51,7 @@ import java.util.Collection;
+@@ -54,6 +54,7 @@ import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
 +import java.util.List;
  
  /** Shows the permissions and other settings for a particular website. */
- public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-@@ -177,7 +178,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+ @NullMarked
+@@ -181,7 +182,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
              case ContentSettingsType.FILE_SYSTEM_WRITE_GUARD:
                  return "file_system_write_guard_permission_list";
              default:
@@ -2405,10 +2406,10 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
      }
  
-@@ -566,8 +567,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
- 
+@@ -577,8 +578,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
      private void setupContentSettingsPreferences() {
-         mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder();
+         Preference permissionsHeaderPref = assumeNonNull(findPreference(PREF_PERMISSIONS_HEADER));
+         mMaxPermissionOrder = permissionsHeaderPref.getOrder();
 -        for (@ContentSettingsType.EnumType int type : SiteSettingsUtil.SETTINGS_ORDER) {
 -            Preference preference = new ChromeSwitchPreference(getStyledContext());
 +        List<Integer> order = BromiteCustomContentSettingImpl.getSettingsOrder();
@@ -2429,7 +2430,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              preference.setKey(getPreferenceKey(type));
  
              if (type == ContentSettingsType.ADS) {
-@@ -1144,20 +1158,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1183,20 +1197,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
              @ContentSettingValues @Nullable Integer value,
              boolean isEmbargoed,
              boolean isOneTime) {
@@ -2470,7 +2471,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                      AppCompatResources.getColorStateList(getContext(), mHighlightColor)
                              .getDefaultColor());
          }
-@@ -1372,14 +1398,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1413,14 +1439,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
          if (newValue instanceof Boolean) {
              permission = (Boolean) newValue ? getEnabledValue(type) : ContentSettingValues.BLOCK;
          } else {
@@ -2484,7 +2485,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +                permission = (Integer) newValue;
          }
  
-         mSite.setContentSetting(browserContextHandle, type, permission);
+         assumeNonNull(mSite).setContentSetting(browserContextHandle, type, permission);
          // In Clank, one time grants are only possible via prompt, not via page
          // info.
          preference.setSummary(
@@ -2496,7 +2497,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
-@@ -53,6 +53,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
+@@ -57,6 +57,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
          SettingsUtils.addPreferencesFromResource(this, R.xml.site_settings_preferences);
          mPageTitle.set(getContext().getString(R.string.prefs_site_settings));
  
@@ -2504,7 +2505,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          configurePreferences();
          updatePreferenceStates();
      }
-@@ -79,7 +80,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
+@@ -87,7 +88,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
  
          // Remove unsupported settings categories.
          for (@SiteSettingsCategory.Type int type = 0;
@@ -2512,8 +2513,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +                type < BromiteCustomContentSettingImpl.NUM_ENTRIES();
                  type++) {
              if (!getSiteSettingsDelegate().isCategoryVisible(type)) {
-                 getPreferenceScreen().removePreference(findPreference(type));
-@@ -101,7 +102,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
+                 Preference pref = assumeNonNull(findPreference(type));
+@@ -113,7 +114,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
          @CookieControlsMode
          int cookieControlsMode =
                  UserPrefs.get(browserContextHandle).getInteger(COOKIE_CONTROLS_MODE);
@@ -2522,7 +2523,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              Preference p = findPreference(prefCategory);
              int contentType = SiteSettingsCategory.contentSettingsType(prefCategory);
              // p can be null if the Preference was removed in configurePreferences.
-@@ -176,19 +177,21 @@ public class SiteSettings extends BaseSiteSettingsFragment
+@@ -191,20 +192,22 @@ public class SiteSettings extends BaseSiteSettingsFragment
              } else if (Type.ZOOM == prefCategory) {
                  // Don't want to set a summary for Zoom because we don't want any message to display
                  // under the Zoom row on site settings.
@@ -2532,10 +2533,11 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 -                                setting, /* isOneTime= */ false));
              } else {
 -                @ContentSettingValues
--                int defaultForToggle =
+-                Integer defaultForToggle =
 -                        checked
 -                                ? ContentSettingsResources.getDefaultEnabledValue(contentType)
 -                                : ContentSettingsResources.getDefaultDisabledValue(contentType);
+-                assumeNonNull(defaultForToggle);
 -                p.setSummary(
 -                        ContentSettingsResources.getCategorySummary(
 -                                defaultForToggle, /* isOneTime= */ false));
@@ -2545,10 +2547,11 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +                    p.setSummary(summary);
 +                } else {
 +                    @ContentSettingValues
-+                    int defaultForToggle =
++                    Integer defaultForToggle =
 +                            checked
 +                                    ? ContentSettingsResources.getDefaultEnabledValue(contentType)
 +                                    : ContentSettingsResources.getDefaultDisabledValue(contentType);
++                    assumeNonNull(defaultForToggle);
 +                    summary = ContentSettingsResources.getCategorySummary(
 +                                   contentType, defaultForToggle, /* isOneTime= */ false);
 +                    p.setSummary(summary);
@@ -2559,7 +2562,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
-@@ -75,7 +75,7 @@ public class SiteSettingsCategory {
+@@ -77,7 +77,7 @@ public class SiteSettingsCategory {
          Type.TRACKING_PROTECTION,
          Type.FILE_EDITING,
          Type.JAVASCRIPT_OPTIMIZER,
@@ -2568,7 +2571,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      })
      @Retention(RetentionPolicy.SOURCE)
      public @interface Type {
-@@ -117,7 +117,7 @@ public class SiteSettingsCategory {
+@@ -119,7 +119,7 @@ public class SiteSettingsCategory {
          int JAVASCRIPT_OPTIMIZER = 33;
  
          /** Number of handled categories used for calculating array sizes. */
@@ -2577,7 +2580,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private final BrowserContextHandle mBrowserContextHandle;
-@@ -166,6 +166,9 @@ public class SiteSettingsCategory {
+@@ -170,6 +170,9 @@ public class SiteSettingsCategory {
          } else {
              permission = "";
          }
@@ -2587,7 +2590,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          return new SiteSettingsCategory(browserContextHandle, type, permission);
      }
  
-@@ -174,7 +177,7 @@ public class SiteSettingsCategory {
+@@ -178,7 +181,7 @@ public class SiteSettingsCategory {
              @ContentSettingsType.EnumType int contentSettingsType) {
          assert contentSettingsType != -1;
          assert Type.ALL_SITES == 0;
@@ -2596,8 +2599,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (contentSettingsType(i) == contentSettingsType) {
                  return createFromType(browserContextHandle, i);
              }
-@@ -185,7 +188,7 @@ public class SiteSettingsCategory {
-     public static SiteSettingsCategory createFromPreferenceKey(
+@@ -189,7 +192,7 @@ public class SiteSettingsCategory {
+     public static @Nullable SiteSettingsCategory createFromPreferenceKey(
              BrowserContextHandle browserContextHandle, String preferenceKey) {
          assert Type.ALL_SITES == 0;
 -        for (@Type int i = Type.ALL_SITES; i < Type.NUM_ENTRIES; i++) {
@@ -2605,7 +2608,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (preferenceKey(i).equals(preferenceKey)) {
                  return createFromType(browserContextHandle, i);
              }
-@@ -262,8 +265,7 @@ public class SiteSettingsCategory {
+@@ -266,8 +269,7 @@ public class SiteSettingsCategory {
              case Type.TRACKING_PROTECTION:
                  return ContentSettingsType.DEFAULT; // Conversion unavailable.
          }
@@ -2615,7 +2618,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      /**
-@@ -354,8 +356,12 @@ public class SiteSettingsCategory {
+@@ -358,8 +360,12 @@ public class SiteSettingsCategory {
              case Type.ZOOM:
                  return "zoom";
              default:
@@ -2631,7 +2634,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
-@@ -217,6 +217,8 @@ public interface SiteSettingsDelegate {
+@@ -218,6 +218,8 @@ public interface SiteSettingsDelegate {
       */
      String getRelatedWebsiteSetOwner(String memberOrigin);
  
@@ -2643,15 +2646,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/TriStateSiteSettingsPreference.java
-@@ -13,6 +13,7 @@ import androidx.preference.PreferenceViewHolder;
- 
+@@ -18,6 +18,7 @@ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.components.browser_ui.widget.RadioButtonWithDescription;
  import org.chromium.components.content_settings.ContentSettingValues;
 +import org.chromium.components.content_settings.ContentSettingsType;
  
  /** A 3-state Allowed/Ask/Blocked radio group Preference used for SiteSettings. */
- public class TriStateSiteSettingsPreference extends Preference
-@@ -23,6 +24,7 @@ public class TriStateSiteSettingsPreference extends Preference
+ @NullMarked
+@@ -29,6 +30,7 @@ public class TriStateSiteSettingsPreference extends Preference
      private RadioButtonWithDescription mAsk;
      private RadioButtonWithDescription mBlocked;
      private RadioGroup mRadioGroup;
@@ -2659,19 +2662,19 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
      public TriStateSiteSettingsPreference(Context context, AttributeSet attrs) {
          super(context, attrs);
-@@ -42,7 +44,9 @@ public class TriStateSiteSettingsPreference extends Preference
+@@ -48,7 +50,9 @@ public class TriStateSiteSettingsPreference extends Preference
       * @param descriptionIds An array of 3 resource IDs for descriptions for
       *                       Allowed, Ask and Blocked states, in that order.
       */
--    public void initialize(@ContentSettingValues int setting, int[] descriptionIds) {
+-    public void initialize(@ContentSettingValues int setting, int @Nullable [] descriptionIds) {
 +    public void initialize(@ContentSettingsType.EnumType int contentType,
-+                           @ContentSettingValues int setting, int[] descriptionIds) {
++                           @ContentSettingValues int setting, int @Nullable [] descriptionIds) {
 +        mContentType = contentType;
          mSetting = setting;
          mDescriptionIds = descriptionIds;
      }
-@@ -75,6 +79,13 @@ public class TriStateSiteSettingsPreference extends Preference
-         mRadioGroup = (RadioGroup) holder.findViewById(R.id.radio_button_layout);
+@@ -86,6 +90,13 @@ public class TriStateSiteSettingsPreference extends Preference
+         mRadioGroup = assumeNonNull(radioGroup);
          mRadioGroup.setOnCheckedChangeListener(this);
  
 +        BromiteCustomContentSetting cs =
@@ -2687,7 +2690,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -327,7 +327,11 @@ public final class Website implements WebsiteEntry {
+@@ -331,7 +331,11 @@ public final class Website implements WebsiteEntry {
                  RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings");
              }
          }
@@ -2703,7 +2706,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
-@@ -110,7 +110,7 @@ public class WebsitePermissionsFetcher {
+@@ -111,7 +111,7 @@ public class WebsitePermissionsFetcher {
              case ContentSettingsType.USB_GUARD:
                  return WebsitePermissionsType.CHOSEN_OBJECT_INFO;
              default:
@@ -2715,7 +2718,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
-@@ -291,7 +291,7 @@ public class WebsitePreferenceBridge {
+@@ -321,7 +321,7 @@ public class WebsitePreferenceBridge {
              case ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER:
                  return true;
              default:
@@ -2724,7 +2727,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
      }
  
-@@ -307,7 +307,6 @@ public class WebsitePreferenceBridge {
+@@ -337,7 +337,6 @@ public class WebsitePreferenceBridge {
      public static boolean isCategoryEnabled(
              BrowserContextHandle browserContextHandle,
              @ContentSettingsType.EnumType int contentSettingsType) {
@@ -2811,7 +2814,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
 diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
 --- a/components/content_settings/core/browser/BUILD.gn
 +++ b/components/content_settings/core/browser/BUILD.gn
-@@ -84,6 +84,13 @@ static_library("browser") {
+@@ -86,6 +86,13 @@ static_library("browser") {
    }
  
    configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -2842,7 +2845,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
  
  namespace content_settings {
  
-@@ -848,6 +849,7 @@ void ContentSettingsRegistry::Init() {
+@@ -859,6 +860,7 @@ void ContentSettingsRegistry::Init() {
             WebsiteSettingsRegistry::DESKTOP,
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -2853,7 +2856,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,
+@@ -215,11 +215,7 @@ void RecordContentSettingsHistogram(const std::string& name,
  }
  
  int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
@@ -2869,7 +2872,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 +2880,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 +3188,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,
+@@ -479,5 +479,7 @@ enum ContentSettingsType {
+   // Website setting which is used for UnusedSitePermissionsService to
+   // store revoked notification permissions of disruptive sites.
+   REVOKED_DISRUPTIVE_NOTIFICATION_PERMISSIONS,
 +
 +#include "components/content_settings/core/common/bromite_content_settings.inc"
  };
@@ -3403,7 +3406,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
  #include "components/content_settings/browser/ui/cookie_controls_controller.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/content_settings_uma_util.h"
-@@ -1267,6 +1268,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1258,6 +1259,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
  // applies to permissions listed in |kPermissionType|.
  bool PageInfo::ShouldShowPermission(
      const PageInfo::PermissionInfo& info) const {
@@ -3418,7 +3421,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
    // Note |ContentSettingsType::ADS| will show up regardless of its default
    // value when it has been activated on the current origin.
    if (info.type == ContentSettingsType::ADS) {
-@@ -1383,7 +1392,19 @@ void PageInfo::PresentSitePermissions() {
+@@ -1374,7 +1383,19 @@ void PageInfo::PresentSitePermissions() {
  
    HostContentSettingsMap* content_settings = GetContentSettings();
    DCHECK(web_contents_);
@@ -3464,7 +3467,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    switch (type) {
      case ContentSettingsType::GEOLOCATION:
        message_id = IDS_PAGE_INFO_STATE_TEXT_LOCATION_ASK;
-@@ -626,6 +634,12 @@ PageInfoUI::~PageInfoUI() = default;
+@@ -628,6 +636,12 @@ PageInfoUI::~PageInfoUI() = default;
  
  // static
  std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -3477,7 +3480,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id);
-@@ -636,6 +650,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -638,6 +652,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
  // static
  std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
      ContentSettingsType type) {
@@ -3490,7 +3493,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
-@@ -1077,6 +1097,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -1079,6 +1099,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
      if (info.type == type)
        return true;
    }
@@ -3571,15 +3574,15 @@ 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
-@@ -44,6 +44,7 @@
- #include "third_party/blink/public/mojom/permissions_policy/permissions_policy_feature.mojom-blink-forward.h"
+@@ -43,6 +43,7 @@
+ #include "third_party/blink/public/mojom/frame/lifecycle.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"
  #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
  #include "third_party/blink/renderer/core/core_export.h"
  #include "third_party/blink/renderer/core/execution_context/security_context.h"
-@@ -103,6 +104,10 @@ class SecurityOrigin;
+@@ -102,6 +103,10 @@ class SecurityOrigin;
  class ScriptState;
  class ScriptWrappable;
  class TrustedTypePolicyFactory;

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

@@ -8,17 +8,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/android/chrome_java_resources.gni      |   2 +-
  .../android/java/res/xml/main_preferences.xml |   4 +-
- .../res/xml/privacy_preferences_cromite.xml   | 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 = [
+@@ -650,7 +650,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);

build/patches/Cromite-Branding.patch

@@ -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
@@ -9180,7 +9180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -392,7 +392,7 @@
+@@ -398,7 +398,7 @@
      No recent activities
    </message>
    <message name="IDS_EXTENSIONS_NO_INSTALLED_ITEMS" desc="The message shown to the user on the Extensions settings page when there are no extensions or apps installed.">
@@ -9189,7 +9189,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
    </message>
    <message name="IDS_EXTENSIONS_NO_DESCRIPTION" desc="The message shown to the user when an extension does not have any description.">
      No description provided
-@@ -530,7 +530,7 @@
+@@ -536,7 +536,7 @@
      My extensions
    </message>
    <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar to open the Chrome Web Store to get more extensions.">
@@ -9201,15 +9201,15 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -275,7 +275,7 @@
-     Change
+@@ -81,7 +81,7 @@
+     Accessibility
    </message>
-   <message name="IDS_SETTINGS_WEB_STORE" desc="Sub-label about choosing something from the Chrome Web Store.">
+   <message name="IDS_SETTINGS_ACCESSIBILITY_WEB_STORE" desc="Text for an external link explaining that additional accessibility features are found on the Chrome Web Store.">
 -    Open Chrome Web Store
 +    Open Chromedontreplace Web Store
    </message>
-   <if expr="is_macosx">
-     <message name="IDS_SETTINGS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
+   <message name="IDS_SETTINGS_MORE_FEATURES_LINK" desc="Link which opens page where users can install extensions which provide additional accessibility features.">
+     Add accessibility features
 diff --git a/chrome/app/theme/chromium/BRANDING b/chrome/app/theme/chromium/BRANDING
 --- a/chrome/app/theme/chromium/BRANDING
 +++ b/chrome/app/theme/chromium/BRANDING
@@ -13155,7 +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") {
+@@ -1859,6 +1859,7 @@ static_library("browser") {
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
      "//build/config/linux/dbus:buildflags",
@@ -13166,7 +13166,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 --- a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
 +++ b/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java
-@@ -37,7 +37,7 @@ public class UpdateConfigs {
+@@ -39,7 +39,7 @@ public class UpdateConfigs {
      private static final String UPDATE_AVAILABLE_SWITCH_VALUE = "update_available";
      private static final String UNSUPPORTED_OS_VERSION_SWITCH_VALUE = "unsupported_os_version";
  
@@ -13178,7 +13178,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -52,6 +52,7 @@ source_set("impl") {
+@@ -51,6 +51,7 @@ source_set("impl") {
    deps = [
      ":prefs",
      ":util",
@@ -13189,15 +13189,15 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -30,6 +30,7 @@
+@@ -26,6 +26,7 @@
+ #include "base/trace_event/trace_event.h"
  #include "build/branding_buildflags.h"
  #include "build/build_config.h"
- #include "build/chromeos_buildflags.h"
 +#include "build/cromite_flags.h"
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -291,10 +292,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
  #endif
    std::string seed;
    CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13243,7 +13243,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
        #menu {
          color: var(--google-grey-700);
          display: flex;
-@@ -173,7 +185,7 @@
+@@ -165,7 +177,7 @@
          </a>
          <a role="menuitem" id="about-menu" href="/help"
              class="cr-nav-menu-item">
@@ -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
+@@ -2462,7 +2462,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">
@@ -13278,16 +13278,16 @@ diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -136,7 +136,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -135,7 +135,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
  inline constexpr char kChromeHelpViaWebUIURL[] =
 -    "https://support.google.com/chrome?p=help&ctx=settings";
 +    "https://github.com/uazo/cromite/issues";
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+ #if BUILDFLAG(IS_CHROMEOS)
  inline constexpr char kChromeOsHelpViaWebUIURL[] =
  #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -199,7 +199,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -198,7 +198,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
      "chrome-untrusted://new-tab-page/";
  
  // The URL for the Chromium project used in the About dialog.
@@ -18225,15 +18225,15 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 -// found in the LICENSE file.
 -
 -CANVAS_DIMENSIONS, 15,
--MOVE_TO, 4.92f, 7.5f,
--R_CUBIC_TO, 0, 0.71f, 0.25f, 1.31f, 0.76f, 1.82f,
--R_CUBIC_TO, 0.51f, 0.51f, 1.12f, 0.76f, 1.82f, 0.76f,
--R_CUBIC_TO, 0.7f, 0, 1.31f, -0.25f, 1.82f, -0.76f,
--R_CUBIC_TO, 0.51f, -0.51f, 0.76f, -1.12f, 0.76f, -1.82f,
--R_CUBIC_TO, 0, -0.7f, -0.25f, -1.31f, -0.76f, -1.82f,
--R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -1.82f, -0.76f,
--R_CUBIC_TO, -0.7f, 0, -1.31f, 0.25f, -1.82f, 0.76f,
--R_ARC_TO, 2.49f, 2.49f, 0, 0, 0, -0.76f, 1.82f,
+-MOVE_TO, 4.92, 7.5,
+-R_CUBIC_TO, 0, 0.71, 0.25, 1.31, 0.76, 1.82,
+-R_CUBIC_TO, 0.51, 0.51, 1.12, 0.76, 1.82, 0.76,
+-R_CUBIC_TO, 0.7, 0, 1.31, -0.25, 1.82, -0.76,
+-R_CUBIC_TO, 0.51, -0.51, 0.76, -1.12, 0.76, -1.82,
+-R_CUBIC_TO, 0, -0.7, -0.25, -1.31, -0.76, -1.82,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -1.82, -0.76,
+-R_CUBIC_TO, -0.7, 0, -1.31, 0.25, -1.82, 0.76,
+-R_ARC_TO, 2.49, 2.49, 0, 0, 0, -0.76, 1.82,
 +CANVAS_DIMENSIONS, 16,
 +MOVE_TO, 15.99f, 8,
 +CUBIC_TO, 15.99f, 9.83f, 15.37f, 11.52f, 14.34f, 12.87f,
@@ -18245,47 +18245,47 @@ diff --git a/components/omnibox/browser/vector_icons/product_chrome_refresh.icon
 +CUBIC_TO, 14.47f, 3.29f, 14.38f, 3.18f, 14.29f, 3.07f,
 +CUBIC_TO, 15.36f, 4.43f, 15.99f, 6.14f, 15.99f, 8,
  CLOSE,
--MOVE_TO, 7.5f, 11.48f,
--R_CUBIC_TO, 0.14f, 0, 0.28f, 0, 0.41f, -0.02f,
--R_CUBIC_TO, 0.13f, -0.01f, 0.26f, -0.04f, 0.39f, -0.07f,
--LINE_TO, 6.77f, 14.06f,
--R_CUBIC_TO, -1.65f, -0.19f, -3.04f, -0.89f, -4.15f, -2.12f,
--CUBIC_TO, 1.5f, 10.71f, 0.94f, 9.24f, 0.94f, 7.55f,
--R_CUBIC_TO, 0, -0.46f, 0.05f, -0.9f, 0.13f, -1.33f,
--R_CUBIC_TO, 0.08f, -0.44f, 0.22f, -0.85f, 0.39f, -1.25f,
--R_LINE_TO, 2.63f, 4.55f,
--R_CUBIC_TO, 0.34f, 0.59f, 0.81f, 1.07f, 1.41f, 1.43f,
--R_CUBIC_TO, 0.6f, 0.36f, 1.26f, 0.54f, 2.01f, 0.54f,
+-MOVE_TO, 7.5, 11.48,
+-R_CUBIC_TO, 0.14, 0, 0.28, 0, 0.41, -0.02,
+-R_CUBIC_TO, 0.13, -0.01, 0.26, -0.04, 0.39, -0.07,
+-LINE_TO, 6.77, 14.06,
+-R_CUBIC_TO, -1.65, -0.19, -3.04, -0.89, -4.15, -2.12,
+-CUBIC_TO, 1.5, 10.71, 0.94, 9.24, 0.94, 7.55,
+-R_CUBIC_TO, 0, -0.46, 0.05, -0.9, 0.13, -1.33,
+-R_CUBIC_TO, 0.08, -0.44, 0.22, -0.85, 0.39, -1.25,
+-R_LINE_TO, 2.63, 4.55,
+-R_CUBIC_TO, 0.34, 0.59, 0.81, 1.07, 1.41, 1.43,
+-R_CUBIC_TO, 0.6, 0.36, 1.26, 0.54, 2.01, 0.54,
 +MOVE_TO, 14.29f, 3.07f,
 +CUBIC_TO, 14.29f, 3.06f, 14.28f, 3.05f, 14.27f, 3.04f,
 +CUBIC_TO, 14.28f, 3.05f, 14.29f, 3.06f, 14.29f, 3.07f,
  CLOSE,
--R_MOVE_TO, 0, -7.87f,
--R_CUBIC_TO, -0.87f, 0, -1.65f, 0.25f, -2.33f, 0.77f,
--R_ARC_TO, 3.95f, 3.95f, 0, 0, 0, -1.42f, 1.94f,
--LINE_TO, 2.21f, 3.66f,
--R_ARC_TO, 6.79f, 6.79f, 0, 0, 1, 2.27f, -1.94f,
--CUBIC_TO, 5.4f, 1.22f, 6.4f, 0.98f, 7.5f, 0.98f,
--R_CUBIC_TO, 1.1f, 0, 2.08f, 0.24f, 2.99f, 0.72f,
--ARC_TO, 6.66f, 6.66f, 0, 0, 1, 12.76f, 3.6f,
--H_LINE_TO, 7.51f,
--R_LINE_TO, -0.01f, 0.01f,
+-R_MOVE_TO, 0, -7.87,
+-R_CUBIC_TO, -0.87, 0, -1.65, 0.25, -2.33, 0.77,
+-R_ARC_TO, 3.95, 3.95, 0, 0, 0, -1.42, 1.94,
+-LINE_TO, 2.21, 3.66,
+-R_ARC_TO, 6.79, 6.79, 0, 0, 1, 2.27, -1.94,
+-CUBIC_TO, 5.4, 1.22, 6.4, 0.98, 7.5, 0.98,
+-R_CUBIC_TO, 1.1, 0, 2.08, 0.24, 2.99, 0.72,
+-ARC_TO, 6.66, 6.66, 0, 0, 1, 12.76, 3.6,
+-H_LINE_TO, 7.51,
+-R_LINE_TO, -0.01, 0.01,
 +MOVE_TO, 14.34f, 12.87f,
 +CUBIC_TO, 14.29f, 12.93f, 14.24f, 12.99f, 14.2f, 13.05f,
 +CUBIC_TO, 14.24f, 12.99f, 14.29f, 12.93f, 14.34f, 12.87f,
  CLOSE,
--R_MOVE_TO, 6.01f, 1.31f,
--R_CUBIC_TO, 0.19f, 0.4f, 0.32f, 0.83f, 0.41f, 1.27f,
--R_CUBIC_TO, 0.09f, 0.44f, 0.15f, 0.89f, 0.15f, 1.36f,
--R_CUBIC_TO, 0, 1.7f, -0.55f, 3.16f, -1.68f, 4.38f,
--R_CUBIC_TO, -1.11f, 1.23f, -2.47f, 1.93f, -4.1f, 2.13f,
--R_LINE_TO, 2.63f, -4.55f,
--R_CUBIC_TO, 0.17f, -0.28f, 0.29f, -0.59f, 0.38f, -0.92f,
--R_CUBIC_TO, 0.09f, -0.34f, 0.15f, -0.69f, 0.15f, -1.05f,
--R_CUBIC_TO, 0, -0.52f, -0.09f, -0.99f, -0.28f, -1.42f,
--R_ARC_TO, 3.96f, 3.96f, 0, 0, 0, -0.74f, -1.2f,
--R_H_LINE_TO, 3.08f,
--R_V_LINE_TO, 0.01f,
+-R_MOVE_TO, 6.01, 1.31,
+-R_CUBIC_TO, 0.19, 0.4, 0.32, 0.83, 0.41, 1.27,
+-R_CUBIC_TO, 0.09, 0.44, 0.15, 0.89, 0.15, 1.36,
+-R_CUBIC_TO, 0, 1.7, -0.55, 3.16, -1.68, 4.38,
+-R_CUBIC_TO, -1.11, 1.23, -2.47, 1.93, -4.1, 2.13,
+-R_LINE_TO, 2.63, -4.55,
+-R_CUBIC_TO, 0.17, -0.28, 0.29, -0.59, 0.38, -0.92,
+-R_CUBIC_TO, 0.09, -0.34, 0.15, -0.69, 0.15, -1.05,
+-R_CUBIC_TO, 0, -0.52, -0.09, -0.99, -0.28, -1.42,
+-R_ARC_TO, 3.96, 3.96, 0, 0, 0, -0.74, -1.2,
+-R_H_LINE_TO, 3.08,
+-R_V_LINE_TO, 0.01,
 +MOVE_TO, 14.27f, 3.04f,
 +CUBIC_TO, 14.19f, 2.94f, 14.11f, 2.84f, 14.02f, 2.74f,
 +CUBIC_TO, 14.11f, 2.84f, 14.19f, 2.94f, 14.27f, 3.04f,
@@ -18917,9 +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() {
+@@ -571,19 +571,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,36 +18984,51 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "Fenced frames must be enabled in order to enable local "
             "unpartitioned "
          << "data access. Use --" << switches::kEnableFeatures << "="
-@@ -599,7 +598,7 @@ void ResolveInvalidConfigurations() {
+@@ -591,12 +594,14 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableFeatureFromString(
+         "FencedFramesLocalUnpartitionedDataAccess", false);
+   }
++  CHECK(!base::FeatureList::IsEnabled(blink::features::kFencedFrames))
++    << "kFencedFrames is enabled!";
+ 
+   // Topics API cannot be enabled without the support of the browser process.
    // The Document API should be additionally gated by the
    // `kBrowsingTopicsDocumentAPI` feature.
-   if (!base::FeatureList::IsEnabled(blink::features::kBrowsingTopics)) {
+   if (!base::FeatureList::IsEnabled(network::features::kBrowsingTopics)) {
 -    LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsAPIEnabled())
 +    CHECK(!WebRuntimeFeatures::IsTopicsAPIEnabled())
          << "Topics cannot be enabled in this configuration. Use --"
          << switches::kEnableFeatures << "="
-         << blink::features::kBrowsingTopics.name << " in addition.";
-@@ -609,7 +608,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kBrowsingTopics.name << " in addition.";
+@@ -604,30 +609,23 @@ void ResolveInvalidConfigurations() {
+     WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+     WebRuntimeFeatures::EnableTopicsImgAPI(false);
    } else {
-     if (!base::FeatureList::IsEnabled(
-             blink::features::kBrowsingTopicsDocumentAPI)) {
+-    if (!base::FeatureList::IsEnabled(
+-            blink::features::kBrowsingTopicsDocumentAPI)) {
 -      LOG_IF(WARNING, WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
-+      CHECK(!WebRuntimeFeatures::IsTopicsDocumentAPIEnabled())
-           << "Topics Document API cannot be enabled in this configuration. Use "
-              "--"
-           << switches::kEnableFeatures << "="
-@@ -620,8 +619,8 @@ void ResolveInvalidConfigurations() {
+-          << "Topics Document API cannot be enabled in this configuration. Use "
+-             "--"
+-          << switches::kEnableFeatures << "="
+-          << blink::features::kBrowsingTopicsDocumentAPI.name
+-          << " in addition.";
+-      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
+-    }
++    CHECK(false) << "kBrowsingTopics is enabled!";
    }
  
-   if (!base::FeatureList::IsEnabled(blink::features::kSharedStorageAPI)) {
+   if (!base::FeatureList::IsEnabled(network::features::kSharedStorageAPI)) {
 -    LOG_IF(WARNING, WebRuntimeFeatures::IsSharedStorageAPIEnabled())
 -        << "SharedStorage cannot be enabled in this "
 +    CHECK(!WebRuntimeFeatures::IsSharedStorageAPIEnabled())
 +        << "SharedStorage for M118+ cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-         << blink::features::kSharedStorageAPI.name << " in addition.";
-@@ -630,7 +629,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kSharedStorageAPI.name << " in addition.";
+     WebRuntimeFeatures::EnableSharedStorageAPI(false);
++  } else {
++    CHECK(false) << "kSharedStorageAPI is enabled!";
+   }
  
    if (!base::FeatureList::IsEnabled(
            attribution_reporting::features::kConversionMeasurement)) {
@@ -19007,27 +19037,27 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "AttributionReporting cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -643,8 +642,7 @@ void ResolveInvalidConfigurations() {
-           attribution_reporting::features::kConversionMeasurement) ||
-       !base::FeatureList::IsEnabled(
-           network::features::kAttributionReportingCrossAppWeb)) {
--    LOG_IF(WARNING,
--           WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
-+    CHECK(!WebRuntimeFeatures::IsAttributionReportingCrossAppWebEnabled())
-         << "AttributionReportingCrossAppWeb cannot be enabled in this "
-            "configuration. Use --"
-         << switches::kEnableFeatures << "="
-@@ -655,8 +653,7 @@ void ResolveInvalidConfigurations() {
+@@ -635,23 +633,25 @@ void ResolveInvalidConfigurations() {
+         << " in addition.";
+     WebRuntimeFeatures::EnableAttributionReporting(false);
    }
++  CHECK(!base::FeatureList::IsEnabled(attribution_reporting::features::kConversionMeasurement))
++    << "kConversionMeasurement is enabled!";
  
-   if (!base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+   if (!base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
 -    LOG_IF(WARNING,
 -           WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
 +    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
          << "AdInterestGroupAPI cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -668,8 +665,7 @@ void ResolveInvalidConfigurations() {
+         << network::features::kInterestGroupStorage.name << " in addition.";
+     WebRuntimeFeatures::EnableAdInterestGroupAPI(false);
+     WebRuntimeFeatures::EnableFledge(false);
++  } else {
++    CHECK(false) << "kInterestGroupStorage is enabled!";
+   }
+ 
    // PermissionElement cannot be enabled without the support of the
    // browser process.
    if (!base::FeatureList::IsEnabled(blink::features::kPermissionElement)) {

build/patches/Customize-selection-popup.patch

@@ -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
+@@ -798,10 +798,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
+@@ -196,12 +196,20 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
          // Skip opening a new Tab if it doesn't make sense.
          if (mTab.isClosing()) return false;
  
@@ -81,9 +81,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
                  tabCreator.createTabWithWebContents(
 -                        mTab, webContents, TabLaunchType.FROM_LONGPRESS_FOREGROUND, url);
 +                        mTab, webContents, tabLaunchType, url);
+         if (!success) return false;
  
-         if (success) {
-             if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) {
+         if (disposition == WindowOpenDisposition.NEW_FOREGROUND_TAB) {
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
@@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  import org.chromium.base.ObserverList;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.supplier.ObservableSupplier;
-@@ -237,6 +238,13 @@ public class LayoutManagerImpl
+@@ -238,6 +239,13 @@ public class LayoutManagerImpl
                                                  != TabLaunchType
                                                          .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);
@@ -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;
+@@ -27,6 +27,7 @@ import androidx.appcompat.app.AppCompatActivity;
  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
+@@ -783,11 +784,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;
          }
  

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

@@ -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;

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

@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1095,6 +1095,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1100,6 +1100,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

build/patches/Disable-Android-AppRestrictions.patch

@@ -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) {

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

@@ -0,0 +1,40 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Tue, 1 Apr 2025 11:37:52 +0000
+Subject: Disable Android Tab Declutter
+
+Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
+---
+ .../org/chromium/chrome/browser/flags/ChromeFeatureList.java  | 4 ++--
+ .../chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc  | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+
+diff --git a/chrome/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
+@@ -1032,7 +1032,7 @@ public abstract class ChromeFeatureList {
+     public static final MutableFlagWithSafeDefault sAndroidDumpOnScrollWithoutResource =
+             newMutableFlagWithSafeDefault(ANDROID_DUMP_ON_SCROLL_WITHOUT_RESOURCE, false);
+     public static final MutableFlagWithSafeDefault sAndroidTabDeclutter =
+-            newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER, true);
++            newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER, false);
+     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveAllButActiveTab =
+             newMutableFlagWithSafeDefault(ANDROID_TAB_DECLUTTER_ARCHIVE_ALL_BUT_ACTIVE, false);
+     public static final MutableFlagWithSafeDefault sAndroidTabDeclutterArchiveDuplicateTabs =
+@@ -1514,7 +1514,7 @@ public abstract class ChromeFeatureList {
+     public static final MutableBooleanParamWithSafeDefault sShouldBlockCapturesForFullscreenParam =
+             sSuppressionToolbarCaptures.newBooleanParam("block_for_fullscreen", false);
+     public static final MutableBooleanParamWithSafeDefault sAndroidTabDeclutterArchiveEnabled =
+-            sAndroidTabDeclutter.newBooleanParam("android_tab_declutter_archive_enabled", true);
++            sAndroidTabDeclutter.newBooleanParam("android_tab_declutter_archive_enabled", false);
+     public static final MutableIntParamWithSafeDefault sAndroidTabDeclutterArchiveTimeDeltaHours =
+             sAndroidTabDeclutter.newIntParam(
+                     "android_tab_declutter_archive_time_delta_hours", 21 * 24);
+diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Android-Tab-Declutter.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kAndroidTabDeclutter);
+--

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

@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 --- a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 +++ b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
-@@ -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();

build/patches/Disable-Compose-feature.patch

@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8383,6 +8383,12 @@ static_library("browser") {
+@@ -8180,6 +8180,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") {
+@@ -8195,7 +8201,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") {
+@@ -8640,7 +8645,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);

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

@@ -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 @@
+@@ -889,12 +889,14 @@
        }
      },
      {

build/patches/Disable-FedCm.patch

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

build/patches/Disable-Feeback-Collector.patch

@@ -29,7 +29,7 @@ diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn
 diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
 +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java
-@@ -28,6 +28,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
+@@ -29,6 +29,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
  import org.chromium.components.signin.identitymanager.IdentityManager;
  
  import java.util.HashMap;
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browse
  import java.util.List;
  import java.util.Map;
  
-@@ -69,31 +70,8 @@ public abstract class FeedbackCollector<T> implements Runnable {
+@@ -73,31 +74,8 @@ public abstract class FeedbackCollector<T> implements Runnable {
              @Nullable ScreenshotSource screenshotTask,
              T initParams,
              Profile profile) {

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

@@ -25,7 +25,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -263,9 +262,6 @@ public class IntentHandler {
+@@ -275,9 +274,6 @@ public class IntentHandler {
      public static final String EXTRA_SKIP_PRECONNECT =
              "org.chromium.chrome.browser.skip_preconnect";
  
@@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
      private static Pair<Integer, String> sPendingReferrer;
      private static int sReferrerId;
      private static String sPendingIncognitoUrl;
-@@ -539,8 +535,6 @@ public class IntentHandler {
+@@ -551,8 +547,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -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() {
@@ -206,16 +206,16 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
-@@ -246,7 +246,7 @@ public class PdfCoordinator {
+@@ -249,7 +249,7 @@ public class PdfCoordinator {
      }
  
-     String requestAssistContent(String filename, boolean isWorkProfile) {
+     @Nullable String requestAssistContent(String filename, boolean isWorkProfile) {
 -        if (mUri == null) {
 +        if ((true)) {
              return null;
          }
          String structuredData;
-@@ -264,8 +264,6 @@ public class PdfCoordinator {
+@@ -267,8 +267,6 @@ public class PdfCoordinator {
          } catch (JSONException e) {
              return null;
          }

build/patches/Disable-GetInstalledRelatedApps-API.patch

@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 --- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 +++ b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
-@@ -153,6 +153,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
+@@ -161,6 +161,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
              final RelatedApplication[] relatedApps,
              final Url manifestUrl,
              final FilterInstalledApps_Response callback) {
@@ -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 @@
+@@ -2538,9 +2538,8 @@
        name: "InspectorGhostRules",
      },
      {

build/patches/Disable-PrivacyGuide.patch

@@ -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);
  

build/patches/Disable-Real-Box.patch

@@ -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,
+@@ -2217,7 +2217,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -21,7 +21,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 +  registry->RegisterBooleanPref(prefs::kLensDesktopNTPSearchEnabled, false);
  #endif
  
- #if !BUILDFLAG(IS_ANDROID)
+   registry->RegisterListPref(
 diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
@@ -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,

build/patches/Disable-TLS-resumption.patch

@@ -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),

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

@@ -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) {

build/patches/Disable-WebGPU.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -559,6 +559,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -556,6 +556,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
  
    WebRuntimeFeatures::EnableRemotePlayback(false);
  
@@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -243,7 +243,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -235,7 +235,7 @@ BASE_FEATURE(kEnableDrDc,
  // enabled by default on supported platforms.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
      BUILDFLAG(IS_ANDROID)
@@ -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"));

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

@@ -5,26 +5,32 @@ 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 +--
+ .../search_prefetch/field_trial_settings.cc      |  4 ++++
+ .../search_prefetch_url_loader_interceptor.cc    |  1 +
+ .../chrome_browser_main_extra_parts_profiles.cc  |  1 -
  chrome/browser/safe_browsing/BUILD.gn            |  1 -
  ...fication_content_detection_service_factory.cc |  5 +++++
  chrome/browser/ui/tab_helpers.cc                 |  1 -
  .../read_anything/read_aloud_app_model.cc        | 16 ++++++++++++++--
  .../read_anything/read_aloud_app_model.h         |  9 ++++++++-
  .../read_anything_app_controller.cc              | 10 ++++++++++
- .../read_anything/read_anything_app_controller.h |  4 ++++
+ .../read_anything/read_anything_app_controller.h |  6 ++++++
  chrome/utility/BUILD.gn                          |  2 +-
  chrome/utility/services.cc                       |  8 --------
  .../integrators/autofill_optimization_guide.cc   |  5 +++--
  .../omnibox/browser/autocomplete_controller.cc   |  4 ++++
+ .../omnibox/browser/base_search_provider.cc      |  4 ++--
  .../optimization_guide/core/hints_fetcher.cc     |  1 +
  .../optimization_guide/core/hints_manager.cc     |  5 +++++
  .../core/optimization_guide_features.cc          | 15 +++++++++------
@@ -33,29 +39,32 @@ 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              |  2 ++
  .../Disable-all-predictors-code.inc              |  1 +
  .../Disable-all-predictors-code.inc              |  1 +
  .../features_cc/Disable-all-predictors-code.inc  |  3 +++
  .../features_cc/Disable-all-predictors-code.inc  |  1 +
+ .../features_cc/Disable-all-predictors-code.inc  |  1 +
  .../features_cc/Disable-all-predictors-code.inc  |  2 ++
  services/webnn/features.gni                      |  2 +-
  .../core/html/parser/html_document_parser.cc     |  1 +
  .../document_speculation_rules.cc                |  1 +
  .../platform/runtime_enabled_features.json5      |  2 +-
- 39 files changed, 106 insertions(+), 40 deletions(-)
+ 47 files changed, 123 insertions(+), 47 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/components/permissions/features_cc/Disable-all-predictors-code.inc
+ create mode 100644 cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-all-predictors-code.inc
 
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -727,8 +727,6 @@ static_library("browser") {
+@@ -755,8 +755,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 +73,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") {
+@@ -2281,7 +2279,7 @@ static_library("browser") {
+     "//components/resources",
      "//components/safe_browsing/content/browser",
-     "//components/safe_browsing/content/browser:client_side_detection",
      "//components/safe_browsing/content/browser:safe_browsing_service",
 -    "//components/safe_browsing/content/browser/notification_content_detection",
++    "//components/safe_browsing/content/browser/notification_content_detection:constants",
      "//components/safe_browsing/content/browser/password_protection",
      "//components/safe_browsing/content/browser/web_ui",
      "//components/safe_browsing/core/browser",
@@ -175,7 +185,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -498,7 +498,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -500,7 +500,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  void OptimizationGuideKeyedService::RegisterOptimizationTypes(
      const std::vector<optimization_guide::proto::OptimizationType>&
          optimization_types) {
@@ -183,10 +193,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
+@@ -40,8 +40,6 @@ source_set("permissions") {
+     "permission_revocation_request.h",
+     "permissions_ai_handler.cc",
+     "permissions_ai_handler.h",
+-    "prediction_based_permission_ui_selector.cc",
+-    "prediction_based_permission_ui_selector.h",
+     "prediction_model_handler_provider.cc",
+     "prediction_model_handler_provider.h",
+     "prediction_service_factory.cc",
+diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc
+--- a/chrome/browser/permissions/chrome_permissions_client.cc
++++ b/chrome/browser/permissions/chrome_permissions_client.cc
+@@ -418,8 +418,6 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
+ #endif
+   selectors.emplace_back(std::make_unique<PrefBasedQuietPermissionUiSelector>(
+       Profile::FromBrowserContext(browser_context)));
+-  selectors.emplace_back(std::make_unique<PredictionBasedPermissionUiSelector>(
+-      Profile::FromBrowserContext(browser_context)));
+   return selectors;
+ }
+ 
 diff --git a/chrome/browser/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,12 +256,45 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p
  
  }  // namespace
  
+diff --git a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
+--- a/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
++++ b/chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.cc
+@@ -146,3 +146,7 @@ const base::FeatureParam<base::TimeDelta>
+     kSuppressesSearchPrefetchOnSlowNetworkThreshold{
+         &kSuppressesSearchPrefetchOnSlowNetwork,
+         "slow_network_threshold_for_search_prefetch", base::Milliseconds(208)};
++
++SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchServicePrefetching);
++SET_CROMITE_FEATURE_DISABLED(kSearchPrefetchWithNoVarySearchDiskCache);
++SET_CROMITE_FEATURE_DISABLED(kSearchNavigationPrefetch);
+diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
+--- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
++++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
+@@ -84,6 +84,7 @@ SearchPrefetchURLLoader::RequestHandler
+ SearchPrefetchURLLoaderInterceptor::MaybeCreateLoaderForRequest(
+     const network::ResourceRequest& tentative_resource_request,
+     content::FrameTreeNodeId frame_tree_node_id) {
++  if ((true)) return {};
+   // Do not intercept non-main frame navigations.
+   if (!tentative_resource_request.is_outermost_main_frame) {
+     // Use the is_outermost_main_frame flag instead of obtaining the
+diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
++++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -1122,7 +1122,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") {
+@@ -49,7 +49,6 @@ static_library("safe_browsing") {
+     "//components/safe_browsing:buildflags",
      "//components/safe_browsing/content/browser",
-     "//components/safe_browsing/content/browser:client_side_detection",
      "//components/safe_browsing/content/browser:client_side_detection_service",
 -    "//components/safe_browsing/content/browser/notification_content_detection:notification_content_detection",
      "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger",
@@ -236,7 +303,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
 diff --git a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
 --- a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
 +++ b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
-@@ -14,6 +14,7 @@
+@@ -15,6 +15,7 @@
  #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h"
  #include "components/safe_browsing/core/browser/db/database_manager.h"
  #include "components/safe_browsing/core/common/features.h"
@@ -244,15 +311,15 @@ diff --git a/chrome/browser/safe_browsing/notification_content_detection_service
  #include "content/public/browser/browser_context.h"
  
  namespace safe_browsing {
-@@ -63,6 +64,7 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
-     return nullptr;
-   }
- 
+@@ -85,6 +86,7 @@ NotificationContentDetectionServiceFactory::
+         content::BrowserContext* context) const {
+   CHECK(opt_guide);
+   CHECK(context);
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
    auto database_manager =
        g_browser_process->safe_browsing_service()->database_manager();
    scoped_refptr<base::SequencedTaskRunner> background_task_runner =
-@@ -70,6 +72,9 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
+@@ -92,6 +94,9 @@ NotificationContentDetectionServiceFactory::
            {base::MayBlock(), base::TaskPriority::BEST_EFFORT});
    return std::make_unique<NotificationContentDetectionService>(
        opt_guide, background_task_runner, database_manager, context);
@@ -265,7 +332,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) {
+@@ -430,7 +430,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    }
    MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
    NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -316,7 +383,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 +409,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!";
    }
@@ -353,10 +420,10 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 --- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 +++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
-@@ -9,7 +9,10 @@
+@@ -8,7 +8,10 @@
+ #include "base/metrics/single_sample_metrics.h"
  #include "base/values.h"
  #include "chrome/common/read_anything/read_anything.mojom.h"
- #include "chrome/common/read_anything/read_anything_constants.h"
 +#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
@@ -364,7 +431,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
  #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
  #include "ui/accessibility/ax_node_position.h"
  
-@@ -87,8 +90,10 @@ class ReadAloudAppModel {
+@@ -86,8 +89,10 @@ class ReadAloudAppModel {
                                 bool is_docs,
                                 const std::set<ui::AXNodeID>* current_nodes);
  
@@ -375,7 +442,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
  
    // Increments the processed_granularity_index_, updating ReadAloud's state of
    // the current granularity to refer to the next granularity. The current
-@@ -242,9 +247,11 @@ class ReadAloudAppModel {
+@@ -241,9 +246,11 @@ class ReadAloudAppModel {
    //      still needs to be read.
    bool NoValidTextRemainingInCurrentNode(bool is_pdf, bool is_docs) const;
  
@@ -387,7 +454,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
  
    // Once the phrase segmentation has completed for a given sentence, update the
    // granularity with the phrase boundaries, and calculate phrases for the next
-@@ -306,7 +313,7 @@ class ReadAloudAppModel {
+@@ -305,7 +312,7 @@ class ReadAloudAppModel {
  
    // Whether a phrase calculation for a sentence is currently underway. (We
    // do not initiate a second calculation before the first has completed.)
@@ -399,17 +466,17 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
 --- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
 +++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
-@@ -21,7 +21,9 @@
+@@ -27,7 +27,9 @@
  #include "base/strings/utf_string_conversions.h"
- #include "chrome/common/read_anything/read_anything_constants.h"
+ #include "chrome/common/read_anything/read_anything_util.h"
  #include "chrome/renderer/accessibility/ax_tree_distiller.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
 +#endif
  #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
+ #include "chrome/renderer/accessibility/read_anything/read_anything_app_model.h"
  #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"
- #include "components/language/core/common/locale_util.h"
-@@ -1444,6 +1446,7 @@ void ReadAnythingAppController::OnConnected() {
+@@ -1454,6 +1456,7 @@ void ReadAnythingAppController::OnConnected() {
    render_frame()->GetBrowserInterfaceBroker().GetInterface(
        std::move(page_handler_factory_receiver));
  
@@ -417,7 +484,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() {
+@@ -1462,6 +1465,7 @@ void ReadAnythingAppController::OnConnected() {
    page_handler_->GetDependencyParserModel(
        base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
                       weak_ptr_factory_.GetWeakPtr()));
@@ -425,7 +492,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() {
+@@ -1666,11 +1670,13 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
  }
  
  void ReadAnythingAppController::PreprocessTextForSpeech() {
@@ -439,7 +506,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
  }
  
  void ReadAnythingAppController::MovePositionToNextGranularity() {
-@@ -1843,14 +1849,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
+@@ -1848,14 +1854,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
  
  void ReadAnythingAppController::UpdateDependencyParserModel(
      base::File model_file) {
@@ -471,7 +538,7 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
  class ReadAnythingAppControllerTest;
  class ReadAnythingAppControllerScreen2xDataCollectionModeTest;
  
-@@ -378,7 +380,9 @@ class ReadAnythingAppController
+@@ -275,7 +277,9 @@ class ReadAnythingAppController
    // available.
    void UpdateDependencyParserModel(base::File model_file);
  
@@ -479,8 +546,18 @@ diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_contr
    DependencyParserModel& GetDependencyParserModelForTesting();
 +#endif
  
-   std::unique_ptr<AXTreeDistiller> distiller_;
-   mojo::Remote<read_anything::mojom::UntrustedPageHandlerFactory>
+   // Called when distillation has completed.
+   void OnAXTreeDistilled(const ui::AXTreeID& tree_id,
+@@ -376,7 +380,9 @@ class ReadAnythingAppController
+ 
+   // Helpers for logging UmaHistograms based on times recorded in WebUI.
+   void IncrementMetricCount(const std::string& metric);
++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+   void LogSpeechEventCounts();
++#endif
+ 
+   // 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
@@ -496,7 +573,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -243,13 +243,6 @@ auto RunMirroringService(
+@@ -245,13 +245,6 @@ auto RunMirroringService(
        std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
  }
  
@@ -510,7 +587,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-@@ -466,7 +459,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
+@@ -470,7 +463,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
  #if !BUILDFLAG(IS_ANDROID)
    services.Add(RunProfileImporter);
    services.Add(RunMirroringService);
@@ -521,7 +598,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(
+@@ -258,6 +258,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 +606,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(
+@@ -335,7 +336,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 +615,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(
+@@ -361,7 +362,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
      const CreditCard& card) const {
    if (auto optimization_type =
            GetVcnMerchantOptOutOptimizationTypeForCard(card);
@@ -550,7 +627,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 +637,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 +645,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);
  }
@@ -576,10 +653,30 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  
  // Appends available autocompletion of the given type, subtype, and number to
  // the existing available autocompletions string, encoding according to the
+diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
+--- a/components/omnibox/browser/base_search_provider.cc
++++ b/components/omnibox/browser/base_search_provider.cc
+@@ -99,14 +99,14 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProvider::Type type,
+ bool BaseSearchProvider::ShouldPrefetch(const AutocompleteMatch& match) {
+   // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
+   //   non-debugging purposes.
+-  return match.GetAdditionalInfoForDebugging(kShouldPrefetchKey) == kTrue;
++  return false;
+ }
+ 
+ // static
+ bool BaseSearchProvider::ShouldPrerender(const AutocompleteMatch& match) {
+   // TODO (manukh): `GetAdditionalInfoForDebugging()` shouldn't be used for
+   //   non-debugging purposes.
+-  return match.GetAdditionalInfoForDebugging(kShouldPrerenderKey) == kTrue;
++  return false;
+ }
+ 
+ // static
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -196,6 +196,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -198,6 +198,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
      bool skip_cache,
      HintsFetchedCallback hints_fetched_callback,
      std::optional<proto::RequestContextMetadata> request_context_metadata) {
@@ -590,7 +687,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -391,6 +391,7 @@ void HintsManager::Shutdown() {
+@@ -393,6 +393,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -598,7 +695,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1100,6 +1101,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1102,6 +1103,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
      OnDemandOptimizationGuideDecisionRepeatingCallback callback,
      std::optional<proto::RequestContextMetadata> request_context_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -606,7 +703,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
  
    InsertionOrderedSet<GURL> urls_to_fetch;
    InsertionOrderedSet<std::string> hosts_to_fetch;
-@@ -1403,6 +1405,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1405,6 +1407,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      bool skip_cache,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -631,7 +728,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 +738,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 +803,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 +816,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,13 +836,30 @@ 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,
+@@ -250,6 +250,7 @@ constexpr base::FeatureParam<bool> kMaliciousApkDownloadCheckTelemetryOnly{
  BASE_FEATURE(kOnDeviceNotificationContentDetectionModel,
               "OnDeviceNotificationContentDetectionModel",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+              base::FEATURE_ENABLED_BY_DEFAULT);
 +SET_CROMITE_FEATURE_DISABLED(kOnDeviceNotificationContentDetectionModel);
  
  constexpr base::FeatureParam<int>
@@ -754,10 +868,9 @@ diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predic
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,2 @@
 +SET_CROMITE_FEATURE_DISABLED(kBookmarkTriggerForPrerender2);
 +SET_CROMITE_FEATURE_DISABLED(kNewTabPageTriggerForPrerender2);
-+SET_CROMITE_FEATURE_DISABLED(kSupportSearchSuggestionForPrerender2);
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -778,6 +891,12 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceNotificationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionOnDeviceGeolocationPredictions);
 +SET_CROMITE_FEATURE_DISABLED(kPermissionPredictionsV2);
+diff --git a/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/net/base/features_cc/Disable-all-predictors-code.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kHttpCacheNoVarySearch);
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -794,19 +913,19 @@ new file mode 100644
 diff --git a/services/webnn/features.gni b/services/webnn/features.gni
 --- a/services/webnn/features.gni
 +++ b/services/webnn/features.gni
-@@ -5,7 +5,7 @@
- import("//build/config/features.gni")
+@@ -7,7 +7,7 @@ import("//services/on_device_model/on_device_model.gni")
  
  declare_args() {
--  webnn_use_tflite = is_android || is_chromeos || is_linux || is_win
-+  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_win
+   # TFLite is used as a fallback option on macOS and Windows.
+-  webnn_use_tflite = is_android || is_chromeos || is_linux || is_mac || is_win
++  webnn_use_tflite = false #is_android || is_chromeos || is_linux || is_mac || is_win
  
-   # Enable logging of TFLite profiling information on MLGraph destruction.
-   webnn_enable_tflite_profiler = false
+   # Enable the GPU delegate provided by the Optimization Guide library.
+   webnn_use_chrome_ml_api = enable_ml_internal
 diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
 --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc
 +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
-@@ -1764,6 +1764,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
+@@ -1752,6 +1752,7 @@ ALWAYS_INLINE bool HTMLDocumentParser::ShouldCheckTimeBudget(
  }
  
  bool HTMLDocumentParser::ShouldSkipPreloadScan() {
@@ -817,7 +936,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 +947,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 @@
+@@ -3440,7 +3440,7 @@
        //
        // It also has some feature params defined throughout the codebase.
        name: "Prerender2",

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

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/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 {
+@@ -1597,6 +1597,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);

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

@@ -26,8 +26,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../origin_trials/features.cc                 |   1 +
  .../render_view_context_menu_base.cc          |   3 -
  .../aggregatable_report_sender.cc             |  15 +-
- .../attribution_data_host_manager_impl.cc     |   2 +
- .../attribution_reporting/attribution_host.cc |   1 +
+ .../attribution_data_host_manager_impl.cc     |   8 +-
+ .../attribution_reporting/attribution_host.cc |   3 +-
+ .../attribution_manager_impl.cc               |   4 -
  .../attribution_os_level_manager.cc           |   3 +-
  .../attribution_report_network_sender.cc      |   9 +
  .../attribution_storage_sql.cc                |   8 +-
@@ -37,22 +38,23 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/AttributionOsLevelManager.java    | 349 +-----------------
  .../public/browser/content_browser_client.cc  |   7 +-
  .../public/browser/navigation_controller.cc   |   1 -
- .../Disable-conversion-measurement-api.inc    |   1 +
+ .../Disable-conversion-measurement-api.inc    |   2 +
  .../Disable-conversion-measurement-api.inc    |   8 +
  .../attribution/request_headers_internal.cc   |   1 +
- services/network/network_context.cc           |   2 +
+ services/network/network_context.cc           |  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, 100 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 {
+@@ -150,6 +150,8 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
                  // not great to dynamically remove the preference in this way.
              case SiteSettingsCategory.Type.ADS:
                  return SiteSettingsCategory.adsCategoryEnabled();
@@ -149,7 +151,7 @@ diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.c
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -635,11 +635,6 @@
+@@ -674,11 +674,6 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -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);
@@ -208,7 +210,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -689,7 +689,7 @@ void ContentSettingsRegistry::Init() {
+@@ -690,7 +690,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
             ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
@@ -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(
+@@ -797,11 +797,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();
+@@ -1160,6 +1158,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
+ }
+ 
+@@ -332,6 +330,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
+@@ -552,11 +552,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
@@ -342,7 +382,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
 --- a/content/browser/attribution_reporting/attribution_storage_sql.cc
 +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
-@@ -532,6 +532,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -533,6 +533,8 @@ void AssignSourceForDeactivationOrDeletion(
    }
  }
  
@@ -351,7 +391,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
  }  // namespace
  
  // static
-@@ -554,9 +556,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -555,9 +557,9 @@ bool AttributionStorageSql::Transaction::Commit() {
  AttributionStorageSql::AttributionStorageSql(
      const base::FilePath& user_data_directory,
      AttributionResolverDelegate* delegate)
@@ -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(
+@@ -10254,6 +10254,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(
+@@ -14093,6 +14094,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);
  
@@ -408,10 +448,10 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 -        this, path, special_storage_policy_);
 -  }
 -
-   if (base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
+   if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
      // Auction worklets on non-Android use dedicated processes; on Android due
      // to high cost of process launch they try to reuse renderers.
-@@ -1544,9 +1535,6 @@ void StoragePartitionImpl::Initialize(
+@@ -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) {
@@ -946,21 +986,22 @@ diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-conve
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kAttributionReportingCrossAppWeb);
+@@ -0,0 +1,2 @@
++SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
++SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
 @@ -0,0 +1,8 @@
 +SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
-+SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsDocumentAPI);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopicsParameters);
 +SET_CROMITE_FEATURE_DISABLED(kFledge);
 +SET_CROMITE_FEATURE_DISABLED(kFledgeBiddingAndAuctionServer);
-+SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 +SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
++SET_CROMITE_FEATURE_DISABLED(kAllowURNsInIframes);
++SET_CROMITE_FEATURE_DISABLED(kFledgeSampleDebugReports);
 diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc
 --- a/services/network/attribution/request_headers_internal.cc
 +++ b/services/network/attribution/request_headers_internal.cc
@@ -975,19 +1016,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));
+@@ -2683,26 +2683,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 +1062,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(
+@@ -1623,7 +1623,7 @@ void Page::UpdateBrowsingContextGroup(
  
  void Page::SetAttributionSupport(
      network::mojom::AttributionSupport attribution_support) {
@@ -1025,34 +1089,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 @@
+@@ -458,8 +458,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 @@
+@@ -3482,8 +3482,8 @@
        base_feature: "none",
      },
      {
@@ -1063,18 +1122,21 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -4314,15 +4314,15 @@
+@@ -4450,16 +4450,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 +1146,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) {

build/patches/Disable-crash-reporting.patch

@@ -12,7 +12,7 @@ Subject: Disable crash reporting
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2710,15 +2710,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2716,15 +2716,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(
+@@ -15707,6 +15707,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(
+@@ -9924,7 +9924,7 @@ void WebContentsImpl::RendererUnresponsive(
    base::UmaHistogramEnumeration(
        "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
  
@@ -54,7 +54,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 --- a/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
 +++ b/third_party/blink/renderer/controller/javascript_call_stack_collector.cc
-@@ -84,7 +84,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
+@@ -130,7 +130,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
      return;
    }
    ExecutionContext* execution_context = ToExecutionContext(script_state);

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

@@ -39,7 +39,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
 --- a/android_webview/browser/aw_browser_context.cc
 +++ b/android_webview/browser/aw_browser_context.cc
-@@ -540,6 +540,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -489,6 +489,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
  
  content::OriginTrialsControllerDelegate*
  AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -136,7 +136,7 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s
 diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 --- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 +++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-@@ -60,6 +60,8 @@ void CreateFallbackSamplingTrial(
+@@ -66,6 +66,8 @@ void CreateFallbackSamplingTrial(
      const int reporting_full_rate_per_mille,
      const bool starts_active,
      base::FeatureList* feature_list) {
@@ -145,7 +145,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
    scoped_refptr<base::FieldTrial> trial(
        base::FieldTrialList::FactoryGetFieldTrial(
            trial_name, /*total_probability=*/1000, "Default", entropy_provider));
-@@ -111,6 +113,8 @@ void CreateFallbackUkmSamplingTrial(
+@@ -118,6 +120,8 @@ void CreateFallbackUkmSamplingTrial(
      const base::FieldTrial::EntropyProvider& entropy_provider,
      bool is_stable_channel,
      base::FeatureList* feature_list) {
@@ -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(
+@@ -847,7 +847,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
  
  void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
      network::mojom::NetworkContextParams* network_context_params) {
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/origin_trials/origin_trials_factory.cc b/chrome/brow
 diff --git a/components/ukm/ukm_recorder_impl.cc b/components/ukm/ukm_recorder_impl.cc
 --- a/components/ukm/ukm_recorder_impl.cc
 +++ b/components/ukm/ukm_recorder_impl.cc
-@@ -189,6 +189,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
+@@ -192,6 +192,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
  
  UkmRecorderImpl::UkmRecorderImpl()
      : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -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() {
+@@ -132,6 +132,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);
+@@ -339,9 +340,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,
+@@ -653,6 +651,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(
+@@ -765,6 +764,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.
@@ -362,7 +362,7 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
  
    ClientHintsControllerDelegate* client_hint_delegate =
        browser_context->GetClientHintsControllerDelegate();
-@@ -141,11 +139,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
+@@ -143,11 +141,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
    std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles =
        GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive(
            request, browser_context, wc_getter, frame_tree_node_id);
@@ -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(
+@@ -832,6 +832,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
@@ -450,7 +450,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
 diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
 --- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h
 +++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
-@@ -553,7 +553,6 @@ class PLATFORM_EXPORT ResourceRequestHead {
+@@ -556,7 +556,6 @@ class PLATFORM_EXPORT ResourceRequestHead {
    }
    void SetTrustTokenParams(
        std::optional<network::mojom::blink::TrustTokenParams> params) {

build/patches/Disable-idle-detection.patch

@@ -6,7 +6,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../common/content_features_cc/Disable-idle-detection.inc    | 4 ++++
  .../common/content_features_h/Disable-idle-detection.inc     | 1 +
- .../permissions_policy/permissions_policy_features.json5     | 1 +
+ .../cpp/permissions_policy/permissions_policy_features.json5 | 1 +
  third_party/blink/renderer/modules/idle/idle_detector.idl    | 3 ++-
  .../blink/renderer/platform/runtime_enabled_features.json5   | 5 +++++
  5 files changed, 13 insertions(+), 1 deletion(-)
@@ -28,10 +28,10 @@ new file mode 100644
 +++ b/cromite_flags/content/public/common/content_features_h/Disable-idle-detection.inc
 @@ -0,0 +1 @@
 +CONTENT_EXPORT BASE_DECLARE_FEATURE(kIdleDetection);
-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 @@
+diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
+--- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
++++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
+@@ -359,6 +359,7 @@
      {
        name: "IdleDetection",
        permissions_policy_name: "idle-detection",

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

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -111,6 +111,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -107,6 +107,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
  }
  
  bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
  #if !BUILDFLAG(IS_ANDROID)
    if (!base::FeatureList::IsEnabled(kMediaRouter)) {
      return false;
-@@ -157,7 +158,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -153,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
    registry->RegisterBooleanPref(
        media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
        true);
-@@ -219,4 +220,7 @@ bool IsCastMessageLoggingEnabled() {
+@@ -215,4 +216,7 @@ bool IsCastMessageLoggingEnabled() {
  }
  #endif  // !BUILDFLAG(IS_ANDROID)
  
@@ -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(
+@@ -549,6 +549,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 @@
+@@ -3602,14 +3602,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",
 --

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoint_fetcher/endpoint_fetcher.cc
 --- a/components/endpoint_fetcher/endpoint_fetcher.cc
 +++ b/components/endpoint_fetcher/endpoint_fetcher.cc
-@@ -388,7 +388,7 @@ void EndpointFetcher::OnResponseFetched(
+@@ -442,7 +442,7 @@ void EndpointFetcher::OnResponseFetched(
      }
    } else {
      std::string net_error = net::ErrorToString(net_error_code);
@@ -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) {

build/patches/Disable-omission-of-URL-elements.patch

@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
 +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
-@@ -269,9 +269,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
+@@ -270,9 +270,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
              ShareSheetLinkToggleCoordinator shareSheetLinkToggleCoordinator) {
          // Default preview is to show title + url.
          String title = mParams.getTitle();
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
 diff --git a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
 --- a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
 +++ b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
-@@ -235,8 +235,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
+@@ -236,8 +236,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
      /** Sets the ephemeral tab URL. */
      public void updateURL(GURL url) {
          TextView originView = mToolbarView.findViewById(R.id.origin);
@@ -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) {
+@@ -603,38 +603,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() {

build/patches/Disable-plugins-enumeration.patch

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -2287,9 +2287,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
+@@ -2288,9 +2288,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
  }
  
  PluginData* LocalFrame::GetPluginData() const {

build/patches/Disable-prefers-reduced-transparency-media-query.patch

@@ -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 @@
+@@ -3434,6 +3434,10 @@
        name: "PrefersReducedData",
        status: "experimental",
      },

build/patches/Disable-privacy-issues-in-password-manager.patch

@@ -7,23 +7,23 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/android/java/AndroidManifest.xml                  | 9 ---------
  .../password_store_android_backend_bridge_helper_impl.cc | 1 +
- .../android/password_store_android_local_backend.cc      | 2 +-
  .../generated_password_leak_detection_pref.cc            | 3 +--
  .../password_receiver_service_factory.cc                 | 2 +-
  .../password_manager/password_sender_service_factory.cc  | 2 +-
  .../affiliations/core/browser/affiliation_backend.cc     | 1 +
  .../core/browser/affiliation_service_impl.cc             | 4 ++++
  components/affiliations/core/browser/facet_manager.cc    | 4 ++++
+ .../affiliation/password_affiliation_source_adapter.cc   | 4 ++++
  .../leak_detection/leak_detection_check_factory_impl.cc  | 5 +++++
  .../browser/leak_detection/leak_detection_check_impl.cc  | 3 +--
  .../Disable-privacy-issues-in-password-manager.inc       | 1 +
- 12 files changed, 21 insertions(+), 16 deletions(-)
+ 12 files changed, 24 insertions(+), 15 deletions(-)
  create mode 100644 cromite_flags/components/password_manager/core/browser/features/password_features_cc/Disable-privacy-issues-in-password-manager.inc
 
 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>
  
@@ -50,18 +50,6 @@ diff --git a/chrome/browser/password_manager/android/password_store_android_back
    base::android::BuildInfo* info = base::android::BuildInfo::GetInstance();
    int current_gms_core_version;
    if (!base::StringToInt(info->gms_version_code(), &current_gms_core_version)) {
-diff --git a/chrome/browser/password_manager/android/password_store_android_local_backend.cc b/chrome/browser/password_manager/android/password_store_android_local_backend.cc
---- a/chrome/browser/password_manager/android/password_store_android_local_backend.cc
-+++ b/chrome/browser/password_manager/android/password_store_android_local_backend.cc
-@@ -37,7 +37,7 @@ PasswordStoreAndroidLocalBackend::PasswordStoreAndroidLocalBackend(
-   // AccountBackend doesn't call `DisableSource` when sync is turned off.
-   // This is why we have to explicitly call it here whenever local GMSCore is
-   // created.
--  password_affiliation_adapter.DisableSource();
-+  if ((true)) password_affiliation_adapter.DisableSource();
- }
- 
- PasswordStoreAndroidLocalBackend::~PasswordStoreAndroidLocalBackend() = default;
 diff --git a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
 --- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
 +++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
@@ -102,7 +90,7 @@ diff --git a/chrome/browser/password_manager/password_sender_service_factory.cc
 diff --git a/components/affiliations/core/browser/affiliation_backend.cc b/components/affiliations/core/browser/affiliation_backend.cc
 --- a/components/affiliations/core/browser/affiliation_backend.cc
 +++ b/components/affiliations/core/browser/affiliation_backend.cc
-@@ -401,6 +401,7 @@ void AffiliationBackend::OnMalformedResponse(
+@@ -400,6 +400,7 @@ void AffiliationBackend::OnMalformedResponse(
  }
  
  bool AffiliationBackend::OnCanSendNetworkRequest() {
@@ -113,17 +101,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
@@ -138,6 +126,20 @@ diff --git a/components/affiliations/core/browser/facet_manager.cc b/components/
    if (IsCachedDataFresh()) {
      AffiliatedFacetsWithUpdateTime affiliation;
      if (!backend_->ReadAffiliationsAndBrandingFromDatabase(facet_uri_,
+diff --git a/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc b/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc
+--- a/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc
++++ b/components/password_manager/core/browser/affiliation/password_affiliation_source_adapter.cc
+@@ -27,6 +27,10 @@ PasswordAffiliationSourceAdapter::~PasswordAffiliationSourceAdapter() = default;
+ 
+ void PasswordAffiliationSourceAdapter::GetFacets(
+     AffiliationSource::ResultCallback response_callback) {
++  if (((true))) {
++    std::move(response_callback).Run({});
++    return;
++  }
+   on_password_forms_received_callback_ = std::move(response_callback);
+   store_->GetAllLogins(weak_ptr_factory_.GetWeakPtr());
+ }
 diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc
 --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc
 +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl.cc

build/patches/Disable-privacy-sandbox.patch

@@ -27,17 +27,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../shared_storage_document_service_impl.cc   |  9 +++++++++
  .../features_cc/Disable-privacy-sandbox.inc   |  1 +
  .../Disable-privacy-sandbox.inc               |  1 +
- .../features_cc/Disable-privacy-sandbox.inc   |  2 ++
+ .../features_cc/Disable-privacy-sandbox.inc   |  1 +
+ .../features_cc/Disable-privacy-sandbox.inc   |  1 +
  third_party/blink/common/features.cc          |  1 +
- 19 files changed, 48 insertions(+), 28 deletions(-)
+ 20 files changed, 48 insertions(+), 28 deletions(-)
  create mode 100644 cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-privacy-sandbox.inc
+ create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
 
 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(
+@@ -3498,6 +3498,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -82,7 +84,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(
+@@ -1200,7 +1200,7 @@ void RegisterProfilePrefsForMigration(
    registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());
  
    // Deprecated 03/2024.
@@ -94,7 +96,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() {
+@@ -1276,7 +1276,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
  void PrivacySandboxServiceImpl::SetRelatedWebsiteSetsDataAccessEnabled(
      bool enabled) {
    pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
@@ -127,7 +129,7 @@ diff --git a/chrome/browser/ui/privacy_sandbox/privacy_sandbox_prompt.cc b/chrom
 diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
 --- a/components/history/core/browser/history_backend.cc
 +++ b/components/history/core/browser/history_backend.cc
-@@ -700,18 +700,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
+@@ -701,18 +701,7 @@ void HistoryBackend::SetBrowsingTopicsAllowed(ContextID context_id,
    if (!visit_id)
      return;
  
@@ -162,7 +164,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,
+@@ -294,4 +294,8 @@ BASE_FEATURE(kPrivacySandboxAllowPromptForBlocked3PCookies,
  BASE_FEATURE(kPrivacySandboxEqualizedPromptButtons,
               "PrivacySandboxEqualizedPromptButtons",
               base::FEATURE_DISABLED_BY_DEFAULT);
@@ -242,7 +244,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 +256,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 +264,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 +302,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(
+@@ -129,6 +129,15 @@ void SharedStorageDocumentServiceImpl::CreateWorklet(
        render_frame_host().GetLastCommittedOrigin().IsSameOriginWith(
            data_origin);
  
@@ -328,17 +330,22 @@ new file mode 100644
 +++ b/cromite_flags/content/public/common/content_features_cc/Disable-privacy-sandbox.inc
 @@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIsOverride);
+diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc
+@@ -0,0 +1 @@
++SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPI);
 diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-privacy-sandbox.inc
-@@ -0,0 +1,2 @@
+@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kFencedFrames);
-+SET_CROMITE_FEATURE_DISABLED(kSharedStorageAPI);
 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,
+@@ -2688,6 +2688,7 @@ BASE_FEATURE(kWebviewAccelerateSmallCanvases,
  // constants for features in the section above.
  
  bool IsAllowURNsInIframeEnabled() {

build/patches/Disable-references-to-fonts.googleapis.com.patch

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
 --- a/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
 +++ b/chrome/browser/resources/side_panel/read_anything/read_anything_toolbar.ts
-@@ -371,9 +371,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase {
+@@ -369,9 +369,7 @@ export class ReadAnythingToolbarElement extends ReadAnythingToolbarElementBase {
      const link = document.createElement('link');
      link.rel = 'preload';
      link.as = 'style';
@@ -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',
 --

build/patches/Disable-safety-check.patch

@@ -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",
+@@ -1086,8 +1085,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",
+@@ -1360,8 +1357,6 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/browser/quick_delete:javatests",
+       "//chrome/browser/renderer_host/android: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 = [
+@@ -913,7 +913,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,9 +135,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-                                     .removePreference(findPreference(PREF_TOOLBAR_SHORTCUT));
-                         });
+@@ -316,7 +316,7 @@ public class MainSettings extends ChromeBaseSettingsFragment
+             removePreferenceIfPresent(PREF_UI_THEME);
+         }
  
 -        if (BuildInfo.getInstance().isAutomotive) {
 +        if (((true)) || BuildInfo.getInstance().isAutomotive) {
@@ -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,9 +184,9 @@ 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") {
-       "//chrome/browser/reading_list/android",
+@@ -3309,7 +3309,6 @@ static_library("browser") {
        "//chrome/browser/recent_tabs:jni_headers",
+       "//chrome/browser/regional_capabilities",
        "//chrome/browser/safe_browsing/android:safe_browsing_enums",
 -      "//chrome/browser/safety_check/android",
        "//chrome/browser/safety_hub/android",
@@ -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) {
+@@ -559,7 +559,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    tpcd::trial::ValidityService::MaybeCreateForWebContents(web_contents);
    TrustedVaultEncryptionKeysTabHelper::CreateForWebContents(web_contents);
  #if BUILDFLAG(IS_ANDROID)
@@ -220,15 +220,15 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettings.java
-@@ -87,7 +87,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
+@@ -96,7 +96,7 @@ public class SiteSettings extends BaseSiteSettingsFragment
          }
  
          // Remove the permission autorevocation preference if Safety Hub is not enabled.
 -        if (!getSiteSettingsDelegate().isSafetyHubEnabled()) {
 +        if (((false)) && !getSiteSettingsDelegate().isSafetyHubEnabled()) {
-             getPreferenceScreen().removePreference(findPreference(PERMISSION_AUTOREVOCATION_PREF));
-             getPreferenceScreen().removePreference(findPreference(DIVIDER_PREF));
-         }
+             Preference autorevocationPref =
+                     assumeNonNull(findPreference(PERMISSION_AUTOREVOCATION_PREF));
+             getPreferenceScreen().removePreference(autorevocationPref);
 diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-safety-check.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-safety-check.inc
 new file mode 100644
 --- /dev/null

build/patches/Disable-smart-selection-by-default.patch

@@ -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,
@@ -55,7 +55,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
-@@ -500,6 +500,7 @@ public abstract class ChromeFeatureList {
+@@ -511,6 +511,7 @@ public abstract class ChromeFeatureList {
      public static final String SHOW_NEW_TAB_ANIMATIONS = "ShowNewTabAnimations";
      public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid";
      public static final String SEED_ACCOUNTS_REVAMP = "SeedAccountsRevamp";

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

@@ -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(
+@@ -1565,7 +1565,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
        site_isolation::prefs::kWebTriggeredIsolatedOrigins);
    registry->RegisterDictionaryPref(
        prefs::kDevToolsBackgroundServicesExpirationDict);

build/patches/Disable-speechSynthesis-getVoices-API.patch

@@ -11,18 +11,18 @@ Require: Timezone-customization.patch
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../renderer/chrome_content_renderer_client.cc  |  2 +-
- .../renderer/content_settings_agent_impl.cc     |  9 ++++++++-
- .../renderer/content_settings_agent_impl.h      |  2 ++
- content/browser/speech/tts_android.cc           |  2 +-
- content/browser/speech/tts_win.cc               |  2 +-
- .../Disable-speechSynthesis-getVoices-API.inc   |  8 ++++++++
- .../Disable-speechSynthesis-getVoices-API.inc   |  2 ++
- .../Disable-speechSynthesis-getVoices-API.inc   |  3 +++
- .../Disable-speechSynthesis-getVoices-API.inc   |  1 +
- .../platform/web_content_settings_client.h      |  2 ++
- .../renderer/modules/speech/speech_synthesis.cc | 17 ++++++++++++++---
- 11 files changed, 43 insertions(+), 7 deletions(-)
+ .../renderer/chrome_content_renderer_client.cc |  2 +-
+ .../renderer/content_settings_agent_impl.cc    |  9 ++++++++-
+ .../renderer/content_settings_agent_impl.h     |  2 ++
+ content/browser/speech/tts_android.cc          |  2 +-
+ content/browser/speech/tts_win.cc              |  2 +-
+ .../Disable-speechSynthesis-getVoices-API.inc  |  8 ++++++++
+ .../Disable-speechSynthesis-getVoices-API.inc  |  2 ++
+ .../Disable-speechSynthesis-getVoices-API.inc  |  3 +++
+ .../Disable-speechSynthesis-getVoices-API.inc  |  1 +
+ .../platform/web_content_settings_client.h     |  2 ++
+ .../modules/speech/speech_synthesis.cc         | 18 +++++++++++++++---
+ 11 files changed, 44 insertions(+), 7 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-speechSynthesis-getVoices-API.inc
  create mode 100644 cromite_flags/media/base/media_switches_cc/Disable-speechSynthesis-getVoices-API.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-speechSynthesis-getVoices-API.inc
@@ -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) {
@@ -151,7 +151,15 @@ diff --git a/third_party/blink/public/platform/web_content_settings_client.h b/t
 diff --git a/third_party/blink/renderer/modules/speech/speech_synthesis.cc b/third_party/blink/renderer/modules/speech/speech_synthesis.cc
 --- a/third_party/blink/renderer/modules/speech/speech_synthesis.cc
 +++ b/third_party/blink/renderer/modules/speech/speech_synthesis.cc
-@@ -35,6 +35,7 @@
+@@ -28,6 +28,7 @@
+ #include <tuple>
+ 
+ #include "build/build_config.h"
++#include "third_party/blink/public/common/features.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiable_token.h"
+@@ -35,6 +36,7 @@
  #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h"
  #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
  #include "third_party/blink/public/platform/platform.h"
@@ -159,7 +167,7 @@ diff --git a/third_party/blink/renderer/modules/speech/speech_synthesis.cc b/thi
  #include "third_party/blink/renderer/bindings/modules/v8/v8_speech_synthesis_error_event_init.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_speech_synthesis_event_init.h"
  #include "third_party/blink/renderer/core/dom/document.h"
-@@ -93,9 +94,19 @@ SpeechSynthesis::SpeechSynthesis(LocalDOMWindow& window)
+@@ -93,9 +95,19 @@ SpeechSynthesis::SpeechSynthesis(LocalDOMWindow& window)
  void SpeechSynthesis::OnSetVoiceList(
      Vector<mojom::blink::SpeechSynthesisVoicePtr> mojom_voices) {
    voice_list_.clear();

build/patches/Disable-text-fragments-by-default.patch

@@ -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) {
+@@ -4579,9 +4579,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 @@
+@@ -4410,10 +4410,9 @@
      },
      {
        name: "TextFragmentIdentifiers",

build/patches/Disable-third-party-origin-trials.patch

@@ -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() {
+@@ -9381,7 +9381,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) {
+@@ -3281,10 +3271,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,12 +268,12 @@ 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) {
 +  if ((true)) return false;
    if (trial_name == "FledgeBiddingAndAuctionServer") {
-     return base::FeatureList::IsEnabled(features::kInterestGroupStorage) &&
-            base::FeatureList::IsEnabled(
+     return base::FeatureList::IsEnabled(
+                network::features::kInterestGroupStorage) &&
 --

build/patches/Disable-various-metrics.patch

@@ -92,8 +92,8 @@ 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) {
- #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -1130,7 +1130,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+ #endif  // BUILDFLAG(IS_CHROMEOS)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
 -                                GoogleUpdateSettings::GetCollectStatsConsent());
@@ -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(
+@@ -5238,16 +5237,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(
+@@ -5380,10 +5369,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()) {