[TOOLS] Update runner to 2.328.0

[AUTO] Patches auto-rebase for master branch

.github/workflows/check_nist.yaml

@@ -1,9 +1,6 @@
 name: 'Check NIST database'
 
 on:
-  schedule:
-    - cron: '30 1 * * *'
-
   workflow_dispatch:
 
 permissions:

README.md

@@ -14,7 +14,7 @@
 
 Cromite is a [Chromium](https://www.chromium.org/Home) fork based on [Bromite](https://github.com/bromite/bromite) with built-in support for ad blocking and an eye for privacy.
 
-Cromite is available for Android arm64-v8a, arm32-v7a and x86_64, Oreo and above (Minimum v8.0, API level 26), Windows and Linux 64bit.
+Cromite is available for Android arm64-v8a, arm32-v7a and x86_64, Android 10 and above, Windows and Linux 64bit.
 
 # Goals
 
@@ -106,7 +106,7 @@ ChromiumUpdateUrl=https://github.com/uazo/cromite/releases/latest/download/updat
 # Command line for Chromium (string):
 # note --user-data-dir= works better if path is absolute
 # See here: http://peter.sh/experiments/chromium-command-line-switches/
-ChromiumCommandLine=--user-data-dir="C:\Users\<my user>\AppData\Local\Cromite\User Data" --no-default-browser-check
+ChromiumCommandLine=--user-data-dir="%LOCALAPPDATA%\Cromite\User Data" --no-default-browser-check
 
 # to enable full logging in c:\temp\log.txt (daily rotate, no automatic deletion)
 # ChromiumCommandLine=--enable-logging --v=0 --log-file=C:\temp\log.txt --user-data-dir=".\User Data" --no-default-browser-check
@@ -188,10 +188,11 @@ thanks to [austinhuang0131](https://github.com/austinhuang0131) for the svg icon
 If you want, you can donate to support cromite development through [paypal](https://www.paypal.com/pools/c/9e5lO2OIzb).
 
 Current link:
-- https://www.paypal.com/pools/c/9e5lO2OIzb
+- https://www.paypal.com/pools/c/9hEHZ6tElk
 
 Historical fundraisings links:
 - https://www.paypal.com/pools/c/9cwNgAQhRL
+- https://www.paypal.com/pools/c/9e5lO2OIzb
 
 # License
 

build/RELEASE

@@ -1 +1 @@
-138.0.7204.184
+140.0.7339.186

build/cromite.gn_args

@@ -4,7 +4,6 @@ build_contextual_search=false
 build_with_tflite_lib=false
 chrome_pgo_phase=0
 dcheck_always_on=false
-disable_android_lint=true
 disable_fieldtrial_testing_config=true
 enable_hangout_services_extension=false
 enable_iterator_debugging=false
@@ -68,17 +67,10 @@ if (target_os == "android" || target_os == "win") {
 enable_platform_dts_audio = false
 enable_passthrough_audio_codecs = false
 
-# Do not compile libmonochrome.so with RELR relocations
-# since supported only on API 28+
-use_relr_relocations=false
-
 # disabled the use of the context snapshot
 # see https://github.com/uazo/cromite/pull/317 for context
 use_v8_context_snapshot = false
 
-# enable libjxl support by default
-enable_jxl_decoder = false
-
 # disable minikin engine
 # see https://github.com/uazo/cromite/issues/697
 use_minikin_hyphenation = false
@@ -87,9 +79,6 @@ use_minikin_hyphenation = false
 # initial commit: https://source.chromium.org/chromium/chromium/src/+/fd9a841f7a63b9f5510f6b713d9c833d259c63ad
 enable_bound_session_credentials = false
 
-# Use LogErrorNotReached() for NOTREACHED_IN_MIGRATION() 
-enable_log_error_not_reached = true
-
 # Allows building without //third_party/unrar included, for license reasons
 safe_browsing_use_unrar = false
 
@@ -127,6 +116,8 @@ if (target_os == "android") {
   }
 
   cromite_pref_hash_seed_bin = getenv("CROMITE_PREF_HASH_SEED_BIN")
+  
+  disable_android_lint = true
 
   _is_debug_build = getenv("TARGET_ISDEBUG")
   if (_is_debug_build == "true") {
@@ -144,7 +135,10 @@ if (target_os == "android") {
     # Turns off all V8 debug features. Disables running V8 in a pseudo debug mode
     # bypass build error -5 in clang_x64/mksnapshot
     v8_enable_debugging_features = false
+    v8_dcheck_always_on = false
   } else {
+    include_both_v8_snapshots = false
+    include_both_v8_snapshots_android_secondary_abi = false
     generate_linker_map = true
   }
 

build/cromite_patches_list.txt

@@ -6,7 +6,7 @@ Force-use-vpython3-for-some-scripts.patch
 Permit-PGO-for-debug-builds.patch
 Fix-chromium-vanilla.patch
 Final-patch-for-chromium-vanilla.patch
-
+Restore-chrome-password-store.patch
 Remove-EV-certificates.patch
 do-not-hide-.orig-files.patch
 do-not-add-suffix-to-package-name.patch
@@ -93,11 +93,9 @@ Disable-feeds-support-by-default.patch
 Disable-DRM-media-origin-IDs-preprovisioning.patch
 Disable-smart-selection-by-default.patch
 Guard-for-user-agent-reduction.patch
-AImageReader-CFI-crash-mitigations.patch
 Add-menu-item-to-view-source.patch
 Revert-removal-of-execution-context-address-space.patch
 Block-gateway-attacks-via-websockets.patch
-Enable-prefetch-privacy-changes-by-default.patch
 Enable-darken-websites-checkbox-in-themes.patch
 Remove-blocklisted-URLs-upon-bookmark-creation.patch
 Disable-the-DIAL-repeating-discovery.patch
@@ -245,8 +243,6 @@ Partition-MediaDeviceId-by-default.patch
 Keep-disabled-FetchLaterAPI.patch
 Disable-ranker-url-fetcher.patch
 Disable-prefers-reduced-transparency-media-query.patch
-libjxl-0-8-2.patch
-Add-support-to-jxl.patch
 Block-Intents-While-Locked.patch
 Keep-Manta-Service-Disabled.patch
 Disable-Service-and-Shared-workers-on-3P-iframe.patch
@@ -277,7 +273,6 @@ Enable-Global-Privacy-Control.patch
 Enable-Do-Not-Track-by-default.patch
 Media-fingerprinting-mitigations.patch
 Use-BoringSSL-for-RandBytes.patch
-Restore-chrome-password-store.patch
 Disable-support-for-pointer-device-id.patch
 Disable-CSS-blink-feature-support.patch
 Close-Sessions-On-Ip-Change.patch
@@ -298,12 +293,17 @@ Enable-component-updater.patch
 Android-fonts-fingerprinting-mitigation.patch
 Disable-Android-Tab-Declutter.patch
 Disable-CSSDynamicRangeLimit.patch
-Android-Import-Passwords.patch
 Disable-prefers-reduced-motion.patch
 Disable-css-preferred-text-scale.patch
 Disable-Viewport-Segments.patch
 Keep-disabled-cache-sharing-for-pervasive-scripts.patch
 High-Resolution-Timing-Mitigation.patch
+Enable-snackbar-swipe.patch
+Add-cromite-test-support.patch
+Android-Pixel-Perfect-Mode.patch
+Set-caret-blink-interval-to-default.patch
+Set-the-screen-frame-rate-to-60-Hz.patch
+Disable-Device-Attributes-API.patch
 Temp-disable-UseContextSnapshot.patch
 
 # temporary or wip patches

build/patches/AImageReader-CFI-crash-mitigations.patch

@@ -1,249 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Tue, 5 May 2020 07:22:20 +0200
-Subject: AImageReader CFI crash mitigations
-
-Revert "gpu/android: Remove setup for disabling AImageReader."
-This reverts commit dcd5a39518246eb999f1cc63bf1ec95d93fd5b2f.
-
-Revert "Remove flags to enable/disable AImageReader."
-This reverts commit 463fa0f2e3b9e418bc26e2c8954463f0b0f76634.
-
-Restore GPU bug blacklist for AImageReader on ARM and Qualcomm CPUs
-
-Restore the AImageReader blacklist for ARM/Qualcomm chipsets which causes
-crashes on Android 9 and 10 (at different code locations).
-
-See discussions at:
-* https://github.com/bromite/bromite/issues/445
-* https://github.com/bromite/bromite/issues/814
-* https://github.com/bromite/bromite/issues/1005
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- base/android/android_image_reader_compat.cc      | 16 ++++++++++++++++
- base/android/android_image_reader_compat.h       | 14 ++++++++++++++
- chrome/browser/flag-metadata.json                |  4 ++++
- .../AImageReader-CFI-crash-mitigations.inc       |  4 ++++
- .../AImageReader-CFI-crash-mitigations.inc       |  1 +
- gpu/config/gpu_driver_bug_list.json              | 16 ++++++++++++++++
- gpu/config/gpu_finch_features.cc                 |  5 +++++
- gpu/config/gpu_finch_features.h                  |  1 +
- gpu/config/gpu_util.cc                           |  8 ++++++++
- gpu/config/gpu_workaround_list.txt               |  1 +
- gpu/ipc/service/gpu_init.cc                      |  8 ++++++++
- media/gpu/android/video_frame_factory_impl.cc    |  4 +++-
- 12 files changed, 81 insertions(+), 1 deletion(-)
- create mode 100644 cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
- create mode 100644 cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-
-diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc
---- a/base/android/android_image_reader_compat.cc
-+++ b/base/android/android_image_reader_compat.cc
-@@ -7,7 +7,23 @@
- namespace base {
- namespace android {
- 
-+AndroidImageReader& AndroidImageReader::GetInstance() {
-+  // C++11 static local variable initialization is
-+  // thread-safe.
-+  static AndroidImageReader instance;
-+  return instance;
-+}
-+
-+void AndroidImageReader::DisableSupport() {
-+  disable_support_ = true;
-+}
-+
-+bool AndroidImageReader::IsSupported() {
-+  return !disable_support_;
-+}
-+
- bool EnableAndroidImageReader() {
-+  if (!AndroidImageReader::GetInstance().IsSupported()) return false;
-   // Currently we want to enable AImageReader only for android P+ devices.
-   if (__builtin_available(android 28, *)) {
-     return true;
-diff --git a/base/android/android_image_reader_compat.h b/base/android/android_image_reader_compat.h
---- a/base/android/android_image_reader_compat.h
-+++ b/base/android/android_image_reader_compat.h
-@@ -10,6 +10,20 @@
- namespace base {
- namespace android {
- 
-+class BASE_EXPORT AndroidImageReader {
-+ public:
-+  // Thread safe GetInstance.
-+  static AndroidImageReader& GetInstance();
-+
-+  bool IsSupported();
-+
-+  // Disable image reader support.
-+  void DisableSupport();
-+
-+ private:
-+  bool disable_support_ = false;
-+};
-+
- // Check if the image reader usage is supported.
- BASE_EXPORT bool EnableAndroidImageReader();
- 
-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
-@@ -3514,6 +3514,10 @@
-       "chrome-signin-team@google.com"
-     ],
-     "expiry_milestone": 138
-+  },{
-+    "name": "enable-image-reader",          // Bromite: do not expire
-+    "owners": [ "vikassoni@chromium.org", "liberato@chromium.org" ],  // flag
-+    "expiry_milestone": -1
-   },
-   {
-     "name": "enable-immersive-fullscreen-toolbar",
-diff --git a/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
-new file mode 100644
---- /dev/null
-+++ b/cromite_flags/media/base/media_switches_cc/AImageReader-CFI-crash-mitigations.inc
-@@ -0,0 +1,4 @@
-+// Enables the Android Image Reader path for Video decoding(for AVDA and MCVD)
-+CROMITE_FEATURE(kAImageReaderVideoOutput,
-+                "AImageReaderVideoOutput",
-+                base::FEATURE_ENABLED_BY_DEFAULT);
-diff --git a/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-new file mode 100644
---- /dev/null
-+++ b/cromite_flags/media/base/media_switches_h/AImageReader-CFI-crash-mitigations.inc
-@@ -0,0 +1 @@
-+MEDIA_EXPORT BASE_DECLARE_FEATURE(kAImageReaderVideoOutput);
-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
-@@ -2613,6 +2613,22 @@
-         "no_downscaled_overlay_promotion"
-       ]
-     },
-+    {
-+      "id":335,
-+      "cr_bugs": [1051705],
-+      "description": "Disable AImageReader on ARM GPUs",
-+      "os": {
-+        "type": "android",
-+        "version": {
-+          "op": "<",
-+          "value": "10"
-+        }
-+      },
-+      "gl_vendor": "ARM.*|Qualcomm.*",
-+      "features": [
-+        "disable_aimagereader"
-+      ]
-+    },
-     {
-       "id": 381,
-       "cr_bugs": [
-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
-@@ -58,6 +58,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
- #if BUILDFLAG(IS_ANDROID)
-+// Use android AImageReader when playing videos with MediaPlayer.
-+CROMITE_FEATURE(kAImageReaderMediaPlayer,
-+                "AImageReaderMediaPlayer",
-+                base::FEATURE_ENABLED_BY_DEFAULT);
-+
- // Use android SurfaceControl API for managing display compositor's buffer queue
- // and using overlays on Android. Also used by webview to disable surface
- // SurfaceControl.
-diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
---- a/gpu/config/gpu_finch_features.h
-+++ b/gpu/config/gpu_finch_features.h
-@@ -26,6 +26,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
- GPU_EXPORT BASE_DECLARE_FEATURE(kAggressiveShaderCacheLimits);
- 
- #if BUILDFLAG(IS_ANDROID)
-+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);
- GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);
- GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);
-diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
---- a/gpu/config/gpu_util.cc
-+++ b/gpu/config/gpu_util.cc
-@@ -127,6 +127,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
- #if !BUILDFLAG(IS_ANDROID)
-   return kGpuFeatureStatusDisabled;
- #else
-+  if (blocklisted_features.count(GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL))
-+    return kGpuFeatureStatusBlocklisted;
-+
-   if (!gpu_preferences.enable_android_surface_control)
-     return kGpuFeatureStatusDisabled;
- 
-@@ -348,6 +351,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
-           kGpuFeatureStatusSoftware;
-     }
-   }
-+
-+  if (gpu_feature_info->IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
-+    gpu_feature_info->status_values[GPU_FEATURE_TYPE_ANDROID_SURFACE_CONTROL] =
-+        kGpuFeatureStatusBlocklisted;
-+  }
- }
- 
- // Estimates roughly user total disk space by counting in the drives where
-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
-@@ -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
-+disable_aimagereader
- disable_accelerated_av1_encode
- disable_accelerated_h264_decode
- disable_accelerated_h264_encode
-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
-@@ -70,6 +70,7 @@
- 
- #if BUILDFLAG(IS_ANDROID)
- #include "ui/gfx/android/android_surface_control_compat.h"
-+#include "base/android/android_image_reader_compat.h"
- #endif
- 
- #if BUILDFLAG(ENABLE_VULKAN)
-@@ -687,6 +688,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
-   }
- #endif  // BUILDFLAG(IS_WIN)
- 
-+#if BUILDFLAG(IS_ANDROID)
-+  // Disable AImageReader if the workaround is enabled.
-+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {
-+    base::android::AndroidImageReader::GetInstance().DisableSupport();
-+  }
-+#endif
-+
-   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=
-           kGpuFeatureStatusEnabled ||
-       !InitializeVulkan()) {
-diff --git a/media/gpu/android/video_frame_factory_impl.cc b/media/gpu/android/video_frame_factory_impl.cc
---- a/media/gpu/android/video_frame_factory_impl.cc
-+++ b/media/gpu/android/video_frame_factory_impl.cc
-@@ -35,10 +35,12 @@ namespace {
- 
- gpu::TextureOwner::Mode GetTextureOwnerMode(
-     VideoFrameFactory::OverlayMode overlay_mode) {
-+  const bool enabled = base::android::EnableAndroidImageReader() &&
-+             base::FeatureList::IsEnabled(features::kAImageReaderMediaPlayer);
-   switch (overlay_mode) {
-     case VideoFrameFactory::OverlayMode::kDontRequestPromotionHints:
-     case VideoFrameFactory::OverlayMode::kRequestPromotionHints:
--      return base::android::EnableAndroidImageReader()
-+      return enabled
-                  ? gpu::TextureOwner::Mode::kAImageReaderInsecure
-                  : gpu::TextureOwner::Mode::kSurfaceTextureInsecure;
-     case VideoFrameFactory::OverlayMode::kSurfaceControlSecure:
---

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
-@@ -233,6 +233,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -236,6 +236,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;
-@@ -981,6 +982,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -985,6 +986,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[] = {
+@@ -184,6 +184,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
@@ -59,16 +59,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
              "AdaptiveButtonInTopToolbarPageSummary";
      public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =
-@@ -680,6 +681,8 @@ public abstract class ChromeFeatureList {
+@@ -768,6 +769,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidWindowPopupLargeScreen =
+     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
-             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);
+             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, 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 sAppSpecificHistoryViewIntent =
+             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
      public static final CachedFlag sAsyncNotificationManager =
-             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);
+@@ -1080,6 +1083,7 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAsyncNotificationManagerForDownload =
-@@ -941,6 +944,7 @@ public abstract class ChromeFeatureList {
                      sAccountForSuppressedKeyboardInsets,
                      sAllowTabClosingUponMinimization,
                      sAndroidAppIntegration,

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

@@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
-@@ -839,6 +839,11 @@ public class KeyboardShortcuts {
+@@ -890,6 +890,11 @@ public class KeyboardShortcuts {
                      KeyEvent.KEYCODE_B,
                      (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));
          }

build/patches/Add-IsCleartextPermitted-flag.patch

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

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -7,16 +7,17 @@ adds a new flag in chrome://flags to re-enable the experiment
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  base/features.cc                                     |  4 ++++
+ content/renderer/render_process_impl.cc              |  9 +++++++++
  .../Add-PartialLowEndModeOnMidRangeDevices-flag.inc  | 12 ++++++++++++
- 2 files changed, 16 insertions(+)
+ 3 files changed, 25 insertions(+)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc
 
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -126,6 +126,10 @@ BASE_FEATURE(kUseSharedRebindServiceConnection,
+@@ -149,6 +149,10 @@ bool IsReducePPMsEnabled() {
-              FEATURE_DISABLED_BY_DEFAULT);
+   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
- #endif  // BUILDFLAG(IS_ANDROID)
+ }
  
 +#if BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kPartialLowEndModeOnMidRangeDevices);
@@ -24,7 +25,37 @@ diff --git a/base/features.cc b/base/features.cc
 +
  void Init(EmitThreadControllerProfilerMetadata
                emit_thread_controller_profiler_metadata) {
-   sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
+   g_is_reduce_ppms_enabled.store(FeatureList::IsEnabled(kReducePPMs),
+diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
+--- a/content/renderer/render_process_impl.cc
++++ b/content/renderer/render_process_impl.cc
+@@ -7,6 +7,7 @@
+ #pragma allow_unsafe_libc_calls
+ #endif
+ 
++#include "base/features.h"
+ #include "content/renderer/render_process_impl.h"
+ 
+ #include "build/build_config.h"
+@@ -127,10 +128,18 @@ RenderProcessImpl::RenderProcessImpl()
+       base::CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kDisallowV8FeatureFlagOverrides);
+   if (!disallow_v8_feature_flag_overrides) {
++#if BUILDFLAG(IS_ANDROID)
++    if (base::SysInfo::IsLowEndDevice()
++          && base::FeatureList::IsEnabled(base::features::kPartialLowEndModeOnMidRangeDevices)) {
++      std::string_view optimize_flag("--optimize-for-size");
++      v8::V8::SetFlagsFromString(optimize_flag.data(), optimize_flag.size());
++    }
++#else
+     if (base::SysInfo::IsLowEndDevice()) {
+       std::string_view optimize_flag("--optimize-for-size");
+       v8::V8::SetFlagsFromString(optimize_flag.data(), optimize_flag.size());
+     }
++#endif
+ 
+     ////////////////////////////////////////////////////////////////////////////
+     // V8 flags are typically set in gin/v8_initializer.cc. Only those flags
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-PartialLowEndModeOnMidRangeDevices-flag.inc
 new file mode 100644
 --- /dev/null

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

@@ -17,8 +17,8 @@ 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
-@@ -8364,9 +8364,9 @@
+@@ -8690,9 +8690,9 @@
-     "expiry_milestone": 140
+     "expiry_milestone": 150
    },
    {
 -    "name": "restrict-gamepad-access",
@@ -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
-@@ -253,6 +253,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -258,6 +258,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
            {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
            {wf::EnablePeriodicBackgroundSync,
             raw_ref(features::kPeriodicBackgroundSync)},

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

@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -372,6 +372,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -376,6 +376,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
    builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
  #endif
    builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -221,6 +221,9 @@
+@@ -226,6 +226,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>
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/extensions/background_mode_manager.h"
  #endif
-@@ -1613,6 +1615,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1605,6 +1607,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc
 --- a/chrome/browser/prefs/chrome_command_line_pref_store.cc
 +++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc
-@@ -160,7 +160,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
+@@ -163,7 +163,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {
          command_line()->GetSwitchValueASCII(switches::kProxyBypassList);
      SetValue(proxy_config::prefs::kProxy,
               base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -661,7 +661,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -204,6 +204,8 @@ static_library("ui") {
+@@ -169,6 +169,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -673,15 +673,15 @@ 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
-@@ -57,6 +57,9 @@
+@@ -58,6 +58,9 @@
  #include "extensions/buildflags/buildflags.h"
  #include "printing/buildflags/buildflags.h"
  
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
 +
 +
- #if BUILDFLAG(ENABLE_NACL)
+ #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
- #include "chrome/browser/ui/webui/nacl_ui.h"
+ #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
  #endif
 @@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {
    map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
@@ -1135,7 +1135,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -51,6 +51,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -50,6 +50,7 @@ bool IsSystemWebUIHost(std::string_view host) {
        kChromeUILockScreenNetworkHost,
        kChromeUILockScreenStartReauthHost,
        kChromeUIMobileSetupHost,
@@ -1143,18 +1143,18 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
        kChromeUIMultiDeviceSetupHost,
        kChromeUINetworkHost,
        kChromeUINotificationTesterHost,
-@@ -72,6 +73,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -71,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view host) {
  // These hosts will also be suggested by BuiltinProvider.
  base::span<const base::cstring_view> ChromeURLHosts() {
    static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
 +      kChromeUIProxyConfigHost,
        kChromeUIAboutHost,
        kChromeUIAccessibilityHost,
- #if !BUILDFLAG(IS_ANDROID)
+       kChromeUIActorInternalsHost,
 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
-@@ -179,6 +179,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+@@ -188,6 +188,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
  inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
  inline constexpr char kChromeUINewTabHost[] = "newtab";
  inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";

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

@@ -24,25 +24,25 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../java/res/xml/incognito_preferences.xml    |  37 ++++
  .../java/res/xml/privacy_preferences.xml      |   5 +
  .../AlwaysIncognitoLinkInterceptor.java       |  54 ++++++
- .../chrome/browser/ChromeTabbedActivity.java  |  28 ++-
+ .../chrome/browser/ChromeTabbedActivity.java  |  25 ++-
  .../chrome/browser/app/ChromeActivity.java    |   4 +
  .../AppMenuPropertiesDelegateImpl.java        |   7 +-
  .../ChromeContextMenuPopulator.java           |   6 +-
- .../CustomTabActivityLifecycleUmaTracker.java |  39 -----
+ .../CustomTabActivityLifecycleUmaTracker.java |  39 ----
  .../CustomTabAppMenuPropertiesDelegate.java   |   4 +
- .../CustomTabIntentDataProvider.java          |  10 ++
+ .../CustomTabIntentDataProvider.java          |  10 +
  .../browser/download/DownloadUtils.java       |  13 +-
  .../history/HistoryContentManager.java        |   7 +-
  .../browser/history/HistoryManager.java       |  27 ++-
  .../chrome/browser/history/HistoryPage.java   |  16 ++
  .../native_page/NativePageFactory.java        |   4 +-
  .../chrome/browser/ntp/RecentTabsManager.java |  28 ++-
- .../privacy/settings/IncognitoSettings.java   | 162 ++++++++++++++++++
+ .../privacy/settings/IncognitoSettings.java   | 175 ++++++++++++++++++
  .../settings/FragmentDependencyProvider.java  |   4 +
  .../HistoricalTabModelObserver.java           |   5 +-
  .../tab/tab_restore/HistoricalTabSaver.java   |   2 +-
  .../tab_restore/HistoricalTabSaverImpl.java   |  17 +-
- .../TabbedAppMenuPropertiesDelegate.java      |  17 +-
+ .../TabbedAppMenuPropertiesDelegate.java      |   6 +-
  .../tabbed_mode/TabbedRootUiCoordinator.java  |   4 +-
  .../browser/tabmodel/ChromeTabCreator.java    |   5 +-
  .../tabmodel/TabModelSelectorImpl.java        |   3 +
@@ -55,21 +55,21 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../remote_suggestions_service_factory.cc     |   5 +
  .../bookmarks/android/bookmark_bridge.cc      |   7 +
  .../host_content_settings_map_factory.cc      |  22 ++-
- chrome/browser/history/history_tab_helper.cc  |  20 +++
+ chrome/browser/history/history_tab_helper.cc  |  20 ++
  chrome/browser/history/history_tab_helper.h   |  10 +-
  .../android/offline_page_bridge.cc            |  11 +-
- .../android/offline_page_model_factory.cc     |  20 ++-
+ .../android/offline_page_model_factory.cc     |  20 +-
  .../android/request_coordinator_factory.cc    |  33 +++-
  .../offline_page_model_factory.h              |   1 +
  .../offline_pages/recent_tab_helper.cc        |  31 +++-
  .../browser/offline_pages/recent_tab_helper.h |   5 +
  .../request_coordinator_factory.h             |   4 +-
  chrome/browser/prefs/browser_prefs.cc         |   5 +
- chrome/browser/profiles/profile_selections.cc |  10 ++
+ chrome/browser/profiles/profile_selections.cc |  10 +
  chrome/browser/profiles/profile_selections.h  |   7 +-
  .../browser/ui/android/native_page/BUILD.gn   |   2 +
  .../browser/ui/native_page/NativePage.java    |  22 ++-
- .../browser/omnibox/LocationBarMediator.java  |  10 +-
+ .../browser/omnibox/LocationBarMediator.java  |   8 +
  .../strings/android_chrome_strings.grd        |  25 +++
  .../browser/toolbar/LocationBarModel.java     |   5 +-
  chrome/browser/ui/messages/android/BUILD.gn   |   1 +
@@ -88,7 +88,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../add-an-always-incognito-mode.inc          |   1 +
  .../add-an-always-incognito-mode.inc          |   3 +
  .../add-an-always-incognito-mode.inc          |   1 +
- 69 files changed, 798 insertions(+), 113 deletions(-)
+ 69 files changed, 797 insertions(+), 111 deletions(-)
  create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -101,7 +101,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
-@@ -646,6 +646,7 @@ chrome_java_resources = [
+@@ -620,6 +620,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",
@@ -120,7 +120,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",
-@@ -898,6 +899,7 @@ chrome_java_sources = [
+@@ -908,6 +909,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",
@@ -247,7 +247,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -74,6 +74,10 @@ import org.chromium.base.task.TaskTraits;
+@@ -74,6 +74,10 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.build.annotations.UsedByReflection;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
@@ -258,7 +258,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.app.ChromeActivity;
-@@ -726,14 +730,19 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -794,14 +798,19 @@ public class ChromeTabbedActivity extends ChromeActivity {
  
              Profile profile = mTabModelSelector.getCurrentModel().getProfile();
              // For saving non-incognito tab closures for Recent Tabs.
@@ -285,22 +285,19 @@ 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(
-@@ -2876,8 +2885,9 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3137,7 +3146,7 @@ public class ChromeTabbedActivity extends ChromeActivity {
+         }
  
          // We determine the model as soon as possible so every systems get initialized coherently.
-         boolean startIncognito =
+-        boolean startIncognito =
--                savedInstanceState != null
++        boolean startIncognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito() ||
--                        && savedInstanceState.getBoolean(IS_INCOGNITO_SELECTED, false);
+                 (mSupportedProfileType == SupportedProfileType.OFF_THE_RECORD)
-+                AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
+                         || (mSupportedProfileType == SupportedProfileType.MIXED
-+                || (savedInstanceState != null
+                                 && savedInstanceState != null
-+                        && savedInstanceState.getBoolean(IS_INCOGNITO_SELECTED, false));
- 
-         mNextTabPolicySupplier = new ChromeNextTabPolicySupplier(mLayoutStateProviderSupplier);
- 
 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
-@@ -96,6 +96,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
+@@ -95,6 +95,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerH
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.chrome.browser.device.DeviceClassManager;
  import org.chromium.chrome.browser.devtools.DevToolsWindowAndroid;
@@ -308,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.dom_distiller.ReaderModeManager;
  import org.chromium.chrome.browser.download.DownloadManagerService;
-@@ -1980,6 +1981,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2000,6 +2001,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -321,16 +318,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -88,6 +88,8 @@ import java.lang.annotation.Retention;
+@@ -88,6 +88,8 @@ import java.lang.annotation.RetentionPolicy;
- import java.lang.annotation.RetentionPolicy;
  import java.util.Iterator;
+ import java.util.List;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -496,8 +498,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -606,8 +608,9 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
                  && !isNativePage
                  && !isFileScheme
                  && !isContentScheme
@@ -345,25 +342,25 @@ 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
-@@ -31,6 +31,7 @@ import org.chromium.base.metrics.RecordUserAction;
+@@ -41,6 +41,7 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.base.shared_preferences.SharedPreferencesManager;
+ import org.chromium.build.annotations.NullMarked;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.Nullable;
  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.contextmenu.ContextMenuCoordinator.ContextMenuItemType;
-@@ -347,6 +348,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -420,6 +421,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
-     public List<Pair<Integer, ModelList>> buildContextMenu() {
          mShowEphemeralTabNewLabel = null;
+         mCustomActionMap.clear();
  
 +        boolean always_incognito =
 +            AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
 +
-         List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
+         List<ModelList> groupedItems = new ArrayList<>();
  
          if (mParams.isPage() && shouldShowEmptySpaceContextMenu()) {
-@@ -415,7 +419,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -489,7 +493,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -424,28 +421,28 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -21,6 +21,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+@@ -21,6 +21,7 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -200,6 +201,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -221,6 +222,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-                 openInChromeItemVisible = false;
+             openInChromeItemVisible = false;
-                 tryAddingReadAloud = false;
+             tryAddingReadAloud = false;
-             }
+         }
 +            if (AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()) {
 +                downloadItemVisible = true;
 +            }
  
-             boolean isNativePage =
+         boolean isNativePage =
-                     url.getScheme().equals(UrlConstants.CHROME_SCHEME)
+                 url.getScheme().equals(UrlConstants.CHROME_SCHEME)
 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
-@@ -98,6 +98,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -101,6 +101,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.device.mojom.ScreenOrientationLockType;
  import org.chromium.net.NetId;
  
@@ -455,7 +452,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;
-@@ -1250,6 +1253,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1260,6 +1263,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          return getInitialActivityWidth() > 0;
      }
  
@@ -472,15 +469,15 @@ 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
-@@ -36,6 +36,7 @@ import org.chromium.base.FileUtils;
+@@ -39,6 +39,7 @@ import org.chromium.base.Log;
- import org.chromium.base.IntentUtils;
+ import org.chromium.build.annotations.NullMarked;
- import org.chromium.base.Log;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.ChromeTabbedActivity;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.download.home.DownloadActivityLauncher;
-@@ -78,6 +79,10 @@ import org.chromium.url.GURL;
+@@ -82,6 +83,10 @@ import org.chromium.url.GURL;
  
  import java.io.File;
  
@@ -489,9 +486,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
 +import org.chromium.chrome.browser.preferences.Pref;
 +
  /** A class containing some utility static methods. */
+ @NullMarked
  public class DownloadUtils {
-     private static final String TAG = "download";
+@@ -313,7 +318,13 @@ public class DownloadUtils {
-@@ -303,7 +308,13 @@ public class DownloadUtils {
      public static boolean isAllowedToDownloadPage(Tab tab) {
          if (tab == null) return false;
  
@@ -509,7 +506,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
-@@ -302,7 +302,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -307,7 +307,9 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.generateFooterItems();
  
          // Listen to changes in sign in state.
@@ -520,7 +517,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);
-@@ -378,7 +380,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
+@@ -383,7 +385,8 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
          mHistoryAdapter.onDestroyed();
          mLargeIconBridge.destroy();
          mLargeIconBridge = null;
@@ -533,9 +530,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManager.java
-@@ -54,6 +54,14 @@ import org.chromium.ui.base.Clipboard;
+@@ -57,6 +57,14 @@ import org.chromium.ui.base.Clipboard;
- 
  import java.util.List;
+ import java.util.function.Function;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +import org.chromium.chrome.browser.profiles.Profile;
@@ -548,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
  /** Combines and manages the different UI components of browsing history. */
  public class HistoryManager
          implements OnMenuItemClickListener,
-@@ -156,7 +164,7 @@ public class HistoryManager
+@@ -162,7 +170,7 @@ public class HistoryManager
  
          mUmaRecorder.recordOpenHistory();
          // If incognito placeholder is shown, we don't need to create History UI elements.
@@ -557,7 +554,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              mSelectableListLayout = null;
              mRootView = getIncognitoHistoryPlaceholderView();
              return;
-@@ -406,9 +414,22 @@ public class HistoryManager
+@@ -415,9 +423,22 @@ public class HistoryManager
          onBackPressStateChanged();
      }
  
@@ -581,7 +578,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
              // If Incognito placeholder is shown no need to call any destroy method.
              return;
          }
-@@ -468,7 +489,7 @@ public class HistoryManager
+@@ -477,7 +498,7 @@ public class HistoryManager
       * @return True if manager handles this event, false if it decides to ignore.
       */
      private boolean onBackPressed() {
@@ -626,7 +623,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -18,6 +18,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+@@ -19,6 +19,7 @@ import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
@@ -634,7 +631,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;
-@@ -326,7 +327,8 @@ public class NativePageFactory {
+@@ -371,7 +372,8 @@ public class NativePageFactory {
              String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) {
          NativePage page;
  
@@ -647,7 +644,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
-@@ -40,6 +40,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint;
+@@ -44,6 +44,15 @@ import org.chromium.components.signin.metrics.SigninAccessPoint;
  import org.chromium.components.sync.SyncService;
  import org.chromium.url.GURL;
  
@@ -663,7 +660,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;
-@@ -108,7 +117,8 @@ public class RecentTabsManager
+@@ -113,7 +122,8 @@ public class RecentTabsManager
              Profile profile,
              Context context,
              Runnable showHistoryManager) {
@@ -673,7 +670,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
          mActiveTab = tab;
          mTabModelSelector = tabModelSelector;
          mShowHistoryManager = showHistoryManager;
-@@ -291,6 +301,22 @@ public class RecentTabsManager
+@@ -301,6 +311,22 @@ public class RecentTabsManager
       */
      public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
          if (mIsDestroyed) return;
@@ -700,7 +697,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,175 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -733,7 +730,10 @@ new file mode 100644
 +import androidx.preference.PreferenceFragmentCompat;
 +import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 +
++import org.chromium.base.supplier.ObservableSupplier;
++import org.chromium.base.supplier.ObservableSupplierImpl;
 +import org.chromium.base.supplier.Supplier;
++
 +import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.preferences.Pref;
 +import org.chromium.chrome.browser.profiles.Profile;
@@ -743,8 +743,11 @@ new file mode 100644
 +import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 +import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
++import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
++
 +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
++import org.chromium.components.browser_ui.settings.SettingsFragment;
 +import org.chromium.components.prefs.PrefService;
 +import org.chromium.components.user_prefs.UserPrefs;
 +
@@ -752,8 +755,8 @@ new file mode 100644
 + * Fragment to keep track of the all the always incognito related preferences.
 + */
 +public class IncognitoSettings
-+        extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener,
++        extends ChromeBaseSettingsFragment implements Preference.OnPreferenceChangeListener,
-+                                                    INeedSnackbarManager {
++                                                      INeedSnackbarManager {
 +    private Supplier<SnackbarManager> mSnackbarManagerSupplier;
 +    private Snackbar mSnackbar;
 +
@@ -762,16 +765,23 @@ new file mode 100644
 +    private static final String PREF_INCOGNITO_SAVE_SITE_SETTING = "incognito_save_site_setting";
 +
 +    private final PrefService prefService = UserPrefs.get(ProfileManager.getLastUsedRegularProfile());
++    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
++
++    @Override
++    public ObservableSupplier<String> getPageTitle() {
++        return mPageTitle;
++    }
++
++    @Override
++    public @SettingsFragment.AnimationType int getAnimationType() {
++        return SettingsFragment.AnimationType.PROPERTY;
++    }
 +
 +    @Override
 +    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+        PrivacyPreferencesManagerImpl privacyPrefManager =
++        mPageTitle.set(getString(R.string.incognito_settings_title));
-+                PrivacyPreferencesManagerImpl.getInstance();
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.incognito_preferences);
-+        getActivity().setTitle(R.string.incognito_settings_title);
-+
 +        setHasOptionsMenu(true);
-+
 +        updatePreferences();
 +    }
 +
@@ -866,7 +876,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
-@@ -53,6 +53,7 @@ import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
+@@ -49,6 +49,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;
@@ -874,7 +884,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;
-@@ -244,6 +245,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -231,6 +232,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
                              SigninAndHistorySyncActivityLauncherImpl.get(),
                              new SettingsCustomTabLauncherImpl()));
          }
@@ -993,48 +1003,30 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -26,6 +26,7 @@ import org.chromium.base.supplier.Supplier;
+@@ -27,6 +27,7 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.build.BuildConfig;
+ import org.chromium.build.annotations.Contract;
  import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ai.AiAssistantService;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
-@@ -371,6 +372,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -220,7 +221,10 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-     }
+         }
  
-     private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
+         // New Tab
+-        modelList.add(buildNewTabItem());
 +        boolean always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
-+        if (always_incognito) {
++        if (!always_incognito) {
-+            final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id);
++            modelList.add(buildNewTabItem());
-+            if (newTabOption != null)
-+                newTabOption.setVisible(false);
 +        }
-+
-         // 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;
-@@ -430,7 +438,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-             }
  
-             if (item.getItemId() == R.id.recent_tabs_menu_id) {
+         // New Incognito Tab
--                item.setVisible(!isIncognito);
+         modelList.add(buildNewIncognitoTabItem());
-+                if (always_incognito) {
-+                    boolean historyEnabledInIncognito =
-+                        UserPrefs.get(currentTab.getProfile()).getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED);
-+                    item.setVisible(historyEnabledInIncognito);
-+                }
-+                else {
-+                    item.setVisible(!isIncognito);
-+                }
-             }
-             if (item.getItemId() == R.id.menu_select_tabs) {
-                 item.setVisible(isMenuSelectTabsVisible);
 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
-@@ -214,6 +214,8 @@ import org.chromium.ui.InsetObserver;
+@@ -212,6 +212,8 @@ import org.chromium.content_public.common.ContentSwitches;
  import org.chromium.ui.UiUtils;
  import org.chromium.ui.base.ActivityWindowAndroid;
  import org.chromium.ui.base.DeviceFormFactor;
@@ -1043,7 +1035,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.ui.base.IntentRequestTracker;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.display.DisplayUtil;
-@@ -1212,7 +1214,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1247,7 +1249,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              () -> {
                                  mTabCreatorManagerSupplier
                                          .get()
@@ -1055,7 +1047,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/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -48,6 +48,10 @@ import org.chromium.ui.base.PageTransition;
+@@ -53,6 +53,10 @@ import org.chromium.ui.base.PageTransition;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.url.GURL;
  
@@ -1064,11 +1056,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 +import org.chromium.chrome.browser.tab.TabObserver;
 +
  /** This class creates various kinds of new tabs and adds them to the right {@link TabModel}. */
+ @NullMarked
  public class ChromeTabCreator extends TabCreator
-         implements NeedsTabModel, NeedsTabModelOrderController {
+@@ -580,7 +584,6 @@ public class ChromeTabCreator extends TabCreator
-@@ -545,7 +549,6 @@ public class ChromeTabCreator extends TabCreator
      // TODO(crbug.com/40691614): Clean up the launches from SearchActivity/Chrome.
-     public Tab launchUrlFromExternalApp(
+     public @Nullable Tab launchUrlFromExternalApp(
              LoadUrlParams loadUrlParams, String appId, boolean forceNewTab, Intent intent) {
 -        assert !mIncognito;
          // Don't re-use tabs for intents from Chrome. Note that this can be spoofed so shouldn't be
@@ -1077,15 +1069,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
-@@ -12,6 +12,7 @@ import androidx.annotation.VisibleForTesting;
+@@ -17,6 +17,7 @@ import org.chromium.build.annotations.EnsuresNonNull;
- 
+ import org.chromium.build.annotations.Initializer;
- import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.build.annotations.NullMarked;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.ntp.RecentlyClosedBridge;
-@@ -119,6 +120,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
+@@ -127,6 +128,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
          ProfileProvider profileProvider = mProfileProviderSupplier.get();
          assert profileProvider != null;
  
@@ -1097,16 +1089,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
-@@ -51,6 +51,8 @@ import org.chromium.chrome.browser.tabwindow.TabWindowManager;
+@@ -61,6 +61,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
  import org.chromium.components.embedder_support.util.UrlUtilities;
  import org.chromium.content_public.browser.LoadUrlParams;
  
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
 +
  import java.io.BufferedInputStream;
- import java.io.BufferedOutputStream;
  import java.io.ByteArrayInputStream;
-@@ -835,6 +837,13 @@ public class TabPersistentStore {
+ import java.io.DataInputStream;
+@@ -838,6 +840,13 @@ public class TabPersistentStore {
                  }
              }
          }
@@ -1123,7 +1115,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
-@@ -49,6 +49,7 @@ import org.chromium.base.supplier.Supplier;
+@@ -50,6 +50,7 @@ import org.chromium.base.supplier.Supplier;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
@@ -1131,7 +1123,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.tabwindow.TabWindowManagerSingleton;
  import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -828,7 +829,7 @@ public class ToolbarManager
+@@ -859,7 +860,7 @@ public class ToolbarManager
                                  TraceEvent.end("isOfflinePage");
                                  return ret;
                              }
@@ -1201,7 +1193,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
  using base::android::JavaParamRef;
  using base::android::JavaRef;
  using base::android::ScopedJavaLocalRef;
-@@ -104,7 +109,8 @@ std::vector<std::optional<base::Uuid>> StringsToUuids(
+@@ -101,7 +106,8 @@ std::vector<std::optional<base::Uuid>> StringsToUuids(
  
  void CreateHistoricalTab(
      TabAndroid* tab_android,
@@ -1211,7 +1203,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!tab_android) {
      return;
    }
-@@ -115,9 +121,14 @@ void CreateHistoricalTab(
+@@ -112,9 +118,14 @@ void CreateHistoricalTab(
      return;
    }
  
@@ -1228,7 +1220,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    if (!service) {
      return;
    }
-@@ -181,7 +192,7 @@ void CreateHistoricalBulkClosure(
+@@ -178,7 +189,7 @@ void CreateHistoricalBulkClosure(
          per_tab_optional_tab_group_ids,
      std::vector<raw_ptr<TabAndroid, VectorExperimental>> tabs,
      std::vector<WebContentsStateByteBuffer> web_contents_state) {
@@ -1237,7 +1229,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    DCHECK_EQ(tab_group_ids.size(), group_titles.size());
    DCHECK_EQ(tab_group_ids.size(), group_colors.size());
    DCHECK_EQ(tab_group_ids.size(), tab_group_ids.size());
-@@ -294,11 +305,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -291,11 +302,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
      const JavaParamRef<jobject>& jtab_android,
      const JavaParamRef<jobject>& state,
@@ -1255,8 +1247,8 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -418,6 +418,15 @@ ChromeAutocompleteProviderClient::GetTabGroupSyncService() const {
+@@ -427,6 +427,15 @@ ChromeAutocompleteProviderClient::GetAimEligibilityService() const {
-   return tab_groups::TabGroupSyncServiceFactory::GetForProfile(profile_);
+   return AimEligibilityServiceFactory::GetForProfile(profile_);
  }
  
 +bool ChromeAutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
@@ -1274,9 +1266,9 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
-@@ -96,6 +96,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
+@@ -99,6 +99,7 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
-   ProviderStateService* GetProviderStateService() const override;
+   AimEligibilityService* GetAimEligibilityService() const override;
-   tab_groups::TabGroupSyncService* GetTabGroupSyncService() const override;
+ 
    bool IsOffTheRecord() const override;
 +  bool IsAlwaysIncognitoEnabled() const override;
    bool IsIncognitoProfile() const override;
@@ -1318,7 +1310,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  #include "chrome/browser/bookmarks/bookmark_model_factory.h"
  #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
  #include "chrome/browser/commerce/shopping_service_factory.h"
-@@ -264,6 +265,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
+@@ -214,6 +215,12 @@ ScopedJavaLocalRef<jobject> JNI_BookmarkBridge_NativeGetForProfile(
    if (!profile)
      return nullptr;
  
@@ -1392,7 +1384,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"
-@@ -570,6 +573,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -598,6 +601,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1406,7 +1398,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
    if (profile->IsOffTheRecord())
      return nullptr;
  
-@@ -577,6 +587,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -605,6 +615,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1426,7 +1418,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
 diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
 --- a/chrome/browser/history/history_tab_helper.h
 +++ b/chrome/browser/history/history_tab_helper.h
-@@ -15,6 +15,8 @@
+@@ -17,6 +17,8 @@
  #include "components/translate/core/browser/translate_driver.h"
  #include "content/public/browser/web_contents_observer.h"
  #include "content/public/browser/web_contents_user_data.h"
@@ -1435,8 +1427,8 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
  
  namespace history {
  struct HistoryAddPageArgs;
-@@ -54,6 +56,11 @@ class HistoryTabHelper
+@@ -59,6 +61,11 @@ class HistoryTabHelper
-   void SetAppId(const std::string& app_id) { app_id_ = app_id; }
+   std::optional<std::string> GetAppId() { return app_id_; }
  #endif
  
 +  static void RegisterProfilePrefs(PrefRegistrySimple* registry);
@@ -1447,7 +1439,7 @@ diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/histor
   private:
    explicit HistoryTabHelper(content::WebContents* web_contents);
    friend class content::WebContentsUserData<HistoryTabHelper>;
-@@ -91,9 +98,6 @@ class HistoryTabHelper
+@@ -101,9 +108,6 @@ class HistoryTabHelper
    void OnLanguageDetermined(
        const translate::LanguageDetectionDetails& details) override;
  
@@ -1470,7 +1462,7 @@ diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrom
  
  // Must come after all headers that specialize FromJniType() / ToJniType().
  #include "chrome/android/chrome_jni_headers/OfflinePageBridge_jni.h"
-@@ -757,9 +760,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
+@@ -731,9 +734,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
    }
  
    if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) {
@@ -1763,7 +1755,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"
-@@ -2068,6 +2069,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2061,6 +2062,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1828,7 +1820,7 @@ diff --git a/chrome/browser/profiles/profile_selections.h b/chrome/browser/profi
 diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
 --- a/chrome/browser/ui/android/native_page/BUILD.gn
 +++ b/chrome/browser/ui/android/native_page/BUILD.gn
-@@ -30,6 +30,8 @@ robolectric_library("junit") {
+@@ -31,6 +31,8 @@ robolectric_library("junit") {
  
    deps = [
      ":java",
@@ -1849,7 +1841,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
  /** An interface for pages that will be using Android views instead of html/rendered Web content. */
  @NullMarked
  public interface NativePage {
-@@ -179,7 +181,8 @@ public interface NativePage {
+@@ -187,7 +189,8 @@ public interface NativePage {
       */
      static boolean isNativePageUrl(GURL url, boolean isIncognito, boolean hasPdfDownload) {
          return url != null
@@ -1859,7 +1851,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -189,7 +192,7 @@ public interface NativePage {
+@@ -197,7 +200,7 @@ public interface NativePage {
       *     not have chrome or chrome-native scheme.
       */
      static boolean isChromePageUrl(GURL url, boolean isIncognito) {
@@ -1868,7 +1860,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -201,11 +204,12 @@ public interface NativePage {
+@@ -209,11 +212,12 @@ public interface NativePage {
       */
      // TODO(crbug.com/40549331) - Convert to using GURL.
      static @NativePageType int nativePageType(
@@ -1883,7 +1875,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
      }
  
      /**
-@@ -219,7 +223,8 @@ public interface NativePage {
+@@ -227,7 +231,8 @@ public interface NativePage {
              GURL url,
              @Nullable NativePage candidatePage,
              boolean isIncognito,
@@ -1893,7 +1885,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          if (hasPdfDownload) {
              // For navigation with associated pdf download (e.g. open a pdf link), pdf page should
              // be created.
-@@ -237,7 +242,7 @@ public interface NativePage {
+@@ -245,7 +250,7 @@ public interface NativePage {
              // created after the pdf document is re-downloaded in other parts of the code.
              return NativePageType.NONE;
          } else {
@@ -1902,7 +1894,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          }
      }
  
-@@ -249,7 +254,7 @@ public interface NativePage {
+@@ -257,7 +262,7 @@ public interface NativePage {
       *     which do not have chrome or chrome-native scheme.
       */
      private static @NativePageType int chromePageType(
@@ -1911,7 +1903,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
          String host = url.getHost();
          String scheme = url.getScheme();
          if (!UrlConstants.CHROME_NATIVE_SCHEME.equals(scheme)
-@@ -269,7 +274,8 @@ public interface NativePage {
+@@ -277,7 +282,8 @@ public interface NativePage {
              return NativePageType.DOWNLOADS;
          } else if (UrlConstants.HISTORY_HOST.equals(host)) {
              return NativePageType.HISTORY;
@@ -1924,7 +1916,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -89,6 +89,11 @@ import org.chromium.ui.base.WindowAndroid;
+@@ -92,6 +92,11 @@ import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.interpolators.Interpolators;
  import org.chromium.url.GURL;
  
@@ -1936,25 +1928,20 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import java.util.ArrayList;
  import java.util.List;
  import java.util.function.BooleanSupplier;
-@@ -1232,10 +1237,13 @@ class LocationBarMediator
+@@ -419,6 +424,9 @@ class LocationBarMediator
-         }
+         if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mContext)) return;
          Tab tab = mLocationBarDataProvider.getTab();
-         if (tab == null) return false;
+         if (tab == null) return;
 +        PrefService prefService = UserPrefs.get(ProfileManager.getLastUsedRegularProfile());
 +        boolean historyEnabledInIncognito =
 +                prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED);
-         // The save offline button should not be shown on native pages. Currently, trying to
+         boolean onNtp = UrlUtilities.isNtpUrl(tab.getUrl());
-         // save an offline page in incognito crashes, so don't show it on incognito either.
+ 
-         return shouldShowPageActionButtons()
+         if (ChromeAccessibilityUtil.get().isAccessibilityEnabled()
--                && (!tab.isOffTheRecord()
-+                && (!tab.isOffTheRecord() || historyEnabledInIncognito
-                         || ChromeFeatureList.isEnabled(
-                                 ChromeFeatureList.ENABLE_SAVE_PACKAGE_FOR_OFF_THE_RECORD));
-     }
 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
-@@ -6682,6 +6682,31 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6675,6 +6675,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>
@@ -1989,7 +1976,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java
-@@ -164,6 +164,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -165,6 +165,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
      protected GURL mVisibleGurl = GURL.emptyGURL();
      protected String mFormattedFullUrl;
      protected String mUrlForDisplay;
@@ -1997,7 +1984,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  
      // notifyUrlChanged and notifySecurityStateChanged are usually called 3 times across a same
      // document navigation. The first call is usually necessary, which updates the UrlBar to reflect
-@@ -187,7 +188,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -188,7 +189,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
              Context context,
              NewTabPageDelegate newTabPageDelegate,
              UrlFormatter urlFormatter,
@@ -2078,7 +2065,7 @@ diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.cc b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -4106,6 +4106,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -4108,6 +4108,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
  
@@ -2094,7 +2081,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
 --- a/components/content_settings/core/browser/content_settings_pref_provider.cc
 +++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
-@@ -111,10 +111,12 @@ void PrefProvider::RegisterProfilePrefs(
+@@ -114,10 +114,12 @@ void PrefProvider::RegisterProfilePrefs(
  
  PrefProvider::PrefProvider(PrefService* prefs,
                             bool off_the_record,
@@ -2107,7 +2094,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
        store_last_modified_(store_last_modified),
        clock_(base::DefaultClock::GetInstance()) {
    TRACE_EVENT_BEGIN("startup", "PrefProvider::PrefProvider");
-@@ -137,11 +139,13 @@ PrefProvider::PrefProvider(PrefService* prefs,
+@@ -140,11 +142,13 @@ PrefProvider::PrefProvider(PrefService* prefs,
    WebsiteSettingsRegistry* website_settings =
        WebsiteSettingsRegistry::GetInstance();
    for (const WebsiteSettingsInfo* info : *website_settings) {
@@ -2144,7 +2131,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
-@@ -269,6 +269,7 @@ struct ContentSettingEntry {
+@@ -287,6 +287,7 @@ struct ContentSettingEntry {
  
  HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
                                                 bool is_off_the_record,
@@ -2152,7 +2139,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                                                 bool store_last_modified,
                                                 bool restore_session,
                                                 bool should_record_metrics)
-@@ -278,6 +279,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -296,6 +297,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
  #endif
        prefs_(prefs),
        is_off_the_record_(is_off_the_record),
@@ -2160,7 +2147,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()) {
-@@ -291,7 +293,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -309,7 +311,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2172,7 +2159,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
 --- a/components/content_settings/core/browser/host_content_settings_map.h
 +++ b/components/content_settings/core/browser/host_content_settings_map.h
-@@ -83,6 +83,7 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -84,6 +84,7 @@ class HostContentSettingsMap : public content_settings::Observer,
    // profile or a guest session.
    HostContentSettingsMap(PrefService* prefs,
                           bool is_off_the_record,
@@ -2180,7 +2167,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -511,6 +512,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -544,6 +545,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -2192,7 +2179,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
 diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/components/omnibox/browser/autocomplete_provider_client.cc
 --- a/components/omnibox/browser/autocomplete_provider_client.cc
 +++ b/components/omnibox/browser/autocomplete_provider_client.cc
-@@ -65,3 +65,7 @@ base::WeakPtr<AutocompleteProviderClient>
+@@ -66,3 +66,7 @@ base::WeakPtr<AutocompleteProviderClient>
  AutocompleteProviderClient::GetWeakPtr() {
    return nullptr;
  }
@@ -2203,7 +2190,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.cc b/compon
 diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h
 --- a/components/omnibox/browser/autocomplete_provider_client.h
 +++ b/components/omnibox/browser/autocomplete_provider_client.h
-@@ -152,6 +152,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
+@@ -154,6 +154,7 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
    virtual bool IsOffTheRecord() const = 0;
    virtual bool IsIncognitoProfile() const = 0;
    virtual bool IsGuestSession() const = 0;
@@ -2214,7 +2201,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
-@@ -413,7 +413,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
+@@ -432,7 +432,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
  
    // Don't make a suggest request if in incognito mode; unless for the Lens
    // searchboxes.
@@ -2226,7 +2213,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(
+@@ -916,7 +916,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

@@ -279,9 +279,9 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -249,7 +249,7 @@ void ContentSettingsRegistry::Init() {
+@@ -255,7 +255,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
 -  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_ALLOW,
 +  Register(ContentSettingsType::AUTOPLAY, "autoplay", CONTENT_SETTING_BLOCK,
@@ -329,7 +329,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
 diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.h b/third_party/blink/renderer/core/html/media/autoplay_policy.h
 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.h
 +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.h
-@@ -151,6 +151,10 @@ class CORE_EXPORT AutoplayPolicy final
+@@ -148,6 +148,10 @@ class CORE_EXPORT AutoplayPolicy final
    // should use, if checking to see if an action is allowed.
    bool IsLockedPendingUserGesture() const;
  

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

@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../app/bookmarks/BookmarkActivity.java       |  31 ++
  .../native_page/NativePageFactory.java        |   9 +-
  chrome/browser/BUILD.gn                       |  11 +-
- .../bookmarks/android/bookmark_bridge.cc      | 266 ++++++++++++++++
+ .../bookmarks/android/bookmark_bridge.cc      | 197 ++++++++++++
  .../bookmarks/android/bookmark_bridge.h       |  30 +-
  .../browser/bookmarks/BookmarkBridge.java     |  39 +++
  .../browser/bookmarks/BookmarkDelegate.java   |  10 +
@@ -36,11 +36,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/importer/profile_writer.h      |   6 +
  .../preferences/ChromePreferenceKeys.java     |   3 +
  .../strings/android_chrome_strings.grd        |  18 ++
- chrome/common/BUILD.gn                        |   3 +
+ chrome/utility/BUILD.gn                       |   7 +
- chrome/utility/BUILD.gn                       |   7 +-
+ .../importer/bookmarks_file_importer.cc       |   4 +
- .../utility/importer/bookmark_html_reader.cc  |  28 +-
- .../utility/importer/bookmark_html_reader.h   |   8 +
  .../headless_select_file_dialog.cc            |   4 +
+ .../content/content_bookmark_parser_utils.cc  |   3 +
  .../add-bookmark-import-export-actions.inc    |  12 +
  .../add-bookmark-import-export-actions.inc    |   4 +
  .../add-bookmark-import-export-actions.inc    |   1 +
@@ -52,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
  ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
  ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 41 files changed, 905 insertions(+), 29 deletions(-)
+ 40 files changed, 809 insertions(+), 24 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -103,8 +102,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
  import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
-@@ -55,7 +56,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
+@@ -60,7 +61,7 @@ import java.util.List;
-  * {@link ChromeTabbedActivity}.
+  * ChromeTabbedActivity}.
   */
  public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
 -    private final Activity mActivity;
@@ -112,7 +111,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
      private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
      private final Supplier<ShareDelegate> mShareDelegateSupplier;
      private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
-@@ -85,7 +86,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+@@ -91,7 +92,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
      private NativePageFactory mNativePageFactory;
  
      public TabbedModeTabDelegateFactory(
@@ -124,15 +123,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
-@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.app.bookmarks;
+@@ -9,6 +9,7 @@ import static org.chromium.build.NullUtil.assumeNonNull;
  import android.content.ComponentName;
  import android.content.Intent;
  import android.text.TextUtils;
 +import android.os.Bundle;
  
  import org.chromium.base.IntentUtils;
- import org.chromium.build.annotations.Nullable;
+ import org.chromium.build.annotations.NullMarked;
-@@ -29,6 +30,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -32,6 +33,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  
@@ -142,7 +141,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
  /**
   * The activity that displays the bookmark UI on the phone. It keeps a {@link
   * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should
-@@ -42,6 +46,9 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -46,6 +50,9 @@ public class BookmarkActivity extends SnackbarActivity {
      private @Nullable BookmarkManagerCoordinator mBookmarkManagerCoordinator;
      private @Nullable BookmarkOpener mBookmarkOpener;
  
@@ -152,7 +151,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onProfileAvailable(Profile profile) {
          super.onProfileAvailable(profile);
-@@ -68,6 +75,14 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -73,6 +80,14 @@ public class BookmarkActivity extends SnackbarActivity {
          mBookmarkManagerCoordinator.updateForUrl(url);
          setContentView(mBookmarkManagerCoordinator.getView());
          BackPressHelper.create(this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator);
@@ -167,15 +166,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      }
  
      @Override
-@@ -87,6 +102,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -91,6 +106,7 @@ public class BookmarkActivity extends SnackbarActivity {
      @Override
-     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
 +        mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data);
          if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
+             assumeNonNull(data);
              BookmarkId bookmarkId =
-                     BookmarkId.getBookmarkIdFromString(
+@@ -100,6 +116,21 @@ public class BookmarkActivity extends SnackbarActivity {
-@@ -95,6 +111,21 @@ public class BookmarkActivity extends SnackbarActivity {
          }
      }
  
@@ -200,7 +199,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
-@@ -18,6 +18,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+@@ -19,6 +19,7 @@ import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.base.supplier.Supplier;
  import org.chromium.chrome.R;
@@ -208,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
  import org.chromium.chrome.browser.app.download.home.DownloadPage;
  import org.chromium.chrome.browser.bookmarks.BookmarkPage;
  import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier;
-@@ -59,7 +60,7 @@ import org.chromium.ui.util.ColorUtils;
+@@ -63,7 +64,7 @@ import org.chromium.ui.util.ColorUtils;
   * Creates NativePage objects to show chrome-native:// URLs using the native Android view system.
   */
  public class NativePageFactory {
@@ -217,7 +216,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
      private final BottomSheetController mBottomSheetController;
      private final BrowserControlsManager mBrowserControlsManager;
      private final Supplier<Tab> mCurrentTabSupplier;
-@@ -82,7 +83,7 @@ public class NativePageFactory {
+@@ -87,7 +88,7 @@ public class NativePageFactory {
      private static NativePage sTestPage;
  
      public NativePageFactory(
@@ -226,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
              @NonNull BottomSheetController sheetController,
              @NonNull BrowserControlsManager browserControlsManager,
              @NonNull Supplier<Tab> currentTabSupplier,
-@@ -154,7 +155,7 @@ public class NativePageFactory {
+@@ -162,7 +163,7 @@ public class NativePageFactory {
  
      @VisibleForTesting
      static class NativePageBuilder {
@@ -235,10 +234,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
          private final BottomSheetController mBottomSheetController;
          private final Supplier<NewTabPageCreationTracker> mNewTabPageCreationTracker;
          private final BrowserControlsManager mBrowserControlsManager;
-@@ -251,7 +252,7 @@ public class NativePageFactory {
+@@ -271,7 +272,7 @@ public class NativePageFactory {
-                     mSnackbarManagerSupplier.get(),
+                             mBrowserControlsManager,
-                     tab.getProfile(),
+                             mTabModelSelector,
-                     new TabShim(tab, mBrowserControlsManager, mTabModelSelector),
+                             mEdgeToEdgeControllerSupplier),
 -                    mActivity.getComponentName());
 +                    mActivity.getComponentName(), mActivity);
          }
@@ -247,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -222,6 +222,8 @@ static_library("browser") {
+@@ -245,6 +245,8 @@ static_library("browser") {
      "bluetooth/chrome_bluetooth_delegate_impl_client.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -256,7 +255,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/chrome_bookmark_client.cc",
      "bookmarks/chrome_bookmark_client.h",
      "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1731,6 +1733,13 @@ static_library("browser") {
+@@ -1721,6 +1723,13 @@ static_library("browser") {
      ]
    }
  
@@ -270,7 +269,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3639,8 +3648,6 @@ static_library("browser") {
+@@ -3704,8 +3713,6 @@ static_library("browser") {
        "bookmarks/bookmark_expanded_state_tracker.h",
        "bookmarks/bookmark_expanded_state_tracker_factory.cc",
        "bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -282,19 +281,20 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
-@@ -68,6 +68,27 @@
+@@ -68,6 +68,28 @@
  #include "content/public/browser/web_contents.h"
  #include "url/gurl.h"
  
 +#include "base/android/content_uri_utils.h"
 +#include "base/android/path_utils.h"
 +#include "base/strings/utf_string_conversions.h"
-+#include "chrome/utility/importer/bookmark_html_reader.h"
 +#include "chrome/browser/bookmarks/bookmark_html_writer.h"
 +#include "chrome/browser/importer/profile_writer.h"
 +#include "chrome/browser/platform_util.h"
 +#include "chrome/browser/ui/chrome_select_file_policy.h"
 +#include "components/user_data_importer/common/imported_bookmark_entry.h"
++#include "components/user_data_importer/content/content_bookmark_parser.h"
++#include "components/user_data_importer/content/content_bookmark_parser_utils.h"
 +#include "chrome/common/url_constants.h"
 +#include "components/favicon_base/favicon_usage_data.h"
 +#include "components/search_engines/template_url.h"
@@ -310,65 +310,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  // Must come after all headers that specialize FromJniType() / ToJniType().
  #include "chrome/browser/bookmarks/android/jni_headers/BookmarkBridge_jni.h"
  
-@@ -86,6 +107,57 @@ using bookmarks::android::JavaBookmarkIdGetType;
+@@ -296,6 +318,10 @@ BookmarkBridge::~BookmarkBridge() {
- using content::BrowserThread;
- using power_bookmarks::PowerBookmarkMeta;
- 
-+namespace internal {
-+
-+// Returns true if |url| has a valid scheme that we allow to import. We
-+// filter out the URL with a unsupported scheme.
-+bool CanImportURL(const GURL& url) {
-+  // The URL is not valid.
-+  if (!url.is_valid())
-+    return false;
-+
-+  // Filter out the URLs with unsupported schemes.
-+  const char* const kInvalidSchemes[] = {"wyciwyg", "place"};
-+  for (size_t i = 0; i < std::size(kInvalidSchemes); ++i) {
-+    if (url.SchemeIs(kInvalidSchemes[i]))
-+      return false;
-+  }
-+
-+  // Check if |url| is about:blank.
-+  if (url == url::kAboutBlankURL)
-+    return true;
-+
-+  // If |url| starts with chrome:// or about:, check if it's one of the URLs
-+  // that we support.
-+  if (url.SchemeIs(content::kChromeUIScheme) ||
-+      url.SchemeIs(url::kAboutScheme)) {
-+    if (url.host_piece() == chrome::kChromeUIAboutHost)
-+      return true;
-+
-+    GURL fixed_url(url_formatter::FixupURL(url.spec(), std::string()));
-+    const base::span<const base::cstring_view> hosts = chrome::ChromeURLHosts();
-+    for (const base::cstring_view host : hosts) {
-+      if (fixed_url.DomainIs(host)) {
-+        return true;
-+      }
-+    }
-+
-+    if (base::Contains(chrome::ChromeDebugURLs(), fixed_url.spec())) {
-+      return true;
-+    }
-+
-+    // If url has either chrome:// or about: schemes but wasn't found in the
-+    // above lists, it means we don't support it, so we don't allow the user
-+    // to import it.
-+    return false;
-+  }
-+
-+  // Otherwise, we assume the url has a valid (importable) scheme.
-+  return true;
-+}
-+
-+} // internal
-+
- namespace {
- // The key used to connect the instance of the bookmark bridge to the bookmark
- // model.
-@@ -296,6 +368,10 @@ BookmarkBridge::~BookmarkBridge() {
    partner_bookmarks_shim_observation_.Reset();
    bookmark_model_observation_.Reset();
    profile_observation_.Reset();
@@ -379,7 +321,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
  }
  
  void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -847,6 +923,196 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -847,6 +873,177 @@ jint BookmarkBridge::GetTotalBookmarkCount(
    return count;
  }
  
@@ -527,43 +469,24 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +}
 +
 +void BookmarkBridge::FileSelectedImplOnUIThread(const base::FilePath& path,
-+                                        const std::string& contents) {
++                                                const std::string& contents) {
 +  if (contents.empty())
 +    return;
 +
 +  // the following import logic comes from BookmarksFileImporter class
-+  std::vector<user_data_importer::ImportedBookmarkEntry> bookmarks;
++  user_data_importer::BookmarkParser::ParsedBookmarks parsed_bookmarks =
-+  std::vector<user_data_importer::SearchEngineInfo> search_engines;
++      user_data_importer::ParseBookmarksUnsafe(contents);
-+  favicon_base::FaviconUsageDataList favicons;
-+
-+  bookmark_html_reader::ImportBookmarksFile(
-+      base::RepeatingCallback<bool(void)>(),
-+      base::BindRepeating(internal::CanImportURL),
-+      contents,
-+      &bookmarks,
-+      &search_engines,
-+      &favicons);
 +
 +  auto *writer = new ProfileWriter(profile_);
 +
-+  if (!bookmarks.empty()) {
++  if (!parsed_bookmarks.bookmarks.empty()) {
 +    // adding bookmarks will begin extensive changes to the model
-+    writer->AddBookmarksWithModel(bookmark_model_, bookmarks, u"Imported");
++    writer->AddBookmarksWithModel(bookmark_model_, parsed_bookmarks.bookmarks, u"Imported");
-+  }
-+  if (!search_engines.empty()) {
-+    TemplateURLService::OwnedTemplateURLVector owned_template_urls;
-+    for (const auto& search_engine : search_engines) {
-+      std::unique_ptr<TemplateURL> owned_template_url = CreateTemplateURL(
-+          search_engine.url, search_engine.keyword, search_engine.display_name);
-+      if (owned_template_url)
-+        owned_template_urls.push_back(std::move(owned_template_url));
-+    }
-+    writer->AddKeywords(std::move(owned_template_urls), false);
 +  }
 +
 +  std::stringstream message;
-+  message << "Imported " << bookmarks.size() << " bookmarks and " <<
++  message << "Imported " << parsed_bookmarks.bookmarks.size() << " bookmarks " <<
-+		search_engines.size() << " search engines from " << path.MaybeAsASCII();
++		" from " << path.MaybeAsASCII();
 +  auto result = message.str();
 +
 +  select_file_dialog_->ShowToast(result);
@@ -637,7 +560,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    void GetAllFoldersWithDepths(
        JNIEnv* env,
        const base::android::JavaParamRef<jobject>& j_folders_obj,
-@@ -390,6 +411,8 @@ class BookmarkBridge : public ProfileObserver,
+@@ -385,6 +406,8 @@ class BookmarkBridge : public ProfileObserver,
    void CreateOrDestroyAccountReadingListManagerIfNeeded();
  
    const raw_ptr<Profile> profile_;  // weak
@@ -646,7 +569,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
    base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
    const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
    const raw_ptr<bookmarks::ManagedBookmarkService>
-@@ -404,6 +427,7 @@ class BookmarkBridge : public ProfileObserver,
+@@ -399,6 +422,7 @@ class BookmarkBridge : public ProfileObserver,
    std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
        grouped_bookmark_actions_;
    PrefChangeRegistrar pref_change_registrar_;
@@ -654,7 +577,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
  
    // Information about the Partner bookmarks (must check for IsLoaded()).
    // This is owned by profile.
-@@ -437,6 +461,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -432,6 +456,10 @@ class BookmarkBridge : public ProfileObserver,
    base::TimeTicks load_start_time_;
    bool loading_notification_sent_ = false;
  
@@ -724,7 +647,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /**
       * Synchronously gets a list of bookmarks that match the specified search query.
       *
-@@ -1124,6 +1159,10 @@ class BookmarkBridge {
+@@ -1108,6 +1143,10 @@ class BookmarkBridge {
          void getChildIds(
                  long nativeBookmarkBridge, long id, int type, List<BookmarkId> bookmarksList);
  
@@ -758,7 +681,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -53,6 +53,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
+@@ -57,6 +57,8 @@ import org.chromium.components.image_fetcher.ImageFetcher;
  import org.chromium.components.image_fetcher.ImageFetcherConfig;
  import org.chromium.components.image_fetcher.ImageFetcherFactory;
  import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -767,7 +690,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
-@@ -322,6 +324,13 @@ public class BookmarkManagerCoordinator
+@@ -333,6 +335,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -784,7 +707,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -59,6 +59,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
+@@ -63,6 +63,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
  import org.chromium.components.embedder_support.util.UrlConstants;
  import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
  import org.chromium.components.power_bookmarks.PowerBookmarkType;
@@ -793,7 +716,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
  import org.chromium.ui.accessibility.AccessibilityState;
  import org.chromium.ui.listmenu.ListMenu;
  import org.chromium.ui.listmenu.ListMenuItemProperties;
-@@ -77,6 +79,47 @@ import java.util.function.BooleanSupplier;
+@@ -81,6 +83,47 @@ import java.util.function.BooleanSupplier;
  import java.util.function.Consumer;
  import java.util.function.Predicate;
  
@@ -840,8 +763,8 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 +
  /** Responsible for BookmarkManager business logic. */
  // TODO(crbug.com/40256938): Remove BookmarkDelegate if possible.
- class BookmarkManagerMediator
+ @NullMarked
-@@ -86,6 +129,9 @@ class BookmarkManagerMediator
+@@ -91,6 +134,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -851,7 +774,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /** Keeps track of whether drag is enabled / active for bookmark lists. */
      private class BookmarkDragStateDelegate implements DragStateDelegate {
          private BookmarkDelegate mBookmarkDelegate;
-@@ -583,6 +629,14 @@ class BookmarkManagerMediator
+@@ -597,6 +643,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -866,7 +789,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /** See BookmarkManager(Coordinator)#updateForUrl */
      void updateForUrl(String url) {
          // Bookmark model is null if the manager has been destroyed.
-@@ -758,6 +812,235 @@ class BookmarkManagerMediator
+@@ -769,6 +823,235 @@ class BookmarkManagerMediator
          }
      }
  
@@ -989,7 +912,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 +        // use the download ui and standard file saving
 +        DownloadLocationDialogController controller = new DownloadLocationDialogController() {
 +            @Override
-+            public void onDownloadLocationDialogComplete(String returnedPath) {}
++            public void onDownloadLocationDialogComplete(String returnedPath, boolean didUserConfirm) {}
 +
 +            @Override
 +            public void onDownloadLocationDialogCanceled() {}
@@ -1105,7 +1028,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
-@@ -16,6 +16,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+@@ -15,6 +15,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
  import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
  import org.chromium.chrome.browser.ui.native_page.NativePageHost;
  import org.chromium.components.embedder_support.util.UrlConstants;
@@ -1114,20 +1037,20 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 +import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  
  /** A native page holding a {@link BookmarkManagerCoordinator} on _tablet_. */
- public class BookmarkPage extends BasicNativePage {
+ @NullMarked
 @@ -35,7 +38,8 @@ public class BookmarkPage extends BasicNativePage {
-             @NonNull SnackbarManager snackbarManager,
+             SnackbarManager snackbarManager,
-             @NonNull Profile profile,
+             Profile profile,
-             @NonNull NativePageHost host,
+             NativePageHost host,
 -            @Nullable ComponentName componentName) {
 +            @Nullable ComponentName componentName,
 +            ChromeActivity activity) {
          super(host);
          mTitle = host.getContext().getString(R.string.bookmarks);
  
-@@ -55,6 +59,9 @@ public class BookmarkPage extends BasicNativePage {
+@@ -56,6 +60,9 @@ public class BookmarkPage extends BasicNativePage {
-                         new BookmarkManagerOpenerImpl(),
+                         PriceDropNotificationManagerFactory.create(profile),
-                         PriceDropNotificationManagerFactory.create(profile));
+                         host::createEdgeToEdgePadAdjuster);
          mBookmarkManagerCoordinator.setBasicNativePage(this);
 +        mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(),
 +            new ModalDialogManager(
@@ -1196,7 +1119,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbarMediator.java
-@@ -140,6 +140,10 @@ class BookmarkToolbarMediator
+@@ -139,6 +139,10 @@ class BookmarkToolbarMediator
                      mBookmarkDelegate = bookmarkDelegate;
                      mModel.set(
                              BookmarkToolbarProperties.NAVIGATE_BACK_RUNNABLE, this::onNavigateBack);
@@ -1315,7 +1238,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
  
      private boolean mLocationDialogManaged;
  
-@@ -153,7 +153,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
+@@ -154,7 +154,7 @@ public class DownloadLocationDialogCoordinator implements ModalDialogProperties.
       * Called after retrieved the download directory options.
       * @param dirs An list of available download directories.
       */
@@ -1327,18 +1250,18 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -223,6 +223,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -251,6 +251,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kBatchTabRestore,
      &kBlockIntentsWhileLocked,
      &kBookmarkPaneAndroid,
 +    &kBookmarksExportUseSaf,
-     &kBottomBrowserControlsRefactor,
-     &kTabClosureMethodRefactor,
      &kBrowserControlsDebugging,
+     &kBrowserControlsEarlyResize,
+     &kCacheActivityTaskID,
 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
-@@ -625,6 +625,7 @@ public abstract class ChromeFeatureList {
+@@ -689,6 +689,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
      public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1349,7 +1272,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
 --- a/chrome/browser/importer/profile_writer.cc
 +++ b/chrome/browser/importer/profile_writer.cc
-@@ -125,6 +125,16 @@ void ProfileWriter::AddBookmarks(
+@@ -126,6 +126,16 @@ void ProfileWriter::AddBookmarks(
      return;
  
    BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -1401,7 +1324,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
  
      /** Whether Chrome is set as the default browser. Default value is false. */
      public static final String CHROME_DEFAULT_BROWSER = "applink.chrome_default_browser";
-@@ -999,6 +1001,7 @@ public final class ChromePreferenceKeys {
+@@ -1017,6 +1019,7 @@ public final class ChromePreferenceKeys {
                  AUXILIARY_SEARCH_SCHEMA_VERSION,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1437,144 +1360,39 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_NOTIFICATION_CATEGORY_VR" desc="Label for notifications in VR, within a list of notification categories. [CHAR_LIMIT=32]">
          Virtual Reality
        </message>
-diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
---- a/chrome/common/BUILD.gn
-+++ b/chrome/common/BUILD.gn
-@@ -352,6 +352,9 @@ static_library("common_lib") {
-     sources += [
-       "media/chrome_media_drm_bridge_client.cc",
-       "media/chrome_media_drm_bridge_client.h",
-+      ## Bromite dependencies for bookmark import functionality
-+      "//components/user_data_importer/common/imported_bookmark_entry.cc",
-+      "//components/user_data_importer/common/imported_bookmark_entry.h",
-     ]
-   } else {
-     # Non-Android.
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -88,8 +88,6 @@ static_library("utility") {
+@@ -222,6 +222,13 @@ static_library("utility") {
- 
-   if (!is_android) {
-     sources += [
--      "importer/bookmark_html_reader.cc",
--      "importer/bookmark_html_reader.h",
-       "importer/bookmarks_file_importer.cc",
-       "importer/bookmarks_file_importer.h",
-       "importer/external_process_importer_bridge.cc",
-@@ -222,6 +220,11 @@ static_library("utility") {
      deps += [ "//chrome/services/pdf:lib" ]
    }
  
-+  sources += [
++  if (is_android) {
-+    "importer/bookmark_html_reader.cc",
++    sources += [
-+    "importer/bookmark_html_reader.h",
++      "importer/bookmarks_file_importer.cc",
-+  ]
++      "importer/bookmarks_file_importer.h",
++    ]
++  }
 +
    # NSS decryptor is not needed on ChromeOS.
    if (!is_chromeos && use_nss_certs) {
      sources += [
-diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
+diff --git a/chrome/utility/importer/bookmarks_file_importer.cc b/chrome/utility/importer/bookmarks_file_importer.cc
---- a/chrome/utility/importer/bookmark_html_reader.cc
+--- a/chrome/utility/importer/bookmarks_file_importer.cc
-+++ b/chrome/utility/importer/bookmark_html_reader.cc
++++ b/chrome/utility/importer/bookmarks_file_importer.cc
-@@ -16,7 +16,9 @@
+@@ -103,8 +103,12 @@ void BookmarksFileImporter::StartImport(
- #include "base/strings/string_util.h"
+       user_data_importer::ParseBookmarksUnsafe(raw_html);
- #include "base/strings/utf_string_conversions.h"
+ 
- #include "base/time/time.h"
+   if (!parsed_bookmarks.bookmarks.empty()) {
-+#if !BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_ANDROID)
- #include "chrome/utility/importer/favicon_reencode.h"
++    std::u16string first_folder_name;
++#else
+     std::u16string first_folder_name =
+         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP);
 +#endif
- #include "components/search_engines/search_terms_data.h"
+     std::erase_if(parsed_bookmarks.bookmarks,
- #include "components/search_engines/template_url.h"
+                   [](user_data_importer::ImportedBookmarkEntry bookmark) {
- #include "components/user_data_importer/common/imported_bookmark_entry.h"
+                     return !internal::CanImportURL(bookmark.url);
-@@ -55,6 +57,7 @@ bool GetAttribute(const std::string& attribute_list,
-   return true;
- }
- 
-+#if !BUILDFLAG(IS_ANDROID)
- // Given the URL of a page and a favicon data URL, adds an appropriate record
- // to the given favicon usage vector.
- void DataURLToFaviconUsage(const GURL& link_url,
-@@ -88,6 +91,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
- 
-   favicons->push_back(usage);
- }
-+#endif
- 
- }  // namespace
- 
-@@ -108,14 +112,29 @@ static std::string stripDt(const std::string& lineDt) {
- }
- 
- void ImportBookmarksFile(
--    base::RepeatingCallback<bool(void)> cancellation_callback,
--    base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
-+    const base::RepeatingCallback<bool(void)> cancellation_callback,
-+    const base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
-     const base::FilePath& file_path,
-     std::vector<user_data_importer::ImportedBookmarkEntry>* bookmarks,
-     std::vector<user_data_importer::SearchEngineInfo>* search_engines,
-     favicon_base::FaviconUsageDataList* favicons) {
-   std::string content;
--  base::ReadFileToString(file_path, &content);
-+  if (!base::ReadFileToString(file_path, &content)) {
-+     LOG(ERROR) << "Could not directly read bookmarks import file";
-+     return;
-+  }
-+
-+  ImportBookmarksFile(cancellation_callback, valid_url_callback,
-+    content, bookmarks, search_engines, favicons);
-+}
-+
-+void ImportBookmarksFile(
-+    base::RepeatingCallback<bool(void)> cancellation_callback,
-+    base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
-+    const std::string& content,
-+    std::vector<user_data_importer::ImportedBookmarkEntry>* bookmarks,
-+    std::vector<user_data_importer::SearchEngineInfo>* search_engines,
-+    favicon_base::FaviconUsageDataList* favicons) {
-   std::vector<std::string> lines = base::SplitString(
-       content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
- 
-@@ -128,6 +147,7 @@ void ImportBookmarksFile(
-   std::vector<std::u16string> path;
-   size_t toolbar_folder_index = 0;
-   std::string charset = "UTF-8";  // If no charset is specified, assume utf-8.
-+
-   for (size_t i = 0;
-        i < lines.size() &&
-            (cancellation_callback.is_null() || !cancellation_callback.Run());
-@@ -219,10 +239,12 @@ void ImportBookmarksFile(
-       }
-       bookmarks->push_back(entry);
- 
-+#if !BUILDFLAG(IS_ANDROID)
-       // Save the favicon. DataURLToFaviconUsage will handle the case where
-       // there is no favicon.
-       if (favicons)
-         DataURLToFaviconUsage(url, favicon, favicons);
-+#endif
- 
-       continue;
-     }
-diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
---- a/chrome/utility/importer/bookmark_html_reader.h
-+++ b/chrome/utility/importer/bookmark_html_reader.h
-@@ -53,6 +53,14 @@ void ImportBookmarksFile(
-     std::vector<user_data_importer::SearchEngineInfo>* search_engines,
-     favicon_base::FaviconUsageDataList* favicons);
- 
-+void ImportBookmarksFile(
-+    const base::RepeatingCallback<bool(void)> cancellation_callback,
-+    const base::RepeatingCallback<bool(const GURL&)> valid_url_callback,
-+    const std::string& content,
-+    std::vector<user_data_importer::ImportedBookmarkEntry>* bookmarks,
-+    std::vector<user_data_importer::SearchEngineInfo>* search_engines,
-+    favicon_base::FaviconUsageDataList* favicons);
-+
- // Returns true if |url| should be imported as a search engine, i.e. because it
- // has replacement terms. Chrome treats such bookmarks as search engines rather
- // than true bookmarks.
 diff --git a/components/headless/select_file_dialog/headless_select_file_dialog.cc b/components/headless/select_file_dialog/headless_select_file_dialog.cc
 --- a/components/headless/select_file_dialog/headless_select_file_dialog.cc
 +++ b/components/headless/select_file_dialog/headless_select_file_dialog.cc
@@ -1589,6 +1407,29 @@ diff --git a/components/headless/select_file_dialog/headless_select_file_dialog.
    SelectFileDialogCallback callback_;
  };
  
+diff --git a/components/user_data_importer/content/content_bookmark_parser_utils.cc b/components/user_data_importer/content/content_bookmark_parser_utils.cc
+--- a/components/user_data_importer/content/content_bookmark_parser_utils.cc
++++ b/components/user_data_importer/content/content_bookmark_parser_utils.cc
+@@ -89,6 +89,7 @@ std::optional<base::Time> GetTimeAttribute(const std::string& attribute_list,
+ 
+ // Given the URL of a page and a favicon data URL, adds an appropriate record
+ // to the given favicon usage vector.
++[[maybe_unused]]
+ void DataURLToFaviconUsage(const GURL& link_url,
+                            const GURL& favicon_data,
+                            favicon_base::FaviconUsageDataList* favicons) {
+@@ -438,9 +439,11 @@ BookmarkParser::ParsedBookmarks ParseBookmarksUnsafe(
+       }
+       parsing_result.bookmarks.push_back(std::move(entry));
+ 
++#if !BUILDFLAG(IS_ANDROID)
+       // Save the favicon. DataURLToFaviconUsage will handle the case where
+       // there is no favicon.
+       DataURLToFaviconUsage(url, favicon, &parsing_result.favicons);
++#endif
+ 
+       continue;
+     }
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc b/cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
 new file mode 100644
 --- /dev/null
@@ -1693,7 +1534,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
          return mimeTypes;
      }
  
-@@ -1155,6 +1169,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1168,6 +1182,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          return countAcceptTypesFor(superType) == mMimeTypes.size();
      }
  
@@ -1732,7 +1573,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_fil
 diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
 --- a/ui/shell_dialogs/select_file_dialog_android.cc
 +++ b/ui/shell_dialogs/select_file_dialog_android.cc
-@@ -175,6 +175,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+@@ -171,6 +171,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
        owning_window->GetJavaObject());
  }
  
@@ -1748,7 +1589,7 @@ diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/s
 diff --git a/ui/shell_dialogs/select_file_dialog_android.h b/ui/shell_dialogs/select_file_dialog_android.h
 --- a/ui/shell_dialogs/select_file_dialog_android.h
 +++ b/ui/shell_dialogs/select_file_dialog_android.h
-@@ -53,6 +53,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
+@@ -49,6 +49,8 @@ class SelectFileDialogImpl : public SelectFileDialog {
                        gfx::NativeWindow owning_window,
                        const GURL* caller) override;
  

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

@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  base/android/feature_map.cc                   |   5 +
  .../base/cached_flags/ValuesReturned.java     |   2 +-
  base/feature_list.cc                          |  76 ++++++++
- base/feature_list.h                           |  72 +++++++-
+ base/feature_list.h                           |  80 +++++++-
  build/android/gyp/java_cpp_features.py        |  17 ++
  chrome/android/java/res/values/values.xml     |   3 +
  .../java/res/xml/privacy_preferences.xml      |   4 +
@@ -42,7 +42,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../placeholder.txt                           |   1 +
  chrome/browser/ui/ui_features.cc              |   1 +
  chrome/browser/unexpire_flags.cc              |  15 +-
- chrome/common/chrome_features.cc              |   1 +
+ chrome/common/chrome_features.cc              |   2 +-
  .../browser_ui/accessibility/android/BUILD.gn |   1 +
  .../res/xml/accessibility_preferences.xml     |   3 +-
  .../accessibility/AccessibilitySettings.java  |   6 +-
@@ -107,7 +107,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  third_party/blink/public/common/features.h    |   1 +
  ui/base/ui_base_features.cc                   |   1 +
  ui/base/ui_base_features.h                    |   1 +
- 94 files changed, 826 insertions(+), 30 deletions(-)
+ 94 files changed, 834 insertions(+), 31 deletions(-)
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
  create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/java_template/CromiteCachedFlag.java.tmpl
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-cromite-flags-support.grdp
@@ -144,7 +144,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -178,6 +178,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -174,6 +174,8 @@ use_epoll = is_linux || is_chromeos || is_android
  # This does not include test code (test support and anything in the test
  # directory) which should use source_set as is recommended for GN targets).
  component("base") {
@@ -153,7 +153,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
    sources = [
      "allocator/allocator_check.cc",
      "allocator/allocator_check.h",
-@@ -1036,7 +1038,7 @@ component("base") {
+@@ -1043,7 +1045,7 @@ component("base") {
      "//build/config/compiler:wglobal_constructors",
    ]
  
@@ -224,7 +224,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  namespace {
  
  // Pointer to the FeatureList instance singleton that was set via
-@@ -472,6 +497,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
+@@ -470,6 +495,46 @@ bool FeatureList::IsEnabled(const Feature& feature) {
    return g_feature_list_instance->IsFeatureEnabled(feature);
  }
  
@@ -271,7 +271,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
  // static
  bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
    return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
-@@ -742,6 +807,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -737,6 +802,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
  
  void FeatureList::FinalizeInitialization() {
    DCHECK(!initialized_);
@@ -292,7 +292,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 diff --git a/base/feature_list.h b/base/feature_list.h
 --- a/base/feature_list.h
 +++ b/base/feature_list.h
-@@ -174,8 +174,10 @@ enum class FeatureMacroHandshake { kSecret };
+@@ -177,8 +177,10 @@ enum class FeatureMacroHandshake { kSecret };
  struct BASE_EXPORT LOGICALLY_CONST Feature {
    constexpr Feature(const char* name,
                      FeatureState default_state,
@@ -305,7 +305,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
  #if BUILDFLAG(ENABLE_BANNED_BASE_FEATURE_PREFIX)
      if (std::string_view(name).find(BUILDFLAG(BANNED_BASE_FEATURE_PREFIX)) ==
          0) {
-@@ -202,6 +204,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
+@@ -205,6 +207,9 @@ struct BASE_EXPORT LOGICALLY_CONST Feature {
    // command line switch.
    const FeatureState default_state;
  
@@ -315,7 +315,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
   private:
    friend class FeatureList;
  
-@@ -481,6 +486,11 @@ class BASE_EXPORT FeatureList {
+@@ -485,6 +490,11 @@ class BASE_EXPORT FeatureList {
    // instance, which is checked in builds with DCHECKs enabled.
    static bool IsEnabled(const Feature& feature);
  
@@ -327,7 +327,7 @@ diff --git a/base/feature_list.h b/base/feature_list.h
    // Some characters are not allowed to appear in feature names or the
    // associated field trial names, as they are used as special characters for
    // command-line serialization. This function checks that the strings are ASCII
-@@ -750,4 +760,62 @@ class BASE_EXPORT FeatureList {
+@@ -754,4 +764,70 @@ class BASE_EXPORT FeatureList {
  
  }  // namespace base
  
@@ -388,12 +388,20 @@ diff --git a/base/feature_list.h b/base/feature_list.h
 +      g_feature_default_state_overrider_ ##feature {namespace_value::feature, base::FEATURE_DISABLED_BY_DEFAULT}; \
 +  _Pragma("clang diagnostic pop")                               \
 +  static_assert(true, "") /* for a semicolon requirement */
++
++#define BASE_FEATURE_DISABLED(feature, name, default_state) \
++  BASE_FEATURE(feature, name, default_state); \
++  static_assert(default_state == base::FEATURE_DISABLED_BY_DEFAULT, "Check default state")
++
++#define BASE_FEATURE_ENABLED(feature, name, default_state) \
++  BASE_FEATURE(feature, name, default_state); \
++  static_assert(default_state == base::FEATURE_ENABLED_BY_DEFAULT, "Check default state")
 +
  #endif  // BASE_FEATURE_LIST_H_
 diff --git a/build/android/gyp/java_cpp_features.py b/build/android/gyp/java_cpp_features.py
 --- a/build/android/gyp/java_cpp_features.py
 +++ b/build/android/gyp/java_cpp_features.py
-@@ -22,10 +22,27 @@ class FeatureParserDelegate(java_cpp_utils.CppConstantParser.Delegate):
+@@ -21,10 +21,27 @@ class FeatureParserDelegate(java_cpp_utils.CppConstantParser.Delegate):
    #   ExtractConstantName() -> 'ConstantName'
    #   ExtractValue() -> '"StringNameOfTheFeature"'
    FEATURE_RE = re.compile(r'BASE_FEATURE\(k([^,]+),')
@@ -451,7 +459,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -38,7 +38,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -40,7 +40,7 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
  
      @Override
@@ -463,7 +471,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
-@@ -127,7 +127,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -130,7 +130,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      }
  
      @Override
@@ -475,15 +483,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/FragmentDependencyProvider.java
-@@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment;
+@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
+ import androidx.fragment.app.Fragment;
  import androidx.fragment.app.FragmentManager;
  
- import org.chromium.base.IntentUtils;
 +import org.chromium.base.supplier.Supplier;
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.OneshotSupplier;
- import org.chromium.chrome.browser.LaunchIntentDispatcher;
+ import org.chromium.chrome.browser.accessibility.settings.ChromeAccessibilitySettingsDelegate;
-@@ -76,18 +77,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -70,18 +71,21 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
      private final OneshotSupplier<SnackbarManager> mSnackbarManagerSupplier;
      private final OneshotSupplier<BottomSheetController> mBottomSheetControllerSupplier;
      private final ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
@@ -506,7 +514,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
+@@ -90,6 +94,10 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
              @NonNull Fragment fragment,
              @NonNull Context unusedContext) {
          // Common dependencies attachments.
@@ -528,7 +536,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import android.annotation.SuppressLint;
  import android.content.Context;
  import android.content.Intent;
-@@ -34,7 +35,9 @@ import org.chromium.base.Callback;
+@@ -32,7 +33,9 @@ import org.chromium.base.Callback;
  import org.chromium.base.CallbackUtils;
  import org.chromium.base.Log;
  import org.chromium.base.metrics.RecordHistogram;
@@ -538,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.base.supplier.OneshotSupplierImpl;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
-@@ -42,12 +45,14 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
+@@ -40,12 +43,14 @@ import org.chromium.chrome.browser.back_press.BackPressHelper;
  import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
@@ -553,7 +561,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
  import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
-@@ -89,6 +94,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -88,6 +93,40 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
          implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, SnackbarManageable {
      private static final String TAG = "SettingsActivity";
  
@@ -594,7 +602,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
      @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
      public static final String EXTRA_SHOW_FRAGMENT = "show_fragment";
  
-@@ -155,7 +194,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -154,7 +193,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                          mProfile,
                          mSnackbarManagerSupplier,
                          mBottomSheetControllerSupplier,
@@ -607,7 +615,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
-@@ -17,11 +17,12 @@ import org.chromium.base.version_info.VersionInfo;
+@@ -19,12 +19,13 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
@@ -616,24 +624,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
  import org.chromium.components.browser_ui.settings.SettingsUtils;
  
  /** Settings fragment containing preferences aimed at Chrome and web developers. */
+ @NullMarked
 -public class DeveloperSettings extends PreferenceFragmentCompat implements EmbeddableSettingsPage {
 +public class DeveloperSettings extends ChromeBaseSettingsFragment implements EmbeddableSettingsPage {
      private static final String UI_PREF_BETA_STABLE_HINT = "beta_stable_hint";
  
      // Non-translated strings:
-@@ -52,7 +53,7 @@ public class DeveloperSettings extends PreferenceFragmentCompat implements Embed
+@@ -55,7 +56,7 @@ public class DeveloperSettings extends PreferenceFragmentCompat implements Embed
      }
  
      @Override
--    public void onCreatePreferences(Bundle savedInstanceState, String s) {
+-    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String s) {
-+    public void onCreatePreferencesCromite(Bundle savedInstanceState, String s) {
++    public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String s) {
          SettingsUtils.addPreferencesFromResource(this, R.xml.developer_preferences);
  
          if (VersionInfo.isBetaBuild() || VersionInfo.isStableBuild()) {
 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
-@@ -406,6 +406,10 @@ using flags_ui::kOsLinux;
+@@ -381,6 +381,10 @@ using flags_ui::kOsLinux;
  using flags_ui::kOsMac;
  using flags_ui::kOsWin;
  
@@ -644,9 +653,9 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  namespace about_flags {
  
  namespace {
-@@ -4705,6 +4709,10 @@ const FeatureEntry::FeatureVariation kHistorySyncOptinExpansionPillVariations[]
+@@ -4903,6 +4907,10 @@ const FeatureEntry::FeatureVariation
-      nullptr}};
+ constexpr char kWebiumFlag[] = "webium";
- #endif  // BUILDFLAG(ENABLE_DICE_SUPPORT)
+ #endif  // !BUILDFLAG(IS_ANDROID)
  
 +#define FEATURE_PARAM_SECTION
 +#include "cromite_flags/chrome_browser_about_flags_cc.inc"
@@ -655,7 +664,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.
-@@ -4731,6 +4739,9 @@ const FeatureEntry::FeatureVariation kHistorySyncOptinExpansionPillVariations[]
+@@ -4929,6 +4937,9 @@ constexpr char kWebiumFlag[] = "webium";
  const FeatureEntry kFeatureEntries[] = {
  // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
  // //tools/flags/generate_unexpire_flags.py.
@@ -668,7 +677,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
-@@ -359,4 +359,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
+@@ -368,4 +368,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
               "RemovalOfIWAsFromTabCapture",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -677,7 +686,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
-@@ -135,6 +135,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+@@ -121,6 +121,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
  // module, e.g.
  // //chrome/browser/<foo_module>/features.h
  //
@@ -727,7 +736,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
-@@ -1348,5 +1348,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
+@@ -1489,5 +1489,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
               "WebOtpCrossDeviceSimpleString",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -737,14 +746,14 @@ 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
-@@ -286,6 +286,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
+@@ -337,6 +337,7 @@ constexpr base::FeatureParam<bool> kTouchToSearchCalloutSnippetAsSubtitle(
-     "trigger_id",
+     "snippet_as_subtitle",
-     /*default_value=*/"");
+     /*default_value=*/false);
  
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_h.inc"
- }  // namespace android
+ }  // namespace chrome::android
- }  // namespace chrome
  
+ #endif  // CHROME_BROWSER_FLAGS_ANDROID_CHROME_FEATURE_LIST_H_
 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
@@ -759,7 +768,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
  
-@@ -924,7 +928,7 @@ public abstract class ChromeFeatureList {
+@@ -1063,7 +1067,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sWebApkMinShellApkVersion =
              newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
  
@@ -768,7 +777,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
              List.of(
                      sAccountForSuppressedKeyboardInsets,
                      sAllowTabClosingUponMinimization,
-@@ -1048,6 +1052,13 @@ public abstract class ChromeFeatureList {
+@@ -1205,6 +1209,13 @@ public abstract class ChromeFeatureList {
                      sUseLibunwindstackNativeUnwinderAndroid,
                      sWebApkMinShellApkVersion);
  
@@ -958,8 +967,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
-@@ -500,4 +500,5 @@ bool HasTabSearchToolbarButton() {
+@@ -619,4 +619,5 @@ bool IsBookmarkTabGroupConversionEnabled() {
-   return has_tab_search_toolbar_button;
+   return base::FeatureList::IsEnabled(kBookmarkTabGroupConversion);
  }
  
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
@@ -967,7 +976,7 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
 --- a/chrome/browser/unexpire_flags.cc
 +++ b/chrome/browser/unexpire_flags.cc
-@@ -12,6 +12,7 @@
+@@ -8,6 +8,7 @@
  #include "base/containers/contains.h"
  #include "base/containers/flat_map.h"
  #include "base/no_destructor.h"
@@ -975,7 +984,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
  #include "chrome/browser/expired_flags_list.h"
  #include "chrome/browser/unexpire_flags_gen.h"
  #include "chrome/common/chrome_version.h"
-@@ -117,7 +118,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
+@@ -114,7 +115,19 @@ bool IsFlagExpired(const flags_ui::FlagsStorage* storage,
  
    // Otherwise, the flag is expired if its expiration mstone is less than the
    // mstone of this copy of Chromium.
@@ -999,10 +1008,11 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1795,4 +1795,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
+@@ -1977,5 +1977,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,
-              "DisableShortcutsEnableDiy",
+ BASE_FEATURE(kSilentPolicyAndDefaultAppUpdating,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+              "SilentPolicyAndDefaultAppUpdating",
- 
+              base::FEATURE_DISABLED_BY_DEFAULT);
+-
 +#include "cromite_flags/chrome_common_chrome_features_cc.inc"
  }  // namespace features
 diff --git a/components/browser_ui/accessibility/android/BUILD.gn b/components/browser_ui/accessibility/android/BUILD.gn
@@ -1146,11 +1156,11 @@ diff --git a/components/components_strings.grd b/components/components_strings.g
 +      <part file="cromite_components_strings_grd/placeholder.txt"/>
        <part file="arc_strings.grdp" />
        <part file="autofill_payments_strings.grdp" />
-       <part file="autofill_prediction_improvements_strings.grdp" />
+       <part file="autofill_strings.grdp" />
 diff --git a/components/content_settings/core/common/features.cc b/components/content_settings/core/common/features.cc
 --- a/components/content_settings/core/common/features.cc
 +++ b/components/content_settings/core/common/features.cc
-@@ -167,5 +167,6 @@ BASE_FEATURE(kForceAllowStorageAccess,
+@@ -181,5 +181,6 @@ BASE_FEATURE(kForceAllowStorageAccess,
               "ForceAllowStorageAccess",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -1186,16 +1196,16 @@ diff --git a/components/offline_pages/core/offline_page_feature.h b/components/o
 diff --git a/components/password_manager/core/browser/features/password_features.cc b/components/password_manager/core/browser/features/password_features.cc
 --- a/components/password_manager/core/browser/features/password_features.cc
 +++ b/components/password_manager/core/browser/features/password_features.cc
-@@ -183,4 +183,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
+@@ -219,4 +219,5 @@ BASE_FEATURE(kRetrieveTrustedVaultKeyKeyboardAccessoryAction,
-              "ImprovedPasswordChangeService",
               base::FEATURE_DISABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_ANDROID)
  
 +#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
  }  // namespace password_manager::features
 diff --git a/components/permissions/features.cc b/components/permissions/features.cc
 --- a/components/permissions/features.cc
 +++ b/components/permissions/features.cc
-@@ -146,6 +146,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
+@@ -139,6 +139,8 @@ BASE_FEATURE(kOsAdditionalSecurityPermissionKillSwitch,
               "OsAdditionalSecurityPermissionKillSwitch",
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
@@ -1249,7 +1259,7 @@ diff --git a/components/variations/synthetic_trials_active_group_id_provider.h b
 diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flags_state.cc
 --- a/components/webui/flags/flags_state.cc
 +++ b/components/webui/flags/flags_state.cc
-@@ -376,6 +376,21 @@ void FlagsState::GetSwitchesAndFeaturesFromFlags(
+@@ -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);
@@ -1271,7 +1281,7 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
      CHECK(entry_it != name_to_switch_map.end());
  
      const SwitchEntry& entry = entry_it->second;
-@@ -709,6 +724,27 @@ void FlagsState::GetFlagFeatureEntries(
+@@ -710,6 +725,27 @@ void FlagsState::GetFlagFeatureEntries(
        data.Set("links", std::move(links));
      }
  
@@ -1299,7 +1309,7 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
      switch (entry.type) {
        case FeatureEntry::SINGLE_VALUE:
        case FeatureEntry::SINGLE_DISABLE_VALUE:
-@@ -836,6 +872,16 @@ void FlagsState::AddSwitchesToCommandLine(
+@@ -837,6 +873,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()) {
@@ -1316,7 +1326,7 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
        NOTREACHED();
      }
  
-@@ -1092,6 +1138,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
+@@ -1093,6 +1139,14 @@ const FeatureEntry* FlagsState::FindFeatureEntryByName(
  bool FlagsState::IsSupportedFeature(const FlagsStorage* storage,
                                      const std::string& name,
                                      int platform_mask) const {
@@ -1331,7 +1341,7 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
    for (const auto& entry : feature_entries_) {
      DCHECK(entry.IsValid());
      if (!(entry.supported_platforms & platform_mask)) {
-@@ -1130,6 +1184,11 @@ void FlagsState::SetFlags(
+@@ -1131,6 +1185,11 @@ void FlagsState::SetFlags(
          FindFeatureEntryByName(feature_internal_name);
      // Since this flag is currently enabled, we know for sure that we can find
      // its feature entry using its internal name.
@@ -1346,7 +1356,7 @@ diff --git a/components/webui/flags/flags_state.cc b/components/webui/flags/flag
 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 {
+@@ -391,3 +391,27 @@ cr-tabs {
      padding-top: 1.5rem;
    }
  }
@@ -1385,7 +1395,7 @@ diff --git a/components/webui/flags/resources/app.html.ts b/components/webui/fla
  <div id="header">
    <div class="flex-container">
      <div class="flex search-container">
-@@ -107,6 +108,32 @@ export function getHtml(this: AppElement) {
+@@ -109,6 +110,32 @@ export function getHtml(this: AppElement) {
          <div class="no-match" role="alert" hidden>$i18n{no-results}</div>
        </div>
  </if>
@@ -1418,7 +1428,7 @@ diff --git a/components/webui/flags/resources/app.html.ts b/components/webui/fla
      </div>
      <div id="needs-restart" ?show="${this.needsRestart}"
          role="${this.getNeedsRestartRole_()}">
-@@ -127,6 +154,7 @@ export function getHtml(this: AppElement) {
+@@ -129,6 +156,7 @@ export function getHtml(this: AppElement) {
      </div>
    </div>
  </div>
@@ -1491,7 +1501,7 @@ diff --git a/components/webui/flags/resources/app.ts b/components/webui/flags/re
 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 @@
+@@ -17,6 +17,7 @@
  }
  
  .experiment {
@@ -1499,7 +1509,7 @@ diff --git a/components/webui/flags/resources/experiment.css b/components/webui/
    color: var(--secondary-color);
    line-height: 1.45;
    width: 100%;
-@@ -79,6 +80,11 @@
+@@ -84,6 +85,11 @@
    resize: none;
  }
  
@@ -1511,7 +1521,7 @@ diff --git a/components/webui/flags/resources/experiment.css b/components/webui/
  select {
    background: white;
    border: 1px solid var(--link-color);
-@@ -155,6 +161,7 @@ input {
+@@ -160,6 +166,7 @@ input {
  @media (max-width: 480px) {
    .experiment {
      border-bottom: 1px solid var(--separator-color);
@@ -1519,7 +1529,7 @@ diff --git a/components/webui/flags/resources/experiment.css b/components/webui/
    }
  
    .experiment-name {
-@@ -172,7 +179,6 @@ input {
+@@ -177,7 +184,6 @@ input {
    .experiment .experiment-actions {
      max-width: 100%;
      padding-top: 12px;
@@ -1527,7 +1537,7 @@ diff --git a/components/webui/flags/resources/experiment.css b/components/webui/
      width: 100%;
    }
  
-@@ -180,7 +186,6 @@ input {
+@@ -185,7 +191,6 @@ input {
    .body {
      overflow: hidden;
      text-overflow: ellipsis;
@@ -1551,7 +1561,7 @@ diff --git a/components/webui/flags/resources/experiment.html.ts b/components/we
 @@ -86,7 +87,9 @@ export function getHtml(this: ExperimentElement) {
              @change="${this.onExperimentSelectChange_}">
            ${this.feature_.options!.map(option => html`
-             <option ?selected="${option.selected}">
+             <option .selected="${option.selected}">
 -              ${option.description}
 +              ${option.description == "Default" && this.feature_.default_value !== undefined
 +                  ? option.description + " (" + this.feature_.default_value + ")"
@@ -1574,7 +1584,7 @@ diff --git a/components/webui/flags/resources/experiment.ts b/components/webui/f
    };
  
    // Whether the controls to change the experiment state should be hidden.
-@@ -127,9 +132,12 @@ export class ExperimentElement extends CrLitElement {
+@@ -121,9 +126,12 @@ export class ExperimentElement extends CrLitElement {
    }
  
    protected getExperimentTitle_(): string {
@@ -1628,16 +1638,16 @@ diff --git a/components/webui/version/version_handler_helper.cc b/components/web
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
-@@ -596,4 +596,5 @@ BASE_FEATURE(kDisallowRasterInterfaceWithoutSkiaBackend,
+@@ -743,4 +743,5 @@ bool IsEnforceSameDocumentOriginInvariantsEnabled() {
- 
+              blink::features::kTreatMhtmlInitialDocumentLoadsAsCrossDocument);
- // Please keep features in alphabetical order.
+ }
  
 +#include "cromite_flags/content_common_features_cc.inc"
  }  // namespace features
 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
-@@ -1527,4 +1527,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
+@@ -1676,4 +1676,5 @@ bool IsPushSubscriptionChangeEventEnabled() {
               features::kPushSubscriptionChangeEventOnResubscribe);
  }
  
@@ -1646,7 +1656,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
-@@ -361,6 +361,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
+@@ -400,6 +400,7 @@ CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();
  
@@ -1992,7 +2002,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
-@@ -1843,5 +1843,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -2008,5 +2008,5 @@ uint32_t GetPassthroughAudioFormats() {
    return 0;
  #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  }
@@ -2002,7 +2012,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
-@@ -569,5 +569,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
+@@ -601,5 +601,5 @@ MEDIA_EXPORT bool IsOutOfProcessVideoDecodingEnabled();
  MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
  
  }  // namespace media
@@ -2012,18 +2022,18 @@ diff --git a/media/base/media_switches.h b/media/base/media_switches.h
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -784,4 +784,5 @@ BASE_FEATURE(kRestrictAbusePortsOnLocalhost,
+@@ -909,4 +909,5 @@ BASE_FEATURE_PARAM(bool,
-              "RestrictAbusePortsOnLocalhost",
+                    "url_request_redirect_job",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+                    false);
  
 +#include "cromite_flags/net_base_features_cc.inc"
  }  // namespace net::features
 diff --git a/net/base/features.h b/net/base/features.h
 --- a/net/base/features.h
 +++ b/net/base/features.h
-@@ -800,6 +800,7 @@ NET_EXPORT extern const base::FeatureParam<std::string>
+@@ -896,6 +896,7 @@ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(bool, kNetTaskSchedulerURLRequestJob);
- // Finch-controlled list of ports that should be blocked on localhost.
+ NET_EXPORT BASE_DECLARE_FEATURE_PARAM(bool,
- NET_EXPORT BASE_DECLARE_FEATURE(kRestrictAbusePortsOnLocalhost);
+                                       kNetTaskSchedulerURLRequestRedirectJob);
  
 +#include "cromite_flags/net_base_features_h.inc"
  }  // namespace net::features
@@ -2032,18 +2042,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
-@@ -617,4 +617,5 @@ BASE_FEATURE_PARAM(size_t,
+@@ -666,4 +666,5 @@ BASE_FEATURE_PARAM(bool,
-                    /*name=*/"max_size",
+                    "url_loader",
-                    1'000'000);
+                    false);
  
 +#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
-@@ -340,6 +340,7 @@ BASE_DECLARE_FEATURE_PARAM(size_t, kSharedDictionaryCacheSize);
+@@ -366,6 +366,7 @@ BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerResourceScheduler);
  COMPONENT_EXPORT(NETWORK_CPP_FLAGS_AND_SWITCHES)
- BASE_DECLARE_FEATURE_PARAM(size_t, kSharedDictionaryCacheMaxSizeBytes);
+ BASE_DECLARE_FEATURE_PARAM(bool, kNetworkServiceTaskSchedulerURLLoader);
  
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
  }  // namespace network::features
@@ -2052,7 +2062,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
-@@ -2912,4 +2912,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
+@@ -2927,4 +2927,5 @@ bool IsXrDevice() {
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2061,7 +2071,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
-@@ -1896,6 +1896,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
+@@ -1912,6 +1912,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -2072,8 +2082,8 @@ 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
-@@ -506,4 +506,5 @@ bool IsPixelCanvasRecordingEnabled() {
+@@ -483,4 +483,5 @@ bool IsHandleIMESpanChangesOnUpdateCompositionEnabled() {
-   return base::FeatureList::IsEnabled(features::kEnablePixelCanvasRecording);
+       features::kHandleIMESpanChangesOnUpdateComposition);
  }
  
 +#include "cromite_flags/ui_base_features_cc.inc"
@@ -2081,9 +2091,9 @@ 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
-@@ -252,6 +252,7 @@ BASE_DECLARE_FEATURE(kEnablePixelCanvasRecording);
+@@ -242,6 +242,7 @@ BASE_DECLARE_FEATURE(kHandleIMESpanChangesOnUpdateComposition);
- 
+ COMPONENT_EXPORT(UI_BASE_FEATURES)
- bool COMPONENT_EXPORT(UI_BASE_FEATURES) IsPixelCanvasRecordingEnabled();
+ bool IsHandleIMESpanChangesOnUpdateCompositionEnabled();
  
 +#include "cromite_flags/ui_base_features_h.inc"
  }  // namespace features

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

@@ -0,0 +1,932 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 22 Aug 2025 15:41:58 +0000
+Subject: Add cromite test support
+
+Allows the activation of specific APIs used for cromite testing.
+API are only available on the chrome://version page.
+It allows the use of tools such as Browserstack for test automation.
+Do not activate the corresponding options (available in the developer
+settings) if you do not know what you are doing.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ .../java/res/xml/developer_preferences.xml    |  12 ++
+ .../init/ProcessInitializationHandler.java    |   6 +-
+ .../tracing/settings/DeveloperSettings.java   |   2 +-
+ chrome/browser/BUILD.gn                       |   5 +
+ chrome/browser/android/devtools_server.cc     |  10 +
+ ...ontent_browser_client_receiver_bindings.cc |  10 +
+ .../cromite/cromite_private_api_host.cc       |  74 +++++++
+ .../cromite/cromite_private_api_host.h        |  54 +++++
+ .../browser/flags/cromite/sActAsWebView.java  |  33 +++
+ .../cromite/sEnableCromiteTestSupport.java    |  33 +++
+ .../NotificationPermissionController.java     |   1 +
+ chrome/browser/ui/startup/bad_flags_prompt.cc |   1 +
+ chrome/common/BUILD.gn                        |   1 +
+ .../cromite_private_api_extension.mojom       |   7 +
+ chrome/renderer/BUILD.gn                      |   2 +
+ .../chrome_content_renderer_client.cc         |   2 +
+ .../cromite/cromite_private_api_extension.cc  | 203 ++++++++++++++++++
+ .../cromite/cromite_private_api_extension.h   |  65 ++++++
+ .../component_updater_service.h               |   1 +
+ .../browser/devtools/devtools_http_handler.cc |   7 +-
+ content/browser/log_console_message.cc        |  15 +-
+ content/browser/log_console_message.h         |   3 +-
+ .../renderer_host/render_frame_host_impl.cc   |  13 +-
+ .../about_flags_cc/Enable-test-support.inc    |  19 ++
+ .../Enable-test-support.inc                   |   7 +
+ .../Enable-test-support.inc                   |   2 +
+ 26 files changed, 581 insertions(+), 7 deletions(-)
+ create mode 100644 chrome/browser/cromite/cromite_private_api_host.cc
+ create mode 100644 chrome/browser/cromite/cromite_private_api_host.h
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+ create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+ create mode 100644 chrome/common/cromite_private_api_extension.mojom
+ create mode 100644 chrome/renderer/cromite/cromite_private_api_extension.cc
+ create mode 100644 chrome/renderer/cromite/cromite_private_api_extension.h
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+ create mode 100644 cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+
+diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml
+--- a/chrome/android/java/res/xml/developer_preferences.xml
++++ b/chrome/android/java/res/xml/developer_preferences.xml
+@@ -12,6 +12,18 @@ found in the LICENSE file.
+         android:fragment="org.chromium.chrome.browser.tracing.settings.TracingSettings"
+         android:key="tracing"
+         android:title="Tracing" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="enable_cromite_test_support"
++        android:title="Enable support for cromite test"
++        android:summary="Setting allows the activation of specific APIs used for cromite testing. Do not activate if you do not know what you are doing."
++        app:featureName="enable-cromite-test-support"
++        app:needRestart="true" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:key="act_as_webview"
++        android:title="Enable webview support for cromite test"
++        android:summary="Setting allows the activation of specific APIs used for cromite testing. Do not activate if you do not know what you are doing."
++        app:featureName="act-as-webview"
++        app:needRestart="true" />
+     <Preference
+         android:key="test_gwp_asan"
+         android:title="Test Gwp Asan"/>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
+@@ -139,6 +139,7 @@ import org.chromium.ui.base.PhotoPickerListener;
+ import org.chromium.ui.base.SelectFileDialog;
+ import org.chromium.ui.base.WindowAndroid;
+ import org.chromium.url.GURL;
++import org.chromium.chrome.browser.flags.cromite.sActAsWebView;
+ 
+ import java.io.File;
+ import java.nio.charset.StandardCharsets;
+@@ -698,7 +699,10 @@ public class ProcessInitializationHandler {
+ 
+         tasks.add(
+                 () -> {
+-                    mDevToolsServer = new DevToolsServer(DEV_TOOLS_SERVER_SOCKET_PREFIX);
++                    String socketPrefix = DEV_TOOLS_SERVER_SOCKET_PREFIX;
++                    if (sActAsWebView.getInstance().isEnabled())
++                        socketPrefix = "weblayer";
++                    mDevToolsServer = new DevToolsServer(socketPrefix);
+                     mDevToolsServer.setRemoteDebuggingEnabled(
+                             true, DevToolsServer.Security.ALLOW_DEBUG_PERMISSION);
+                 });
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
+@@ -37,7 +37,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
+     private final ObservableSupplier<String> mPageTitle =
+             new ObservableSupplierImpl<>(MSG_DEVELOPER_OPTIONS_TITLE);
+ 
+-    private static @Nullable Boolean sIsEnabledForTests;
++    private static @Nullable Boolean sIsEnabledForTests = true;
+ 
+     public static boolean shouldShowDeveloperSettings() {
+         // Always enabled on canary, dev and local builds, otherwise can be enabled by tapping the
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
++++ b/chrome/browser/BUILD.gn
+@@ -188,6 +188,11 @@ source_set("shell_integration") {
+ # require many files from it. This makes linking more efficient.
+ static_library("browser") {
+   sources = [
++    "cromite/cromite_private_api_host.cc",
++    "cromite/cromite_private_api_host.h",
++  ]
++
++  sources += [
+     "about_flags.cc",
+     "accessibility/accessibility_labels_service.cc",
+     "accessibility/accessibility_labels_service.h",
+diff --git a/chrome/browser/android/devtools_server.cc b/chrome/browser/android/devtools_server.cc
+--- a/chrome/browser/android/devtools_server.cc
++++ b/chrome/browser/android/devtools_server.cc
+@@ -12,6 +12,7 @@
+ #include "base/command_line.h"
+ #include "base/compiler_specific.h"
+ #include "base/files/file_path.h"
++#include "base/feature_list.h"
+ #include "base/functional/bind.h"
+ #include "base/functional/callback.h"
+ #include "base/strings/string_number_conversions.h"
+@@ -32,6 +33,7 @@
+ #include "content/public/browser/render_view_host.h"
+ #include "content/public/browser/web_contents.h"
+ #include "content/public/browser/web_contents_delegate.h"
++#include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/url_constants.h"
+ #include "net/base/net_errors.h"
+@@ -64,6 +66,8 @@ const int kBackLog = 10;
+ 
+ bool AuthorizeSocketAccessWithDebugPermission(
+     const net::UnixDomainServerSocket::Credentials& credentials) {
++  if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
++    return true;
+   JNIEnv* env = base::android::AttachCurrentThread();
+   return Java_DevToolsServer_checkDebugPermission(env, credentials.process_id,
+                                                   credentials.user_id) ||
+@@ -127,6 +131,10 @@ DevToolsServer::DevToolsServer(const std::string& socket_name_prefix)
+     : socket_name_(base::StringPrintf(kDevToolsChannelNameFormat,
+                                       socket_name_prefix.c_str())),
+       is_started_(false) {
++  if (base::FeatureList::IsEnabled(features::kActAsWebView)) {
++    socket_name_ = base::StringPrintf("%s_devtools_remote_%d",
++        socket_name_prefix.c_str(), getpid());
++  }
+   // Override the socket name if one is specified on the command line.
+   const base::CommandLine& command_line =
+       *base::CommandLine::ForCurrentProcess();
+@@ -144,6 +152,8 @@ void DevToolsServer::Start(bool allow_debug_permission) {
+   if (is_started_)
+     return;
+ 
++  DLOG(INFO) << "---DevToolsServer::Start allow_debug_permission=" << allow_debug_permission;
++  DLOG(INFO) << "---socket_name_=" << socket_name_;
+   net::UnixDomainServerSocket::AuthCallback auth_callback =
+       allow_debug_permission
+           ? base::BindRepeating(&AuthorizeSocketAccessWithDebugPermission)
+diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
++++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+@@ -10,6 +10,7 @@
+ #include "build/build_config.h"
+ #include "chrome/browser/browser_process.h"
+ #include "chrome/browser/chrome_browser_interface_binders.h"
++#include "chrome/browser/cromite/cromite_private_api_host.h"
+ #include "chrome/browser/chrome_browser_interface_binders_webui.h"
+ #include "chrome/browser/chrome_content_browser_client.h"
+ #include "chrome/browser/chrome_content_browser_client_parts.h"
+@@ -494,6 +495,15 @@ void ChromeContentBrowserClient::
+                                                     render_frame_host);
+       },
+       &render_frame_host));
++  associated_registry.AddInterface<
++      chrome::mojom::CromitePrivateApiExtension>(base::BindRepeating(
++      [](content::RenderFrameHost* render_frame_host,
++         mojo::PendingAssociatedReceiver<
++             chrome::mojom::CromitePrivateApiExtension> receiver) {
++        CromitePrivateApiHost::BindHost(std::move(receiver),
++                                        render_frame_host);
++      },
++      &render_frame_host));
+   associated_registry.AddInterface<
+       chrome::mojom::GoogleAccountsPrivateApiExtension>(base::BindRepeating(
+       [](content::RenderFrameHost* render_frame_host,
+diff --git a/chrome/browser/cromite/cromite_private_api_host.cc b/chrome/browser/cromite/cromite_private_api_host.cc
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/cromite/cromite_private_api_host.cc
+@@ -0,0 +1,74 @@
++#include "chrome/browser/cromite/cromite_private_api_host.h"
++
++#include "base/json/json_writer.h"
++
++#include "chrome/browser/browser_process.h"
++#include "components/component_updater/component_updater_service.h"
++#include "components/update_client/crx_update_item.h"
++#include "content/public/browser/document_user_data.h"
++#include "content/public/browser/navigation_handle.h"
++#include "content/public/browser/render_frame_host.h"
++#include "content/public/browser/site_instance.h"
++
++CromitePrivateApiHost::CromitePrivateApiHost(
++    content::RenderFrameHost* rfh)
++    : DocumentUserData<CromitePrivateApiHost>(rfh),
++      receiver_(this) {}
++
++CromitePrivateApiHost::~CromitePrivateApiHost() = default;
++
++DOCUMENT_USER_DATA_KEY_IMPL(CromitePrivateApiHost);
++
++void CromitePrivateApiHost::BindReceiver(
++    mojo::PendingAssociatedReceiver<
++        chrome::mojom::CromitePrivateApiExtension> receiver) {
++  receiver_.Bind(std::move(receiver));
++}
++
++void CromitePrivateApiHost::GetComponentData(
++    const std::string& id,
++    GetComponentDataCallback callback) {
++  LOG(INFO) << "---CromitePrivateApiHost::GetComponentData "
++            << "id=" << id;
++  const raw_ptr<component_updater::ComponentUpdateService>
++    component_updater = g_browser_process->component_updater();
++
++  update_client::CrxUpdateItem item;
++  if (component_updater->GetComponentDetails(id, &item) && item.component) {
++    base::Value::Dict dict;
++    dict.Set("id", id);
++    dict.Set("version", item.component->version.GetString());
++    dict.Set("status", (int)item.state);
++
++    std::string json_string;
++      base::JSONWriter::WriteWithOptions(
++          dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
++      base::TrimWhitespaceASCII(json_string, base::TRIM_ALL, &json_string);
++
++    std::move(callback).Run(json_string);
++  }
++}
++
++void CromitePrivateApiHost::StartComponentUpdate(const std::string& id) {
++  LOG(INFO) << "---CromitePrivateApiHost::StartComponentUpdate "
++            << "id=" << id;
++  const raw_ptr<component_updater::ComponentUpdateService>
++    component_updater = g_browser_process->component_updater();
++  component_updater->GetOnDemandUpdater().OnDemandUpdate(
++      id, component_updater::OnDemandUpdater::Priority::FOREGROUND,
++      component_updater::Callback());
++}
++
++void CromitePrivateApiHost::SetEnableLogConsole(bool enabled) {
++  enable_log_console_ = enabled;
++}
++
++// static
++void CromitePrivateApiHost::BindHost(
++    mojo::PendingAssociatedReceiver<
++        chrome::mojom::CromitePrivateApiExtension> receiver,
++    content::RenderFrameHost* render_frame_host) {
++  CromitePrivateApiHost* api_host =
++      CromitePrivateApiHost::GetOrCreateForCurrentDocument(render_frame_host);
++  api_host->BindReceiver(std::move(receiver));
++}
+diff --git a/chrome/browser/cromite/cromite_private_api_host.h b/chrome/browser/cromite/cromite_private_api_host.h
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/cromite/cromite_private_api_host.h
+@@ -0,0 +1,54 @@
++#ifndef CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
++#define CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
++
++#include <string>
++
++#include "base/functional/callback.h"
++#include "chrome/common/cromite_private_api_extension.mojom.h"
++#include "content/public/browser/document_user_data.h"
++#include "mojo/public/cpp/bindings/associated_receiver.h"
++
++namespace content {
++class NavigationHandle;
++class RenderFrameHost;
++}  // namespace content
++
++class CromitePrivateApiHost
++    : public chrome::mojom::CromitePrivateApiExtension,
++      public content::DocumentUserData<CromitePrivateApiHost> {
++ public:
++  ~CromitePrivateApiHost() override;
++  CromitePrivateApiHost(const CromitePrivateApiHost&) = delete;
++  CromitePrivateApiHost& operator=(const CromitePrivateApiHost&) =
++      delete;
++
++  static void BindHost(
++      mojo::PendingAssociatedReceiver<
++          chrome::mojom::CromitePrivateApiExtension> receiver,
++      content::RenderFrameHost* render_frame_host);
++
++  void BindReceiver(mojo::PendingAssociatedReceiver<
++                    chrome::mojom::CromitePrivateApiExtension> receiver);
++
++  bool IsLogConsoleEnabled() const { return enable_log_console_; }
++
++  // chrome::mojom::CromitePrivateApiExtension:
++  void GetComponentData(const std::string& id,
++                        GetComponentDataCallback callback) override;
++  void StartComponentUpdate(const std::string& id) override;
++  void SetEnableLogConsole(bool can_show) override;
++
++ private:
++  explicit CromitePrivateApiHost(
++      content::RenderFrameHost* rfh);
++
++  friend DocumentUserData;
++  DOCUMENT_USER_DATA_KEY_DECL();
++
++  mojo::AssociatedReceiver<chrome::mojom::CromitePrivateApiExtension>
++      receiver_;
++
++  bool enable_log_console_ = false;
++};
++
++#endif  // CHROME_BROWSER_CROMITE_PRIVATE_API_HOST_H_
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sActAsWebView.java
+@@ -0,0 +1,33 @@
++/*
++    This file is part of Cromite.
++
++    Cromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Cromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++package org.chromium.chrome.browser.flags.cromite;
++
++import org.chromium.components.cached_flags.CachedFlag;
++import org.chromium.chrome.browser.flags.ChromeFeatureMap;
++
++public class sActAsWebView {
++    private static final CachedFlag sInstance =
++        new CachedFlag(ChromeFeatureMap.getInstance(),
++            "ActAsWebView", false);
++
++    private sActAsWebView() {}
++
++    public static CachedFlag getInstance() {
++        return sInstance;
++    }
++}
+diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+new file mode 100644
+--- /dev/null
++++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sEnableCromiteTestSupport.java
+@@ -0,0 +1,33 @@
++/*
++    This file is part of Cromite.
++
++    Cromite is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    Cromite is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with Cromite. If not, see <https://www.gnu.org/licenses/>.
++*/
++
++package org.chromium.chrome.browser.flags.cromite;
++
++import org.chromium.components.cached_flags.CachedFlag;
++import org.chromium.chrome.browser.flags.ChromeFeatureMap;
++
++public class sEnableCromiteTestSupport {
++    private static final CachedFlag sInstance =
++        new CachedFlag(ChromeFeatureMap.getInstance(),
++            "EnableCromiteTestSupport", false);
++
++    private sEnableCromiteTestSupport() {}
++
++    public static CachedFlag getInstance() {
++        return sInstance;
++    }
++}
+diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
++++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
+@@ -182,6 +182,7 @@ public class NotificationPermissionController implements UnownedUserData {
+      * @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise.
+      */
+     public boolean requestPermissionIfNeeded(boolean contextual) {
++        if (!contextual) return false;
+         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+                 || ApiCompatibilityUtils.isDemoUser()) {
+             return false;
+diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
+--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
++++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
+@@ -210,6 +210,7 @@ static const base::Feature* kBadFeatureFlagsInAboutFlags[] = {
+ 
+ #if BUILDFLAG(IS_ANDROID)
+     &chrome::android::kCommandLineOnNonRooted,
++    &features::kEnableCromiteTestSupport,
+ #endif
+ 
+     // This flag disables security for the Page Embedded Permission Control, for
+diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
+--- a/chrome/common/BUILD.gn
++++ b/chrome/common/BUILD.gn
+@@ -657,6 +657,7 @@ mojom("mojo_bindings") {
+   sources = [
+     "chrome_render_frame.mojom",
+     "google_accounts_private_api_extension.mojom",
++    "cromite_private_api_extension.mojom",
+     "media/webrtc_logging.mojom",
+     "net/net_error_page_support.mojom",
+     "net_benchmarking.mojom",
+diff --git a/chrome/common/cromite_private_api_extension.mojom b/chrome/common/cromite_private_api_extension.mojom
+new file mode 100644
+--- /dev/null
++++ b/chrome/common/cromite_private_api_extension.mojom
+@@ -0,0 +1,7 @@
++module chrome.mojom;
++
++interface CromitePrivateApiExtension {
++  GetComponentData(string id) => (string response);
++  StartComponentUpdate(string id);
++  SetEnableLogConsole(bool enabled);
++};
+diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
+--- a/chrome/renderer/BUILD.gn
++++ b/chrome/renderer/BUILD.gn
+@@ -74,6 +74,8 @@ static_library("renderer") {
+     "chrome_render_thread_observer.cc",
+     "chrome_render_thread_observer.h",
+     "custom_menu_commands.h",
++    "cromite/cromite_private_api_extension.cc",
++    "cromite/cromite_private_api_extension.h",
+     "google_accounts_private_api_extension.cc",
+     "google_accounts_private_api_extension.h",
+     "google_accounts_private_api_util.cc",
+diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
+--- a/chrome/renderer/chrome_content_renderer_client.cc
++++ b/chrome/renderer/chrome_content_renderer_client.cc
+@@ -54,6 +54,7 @@
+ #include "chrome/renderer/chrome_render_frame_observer.h"
+ #include "chrome/renderer/chrome_render_thread_observer.h"
+ #include "chrome/renderer/controlled_frame/controlled_frame_extensions_renderer_api_provider.h"
++#include "chrome/renderer/cromite/cromite_private_api_extension.h"
+ #include "chrome/renderer/google_accounts_private_api_extension.h"
+ #include "chrome/renderer/loadtimes_extension_bindings.h"
+ #include "chrome/renderer/media/flash_embed_rewrite.h"
+@@ -624,6 +625,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+ 
+   TrustedVaultEncryptionKeysExtension::Create(render_frame);
+   GoogleAccountsPrivateApiExtension::Create(render_frame);
++  CromitePrivateApiExtension::Create(render_frame);
+ 
+   if (render_frame->IsMainFrame())
+     new webapps::WebPageMetadataAgent(render_frame);
+diff --git a/chrome/renderer/cromite/cromite_private_api_extension.cc b/chrome/renderer/cromite/cromite_private_api_extension.cc
+new file mode 100644
+--- /dev/null
++++ b/chrome/renderer/cromite/cromite_private_api_extension.cc
+@@ -0,0 +1,203 @@
++#include "chrome/renderer/cromite/cromite_private_api_extension.h"
++
++#include "chrome/common/chrome_features.h"
++#include "content/public/common/content_features.h"
++#include "content/public/common/isolated_world_ids.h"
++#include "content/public/renderer/chrome_object_extensions_utils.h"
++#include "content/public/renderer/render_frame.h"
++#include "gin/arguments.h"
++#include "gin/function_template.h"
++#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
++#include "third_party/blink/public/platform/platform.h"
++#include "third_party/blink/public/platform/scheduler/web_agent_group_scheduler.h"
++#include "third_party/blink/public/web/web_local_frame.h"
++#include "v8/include/v8-context.h"
++#include "v8/include/v8-function.h"
++
++namespace {
++
++bool ShouldExposeCromitePrivateApi(
++    content::RenderFrame* render_frame) {
++  DCHECK(render_frame);
++  if (!base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
++    return false;
++
++  GURL origin_url = GURL("chrome://version");
++  const url::Origin& allowed_origin = url::Origin::Create(origin_url);
++
++  const url::Origin origin = render_frame->GetWebFrame()->GetSecurityOrigin();
++  return origin == allowed_origin;
++}
++
++}
++
++CromitePrivateApiExtension::PendingRequest::PendingRequest(
++    v8::Isolate* isolate,
++    v8::Local<v8::Context> context,
++    v8::Local<v8::Promise::Resolver> resolver)
++    : isolate(isolate),
++      context(isolate, context),
++      promise_resolver(isolate, resolver) {}
++
++CromitePrivateApiExtension::PendingRequest::~PendingRequest() = default;
++
++// static
++void CromitePrivateApiExtension::Create(content::RenderFrame* frame) {
++  new CromitePrivateApiExtension(frame);
++}
++
++CromitePrivateApiExtension::CromitePrivateApiExtension(
++    content::RenderFrame* frame)
++    : content::RenderFrameObserver(frame) {}
++
++CromitePrivateApiExtension::~CromitePrivateApiExtension() =
++    default;
++
++void CromitePrivateApiExtension::OnDestruct() {
++  delete this;
++}
++
++void CromitePrivateApiExtension::DidCreateScriptContext(
++    v8::Local<v8::Context> v8_context,
++    int32_t world_id) {
++  if (!render_frame() || world_id != content::ISOLATED_WORLD_ID_GLOBAL) {
++    return;
++  }
++
++  if (ShouldExposeCromitePrivateApi(render_frame())) {
++    InjectScript();
++  }
++}
++
++void CromitePrivateApiExtension::InjectScript() {
++  DCHECK(render_frame());
++
++  blink::WebLocalFrame* web_frame = render_frame()->GetWebFrame();
++  v8::Isolate* isolate = web_frame->GetAgentGroupScheduler()->Isolate();
++  v8::HandleScope handle_scope(isolate);
++  v8::Local<v8::Context> context = web_frame->MainWorldScriptContext();
++  if (context.IsEmpty()) {
++    return;
++  }
++
++  v8::Context::Scope context_scope(context);
++
++  v8::Local<v8::Object> window =
++      content::GetOrCreateObject(isolate, context, "window");
++  v8::Local<v8::Object> oCromiteObject =
++      content::GetOrCreateObject(isolate, context, window, "cromite");
++
++  oCromiteObject
++      ->Set(
++          context, gin::StringToSymbol(isolate, "getComponentData"),
++          gin::CreateFunctionTemplate(
++              isolate, base::BindRepeating(
++                           &CromitePrivateApiExtension::GetComponentData,
++                           weak_ptr_factory_.GetWeakPtr()))
++              ->GetFunction(context)
++              .ToLocalChecked())
++      .Check();
++
++  oCromiteObject
++      ->Set(
++          context, gin::StringToSymbol(isolate, "startComponentUpdate"),
++          gin::CreateFunctionTemplate(
++              isolate, base::BindRepeating(
++                           &CromitePrivateApiExtension::StartComponentUpdate,
++                           weak_ptr_factory_.GetWeakPtr()))
++              ->GetFunction(context)
++              .ToLocalChecked())
++      .Check();
++
++  oCromiteObject
++      ->Set(
++          context, gin::StringToSymbol(isolate, "setEnableLogConsole"),
++          gin::CreateFunctionTemplate(
++              isolate, base::BindRepeating(
++                           &CromitePrivateApiExtension::SetEnableLogConsole,
++                           weak_ptr_factory_.GetWeakPtr()))
++              ->GetFunction(context)
++              .ToLocalChecked())
++      .Check();
++}
++
++void CromitePrivateApiExtension::GetComponentData(gin::Arguments* args) {
++  std::string component_id;
++  if (!args->GetNext(&component_id)) {
++    args->ThrowError();
++    return;
++  }
++
++  if (!remote_.is_bound()) {
++    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
++  }
++
++  v8::Isolate* isolate = args->isolate();
++  v8::Local<v8::Context> context = isolate->GetCurrentContext();
++
++  v8::Local<v8::Promise::Resolver> resolver =
++      v8::Promise::Resolver::New(context).ToLocalChecked();
++  v8::Local<v8::Promise> promise = resolver->GetPromise();
++
++  base::UnguessableToken request_id = base::UnguessableToken::Create();
++  pending_requests_.emplace(
++      request_id,
++      std::make_unique<PendingRequest>(isolate, context, resolver));
++
++  remote_->GetComponentData(component_id,
++      base::BindOnce(&CromitePrivateApiExtension::OnGetComponentData,
++                     weak_ptr_factory_.GetWeakPtr(), request_id));
++
++  args->Return(promise);
++}
++
++void CromitePrivateApiExtension::OnGetComponentData(const base::UnguessableToken callback_id,
++                                                    const std::string& result) {
++  auto iter = pending_requests_.find(callback_id);
++  if (iter == pending_requests_.end())
++    return;
++
++  std::unique_ptr<PendingRequest> request = std::move(iter->second);
++  pending_requests_.erase(iter);
++
++  v8::HandleScope handle_scope(request->isolate);
++  v8::Local<v8::Context> context =
++    request->context.Get(request->isolate);
++  v8::Local<v8::Promise::Resolver> resolver =
++    request->promise_resolver.Get(request->isolate);
++
++  LOG(INFO) << "---CromitePrivateApiExtension::OnGetComponentData4";
++  resolver->Resolve(context,
++                    gin::StringToV8(request->isolate, result))
++      .ToChecked();
++
++  LOG(INFO) << "---CromitePrivateApiExtension::OnGetComponentData5";
++}
++
++void CromitePrivateApiExtension::StartComponentUpdate(gin::Arguments* args) {
++  std::string component_id;
++  if (!args->GetNext(&component_id)) {
++    args->ThrowError();
++    return;
++  }
++
++  if (!remote_.is_bound()) {
++    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
++  }
++
++  remote_->StartComponentUpdate(component_id);
++}
++
++void CromitePrivateApiExtension::SetEnableLogConsole(gin::Arguments* args) {
++  bool enabled;
++  if (!args->GetNext(&enabled)) {
++    args->ThrowError();
++    return;
++  }
++
++  if (!remote_.is_bound()) {
++    render_frame()->GetRemoteAssociatedInterfaces()->GetInterface(&remote_);
++  }
++
++  remote_->SetEnableLogConsole(enabled);
++}
+diff --git a/chrome/renderer/cromite/cromite_private_api_extension.h b/chrome/renderer/cromite/cromite_private_api_extension.h
+new file mode 100644
+--- /dev/null
++++ b/chrome/renderer/cromite/cromite_private_api_extension.h
+@@ -0,0 +1,65 @@
++#ifndef CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
++#define CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
++
++#include "base/memory/weak_ptr.h"
++#include "chrome/common/cromite_private_api_extension.mojom.h"
++#include "content/public/renderer/render_frame_observer.h"
++#include "mojo/public/cpp/bindings/associated_remote.h"
++#include "v8/include/v8.h"
++
++namespace gin {
++class Arguments;
++}  // namespace gin
++
++class CromitePrivateApiExtension : public content::RenderFrameObserver {
++ public:
++  // Creates a new instance, with ownership transferred to |*frame|.
++  static void Create(content::RenderFrame* frame);
++
++  CromitePrivateApiExtension(const CromitePrivateApiExtension&) =
++      delete;
++  CromitePrivateApiExtension& operator=(
++      const CromitePrivateApiExtension&) = delete;
++
++  ~CromitePrivateApiExtension() override;
++
++  // content::RenderFrameObserver:
++  void OnDestruct() override;
++  void DidCreateScriptContext(v8::Local<v8::Context> v8_context,
++                              int32_t world_id) override;
++
++ private:
++
++ struct PendingRequest {
++    PendingRequest(
++        v8::Isolate* isolate,
++        v8::Local<v8::Context> context,
++        v8::Local<v8::Promise::Resolver> resolver);
++
++    ~PendingRequest();
++
++    raw_ptr<v8::Isolate> isolate;
++    v8::Global<v8::Context> context;
++    v8::Global<v8::Promise::Resolver> promise_resolver;
++  };
++
++  explicit CromitePrivateApiExtension(content::RenderFrame* frame);
++
++  void InjectScript();
++
++  void GetComponentData(gin::Arguments* args);
++  void OnGetComponentData(const base::UnguessableToken callback_id,
++                          const std::string& label);
++  void StartComponentUpdate(gin::Arguments* args);
++  void SetEnableLogConsole(gin::Arguments* args);
++
++  std::map<const base::UnguessableToken,
++           std::unique_ptr<PendingRequest>> pending_requests_;
++
++  mojo::AssociatedRemote<chrome::mojom::CromitePrivateApiExtension>
++      remote_;
++  base::WeakPtrFactory<CromitePrivateApiExtension> weak_ptr_factory_{
++      this};
++};
++
++#endif  // CHROME_RENDERER_CROMITE_PRIVATE_API_EXTENSION_H_
+diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h
+--- a/components/component_updater/component_updater_service.h
++++ b/components/component_updater/component_updater_service.h
+@@ -242,6 +242,7 @@ class OnDemandUpdater {
+   // the update will be applied. The caller can subscribe to component update
+   // service notifications and provide an optional callback to get the result
+   // of the call. The function does not implement any cooldown interval.
++ public:
+   virtual void OnDemandUpdate(const std::string& id,
+                               Priority priority,
+                               Callback callback) = 0;
+diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc
+--- a/content/browser/devtools/devtools_http_handler.cc
++++ b/content/browser/devtools/devtools_http_handler.cc
+@@ -16,6 +16,7 @@
+ #include "base/command_line.h"
+ #include "base/compiler_specific.h"
+ #include "base/files/file_util.h"
++#include "base/feature_list.h"
+ #include "base/functional/bind.h"
+ #include "base/functional/callback_helpers.h"
+ #include "base/json/json_writer.h"
+@@ -46,6 +47,7 @@
+ #include "content/public/browser/devtools_manager_delegate.h"
+ #include "content/public/browser/devtools_socket_factory.h"
+ #include "content/public/common/content_client.h"
++#include "content/public/common/content_features.h"
+ #include "content/public/common/content_switches.h"
+ #include "content/public/common/url_constants.h"
+ #include "net/base/io_buffer.h"
+@@ -587,9 +589,12 @@ void DevToolsHttpHandler::OnJsonRequest(
+ 
+   if (command == "version") {
+     base::Value::Dict version;
++    auto browser = GetContentClient()->browser()->GetProduct();
++    if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
++      browser = "Chrome/0.0.0.0";
+     version.Set("Protocol-Version", DevToolsAgentHost::GetProtocolVersion());
+     version.Set("WebKit-Version", embedder_support::GetWebKitVersion());
+-    version.Set("Browser", GetContentClient()->browser()->GetProduct());
++    version.Set("Browser", browser);
+     version.Set("User-Agent", GetContentClient()->browser()->GetUserAgent());
+     version.Set("V8-Version", V8_VERSION_STRING);
+     std::string host = info.GetHeaderValue("host");
+diff --git a/content/browser/log_console_message.cc b/content/browser/log_console_message.cc
+--- a/content/browser/log_console_message.cc
++++ b/content/browser/log_console_message.cc
+@@ -17,10 +17,23 @@ void LogConsoleMessage(blink::mojom::ConsoleMessageLevel log_level,
+                        int32_t line_number,
+                        bool is_builtin_component,
+                        bool is_off_the_record,
+-                       const std::u16string& source_id) {
++                       const std::u16string& source_id,
++                       bool is_log_console_enabled) {
++  if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport)) {
++    LOG(INFO) << "CONSOLE:"
++        << "\"" << message << "\", source: " << source_id << " (" << line_number
++        << ")";
++    return;
++  }
+   const int32_t resolved_level =
+       is_builtin_component ? ConsoleMessageLevelToLogSeverity(log_level)
+                            : ::logging::LOGGING_INFO;
++  if (is_log_console_enabled) {
++    logging::LogMessage("CONSOLE", line_number, resolved_level).stream()
++        << "\"" << message << "\", source: " << source_id << " (" << line_number
++        << ")";
++    return;
++  }
+   if (::logging::GetMinLogLevel() > resolved_level)
+     return;
+ 
+diff --git a/content/browser/log_console_message.h b/content/browser/log_console_message.h
+--- a/content/browser/log_console_message.h
++++ b/content/browser/log_console_message.h
+@@ -19,7 +19,8 @@ void LogConsoleMessage(blink::mojom::ConsoleMessageLevel log_level,
+                        int32_t line_number,
+                        bool is_builtin_component,
+                        bool is_off_the_record,
+-                       const std::u16string& source_id);
++                       const std::u16string& source_id,
++                       bool is_log_console_enabled = false);
+ 
+ }  // namespace content
+ 
+diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
+--- a/content/browser/renderer_host/render_frame_host_impl.cc
++++ b/content/browser/renderer_host/render_frame_host_impl.cc
+@@ -315,6 +315,8 @@
+ #include "url/origin.h"
+ #include "url/url_constants.h"
+ 
++//#include "chrome/browser/cromite/cromite_private_api_host.h"
++
+ #if BUILDFLAG(IS_ANDROID)
+ #include "content/browser/accessibility/browser_accessibility_manager_android.h"
+ #include "content/browser/android/content_url_loader_factory.h"
+@@ -4755,7 +4757,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+   if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
+                                         updated_source_id,
+                                         untrusted_stack_trace)) {
+-    return;
++    if (!base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
++      return;
+   }
+ 
+   // Pass through log severity only on builtin components pages to limit console
+@@ -4772,8 +4775,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+   const bool is_off_the_record =
+       GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
+ 
++  bool is_log_console_enabled = false;
++  // CromitePrivateApiHost* cromite_data =
++  //     CromitePrivateApiHost::GetForCurrentDocument(this);
++  // if (cromite_data) {
++  //   is_log_console_enabled = cromite_data->IsLogConsoleEnabled();
++  // }
+   LogConsoleMessage(log_level, message, line_no, is_builtin_component,
+-                    is_off_the_record, updated_source_id);
++                    is_off_the_record, updated_source_id, is_log_console_enabled);
+ }
+ 
+ void RenderFrameHostImpl::FrameSizeChanged(const gfx::Size& frame_size) {
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc b/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Enable-test-support.inc
+@@ -0,0 +1,19 @@
++#ifdef FLAG_SECTION
++
++    {"enable-cromite-test-support",
++     "Enable support for cromite test",
++     "Setting allows the activation of specific APIs used for cromite testing. "
++     "Do not activate if you do not know what you are doing.", kOsAll,
++     FEATURE_VALUE_TYPE(features::kEnableCromiteTestSupport)},
++
++#if BUILDFLAG(IS_ANDROID)
++
++    {"act-as-webview",
++     "Enable webview support for cromite test",
++     "Setting allows the activation of specific APIs used for cromite testing. "
++     "Do not activate if you do not know what you are doing.", kOsAndroid,
++     FEATURE_VALUE_TYPE(features::kActAsWebView)},
++
++#endif
++
++#endif
+diff --git a/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc b/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/content/public/common/content_features_cc/Enable-test-support.inc
+@@ -0,0 +1,7 @@
++CROMITE_FEATURE(kEnableCromiteTestSupport,
++                "EnableCromiteTestSupport",
++                base::FEATURE_DISABLED_BY_DEFAULT);
++
++CROMITE_FEATURE(kActAsWebView,
++                "ActAsWebView",
++                base::FEATURE_DISABLED_BY_DEFAULT);
+diff --git a/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc b/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/content/public/common/content_features_h/Enable-test-support.inc
+@@ -0,0 +1,2 @@
++CONTENT_EXPORT BASE_DECLARE_FEATURE(kEnableCromiteTestSupport);
++CONTENT_EXPORT BASE_DECLARE_FEATURE(kActAsWebView);
+--

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

@@ -14,18 +14,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../java/res/xml/privacy_preferences.xml      | 15 ++++++
  .../browser/LaunchIntentDispatcher.java       | 21 ++++++++
- .../CustomTabIntentDataProvider.java          |  4 +-
+ .../CustomTabIntentDataProvider.java          | 22 ++++----
- .../customtabs/CustomTabsConnection.java      |  1 +
+ .../customtabs/CustomTabsConnection.java      |  3 +-
- .../IncognitoCustomTabIntentDataProvider.java | 14 ++++++
+ .../IncognitoCustomTabIntentDataProvider.java | 14 +++++
- .../privacy/settings/PrivacySettings.java     | 50 +++++++++++++++++++
+ .../privacy/settings/PrivacySettings.java     | 51 +++++++++++++++++++
  .../flags/android/chrome_feature_list.cc      |  2 +-
  .../browser/flags/ChromeFeatureList.java      |  3 ++
  .../chrome/browser/tab/TabAssociatedApp.java  |  6 ++-
- ...Add-custom-tab-intents-privacy-option.grdp | 25 ++++++++++
+ ...Add-custom-tab-intents-privacy-option.grdp | 25 +++++++++
  .../OriginVerifier.java                       |  5 ++
  .../core/common/language_experiments.cc       |  1 +
  .../add-custom-tab-intents-privacy-option.inc |  1 +
- 13 files changed, 145 insertions(+), 3 deletions(-)
+ 13 files changed, 156 insertions(+), 13 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-custom-tab-intents-privacy-option.grdp
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
 
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -61,6 +61,9 @@ import java.lang.annotation.Retention;
+@@ -62,6 +62,9 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  /**
   * Dispatches incoming intents to the appropriate activity based on the current configuration and
   * Intent fired.
-@@ -263,6 +266,9 @@ public class LaunchIntentDispatcher {
+@@ -264,6 +267,9 @@ public class LaunchIntentDispatcher {
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          Log.w(
                  TAG,
                  "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -291,6 +297,10 @@ public class LaunchIntentDispatcher {
+@@ -292,6 +298,10 @@ public class LaunchIntentDispatcher {
          // Make sure the result of the CustomTabActivity is forwarded to the client.
          newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
  
@@ -88,7 +88,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          // Since configureIntentForResizableCustomTab() might change the componenet/class
          // associated with the passed intent, it needs to be called after #setClassName(context,
          // CustomTabActivity.class.getName());
-@@ -483,6 +493,17 @@ public class LaunchIntentDispatcher {
+@@ -490,6 +500,17 @@ public class LaunchIntentDispatcher {
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -103,13 +103,56 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 +                IntentHandler.setTabLaunchType(newIntent, TabLaunchType.FROM_EXTERNAL_APP);
 +                newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 +            }
-             if (!chromeTabbedTaskExists()) {
+             if (!chromeTabbedTaskExists(mActivity)) {
                  newIntent.putExtra(IntentHandler.EXTRA_STARTED_TABBED_CHROME_TASK, true);
              }
 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
-@@ -1257,7 +1257,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -233,16 +233,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+ 
+     // Extra whose value is an array of ints that is supplied to
+     // SyntheticTrialRegistry::RegisterExternalExperiments().
+-    public static final String EXPERIMENT_IDS =
+-            "org.chromium.chrome.browser.customtabs.AGA_EXPERIMENT_IDS";
++    // public static final String EXPERIMENT_IDS =
++    //         "org.chromium.chrome.browser.customtabs.AGA_EXPERIMENT_IDS";
+ 
+     // These Extra Intent parameters allow an Intent to enable or disable a set of Features.
+     // The set of Features that may be enabled or disabled is restricted by the code,
+     // and initially only two Features may be enabled together, or disabled together.
+-    public static final String EXPERIMENTS_ENABLE =
+-            "org.chromium.chrome.browser.customtabs.EXPERIMENTS_ENABLE";
+-    public static final String EXPERIMENTS_DISABLE =
+-            "org.chromium.chrome.browser.customtabs.EXPERIMENTS_DISABLE";
++    // public static final String EXPERIMENTS_ENABLE =
++    //         "org.chromium.chrome.browser.customtabs.EXPERIMENTS_ENABLE";
++    // public static final String EXPERIMENTS_DISABLE =
++    //         "org.chromium.chrome.browser.customtabs.EXPERIMENTS_DISABLE";
+ 
+     /**
+      * Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab
+@@ -682,7 +682,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+                                 TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION,
+                                 ScreenOrientation.DEFAULT));
+ 
+-        mGsaExperimentIds = IntentUtils.safeGetIntArrayExtra(intent, EXPERIMENT_IDS);
++        mGsaExperimentIds = null; //IntentUtils.safeGetIntArrayExtra(intent, EXPERIMENT_IDS);
+ 
+         mBreakPointDp = getActivityBreakPointFromIntent(intent);
+         mInitialActivityHeight = getInitialActivityHeightFromIntent(intent);
+@@ -695,8 +695,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+                         intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT);
+         mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED;
+ 
+-        mInteractWithBackground = CustomTabsIntent.isBackgroundInteractionEnabled(intent);
+-        if (IntentUtils.safeHasExtra(intent, EXTRA_ENABLE_BACKGROUND_INTERACTION)) {
++        mInteractWithBackground = false; // CustomTabsIntent.isBackgroundInteractionEnabled(intent);
++        if (((false)) && IntentUtils.safeHasExtra(intent, EXTRA_ENABLE_BACKGROUND_INTERACTION)) {
+             @BackgroundInteractBehavior
+             int backgroundInteractBehavior =
+                     IntentUtils.safeGetIntExtra(
+@@ -1267,7 +1267,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
      public @CustomTabProfileType int getCustomTabMode() {
          return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                  ? CustomTabProfileType.INCOGNITO
@@ -123,7 +166,16 @@ 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
-@@ -968,6 +968,7 @@ public class CustomTabsConnection {
+@@ -780,7 +780,7 @@ public class CustomTabsConnection {
+         ThreadUtils.assertOnUiThread();
+         if (extras == null) return;
+         int[] experimentIds =
+-                IntentUtils.safeGetIntArray(extras, CustomTabIntentDataProvider.EXPERIMENT_IDS);
++                null; //IntentUtils.safeGetIntArray(extras, CustomTabIntentDataProvider.EXPERIMENT_IDS);
+         if (experimentIds == null) return;
+         // When ids are set through cct, they should not override existing ids.
+         boolean override = false;
+@@ -996,6 +996,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -179,7 +231,15 @@ 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
-@@ -80,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
+@@ -10,6 +10,7 @@ import android.content.Context;
+ import android.content.Intent;
+ import android.content.SharedPreferences;
+ import android.graphics.drawable.Drawable;
++import android.os.Build;
+ import android.os.Bundle;
+ import android.text.SpannableString;
+ import android.text.style.ClickableSpan;
+@@ -79,6 +80,15 @@ import org.chromium.ui.text.SpanApplier;
  import java.util.concurrent.TimeUnit;
  import java.util.function.Consumer;
  
@@ -195,7 +255,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import androidx.preference.PreferenceCategory;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.base.shared_preferences.SharedPreferencesManager;
-@@ -149,6 +158,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -152,6 +162,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
      }
  
@@ -205,7 +265,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -376,6 +388,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -384,6 +397,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                  new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
      }
  
@@ -215,7 +275,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
-@@ -396,6 +411,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -404,6 +420,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
          } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -247,7 +307,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -428,6 +468,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -436,6 +477,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                      UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
          }
  
@@ -267,7 +327,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -1020,7 +1020,7 @@ BASE_FEATURE(kMagicStackAndroid,
+@@ -1093,7 +1093,7 @@ BASE_FEATURE(kMagicStackAndroid,
  // Enables an experimental feature which forces mayLaunchUrl to use a different
  // storage partition. This may reduce performance. This should not be enabled by
  // default.
@@ -279,18 +339,18 @@ 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
-@@ -825,6 +825,8 @@ public abstract class ChromeFeatureList {
+@@ -943,6 +943,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sMiniOriginBar = newCachedFlag(MINI_ORIGIN_BAR, false, true);
+                     MOST_VISITED_TILES_CUSTOMIZATION,
-     public static final CachedFlag sMostVisitedTilesCustomization =
+                     /* defaultValue= */ false,
-             newCachedFlag(MOST_VISITED_TILES_CUSTOMIZATION, false);
+                     /* defaultValueInTests= */ true);
 +    public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition =
 +            newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
      public static final CachedFlag sMostVisitedTilesReselect =
              newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
      public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -1013,6 +1015,7 @@ public abstract class ChromeFeatureList {
+@@ -1165,6 +1167,7 @@ public abstract class ChromeFeatureList {
-                     sMagicStackAndroid,
                      sMiniOriginBar,
+                     sMitigateLegacySearchEnginePromoOverlap,
                      sMostVisitedTilesCustomization,
 +                    sMayLaunchurlUsesSeparateStoragePartition,
                      sMostVisitedTilesReselect,
@@ -345,7 +405,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
-@@ -180,6 +180,11 @@ public abstract class OriginVerifier {
+@@ -181,6 +181,11 @@ public abstract class OriginVerifier {
          assert mNativeOriginVerifier != 0
                  : "Either provide a browserContextHandle to "
                          + "OriginVerifier#ctor or call initNativeOriginVerifier.";
@@ -360,9 +420,9 @@ diff --git a/components/content_relationship_verification/android/java/src/org/c
 diff --git a/components/language/core/common/language_experiments.cc b/components/language/core/common/language_experiments.cc
 --- a/components/language/core/common/language_experiments.cc
 +++ b/components/language/core/common/language_experiments.cc
-@@ -32,4 +32,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
+@@ -26,4 +26,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
- // Params:
+              "DisableGeoLanguageModel",
- const char kContentLanguagesDisableObserversParam[] = "disable_observers";
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kCctAutoTranslate);
  }  // namespace language
@@ -371,5 +431,5 @@ new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-custom-tab-intents-privacy-option.inc
 @@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kCCTIntentFeatureOverrides);
++// explicitly empty
 --

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

@@ -6,40 +6,29 @@ Corrected Exit functionality
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/menu/main_menu.xml                  | 6 ++++++
+ chrome/android/java/res/values/ids.xml                     | 1 +
- .../org/chromium/chrome/browser/ChromeTabbedActivity.java   | 4 ++++
+ .../org/chromium/chrome/browser/ChromeTabbedActivity.java  | 4 ++++
- .../src/org/chromium/chrome/browser/app/ChromeActivity.java | 6 ++++++
+ .../org/chromium/chrome/browser/app/ChromeActivity.java    | 6 ++++++
- .../chrome/browser/init/ChromeLifetimeController.java       | 2 ++
+ .../chrome/browser/init/ChromeLifetimeController.java      | 2 ++
- .../browser/ui/android/strings/android_chrome_strings.grd   | 3 +++
+ .../tabbed_mode/TabbedAppMenuPropertiesDelegate.java       | 7 +++++++
- 5 files changed, 21 insertions(+)
+ .../browser/ui/android/strings/android_chrome_strings.grd  | 3 +++
+ 6 files changed, 23 insertions(+)
 
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
---- a/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/values/ids.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
++++ b/chrome/android/java/res/values/ids.xml
-@@ -181,6 +181,9 @@ found in the LICENSE file.
+@@ -119,6 +119,7 @@ found in the LICENSE file.
-         <item android:id="@+id/managed_by_menu_id"
+     <item type="id" name="ntp_feed_header_menu_item_toggle_switch" />
-             android:title="@string/managed_browser"
-             android:icon="@drawable/ic_business" />
-+        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
-     </group>
  
-     <!-- Items shown only in the tab switcher -->
+     <!-- App Menu -->
-@@ -213,6 +216,9 @@ found in the LICENSE file.
++    <item type="id" name="exit_id" />
-         <item android:id="@id/preferences_id"
+     <item type="id" name="icon_row_menu_id" />
-             android:title="@string/menu_settings"
+     <item type="id" name="forward_menu_id" />
-             android:icon="@drawable/settings_cog" />
+     <item type="id" name="bookmark_this_page_id" />
-+        <item android:id="@+id/exit_id"
-+            android:title="@string/menu_exit"
-+            android:icon="@drawable/ic_exit_to_app_white_24dp" />
-     </group>
- 
-     <!-- Items shown only when the tablet has no visible tabs -->
 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
-@@ -326,6 +326,8 @@ import java.util.Map;
+@@ -345,6 +345,8 @@ import java.util.Map;
  import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
  
@@ -48,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  /**
   * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
   * accessible via a chrome specific tab switching UI.
-@@ -3361,6 +3363,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3692,6 +3694,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                      .closeTabs(
                              TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
              RecordUserAction.record("MobileTabClosed");
@@ -60,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -60,6 +60,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+@@ -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;
@@ -68,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.ChromeActivitySessionTracker;
  import org.chromium.chrome.browser.ChromeApplicationImpl;
  import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2419,6 +2420,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2445,6 +2446,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return true;
          }
  
@@ -83,15 +72,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/init/ChromeLifetimeController.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLifetimeController.java
-@@ -18,6 +18,7 @@ import org.chromium.base.ContextUtils;
+@@ -20,6 +20,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
- import org.chromium.base.ThreadUtils;
+ import org.chromium.build.annotations.NullMarked;
  import org.chromium.chrome.browser.BrowserRestartActivity;
  import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 +import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
  
  /**
   * Answers requests to kill and (potentially) restart Chrome's main browser process.
-@@ -73,6 +74,7 @@ class ChromeLifetimeController
+@@ -76,6 +77,7 @@ class ChromeLifetimeController
  
      @Override
      public void onTerminate(boolean restart) {
@@ -99,10 +88,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
          mRestartChromeOnDestroy = restart;
  
          // Tell all Chrome Activities to finish themselves.
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+@@ -384,6 +384,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+             maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
+             modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
+         }
++
++        modelList.add(new MVCListAdapter.ListItem(
++                AppMenuHandler.AppMenuItemType.STANDARD,
++                buildModelForStandardMenuItem(
++                        R.id.exit_id,
++                        R.string.menu_exit,
++                        shouldShowIconBeforeItem() ? R.drawable.ic_exit_to_app_white_24dp : 0)));
+     }
+ 
+     private Runnable buildUpdateStateChangedObserver() {
 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
-@@ -4436,6 +4436,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4347,6 +4347,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

@@ -18,7 +18,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 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
-@@ -22,6 +22,7 @@
+@@ -23,6 +23,7 @@
  
  #include "base/check_op.h"
  #include "base/containers/contains.h"
@@ -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"
-@@ -567,6 +568,15 @@ AutocompleteController::AutocompleteController(
+@@ -569,6 +570,15 @@ AutocompleteController::AutocompleteController(
            provider_client_->GetOmniboxTriggeredFeatureService()),
        steady_state_omnibox_position_(
            metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -58,7 +58,7 @@ diff --git a/components/omnibox/browser/history_url_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
-@@ -14,6 +14,7 @@
+@@ -17,6 +17,7 @@
  #include "base/base64.h"
  #include "base/feature_list.h"
  #include "base/functional/bind.h"
@@ -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) {
+@@ -632,6 +633,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -88,7 +88,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
  #include "base/files/file_path.h"
  #include "base/files/file_util.h"
  #include "base/i18n/char_iterator.h"
-@@ -655,6 +657,8 @@ GURL FixupURLInternal(const std::string& text,
+@@ -648,6 +650,8 @@ GURL FixupURLInternal(const std::string& text,
  
      FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
      if (chrome_url && !parts.host.is_valid()) {

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

@@ -103,7 +103,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
  #include "net/ssl/ssl_config.h"
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
-@@ -164,6 +168,19 @@ void ClientSocketPoolManager::set_max_sockets_per_pool(
+@@ -186,6 +190,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,13 +45,13 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1145,6 +1145,7 @@ component("net") {
+@@ -1157,6 +1157,7 @@ component("net") {
      ":net_deps",
      "//components/miracle_parameter/common",
      "//components/network_time/time_tracker",
 +    "//components/network_session_configurator/common",
      "//net/http:transport_security_state_generated_files",
-     "//third_party/simdutf:simdutf",
+     "//third_party/simdutf",
    ]
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
@@ -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"
-@@ -1489,6 +1490,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1497,6 +1498,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
-@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
+@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
  import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.fullscreen.BrowserControlsManager;
  import org.chromium.chrome.browser.fullscreen.FullscreenManager;
  import org.chromium.chrome.browser.init.ChromeActivityNativeDelegate;
-@@ -126,6 +127,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
+@@ -128,6 +129,7 @@ public class CustomTabDelegateFactory implements TabDelegateFactory {
  
          @Override
          public boolean shouldDisableAllExternalIntents() {
@@ -68,15 +68,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
-@@ -20,6 +20,7 @@ import org.chromium.base.IntentUtils;
+@@ -26,6 +26,7 @@ import org.chromium.base.supplier.Supplier;
- import org.chromium.base.PackageManagerUtils;
+ import org.chromium.build.annotations.NullMarked;
- import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.ChromeTabbedActivity2;
 +import org.chromium.chrome.browser.flags.cromite.sAllowExternalIntentRequests;
  import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.password_manager.CctPasswordSavingMetricsRecorderBridge;
+ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
- import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
+ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
-@@ -107,7 +108,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+@@ -117,7 +118,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
  
      @Override
      public boolean shouldDisableExternalIntentRequestsForUrl(GURL url) {
@@ -141,16 +141,16 @@ new file mode 100644
 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
 --- a/components/external_intents/android/external_intents_features.cc
 +++ b/components/external_intents/android/external_intents_features.cc
-@@ -28,7 +28,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -29,7 +29,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kExternalNavigationDebugLogs,       &kBlockIntentsToSelf,
      &kNavigationCaptureRefactorAndroid,  &kAuxiliaryNavigationStaysInBrowser,
-     &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA};
+     &kReparentTopLevelNavigationFromPWA, &kReparentAuxiliaryNavigationFromPWA,
+     &kAuxiliaryNavigationStaysInPWA};
 -
  }  // namespace
  
  // Alphabetical:
-@@ -57,7 +56,13 @@ BASE_FEATURE(kReparentAuxiliaryNavigationFromPWA,
+@@ -62,7 +61,13 @@ BASE_FEATURE(kAuxiliaryNavigationStaysInPWA,
-              "ReparentAuxiliaryNavigationFromPWA",
+              "AuxiliaryNavigationStaysInPWA",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +CROMITE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
@@ -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
-@@ -1560,6 +1560,12 @@ public class ExternalNavigationHandler {
+@@ -1558,6 +1558,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,
-@@ -1617,6 +1623,21 @@ public class ExternalNavigationHandler {
+@@ -1626,6 +1632,21 @@ public class ExternalNavigationHandler {
              return OverrideUrlLoadingResult.forNoOverride();
          }
  

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

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -104,6 +104,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -105,6 +105,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
    if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
      WebRuntimeFeatures::EnableMediaSession(false);
    }
@@ -59,14 +59,14 @@ new file mode 100644
 diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_party/blink/public/platform/web_runtime_features.h
 --- a/third_party/blink/public/platform/web_runtime_features.h
 +++ b/third_party/blink/public/platform/web_runtime_features.h
-@@ -71,6 +71,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
+@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
    static void EnableFingerprintingCanvasImageDataNoise(bool);
    static void EnableFluentScrollbars(bool);
    static void EnableFluentOverlayScrollbars(bool);
 +  static void EnableVibration(bool);
  
-   WebRuntimeFeatures() = delete;
+   static void EnableLocalNetworkAccessWebRTC(bool);
- };
+ 
 diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.cc b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 --- a/third_party/blink/renderer/modules/vibration/vibration_controller.cc
 +++ b/third_party/blink/renderer/modules/vibration/vibration_controller.cc
@@ -104,7 +104,7 @@ diff --git a/third_party/blink/renderer/platform/exported/web_runtime_features.c
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -987,6 +987,10 @@
+@@ -1011,6 +1011,10 @@
      {
        name: "CompositingDecisionAtAnimationPhaseBoundaries"
      },

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

@@ -14,33 +14,33 @@ 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
-@@ -640,7 +640,7 @@ config("compiler") {
+@@ -700,7 +700,7 @@ config("compiler") {
-     # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF
-     # (excluding toolchains that use an older version of LLVM).
      # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
+     # It also causes segfault on Linux s390x:
+     # https://github.com/llvm/llvm-project/issues/149511
 -    if (is_linux && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
 +    if (is_linux && !skip_clangd_unsupported_options && use_lld && !llvm_android_mainline && current_cpu != "arm" &&
+         current_cpu != "s390x" &&
          default_toolchain != "//build/toolchain/cros:target") {
        cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
-     }
+@@ -1813,7 +1813,7 @@ config("clang_revision") {
-@@ -1784,7 +1784,7 @@ config("clang_revision") {
+ # e.g. by setting in the the project's .gn file.
  config("clang_warning_suppression") {
    # Some build configs use older versions of clang that don't support WSMs
-   if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" &&
+-  if (use_clang_warning_suppression_file) {
--      !llvm_android_mainline && is_clang &&
++  if (use_clang_warning_suppression_file && !skip_clangd_unsupported_options) {
-+      !llvm_android_mainline && is_clang && !skip_clangd_unsupported_options &&
-       clang_warning_suppression_file != "") {
      from_build_root =
          rebase_path(clang_warning_suppression_file, root_build_dir)
+     inputs = [ clang_warning_suppression_file ]
 @@ -2146,7 +2146,6 @@ config("default_warnings") {
-         # TODO(crbug.com/376641662): Fix and re-enable.
+       # TODO(crbug.com/376641662): Fix and re-enable.
-         "-Wno-nontrivial-memcall",
+       "-Wno-nontrivial-memcall",
-       ]
+     ]
 -
-       cflags_cc += [
+     cflags_cc += [
-         # TODO(crbug.com/328490295): Fix and re-enable for C flags.
+       # TODO(crbug.com/328490295): Fix and re-enable for C flags.
-         "-Wenum-compare-conditional",
+       "-Wenum-compare-conditional",
-@@ -2187,6 +2186,15 @@ config("default_warnings") {
+@@ -2211,6 +2210,15 @@ config("default_warnings") {
        ]
      }
  
@@ -59,9 +59,9 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 --- a/build_overrides/build.gni
 +++ b/build_overrides/build.gni
-@@ -62,6 +62,9 @@ declare_args() {
+@@ -54,6 +54,9 @@ declare_args() {
-   # to lack of toolchain support.
+   # Allows googletest to pretty-print various absl types.
-   gtest_enable_absl_printers = !is_nacl
+   gtest_enable_absl_printers = true
  
 +  # Allows clangd builds by suppressing unsupported parameters
 +  skip_clangd_unsupported_options = false

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

@@ -52,18 +52,17 @@ See also: https://github.com/bromite/bromite/issues/1549
 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
 ---
- .../permissions/last_tab_standing_tracker.cc  | 32 ++++++++
+ .../permissions/last_tab_standing_tracker.cc  | 33 ++++++++
- .../one_time_permissions_tracker.cc           | 33 +++++++-
+ .../one_time_permissions_tracker.cc           | 34 +++++++-
  .../one_time_permissions_tracker.h            |  5 +-
  .../one_time_permissions_tracker_factory.cc   |  2 +-
  .../views/permissions/chip/chip_controller.cc |  2 +-
  ...exclusive_access_permission_prompt_view.cc |  2 +-
  .../permission_prompt_bubble_base_view.cc     |  2 +-
- .../site_settings/PermissionInfo.java         |  1 +
  .../site_settings/SingleWebsiteSettings.java  |  9 ++
  .../android/website_preference_bridge.cc      |  2 +-
  .../strings/android/browser_ui_strings.grd    |  5 ++
- .../core/browser/content_settings_utils.cc    | 42 ++++++++--
+ .../core/browser/content_settings_utils.cc    | 44 ++++++++--
  .../core/browser/content_settings_utils.h     |  6 ++
  .../core/common/content_settings_enums.mojom  |  9 ++
  .../page_info/PageInfoController.java         |  4 +-
@@ -72,7 +71,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/page_info/page_info.cc             |  2 +
  components/page_info/page_info.h              |  1 +
  .../permissions/PermissionDialogDelegate.java | 13 +++
- .../PermissionDialogModelFactory.java         | 82 ++++++++++++++++++-
+ .../PermissionDialogModelFactory.java         | 83 ++++++++++++++++++-
  .../embedded_permission_prompt_android.cc     |  3 +-
  .../embedded_permission_prompt_android.h      |  2 +-
  .../permission_dialog_delegate.cc             | 24 +++++-
@@ -80,17 +79,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../permission_prompt_android.cc              |  8 +-
  .../permission_prompt_android.h               |  3 +-
  .../android/permissions_android_strings.grd   | 17 ++++
- .../geolocation_permission_context_android.cc | 32 ++++++--
+ .../geolocation_permission_context_android.cc | 30 +++++--
- .../geolocation_permission_context_android.h  | 11 ++-
+ .../geolocation_permission_context_android.h  |  8 ++
  .../embedded_permission_prompt_flow_model.cc  |  2 +-
- .../permissions/permission_context_base.cc    | 49 +++++++++--
+ .../permissions/permission_context_base.cc    | 64 ++++++++++++--
- .../permissions/permission_context_base.h     | 20 ++++-
+ .../permissions/permission_context_base.h     | 26 +++++-
  components/permissions/permission_prompt.h    |  3 +-
- components/permissions/permission_request.cc  | 32 +++++++-
+ components/permissions/permission_request.cc  | 34 +++++++-
  components/permissions/permission_request.h   | 18 +++-
  .../permissions/permission_request_manager.cc | 45 ++++++----
  .../permissions/permission_request_manager.h  | 11 ++-
- 38 files changed, 487 insertions(+), 71 deletions(-)
+ 37 files changed, 507 insertions(+), 73 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
@@ -128,13 +127,14 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/br
  LastTabStandingTracker::LastTabStandingTracker(content::BrowserContext* context)
      : context_(context) {}
  
-@@ -56,4 +82,10 @@ void LastTabStandingTracker::WebContentsUnloadedOrigin(
+@@ -56,4 +82,11 @@ void LastTabStandingTracker::WebContentsUnloadedOrigin(
      for (auto& observer : observer_list_) {
        observer.OnLastPageFromOriginClosed(origin);
      }
 +    HostContentSettingsMap* content_settings =
 +            permissions::PermissionsClient::Get()->GetSettingsMap(context_);
 +    RemoveSessionSettings(content_settings, origin, ContentSettingsType::GEOLOCATION);
++    RemoveSessionSettings(content_settings, origin, ContentSettingsType::GEOLOCATION_WITH_OPTIONS);
 +    RemoveSessionSettings(content_settings, origin, ContentSettingsType::MEDIASTREAM_MIC);
 +    RemoveSessionSettings(content_settings, origin, ContentSettingsType::MEDIASTREAM_CAMERA);
 +  }
@@ -143,7 +143,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
 --- a/chrome/browser/permissions/one_time_permissions_tracker.cc
 +++ b/chrome/browser/permissions/one_time_permissions_tracker.cc
 @@ -19,8 +19,34 @@
- #include "components/permissions/permission_context_base.h"
+ #include "components/permissions/features.h"
  #include "content/public/browser/visibility.h"
  #include "url/gurl.h"
 +#include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -178,13 +178,14 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
  OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
  
  OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
-@@ -254,6 +280,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
+@@ -254,6 +280,12 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
    for (auto& observer : observer_list_) {
      observer.OnLastPageFromOriginClosed(origin);
    }
 +  HostContentSettingsMap* content_settings =
 +          permissions::PermissionsClient::Get()->GetSettingsMap(context_);
 +  RemoveSessionSettings(content_settings, origin, ContentSettingsType::GEOLOCATION);
++  RemoveSessionSettings(content_settings, origin, ContentSettingsType::GEOLOCATION_WITH_OPTIONS);
 +  RemoveSessionSettings(content_settings, origin, ContentSettingsType::MEDIASTREAM_MIC);
 +  RemoveSessionSettings(content_settings, origin, ContentSettingsType::MEDIASTREAM_CAMERA);
  }
@@ -232,7 +233,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker_factory.cc
 diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 --- a/chrome/browser/ui/views/permissions/chip/chip_controller.cc
 +++ b/chrome/browser/ui/views/permissions/chip/chip_controller.cc
-@@ -224,7 +224,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
+@@ -227,7 +227,7 @@ void ChipController::OnWidgetDestroyed(views::Widget* widget) {
        active_chip_permission_request_manager_.value()->Accept();
        break;
      case permissions::PermissionAction::GRANTED_ONCE:
@@ -256,7 +257,7 @@ diff --git a/chrome/browser/ui/views/permissions/exclusive_access_permission_pro
 diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
 +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc
-@@ -297,7 +297,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallback(int button_id) {
+@@ -294,7 +294,7 @@ void PermissionPromptBubbleBaseView::RunButtonCallback(int button_id) {
        delegate_->Accept();
        return;
      case PermissionDialogButton::kAcceptOnce:
@@ -265,21 +266,10 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_v
        return;
      case PermissionDialogButton::kDeny:
  #if BUILDFLAG(IS_CHROMEOS)
-diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
---- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
-+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/PermissionInfo.java
-@@ -12,6 +12,7 @@ import org.chromium.components.content_settings.SessionModel;
- import org.chromium.components.permissions.PermissionsAndroidFeatureList;
- import org.chromium.components.permissions.PermissionsAndroidFeatureMap;
- import org.chromium.content_public.browser.BrowserContextHandle;
-+import org.chromium.components.content_settings.SessionModel;
- 
- import java.io.Serializable;
- import java.util.Objects;
 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
-@@ -618,6 +618,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -630,6 +630,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
      }
  
      @RequiresNonNull({"mSite"})
@@ -291,12 +281,12 @@ 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();
-@@ -1290,6 +1295,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1316,6 +1321,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-                     AppCompatResources.getColorStateList(getContext(), mHighlightColor)
+                                 .getDefaultColor());
-                             .getDefaultColor());
+             }
          }
-+        if (isSessionPermission(contentType)) {
++        if (preference instanceof ChromeSwitchPreference && isSessionPermission(contentType)) {
-+            switchPreference.setSummary(switchPreference.getSummary() + " " +
++            ((ChromeSwitchPreference)preference).setSummary(preference.getSummary() + " " +
 +                getString(R.string.page_info_android_permission_session_permission));
 +        }
      }
@@ -305,7 +295,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/website_preference_bridge.cc b/components/browser_ui/site_settings/android/website_preference_bridge.cc
 --- a/components/browser_ui/site_settings/android/website_preference_bridge.cc
 +++ b/components/browser_ui/site_settings/android/website_preference_bridge.cc
-@@ -208,7 +208,7 @@ void GetOrigins(JNIEnv* env,
+@@ -218,7 +218,7 @@ void GetOrigins(JNIEnv* env,
        seen_origins.push_back(origin);
        insertionFunc(env, static_cast<int>(content_type), list,
                      ConvertOriginToJavaString(env, origin), jembedder,
@@ -317,7 +307,7 @@ diff --git a/components/browser_ui/site_settings/android/website_preference_brid
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -637,6 +637,11 @@
+@@ -646,6 +646,11 @@
        <message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
          URL truncated
        </message>
@@ -332,7 +322,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
-@@ -157,6 +157,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
+@@ -182,6 +182,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
    return constraints.session_model() == mojom::SessionModel::DURABLE;
  }
  
@@ -373,23 +363,25 @@ 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
+   DCHECK(WebsiteSettingsRegistry::GetInstance()->Get(type)) << type;
-   // auto-revoked.
+ 
-@@ -240,9 +276,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
+@@ -261,10 +297,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrants() {
        ContentSettingsType::CAPTURED_SURFACE_CONTROL,
  #endif
        ContentSettingsType::KEYBOARD_LOCK,
 -      ContentSettingsType::GEOLOCATION,
+-      ContentSettingsType::GEOLOCATION_WITH_OPTIONS,
 -      ContentSettingsType::MEDIASTREAM_MIC,
 -      ContentSettingsType::MEDIASTREAM_CAMERA,
        ContentSettingsType::HAND_TRACKING,
        ContentSettingsType::SMART_CARD_DATA,
        ContentSettingsType::AR,
-@@ -258,9 +291,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
+@@ -280,10 +312,6 @@ const std::vector<ContentSettingsType>& GetTypesWithTemporaryGrantsInHcsm() {
        ContentSettingsType::CAPTURED_SURFACE_CONTROL,
  #endif
        ContentSettingsType::KEYBOARD_LOCK,
 -      ContentSettingsType::GEOLOCATION,
+-      ContentSettingsType::GEOLOCATION_WITH_OPTIONS,
 -      ContentSettingsType::MEDIASTREAM_MIC,
 -      ContentSettingsType::MEDIASTREAM_CAMERA,
        ContentSettingsType::HAND_TRACKING,
@@ -398,7 +390,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
 diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
 --- a/components/content_settings/core/browser/content_settings_utils.h
 +++ b/components/content_settings/core/browser/content_settings_utils.h
-@@ -73,6 +73,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
+@@ -78,6 +78,12 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints);
  // Returns whether the given type supports tracking last_visit timestamps.
  bool CanTrackLastVisit(ContentSettingsType type);
  
@@ -433,7 +425,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
-@@ -364,9 +364,9 @@ public class PageInfoController
+@@ -378,9 +378,9 @@ public class PageInfoController
              String name,
              String nameMidSentence,
              int type,
@@ -491,7 +483,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/page_info_controller_android.cc b/components/page_info/android/page_info_controller_android.cc
 --- a/components/page_info/android/page_info_controller_android.cc
 +++ b/components/page_info/android/page_info_controller_android.cc
-@@ -165,6 +165,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -186,6 +186,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
@@ -500,7 +492,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
  
    for (const auto& permission : permission_info_list) {
      if (base::Contains(permissions_to_display, permission.type)) {
-@@ -173,6 +175,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -194,6 +196,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
        if (setting_to_display) {
          user_specified_settings_to_display[permission.type] =
              *setting_to_display;
@@ -509,7 +501,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
        }
      }
    }
-@@ -189,7 +193,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -210,7 +214,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
@@ -519,7 +511,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
      }
    }
  
-@@ -202,7 +207,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -223,7 +228,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
          env, controller_jobject_, ConvertUTF16ToJavaString(env, object_title),
          ConvertUTF16ToJavaString(env, object_title),
          static_cast<jint>(chosen_object->ui_info->content_settings_type),
@@ -532,7 +524,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
 --- a/components/page_info/page_info.cc
 +++ b/components/page_info/page_info.cc
-@@ -1234,6 +1234,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1256,6 +1256,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
@@ -544,7 +536,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
 diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 --- a/components/page_info/page_info.h
 +++ b/components/page_info/page_info.h
-@@ -150,6 +150,7 @@ class PageInfo : private content_settings::CookieControlsObserver,
+@@ -151,6 +151,7 @@ class PageInfo : private content_settings::CookieControlsObserver,
          content_settings::SettingSource::kNone;
      // Whether the permission is a one-time grant.
      bool is_one_time = false;
@@ -555,15 +547,15 @@ diff --git a/components/page_info/page_info.h b/components/page_info/page_info.h
 diff --git a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 --- a/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
 +++ b/components/permissions/android/java/src/org/chromium/components/permissions/PermissionDialogDelegate.java
-@@ -16,6 +16,7 @@ import org.chromium.build.annotations.NullMarked;
+@@ -16,6 +16,7 @@ import org.jni_zero.NativeMethods;
+ import org.chromium.build.annotations.NullMarked;
  import org.chromium.build.annotations.Nullable;
- import org.chromium.components.content_settings.ContentSettingsType;
  import org.chromium.ui.base.WindowAndroid;
 +import org.chromium.components.content_settings.LifetimeMode;
  
  import java.util.ArrayList;
- import java.util.Arrays;
+ import java.util.List;
-@@ -72,6 +73,9 @@ public class PermissionDialogDelegate {
+@@ -67,6 +68,9 @@ public class PermissionDialogDelegate {
      // Prompt(screen) variant we want to display on the dialog.
      private @EmbeddedPromptVariant int mEmbeddedPromptVariant;
  
@@ -573,8 +565,8 @@ 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.
-@@ -145,6 +149,15 @@ public class PermissionDialogDelegate {
+@@ -139,6 +143,15 @@ public class PermissionDialogDelegate {
-                 .acceptThisTime(mNativeDelegatePtr, PermissionDialogDelegate.this);
+         PermissionDialogDelegateJni.get().acceptThisTime(mNativeDelegatePtr);
      }
  
 +    public void setSelectedLifetimeOption(int idx) {
@@ -588,7 +580,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 +
      public void onDeny() {
          assert mNativeDelegatePtr != 0;
-         PermissionDialogDelegateJni.get().deny(mNativeDelegatePtr, PermissionDialogDelegate.this);
+         PermissionDialogDelegateJni.get().deny(mNativeDelegatePtr);
 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
@@ -611,7 +603,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
  /** This class creates the model for the permission dialog. */
  @NullMarked
  class PermissionDialogModelFactory {
-@@ -67,7 +79,75 @@ class PermissionDialogModelFactory {
+@@ -67,7 +79,76 @@ class PermissionDialogModelFactory {
                              ModalDialogProperties.ButtonStyles.PRIMARY_FILLED_NEGATIVE_OUTLINE)
                      .with(ModalDialogProperties.CHANGE_CUSTOM_VIEW_OR_BUTTONS, true);
          }
@@ -620,6 +612,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 +        PropertyModel pm = builder.build();
 +        int[] types = delegate.getContentSettingsTypes();
 +        if (contains(types, ContentSettingsType.GEOLOCATION) ||
++            contains(types, ContentSettingsType.GEOLOCATION_WITH_OPTIONS) ||
 +            contains(types, ContentSettingsType.MEDIASTREAM_MIC) ||
 +            contains(types, ContentSettingsType.MEDIASTREAM_CAMERA))
 +        {
@@ -691,7 +684,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
 diff --git a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
 --- a/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
 +++ b/components/permissions/android/permission_prompt/embedded_permission_prompt_android.cc
-@@ -119,7 +119,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
+@@ -118,7 +118,8 @@ void EmbeddedPermissionPromptAndroid::Acknowledge() {
    delegate()->FinalizeCurrentRequests();
  }
  
@@ -716,7 +709,7 @@ diff --git a/components/permissions/android/permission_prompt/embedded_permissio
 diff --git a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 --- a/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
 +++ b/components/permissions/android/permission_prompt/permission_dialog_delegate.cc
-@@ -139,6 +139,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
+@@ -137,6 +137,11 @@ void PermissionDialogJavaDelegate::UpdateDialog() {
        static_cast<int>(permission_prompt_->GetEmbeddedPromptVariant()));
  }
  
@@ -728,9 +721,9 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
  // static
  std::unique_ptr<PermissionDialogDelegate> PermissionDialogDelegate::Create(
      content::WebContents* web_contents,
-@@ -168,6 +173,13 @@ PermissionDialogDelegate::CreateForTesting(
+@@ -165,12 +170,22 @@ PermissionDialogDelegate::CreateForTesting(
- void PermissionDialogDelegate::Accept(JNIEnv* env,
+ 
-                                       const JavaParamRef<jobject>& obj) {
+ void PermissionDialogDelegate::Accept(JNIEnv* env) {
    CHECK(permission_prompt_);
 +  content_settings::mojom::LifetimeMode lifetimeOption =
 +    static_cast<content_settings::mojom::LifetimeMode>(
@@ -742,9 +735,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
    permission_prompt_->Accept();
  }
  
-@@ -175,7 +187,10 @@ void PermissionDialogDelegate::AcceptThisTime(
+ void PermissionDialogDelegate::AcceptThisTime(JNIEnv* env) {
-     JNIEnv* env,
-     const JavaParamRef<jobject>& obj) {
    CHECK(permission_prompt_);
 -  permission_prompt_->AcceptThisTime();
 +  content_settings::mojom::LifetimeMode lifetimeOption =
@@ -753,10 +744,10 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 +  permission_prompt_->AcceptThisTime(lifetimeOption);
  }
  
- void PermissionDialogDelegate::Acknowledge(JNIEnv* env,
+ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
-@@ -187,6 +202,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env,
+@@ -180,6 +195,13 @@ void PermissionDialogDelegate::Acknowledge(JNIEnv* env) {
- void PermissionDialogDelegate::Deny(JNIEnv* env,
+ 
-                                     const JavaParamRef<jobject>& obj) {
+ void PermissionDialogDelegate::Deny(JNIEnv* env) {
    CHECK(permission_prompt_);
 +  content_settings::mojom::LifetimeMode lifetimeOption =
 +    static_cast<content_settings::mojom::LifetimeMode>(
@@ -782,7 +773,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_dialog_
 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
-@@ -83,8 +83,12 @@ void PermissionPromptAndroid::Accept() {
+@@ -85,8 +85,12 @@ void PermissionPromptAndroid::Accept() {
    delegate_->Accept();
  }
  
@@ -800,7 +791,7 @@ diff --git a/components/permissions/android/permission_prompt/permission_prompt_
 diff --git a/components/permissions/android/permission_prompt/permission_prompt_android.h b/components/permissions/android/permission_prompt/permission_prompt_android.h
 --- a/components/permissions/android/permission_prompt/permission_prompt_android.h
 +++ b/components/permissions/android/permission_prompt/permission_prompt_android.h
-@@ -55,9 +55,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
+@@ -56,9 +56,10 @@ class PermissionPromptAndroid : public PermissionPrompt {
        const;
    virtual void Closing();
    virtual void Accept();
@@ -842,12 +833,12 @@ 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
-@@ -193,7 +193,18 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -194,7 +194,18 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
-     bool is_one_time,
+     PermissionDecision decision,
      bool is_final_decision) {
    DCHECK(is_final_decision);
 +  NotifyPermissionSetWithLifetime(request_data,
-+    std::move(callback), persist, content_setting, is_one_time, is_final_decision,
++    std::move(callback), persist, decision, is_final_decision,
 +    content_settings::mojom::LifetimeMode::ALWAYS);
 +}
  
@@ -855,122 +846,119 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
 +    const PermissionRequestData& request_data,
 +    BrowserPermissionCallback callback,
 +    bool persist,
-+    ContentSetting content_setting,
++    PermissionDecision decision,
-+    bool is_one_time, bool is_final_decision,
++    bool is_final_decision,
 +    content_settings::mojom::LifetimeMode lifetime_option) {
    bool is_default_search =
        IsRequestingOriginDSE(request_data.requesting_origin);
-   if (content_setting == CONTENT_SETTING_ALLOW &&
+   if (decision == PermissionDecision::kAllow &&
-@@ -208,7 +219,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+@@ -209,7 +220,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
        FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
                                  request_data.embedding_origin,
                                  std::move(callback), false /* persist */,
--                                CONTENT_SETTING_BLOCK, is_one_time);
+-                                PermissionDecision::kDeny,
-+                                CONTENT_SETTING_BLOCK,
++                                PermissionDecision::kDeny, lifetime_option,
-+                                is_one_time, lifetime_option);
+                                 request_data.prompt_options);
        return;
      }
- 
+@@ -230,7 +241,7 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
-@@ -228,7 +240,8 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
        FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
                                  request_data.embedding_origin,
                                  std::move(callback), false /* persist */,
--                                CONTENT_SETTING_BLOCK, is_one_time);
+-                                PermissionDecision::kDeny,
-+                                CONTENT_SETTING_BLOCK,
++                                PermissionDecision::kDeny, lifetime_option,
-+                                is_one_time, lifetime_option);
+                                 request_data.prompt_options);
        return;
      }
- 
+@@ -243,14 +254,14 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
-@@ -241,13 +254,13 @@ void GeolocationPermissionContextAndroid::NotifyPermissionSet(
+         base::BindOnce(
              &GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown,
              weak_factory_.GetWeakPtr(), request_data.requesting_origin,
-             request_data.embedding_origin, persist, content_setting,
+-            request_data.embedding_origin, persist, decision,
--            is_one_time));
++            request_data.embedding_origin, persist, decision, lifetime_option,
-+            is_one_time, lifetime_option));
+             request_data.prompt_options));
      return;
    }
  
    FinishNotifyPermissionSet(request_data.id, request_data.requesting_origin,
                              request_data.embedding_origin, std::move(callback),
--                            persist, content_setting, is_one_time);
+-                            persist, decision, request_data.prompt_options);
-+                            persist, content_setting, is_one_time, lifetime_option);
++                            persist, decision, lifetime_option, request_data.prompt_options);
  }
  
  content::PermissionResult
-@@ -425,7 +438,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+@@ -427,7 +438,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
+     const GURL& requesting_origin,
      const GURL& embedding_origin,
      bool persist,
-     ContentSetting content_setting,
+-    PermissionDecision decision,
--    bool is_one_time,
++    PermissionDecision decision, content_settings::mojom::LifetimeMode lifetime_option,
-+    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option,
+     std::optional<PromptOptions> prompt_options,
      LocationSettingsDialogOutcome prompt_outcome) {
    bool is_default_search = IsRequestingOriginDSE(requesting_origin);
-   if (prompt_outcome == GRANTED) {
+@@ -447,7 +458,7 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
-@@ -444,7 +457,8 @@ void GeolocationPermissionContextAndroid::OnLocationSettingsDialogShown(
    FinishNotifyPermissionSet(location_settings_dialog_request_id_,
                              requesting_origin, embedding_origin,
                              std::move(location_settings_dialog_callback_),
--                            persist, content_setting, is_one_time);
+-                            persist, decision, prompt_options);
-+                            persist, content_setting, is_one_time,
++                            persist, decision, lifetime_option, prompt_options);
-+                            lifetime_option);
  
    location_settings_dialog_request_id_ =
        PermissionRequestID(content::GlobalRenderFrameHostId(0, 0),
-@@ -458,8 +472,8 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+@@ -460,7 +471,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+     const GURL& embedding_origin,
      BrowserPermissionCallback callback,
      bool persist,
-     ContentSetting content_setting,
+-    PermissionDecision decision,
--    bool is_one_time) {
++    PermissionDecision decision, content_settings::mojom::LifetimeMode lifetime_option,
+     std::optional<PromptOptions> prompt_options) {
+   PermissionRequestData request_data(
+       this, id,
+@@ -469,9 +480,10 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
+               blink::PermissionType::GEOLOCATION)),
+       requesting_origin, embedding_origin);
+   request_data.prompt_options = prompt_options.value_or(std::monostate());
 -  GeolocationPermissionContext::NotifyPermissionSet(
-+    bool is_one_time, content_settings::mojom::LifetimeMode lifetime_option) {
++  GeolocationPermissionContext::NotifyPermissionSetImpl(
-+  GeolocationPermissionContext::NotifyPermissionSetWithLifetime(
+      request_data,
-       PermissionRequestData(this, id,
+-      std::move(callback), persist, decision, /*is_final_decision=*/true);
-                             content::PermissionRequestDescription(
++      std::move(callback), persist, decision, /*is_final_decision=*/true,
-                                 content::PermissionDescriptorUtil::
++      /*use_lifetime_option*/ true, lifetime_option);
-@@ -467,7 +481,7 @@ void GeolocationPermissionContextAndroid::FinishNotifyPermissionSet(
-                                         blink::PermissionType::GEOLOCATION)),
-                             requesting_origin),
-       std::move(callback), persist, content_setting, is_one_time,
--      /*is_final_decision=*/true);
-+      /*is_final_decision=*/true, lifetime_option);
  }
  
  void GeolocationPermissionContextAndroid::SetLocationSettingsForTesting(
 diff --git a/components/permissions/contexts/geolocation_permission_context_android.h b/components/permissions/contexts/geolocation_permission_context_android.h
 --- a/components/permissions/contexts/geolocation_permission_context_android.h
 +++ b/components/permissions/contexts/geolocation_permission_context_android.h
-@@ -93,6 +93,13 @@ class GeolocationPermissionContextAndroid
+@@ -92,6 +92,12 @@ class GeolocationPermissionContextAndroid
-                            ContentSetting content_setting,
+                            bool persist,
-                            bool is_one_time,
+                            PermissionDecision decision,
                             bool is_final_decision) override;
 +  void NotifyPermissionSetWithLifetime(const PermissionRequestData& request_data,
 +                           BrowserPermissionCallback callback,
 +                           bool persist,
-+                           ContentSetting content_setting,
++                           PermissionDecision decision,
-+                           bool is_one_time,
 +                           bool is_final_decision,
 +                           content_settings::mojom::LifetimeMode lifetime_option) override;
    content::PermissionResult UpdatePermissionStatusWithDeviceStatus(
        content::WebContents* web_contents,
        content::PermissionResult result,
-@@ -138,6 +145,7 @@ class GeolocationPermissionContextAndroid
+@@ -136,6 +142,7 @@ class GeolocationPermissionContextAndroid
+       const GURL& embedding_origin,
        bool persist,
-       ContentSetting content_setting,
+       PermissionDecision decision,
-       bool is_one_time,
 +      content_settings::mojom::LifetimeMode lifetime_option,
+       std::optional<PromptOptions> prompt_options,
        LocationSettingsDialogOutcome prompt_outcome);
  
-   void FinishNotifyPermissionSet(const PermissionRequestID& id,
+@@ -145,6 +152,7 @@ class GeolocationPermissionContextAndroid
-@@ -146,7 +154,8 @@ class GeolocationPermissionContextAndroid
                                   BrowserPermissionCallback callback,
                                   bool persist,
-                                  ContentSetting content_setting,
+                                  PermissionDecision decision,
--                                 bool is_one_time);
++                                 content_settings::mojom::LifetimeMode lifetime_option,
-+                                 bool is_one_time,
+                                  std::optional<PromptOptions> prompt_options);
-+                                 content_settings::mojom::LifetimeMode lifetime_option);
  
    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
@@ -986,7 +974,7 @@ diff --git a/components/permissions/embedded_permission_prompt_flow_model.cc b/c
 diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
 --- a/components/permissions/permission_context_base.cc
 +++ b/components/permissions/permission_context_base.cc
-@@ -253,6 +253,17 @@ PermissionContextBase::CreatePermissionRequest(
+@@ -260,6 +260,17 @@ PermissionContextBase::CreatePermissionRequest(
        std::move(request_finished_callback), UsesAutomaticEmbargo());
  }
  
@@ -1004,41 +992,39 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
  bool PermissionContextBase::UsesAutomaticEmbargo() const {
    return true;
  }
-@@ -540,7 +551,8 @@ void PermissionContextBase::PermissionDecided(
+@@ -551,7 +562,8 @@ void PermissionContextBase::DecidePermission(
-     ContentSetting content_setting,
+ void PermissionContextBase::PermissionDecided(
-     bool is_one_time,
+     PermissionDecision decision,
      bool is_final_decision,
 -    const PermissionRequestData& request_data) {
 +    const PermissionRequestData& request_data,
 +    content_settings::mojom::LifetimeMode lifetime_option) {
-   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
+   UserMadePermissionDecision(request_data.id, request_data.requesting_origin,
-          content_setting == CONTENT_SETTING_BLOCK ||
+                              request_data.embedding_origin, decision);
-          content_setting == CONTENT_SETTING_DEFAULT);
+ 
-@@ -556,12 +568,13 @@ void PermissionContextBase::PermissionDecided(
+@@ -564,11 +576,12 @@ void PermissionContextBase::PermissionDecided(
    // missing if a permission prompt was preignored and we already notified an
    // origin about it.
    if (request->second.second) {
 -    NotifyPermissionSet(request_data, std::move(request->second.second),
+-                        persist, decision, is_final_decision);
 +    NotifyPermissionSetWithLifetime(request_data, std::move(request->second.second),
-                         persist, content_setting, is_one_time,
++                        persist, decision, is_final_decision,
--                        is_final_decision);
-+                        is_final_decision,
 +                        lifetime_option);
    } else {
--    NotifyPermissionSet(request_data, base::DoNothing(), persist,
+-    NotifyPermissionSet(request_data, base::DoNothing(), persist, decision,
--                        content_setting, is_one_time, is_final_decision);
+-                        is_final_decision);
-+    NotifyPermissionSetWithLifetime(request_data, base::DoNothing(), persist,
++    NotifyPermissionSetWithLifetime(request_data, base::DoNothing(), persist, decision,
-+                        content_setting, is_one_time, is_final_decision, lifetime_option);
++                        is_final_decision, lifetime_option);
    }
  }
  
-@@ -652,10 +665,24 @@ void PermissionContextBase::NotifyPermissionSet(
+@@ -653,6 +666,30 @@ void PermissionContextBase::NotifyPermissionSet(
-     ContentSetting content_setting,
+     bool persist,
-     bool is_one_time,
+     PermissionDecision decision,
      bool is_final_decision) {
-+  DCHECK(is_one_time == false);
++  NotifyPermissionSetImpl(request_data, std::move(callback),
-+  NotifyPermissionSetWithLifetime(request_data, std::move(callback),
++     persist, decision, is_final_decision, /*use_lifetime_option*/ false,
-+     persist, content_setting, is_one_time, is_final_decision,
 +     content_settings::mojom::LifetimeMode::ALWAYS);
 +}
 +
@@ -1046,38 +1032,58 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 +    const PermissionRequestData& request_data,
 +    BrowserPermissionCallback callback,
 +    bool persist,
-+    ContentSetting content_setting,
++    PermissionDecision decision,
-+    bool is_one_time,
 +    bool is_final_decision,
++    content_settings::mojom::LifetimeMode lifetime_option) {
++  NotifyPermissionSetImpl(request_data, std::move(callback),
++     persist, decision, is_final_decision, /*use_lifetime_option*/ true,
++     lifetime_option);
++}
++
++void PermissionContextBase::NotifyPermissionSetImpl(
++    const PermissionRequestData& request_data,
++    BrowserPermissionCallback callback,
++    bool persist,
++    PermissionDecision decision,
++    bool is_final_decision, bool use_lifetime_option,
 +    content_settings::mojom::LifetimeMode lifetime_option) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  
+   // Note that rfh may be null, see crbug.com/426909787.
+@@ -668,8 +705,8 @@ void PermissionContextBase::NotifyPermissionSet(
+ 
    if (persist) {
--    UpdateContentSetting(request_data, content_setting, is_one_time);
+     // Clone new value, because we need it again for the callback.
-+    UpdateContentSetting(request_data, content_setting, is_one_time, lifetime_option);
+-    UpdateSetting(request_data, std::move(new_value),
+-                  decision == PermissionDecision::kAllowThisTime);
++    UpdateSettingImpl(request_data, std::move(new_value),
++                  decision == PermissionDecision::kAllowThisTime, use_lifetime_option, lifetime_option);
    }
  
    if (is_final_decision) {
-@@ -696,6 +723,14 @@ void PermissionContextBase::UpdateContentSetting(
+@@ -706,6 +743,17 @@ void PermissionContextBase::UpdateSetting(
      const PermissionRequestData& request_data,
-     ContentSetting content_setting,
+     PermissionSetting setting,
      bool is_one_time) {
-+  UpdateContentSetting(request_data, content_setting,
++  UpdateSettingImpl(request_data, std::move(setting),
-+    is_one_time, content_settings::mojom::LifetimeMode::ALWAYS);
++    is_one_time,
++    /*use_lifetime_option*/ false,
++    content_settings::mojom::LifetimeMode::ALWAYS);
 +}
 +
-+void PermissionContextBase::UpdateContentSetting(const PermissionRequestData& request_data,
++void PermissionContextBase::UpdateSettingImpl(const PermissionRequestData& request_data,
-+                                                 ContentSetting content_setting,
++                                              PermissionSetting setting,
-+                                                 bool is_one_time,
++                                              bool is_one_time,
-+                                                 content_settings::mojom::LifetimeMode lifetime_option) {
++                                              bool use_lifetime_option,
++                                              content_settings::mojom::LifetimeMode lifetime_option) {
    DCHECK_EQ(request_data.requesting_origin,
              request_data.requesting_origin.DeprecatedGetOriginAsURL());
    DCHECK_EQ(request_data.embedding_origin,
-@@ -707,6 +742,8 @@ void PermissionContextBase::UpdateContentSetting(
+@@ -715,6 +763,8 @@ void PermissionContextBase::UpdateSetting(
    constraints.set_session_model(
        is_one_time ? content_settings::mojom::SessionModel::ONE_TIME
                    : content_settings::mojom::SessionModel::DURABLE);
-+  if (is_one_time)
++  if (use_lifetime_option)
 +    constraints = content_settings::GetConstraintSessionExpiration(lifetime_option);
  
    // The Permissions module in Safety check will revoke permissions after
@@ -1085,32 +1091,38 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
 diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
 --- a/components/permissions/permission_context_base.h
 +++ b/components/permissions/permission_context_base.h
-@@ -188,6 +188,13 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -192,6 +192,18 @@ class PermissionContextBase : public content_settings::Observer {
  
-   // Updates stored content setting if persist is set, updates tab indicators
+   // Updates stored setting if persist is set, updates tab indicators
    // and runs the callback to finish the request.
++  void NotifyPermissionSetImpl(const PermissionRequestData& request_data,
++                               BrowserPermissionCallback callback,
++                               bool persist,
++                               PermissionDecision decision,
++                               bool is_final_decision, bool use_lifetime_option,
++                               content_settings::mojom::LifetimeMode lifetime_option);
 +  virtual void NotifyPermissionSetWithLifetime(const PermissionRequestData& request_data,
 +                                               BrowserPermissionCallback callback,
 +                                               bool persist,
-+                                               ContentSetting content_setting,
++                                               PermissionDecision decision,
-+                                               bool is_one_time,
 +                                               bool is_final_decision,
 +                                               content_settings::mojom::LifetimeMode lifetime_option);
    virtual void NotifyPermissionSet(const PermissionRequestData& request_data,
                                     BrowserPermissionCallback callback,
                                     bool persist,
-@@ -207,6 +214,10 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -209,6 +221,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
+   // Store the decided permission state. Virtual since the permission might be
-   // (for example for desktop notifications).
+   // stored with different restrictions (for example for desktop notifications).
-+  void UpdateContentSetting(const PermissionRequestData& request_data,
++  void UpdateSettingImpl(const PermissionRequestData& request_data,
-+                            ContentSetting content_setting,
++                         PermissionSetting setting,
-+                            bool is_one_time,
++                         bool is_one_time,
-+                            content_settings::mojom::LifetimeMode lifetime_option);
++                         bool use_lifetime_option,
-   virtual void UpdateContentSetting(const PermissionRequestData& request_data,
++                         content_settings::mojom::LifetimeMode lifetime_option);
-                                     ContentSetting content_setting,
+   virtual void UpdateSetting(const PermissionRequestData& request_data,
-                                     bool is_one_time);
+                              PermissionSetting setting,
-@@ -236,6 +247,12 @@ class PermissionContextBase : public content_settings::Observer {
+                              bool is_one_time);
+@@ -238,6 +255,12 @@ class PermissionContextBase : public content_settings::Observer {
        PermissionRequest::PermissionDecidedCallback permission_decided_callback,
        base::OnceClosure request_finished_callback) const;
  
@@ -1123,9 +1135,9 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
    // Implementors can override this method to avoid using automatic embargo.
    virtual bool UsesAutomaticEmbargo() const;
  
-@@ -270,7 +287,8 @@ class PermissionContextBase : public content_settings::Observer {
+@@ -271,7 +294,8 @@ class PermissionContextBase : public content_settings::Observer {
-   void PermissionDecided(ContentSetting content_setting,
+   // allows/blocks/dismisses a permission prompt.
-                          bool is_one_time,
+   void PermissionDecided(PermissionDecision decision,
                           bool is_final_decision,
 -                         const PermissionRequestData& request_data);
 +                         const PermissionRequestData& request_data,
@@ -1136,7 +1148,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
 diff --git a/components/permissions/permission_prompt.h b/components/permissions/permission_prompt.h
 --- a/components/permissions/permission_prompt.h
 +++ b/components/permissions/permission_prompt.h
-@@ -68,8 +68,9 @@ class PermissionPrompt {
+@@ -70,8 +70,9 @@ class PermissionPrompt {
      virtual GURL GetEmbeddingOrigin() const = 0;
  
      virtual void Accept() = 0;
@@ -1150,7 +1162,7 @@ diff --git a/components/permissions/permission_prompt.h b/components/permissions
 diff --git a/components/permissions/permission_request.cc b/components/permissions/permission_request.cc
 --- a/components/permissions/permission_request.cc
 +++ b/components/permissions/permission_request.cc
-@@ -32,6 +32,16 @@ PermissionRequest::PermissionRequest(
+@@ -36,6 +36,16 @@ PermissionRequest::PermissionRequest(
        request_finished_callback_(std::move(request_finished_callback)),
        uses_automatic_embargo_(uses_automatic_embargo) {}
  
@@ -1167,7 +1179,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    std::move(request_finished_callback_).Run();
  }
-@@ -412,19 +422,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+@@ -424,20 +434,40 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
    return request_type() == RequestType::kStorageAccess;
  }
  
@@ -1176,11 +1188,14 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 +                            content_settings::mojom::LifetimeMode lifetime_option) {
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
-+        .Run(CONTENT_SETTING_ALLOW, is_one_time, /*is_final_decision=*/true, *data_, lifetime_option);
++        .Run(is_one_time ? PermissionDecision::kAllowThisTime
++                         : PermissionDecision::kAllow,
++             /*is_final_decision=*/true, *data_, lifetime_option);
 +    return;
 +  }
    std::move(permission_decided_callback_)
-       .Run(CONTENT_SETTING_ALLOW, is_one_time,
+       .Run(is_one_time ? PermissionDecision::kAllowThisTime
+                        : PermissionDecision::kAllow,
             /*is_final_decision=*/true, /*request_data=*/*data_);
  }
  
@@ -1189,33 +1204,33 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
 +                            content_settings::mojom::LifetimeMode lifetime_option) {
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
-+        .Run(CONTENT_SETTING_BLOCK, is_one_time, /*is_final_decision=*/true, *data_, lifetime_option);
++        .Run(PermissionDecision::kDeny, /*is_final_decision=*/true, *data_, lifetime_option);
 +    return;
 +  }
    std::move(permission_decided_callback_)
-       .Run(CONTENT_SETTING_BLOCK, /*is_one_time=*/false,
+       .Run(PermissionDecision::kDeny,
             /*is_final_decision=*/true, /*request_data=*/*data_);
  }
  
  void PermissionRequest::Cancelled(bool is_final_decision) {
 +  if (permission_decided_callback_withlifetime_) {
 +    std::move(permission_decided_callback_withlifetime_)
-+        .Run(CONTENT_SETTING_DEFAULT, false, is_final_decision, *data_,
++        .Run(PermissionDecision::kNone, is_final_decision, *data_,
 +             content_settings::mojom::LifetimeMode::ALWAYS);
 +    return;
 +  }
    if (permission_decided_callback_) {
-     permission_decided_callback_.Run(CONTENT_SETTING_DEFAULT,
+     permission_decided_callback_.Run(PermissionDecision::kNone,
-                                      /*is_one_time=*/false, is_final_decision,
+                                      is_final_decision,
 diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h
 --- a/components/permissions/permission_request.h
 +++ b/components/permissions/permission_request.h
-@@ -47,6 +47,12 @@ class PermissionRequest {
+@@ -52,6 +52,12 @@ class PermissionRequest {
        bool /*is_final_decision*/,
        const PermissionRequestData& /*request_data*/)>;
  
 +  using PermissionDecidedCallbackWithLifetime = base::RepeatingCallback<void(
-+      ContentSetting /*result*/, bool /*is_one_time*/,
++      PermissionDecision /*decision*/,
 +      bool /*is_final_decision*/,
 +      const PermissionRequestData& /*request_data*/,
 +      content_settings::mojom::LifetimeMode /*lifetime_option*/)>;
@@ -1223,7 +1238,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    // `permission_decided_callback` is called when the permission request is
    // resolved by the user (see comment on PermissionDecidedCallback above).
    // `request_finished_callback` is called when the permission request is being
-@@ -61,6 +67,11 @@ class PermissionRequest {
+@@ -66,6 +72,11 @@ class PermissionRequest {
        base::OnceClosure request_finished_callback = base::DoNothing(),
        bool uses_automatic_embargo = true);
  
@@ -1235,7 +1250,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
    PermissionRequest(const PermissionRequest&) = delete;
    PermissionRequest& operator=(const PermissionRequest&) = delete;
  
-@@ -167,10 +178,10 @@ class PermissionRequest {
+@@ -172,10 +183,10 @@ class PermissionRequest {
    // If |is_one_time| is true the permission will last until all tabs of
    // |origin| are closed or navigated away from, and then the permission will
    // automatically expire after 1 day.
@@ -1248,7 +1263,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
  
    // Called when the user has cancelled the permission request. This
    // corresponds to a denial, but is segregated in case the context needs to
-@@ -224,6 +235,9 @@ class PermissionRequest {
+@@ -237,6 +248,9 @@ class PermissionRequest {
    // Called once a decision is made about the permission.
    PermissionDecidedCallback permission_decided_callback_;
  
@@ -1261,7 +1276,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission
 diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
 --- a/components/permissions/permission_request_manager.cc
 +++ b/components/permissions/permission_request_manager.cc
-@@ -189,7 +189,7 @@ void PermissionRequestManager::AddRequest(
+@@ -198,7 +198,7 @@ void PermissionRequestManager::AddRequest(
  
    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kDenyPermissionPrompts)) {
@@ -1270,7 +1285,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      return;
    }
  
-@@ -258,7 +258,7 @@ void PermissionRequestManager::AddRequest(
+@@ -267,7 +267,7 @@ void PermissionRequestManager::AddRequest(
  
    if (should_auto_approve_request) {
      if (should_auto_approve_request == PermissionAction::GRANTED) {
@@ -1279,7 +1294,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
      }
      return;
    }
-@@ -623,7 +623,8 @@ void PermissionRequestManager::Accept() {
+@@ -626,7 +626,8 @@ void PermissionRequestManager::Accept() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED);
      PermissionGrantedIncludingDuplicates(requests_iter->get(),
@@ -1289,7 +1304,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
  
  #if !BUILDFLAG(IS_ANDROID)
      std::optional<ContentSettingsType> content_settings_type =
-@@ -641,7 +642,7 @@ void PermissionRequestManager::Accept() {
+@@ -644,7 +645,7 @@ void PermissionRequestManager::Accept() {
    CurrentRequestsDecided(PermissionAction::GRANTED);
  }
  
@@ -1298,7 +1313,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -655,7 +656,8 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -658,7 +659,8 @@ void PermissionRequestManager::AcceptThisTime() {
                                  (*requests_iter)->request_type(),
                                  PermissionAction::GRANTED_ONCE);
      PermissionGrantedIncludingDuplicates(requests_iter->get(),
@@ -1308,7 +1323,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    }
  
    NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
-@@ -663,6 +665,15 @@ void PermissionRequestManager::AcceptThisTime() {
+@@ -666,6 +668,15 @@ void PermissionRequestManager::AcceptThisTime() {
  }
  
  void PermissionRequestManager::Deny() {
@@ -1324,7 +1339,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
    if (ignore_callbacks_from_prompt_) {
      return;
    }
-@@ -685,7 +696,7 @@ void PermissionRequestManager::Deny() {
+@@ -688,7 +699,7 @@ void PermissionRequestManager::Deny() {
      StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
                                  (*requests_iter)->request_type(),
                                  PermissionAction::DENIED);
@@ -1388,7 +1403,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
 diff --git a/components/permissions/permission_request_manager.h b/components/permissions/permission_request_manager.h
 --- a/components/permissions/permission_request_manager.h
 +++ b/components/permissions/permission_request_manager.h
-@@ -165,8 +165,10 @@ class PermissionRequestManager
+@@ -166,8 +166,10 @@ class PermissionRequestManager
    GURL GetRequestingOrigin() const override;
    GURL GetEmbeddingOrigin() const override;
    void Accept() override;
@@ -1400,7 +1415,7 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
    void Dismiss() override;
    void Ignore() override;
    void FinalizeCurrentRequests() override;
-@@ -394,9 +396,12 @@ class PermissionRequestManager
+@@ -413,9 +415,12 @@ class PermissionRequestManager
  
    // Calls PermissionGranted on a request and all its duplicates.
    void PermissionGrantedIncludingDuplicates(PermissionRequest* request,
@@ -1413,6 +1428,6 @@ diff --git a/components/permissions/permission_request_manager.h b/components/pe
 +                                           bool is_one_time,
 +                                           content_settings::mojom::LifetimeMode lifetime_option);
    // Calls Cancelled on a request and all its duplicates.
-   void CancelledIncludingDuplicates(PermissionRequest* request,
+   void CancelRequestIncludingDuplicates(PermissionRequest* request,
-                                     bool is_final_decision = true);
+                                         bool is_final_decision = true);
 --

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

@@ -4,8 +4,9 @@ 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/android/java/res/values/ids.xml        |  1 +
  .../chrome/browser/ChromeTabbedActivity.java  | 43 +++++++++++++++++++
+ .../TabbedAppMenuPropertiesDelegate.java      | 15 +++++++
  .../bookmarks/android/bookmark_bridge.cc      | 42 ++++++++++++++++++
  .../bookmarks/android/bookmark_bridge.h       |  8 ++++
  .../browser/bookmarks/BookmarkBridge.java     | 41 ++++++++++++++++++
@@ -28,34 +29,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bookmarks/browser/bookmark_uuids.cc       |  3 ++
  components/bookmarks/browser/bookmark_uuids.h |  1 +
  components/bookmarks/browser/model_loader.cc  |  9 +++-
- ...ookmark_model_merger_comparison_metrics.cc |  4 ++
  .../bookmark_specifics_conversions.cc         |  1 +
- 26 files changed, 250 insertions(+), 14 deletions(-)
+ 26 files changed, 255 insertions(+), 14 deletions(-)
 
-diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
+diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
---- a/chrome/android/java/res/menu/main_menu.xml
+--- a/chrome/android/java/res/values/ids.xml
-+++ b/chrome/android/java/res/menu/main_menu.xml
++++ b/chrome/android/java/res/values/ids.xml
-@@ -77,6 +77,10 @@ found in the LICENSE file.
+@@ -180,6 +180,7 @@ found in the LICENSE file.
-         <item android:id="@+id/all_bookmarks_menu_id"
+     <item type="id" name="menu_select_tabs" />
-             android:title="@string/menu_bookmarks"
+     <item type="id" name="menu_item_content_filter_divider_line_id" />
-             android:icon="@drawable/btn_star_filled" />
+     <item type="id" name="menu_item_content_filter_help_center_id" />
-+        <item android:id="@+id/bookmark_all_tabs_menu_id"
++    <item type="id" name="bookmark_all_tabs_menu_id" />
-+            android:title="@string/menu_bookmark_all_tabs"
+ 
-+            android:titleCondensed="@string/menu_bookmark_all_tabs"
+     <!-- Custom Tabs -->
-+            android:icon="@drawable/ic_folder_blue_24dp" />
+     <item type="id" name="view_id_tag_key" />
-         <item android:id="@+id/recent_tabs_menu_id"
-             android:title="@string/menu_recent_tabs"
-             android:icon="@drawable/devices_black_24dp" />
-@@ -207,6 +211,9 @@ found in the LICENSE file.
-         <item android:id="@id/tinker_tank_menu_id"
-             android:title="@string/menu_tinker_tank"
-             android:icon="@drawable/ic_add_box_rounded_corner" />
-+        <item android:id="@+id/bookmark_all_tabs_menu_id"
-+            android:title="@string/menu_bookmark_all_tabs"
-+            android:icon="@drawable/ic_folder_blue_24dp" />
-         <item android:id="@+id/menu_select_tabs"
-             android:title="@string/menu_select_tabs"
-             android:icon="@drawable/ic_select_check_box_24dp" />
 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
@@ -67,26 +54,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -275,6 +276,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
+@@ -287,6 +288,9 @@ import org.chromium.chrome.browser.ui.browser_window.ChromeAndroidTaskTrackerFac
  import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
- import org.chromium.chrome.browser.ui.extensions.ExtensionKeybindingRegistry;
+ import org.chromium.chrome.browser.ui.extensions.windowing.ExtensionWindowControllerBridgeFactory;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
  import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
  import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
  import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig;
-@@ -284,6 +288,8 @@ import org.chromium.chrome.browser.undo_tab_close_snackbar.UndoBarController;
+@@ -298,6 +302,8 @@ import org.chromium.chrome.browser.usage_stats.UsageStatsService;
- 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.chrome.browser.xr.scenecore.XrSceneCoreSessionInitializerImpl;
+ import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionManagerImpl;
 +import org.chromium.components.bookmarks.BookmarkId;
 +import org.chromium.components.bookmarks.BookmarkItem;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.edge_to_edge.SystemBarColorHelper;
  import org.chromium.components.browser_ui.edge_to_edge.TabbedSystemBarColorHelper;
-@@ -3394,6 +3400,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3724,6 +3730,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                      getTabModelSelectorSupplier().get(),
                      closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -95,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
  
-@@ -3502,6 +3510,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3848,6 +3856,41 @@ public class ChromeTabbedActivity extends ChromeActivity {
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -137,10 +124,42 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
      private void recordLauncherShortcutAction(boolean isIncognito) {
          if (isIncognito) {
              RecordUserAction.record("Android.LauncherShortcut.NewIncognitoTab");
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+@@ -270,6 +270,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+         // Bookmarks
+         modelList.add(buildBookmarksItem());
+ 
++        // Add bookmark all item
++        modelList.add(new MVCListAdapter.ListItem(
++                AppMenuHandler.AppMenuItemType.STANDARD,
++                buildModelForStandardMenuItem(
++                        R.id.bookmark_all_tabs_menu_id,
++                        R.string.menu_bookmark_all_tabs,
++                        shouldShowIconBeforeItem() ? R.drawable.ic_folder_blue_24dp : 0)));
++
+         // Recent Tabs
+         if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
+ 
+@@ -434,6 +442,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+         }
+         modelList.add(buildCloseAllTabsItem());
+         if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
++        // Add bookmark all item
++        modelList.add(new MVCListAdapter.ListItem(
++                AppMenuHandler.AppMenuItemType.STANDARD,
++                buildModelForStandardMenuItem(
++                        R.id.bookmark_all_tabs_menu_id,
++                        R.string.menu_bookmark_all_tabs,
++                        shouldShowIconBeforeItem() ? R.drawable.ic_folder_blue_24dp : 0)));
+         modelList.add(buildSelectTabsItem());
+         if (shouldShowQuickDeleteItem()) modelList.add(buildQuickDeleteItem());
+         modelList.add(buildSettingsItem());
 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
-@@ -390,6 +390,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
+@@ -340,6 +340,33 @@ jboolean BookmarkBridge::AreAccountBookmarkFoldersActive(JNIEnv* env) {
    return bookmark_model_->account_mobile_node() != nullptr;
  }
  
@@ -174,7 +193,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) {
-@@ -502,6 +529,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -452,6 +479,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(),
@@ -182,7 +201,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
        bookmark_model_->bookmark_bar_node(),
        bookmark_model_->other_node(),
    };
-@@ -610,6 +638,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+@@ -560,6 +588,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
      top_level_folders.push_back(other_node);
    }
  
@@ -192,7 +211,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(
-@@ -1337,6 +1368,17 @@ void BookmarkBridge::GetBookmarksOfType(
+@@ -1237,6 +1268,17 @@ void BookmarkBridge::GetBookmarksOfType(
    AddBookmarkNodesToBookmarkIdList(env, j_list, results);
  }
  
@@ -224,7 +243,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(
-@@ -250,6 +254,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -245,6 +249,10 @@ class BookmarkBridge : public ProfileObserver,
                            const base::android::JavaParamRef<jobject>& j_list,
                            jint type);
  
@@ -279,7 +298,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /** Returns Id representing the special "other" folder from bookmark model. */
      public @Nullable BookmarkId getOtherFolderId() {
          ThreadUtils.assertOnUiThread();
-@@ -898,6 +911,29 @@ class BookmarkBridge {
+@@ -882,6 +895,29 @@ class BookmarkBridge {
                  .addToReadingList(mNativeBookmarkBridge, parentId, title, url);
      }
  
@@ -309,7 +328,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
      /**
       * Helper method to mark an item as read.
       *
-@@ -1115,6 +1151,9 @@ class BookmarkBridge {
+@@ -1099,6 +1135,9 @@ class BookmarkBridge {
          BookmarkId getMostRecentlyAddedUserBookmarkIdForUrl(
                  long nativeBookmarkBridge, @JniType("GURL") GURL url);
  
@@ -319,7 +338,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
          BookmarkItem getBookmarkById(long nativeBookmarkBridge, long id, int type);
  
          void getTopLevelFolderIds(
-@@ -1136,6 +1175,8 @@ class BookmarkBridge {
+@@ -1120,6 +1159,8 @@ class BookmarkBridge {
  
          BookmarkId getRootFolderId(long nativeBookmarkBridge);
  
@@ -440,7 +459,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
-@@ -4541,6 +4541,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4482,6 +4482,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>
@@ -453,7 +472,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
-@@ -104,6 +104,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
+@@ -105,6 +105,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
    if (is_reorder) {
      base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target);
      switch (target_parent()->GetType()) {
@@ -716,7 +735,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
-@@ -908,7 +908,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
+@@ -909,7 +909,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
           (account_bookmark_bar_node_ &&
            !account_bookmark_bar_node_->children().empty()) ||
           (account_other_node_ && !account_other_node_->children().empty()) ||
@@ -725,7 +744,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
  }
  
  bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1240,6 +1240,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1241,6 +1241,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();
@@ -884,27 +903,6 @@ diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks
                       &sync_metadata_str)) {
        details->set_local_or_syncable_sync_metadata_str(
            std::move(sync_metadata_str));
-diff --git a/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc b/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
---- a/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
-+++ b/components/sync_bookmarks/bookmark_model_merger_comparison_metrics.cc
-@@ -38,6 +38,7 @@ const char kOtherBookmarksTag[] = "other_bookmarks";
- constexpr char16_t kBookmarkBarFolderName[] = u"__Bookmarks bar__";
- constexpr char16_t kOtherBookmarksFolderName[] = u"__Other bookmarks__";
- constexpr char16_t kMobileBookmarksFolderName[] = u"__Mobile bookmarks__";
-+constexpr char16_t kTabsCollectionBookmarksFolderName[] = u"__Tabs collection__";
- 
- using RemoteForest = BookmarkModelMerger::RemoteForest;
- using RemoteTreeNode = BookmarkModelMerger::RemoteTreeNode;
-@@ -129,6 +130,9 @@ std::u16string_view GetBookmarkNodeTitle(const bookmarks::BookmarkNode* node) {
-       return kOtherBookmarksFolderName;
-     case bookmarks::BookmarkNode::MOBILE:
-       return kMobileBookmarksFolderName;
-+    case bookmarks::BookmarkNode::TABS_COLLECTION:
-+      return kTabsCollectionBookmarksFolderName;
-+
-   }
-   NOTREACHED();
- }
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
 --- a/components/sync_bookmarks/bookmark_specifics_conversions.cc
 +++ b/components/sync_bookmarks/bookmark_specifics_conversions.cc

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

@@ -4,46 +4,30 @@ Subject: Add menu item to view source
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../android/java/res/menu/custom_tabs_menu.xml  |  3 +++
+ chrome/android/java/res/values/ids.xml        |  1 +
- chrome/android/java/res/menu/main_menu.xml      |  3 +++
+ .../chrome/browser/ChromeTabbedActivity.java  |  2 ++
- .../chrome/browser/ChromeTabbedActivity.java    |  2 ++
+ .../chrome/browser/app/ChromeActivity.java    |  5 ++++
- .../chrome/browser/app/ChromeActivity.java      |  5 +++++
+ .../AppMenuPropertiesDelegateImpl.java        | 24 +++++++++++++++++++
- .../appmenu/AppMenuPropertiesDelegateImpl.java  | 17 +++++++++++++++++
+ .../CustomTabAppMenuPropertiesDelegate.java   |  3 +++
- .../CustomTabAppMenuPropertiesDelegate.java     |  2 +-
+ .../TabbedAppMenuPropertiesDelegate.java      |  3 +++
- .../TabbedAppMenuPropertiesDelegate.java        |  6 +++---
+ .../strings/android_chrome_strings.grd        |  4 ++++
- .../android/strings/android_chrome_strings.grd  |  4 ++++
+ 7 files changed, 42 insertions(+)
- 8 files changed, 38 insertions(+), 4 deletions(-)
 
-diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
+diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
---- a/chrome/android/java/res/menu/custom_tabs_menu.xml
+--- a/chrome/android/java/res/values/ids.xml
-+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
++++ b/chrome/android/java/res/values/ids.xml
-@@ -73,6 +73,9 @@ found in the LICENSE file.
+@@ -129,6 +129,7 @@ found in the LICENSE file.
-         <item android:id="@+id/universal_install"
+     <item type="id" name="update_menu_id" />
-             android:title="@string/menu_add_to_homescreen"
+     <item type="id" name="new_tab_menu_id" />
-             android:orderInCategory="2" />
+     <item type="id" name="new_incognito_tab_menu_id" />
-+        <item android:id="@+id/view_source_id"
++    <item type="id" name="view_source_id" />
-+            android:title="@string/view_source"
+     <item type="id" name="add_to_group_menu_id" />
-+            android:orderInCategory="2" />
+     <item type="id" name="pin_tab_menu_id" />
-         <item android:id="@+id/open_webapk_id"
+     <item type="id" name="unpin_tab_menu_id" />
-             android:title="@string/menu_open_webapk"
-             android:orderInCategory="2" />
-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
-@@ -131,6 +131,9 @@ found in the LICENSE file.
-         <item android:id="@+id/universal_install"
-             android:title="@string/menu_add_to_homescreen"
-             android:icon="@drawable/ic_add_to_home_screen" />
-+        <item android:id="@+id/view_source_id"
-+            android:title="@string/view_source"
-+            android:icon="@drawable/ic_drive_document_24dp" />
-         <item android:id="@+id/open_webapk_id"
-             android:title="@string/menu_open_webapk"
-             android:icon="@drawable/ic_open_webapk" />
 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
-@@ -3434,6 +3434,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -3764,6 +3764,8 @@ public class ChromeTabbedActivity extends ChromeActivity {
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -55,7 +39,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2576,6 +2576,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2602,6 +2602,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              return doOpenWebApk(currentTab);
          }
  
@@ -70,8 +54,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -864,6 +864,23 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -957,6 +957,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
-         }
+         return false;
      }
  
 +    /**
@@ -80,62 +64,53 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 +     * @param menu {@link Menu} for view source.
 +     * @param currentTab      Current tab being displayed.
 +     */
-+    protected void updateViewSourceMenuItem(
++    protected void buildAddViewSourceItem(
-+            Menu menu, Tab currentTab) {
++            MVCListAdapter.ModelList modelList,
-+        MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
++            @Nullable Tab currentTab) {
 +        boolean visible = false;
 +        if (currentTab != null) {
-+                String url = currentTab.getUrl().getSpec();
++            String url = currentTab.getUrl().getSpec();
-+                visible = !url.isEmpty() && !url.startsWith("view-source:");
++            visible = !url.isEmpty() && !url.startsWith("view-source:");
++        }
++        if (visible) {
++            modelList.add(new MVCListAdapter.ListItem(
++                AppMenuHandler.AppMenuItemType.STANDARD,
++                 buildModelForStandardMenuItem(
++                    R.id.view_source_id,
++                    R.string.view_source,
++                    shouldShowIconBeforeItem() ? R.drawable.ic_drive_document_24dp : 0)));
 +        }
-+        viewSourceMenuItem.setVisible(visible);
 +    }
 +
      /**
-      * Updates the request desktop site item's state.
+      * Updates the bookmark item's visibility.
       *
 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
-@@ -331,7 +331,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -370,6 +370,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-             // --- Request Desktop Site ---
+             modelList.add(buildAddToHomescreenListItem(currentTab, false));
-             updateRequestDesktopSiteMenuItem(
+         }
-                     menu, currentTab, requestDesktopSiteVisible, isNativePage);
--
-+            updateViewSourceMenuItem(menu, currentTab);
-             // --- Translate ---
-             prepareTranslateMenuItem(menu, currentTab);
  
++        // Add view source item
++        buildAddViewSourceItem(modelList, currentTab);
++
+         // --- Request Desktop Site ---
+         if (requestDesktopSiteVisible) {
+             MVCListAdapter.ListItem rdsListItem =
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -173,7 +173,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -334,6 +334,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-         if (menuGroup == MenuGroup.PAGE_MENU) {
+             modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
-             preparePageMenu(menu, currentTab, handler, isIncognito);
          }
--        prepareCommonMenuItems(menu, menuGroup, isIncognito);
-+        prepareCommonMenuItems(menu, menuGroup, isIncognito, currentTab);
-     }
  
-     private void setMenuGroupVisibility(@MenuGroup int menuGroup, Menu menu) {
++        // Add view source item
-@@ -338,7 +338,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
++        buildAddViewSourceItem(modelList, currentTab);
-                         isNativePage, isFileScheme, isContentScheme, isIncognito, url));
++
- 
+         // RDS
-         updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
+         MVCListAdapter.ListItem rdsListItem =
--
+                 maybeBuildRequestDesktopSiteListItem(
-+        updateViewSourceMenuItem(menu, currentTab);
-         updateAutoDarkMenuItem(menu, currentTab, isNativePage);
- 
-         // Only display reader mode settings menu option if the current page is in reader mode.
-@@ -371,7 +371,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-                 && UrlUtilities.isNtpUrl(currentTab.getUrl());
-     }
- 
--    private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
-+    private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito, Tab currentTab) {
-         boolean always_incognito = AlwaysIncognitoLinkInterceptor.isAlwaysIncognito();
-         if (always_incognito) {
-             final MenuItem newTabOption = menu.findItem(R.id.new_tab_menu_id);
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

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

@@ -15,12 +15,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -457,7 +457,12 @@ class TabGridViewBinder {
+@@ -480,7 +480,12 @@ class TabGridViewBinder {
                      if (result != null) {
                          TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                      } else {
 -                        thumbnail.setImageDrawable(null);
-+                        TabListFaviconProvider.TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
++                        TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
 +                        if (tabFavicon != null) {
 +                            thumbnail.setScaleType(ImageView.ScaleType.CENTER);
 +                            thumbnail.setImageDrawable(
@@ -29,10 +29,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -498,6 +503,7 @@ class TabGridViewBinder {
+@@ -518,6 +523,7 @@ class TabGridViewBinder {
       */
      private static void setFavicon(
-             ImageView faviconView, PropertyModel model, TabListFaviconProvider.TabFavicon favicon) {
+             ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
 +        model.set(TabProperties.FAVICON, favicon);
          if (favicon == null) {
              faviconView.setImageDrawable(null);
@@ -40,7 +40,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
-@@ -85,6 +85,9 @@ public class TabProperties {
+@@ -127,6 +127,9 @@ public class TabProperties {
      public static final WritableBooleanPropertyKey FAVICON_FETCHED =
              new WritableBooleanPropertyKey();
  
@@ -50,15 +50,15 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
      /** Property for lazily fetching favicons when required by an item in a UI. */
      public static final WritableObjectPropertyKey<TabListFaviconProvider.TabFaviconFetcher>
              FAVICON_FETCHER = new WritableObjectPropertyKey<>();
-@@ -174,6 +177,7 @@ public class TabProperties {
+@@ -220,6 +223,7 @@ public class TabProperties {
                  CARD_TYPE,
                  CONTENT_DESCRIPTION_TEXT_RESOLVER,
                  ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
 +                FAVICON,
                  QUICK_DELETE_ANIMATION_STATUS,
                  TAB_GROUP_COLOR_VIEW_PROVIDER,
-                 VISIBILITY,
+                 TAB_GROUP_CARD_COLOR,
-@@ -210,6 +214,7 @@ public class TabProperties {
+@@ -259,6 +263,7 @@ public class TabProperties {
                  TAB_ACTION_BUTTON_DATA,
                  FAVICON_FETCHED,
                  FAVICON_FETCHER,
@@ -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
-@@ -145,6 +145,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -147,6 +147,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
  import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,11 +92,11 @@ 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;
-@@ -637,7 +638,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -641,7 +642,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                      new TabContentManager(
                              this,
                              mBrowserControlsManagerSupplier.get(),
--                            !TabUiFeatureUtilities.shouldUseListMode(),
+-                            /* snapshotsEnabled= */ true,
 +                            !TabUiFeatureUtilities.shouldUseListMode()
 +                                && !ContextUtils.getAppSharedPreferences().getBoolean(PrivacySettings.PREF_TABGRID_USE_ICONS, false),
                              tabModelSelector != null ? tabModelSelector::getTabById : null,
@@ -141,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";
-@@ -206,6 +221,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -215,6 +230,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -163,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(
-@@ -432,6 +462,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -441,6 +471,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";
@@ -171,7 +171,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -478,6 +509,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -487,6 +518,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
              sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
              sharedPreferencesEditor.apply();
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
          }
          return true;
      }
-@@ -528,6 +566,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -537,6 +575,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              : R.string.text_off);
          }
  
@@ -199,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
-@@ -6198,6 +6198,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6194,6 +6194,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

@@ -43,7 +43,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
 --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
 +++ b/chrome/android/java/res/layout/custom_tabs_control_container.xml
-@@ -32,7 +32,7 @@ found in the LICENSE file.
+@@ -31,7 +31,7 @@ found in the LICENSE file.
              android:id="@+id/find_toolbar_stub"
              android:inflatedId="@+id/find_toolbar"
              android:visibility="gone"
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -117,9 +117,13 @@ found in the LICENSE file.
+@@ -119,9 +119,13 @@ found in the LICENSE file.
      <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
  
      <!-- Should match toolbar_height_no_shadow -->
@@ -99,15 +99,15 @@ 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
-@@ -58,6 +58,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
- import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
- import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl;
- import org.chromium.chrome.browser.night_mode.NightModeUtils;
-+import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
++import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
-@@ -133,6 +134,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
+@@ -145,6 +146,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
      protected void attachBaseContext(Context newBase) {
          super.attachBaseContext(newBase);
  
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-@@ -66,6 +66,7 @@ import org.chromium.content_public.browser.WebContents;
+@@ -69,6 +69,7 @@ import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.browser.WebContentsObserver;
  import org.chromium.net.NetId;
  import org.chromium.ui.LayoutInflaterUtils;
@@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.display.DisplayUtil;
  import org.chromium.url.GURL;
-@@ -481,7 +482,9 @@ public class WarmupManager {
+@@ -491,7 +492,9 @@ public class WarmupManager {
              ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
  
              if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -787,7 +787,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -791,7 +791,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
              // Inflate the correct toolbar layout for the device.
              int toolbarLayoutId = getToolbarLayoutId();
              if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -120,6 +120,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -127,6 +127,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
  import org.chromium.components.tab_group_sync.TriggerSource;
  import org.chromium.components.tab_groups.TabGroupColorId;
  import org.chromium.ui.accessibility.AccessibilityState;
@@ -192,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.util.ColorUtils;
-@@ -4472,8 +4473,13 @@ public class StripLayoutHelper
+@@ -4955,8 +4956,13 @@ public class StripLayoutHelper
          mCloseButtonMenu.setAnchorView(tabView);
          // 3. Set the vertical offset to align the close button menu with bottom of the tab strip
          int tabHeight = mManagerHost.getHeight();
@@ -211,7 +211,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
-@@ -98,6 +98,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
+@@ -105,6 +105,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;
@@ -219,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.PageTransition;
  import org.chromium.ui.base.WindowAndroid;
-@@ -467,7 +468,10 @@ public class StripLayoutHelperManager
+@@ -495,7 +496,10 @@ public class StripLayoutHelperManager
          mIsLayoutOptimizationsEnabled =
                  ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(
                          /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
@@ -248,11 +248,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
 +
          // This will hide the tab strips if necessary.
          TabStripSceneLayerJni.get()
-                 .beginBuildingFrame(mNativePtr, TabStripSceneLayer.this, visible);
+                 .beginBuildingFrame(mNativePtr, visible, resourceManager, layerTitleCache);
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
-@@ -17,6 +17,7 @@ import org.chromium.base.library_loader.LibraryProcessType;
+@@ -16,6 +16,7 @@ import org.chromium.base.library_loader.LibraryProcessType;
  import org.chromium.base.task.ChainedTasks;
  import org.chromium.base.task.TaskTraits;
  import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -260,7 +260,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow
  import org.chromium.chrome.browser.profiles.ProfileManager;
  import org.chromium.chrome.browser.signin.SigninCheckerProvider;
  import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
-@@ -107,6 +108,7 @@ public class ChromeBrowserInitializer {
+@@ -106,6 +107,7 @@ public class ChromeBrowserInitializer {
      public void handlePreNativeStartupAndLoadLibraries(final BrowserParts parts) {
          ThreadUtils.checkUiThread();
          if (parts.isActivityFinishingOrDestroyed()) return;
@@ -271,7 +271,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrow
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -725,7 +725,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -747,7 +747,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
      @Override
      public int getControlContainerHeightResource() {
@@ -285,7 +285,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -104,6 +104,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -108,6 +108,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.pdf.PdfPage;
@@ -294,7 +294,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
-@@ -1645,7 +1647,9 @@ public class RootUiCoordinator
+@@ -1715,7 +1717,9 @@ public class RootUiCoordinator
          if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
  
          int stubId = R.id.find_toolbar_stub;
@@ -319,7 +319,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -313,6 +313,7 @@ public final class ChromePreferenceKeys {
+@@ -317,6 +317,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";
@@ -370,15 +370,15 @@ 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
-@@ -39,6 +39,7 @@ import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
+@@ -42,6 +42,7 @@ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateMa
- import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
- import org.chromium.ui.CaptionBarInsetsRectProvider;
+ import org.chromium.ui.display.DisplayUtil;
+ import org.chromium.ui.insets.CaptionBarInsetsRectProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.InsetObserver;
+ import org.chromium.ui.insets.InsetObserver;
- import org.chromium.ui.InsetObserver.WindowInsetsConsumer;
+ import org.chromium.ui.insets.InsetObserver.WindowInsetsConsumer;
- import org.chromium.ui.InsetsRectProvider;
+ import org.chromium.ui.insets.InsetsRectProvider;
-@@ -267,6 +268,7 @@ public class AppHeaderCoordinator
+@@ -280,6 +281,7 @@ public class AppHeaderCoordinator
              InsetsRectProvider insetsRectProvider,
              @DesktopWindowHeuristicResult int currentResult,
              boolean isOnExternalDisplay) {
@@ -389,7 +389,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
-@@ -857,7 +857,7 @@ public class LocationBarCoordinator
+@@ -833,7 +833,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1654,6 +1654,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1531,6 +1531,13 @@ Your Google account may have other forms of browsing history like searches and a
          Privacy guide explanation closed
        </message>
  
@@ -427,7 +427,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
  
      <view
          class="org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer$ToolbarViewResourceFrameLayout"
-@@ -20,7 +20,7 @@ found in the LICENSE file.
+@@ -20,20 +20,20 @@ found in the LICENSE file.
          <ViewStub
              android:id="@+id/toolbar_stub"
              android:layout_width="match_parent"
@@ -435,17 +435,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
 +            android:layout_marginTop="@dimen/tab_strip_height_cromite"
              android:layout_height="@dimen/toolbar_height_no_shadow" />
  
-         <ImageView
+         <org.chromium.chrome.browser.toolbar.ToolbarHairlineView
-@@ -28,7 +28,7 @@ found in the LICENSE file.
+             android:id="@+id/toolbar_hairline"
-             android:src="@drawable/toolbar_hairline"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
--            android:layout_marginTop="@dimen/control_container_height"
+-            android:layout_marginTop="@dimen/control_container_height" />
-+            android:layout_marginTop="@dimen/control_container_height_cromite"
++            android:layout_marginTop="@dimen/control_container_height_cromite" />
-             android:scaleType="fitXY"
-             android:importantForAccessibility="no" />
  
-@@ -36,7 +36,7 @@ found in the LICENSE file.
+         <ViewStub
              android:id="@+id/find_toolbar_stub"
              android:inflatedId="@+id/find_toolbar"
              android:visibility="gone"
@@ -518,7 +515,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import android.graphics.Canvas;
  import android.graphics.Color;
  import android.graphics.PorterDuff;
-@@ -157,8 +158,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+@@ -163,8 +164,25 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
  
      @Override
      @Initializer
@@ -548,7 +545,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -68,6 +68,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -66,6 +66,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
  import org.chromium.components.feature_engagement.Tracker;
  import org.chromium.ui.base.ViewUtils;
  import org.chromium.ui.util.MotionEventUtils;
@@ -556,7 +553,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import org.chromium.ui.util.TokenHolder;
  import org.chromium.url.GURL;
  
-@@ -586,7 +587,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -594,7 +595,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -570,7 +567,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java
-@@ -29,6 +29,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
+@@ -30,6 +30,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
  import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripHeightObserver;
  import org.chromium.chrome.browser.toolbar.top.tab_strip.TabStripTransitionCoordinator.TabStripTransitionDelegate;
  import org.chromium.ui.base.ViewUtils;
@@ -578,7 +575,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;
  
-@@ -559,6 +560,7 @@ class HeightTransitionHandler {
+@@ -562,6 +563,7 @@ class HeightTransitionHandler {
          if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
              return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
          }
@@ -683,9 +680,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 --- a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
 +++ b/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java
-@@ -83,6 +83,14 @@ public class DeviceFormFactor {
+@@ -70,6 +70,14 @@ public class DeviceFormFactor {
-         return BuildConfig.IS_DESKTOP_ANDROID;
+     /** See {@link #setIsTabletForTesting(boolean)}. */
-     }
+     private static @Nullable Boolean sIsTabletForTesting;
  
 +    private static boolean mForceTabletUI = false;
 +    public static void setForceTabletUI(boolean forceTabletUI) {
@@ -698,7 +695,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
      /**
       * Each activity could be on a different display, and this will just tell you whether the
       * display associated with the application context is "tablet sized". Use {@link
-@@ -91,6 +99,7 @@ public class DeviceFormFactor {
+@@ -78,6 +86,7 @@ public class DeviceFormFactor {
      @CalledByNative
      @Deprecated
      public static boolean isTablet() {
@@ -706,7 +703,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          if (sIsTabletForTesting != null) {
              return sIsTabletForTesting;
          }
-@@ -121,6 +130,7 @@ public class DeviceFormFactor {
+@@ -108,6 +117,7 @@ public class DeviceFormFactor {
       *     E.g. http://developer.samsung.com/samsung-dex/testing
       */
      public static boolean isNonMultiDisplayContextOnTablet(Context context) {
@@ -714,7 +711,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return detectScreenWidthBucket(context) >= SCREEN_BUCKET_TABLET;
      }
  
-@@ -156,6 +166,7 @@ public class DeviceFormFactor {
+@@ -142,6 +152,7 @@ public class DeviceFormFactor {
       * @return The screen width bucket the device is in (see constants at the top of this class).
       */
      private static int detectScreenWidthBucket(Context context) {
@@ -722,7 +719,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return context.getResources().getInteger(R.integer.min_screen_width_bucket);
      }
  
-@@ -163,6 +174,7 @@ public class DeviceFormFactor {
+@@ -149,6 +160,7 @@ public class DeviceFormFactor {
          ThreadUtils.assertOnUiThread();
          Context context = windowAndroid.getContext().get();
          if (context == null) return 0;
@@ -730,7 +727,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return context.getResources().getInteger(R.integer.min_screen_width_bucket);
      }
  
-@@ -172,6 +184,7 @@ public class DeviceFormFactor {
+@@ -158,6 +170,7 @@ public class DeviceFormFactor {
       */
      @UiThread
      public static int getNonMultiDisplayMinimumTabletWidthPx(Context context) {
@@ -738,7 +735,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/DeviceFormFactor.java b/ui
          return getMinimumTabletWidthPx(DisplayAndroid.getNonMultiDisplay(context));
      }
  
-@@ -180,6 +193,7 @@ public class DeviceFormFactor {
+@@ -166,6 +179,7 @@ public class DeviceFormFactor {
       *         layout.
       */
      public static int getMinimumTabletWidthPx(DisplayAndroid display) {

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

@@ -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
-@@ -47,6 +47,7 @@ import org.chromium.base.Callback;
+@@ -46,6 +46,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;
-@@ -1849,8 +1850,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2086,8 +2087,10 @@ public class ChromeTabbedActivity extends ChromeActivity {
              boolean hadCipherData =
                      CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
  
@@ -57,9 +57,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import android.content.Intent;
 +import android.content.SharedPreferences;
  import android.graphics.drawable.Drawable;
- import android.os.Build;
  import android.os.Bundle;
-@@ -21,7 +22,9 @@ import android.view.View;
+ import android.text.SpannableString;
+@@ -20,7 +21,9 @@ import android.view.View;
  import androidx.annotation.VisibleForTesting;
  import androidx.preference.Preference;
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.base.IntentUtils;
  import org.chromium.base.metrics.RecordHistogram;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -113,6 +116,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -112,6 +115,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final SharedPreferencesManager mSharedPreferencesManager =
              ChromeSharedPreferences.getInstance();
  
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
      private ManagedPreferenceDelegate mManagedPreferenceDelegate;
      @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
      @VisibleForTesting static final String PREF_TRACKING_PROTECTION = "tracking_protection";
-@@ -373,7 +378,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -381,7 +386,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          String key = preference.getKey();
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
              UserPrefs.get(getProfile())
                      .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
          } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
-@@ -433,6 +442,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -441,6 +450,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                              getContext(), getProfile()));
          }
  
@@ -106,9 +106,9 @@ 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
-@@ -5714,6 +5714,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -2901,6 +2901,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.">
+       <message name="IDS_ACCESSIBILITY_TAB_SWITCHER_TITLE" desc="Accessibility label of the current window when Grid Tab Switcher is shown.">
-         IMAGE
+         All tabs
        </message>
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_TITLE" desc="Text for 'Close tabs on exit' settings-privacy option.">
 +        Close all open tabs on exit
@@ -116,7 +116,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 +      <message name="IDS_CLOSE_TABS_ON_EXIT_SUMMARY" desc="Summary text for 'Close tabs on exit' settings-privacy option.">
 +        Don't persist tabs between browsing sessions. Caution: parameters in urls allow linking between different sessions.
 +      </message>
-       <message name="IDS_CONTEXTMENU_LINK_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 link.">
+       <message name="IDS_TAB_LOADING_DEFAULT_TITLE" desc="The title of a tab when we are still waiting for either the URL or the real title. This generally shows when the page is first loading.">
-         LINK
+         Loading…
        </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
-@@ -114,6 +114,9 @@ import java.util.Objects;
+@@ -120,6 +120,9 @@ import java.util.Objects;
  import java.util.Optional;
  import java.util.Set;
  
@@ -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.
-@@ -1028,9 +1031,15 @@ public class TabGridDialogMediator
+@@ -1035,9 +1038,15 @@ public class TabGridDialogMediator
                  return;
              }
  
@@ -45,7 +45,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 +                url = gurl != null ? gurl.getSpec() : url;
 +            }
              TabGroupUtils.openUrlInGroup(
-                     mCurrentTabGroupModelFilterSupplier.get(),
+                     assumeNonNull(mCurrentTabGroupModelFilterSupplier.get()),
 -                    UrlConstants.NTP_URL,
 +                    url,
                      currentTab.getId(),
@@ -54,7 +54,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/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
-@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
+@@ -36,6 +36,7 @@ import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesConfig;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
@@ -62,7 +62,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -415,10 +416,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -420,10 +421,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                      assert relatedTabs.size() > 0;
  
                      Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -97,7 +97,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
-@@ -71,6 +71,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
+@@ -75,6 +75,9 @@ import org.chromium.ui.text.EmptyTextWatcher;
  import org.chromium.ui.widget.AnchoredPopupWindow.HorizontalOrientation;
  import org.chromium.ui.widget.RectProvider;
  
@@ -107,10 +107,10 @@ 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.
-@@ -208,9 +211,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
+@@ -215,9 +218,15 @@ public class TabGroupContextMenuCoordinator extends TabGroupOverflowMenuCoordina
                          /* didCloseCallback= */ null);
                  RecordUserAction.record("MobileToolbarTabGroupMenu.DeleteGroup");
-             } else if (menuId == org.chromium.chrome.R.id.open_new_tab_in_group) {
+             } else if (menuId == R.id.open_new_tab_in_group) {
 +                String url = UrlConstants.NTP_URL;
 +                if (UrlConstants.NTP_URL.equals(url)
 +                        && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
@@ -127,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -231,6 +231,22 @@ public class HomepageManager
+@@ -258,6 +258,22 @@ public class HomepageManager
          notifyHomepageUpdated();
      }
  
@@ -153,15 +153,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -25,6 +25,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -26,6 +26,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
  import org.chromium.components.embedder_support.util.UrlUtilities;
  import org.chromium.components.url_formatter.UrlFormatter;
  import org.chromium.url.GURL;
 +import org.chromium.components.embedder_support.util.UrlConstants;
  
  /** Fragment that allows the user to configure homepage related preferences. */
- public class HomepageSettings extends ChromeBaseSettingsFragment {
+ @NullMarked
-@@ -33,6 +34,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -35,6 +36,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
      @VisibleForTesting
      public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
  
@@ -170,7 +170,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
      private HomepageManager mHomepageManager;
      private RadioButtonGroupHomepagePreference mRadioButtons;
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-@@ -69,6 +72,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -78,6 +81,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
                  });
          mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
  
@@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java
-@@ -113,7 +113,6 @@ public class LaunchMetrics {
+@@ -117,7 +117,6 @@ public class LaunchMetrics {
      public static void recordHomePageLaunchMetrics(
              boolean showHomeButton, boolean homepageIsNtp, GURL homepageGurl) {
          if (homepageGurl.isEmpty()) {
@@ -200,18 +200,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
+@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
- import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
+ import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
 +import org.chromium.chrome.browser.homepage.HomepageManager;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
  import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
  import org.chromium.chrome.browser.profiles.Profile;
-@@ -530,6 +531,13 @@ public class ChromeTabCreator extends TabCreator
+@@ -565,6 +566,13 @@ public class ChromeTabCreator extends TabCreator
-      * @return the created tab.
       */
-     public Tab launchUrl(String url, @TabLaunchType int type, Intent intent, long intentTimestamp) {
+     public @Nullable Tab launchUrl(
+             String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
 +        if (!mIncognito && url.equals(UrlConstants.NTP_URL)) {
 +            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {
 +                GURL gurl = HomepageManager.getInstance().getHomepageGurl();
@@ -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
-@@ -326,6 +326,7 @@ public final class ChromePreferenceKeys {
+@@ -330,6 +330,7 @@ public final class ChromePreferenceKeys {
      public static final String HOMEPAGE_USE_CHROME_NTP = "Chrome.Homepage.UseNTP";
      public static final String HOMEPAGE_USE_DEFAULT_URI = "homepage_partner_enabled";
  
@@ -247,7 +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
-@@ -1480,6 +1480,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1357,6 +1357,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
-@@ -107,6 +107,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -111,6 +111,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
                                  pref_registration_flags);
@@ -272,7 +272,7 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -1328,6 +1328,10 @@ inline constexpr char kPinSplitTabButton[] = "browser.pin_split_tab_button";
+@@ -1327,6 +1327,10 @@ inline constexpr char kPinSplitTabButton[] = "browser.pin_split_tab_button";
  // by enterprise policy.
  inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
  

build/patches/Add-search-engine.patch

@@ -63,7 +63,7 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
    ]
  
    deps = [
-@@ -163,6 +164,7 @@ source_set("search_engine_utils") {
+@@ -162,6 +163,7 @@ source_set("search_engine_utils") {
      ":search_engine_type",
      "//components/google/core/common",
      "//third_party/search_engines_data:prepopulated_engines",
@@ -141,7 +141,7 @@ new file mode 100644
 diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
-@@ -182,10 +182,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+@@ -155,10 +155,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
  }
  
  void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -156,12 +156,12 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
 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
-@@ -97,11 +97,16 @@ enum SearchEngineType {
+@@ -98,11 +98,16 @@ enum SearchEngineType {
-   SEARCH_ENGINE_MCAFEE = 77,
    SEARCH_ENGINE_FREESPOKE = 78,
    SEARCH_ENGINE_KAGI = 79,
-+  SEARCH_ENGINE_GOOGLE_EN = 80,
+   SEARCH_ENGINE_STARTER_PACK_AI_MODE = 80,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 81,
++  SEARCH_ENGINE_GOOGLE_EN = 81,
++  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 82,
  
    SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
  };
@@ -185,7 +185,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  namespace TemplateURLPrepopulateData {
  
  // Helpers --------------------------------------------------------------------
-@@ -123,7 +125,7 @@ int GetDataVersion(PrefService* prefs) {
+@@ -122,7 +124,7 @@ int GetDataVersion(PrefService* prefs) {
        kCurrentDataVersion;
  }
  
@@ -194,7 +194,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
      PrefService& prefs,
      std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
          regional_prepopulated_engines) {
-@@ -139,6 +141,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+@@ -138,6 +140,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
                          &PrepopulatedEngineToTemplateURLData);
  }
  
@@ -212,14 +212,16 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
  std::unique_ptr<TemplateURLData> GetPrepopulatedEngine(
      PrefService& prefs,
      std::vector<const TemplateURLPrepopulateData::PrepopulatedEngine*>
-@@ -160,9 +173,13 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+@@ -159,11 +172,15 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
      return std::vector<std::unique_ptr<TemplateURLData>>();
    }
  
 -  return base::ToVector(
 +  std::vector<std::unique_ptr<TemplateURLData>> t_urls =
 +    base::ToVector(
-       regional_capabilities::GetPrepopulatedEngines(country_id, prefs),
+       regional_capabilities::GetPrepopulatedEngines(
+           country_id, prefs,
+           regional_capabilities::SearchEngineListType::kTopFive),
        &PrepopulatedEngineToTemplateURLData);
 +  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(googleen));
 +  t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(duckduckgo_light));

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

@@ -48,7 +48,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -257,6 +257,7 @@ chrome_java_sources = [
+@@ -262,6 +262,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
@@ -74,7 +74,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
-@@ -198,6 +198,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -203,6 +203,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
  import org.chromium.chrome.browser.quick_delete.QuickDeleteMetricsDelegate;
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.read_later.ReadingListBackPressHandler;
  import org.chromium.chrome.browser.recent_tabs.CrossDevicePaneFactory;
  import org.chromium.chrome.browser.reengagement.ReengagementNotificationController;
-@@ -1854,7 +1855,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -2091,7 +2092,11 @@ public class ChromeTabbedActivity extends ChromeActivity {
              Intent intent = getIntent();
  
              boolean hadCipherData =
@@ -98,7 +98,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
-@@ -218,8 +218,8 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -224,8 +224,8 @@ public final class BrowsingDataBridge implements Destroyable {
       *     BrowsingDataType}).
       * @return The state of the corresponding deletion preference.
       */
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
      }
  
      /**
-@@ -229,8 +229,8 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -235,8 +235,8 @@ public final class BrowsingDataBridge implements Destroyable {
       *     BrowsingDataType}).
       * @param value The state to be set.
       */
@@ -120,7 +120,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
      }
  
      /**
-@@ -338,10 +338,10 @@ public final class BrowsingDataBridge implements Destroyable {
+@@ -340,10 +340,10 @@ public final class BrowsingDataBridge implements Destroyable {
                  @JniType("Profile*") Profile profile, @JniType("std::string") String origin);
  
          boolean getBrowsingDataDeletionPreference(
@@ -136,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -161,6 +161,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -160,6 +160,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
              assert mCheckbox == preference;
  
              mParent.updateButtonState();
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              return true;
          }
  
-@@ -242,7 +248,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -241,7 +247,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      private @TimePeriod int mLastSelectedTimePeriod;
      private boolean mShouldShowPostDeleteFeedback;
  
@@ -158,7 +158,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
  
      /**
       * @return All available {@link DialogOption} entries.
-@@ -348,7 +354,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -347,7 +353,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      }
  
      /** Called when browsing data is about to be cleared. */
@@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          RecordUserAction.record("ClearBrowsingData_AdvancedTab");
  
          if (ChromeFeatureList.sClearBrowsingDataAndroidSurvey.isEnabled()) {
-@@ -438,6 +444,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -437,6 +443,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
              BrowsingDataBridge.getForProfile(getProfile())
                      .setBrowsingDataDeletionPreference(
                              ClearBrowsingDataFragment.getDataType(item.getOption()),
@@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
                              item.isSelected());
          }
  
-@@ -445,8 +452,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -444,8 +451,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
      }
  
@@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          String referrer =
                  fragmentArgs.getString(
                          ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
-@@ -472,6 +483,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -471,6 +482,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                  DialogOption.CLEAR_SITE_SETTINGS);
      }
  
@@ -200,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      /**
       * Decides whether a given dialog option should be selected when the dialog is initialized.
       *
-@@ -480,7 +495,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -479,7 +494,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       */
      private boolean isOptionSelectedByDefault(@DialogOption int option) {
          return BrowsingDataBridge.getForProfile(getProfile())
@@ -209,7 +209,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      }
  
      /**
-@@ -548,6 +563,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -547,6 +562,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
       * options.
       */
      private void onClearButtonClicked() {
@@ -217,7 +217,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -577,6 +593,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -576,6 +592,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
          Button clearButton = (Button) getView().findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
      }
  
      private int getSpinnerIndex(
-@@ -652,7 +669,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -651,7 +668,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                              .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
                  enabled = false;
                  browsingDataBridge.setBrowsingDataDeletionPreference(
@@ -234,7 +234,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              }
  
              // Disable tabs closure if the user is in multi-window mode.
-@@ -682,8 +699,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -681,8 +698,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
          mSigninManager.addSignInStateObserver(this);
  
          setHasOptionsMenu(true);
@@ -334,7 +334,7 @@ new file mode 100644
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -1973,6 +1973,16 @@
+@@ -2054,6 +2054,16 @@
    <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
      Delete browsing data
    </message>
@@ -354,7 +354,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -105,6 +105,7 @@
+@@ -107,6 +107,7 @@
  #include "components/enterprise/data_controls/core/browser/features.h"
  #include "components/enterprise/obfuscation/core/utils.h"
  #include "components/error_page/common/error_page_switches.h"
@@ -459,7 +459,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -359,6 +359,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -350,6 +350,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      uint64_t origin_type_mask,
      base::OnceCallback<void(uint64_t)> callback) {
    CHECK(((remove_mask &
@@ -467,7 +467,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
            ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
            ~constants::FILTERABLE_DATA_TYPES) == 0) ||
          filter_builder->MatchesAllOriginsAndDomains());
-@@ -466,6 +467,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -457,6 +458,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -477,7 +477,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -574,6 +578,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -565,6 +569,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      // and SSL host state are scoped to hosts and represent them as std::string.
      // Rename the method to indicate its more general usage.
      if (profile_->GetSSLHostStateDelegate()) {
@@ -489,7 +489,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
        profile_->GetSSLHostStateDelegate()->Clear(
            filter_builder->MatchesAllOriginsAndDomains()
                ? base::RepeatingCallback<bool(const std::string&)>()
-@@ -602,9 +611,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -593,9 +602,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -503,7 +503,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
-@@ -1324,6 +1337,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1320,6 +1333,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -515,7 +515,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -543,6 +543,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -550,6 +550,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -574,7 +574,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1446,6 +1446,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1441,6 +1441,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
    }
  }
  
@@ -594,7 +594,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  void ProfileManager::DoFinalInitForServices(Profile* profile,
                                              bool go_off_the_record) {
    if (!do_final_services_init_ ||
-@@ -2122,7 +2135,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2102,7 +2115,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
    Profile* original_profile = profile->GetOriginalProfile();
    // Do nothing if the closed window is not the last window of the same profile.
    for (Browser* browser_iter : *BrowserList::GetInstance()) {
@@ -691,7 +691,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1575,6 +1575,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1452,6 +1452,9 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_ANDROID_APP_HISTORY_OPEN_FULL_OTHER_FORMS" desc="The informational message at the top of the history page letting users know that app-specific history may be missing some entries, followed by the info on the other forms of browing history.">
          Some of your history might not show up here. To see all your Chrome history, open full Chrome history. Also, your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
        </message>
@@ -718,7 +718,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -1925,6 +1925,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -2021,6 +2021,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -729,7 +729,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc
 --- a/components/browsing_data/content/browsing_data_helper.cc
 +++ b/components/browsing_data/content/browsing_data_helper.cc
-@@ -39,8 +39,13 @@ bool WebsiteSettingsFilterAdapter(
+@@ -42,8 +42,13 @@ bool WebsiteSettingsFilterAdapter(
    // this filter is used for is DURABLE_STORAGE, which also only uses
    // origin-scoped patterns. Such patterns can be directly translated to a GURL.
    GURL url(primary_pattern.ToString());
@@ -826,7 +826,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -407,6 +407,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -413,6 +413,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -965,7 +965,7 @@ diff --git a/components/favicon/core/favicon_database.h b/components/favicon/cor
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -885,6 +885,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -925,6 +925,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
      if (turl->date_created() >= created_after &&
          (created_before.is_null() || turl->date_created() < created_before) &&
          turl->safe_for_autoreplace() && turl->prepopulate_id() == 0 &&
@@ -976,7 +976,7 @@ diff --git a/components/search_engines/template_url_service.cc b/components/sear
 diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
 --- a/content/browser/btm/btm_service_impl.cc
 +++ b/content/browser/btm/btm_service_impl.cc
-@@ -210,7 +210,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+@@ -212,7 +212,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
      remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
      remover->RemoveWithFilterAndReply(
          base::Time::Min(), base::Time::Max(),
@@ -988,7 +988,7 @@ diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_s
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1514,6 +1514,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1529,6 +1529,7 @@ void StoragePartitionImpl::Initialize(
                              .AppendASCII("Code Cache");
      }
      DCHECK_GE(settings.size_in_bytes(), 0);
@@ -999,17 +999,17 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h
 --- a/content/public/browser/browsing_data_remover.h
 +++ b/content/public/browser/browsing_data_remover.h
-@@ -162,11 +162,16 @@ class BrowsingDataRemover {
+@@ -157,11 +157,16 @@ class BrowsingDataRemover {
  
    // Clear-Site-Data Interaction with Prefetch and Prerender.
-   static constexpr DataType DATA_TYPE_PREFETCH_CACHE = 1 << 27;
+   static constexpr DataType DATA_TYPE_PREFETCH_CACHE = 1 << 24;
--  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 28;
+-  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 25;
-+  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 29;
++  static constexpr DataType DATA_TYPE_PRERENDER_CACHE = 1 << 26;
  
    // Embedders can add more datatypes beyond this point.
    static constexpr DataType DATA_TYPE_CONTENT_END = DATA_TYPE_PRERENDER_CACHE;
  
-+  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 28;
++  static constexpr DataType DATA_TYPE_SKIP_SSL_HOST_STATE = 1 << 25;
 +
 +  static_assert(DATA_TYPE_CONTENT_END == DATA_TYPE_PRERENDER_CACHE,
 +              "Please check.");

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

@@ -28,9 +28,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../renderer/core/html/html_anchor_element.h  |  7 +++-
  .../renderer/core/html/html_image_element.cc  | 17 +++++++++
  .../renderer/core/html/html_image_element.h   |  2 ++
- .../core/page/context_menu_controller.cc      | 33 ++++++++++++-----
+ .../core/page/context_menu_controller.cc      | 23 +++++++++---
  .../core/page/context_menu_controller.h       |  5 +--
- 22 files changed, 170 insertions(+), 20 deletions(-)
+ 22 files changed, 164 insertions(+), 16 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc
@@ -38,15 +38,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
 --- a/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
 +++ b/android_webview/java/src/org/chromium/android_webview/contextmenu/AwContextMenuItemDelegate.java
-@@ -12,6 +12,7 @@ import org.chromium.base.IntentUtils;
+@@ -11,6 +11,7 @@ import android.net.Uri;
+ import org.chromium.base.IntentUtils;
  import org.chromium.build.annotations.NullMarked;
  import org.chromium.components.embedder_support.contextmenu.ContextMenuItemDelegate;
- import org.chromium.components.embedder_support.contextmenu.ContextMenuParams;
 +import org.chromium.content_public.common.Referrer;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.ui.base.Clipboard;
  import org.chromium.url.GURL;
-@@ -54,6 +55,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -52,6 +53,9 @@ public class AwContextMenuItemDelegate implements ContextMenuItemDelegate {
          IntentUtils.safeStartActivity(mActivity, intent);
      }
  
@@ -59,7 +59,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/contextmenu/A
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -104,6 +104,7 @@ found in the LICENSE file.
+@@ -105,6 +105,7 @@ found in the LICENSE file.
  
      <!-- Menu item IDs for FullscreenActivities -->
      <item type="id" name="contextmenu_open_in_chrome" />
@@ -98,7 +98,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/contextmenu/ChromeContextMenuItem.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuItem.java
-@@ -123,8 +123,9 @@ class ChromeContextMenuItem {
+@@ -128,8 +128,9 @@ class ChromeContextMenuItem {
          int PRINT_PAGE = 38;
          // Developer Group
          int INSPECT_ELEMENT = 39;
@@ -109,7 +109,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
      }
  
      /** Mapping from {@link Item} to the ID found in the ids.xml. */
-@@ -169,6 +170,7 @@ class ChromeContextMenuItem {
+@@ -174,6 +175,7 @@ class ChromeContextMenuItem {
          R.id.contextmenu_share_page, // Item.SHARE_PAGE
          R.id.contextmenu_print_page, // Item.PRINT_PAGE
          R.id.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
      };
  
      /** Mapping from {@link Item} to the ID of the string that describes the action of the item. */
-@@ -213,6 +215,7 @@ class ChromeContextMenuItem {
+@@ -218,6 +220,7 @@ class ChromeContextMenuItem {
          R.string.contextmenu_share_page, // Item.SHARE_PAGE
          R.string.contextmenu_print_page, // Item.PRINT_PAGE
          R.string.contextmenu_inspect_element, // Item.INSPECT_ELEMENT
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
-@@ -369,6 +369,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -442,6 +442,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())) {
-@@ -834,6 +837,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -1026,6 +1029,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -150,7 +150,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -356,6 +356,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -369,6 +369,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
          mTab.loadUrl(loadUrlParams);
      }
  
@@ -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
-@@ -382,6 +382,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -419,6 +419,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kTabGroupParityBottomSheetAndroid,
-     &kTabletTabStripAnimation,
+     &kTabModelInitFixes,
-     &kToolbarPhoneCleanup,
+     &kTabStorageSqlitePrototype,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
-     &kTabStateFlatBuffer,
+     &kTabStripAutoSelectOnCloseChange,
-     &kTabStripContextMenuAndroid,
      &kTabStripDensityChangeAndroid,
+     &kTabStripGroupDragDropAndroid,
 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
-@@ -455,6 +455,8 @@ public abstract class ChromeFeatureList {
+@@ -494,6 +494,8 @@ public abstract class ChromeFeatureList {
              "DisableToolbarSwipeUp";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -187,8 +187,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +            "ShowAlwaysContextMenuOnLinks";
      public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
              "NewTabPageCustomizationToolbarButton";
-     public static final String NOTIFICATION_ONE_TAP_UNSUBSCRIBE = "NotificationOneTapUnsubscribe";
+     public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2";
-@@ -868,6 +870,8 @@ public abstract class ChromeFeatureList {
+@@ -988,6 +990,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -197,18 +197,18 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
      public static final CachedFlag sPostGetMyMemoryStateToBackground =
              newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, true);
-@@ -1072,6 +1076,7 @@ public abstract class ChromeFeatureList {
+@@ -1228,6 +1232,7 @@ public abstract class ChromeFeatureList {
-                     sTabWindowManagerReportIndicesMismatch,
                      sTopControlsRefactor,
+                     sTouchToSearchCallout,
                      sTraceBinderIpc,
 +                    sShowAlwaysContextMenuOnLinks,
-                     sUseChimeAndroidSdk,
                      sUseActivityManagerForTabActivation,
-                     sUseLibunwindstackNativeUnwinderAndroid,
+                     sUseChimeAndroidSdk,
+                     sUseInitialNetworkStateAtStartup,
 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
-@@ -1719,6 +1719,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1596,6 +1596,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]">
-@@ -3330,6 +3336,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3237,6 +3243,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
          Open in new Chrome tab
        </message>
@@ -350,9 +350,9 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
  #include "third_party/blink/renderer/core/page/chrome_client.h"
 +#include "third_party/blink/renderer/core/page/context_menu_controller.h"
  #include "third_party/blink/renderer/core/page/page.h"
+ #include "third_party/blink/renderer/core/scroll/scroll_into_view_util.h"
  #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
- #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
+@@ -501,6 +502,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
-@@ -500,6 +501,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      bool is_trusted,
      base::TimeTicks platform_time_stamp,
      KURL completed_url) {
@@ -370,7 +370,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    LocalDOMWindow* window = GetDocument().domWindow();
    if (!window) {
      return;
-@@ -590,6 +602,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -591,6 +603,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
      frame_request.SetImpression(impression);
    }
  
@@ -386,8 +386,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
    Frame* target_frame =
        frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
  
-@@ -633,7 +654,7 @@ Element* HTMLAnchorElementBase::InterestTargetElement() const {
+@@ -634,7 +655,7 @@ Element* HTMLAnchorElementBase::InterestForElement() const {
-       html_names::kInteresttargetAttr);
+       html_names::kInterestforAttr);
  }
  
 -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();
-@@ -729,13 +750,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -730,13 +751,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(
-@@ -745,7 +765,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -746,7 +766,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
      frame->GetEventHandler().SetDelayedNavigationTaskHandle(
          std::move(task_handle));
    } else {
@@ -428,7 +428,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.h b/third_
 --- a/third_party/blink/renderer/core/html/html_anchor_element.h
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.h
 @@ -112,6 +112,7 @@ class CORE_EXPORT HTMLAnchorElementBase : public HTMLElement,
-   Element* InterestTargetElement() const override;
+   Element* InterestForElement() const override;
  
    void Trace(Visitor*) const override;
 +  void HandleClick(MouseEvent&, bool do_not_show_context_menu = false);
@@ -492,7 +492,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -217,6 +217,8 @@ class CORE_EXPORT HTMLImageElement
+@@ -215,6 +215,8 @@ class CORE_EXPORT HTMLImageElement
    void DidAddUserAgentShadowRoot(ShadowRoot&) override;
    void AdjustStyle(ComputedStyleBuilder&) override;
  
@@ -551,25 +551,15 @@ 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;
-@@ -830,11 +843,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -825,7 +838,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
  
    SetAutofillData(result.InnerNode(), data);
  
--  const bool from_touch = source_type == kMenuSourceTouch ||
--                          source_type == kMenuSourceLongPress ||
--                          source_type == kMenuSourceLongTap;
 -  if (from_touch && !ShouldShowContextMenuFromTouch(data))
--    return false;
++  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks) && from_touch && !ShouldShowContextMenuFromTouch(data))
-+  if (!base::FeatureList::IsEnabled(features::kShowAlwaysContextMenuOnLinks)) {
+     return false;
-+    const bool from_touch = source_type == kMenuSourceTouch ||
-+                            source_type == kMenuSourceLongPress ||
-+                            source_type == kMenuSourceLongTap;
-+    if (from_touch && !ShouldShowContextMenuFromTouch(data))
-+      return false;
-+  }
  
    WebLocalFrameImpl* selected_web_frame =
-       WebLocalFrameImpl::FromFrame(selected_frame);
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/third_party/blink/renderer/core/page/context_menu_controller.h
 --- a/third_party/blink/renderer/core/page/context_menu_controller.h
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.h

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 @@
+@@ -166,6 +166,7 @@
  #include "components/sensitive_content/features.h"
  #include "components/services/heap_profiling/public/cpp/switches.h"
  #include "components/services/storage/public/cpp/buckets/bucket_info.h"
@@ -76,15 +76,15 @@ 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"
-@@ -236,6 +237,8 @@ TrackerImpl::TrackerImpl(
+@@ -306,6 +307,8 @@ TrackerImpl::TrackerImpl(
  TrackerImpl::~TrackerImpl() = default;
  
  void TrackerImpl::NotifyEvent(const std::string& event) {
 +  if (!base::FeatureList::IsEnabled(site_engagement::features::kSiteEngagement))
 +    return;
-   event_model_->IncrementEvent(event, time_provider_->GetCurrentDay());
+   GetEventModelWriter()->IncrementEvent(event, time_provider_->GetCurrentDay());
    stats::RecordNotifyEvent(event, configuration_.get(),
-                            event_model_->IsReady());
+                            event_model_provider_->IsReady());
 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

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

@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -56,6 +56,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
+@@ -54,6 +54,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
  import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
@@ -20,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.settings.SettingsFragment;
-@@ -466,8 +467,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -469,8 +470,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
              finishCurrentSettings(mainFragment);
              return true;
          } else if (item.getItemId() == R.id.menu_id_general_help) {

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

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

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

@@ -166,7 +166,7 @@ new file mode 100644
 +           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
 +           WebsiteSettingsRegistry::ALL_PLATFORMS,
 +           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
++           PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 +
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::WEBGL)
@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -115,6 +115,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -114,6 +114,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
-@@ -339,6 +339,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -345,6 +345,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_);
-@@ -608,25 +615,6 @@ static String ExtractWebGLContextCreationError(
+@@ -615,25 +622,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('.');
-@@ -686,6 +674,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -693,6 +681,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
-@@ -1932,6 +1932,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
+@@ -1951,6 +1951,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                          DOMArrayBufferView* pixels,
                          int64_t offset);
  

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

@@ -12,9 +12,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bromite_content_settings/webrtc.inc       | 22 +++++
  .../bromite_content_settings/WEBRTC.inc       |  1 +
  .../peer_connection_dependency_factory.cc     |  6 ++
- .../peerconnection/rtc_rtp_receiver.cc        | 10 ++
+ .../peerconnection/rtc_rtp_receiver.cc        | 11 +++
- .../modules/peerconnection/rtc_rtp_sender.cc  | 10 ++
+ .../modules/peerconnection/rtc_rtp_sender.cc  | 11 +++
- 7 files changed, 170 insertions(+)
+ 7 files changed, 172 insertions(+)
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromiteWebRTCContentSetting.java
  create mode 100644 components/browser_ui/strings/bromite_content_settings/webrtc.grdp
  create mode 100644 components/content_settings/core/browser/bromite_content_settings/webrtc.inc
@@ -164,7 +164,7 @@ new file mode 100644
 +           WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE,
 +           WebsiteSettingsRegistry::ALL_PLATFORMS,
 +           ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-+           ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
++           PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
 +
 +  content_settings::WebsiteSettingsRegistry::GetInstance()
 +    ->GetMutable(ContentSettingsType::WEBRTC)
@@ -187,7 +187,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -41,6 +41,7 @@
+@@ -46,6 +46,7 @@
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
  #include "third_party/blink/public/platform/platform.h"
  #include "third_party/blink/public/platform/task_type.h"
@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
  #include "third_party/blink/public/platform/web_url.h"
  #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
  #include "third_party/blink/public/web/web_document.h"
-@@ -936,6 +937,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -1062,6 +1063,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // |request_multiple_routes|. Whether local IP addresses could be
        // collected depends on if mic/camera permission is granted for this
        // origin.
@@ -210,16 +210,17 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.cc
-@@ -16,6 +16,8 @@
+@@ -16,6 +16,9 @@
  #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
  #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
++#include "third_party/blink/renderer/core/frame/local_dom_window.h"
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_rtcp_parameters.h"
-@@ -288,6 +290,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
+@@ -288,6 +291,14 @@ RTCRtpCapabilities* RTCRtpReceiver::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  
@@ -237,16 +238,17 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_receiver.
 diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 --- a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
-@@ -21,6 +21,8 @@
+@@ -21,6 +21,9 @@
  #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
  #include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
  #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 +#include "third_party/blink/public/platform/web_content_settings_client.h"
 +#include "third_party/blink/public/web/web_local_frame.h"
++#include "third_party/blink/renderer/core/frame/local_dom_window.h"
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1035,6 +1037,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1035,6 +1038,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  

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

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/media/PictureInPicture.java
-@@ -27,6 +27,7 @@ public abstract class PictureInPicture {
+@@ -29,6 +29,7 @@ public abstract class PictureInPicture {
       * @return boolean true if Picture-In-Picture is enabled, otherwise false.
       */
      public static boolean isEnabled(Context context) {
@@ -26,15 +26,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/PictureIn
 diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 --- a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
 +++ b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_impl.cc
-@@ -27,6 +27,7 @@
+@@ -31,6 +31,7 @@
- #include "third_party/blink/renderer/core/html/media/html_media_element.h"
- #include "third_party/blink/renderer/core/html/media/html_video_element.h"
  #include "third_party/blink/renderer/core/layout/layout_video.h"
+ #include "third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture.h"
+ #include "third_party/blink/renderer/modules/document_picture_in_picture/document_picture_in_picture_event.h"
 +#include "third_party/blink/renderer/core/loader/document_loader.h"
  #include "third_party/blink/renderer/modules/picture_in_picture/picture_in_picture_event.h"
  #include "third_party/blink/renderer/platform/heap/garbage_collected.h"
  #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-@@ -392,6 +393,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
+@@ -386,6 +387,12 @@ void PictureInPictureControllerImpl::CreateDocumentPictureInPictureWindow(
      return;
    }
  

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

@@ -43,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1484,6 +1484,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1496,6 +1496,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
@@ -51,7 +51,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
  std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
    std::vector<GURL> urls;
    frame_host->ForEachRenderFrameHostImplWithAction(
-@@ -1497,6 +1498,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1509,6 +1510,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -126,7 +126,7 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -15928,12 +15928,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -16153,12 +16153,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
        }
      }
    }
@@ -281,7 +281,7 @@ new file mode 100644
 diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc
 --- a/net/reporting/reporting_header_parser.cc
 +++ b/net/reporting/reporting_header_parser.cc
-@@ -337,6 +337,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
+@@ -344,6 +344,7 @@ void ReportingHeaderParser::ProcessParsedReportingEndpointsHeader(
      const NetworkAnonymizationKey& network_anonymization_key,
      const url::Origin& origin,
      base::flat_map<std::string, std::string> header) {
@@ -308,7 +308,7 @@ diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_servic
 diff --git a/services/network/network_context.h b/services/network/network_context.h
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -486,14 +486,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -494,14 +494,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
        const GURL& url,
        const std::optional<base::UnguessableToken>& reporting_source,
        const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -340,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1791,7 +1791,6 @@ mojom("mojom") {
+@@ -1793,7 +1793,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -351,7 +351,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1234,6 +1234,7 @@ interface NetworkContext {
+@@ -1240,6 +1240,7 @@ interface NetworkContext {
    // provided `network_anonymization_key`.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1241,6 +1242,7 @@ interface NetworkContext {
+@@ -1247,6 +1248,7 @@ interface NetworkContext {
                NetworkAnonymizationKey network_anonymization_key,
                mojo_base.mojom.DictionaryValue body);
  
@@ -367,7 +367,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueEnterpriseReport(string type,
                          string group,
                          url.mojom.Url url,
-@@ -1251,6 +1253,7 @@ interface NetworkContext {
+@@ -1257,6 +1259,7 @@ interface NetworkContext {
    // Note that this queued report will never be delivered if no reporting
    // endpoint matching is registered for with the provided
    // `network_anonymization_key`.
@@ -386,15 +386,15 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/feature_list.h"
-@@ -1260,6 +1261,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1344,6 +1345,7 @@ void ContentSecurityPolicy::ReportViolation(
+       ShouldBypassContentSecurityPolicy(KURL(violation_data->sourceFile()))) {
      return;
    }
- 
 +#if BUILDFLAG(ENABLE_REPORTING)
    PostViolationReport(violation_data, context_frame, report_endpoints,
                        use_reporting_api);
  
-@@ -1267,6 +1269,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1351,6 +1353,7 @@ void ContentSecurityPolicy::ReportViolation(
    // `context_frame` (i.e. we're not processing 'frame-ancestors').
    if (delegate_ && !context_frame)
      delegate_->DispatchViolationEvent(*violation_data, element);
@@ -405,7 +405,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
  #include "build/build_config.h"
  #include "mojo/public/cpp/bindings/self_owned_receiver.h"
  #include "mojo/public/cpp/system/message_pipe.h"
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  #include "services/network/public/cpp/features.h"
  #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
  #include "services/network/public/mojom/source_location.mojom-blink.h"
-@@ -2740,9 +2741,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2836,9 +2837,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
    return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
  }
  
@@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "net/storage_access_api/status.h"
-@@ -667,7 +668,9 @@ class CORE_EXPORT LocalFrame final
+@@ -671,7 +672,9 @@ class CORE_EXPORT LocalFrame final
      return client_hints_preferences_;
    }
  

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

@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -805,7 +805,6 @@ if (_is_default_toolchain) {
+@@ -819,7 +819,6 @@ if (_is_default_toolchain) {
        "//components/offline_pages/core:offline_page_model_enums_java",
        "//components/sharing_message:sharing_dialog_type_generated_enum",
        "//components/sharing_message:sharing_send_message_result_generated_enum",
@@ -35,7 +35,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
-@@ -93,7 +93,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
+@@ -95,7 +95,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
          // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
          // incognito profile.
          if (!initParams.profile.isOffTheRecord()) {
@@ -65,19 +65,19 @@ 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
-@@ -328,7 +328,7 @@ void PrepareFactory(
+@@ -319,7 +319,7 @@ void PrepareFactory(
      policy::BrowserPolicyConnector* policy_connector) {
    factory->SetManagedPolicies(policy_service, policy_connector);
    factory->SetRecommendedPolicies(policy_service, policy_connector);
 -  if (supervised_user_settings) {
 +  if (((false)) && supervised_user_settings) {
+     // supervised_user_prefs handles the case when content_filters_service is
+     // nullptr. It's simply not subscribing to empty service's notifications.
      scoped_refptr<PrefStore> supervised_user_prefs =
-         base::MakeRefCounted<SupervisedUserPrefStore>(supervised_user_settings);
-     DCHECK(async || supervised_user_prefs->IsInitializationComplete());
 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
-@@ -467,7 +467,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -471,7 +471,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
  }
  
  std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -89,7 +89,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -674,10 +674,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -684,10 +684,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
      prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
  
    pref_change_registrar_.Init(prefs);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
  
    // Changes in the profile avatar.
    pref_change_registrar_.Add(
-@@ -1619,6 +1615,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1624,6 +1620,7 @@ GURL ProfileImpl::GetHomePage() {
  }
  
  void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -119,10 +119,10 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 -    profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
 -                                   supervised_user_id);
 -  }
- #if !BUILDFLAG(IS_ANDROID)
+ }
-   if (profile->IsNewProfile()) {
+ 
-     profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
+ void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
-@@ -1978,9 +1974,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -1962,9 +1958,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
@@ -160,7 +160,7 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -595,10 +595,6 @@ bool ManagementUIHandler::managed() const {
+@@ -617,10 +617,6 @@ bool ManagementUIHandler::managed() const {
  
  void ManagementUIHandler::RegisterPrefChange(
      PrefChangeRegistrar& pref_registrar) {
@@ -174,7 +174,7 @@ diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrom
 diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.cc b/components/supervised_user/core/browser/supervised_user_pref_store.cc
 --- a/components/supervised_user/core/browser/supervised_user_pref_store.cc
 +++ b/components/supervised_user/core/browser/supervised_user_pref_store.cc
-@@ -142,6 +142,7 @@ SupervisedUserPrefStore::~SupervisedUserPrefStore() = default;
+@@ -175,6 +175,7 @@ void SupervisedUserPrefStore::OnNewContentFiltersStateAvailable(
  
  void SupervisedUserPrefStore::OnNewSettingsAvailable(
      const base::Value::Dict& settings) {
@@ -208,7 +208,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
 --- a/components/supervised_user/core/browser/supervised_user_service.cc
 +++ b/components/supervised_user/core/browser/supervised_user_service.cc
-@@ -168,6 +168,7 @@ SupervisedUserService::SupervisedUserService(
+@@ -249,6 +249,7 @@ SupervisedUserService::SupervisedUserService(
  }
  
  void SupervisedUserService::SetSettingsServiceActive(bool active) {
@@ -219,7 +219,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -35,7 +35,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
+@@ -33,7 +33,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
  #else
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif
@@ -227,16 +227,16 @@ diff --git a/components/supervised_user/core/common/features.cc b/components/sup
  #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
      BUILDFLAG(IS_WIN)
  const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
-@@ -148,4 +147,5 @@ BASE_FEATURE(kDecoupleSafeSitesFromMainSwitch,
+@@ -170,4 +169,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
-              "DecoupleSafeSitesFromMainSwitch",
+ 
-              base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif
  
 +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
  }  // namespace supervised_user
 diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
 --- a/extensions/browser/api/management/management_api.cc
 +++ b/extensions/browser/api/management/management_api.cc
-@@ -310,6 +310,7 @@ void AddExtensionInfo(const Extension* source_extension,
+@@ -312,6 +312,7 @@ void AddExtensionInfo(const Extension* source_extension,
  }
  
  bool PlatformSupportsApprovalFlowForExtensions() {

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

@@ -11,8 +11,8 @@ 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
-@@ -1340,6 +1340,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
+@@ -1330,6 +1330,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
-   pipeline_controller_->OnSelectedVideoTrackChanged(selected);
+   return pipeline_metadata_.has_audio;
  }
  
 +bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
@@ -22,9 +22,9 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +}
 +
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
-     const std::vector<WebMediaPlayer::TrackId>& enabled_track_ids) {
+     std::optional<WebMediaPlayer::TrackId> enabled_track_id) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3710,7 +3716,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3683,7 +3689,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 std::vector<WebMediaPlayer::TrackId>& enabled_track_ids) override;
+       std::optional<WebMediaPlayer::TrackId> enabled_track_id) override;
    void SelectedVideoTrackChanged(
 --

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

@@ -20,7 +20,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resour
    if (!HOST_CHROME_VERSION) {
      return false;
    }
-@@ -566,7 +567,7 @@ function formatValue(data, property) {
+@@ -590,7 +591,7 @@ function formatValue(data, property) {
  function addFavicon(row, data) {
    const favicon = document.createElement('img');
    if (data['faviconUrl']) {

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

@@ -10,15 +10,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -21,6 +21,7 @@ import org.chromium.base.IntentUtils;
+@@ -24,6 +24,7 @@ import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.base.PackageManagerUtils;
- import org.chromium.base.metrics.RecordUserAction;
  import org.chromium.base.supplier.Supplier;
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
 +import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
-@@ -38,6 +39,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -43,6 +44,7 @@ import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
  import org.chromium.chrome.browser.printing.TabPrinter;
  import org.chromium.chrome.browser.profiles.Profile;
@@ -26,18 +26,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  import org.chromium.chrome.browser.tabmodel.TabModelSelector;
  import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
  import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-@@ -290,6 +292,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -303,6 +305,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
-             Referrer referrer,
+             @Nullable Referrer referrer,
              boolean navigateToTab,
              @Nullable AdditionalNavigationParams additionalNavigationParams) {
 +        TabBrowserControlsConstraintsHelper.get(mTab).update(BrowserControlsState.SHOWN, true);
          RecordUserAction.record("MobileNewTabOpened");
          RecordUserAction.record("LinkOpenedInNewTab");
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-@@ -310,6 +313,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -323,6 +326,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
       * @param url The URL to open.
       */
-     public void onOpenInNewTabInGroup(GURL url, Referrer referrer) {
+     public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) {
 +        TabBrowserControlsConstraintsHelper.get(mTab).update(BrowserControlsState.SHOWN, true);
          RecordUserAction.record("MobileNewTabOpened");
          RecordUserAction.record("LinkOpenedInNewTab");

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

@@ -19,12 +19,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -148,10 +148,6 @@ public class HomepageManager
+@@ -160,10 +160,6 @@ public class HomepageManager
       *     tab page if the homepage button is force enabled via flag.
       */
      public GURL getDefaultHomepageGurl() {
 -        if (PartnerBrowserCustomizations.getInstance().isHomepageProviderAvailableAndEnabled()) {
--            return PartnerBrowserCustomizations.getInstance().getHomePageUrl();
+-            return assumeNonNull(PartnerBrowserCustomizations.getInstance().getHomePageUrl());
 -        }
 -
          String homepagePartnerDefaultGurlSerialized =
@@ -33,7 +33,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/new_tab_url/DseNewTabUrlManager.java
-@@ -54,6 +54,7 @@ public class DseNewTabUrlManager {
+@@ -60,6 +60,7 @@ public class DseNewTabUrlManager {
  
      /** Returns whether the feature NewTabSearchEngineUrlAndroid is enabled. */
      public static boolean isNewTabSearchEngineUrlAndroidEnabled() {
@@ -67,7 +67,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -85,6 +85,7 @@ public class TemplateUrl {
+@@ -88,6 +88,7 @@ public class TemplateUrl {
       *     prepopulated_engines.json.
       */
      public String getNewTabURL() {
@@ -78,7 +78,7 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
 diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
 --- a/components/search_engines/android/template_url_service_android.cc
 +++ b/components/search_engines/android/template_url_service_android.cc
-@@ -403,6 +403,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -400,6 +400,7 @@ jboolean TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
          jimage_translate_source_language_param_key,
      const base::android::JavaParamRef<jstring>&
          jimage_translate_target_language_param_key) {

build/patches/Android-Import-Passwords.patch

@@ -1,353 +0,0 @@
-From: uazo <uazo@users.noreply.github.com>
-Date: Mon, 26 May 2025 12:17:48 +0000
-Subject: Android Import Passwords
-
-Adds the possibility of importing a csv file containing the list of passwords,
-with the same functionality available on desktops.
-
-License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
----
- ...e_password_preferences_action_bar_menu.xml |  6 ++
- .../settings/PasswordSettings.java            | 34 +++++++++
- .../settings/PasswordManagerHandler.java      |  3 +
- .../settings/PasswordUiView.java              |  8 +++
- .../android/password_ui_view_android.cc       | 71 +++++++++++++++++++
- .../android/password_ui_view_android.h        | 20 +++++-
- .../Import-Password-Android.grdp              |  9 +++
- .../core/browser/import/password_importer.cc  | 11 +++
- 8 files changed, 161 insertions(+), 1 deletion(-)
- create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
-
-diff --git a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
---- a/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
-+++ b/chrome/android/java/res/menu/save_password_preferences_action_bar_menu.xml
-@@ -22,6 +22,12 @@ found in the LICENSE file.
-         android:visibility="gone"
-         app:showAsAction="ifRoom"/>
- 
-+    <item
-+        android:id="@+id/import_passwords"
-+        android:title="@string/password_settings_import_action_title"
-+        android:contentDescription="@string/password_settings_import_action_description"
-+        app:showAsAction="never"/>
-+
-     <item
-         android:id="@+id/export_passwords"
-         android:title="@string/password_settings_export_action_title"
-diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
-@@ -57,6 +57,9 @@ import org.chromium.components.sync.PassphraseType;
- import org.chromium.components.sync.SyncService;
- import org.chromium.components.user_prefs.UserPrefs;
- import org.chromium.ui.text.SpanApplier;
-+import org.chromium.ui.base.ActivityWindowAndroid;
-+import org.chromium.ui.base.ActivityIntentRequestTrackerDelegate;
-+import org.chromium.ui.base.IntentRequestTracker;
- 
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
-@@ -151,6 +154,8 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
- 
-     /** For controlling the UX flow of exporting passwords. */
-     private final ExportFlow mExportFlow = new ExportFlow(PasswordAccessLossWarningType.NONE);
-+    private ActivityWindowAndroid mWindowAndroid;
-+    private IntentRequestTracker mIntentRequestTracker;
- 
-     public ExportFlow getExportFlowForTesting() {
-         return mExportFlow;
-@@ -199,6 +204,19 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
- 
-         mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState);
- 
-+        mIntentRequestTracker = IntentRequestTracker.createFromDelegate(
-+                                new ActivityIntentRequestTrackerDelegate(getActivity()) {
-+                                    @Override
-+                                    public boolean startActivityForResult(@Nullable Intent intent, int requestCode) {
-+                                        PasswordSettings.this.startActivityForResult(intent, requestCode);
-+                                        return true;
-+                                    }
-+                                });
-+        mWindowAndroid = new ActivityWindowAndroid(
-+            getActivity(), /* listenToActivityState */ true,
-+            mIntentRequestTracker, /*InsetObserver*/ null,
-+            /* trackOcclusion= */ true);
-+
-         if (savedInstanceState == null) return;
- 
-         if (savedInstanceState.containsKey(SAVED_STATE_SEARCH_QUERY)) {
-@@ -263,6 +281,12 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
-     @Override
-     public boolean onOptionsItemSelected(MenuItem item) {
-         int id = item.getItemId();
-+        if (id == R.id.import_passwords) {
-+            PasswordManagerHandlerProvider.getForProfile(getProfile())
-+                    .getPasswordManagerHandler()
-+                    .startImporting(mWindowAndroid);
-+            return true;
-+        }
-         if (id == R.id.export_passwords) {
-             RecordHistogram.recordEnumeratedHistogram(
-                     mExportFlow.getExportEventHistogramName(),
-@@ -506,6 +530,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
-     @Override
-     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-         super.onActivityResult(requestCode, resultCode, intent);
-+        mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, intent);
-         if (requestCode != PASSWORD_EXPORT_INTENT_REQUEST_CODE) return;
-         if (resultCode != Activity.RESULT_OK) return;
-         if (intent == null || intent.getData() == null) return;
-@@ -517,12 +542,21 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
-     public void onSaveInstanceState(Bundle outState) {
-         super.onSaveInstanceState(outState);
-         mExportFlow.onSaveInstanceState(outState);
-+        mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState);
-         if (mSearchQuery != null) {
-             outState.putString(SAVED_STATE_SEARCH_QUERY, mSearchQuery);
-         }
-         outState.putInt(PasswordManagerHelper.MANAGE_PASSWORDS_REFERRER, mManagePasswordsReferrer);
-     }
- 
-+    @Override
-+    public void onRequestPermissionsResult(
-+            int requestCode, String[] permissions, int[] grantResults) {
-+        if (mWindowAndroid.handlePermissionResult(requestCode, permissions, grantResults))
-+            return;
-+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-+    }
-+
-     @Override
-     public void onDestroy() {
-         super.onDestroy();
-diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
---- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
-+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordManagerHandler.java
-@@ -9,6 +9,7 @@ import android.content.Context;
- import org.chromium.base.Callback;
- import org.chromium.base.IntStringCallback;
- import org.chromium.build.annotations.NullMarked;
-+import org.chromium.ui.base.WindowAndroid;
- 
- /**
-  * Interface for retrieving passwords and password exceptions (websites for which Chrome should not
-@@ -80,4 +81,6 @@ public interface PasswordManagerHandler {
-      * @return Returns true if the request to fetch the passwords is still pending.
-      */
-     boolean isWaitingForPasswordStore();
-+
-+    boolean startImporting(WindowAndroid window);
- }
-diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
---- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
-+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordUiView.java
-@@ -12,6 +12,7 @@ import org.jni_zero.NativeMethods;
- 
- import org.chromium.base.Callback;
- import org.chromium.base.IntStringCallback;
-+import org.chromium.ui.base.WindowAndroid;
- import org.chromium.build.annotations.NullMarked;
- import org.chromium.chrome.browser.profiles.Profile;
- 
-@@ -158,6 +159,12 @@ public final class PasswordUiView implements PasswordManagerHandler {
-         }
-     }
- 
-+    @Override
-+    public boolean startImporting(WindowAndroid window) {
-+        return PasswordUiViewJni.get()
-+                .startImporting(mNativePasswordUiViewAndroid, PasswordUiView.this, window);
-+    }
-+
-     @NativeMethods
-     interface Natives {
-         long init(PasswordUiView caller, @JniType("Profile*") Profile profile);
-@@ -190,6 +197,7 @@ public final class PasswordUiView implements PasswordManagerHandler {
-         String getTrustedVaultLearnMoreURL();
- 
-         boolean isWaitingForPasswordStore(long nativePasswordUiViewAndroid, PasswordUiView caller);
-+        boolean startImporting(long nativePasswordUiViewAndroid, PasswordUiView caller, WindowAndroid window);
- 
-         void destroy(long nativePasswordUiViewAndroid, PasswordUiView caller);
- 
-diff --git a/chrome/browser/password_manager/android/password_ui_view_android.cc b/chrome/browser/password_manager/android/password_ui_view_android.cc
---- a/chrome/browser/password_manager/android/password_ui_view_android.cc
-+++ b/chrome/browser/password_manager/android/password_ui_view_android.cc
-@@ -41,6 +41,11 @@
- #include "ui/base/l10n/l10n_util.h"
- #include "url/gurl.h"
- 
-+#include "chrome/browser/ui/chrome_select_file_policy.h"
-+#include "ui/shell_dialogs/selected_file_info.h"
-+#include "ui/shell_dialogs/select_file_dialog.h"
-+#include "ui/android/window_android.h"
-+
- // Must come after other includes, because FromJniType() uses Profile.
- #include "chrome/browser/password_manager/android/jni_headers/PasswordUiView_jni.h"
- 
-@@ -123,6 +128,8 @@ PasswordUiViewAndroid::PasswordUiViewAndroid(
- 
- PasswordUiViewAndroid::~PasswordUiViewAndroid() {
-   saved_passwords_presenter_.RemoveObserver(this);
-+  if (select_file_dialog_)
-+    select_file_dialog_->ListenerDestroyed();
- }
- 
- void PasswordUiViewAndroid::Destroy(JNIEnv*, const JavaRef<jobject>&) {
-@@ -314,6 +321,70 @@ jboolean PasswordUiViewAndroid::IsWaitingForPasswordStore(
-   return saved_passwords_presenter_.IsWaitingForPasswordStore();
- }
- 
-+void PasswordUiViewAndroid::ImportFinished(
-+    const password_manager::ImportResults& results) {
-+  std::string error;
-+  if (results.status == password_manager::ImportResults::Status::SUCCESS)
-+    error = "Success.";
-+  else if (results.status == password_manager::ImportResults::Status::IO_ERROR)
-+    error = "Failed to read provided file.";
-+  else if (results.status == password_manager::ImportResults::Status::BAD_FORMAT)
-+    error = "Header is missing, invalid or could not be read.";
-+  else if (results.status == password_manager::ImportResults::Status::NUM_PASSWORDS_EXCEEDED)
-+    error = "Too many passwords.";
-+  else
-+    error = "UNKNOWN ERROR.";
-+
-+  std::stringstream message;
-+  message << error << " Imported " << results.number_imported << " passwords.";
-+  auto result = message.str();
-+
-+  select_file_dialog_->ShowToast(result);
-+
-+  importer_.reset();
-+}
-+
-+jboolean PasswordUiViewAndroid::StartImporting(
-+    JNIEnv* env,
-+    const base::android::JavaRef<jobject>& obj,
-+    const JavaParamRef<jobject>& java_window) {
-+  ui::WindowAndroid* window =
-+      ui::WindowAndroid::FromJavaWindowAndroid(java_window);
-+  CHECK(window);
-+
-+  select_file_dialog_ = ui::SelectFileDialog::Create(
-+    this, std::make_unique<ChromeSelectFilePolicy>(nullptr));
-+
-+  ui::SelectFileDialog::FileTypeInfo file_type_info;
-+
-+  const std::vector<std::u16string> v_accept_types = { u"application/octet-stream" };
-+  select_file_dialog_->SetAcceptTypes(v_accept_types);
-+
-+  select_file_dialog_->SelectFile(
-+        ui::SelectFileDialog::SELECT_OPEN_FILE,
-+        std::u16string(),
-+        base::FilePath(),
-+        &file_type_info,
-+        0,
-+        base::FilePath::StringType(),
-+        window);
-+
-+  return true;
-+}
-+
-+void PasswordUiViewAndroid::FileSelectionCanceled() {}
-+
-+void PasswordUiViewAndroid::FileSelected(const ui::SelectedFileInfo& file, int index) {
-+  base::FilePath path = file.path();
-+
-+  importer_ =
-+    std::make_unique<password_manager::PasswordImporter>(&saved_passwords_presenter_);
-+  importer_->Import(path,
-+    password_manager::PasswordForm::Store::kProfileStore,
-+    base::BindOnce(&PasswordUiViewAndroid::ImportFinished,
-+                     base::Unretained(this)));
-+}
-+
- // static
- static jlong JNI_PasswordUiView_Init(JNIEnv* env,
-                                      const JavaParamRef<jobject>& obj,
-diff --git a/chrome/browser/password_manager/android/password_ui_view_android.h b/chrome/browser/password_manager/android/password_ui_view_android.h
---- a/chrome/browser/password_manager/android/password_ui_view_android.h
-+++ b/chrome/browser/password_manager/android/password_ui_view_android.h
-@@ -21,6 +21,8 @@
- #include "chrome/browser/signin/identity_manager_factory.h"
- #include "components/password_manager/core/browser/password_store/password_store_consumer.h"
- #include "components/password_manager/core/browser/ui/saved_passwords_presenter.h"
-+#include "components/password_manager/core/browser/import/password_importer.h"
-+#include "ui/shell_dialogs/select_file_dialog.h"
- 
- class Profile;
- 
-@@ -31,7 +33,8 @@ class CredentialProviderInterface;
- // PasswordUIView for Android, contains jni hooks that allows Android UI to
- // display passwords and route UI commands back to SavedPasswordsPresenter.
- class PasswordUiViewAndroid
--    : public password_manager::SavedPasswordsPresenter::Observer {
-+    : public password_manager::SavedPasswordsPresenter::Observer,
-+      public ui::SelectFileDialog::Listener {
-  public:
-   // Result of transforming a vector of PasswordForms into their CSV
-   // description and writing that to disk.
-@@ -95,6 +98,18 @@ class PasswordUiViewAndroid
-       const base::android::JavaParamRef<jobject>& obj);
-   jboolean IsWaitingForPasswordStore(JNIEnv* env,
-                                      const base::android::JavaRef<jobject>&);
-+
-+  void FileSelected(const ui::SelectedFileInfo& file,
-+                    int index) override;
-+  void FileSelectionCanceled() override;
-+
-+  void ImportFinished(
-+       const password_manager::ImportResults& results);
-+
-+  jboolean StartImporting(JNIEnv* env,
-+                          const base::android::JavaRef<jobject>& obj,
-+                          const base::android::JavaParamRef<jobject>& java_window);
-+
-   // Destroy the native implementation.
-   void Destroy(JNIEnv*, const base::android::JavaRef<jobject>&);
- 
-@@ -162,6 +177,9 @@ class PasswordUiViewAndroid
-   std::vector<password_manager::CredentialUIEntry> passwords_;
-   std::vector<password_manager::CredentialUIEntry> blocked_sites_;
- 
-+  scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
-+  std::unique_ptr<password_manager::PasswordImporter> importer_;
-+
-   // If not null, passwords for exporting will be obtained from
-   // |*credential_provider_for_testing_|, otherwise from
-   // |saved_passwords_presenter_|. This must remain null in production code.
-diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
-new file mode 100644
---- /dev/null
-+++ b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Import-Password-Android.grdp
-@@ -0,0 +1,9 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<grit-part>
-+    <message name="IDS_PASSWORD_SETTINGS_IMPORT_ACTION_TITLE" desc="The title of a menu item to trigger importing passwords from the password settings.">
-+        Import passwords…
-+    </message>
-+    <message name="IDS_PASSWORD_SETTINGS_IMPORT_ACTION_DESCRIPTION" desc="The description of a menu item to trigger importing passwords from the password settings.">
-+        Import passwords stored with Chrome
-+    </message>
-+</grit-part>
-diff --git a/components/password_manager/core/browser/import/password_importer.cc b/components/password_manager/core/browser/import/password_importer.cc
---- a/components/password_manager/core/browser/import/password_importer.cc
-+++ b/components/password_manager/core/browser/import/password_importer.cc
-@@ -75,6 +75,17 @@ const int32_t kMaxFileSizeBytes = 150 * 1024;
- // optional string. The string will be present if the status is SUCCESS.
- base::expected<std::string, ImportResults::Status> ReadFileToString(
-     const base::FilePath& path) {
-+#if BUILDFLAG(IS_ANDROID)
-+  if (path.IsContentUri()) {
-+    base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
-+    auto fileLength = file.GetLength();
-+    std::vector<char> buffer(fileLength);
-+    file.ReadAtCurrentPos(base::as_writable_byte_span(buffer));
-+
-+    std::string file_contents(buffer.begin(), buffer.end());
-+    return std::move(file_contents);
-+  }
-+#endif
-   std::optional<int64_t> file_size = base::GetFileSize(path);
- 
-   if (file_size.has_value()) {
---

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

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  chrome/browser/BUILD.gn                       |    7 +
  .../browser/component_updater/registration.cc |   10 +
  ...droid-fonts-fingerprinting-mitigation.grdp |    9 +
- chrome/renderer/BUILD.gn                      |    3 +
+ chrome/renderer/BUILD.gn                      |    4 +
  .../installer_policies/BUILD.gn               |    7 +
  .../fonts_pack_component_installer.cc         |   96 +
  .../fonts_pack_component_installer.h          |   60 +
@@ -38,11 +38,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../skia/src/ports/SkFontConfigInterface.cpp  |    4 +
  .../ports/SkFontConfigInterface_direct.cpp    |    5 +
  .../src/ports/SkFontConfigInterface_direct.h  |    1 +
- .../skia/src/ports/SkFontMgr_android.cpp      |  278 ++-
+ .../skia/src/ports/SkFontMgr_android.cpp      |  279 ++-
  .../skia/src/ports/SkFontMgr_android_data.cpp | 1640 +++++++++++++++++
  .../src/ports/SkFontMgr_android_parser.cpp    |   49 +-
  .../skia/src/ports/SkFontMgr_android_parser.h |    5 +-
- 36 files changed, 2410 insertions(+), 79 deletions(-)
+ 36 files changed, 2415 insertions(+), 76 deletions(-)
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp
  create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc
  create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h
@@ -54,7 +54,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
-@@ -1046,6 +1046,9 @@ public final class ProductionSupportedFlagList {
+@@ -1007,6 +1007,9 @@ public final class ProductionSupportedFlagList {
                  "Hides user preference on the system keyboard by setting the standard "
                   + "eng layout and removing the layout information from the "
                   + "javascript keyboard events."),
@@ -67,7 +67,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/common/Produc
 diff --git a/android_webview/nonembedded/component_updater/registration.cc b/android_webview/nonembedded/component_updater/registration.cc
 --- a/android_webview/nonembedded/component_updater/registration.cc
 +++ b/android_webview/nonembedded/component_updater/registration.cc
-@@ -27,6 +27,9 @@
+@@ -26,6 +26,9 @@
  #include "components/update_client/update_client.h"
  #include "mojo/public/cpp/base/proto_wrapper.h"
  
@@ -77,7 +77,7 @@ diff --git a/android_webview/nonembedded/component_updater/registration.cc b/and
  namespace android_webview {
  
  void RegisterComponentsForUpdate(
-@@ -43,6 +46,12 @@ void RegisterComponentsForUpdate(
+@@ -42,6 +45,12 @@ void RegisterComponentsForUpdate(
    std::vector<std::unique_ptr<component_updater::ComponentInstallerPolicy>>
        component_installer_list_cromite;
  
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7888,6 +7888,13 @@ static_library("browser") {
+@@ -7951,6 +7951,13 @@ static_library("browser") {
      }
    }
  
@@ -123,7 +123,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
 --- a/chrome/browser/component_updater/registration.cc
 +++ b/chrome/browser/component_updater/registration.cc
-@@ -123,10 +123,20 @@
+@@ -115,10 +115,20 @@
  #include "chrome/browser/component_updater/file_type_policies_component_installer.h"
  #endif
  
@@ -161,20 +161,21 @@ new file mode 100644
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -292,6 +292,9 @@ static_library("renderer") {
+@@ -258,6 +258,10 @@ static_library("renderer") {
-       "//ppapi/shared_impl",
+     deps += [ "//components/strings" ]
-     ]
+   }
  
-+    if (is_android) {
++  if (is_android) {
-+      deps += [ "//components/services/font/public/cpp" ]
++    deps += [ "//components/services/font/public/cpp" ]
-+    }
++  }
-     if (is_linux || is_chromeos) {
++
-       deps += [ "//components/services/font/public/cpp" ]
+   if (enable_pdf) {
-     }
+     deps += [
+       "//components/pdf/renderer",
 diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
 --- a/components/component_updater/installer_policies/BUILD.gn
 +++ b/components/component_updater/installer_policies/BUILD.gn
-@@ -36,6 +36,13 @@ static_library("installer_policies_no_content_deps") {
+@@ -38,6 +38,13 @@ static_library("installer_policies_no_content_deps") {
      "trust_token_key_commitments_component_installer_policy.h",
    ]
  
@@ -614,7 +615,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2581,6 +2581,17 @@ source_set("browser") {
+@@ -2600,6 +2600,17 @@ source_set("browser") {
      ]
    }
  
@@ -632,7 +633,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
    if (is_linux || is_chromeos) {
      sources -=
          [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2626,6 +2637,13 @@ source_set("browser") {
+@@ -2645,6 +2656,13 @@ source_set("browser") {
      ]
    }
  
@@ -649,7 +650,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc b/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 --- a/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 +++ b/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
-@@ -51,6 +51,11 @@
+@@ -52,6 +52,11 @@
  #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
  #endif
  
@@ -661,7 +662,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
  #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
  #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
  #include "content/browser/font_service.h"  // nogncheck
-@@ -336,6 +341,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
+@@ -348,6 +353,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
    }
  #endif
  
@@ -695,7 +696,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 --- a/content/renderer/BUILD.gn
 +++ b/content/renderer/BUILD.gn
-@@ -347,6 +347,10 @@ target(link_target_type, "renderer") {
+@@ -346,6 +346,10 @@ target(link_target_type, "renderer") {
      deps += [ "//services/screen_ai/public/mojom" ]
    }
  
@@ -709,7 +710,7 @@ diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -136,6 +136,23 @@
+@@ -137,6 +137,23 @@
  #include "content/common/android/sync_compositor_statics.h"
  #endif
  
@@ -733,7 +734,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  using blink::Platform;
  using blink::WebAudioDevice;
  using blink::WebAudioLatencyHint;
-@@ -178,6 +195,37 @@ gpu::ContextType ToGpuContextType(blink::Platform::ContextType type) {
+@@ -180,6 +197,37 @@ gpu::ContextType ToGpuContextType(blink::Platform::ContextType type) {
    NOTREACHED();
  }
  
@@ -771,7 +772,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
  }  // namespace
  
  //------------------------------------------------------------------------------
-@@ -191,18 +239,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -193,18 +241,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
        is_locked_to_site_(false),
        main_thread_scheduler_(main_thread_scheduler),
        next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -837,7 +838,7 @@ new file mode 100644
 diff --git a/skia/BUILD.gn b/skia/BUILD.gn
 --- a/skia/BUILD.gn
 +++ b/skia/BUILD.gn
-@@ -457,6 +457,18 @@ component("skia") {
+@@ -463,6 +463,18 @@ component("skia") {
      sources += skia_ports_fci_sources
    }
  
@@ -883,7 +884,7 @@ diff --git a/third_party/skia/include/ports/SkFontMgr_android.h b/third_party/sk
  
  #include <memory>
  
-@@ -40,13 +45,46 @@ struct SkFontMgr_Android_CustomFonts {
+@@ -40,9 +45,44 @@ struct SkFontMgr_Android_CustomFonts {
       *  system IO resources on initialization.
       */
      bool fIsolated;
@@ -923,12 +924,9 @@ diff --git a/third_party/skia/include/ports/SkFontMgr_android.h b/third_party/sk
  };
  
  /** Create a font manager for Android. If 'custom' is NULL, use only system fonts. */
- 
- // Deprecated
--SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom);
-+SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom);
- 
 -SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom,
++SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom);
++
 +SK_API sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom,
                                                std::unique_ptr<SkFontScanner> scanner);
  #endif // SkFontMgr_android_DEFINED
@@ -950,7 +948,7 @@ diff --git a/third_party/skia/src/ports/SkFontConfigInterface.cpp b/third_party/
 diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp b/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
 --- a/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
 +++ b/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
-@@ -707,3 +707,8 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
+@@ -715,3 +715,8 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
  SkStreamAsset* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
      return SkStream::MakeFromFile(identity.fString.c_str()).release();
  }
@@ -973,7 +971,15 @@ diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct.h b/third_p
 diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia/src/ports/SkFontMgr_android.cpp
 --- a/third_party/skia/src/ports/SkFontMgr_android.cpp
 +++ b/third_party/skia/src/ports/SkFontMgr_android.cpp
-@@ -27,6 +27,7 @@
+@@ -16,6 +16,7 @@
+ #include "include/core/SkStream.h"
+ #include "include/core/SkString.h"
+ #include "include/ports/SkFontMgr_android.h"
++#include "include/ports/SkFontScanner_FreeType.h"
+ #include "include/private/base/SkFixed.h"
+ #include "include/private/base/SkTArray.h"
+ #include "include/private/base/SkTDArray.h"
+@@ -27,6 +28,7 @@
  #include "src/core/SkTypefaceCache.h"
  #include "src/ports/SkFontMgr_android_parser.h"
  #include "src/ports/SkTypeface_proxy.h"
@@ -981,7 +987,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
  #include <algorithm>
  #include <limits>
-@@ -36,6 +37,91 @@ using namespace skia_private;
+@@ -36,6 +38,91 @@ using namespace skia_private;
  class SkData;
  
  namespace {
@@ -1073,7 +1079,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  class SkTypeface_AndroidSystem : public SkTypeface_proxy {
  public:
      static sk_sp<SkTypeface_AndroidSystem> Make(sk_sp<SkTypeface> realTypeface,
-@@ -110,7 +196,8 @@ using StreamForPathCache = skia_private::THashMap<SkString, std::unique_ptr<SkSt
+@@ -109,7 +196,8 @@ using StreamForPathCache = skia_private::THashMap<SkString, std::unique_ptr<SkSt
  class SkFontStyleSet_Android : public SkFontStyleSet {
  public:
      explicit SkFontStyleSet_Android(const FontFamily& family, const SkFontScanner* scanner,
@@ -1083,7 +1089,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          const SkString* cannonicalFamilyName = nullptr;
          if (!family.fNames.empty()) {
              cannonicalFamilyName = &family.fNames[0];
-@@ -119,38 +206,60 @@ public:
+@@ -118,38 +206,60 @@ public:
  
          // TODO? make this lazy
          for (int i = 0; i < family.fFonts.size(); ++i) {
@@ -1167,7 +1173,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              }
  
              uint32_t variant = family.fVariant;
-@@ -161,13 +270,25 @@ public:
+@@ -160,13 +270,25 @@ public:
              // The first specified family name overrides the family name found in the font.
              // TODO: SkTypeface_AndroidSystem::onCreateFamilyNameIterator should return
              // all of the specified family names in addition to the names found in the font.
@@ -1199,7 +1205,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              int weight = fontFile.fWeight != 0 ? fontFile.fWeight : fontStyle.weight();
              SkFontStyle::Slant slant = fontStyle.slant();
              switch (fontFile.fStyle) {
-@@ -178,6 +299,19 @@ public:
+@@ -177,6 +299,19 @@ public:
              }
              fontStyle = SkFontStyle(weight, fontStyle.width(), slant);
  
@@ -1219,7 +1225,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              fStyles.push_back(
                  SkTypeface_AndroidSystem::Make(proxy,
                                                 fontStyle, proxy->isFixedPitch(),
-@@ -206,15 +340,18 @@ public:
+@@ -205,15 +340,18 @@ public:
          return fStyles[index];
      }
  
@@ -1241,7 +1247,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
      SkString fFallbackFor;
  
      friend struct NameToFamily;
-@@ -235,24 +372,26 @@ struct NameToFamily {
+@@ -234,24 +372,26 @@ struct NameToFamily {
  
  class SkFontMgr_Android : public SkFontMgr {
  public:
@@ -1272,7 +1278,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          }
          this->buildNameToFamilyMap(families, custom ? custom->fIsolated : false);
          this->findDefaultStyleSet();
-@@ -310,33 +449,53 @@ protected:
+@@ -309,33 +449,53 @@ protected:
          return sset->matchStyle(style);
      }
  
@@ -1341,7 +1347,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
              }
          }
          return nullptr;
-@@ -359,7 +518,7 @@ protected:
+@@ -358,7 +518,7 @@ protected:
                  for (int bcp47Index = bcp47Count; bcp47Index --> 0;) {
                      SkLanguage lang(bcp47[bcp47Index]);
                      while (!lang.getTag().isEmpty()) {
@@ -1350,7 +1356,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
                              find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap,
                                                          style, SkToBool(elegant),
                                                          lang.getTag(), character);
-@@ -370,7 +529,7 @@ protected:
+@@ -369,7 +529,7 @@ protected:
                          lang = lang.getParent();
                      }
                  }
@@ -1359,7 +1365,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
                      find_family_style_character(currentFamilyName, fFallbackNameToFamilyMap,
                                                  style, SkToBool(elegant),
                                                  SkString(), character);
-@@ -421,6 +580,7 @@ protected:
+@@ -420,6 +580,7 @@ protected:
  private:
  
      std::unique_ptr<SkFontScanner> fScanner;
@@ -1367,7 +1373,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
  
      TArray<sk_sp<SkFontStyleSet_Android>> fStyleSets;
      sk_sp<SkFontStyleSet> fDefaultStyleSet;
-@@ -442,7 +602,7 @@ private:
+@@ -441,7 +602,7 @@ private:
          }
  
          sk_sp<SkFontStyleSet_Android> newSet =
@@ -1376,22 +1382,20 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
          if (0 == newSet->count()) {
              return;
          }
-@@ -487,11 +647,11 @@ static char const * const gSystemFontUseStrings[] = {
+@@ -486,7 +647,11 @@ static char const * const gSystemFontUseStrings[] = {
  
  }  // namespace
  
--sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom) {
+-sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom, std::unique_ptr<SkFontScanner> scanner) {
--    return SkFontMgr_New_Android(custom, SkFontScanner_Make_FreeType());
 +sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom) {
 +    return SkFontMgr_New_Android(std::move(custom), SkFontScanner_Make_FreeType());
- }
++}
- 
++
--sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* custom, std::unique_ptr<SkFontScanner> scanner) {
 +sk_sp<SkFontMgr> SkFontMgr_New_Android(std::unique_ptr<SkFontMgr_Android_CustomFonts> custom, std::unique_ptr<SkFontScanner> scanner) {
      if (custom) {
          SkASSERT(0 <= custom->fSystemFontUse);
          SkASSERT(custom->fSystemFontUse < std::size(gSystemFontUseStrings));
-@@ -501,5 +661,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
+@@ -496,5 +661,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
                   custom->fFontsXml,
                   custom->fFallbackFontsXml);
      }

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

@@ -76,7 +76,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/net/connectivitydetector/ConnectivityDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/net/connectivitydetector/ConnectivityDetector.java
-@@ -468,7 +468,6 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
+@@ -470,7 +470,6 @@ public class ConnectivityDetector implements NetworkChangeNotifier.ConnectionTyp
      @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
      public void setConnectionState(@ConnectionState int connectionState) {
          Log.i(TAG, "setConnectionState connectionState=" + connectionState);
@@ -87,7 +87,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/net/connectivit
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineDetector.java
-@@ -21,16 +21,38 @@ import org.chromium.base.version_info.VersionInfo;
+@@ -23,17 +23,39 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
  import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector;
  import org.chromium.chrome.browser.net.connectivitydetector.ConnectivityDetector.ConnectionState;
@@ -122,6 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
   * Class that detects if the network is offline. Waits for the network to stablize before notifying
   * the observer.
   */
+ @NullMarked
  class OfflineDetector
 -        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener {
 +        implements ConnectivityDetector.Observer, ApplicationStatus.ApplicationStateListener,
@@ -129,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      // If the connection is online, then we report that immediately via |mIsOfflineCallback|.
      // |STATUS_INDICATOR_WAIT_ON_OFFLINE_DURATION_MS| and
      // |mStatusIndicatorWaitOnSwitchOnlineToOfflineDurationMs| control the duration before
-@@ -116,6 +138,11 @@ class OfflineDetector
+@@ -119,6 +141,11 @@ class OfflineDetector
  
      private static final String TAG = "OfflineDetector";
  
@@ -141,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      /**
       * Constructs the offline indicator.
       * @param isOfflineCallback The {@link Callback} is invoked when the connectivity status is
-@@ -127,7 +154,13 @@ class OfflineDetector
+@@ -130,7 +157,13 @@ class OfflineDetector
      OfflineDetector(
              Callback<Boolean> isOfflineCallback,
              Callback<Boolean> isForegroundCallback,
@@ -156,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
          mIsOfflineCallback = isOfflineCallback;
          mIsForegroundCallback = isForegroundCallback;
          mContext = context;
-@@ -231,6 +264,75 @@ class OfflineDetector
+@@ -234,6 +267,75 @@ class OfflineDetector
          updateState();
      }
  
@@ -232,7 +233,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
      private void logToAdbConsoleNow(String prefix) {
          Log.i(
                  TAG,
-@@ -316,6 +418,7 @@ class OfflineDetector
+@@ -320,6 +422,7 @@ class OfflineDetector
       ** Calls |mUpdateOfflineStatusIndicatorDelayedRunnable| to update the connection state.
       */
      private void updateState() {
@@ -243,7 +244,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/offlinepages/indicator/OfflineIndicatorControllerV2.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
-@@ -28,6 +28,11 @@ import org.chromium.content_public.common.ContentSwitches;
+@@ -31,6 +31,11 @@ import org.chromium.content_public.common.ContentSwitches;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  
@@ -255,7 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
  /**
   * Class that controls visibility and content of {@link StatusIndicatorCoordinator} to relay
   * connectivity information.
-@@ -101,7 +106,10 @@ public class OfflineIndicatorControllerV2 {
+@@ -104,7 +109,10 @@ public class OfflineIndicatorControllerV2 {
              Context context,
              StatusIndicatorCoordinator statusIndicator,
              ObservableSupplier<Boolean> isUrlBarFocusedSupplier,
@@ -264,10 +265,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 +            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
 +            ObservableSupplierImpl<LayoutManager> layoutManager,
 +            Supplier<SnackbarManager> snackbarManagerSupplier) {
-         if (CommandLine.getInstance()
+         // If "force online connection state" switch is set, the offline indicator should never
-                 .hasSwitch(ContentSwitches.FORCE_ONLINE_CONNECTION_STATE_FOR_INDICATOR)) {
+         // show.
-             // If "force online connection state" switch is set, the offline indicator should never
+         assert !CommandLine.getInstance()
-@@ -129,7 +137,10 @@ public class OfflineIndicatorControllerV2 {
+@@ -130,7 +138,10 @@ public class OfflineIndicatorControllerV2 {
                      new OfflineDetector(
                              (Boolean offline) -> onConnectionStateChanged(offline),
                              (Boolean isForeground) -> onApplicationStateChanged(isForeground),
@@ -282,22 +283,22 @@ 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
-@@ -1373,7 +1373,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1417,7 +1417,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
-                         mActivity,
+                             mActivity,
-                         mStatusIndicatorCoordinator,
+                             mStatusIndicatorCoordinator,
-                         isUrlBarFocusedSupplier,
+                             isUrlBarFocusedSupplier,
--                        mCanAnimateBrowserControls);
+-                            mCanAnimateBrowserControls);
-+                        mCanAnimateBrowserControls,
++                            mCanAnimateBrowserControls,
-+                        mTabModelSelectorSupplier,
++                            mTabModelSelectorSupplier,
-+                        mLayoutManagerSupplier,
++                            mLayoutManagerSupplier,
-+                        mSnackbarManagerSupplier);
++                            mSnackbarManagerSupplier);
-         if (mToolbarManager.getOmniboxStub() != null) {
-             mToolbarManager.getOmniboxStub().addUrlFocusChangeListener(mUrlFocusChangeListener);
          }
+ 
+         if (mToolbarManager.getOmniboxStub() != null) {
 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
-@@ -195,6 +195,13 @@ public abstract class TabModelSelectorBase
+@@ -198,6 +198,13 @@ public abstract class TabModelSelectorBase
          return null;
      }
  
@@ -309,7 +310,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 +    }
 +
      @Override
-     public @NonNull TabModel getCurrentModel() {
+     public TabModel getCurrentModel() {
          if (mTabModelInternals.size() == 0) return EmptyTabModel.getInstance(false);
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
 new file mode 100644
@@ -404,7 +405,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 --- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 +++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
-@@ -138,6 +138,8 @@ public interface TabWindowManager {
+@@ -133,6 +133,8 @@ public interface TabWindowManager {
      /** Returns the total number of incognito tabs across all tab model selectors. */
      int getIncognitoTabCount();
  
@@ -416,7 +417,7 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 --- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 +++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
-@@ -555,6 +555,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+@@ -546,6 +546,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
          return tabGroupModelFilter.getTabsInGroup(tabGroupId);
      }
  
@@ -598,7 +599,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc
 --- a/content/browser/web_contents/web_contents_android.cc
 +++ b/content/browser/web_contents/web_contents_android.cc
-@@ -899,6 +899,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
+@@ -903,6 +903,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
    view->SetFocus(focused);
  }
  
@@ -624,7 +625,7 @@ diff --git a/content/browser/web_contents/web_contents_android.cc b/content/brow
 diff --git a/content/browser/web_contents/web_contents_android.h b/content/browser/web_contents/web_contents_android.h
 --- a/content/browser/web_contents/web_contents_android.h
 +++ b/content/browser/web_contents/web_contents_android.h
-@@ -194,6 +194,7 @@ class CONTENT_EXPORT WebContentsAndroid {
+@@ -196,6 +196,7 @@ class CONTENT_EXPORT WebContentsAndroid {
  
    void OnScaleFactorChanged(JNIEnv* env);
    void SetFocus(JNIEnv* env, jboolean focused);
@@ -635,7 +636,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
-@@ -3991,8 +3991,10 @@ void WebContentsImpl::Stop() {
+@@ -4080,8 +4080,10 @@ void WebContentsImpl::Stop() {
  void WebContentsImpl::SetPageFrozen(bool frozen) {
    TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
  
@@ -649,7 +650,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
-@@ -1130,6 +1130,12 @@ public class WebContentsImpl
+@@ -1138,6 +1138,12 @@ public class WebContentsImpl
          WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
      }
  
@@ -662,7 +663,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
      @Override
      public void setDisplayCutoutSafeArea(Rect insets) {
          if (mNativeWebContentsAndroid == 0) return;
-@@ -1450,6 +1456,8 @@ public class WebContentsImpl
+@@ -1447,6 +1453,8 @@ public class WebContentsImpl
  
          void setFocus(long nativeWebContentsAndroid, boolean focused);
  
@@ -674,7 +675,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
 diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 --- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
 +++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
-@@ -283,6 +283,8 @@ public interface WebContents extends Parcelable {
+@@ -288,6 +288,8 @@ public interface WebContents extends Parcelable {
       */
      void setFocus(boolean hasFocus);
  
@@ -731,7 +732,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
-@@ -4387,6 +4387,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4614,6 +4614,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
  }
  
  void Document::DispatchFreezeEvent() {
@@ -742,7 +743,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
-@@ -3178,6 +3178,7 @@ void LocalFrame::DidFreeze() {
+@@ -3273,6 +3273,7 @@ void LocalFrame::DidFreeze() {
    LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
    GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
    Loader().SetDefersLoading(freeze_mode);
@@ -750,7 +751,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  }
  
  void LocalFrame::DidResume() {
-@@ -3192,6 +3193,7 @@ void LocalFrame::DidResume() {
+@@ -3287,6 +3288,7 @@ void LocalFrame::DidResume() {
    GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
    Loader().SetDefersLoading(LoaderFreezeMode::kNone);
  
@@ -761,7 +762,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
-@@ -998,7 +998,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -989,7 +989,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
    if (!parent_page_scheduler_)
      return SchedulingLifecycleState::kNotThrottled;
    if (parent_page_scheduler_->IsFrozen()) {
@@ -774,7 +775,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_sch
 diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 --- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 +++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-@@ -238,10 +238,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
+@@ -237,10 +237,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
    // it is desirable to reject the page freeze to prevent the scheduler from
    // being put in a bad state. See https://crbug.com/873214 for context of how
    // this can happen on the browser side.
@@ -787,7 +788,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_sche
    PolicyUpdater policy_updater;
    SetPageFrozenImpl(frozen, policy_updater);
  }
-@@ -801,7 +803,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+@@ -815,7 +817,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
    // expire immediately when a page is backgrounded, which is undesirable in
    // headless mode. To prevent that, a page is never considerer backgrounded
    // when virtual time is enabled.

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

@@ -15,9 +15,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../modules/webaudio/base_audio_context.cc         | 12 ++++++++++++
  .../renderer/modules/webaudio/base_audio_context.h |  2 ++
  .../modules/webaudio/offline_audio_context.cc      |  1 +
- .../renderer/modules/webaudio/realtime_analyser.cc |  7 +++++++
+ .../renderer/modules/webaudio/realtime_analyser.cc |  9 ++++++++-
  .../platform/runtime_enabled_features.json5        |  5 ++---
- 11 files changed, 56 insertions(+), 4 deletions(-)
+ 11 files changed, 57 insertions(+), 5 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/AudioBuffer-AnalyserNode-fp-mitigations.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_h/AudioBuffer-AnalyserNode-fp-mitigations.inc
@@ -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
-@@ -199,6 +199,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
+@@ -200,6 +200,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
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,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"
-@@ -660,7 +661,9 @@ double AudioContext::baseLatency() const {
+@@ -678,7 +679,9 @@ double AudioContext::baseLatency() const {
    DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
    DCHECK(destination());
  
@@ -118,7 +118,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
  #include "third_party/blink/public/mojom/devtools/console_message.mojom-blink.h"
  #include "third_party/blink/public/mojom/frame/lifecycle.mojom-shared.h"
  #include "third_party/blink/public/platform/platform.h"
-@@ -715,6 +716,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -710,6 +711,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -151,7 +151,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
 diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
-@@ -372,6 +372,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -374,6 +374,7 @@ void OfflineAudioContext::FireCompletionEvent() {
      if (!rendered_buffer) {
        return;
      }
@@ -162,25 +162,25 @@ diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.c
 diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
 +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc
-@@ -36,6 +36,7 @@
+@@ -32,6 +32,7 @@
- #include <bit>
  #include <complex>
  
+ #include "base/compiler_specific.h"
 +#include "third_party/blink/renderer/modules/webaudio/base_audio_context.h"
  #include "third_party/blink/renderer/platform/audio/audio_bus.h"
  #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
  #include "third_party/blink/renderer/platform/audio/vector_math.h"
-@@ -160,6 +161,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+@@ -156,6 +157,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
            input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize];
+                        kInputBufferSize]);
  
 +      value = BaseAudioContext::ShuffleAudioData(value, i);
-       destination[i] = value;
+       UNSAFE_TODO(destination[i]) = value;
      }
    }
-@@ -187,6 +189,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+@@ -183,6 +185,8 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
            input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize];
+                        kInputBufferSize]);
  
 +      value = BaseAudioContext::ShuffleAudioData(value, i);
 +
@@ -194,20 +194,22 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 +      scaled_value = BaseAudioContext::ShuffleAudioData(scaled_value, i);
 +
        // Clip to valid range.
-       destination[i] =
+       UNSAFE_TODO(destination[i]) =
            static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
-@@ -325,6 +331,7 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) {
+@@ -324,7 +330,8 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) {
-       float linear_value = source[i];
+     for (unsigned i = 0; i < len; ++i) {
+       float linear_value = UNSAFE_TODO(source[i]);
        double db_mag = audio_utilities::LinearToDecibels(linear_value);
-       destination[i] = static_cast<float>(db_mag);
+-      UNSAFE_TODO(destination[i]) = static_cast<float>(db_mag);
-+      destination[i] = BaseAudioContext::ShuffleAudioData(destination[i], i);
++      auto v = static_cast<float>(db_mag);
++      UNSAFE_TODO(destination[i]) = BaseAudioContext::ShuffleAudioData(v, i);
      }
    }
  }
 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
-@@ -562,9 +562,8 @@
+@@ -575,9 +575,8 @@
      {
        // AudioContext.playoutStats interface.
        // https://chromestatus.com/feature/5172818344148992

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

@@ -7,49 +7,23 @@ This approach is not comprehensive, see also:
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../execution_context/execution_context.cc    | 15 +++++++++
  .../execution_context/execution_context.h     |  1 +
  .../renderer/core/loader/base_fetch_context.h |  1 +
  .../core/loader/frame_fetch_context.cc        | 20 ++++++++++++
  .../core/loader/frame_fetch_context.h         |  1 +
  .../core/loader/worker_fetch_context.cc       | 21 +++++++++++++
  .../core/loader/worker_fetch_context.h        |  1 +
- .../core/workers/installed_scripts_manager.cc |  4 +--
+ .../core/workers/installed_scripts_manager.cc |  2 +-
  .../background_fetch_manager.cc               | 31 +++++++++++++++++++
  .../websockets/websocket_channel_impl.cc      |  5 +++
  .../modules/websockets/websocket_common.cc    | 30 ++++++++++++++++++
  .../modules/websockets/websocket_common.h     |  4 +++
- 12 files changed, 132 insertions(+), 2 deletions(-)
+ 11 files changed, 116 insertions(+), 1 deletion(-)
 
-diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
---- a/third_party/blink/renderer/core/execution_context/execution_context.cc
-+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -713,6 +713,21 @@ void ExecutionContext::WriteIntoTrace(
-   proto->set_world_type(GetWorldType(*this));
- }
- 
-+String ExecutionContext::addressSpaceForBindings() const {
-+  switch (AddressSpace()) {
-+    case network::mojom::IPAddressSpace::kPublic:
-+    case network::mojom::IPAddressSpace::kUnknown:
-+      return "public";
-+
-+    case network::mojom::IPAddressSpace::kPrivate:
-+      return "private";
-+
-+    case network::mojom::IPAddressSpace::kLocal:
-+      return "local";
-+  }
-+  NOTREACHED();
-+}
-+
- bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
-     const {
-   return Agent::IsWebSecurityDisabled() || CrossOriginIsolatedCapability();
 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
-@@ -396,6 +396,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -395,6 +395,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
    void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
  
    HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -71,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -1033,6 +1033,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1057,6 +1057,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -84,7 +58,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
++    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -101,7 +75,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -184,6 +184,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -187,6 +187,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;
@@ -133,7 +107,7 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.cc b/th
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
++    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -161,12 +135,9 @@ diff --git a/third_party/blink/renderer/core/loader/worker_fetch_context.h b/thi
 diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
 --- a/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
 +++ b/third_party/blink/renderer/core/workers/installed_scripts_manager.cc
-@@ -33,9 +33,9 @@ InstalledScriptsManager::ScriptData::ScriptData(
+@@ -35,7 +35,7 @@ InstalledScriptsManager::ScriptData::ScriptData(
-   // place so that this is shareable out of worker code.
-   response_address_space_ = network::mojom::IPAddressSpace::kPublic;
    if (network_utils::IsReservedIPAddress(script_url_.Host()))
--    response_address_space_ = network::mojom::IPAddressSpace::kLocal;
+     response_address_space_ = network::mojom::IPAddressSpace::kLocal;
-+    response_address_space_ = network::mojom::IPAddressSpace::kPrivate;
    if (SecurityOrigin::Create(script_url_)->IsLocalhost())
 -    response_address_space_ = network::mojom::IPAddressSpace::kLoopback;
 +    response_address_space_ = network::mojom::IPAddressSpace::kLocal;
@@ -176,7 +147,7 @@ diff --git a/third_party/blink/renderer/core/workers/installed_scripts_manager.c
 diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
-@@ -103,6 +103,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
+@@ -104,6 +104,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
           request_url.ProtocolIsInHTTPFamily();
  }
  
@@ -193,7 +164,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 +    network::mojom::IPAddressSpace target_space =
 +        network::mojom::IPAddressSpace::kPublic;
 +    if (network_utils::IsReservedIPAddress(request_url.Host()))
-+      target_space = network::mojom::IPAddressSpace::kPrivate;
++      target_space = network::mojom::IPAddressSpace::kLocal;
 +    if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +      target_space = network::mojom::IPAddressSpace::kLocal;
 +
@@ -207,7 +178,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
  scoped_refptr<BlobDataHandle> ExtractBlobHandle(
      Request* request,
      ExceptionState& exception_state) {
-@@ -190,6 +214,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
+@@ -191,6 +215,13 @@ ScriptPromise<BackgroundFetchRegistration> BackgroundFetchManager::fetch(
                                   exception_state);
      }
  
@@ -224,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_channel_impl.cc
-@@ -284,6 +284,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
+@@ -285,6 +285,11 @@ bool WebSocketChannelImpl::Connect(const KURL& url, const String& protocol) {
      return false;
    }
  
@@ -239,7 +210,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
-@@ -135,9 +135,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
+@@ -139,9 +139,39 @@ WebSocketCommon::ConnectResult WebSocketCommon::Connect(
      return ConnectResult::kException;
    }
  
@@ -265,7 +236,7 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b
 +  network::mojom::IPAddressSpace target_space =
 +      network::mojom::IPAddressSpace::kPublic;
 +  if (network_utils::IsReservedIPAddress(request_url.Host()))
-+    target_space = network::mojom::IPAddressSpace::kPrivate;
++    target_space = network::mojom::IPAddressSpace::kLocal;
 +  if (SecurityOrigin::Create(request_url)->IsLocalhost())
 +    target_space = network::mojom::IPAddressSpace::kLocal;
 +

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
-@@ -5023,7 +5023,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -5133,7 +5133,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
-@@ -832,6 +832,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -833,6 +833,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_;
  }
  
-@@ -2897,6 +2902,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2898,6 +2903,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
-@@ -775,7 +775,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -771,7 +771,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

@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc
-@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
+@@ -72,6 +72,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForScheme(
    if (base::IsStringASCII(scheme) &&
        (ProfileIOData::IsHandledProtocol(scheme) ||
         base::EqualsCaseInsensitiveASCII(scheme, content::kViewSourceScheme) ||
@@ -93,7 +93,7 @@ diff --git a/components/omnibox/browser/autocomplete_input.cc b/components/omnib
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -607,6 +607,10 @@ GURL FixupURLInternal(const std::string& text,
+@@ -602,6 +602,10 @@ GURL FixupURLInternal(const std::string& text,
      }
    }
  
@@ -107,18 +107,18 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -950,6 +950,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -970,6 +970,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
    RegisterPseudoScheme(url::kJavaScriptScheme);
    RegisterPseudoScheme(kViewSourceScheme);
    RegisterPseudoScheme(kGoogleChromeScheme);
 +  RegisterWebSafeScheme(url::kTraceScheme);
  }
  
- ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
+ ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() = default;
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1115,6 +1115,8 @@ component("net") {
+@@ -1127,6 +1127,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -227,7 +227,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
 diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
 --- a/net/url_request/url_request_context_builder.cc
 +++ b/net/url_request/url_request_context_builder.cc
-@@ -53,6 +53,7 @@
+@@ -55,6 +55,7 @@
  #include "net/socket/network_binding_client_socket_factory.h"
  #include "net/ssl/ssl_config_service_defaults.h"
  #include "net/url_request/static_http_user_agent_settings.h"
@@ -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"
-@@ -610,6 +611,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -619,6 +620,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }
@@ -258,7 +258,7 @@ diff --git a/url/url_constants.h b/url/url_constants.h
 diff --git a/url/url_util.cc b/url/url_util.cc
 --- a/url/url_util.cc
 +++ b/url/url_util.cc
-@@ -53,6 +53,7 @@ struct SchemeRegistry {
+@@ -54,6 +54,7 @@ struct SchemeRegistry {
    std::vector<SchemeWithType> standard_schemes = {
        {kHttpsScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
        {kHttpScheme, SCHEME_WITH_HOST_PORT_AND_USER_INFORMATION},
@@ -266,7 +266,7 @@ diff --git a/url/url_util.cc b/url/url_util.cc
        // Yes, file URLs can have a hostname, so file URLs should be handled as
        // "standard". File URLs never have a port as specified by the SchemeType
        // field.  Unlike other SCHEME_WITH_HOST schemes, the 'host' in a file
-@@ -98,6 +99,7 @@ struct SchemeRegistry {
+@@ -99,6 +100,7 @@ struct SchemeRegistry {
        kAboutScheme,
        kJavaScriptScheme,
        kDataScheme,

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

@@ -57,10 +57,10 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
          }
 +        if (menuItem.getItemId() == R.id.select_all_menu_id) {
 +            if (mBookmarkModel.isBookmarkModelLoaded()) {
-+                List<BookmarkItem> items = mBookmarkModel.getBookmarksForFolder(mCurrentFolder.getId());
++                List<BookmarkId> childs = mBookmarkModel.getChildIds(mCurrentFolder.getId());
-+                HashSet<BookmarkId> ids = new HashSet<>(items.size());
++                HashSet<BookmarkId> ids = new HashSet<>(childs.size());
-+                for (BookmarkItem item : items) {
++                for (BookmarkId item : childs) {
-+                    ids.add(item.getId());
++                    ids.add(item);
 +                }
 +                mSelectionDelegate.setSelectedItems(ids);
 +            }

build/patches/Bromite-auto-updater.patch

@@ -36,12 +36,13 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../safety_hub/SafetyHubFetchService.java     |   5 -
  .../strings/android_chrome_strings.grd        |  23 +-
  .../ui/lens/lens_overlay_query_controller.cc  |   1 +
- .../endpoint_fetcher/endpoint_fetcher.cc      | 132 ++++++--
+ .../endpoint_fetcher/endpoint_fetcher.cc      | 123 ++++++--
- .../endpoint_fetcher/endpoint_fetcher.h       |  24 ++
+ .../endpoint_fetcher/endpoint_fetcher.h       |  25 ++
  components/manta/base_provider.cc             |   1 +
+ .../composebox/composebox_query_controller.cc |   2 +-
  .../Bromite-auto-updater.inc                  |   3 +
  .../Bromite-auto-updater.inc                  |   1 +
- 33 files changed, 1239 insertions(+), 95 deletions(-)
+ 34 files changed, 1235 insertions(+), 93 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
@@ -70,7 +71,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
-@@ -1936,6 +1936,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1945,6 +1945,9 @@ if (!is_robolectric && enable_java_templates) {
        sources = [ "//build/android/java/templates/BuildConfig.template" ]
        defines = []
  
@@ -83,7 +84,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
-@@ -820,6 +820,8 @@ chrome_java_sources = [
+@@ -833,6 +833,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",
@@ -215,7 +216,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase.java
-@@ -140,7 +140,8 @@ public class OmahaBase {
+@@ -149,7 +149,8 @@ public class OmahaBase {
      }
  
      static boolean isDisabled() {
@@ -225,7 +226,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
      }
  
      /**
-@@ -580,6 +581,10 @@ public class OmahaBase {
+@@ -592,6 +593,10 @@ public class OmahaBase {
      /** Sends the request to the server and returns the response. */
      static String sendRequestToServer(HttpURLConnection urlConnection, String request)
              throws RequestFailureException {
@@ -239,15 +240,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/OmahaBase
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java
-@@ -12,6 +12,7 @@ import android.view.Choreographer;
+@@ -9,6 +9,7 @@ import android.content.ActivityNotFoundException;
- 
+ import android.content.res.Resources;
- import androidx.annotation.NonNull;
+ import android.text.TextUtils;
- import androidx.annotation.Nullable;
+ import android.view.Choreographer;
 +import androidx.annotation.StringRes;
  
  import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
-@@ -24,6 +25,7 @@ import org.chromium.base.task.TaskTraits;
+@@ -23,6 +24,7 @@ import org.chromium.build.annotations.Nullable;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateState;
  import org.chromium.chrome.browser.omaha.UpdateStatusProvider.UpdateStatus;
@@ -677,7 +678,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
-@@ -2620,6 +2620,12 @@ static_library("browser") {
+@@ -2685,6 +2685,12 @@ static_library("browser") {
    }
  
    if (is_android) {
@@ -1090,7 +1091,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
-@@ -336,6 +336,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -363,6 +363,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kProtectedTabsAndroid,
      &kPwaRestoreUi,
      &kPwaRestoreUiAtStartup,
@@ -1101,9 +1102,9 @@ 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
-@@ -417,6 +417,7 @@ public abstract class ChromeFeatureList {
+@@ -453,6 +453,7 @@ public abstract class ChromeFeatureList {
-             "HomepageIsNewTabPagePolicyAndroid";
+     public static final String HUB_BACK_BUTTON = "HubBackButton";
-     public static final String HTTPS_FIRST_BALANCED_MODE = "HttpsFirstBalancedMode";
+     public static final String HUB_SLIDE_ANIMATION = "HubSlideAnimation";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
 +    public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
      public static final String INSTANCE_SWITCHER_V2 = "InstanceSwitcherV2";
@@ -1657,7 +1658,7 @@ 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
-@@ -84,9 +84,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -85,9 +85,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
          mLocalPasswordsFetchService =
                  new SafetyHubPasswordsFetchService(passwordManagerHelper, prefService, null);
  
@@ -1667,7 +1668,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
          recordMetricForUnusedSitePermissionsSettingState();
      }
  
-@@ -115,8 +112,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -116,8 +113,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
          if (mSigninManager != null) {
              mSigninManager.removeSignInStateObserver(this);
          }
@@ -1679,7 +1680,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
-@@ -2420,6 +2420,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2324,6 +2324,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>
@@ -1692,7 +1693,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]">
-@@ -4383,7 +4389,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4288,7 +4294,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]">
@@ -1704,7 +1705,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
-@@ -4394,6 +4403,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4299,6 +4308,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>
@@ -1726,7 +1727,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 --- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 +++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
-@@ -923,6 +923,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
+@@ -802,6 +802,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
        /*post_data=*/std::move(request_string),
        /*headers=*/request_headers,
        /*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(),
@@ -1767,7 +1768,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
    }
    return HttpMethod::kUndefined;
  }
-@@ -117,9 +126,11 @@ EndpointFetcher::EndpointFetcher(
+@@ -110,6 +119,7 @@ EndpointFetcher::EndpointFetcher(
+     RequestParams request_params)
+     : url_loader_factory_(url_loader_factory),
+       identity_manager_(identity_manager),
++      intercept_redirect_(false),
+       request_params_(std::move(request_params)) {
+   if (request_params_.auth_type() == OAUTH) {
+     DCHECK(identity_manager_)
+@@ -150,9 +160,11 @@ EndpointFetcher::EndpointFetcher(
      const std::vector<std::string>& headers,
      const std::vector<std::string>& cors_exempt_headers,
      version_info::Channel channel,
@@ -1776,35 +1785,35 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
      : url_loader_factory_(url_loader_factory),
        identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       consent_level_(std::nullopt),
+       request_params_(EndpointFetcher::RequestParams::Builder(request_params)
-       sanitize_response_(true),
+                           .SetAuthType(CHROME_API_KEY)
-       channel_(channel),
+                           .SetUrl(url)
-@@ -139,6 +150,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -171,6 +183,7 @@ EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
      : url_loader_factory_(url_loader_factory),
        identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       consent_level_(std::nullopt),
-       sanitize_response_(false),
        request_params_(EndpointFetcher::RequestParams::Builder(HttpMethod::kGet,
-@@ -163,6 +175,7 @@ EndpointFetcher::EndpointFetcher(
+                                                               annotation_tag)
-     : oauth_consumer_name_(oauth_consumer_name),
+                           .SetAuthType(NO_AUTH)
-       url_loader_factory_(url_loader_factory),
+@@ -193,6 +206,7 @@ EndpointFetcher::EndpointFetcher(
+     signin::ConsentLevel consent_level)
+     : url_loader_factory_(url_loader_factory),
        identity_manager_(identity_manager),
 +      intercept_redirect_(false),
-       consent_level_(consent_level),
-       sanitize_response_(true),
        request_params_(
-@@ -182,6 +195,7 @@ EndpointFetcher::EndpointFetcher(
+           EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method),
+                                                   annotation_tag)
+@@ -212,6 +226,7 @@ EndpointFetcher::EndpointFetcher(
  EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
      : identity_manager_(nullptr),
 +      intercept_redirect_(false),
-       consent_level_(std::nullopt),
-       sanitize_response_(true),
        request_params_(
-@@ -190,6 +204,27 @@ EndpointFetcher::EndpointFetcher(
+           EndpointFetcher::RequestParams::Builder(HttpMethod::kUndefined,
-               .SetTimeout(kDefaultTimeOut)
+                                                   annotation_tag)
+@@ -219,6 +234,25 @@ EndpointFetcher::EndpointFetcher(
+               .SetSanitizeResponse(true)
                .Build()) {}
  
 +// constructor used by Bromite
@@ -1818,8 +1827,6 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +    : url_loader_factory_(url_loader_factory),
 +      identity_manager_(nullptr),
 +      intercept_redirect_(intercept_redirect),
-+      consent_level_(std::nullopt),
-+      sanitize_response_(false),
 +      request_params_(
 +          EndpointFetcher::RequestParams::Builder(GetHttpMethod(http_method),
 +                                                  annotation_tag)
@@ -1831,34 +1838,32 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  EndpointFetcher::~EndpointFetcher() = default;
  
  void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -247,12 +282,9 @@ void EndpointFetcher::PerformRequest(
+@@ -301,13 +335,10 @@ void EndpointFetcher::PerformHttpRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->method = GetHttpMethodString(request_params_.http_method());
    resource_request->url = request_params_.url();
 -  resource_request->credentials_mode = GetCredentialsMode();
+-
 -  if (GetSetSiteForCookies()) {
 -    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 (request_params_.http_method() == HttpMethod::kPost) {
+   // Add Content-Type header if post data is present.
-     resource_request->headers.SetHeader(kContentTypeKey,
+   if (request_params_.http_method() == HttpMethod::kPost &&
-                                         request_params_.content_type());
+       request_params_.post_data()) {
-@@ -280,10 +312,26 @@ void EndpointFetcher::PerformRequest(
+@@ -346,8 +377,23 @@ void EndpointFetcher::PerformHttpRequest(
-     default:
        break;
    }
-+
+ 
 +  if (intercept_redirect_ == true) {
 +    // will need manual mode to capture the landing page URL
 +    resource_request->redirect_mode = network::mojom::RedirectMode::kManual; // default is kFollow
 +  }
 +
-   // TODO(crbug.com/40641804) Make simple_url_loader_ local variable passed to
-   // callback
    simple_url_loader_ = network::SimpleURLLoader::Create(
        std::move(resource_request), request_params_.annotation_tag());
 +  simple_url_loader_->SetAllowHttpErrorResults(true);
@@ -1872,15 +1877,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +      &EndpointFetcher::OnSimpleLoaderRedirect, base::Unretained(this)));
 +  }
  
-   if (request_params_.http_method() == HttpMethod::kPost) {
+   if (request_params_.http_method() == HttpMethod::kPost &&
-     simple_url_loader_->AttachStringForUpload(
+       request_params_.post_data()) {
-@@ -295,15 +343,25 @@ void EndpointFetcher::PerformRequest(
+@@ -361,9 +407,18 @@ void EndpointFetcher::PerformHttpRequest(
-   }
+ 
    simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                        network::SimpleURLLoader::RETRY_ON_5XX);
 -  simple_url_loader_->SetTimeoutDuration(request_params_.timeout());
 -  simple_url_loader_->SetAllowHttpErrorResults(true);
--  network::SimpleURLLoader::BodyAsStringCallbackDeprecated
+-
 +  LOG(INFO) << "performing "
 +            << GetHttpMethodString(request_params_.http_method())
 +            << " request to " << url_;
@@ -1891,22 +1896,12 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
 +        url_loader_factory_.get(),
 +        base::BindOnce(&EndpointFetcher::OnURLLoadComplete,
 +                     base::Unretained(this)));
-+  } else {
++    return;
-+      network::SimpleURLLoader::BodyAsStringCallbackDeprecated
++  }
+   network::SimpleURLLoader::BodyAsStringCallbackDeprecated
        body_as_string_callback = base::BindOnce(
            &EndpointFetcher::OnResponseFetched, weak_ptr_factory_.GetWeakPtr(),
-           std::move(endpoint_fetcher_callback));
+@@ -453,21 +508,6 @@ void EndpointFetcher::OnSanitizationResult(
--  simple_url_loader_->DownloadToString(
--      url_loader_factory_.get(), std::move(body_as_string_callback),
--      network::SimpleURLLoader::kMaxBoundedStringDownloadSize);
-+      simple_url_loader_->DownloadToString(
-+         url_loader_factory_.get(), std::move(body_as_string_callback),
-+         network::SimpleURLLoader::kMaxBoundedStringDownloadSize);
-+  }
- }
- 
- void EndpointFetcher::OnResponseFetched(
-@@ -381,21 +439,6 @@ void EndpointFetcher::OnSanitizationResult(
    std::move(endpoint_fetcher_callback).Run(std::move(response));
  }
  
@@ -1928,7 +1923,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  int EndpointFetcher::GetMaxRetries() const {
    if (!request_params_.max_retries.has_value()) {
      return kNumRetries;
-@@ -421,4 +464,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
+@@ -493,4 +533,39 @@ std::string EndpointFetcher::GetUrlForTesting() {
    return request_params_.url().spec();
  }
  
@@ -1979,7 +1974,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 +#include "services/network/public/mojom/url_response_head.mojom.h"
  
  namespace network {
- struct ResourceRequest;
+ class SimpleURLLoader;
 @@ -59,6 +61,7 @@ enum class HttpMethod {
    kGet = 0,
    kPost = 1,
@@ -1988,7 +1983,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  };
  
  enum AuthType {
-@@ -74,6 +77,8 @@ enum AuthType {
+@@ -72,6 +75,8 @@ enum AuthType {
  
  struct EndpointResponse {
    std::string response;
@@ -1997,15 +1992,15 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    int http_status_code{-1};
    std::optional<FetchErrorType> error_type;
  };
-@@ -294,6 +299,7 @@ class EndpointFetcher {
+@@ -359,6 +364,7 @@ class EndpointFetcher {
        const std::vector<std::string>& headers,
        const std::vector<std::string>& cors_exempt_headers,
        version_info::Channel channel,
 +      const net::NetworkTrafficAnnotationTag& annotation_tag,
        const RequestParams request_params);
  
-   // Constructor if no authentication is needed.
+   // Less preferred convenience constructor for requests requiring no
-@@ -302,6 +308,14 @@ class EndpointFetcher {
+@@ -375,6 +381,14 @@ class EndpointFetcher {
        const GURL& url,
        const net::NetworkTrafficAnnotationTag& annotation_tag);
  
@@ -2017,10 +2012,10 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
 +                  const bool intercept_redirect,
 +                  const net::NetworkTrafficAnnotationTag& annotation_tag);
 +
-   // Used for tests. Can be used if caller constructs their own
+   // Used internally. Can be used if caller constructs their own
    // url_loader_factory and identity_manager.
    EndpointFetcher(
-@@ -344,6 +358,11 @@ class EndpointFetcher {
+@@ -424,11 +438,17 @@ class EndpointFetcher {
    void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
                              EndpointFetcherCallback endpoint_fetcher_callback,
                              data_decoder::JsonSanitizer::Result result);
@@ -2032,22 +2027,22 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
    network::mojom::CredentialsMode GetCredentialsMode() const;
    int GetMaxRetries() const;
-@@ -354,12 +373,14 @@ class EndpointFetcher {
+   bool GetSetSiteForCookies() const;
-   // network::SimpleURLLoader.
+   UploadProgressCallback GetUploadProgressCallback() const;
-   const std::string oauth_consumer_name_;
-   signin::ScopeSet oauth_scopes_;
 +  GURL url_;
  
    // 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
+@@ -436,6 +456,8 @@ class EndpointFetcher {
    // this case, callers should invoke `PerformRequest` directly).
    const raw_ptr<signin::IdentityManager> identity_manager_;
+ 
 +  const bool intercept_redirect_;
-   // `consent_level_` is used together with `identity_manager_`, so it can be
++
-   // null if `identity_manager_` is null.
+   // The complete definition of the specific network request to be performed.
-   const std::optional<signin::ConsentLevel> consent_level_;
+   // Contains authentication details and response handling preferences.
-@@ -372,6 +393,9 @@ class EndpointFetcher {
+   const RequestParams request_params_;
+@@ -445,6 +467,9 @@ class EndpointFetcher {
        access_token_fetcher_;
    std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
  
@@ -2068,6 +2063,18 @@ diff --git a/components/manta/base_provider.cc b/components/manta/base_provider.
        EndpointFetcher::RequestParams::Builder(kHttpMethod, annotation_tag)
            .Build());
  }
+diff --git a/components/omnibox/composebox/composebox_query_controller.cc b/components/omnibox/composebox/composebox_query_controller.cc
+--- a/components/omnibox/composebox/composebox_query_controller.cc
++++ b/components/omnibox/composebox/composebox_query_controller.cc
+@@ -314,7 +314,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
+       /*post_data=*/std::move(request_string),
+       /*headers=*/request_headers,
+       /*cors_exempt_headers=*/cors_exempt_headers,
+-      /*channel=*/channel_,
++      /*channel=*/channel_, kTrafficAnnotationTag,
+       /*request_params=*/
+       EndpointFetcher::RequestParams::Builder(http_method,
+                                               kTrafficAnnotationTag)
 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

@@ -21,8 +21,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../java/res/xml/adblock_preferences.xml      |  25 ++
  .../android/java/res/xml/main_preferences.xml |   5 +
  .../browser/settings/AdBlockEditor.java       |  91 ++++++
- .../browser/settings/AdBlockPreferences.java  |  58 ++++
+ .../browser/settings/AdBlockPreferences.java  |  74 +++++
- .../chrome/browser/tabmodel/TabModelImpl.java |   4 +-
+ .../browser/settings/SettingsActivity.java    |   3 +
  chrome/app/generated_resources.grd            |  10 +
  chrome/browser/after_startup_task_utils.cc    |   4 +
  chrome/browser/browser_process.h              |   6 +
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/subresource_filter_features.cc    | 118 +-------
  .../core/browser/verified_ruleset_dealer.cc   |   4 +
  .../core/common/indexed_ruleset.cc            |   5 +-
- 39 files changed, 1269 insertions(+), 132 deletions(-)
+ 39 files changed, 1287 insertions(+), 129 deletions(-)
  create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
  create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -66,7 +66,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -328,6 +328,7 @@ if (_is_default_toolchain) {
+@@ -325,6 +325,7 @@ if (_is_default_toolchain) {
        "//chrome/android/features/tab_ui/public:ui_java_resources",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
@@ -77,7 +77,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -440,6 +440,7 @@ chrome_java_resources = [
+@@ -419,6 +419,7 @@ chrome_java_resources = [
    "java/res/layout/account_divider_preference.xml",
    "java/res/layout/account_management_account_row.xml",
    "java/res/layout/app_history_filter.xml",
@@ -85,7 +85,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
    "java/res/layout/auto_sign_in_first_run_dialog.xml",
    "java/res/layout/autofill_billing_address_dropdown.xml",
    "java/res/layout/autofill_card_name_and_number.xml",
-@@ -634,6 +635,7 @@ chrome_java_resources = [
+@@ -608,6 +609,7 @@ chrome_java_resources = [
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
    "java/res/xml/appearance_preferences.xml",
@@ -96,7 +96,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -893,6 +893,8 @@ chrome_java_sources = [
+@@ -903,6 +903,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
-@@ -263,6 +263,24 @@ found in the LICENSE file.
+@@ -273,6 +273,24 @@ found in the LICENSE file.
          <item name="android:textSize">20sp</item>
      </style>
  
@@ -364,7 +364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBloc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,74 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -374,30 +374,46 @@ new file mode 100644
 +import android.os.Bundle;
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceFragmentCompat;
-+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
++
++import org.chromium.base.supplier.ObservableSupplier;
++import org.chromium.base.supplier.ObservableSupplierImpl;
++import org.chromium.base.supplier.Supplier;
 +
 +import org.chromium.content_public.browser.BrowserContextHandle;
++import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 +import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
 +import org.chromium.components.browser_ui.site_settings.WebsitePreferenceBridge;
 +import org.chromium.components.content_settings.ContentSettingsType;
 +import org.chromium.components.browser_ui.settings.SettingsUtils;
-+import org.chromium.chrome.browser.flags.AdBlockNativeGateway;
++import org.chromium.components.browser_ui.settings.SettingsFragment;
-+import androidx.annotation.VisibleForTesting;
++
 +import org.chromium.chrome.R;
++import org.chromium.chrome.browser.flags.AdBlockNativeGateway;
++import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
 +
 +/**
 + * Fragment that allows the user to configure AdBlock related preferences.
 + */
-+public class AdBlockPreferences extends BaseSiteSettingsFragment {
++public class AdBlockPreferences extends ChromeBaseSettingsFragment {
-+    @VisibleForTesting
 +    public static final String PREF_ADBLOCK_SWITCH = "adblock_switch";
 +    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
 +
 +    private Preference mAdBlockEdit;
++    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
++
++    @Override
++    public ObservableSupplier<String> getPageTitle() {
++        return mPageTitle;
++    }
++
++    @Override
++    public @SettingsFragment.AnimationType int getAnimationType() {
++        return SettingsFragment.AnimationType.PROPERTY;
++    }
 +
 +    @Override
 +    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-+        getActivity().setTitle(R.string.options_adblock_title);
++        mPageTitle.set(getString(R.string.options_adblock_title));
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.adblock_preferences);
 +
 +        ChromeSwitchPreference mAdBlockSwitch =
@@ -423,24 +439,30 @@ new file mode 100644
 +        updateCurrentAdBlockUrl();
 +    }
 +}
-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
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
---- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -942,9 +942,7 @@ public class TabModelImpl extends TabModelJniBridge {
+@@ -72,6 +72,8 @@ import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
-                         .createTabWithWebContents(
+ import java.lang.ref.WeakReference;
-                                 parent,
+ import java.util.Locale;
-                                 webContents,
--                                select
--                                        ? TabLaunchType.FROM_RECENT_TABS_FOREGROUND
--                                        : TabLaunchType.FROM_RECENT_TABS)
-+                                TabLaunchType.FROM_LINK)
-                 != null;
-     }
  
++import org.chromium.chrome.browser.settings.AdBlockEditor;
++
+ /**
+  * The Chrome settings activity.
+  *
+@@ -683,6 +685,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+             if (!MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
+                 return;
+             }
++            if (fragment instanceof AdBlockEditor) return;
+ 
+             String className = fragment.getClass().getSimpleName();
+             RecordHistogram.recordSparseHistogram(
 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
-@@ -16713,6 +16713,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -16888,6 +16888,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -511,7 +533,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1271,6 +1271,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1273,6 +1273,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -549,7 +571,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -212,6 +212,7 @@ class BrowserProcessImpl : public BrowserProcess,
  #endif
  
    component_updater::ComponentUpdateService* component_updater() override;
@@ -557,7 +579,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;
-@@ -431,6 +432,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -429,6 +430,7 @@ class BrowserProcessImpl : public BrowserProcess,
    // to concerns over integrity of data shared between profiles,
    // but some users of component updater only install per-user.
    std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -568,7 +590,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -387,6 +387,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -384,6 +384,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -679,9 +701,9 @@ 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
-@@ -653,6 +653,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -721,6 +721,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
-   StubResolverConfigReader::RegisterPrefs(registry);
    DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
+   NetworkProcessLaunchWatcher::RegisterPrefs(registry);
  
 +  registry->RegisterBooleanPref(prefs::kAdBlockEnabled, false);
 +  registry->RegisterStringPref(prefs::kAdBlockFiltersURL,
@@ -734,7 +756,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2895,6 +2895,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2907,6 +2907,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -749,7 +771,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -379,6 +379,9 @@
+@@ -391,6 +391,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>

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

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
 --- a/chrome/browser/ui/views/toolbar/reload_button.cc
 +++ b/chrome/browser/ui/views/toolbar/reload_button.cc
-@@ -226,6 +226,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
+@@ -225,6 +225,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
        command = IDC_RELOAD;
      }
  
@@ -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
-@@ -1406,6 +1406,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1456,6 +1456,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
-   void UpdateAccessibleNameForRootView();
+ 
-   void UpdateAccessibleURLForRootView(const GURL& url);
+   WidgetAXManager* ax_manager() { return ax_manager_.get(); }
  
 +  // 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.
-@@ -1444,13 +1457,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1494,13 +1507,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;
-@@ -1461,11 +1467,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1511,11 +1517,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
    friend class ui_devtools::BubbleLocking;
    friend void DisableActivationChangeHandlingForTests();
  

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

@@ -273,7 +273,7 @@ new file mode 100644
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -134,7 +134,7 @@ void ContentSettingsRegistry::Init() {
+@@ -140,7 +140,7 @@ void ContentSettingsRegistry::Init() {
             WebsiteSettingsInfo::SYNCABLE,
             /*allowlisted_primary_schemes=*/
             {kChromeUIScheme, kChromeDevToolsScheme, kExtensionScheme},

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

@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../extension_safety_check_utils.cc           |  3 +-
  .../browser/extensions/extension_service.cc   |  4 +-
  .../chrome_extension_downloader_factory.cc    |  1 -
- .../extensions/updater/extension_updater.cc   | 40 ++++++++-----
+ .../extensions/updater/extension_updater.cc   | 40 +++++++-----
  .../extensions/updater/extension_updater.h    |  4 ++
  .../extensions/webstore_install_helper.cc     |  2 +-
  .../browser/extensions/webstore_installer.cc  |  2 +-
@@ -34,22 +34,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/resources/extensions/service.ts   |  5 ++
  .../browser/resources/extensions/toolbar.css  |  5 ++
  .../resources/extensions/toolbar.html.ts      |  7 +++
- .../browser/resources/extensions/toolbar.ts   | 17 ++++++
+ .../browser/resources/extensions/toolbar.ts   | 17 +++++
  .../resources/webstore_app/manifest.json      |  7 +--
  .../ui/webui/extensions/extensions_ui.cc      |  7 +++
  .../chrome_update_query_params_delegate.cc    | 13 ++--
  .../extensions/api/developer_private.idl      |  2 +
- .../update_client/update_query_params.cc      |  7 +--
+ .../update_client/update_query_params.cc      |  5 +-
  .../about_flags_cc/Webstore-protection.inc    | 19 ++++++
- .../browser/api/management/management_api.cc  | 60 ++++++++++++-------
+ .../browser/api/management/management_api.cc  | 62 +++++++++++++------
- .../browser/updater/extension_downloader.cc   | 53 +++++++---------
+ .../browser/updater/extension_downloader.cc   | 53 ++++++----------
  .../browser/updater/extension_downloader.h    |  1 -
  .../browser/updater/manifest_fetch_data.cc    |  8 +--
  .../browser/updater/safe_manifest_parser.cc   |  1 +
  extensions/common/extension_features.cc       | 14 +++++
  extensions/common/extension_features.h        |  2 +
  .../definitions/developer_private.d.ts        |  2 +
- 36 files changed, 252 insertions(+), 108 deletions(-)
+ 36 files changed, 253 insertions(+), 107 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Webstore-protection.inc
 
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
@@ -71,7 +71,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
-@@ -24,6 +24,12 @@
+@@ -25,6 +25,12 @@
  #include "extensions/browser/app_window/app_window_registry.h"
  #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
  namespace extensions {
  
  namespace developer = api::developer_private;
-@@ -65,6 +71,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
+@@ -66,6 +72,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
    return g_developer_private_api_factory.Pointer();
  }
  
@@ -116,7 +116,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h
 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h
-@@ -33,6 +33,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
+@@ -34,6 +34,9 @@ class DeveloperPrivateAPI : public BrowserContextKeyedAPI,
    static BrowserContextKeyedAPIFactory<DeveloperPrivateAPI>*
    GetFactoryInstance();
  
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_functions_shared.cc
-@@ -301,6 +301,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -354,6 +354,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
      ExtensionUpdater::CheckParams params;
      params.fetch_priority = DownloadFetchPriority::kForeground;
      params.install_immediately = true;
@@ -137,7 +137,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
      params.callback =
          base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
      updater->CheckNow(std::move(params));
-@@ -439,7 +440,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -490,7 +491,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
  
    const developer::ProfileConfigurationUpdate& update = params->update;
  
@@ -146,9 +146,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
      Profile* profile = Profile::FromBrowserContext(browser_context());
      CHECK(profile);
      if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -456,6 +457,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -504,6 +505,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+         ->MarkNoticeAsAcknowledgedGlobally();
    }
- #endif  // !BUILDFLAG(IS_ANDROID)
  
 +  if (update.is_extension_autoupdate_enabled.has_value()) {
 +    DeveloperPrivateAPI::SetExtensionAutoupdateEnabled(
@@ -161,7 +161,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
 diff --git a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
 --- a/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
 +++ b/chrome/browser/extensions/api/developer_private/profile_info_generator.cc
-@@ -9,6 +9,7 @@
+@@ -10,6 +10,7 @@
  #include "chrome/browser/prefs/incognito_mode_prefs.h"
  #include "chrome/browser/profiles/profile.h"
  #include "chrome/browser/supervised_user/supervised_user_browser_utils.h"
@@ -169,9 +169,9 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
  #include "chrome/common/pref_names.h"
  #include "components/policy/core/common/policy_pref_names.h"
  #include "components/prefs/pref_service.h"
-@@ -44,6 +45,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
+@@ -39,6 +40,8 @@ developer::ProfileInfo CreateProfileInfo(Profile* profile) {
+       ManifestV2ExperimentManager::Get(profile)
            ->DidUserAcknowledgeNoticeGlobally();
- #endif  // BUILDFLAG(ENABLE_EXTENSIONS)
  
 +  info.is_extension_autoupdate_enabled =
 +    DeveloperPrivateAPI::IsExtensionAutoupdateEnabled();
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -60,6 +60,7 @@
+@@ -63,6 +63,7 @@
  #include "extensions/browser/extension_util.h"
  #include "extensions/browser/extensions_browser_client.h"
  #include "extensions/common/extension.h"
@@ -189,7 +189,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -223,6 +224,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -224,6 +225,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
  // there was previously stored data, or an empty string otherwise. The Set will
  // overwrite any previous login.
  std::string GetWebstoreLogin(Profile* profile) {
@@ -198,7 +198,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
      return profile->GetPrefs()->GetString(kWebstoreLogin);
    }
-@@ -230,11 +233,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -231,11 +234,15 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -214,7 +214,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    switch (status) {
      case kCanRequest:
        return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1157,7 +1164,8 @@ ExtensionFunction::ResponseAction
+@@ -1158,7 +1165,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -224,7 +224,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1253,11 +1261,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1254,11 +1262,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -267,7 +267,7 @@ diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/brow
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -391,6 +391,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+@@ -424,6 +424,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
  
  bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
      const Extension* extension) {
@@ -291,7 +291,7 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/
 diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
 --- a/chrome/browser/extensions/extension_service.cc
 +++ b/chrome/browser/extensions/extension_service.cc
-@@ -244,8 +244,6 @@ ExtensionService::ExtensionService(
+@@ -241,8 +241,6 @@ ExtensionService::ExtensionService(
    UpgradeDetector::GetInstance()->AddObserver(this);
  #endif
  
@@ -300,7 +300,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
    ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
  
    if (autoupdate_enabled) {
-@@ -756,7 +754,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+@@ -757,7 +755,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.
@@ -556,7 +556,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -311,6 +311,11 @@ export class Service implements ServiceInterface {
+@@ -320,6 +320,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -698,7 +698,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
        {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
        {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
        {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -472,6 +475,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -464,6 +467,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
        "hostPermissionsLearnMoreLink",
        extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
    source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -754,19 +754,17 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/
 diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc
 --- a/components/update_client/update_query_params.cc
 +++ b/components/update_client/update_query_params.cc
-@@ -85,9 +85,8 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
+@@ -87,8 +87,7 @@ UpdateQueryParamsDelegate* g_delegate = nullptr;
  // static
  std::string UpdateQueryParams::Get(ProdId prod) {
    return base::StringPrintf(
--      "os=%s&arch=%s&os_arch=%s&nacl_arch=%s&prod=%s%s&acceptformat=crx3,puff",
+-      "os=%s&arch=%s&os_arch=%s&prod=%s%s&acceptformat=crx3,puff", kOs, kArch,
--      kOs, kArch, base::SysInfo().OperatingSystemArchitecture().c_str(),
+-      base::SysInfo().OperatingSystemArchitecture().c_str(),
--      GetNaclArch(), GetProdIdString(prod),
 +      "prod=%s%s&acceptformat=crx3",
-+      GetProdIdString(prod),
+       GetProdIdString(prod),
        g_delegate ? g_delegate->GetExtraParams().c_str() : "");
  }
- 
+@@ -120,7 +119,7 @@ const char* UpdateQueryParams::GetArch() {
-@@ -148,7 +147,7 @@ const char* UpdateQueryParams::GetNaclArch() {
  
  // static
  std::string UpdateQueryParams::GetProdVersion() {
@@ -820,7 +818,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  #include "extensions/common/extension_id.h"
  #include "extensions/common/extension_urls.h"
  #include "extensions/common/icons/extension_icon_set.h"
-@@ -92,6 +96,27 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
+@@ -92,6 +96,29 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) {
    return warnings_list;
  }
  
@@ -829,11 +827,13 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
 +                                  const std::string& id,
 +                                  int include_mask) {
 +  bool enabled = base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore);
-+  if (content::RenderFrameHost* rfh = web_contents->GetPrimaryMainFrame()) {
++  if (web_contents) {
-+    url::Origin top_frame_origin = rfh->GetMainFrame()->GetLastCommittedOrigin();
++    if (content::RenderFrameHost* rfh = web_contents->GetPrimaryMainFrame()) {
-+    std::string scheme = top_frame_origin.scheme();
++      url::Origin top_frame_origin = rfh->GetMainFrame()->GetLastCommittedOrigin();
-+    if (scheme == content::kChromeUIScheme) {
++      std::string scheme = top_frame_origin.scheme();
-+      enabled = true;
++      if (scheme == content::kChromeUIScheme) {
++        enabled = true;
++      }
 +    }
 +  }
 +  if (!enabled)
@@ -848,7 +848,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  std::vector<management::LaunchType> GetAvailableLaunchTypes(
      const Extension& extension) {
    std::vector<management::LaunchType> launch_type_list;
-@@ -269,6 +294,8 @@ void AddExtensionInfo(const Extension* source_extension,
+@@ -269,6 +296,8 @@ void AddExtensionInfo(const Extension* source_extension,
                        const ExtensionSet& extensions,
                        ExtensionInfoList* extension_list,
                        content::BrowserContext* context) {
@@ -857,7 +857,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    for (ExtensionSet::const_iterator iter = extensions.begin();
         iter != extensions.end(); ++iter) {
      const Extension& extension = **iter;
-@@ -311,10 +338,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
+@@ -311,10 +340,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
    std::optional<management::Get::Params> params =
        management::Get::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
@@ -869,7 +869,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!target_extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -335,8 +361,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
+@@ -335,8 +363,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
    EXTENSION_FUNCTION_VALIDATE(params);
  
    const Extension* extension =
@@ -879,7 +879,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -404,8 +429,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
+@@ -404,8 +431,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
    }
  
    const Extension* extension =
@@ -889,7 +889,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -547,8 +571,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
+@@ -547,8 +573,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
    // Extension could have been uninstalled externally while previous check was
    // happening.
    const Extension* extension =
@@ -900,7 +900,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -591,8 +615,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
+@@ -591,8 +617,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
    // Extension can be uninstalled externally while the previous check was
    // happening async.
    const Extension* extension =
@@ -911,7 +911,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -736,8 +760,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
+@@ -736,8 +762,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
  }
  
  const Extension* ManagementSetEnabledFunction::GetExtension() {
@@ -922,7 +922,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  }
  
  ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
-@@ -762,8 +786,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -762,8 +788,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                                ->GetDelegate();
    target_extension_id_ = target_extension_id;
    const Extension* target_extension =
@@ -932,7 +932,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    if (!target_extension || !ShouldExposeViaManagementAPI(*target_extension)) {
      return RespondNow(Error(keys::kNoExtensionError, target_extension_id_));
-@@ -828,8 +851,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -828,8 +853,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
    // The extension can be uninstalled in another window while the UI was
    // showing. Do nothing in that case.
    const Extension* target_extension =
@@ -942,7 +942,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    std::string error;
    bool success = false;
-@@ -909,8 +931,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -909,8 +933,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
        management::CreateAppShortcut::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -952,7 +952,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(
          ErrorUtils::FormatErrorMessage(keys::kNoExtensionError, params->id)));
-@@ -964,8 +985,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -964,8 +987,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
        management::SetLaunchType::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -1201,8 +1201,8 @@ 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
-@@ -233,4 +233,18 @@ BASE_FEATURE(kExtensionBrowserNamespaceAlternative,
+@@ -242,4 +242,18 @@ BASE_FEATURE(kAvoidCloneArgsOnExtensionFunctionDispatch,
-              "ExtensionBrowserNamespaceAlternative",
+              "AvoidCloneArgsOnExtensionFunctionDispatch",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +// Activates the auto update of extensions.
@@ -1223,9 +1223,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -273,6 +273,8 @@ BASE_DECLARE_FEATURE(kDebuggerAPIRestrictedToDevMode);
+@@ -271,6 +271,8 @@ BASE_DECLARE_FEATURE(kOptimizeServiceWorkerStartRequests);
- // `loadTimes` , `csi`, etc. or deprecated APIs (e.g. `app`).
+ // TODO(crbug.com/424432184): Clean up when experiment is complete.
- BASE_DECLARE_FEATURE(kExtensionBrowserNamespaceAlternative);
+ BASE_DECLARE_FEATURE(kAvoidCloneArgsOnExtensionFunctionDispatch);
  
 +BASE_DECLARE_FEATURE(kEnableExtensionAutoupdate);
 +BASE_DECLARE_FEATURE(kEnableExtensionManagementToChromeStore);

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

@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
 diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
 --- a/services/network/cors/preflight_controller.cc
 +++ b/services/network/cors/preflight_controller.cc
-@@ -834,6 +834,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -762,6 +762,10 @@ void PreflightController::ClearCorsPreflightCache(
    cache_.ClearCache(std::move(url_filter));
  }
  
@@ -55,7 +55,7 @@ diff --git a/services/network/cors/preflight_controller.cc b/services/network/co
 diff --git a/services/network/cors/preflight_controller.h b/services/network/cors/preflight_controller.h
 --- a/services/network/cors/preflight_controller.h
 +++ b/services/network/cors/preflight_controller.h
-@@ -157,6 +157,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
+@@ -151,6 +151,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightController final {
            url_loader_network_service_observer,
        const PreflightMode& preflight_mode);
  
@@ -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
-@@ -1356,6 +1356,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1374,6 +1374,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
                                      base::Time end_time,
                                      mojom::ClearDataFilterPtr filter,
                                      ClearHttpCacheCallback callback) {

build/patches/Client-hints-overrides.patch

@@ -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
-@@ -203,9 +203,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -202,9 +202,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
    bool parse_result = base::StringToInt(major_version, &major_version_number);
    DCHECK(parse_result);
    std::optional<std::string> brand;
@@ -90,7 +90,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1380,6 +1380,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1674,6 +1674,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -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
-@@ -226,6 +226,8 @@ bool ShouldSendClientHint(const network::PermissionsPolicy& policy,
+@@ -227,6 +227,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(
-@@ -606,7 +608,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -630,7 +632,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
    }
  
    // Only send User Agent hints if the info is available
@@ -255,7 +255,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -517,6 +517,11 @@
+@@ -532,6 +532,11 @@
        name: "AriaNotifyV2",
        status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
      },
@@ -267,7 +267,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
      {
        name: "AriaRowColIndexText",
        status: "stable",
-@@ -903,8 +908,7 @@
+@@ -924,8 +929,7 @@
        // Allows top-level sites to restrict collection of high-entropy UA client
        // hints (from 3Ps, or itself) via the getHighEntropyValues API.
        // crbug.com/385161047

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

@@ -9,12 +9,12 @@ No change in doh connections.
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../browser/network_session_configurator.cc        | 11 ++++-------
+ .../browser/network_session_configurator.cc        | 12 ++++--------
  .../about_flags_cc/Close-Sessions-On-Ip-Change.inc | 14 ++++++++++++++
  .../features_cc/Close-Sessions-On-Ip-Change.inc    |  5 +++++
  .../features_h/Close-Sessions-On-Ip-Change.inc     |  3 +++
  net/base/features.cc                               |  2 +-
- 5 files changed, 27 insertions(+), 8 deletions(-)
+ 5 files changed, 27 insertions(+), 9 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Close-Sessions-On-Ip-Change.inc
  create mode 100644 cromite_flags/net/base/features_cc/Close-Sessions-On-Ip-Change.inc
  create mode 100644 cromite_flags/net/base/features_h/Close-Sessions-On-Ip-Change.inc
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/network_session_configurator/browser/network_session_configurator.cc b/components/network_session_configurator/browser/network_session_configurator.cc
 --- a/components/network_session_configurator/browser/network_session_configurator.cc
 +++ b/components/network_session_configurator/browser/network_session_configurator.cc
-@@ -220,9 +220,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
+@@ -222,9 +222,8 @@ quic::QuicTagVector GetQuicClientConnectionOptions(
  
  bool ShouldQuicCloseSessionsOnIpChange(
      const VariationParameters& quic_trial_params) {
@@ -34,14 +34,15 @@ diff --git a/components/network_session_configurator/browser/network_session_con
  }
  
  bool ShouldQuicGoAwaySessionsOnIpChange(
-@@ -303,10 +302,8 @@ bool ShouldQuicEstimateInitialRtt(
+@@ -305,11 +304,8 @@ bool ShouldQuicEstimateInitialRtt(
  
  bool ShouldQuicMigrateSessionsOnNetworkChangeV2(
      const VariationParameters& quic_trial_params) {
 -  return GetVariationBoolParamOrFeatureSetting(
 -      quic_trial_params, "migrate_sessions_on_network_change_v2",
 -      base::FeatureList::IsEnabled(
--          net::features::kMigrateSessionsOnNetworkChangeV2));
+-          net::features::kMigrateSessionsOnNetworkChangeV2),
+-      "true");
 +  return base::FeatureList::IsEnabled(
 +          net::features::kMigrateSessionsOnNetworkChangeV2);
  }
@@ -87,7 +88,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -548,7 +548,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI,
+@@ -581,7 +581,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI,
  // NetworkChangeNotifier::AreNetworkHandlesSupported).
  #if BUILDFLAG(IS_ANDROID)
  inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =

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

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

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

@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/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
-@@ -653,7 +653,7 @@ chrome_java_resources = [
+@@ -634,7 +634,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",
@@ -218,8 +218,8 @@ new file mode 100644
 +        app:isPreferenceVisible="false" />
 +    <Preference
 +        android:key="incognito_tracking_protections"
-+        android:title="@string/incognito_tracking_protections_page_title"
++        android:title="@string/incognito_tracking_protections_link_row_label"
-+        android:summary="@string/incognito_tracking_protections_page_entrypoint_description"
++        android:summary="@string/incognito_tracking_protections_link_row_sublabel"
 +        android:fragment="org.chromium.components.privacy_sandbox.IncognitoTrackingProtectionsFragment"
 +        app:isPreferenceVisible="false" />
 +    <Preference
@@ -247,7 +247,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
-@@ -189,7 +189,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -193,7 +193,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
  
@@ -256,7 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  
          Preference incognitoTrackingProtectionsPreference =
                  findPreference(PREF_INCOGNITO_TRACKING_PROTECTIONS);
-@@ -280,7 +280,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -289,7 +289,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
  
          ChromeSwitchPreference passwordLeakTogglePref =
                  (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);

build/patches/Cromite-Branding.patch

@@ -26,6 +26,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../mipmap-xxxhdpi/layered_app_icon.png       | Bin 3652 -> 29220 bytes
  .../layered_app_icon_background.png           | Bin 3519 -> 142032 bytes
  .../values/channel_constants.xml              |   8 +-
+ .../browser/fullscreen/FullscreenToast.java   |   2 +-
  .../inline/BromiteInlineUpdateController.java |  19 +++-
  chrome/app/extensions_strings.grdp            |   4 +-
  chrome/app/settings_strings.grdp              |   2 +-
@@ -61,7 +62,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  content/child/runtime_features.cc             |  44 ++++-----
  .../Cromite-Branding.inc                      |   1 +
  tools/grit/grit/grd_reader.py                 |  35 +++++++
- 57 files changed, 203 insertions(+), 129 deletions(-)
+ 58 files changed, 204 insertions(+), 130 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
 
 diff --git a/build/BUILD.gn b/build/BUILD.gn
@@ -85,7 +86,7 @@ diff --git a/build/BUILD.gn b/build/BUILD.gn
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -187,6 +187,10 @@ declare_args() {
+@@ -194,6 +194,10 @@ declare_args() {
    clang_warning_suppression_file = ""
  }
  
@@ -99,7 +100,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -182,7 +182,7 @@ by a child template that "extends" this file.
+@@ -189,7 +189,7 @@ by a child template that "extends" this file.
        <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
          android:icon="@drawable/ic_launcher"
          android:roundIcon="@drawable/ic_launcher_round"
@@ -9137,6 +9138,18 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml
 +    <string name="search_widget_title" translatable="false">Cromite search</string>
 +    <string name="quick_action_search_widget_title" translatable="false">Cromite quick action search</string>
  </resources>
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenToast.java
+@@ -108,7 +108,7 @@ interface FullscreenToast {
+             mNotificationToast =
+                     Toast.makeTextWithPriority(
+                             mActivity, toastTextId, Toast.LENGTH_LONG, ToastPriority.HIGH);
+-            mNotificationToast.setGravity(Gravity.BOTTOM | Gravity.CENTER, 0, 0);
++            mNotificationToast.setGravity(Gravity.TOP | Gravity.CENTER, 0, 0);
+             mNotificationToast.show();
+         }
+ 
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
@@ -9204,7 +9217,7 @@ 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
-@@ -81,7 +81,7 @@
+@@ -84,7 +84,7 @@
      Accessibility
    </message>
    <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.">
@@ -13158,7 +13171,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
-@@ -1895,6 +1895,7 @@ static_library("browser") {
+@@ -1914,6 +1914,7 @@ static_library("browser") {
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
      "//build/config/linux/dbus:buildflags",
@@ -13169,15 +13182,15 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -1173,7 +1173,7 @@ public abstract class ChromeFeatureList {
+@@ -1340,7 +1340,7 @@ public abstract class ChromeFeatureList {
      public static final MutableFlagWithSafeDefault sSuppressToolbarCapturesAtGestureEnd =
              newMutableFlagWithSafeDefault(SUPPRESS_TOOLBAR_CAPTURES_AT_GESTURE_END, false);
      public static final MutableFlagWithSafeDefault sSwapNewTabAndNewTabInGroupAndroid =
 -            newMutableFlagWithSafeDefault(SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID, false);
 +            newMutableFlagWithSafeDefault(SWAP_NEW_TAB_AND_NEW_TAB_IN_GROUP_ANDROID, true);
-     public static final MutableFlagWithSafeDefault sTabGroupEntryPointsAndroid =
+     public static final MutableFlagWithSafeDefault sTabArchivalDragDropAndroid =
-             newMutableFlagWithSafeDefault(TAB_GROUP_ENTRY_POINTS_ANDROID, false);
+             newMutableFlagWithSafeDefault(TAB_ARCHIVAL_DRAG_DROP_ANDROID, true);
-     public static final MutableFlagWithSafeDefault sTabGroupParityBottomSheetAndroid =
+     public static final MutableFlagWithSafeDefault sTabCollectionAndroid =
 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
@@ -13199,8 +13212,8 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
      ":util",
 +    "//build:cromite_buildflags",
      "//chrome/browser:browser_process",
-     "//chrome/browser/devtools",
+     "//chrome/browser:flags",
-     "//chrome/browser/media/prefs",
+     "//chrome/browser/autocomplete:aim_eligibility_service",
 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
@@ -13212,8 +13225,8 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
  #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -291,10 +292,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -281,10 +282,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
- #endif
+     const base::FilePath& profile_path) {
    std::string seed;
    CHECK(ui::ResourceBundle::HasSharedInstance());
 -#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -13221,9 +13234,9 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 -      IDR_PREF_HASH_SEED_BIN));
 -#endif
 +  seed = BUILDFLAG_INTERNAL_CROMITE_PREF_HASH_SEED_BIN();
-   return std::make_unique<ProfilePrefStoreManager>(profile_path, seed,
+   return std::make_unique<ProfilePrefStoreManager>(profile_path, seed);
-                                                    legacy_device_id);
  }
+ 
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -13270,7 +13283,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
-@@ -2485,7 +2485,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2389,7 +2389,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">
@@ -13282,7 +13295,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
-@@ -140,6 +140,7 @@ bool AreNewChromeLabsExperimentsAvailable(const ChromeLabsModel* model,
+@@ -140,6 +140,7 @@ bool AreNewChromeLabsExperimentsAvailable(Profile* profile) {
  }
  
  bool IsChromeLabsEnabled() {
@@ -13326,7 +13339,7 @@ diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_st
 diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
 --- a/components/browser_ui/strings/android/browser_ui_strings.grd
 +++ b/components/browser_ui/strings/android/browser_ui_strings.grd
-@@ -992,7 +992,7 @@
+@@ -1005,7 +1005,7 @@
  
        <!-- Accessibility preferences -->
        <message name="IDS_PREFS_ACCESSIBILITY" desc="Title of Accessibility settings, which allows the user to change webpage font sizes. [CHAR_LIMIT=32]">
@@ -18972,7 +18985,7 @@ diff --git a/components/webui/version/resources/about_version_mobile.css b/compo
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -570,19 +570,22 @@ void ResolveInvalidConfigurations() {
+@@ -568,19 +568,22 @@ void ResolveInvalidConfigurations() {
         base::FeatureList::IsEnabled(
             features::kPrivacySandboxAdsAPIsM1Override)) &&
        !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -18999,7 +19012,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "Fenced frames must be enabled in order to enable local "
             "unpartitioned "
          << "data access. Use --" << switches::kEnableFeatures << "="
-@@ -590,12 +593,14 @@ void ResolveInvalidConfigurations() {
+@@ -588,12 +591,14 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableFeatureFromString(
          "FencedFramesLocalUnpartitionedDataAccess", false);
    }
@@ -19015,7 +19028,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "Topics cannot be enabled in this configuration. Use --"
          << switches::kEnableFeatures << "="
          << network::features::kBrowsingTopics.name << " in addition.";
-@@ -603,30 +608,23 @@ void ResolveInvalidConfigurations() {
+@@ -601,30 +606,23 @@ void ResolveInvalidConfigurations() {
      WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
      WebRuntimeFeatures::EnableTopicsImgAPI(false);
    } else {
@@ -19052,7 +19065,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "AttributionReporting cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -634,23 +632,25 @@ void ResolveInvalidConfigurations() {
+@@ -632,23 +630,25 @@ void ResolveInvalidConfigurations() {
          << " in addition.";
      WebRuntimeFeatures::EnableAttributionReporting(false);
    }

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
-@@ -166,9 +166,7 @@ public class ChromeActionModeHandler {
+@@ -173,9 +173,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
-@@ -803,10 +803,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
+@@ -884,10 +884,17 @@ public class ChromeTabbedActivity extends ChromeActivity {
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
@@ -62,7 +62,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-@@ -202,6 +202,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -258,6 +258,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
          // Skip opening a new Tab if it doesn't make sense.
          if (mTab.isClosing()) return false;
  
@@ -74,12 +74,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 +            tabLaunchType = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
 +        }
 +
+         WindowAndroid window = mTab.getWindowAndroid();
          boolean openingPopup =
-                 PopupCreator.arePopupsEnabled(mActivity)
+                 window != null
-                         && (disposition == WindowOpenDisposition.NEW_POPUP);
+@@ -288,7 +296,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
-@@ -225,7 +233,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
-                 tabCreator.createTabWithWebContents(
                          mTab,
+                         /* shouldPin= */ false,
                          webContents,
 -                        TabLaunchType.FROM_LONGPRESS_FOREGROUND,
 +                        tabLaunchType,
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 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
-@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
+@@ -18,6 +18,7 @@ import android.view.ViewGroup;
  import androidx.annotation.VisibleForTesting;
  
  import org.chromium.base.Callback;
@@ -114,8 +114,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -372,8 +372,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -385,8 +385,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
-     public void onOpenImageInNewTab(GURL url, Referrer referrer) {
+     public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
          loadUrlParams.setReferrer(referrer);
 +        @TabLaunchType int type = TabLaunchType.FROM_LONGPRESS_BACKGROUND;
@@ -132,7 +132,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -29,6 +29,7 @@ import androidx.core.view.WindowInsetsCompat;
+@@ -30,6 +30,7 @@ import androidx.core.view.WindowInsetsCompat;
  import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
@@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.base.TraceEvent;
  import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -795,11 +796,16 @@ public class RootUiCoordinator
+@@ -842,11 +843,16 @@ public class RootUiCoordinator
                      TrackerFactory.getTrackerForProfile(tab.getProfile())
                              .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  

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

@@ -23,11 +23,11 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
      android:textAppearance="@style/TextAppearance.SearchBoxText"
 +    android:inputType="textUri"
      android:hint="@string/omnibox_empty_hint"
-     android:importantForAutofill="no" />
+     android:importantForAutofill="no"/>
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -318,8 +318,17 @@ class LocationBarMediator
+@@ -307,8 +307,17 @@ class LocationBarMediator
              if (!mUrlFocusedWithPastedText
                      && !shouldRetainOmniboxOnFocus
                      && mLocationBarLayout.shouldClearTextOnFocus()) {
@@ -58,7 +58,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
  import android.os.SystemClock;
  import android.text.Editable;
  import android.text.InputType;
-@@ -113,6 +114,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -115,6 +116,7 @@ public class UrlBar extends AutocompleteEditText {
      private boolean mAllowFocus = true;
      private boolean mShouldSendTypingStartedEvent;
  
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
      private boolean mPendingScroll;
      private boolean mIsInCct;
  
-@@ -339,6 +341,28 @@ public class UrlBar extends AutocompleteEditText {
+@@ -352,6 +354,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
-@@ -1101,6 +1101,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1125,6 +1125,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

build/patches/Disable-Android-AppRestrictions.patch

@@ -32,15 +32,15 @@ diff --git a/chrome/browser/enterprise/util/BUILD.gn b/chrome/browser/enterprise
 diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 --- a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
 +++ b/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfoImpl.java
-@@ -28,6 +28,7 @@ import org.chromium.build.annotations.MonotonicNonNull;
+@@ -31,6 +31,7 @@ import org.chromium.build.annotations.NullMarked;
- 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.components.policy.AppRestrictionsProvider;
  
  import java.util.LinkedList;
- import java.util.Queue;
+ import java.util.List;
-@@ -109,6 +110,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
+@@ -113,6 +114,10 @@ public class EnterpriseInfoImpl extends EnterpriseInfo {
              new AsyncTask<OwnedState>() {
                  // TODO: Unit test this function. https://crbug.com/1099262
                  private OwnedState calculateIsRunningOnManagedProfile(Context context) {
@@ -48,9 +48,9 @@ diff --git a/chrome/browser/enterprise/util/android/java/src/org/chromium/chrome
 +                        return new OwnedState(/*hasDeviceOwnerApp*/false,
 +                            /*hasProfileOwnerApp*/false);
 +                    }
+                     long startTime = SystemClock.elapsedRealtime();
                      boolean hasProfileOwnerApp = false;
                      boolean hasDeviceOwnerApp = false;
-                     PackageManager packageManager = context.getPackageManager();
 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

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

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

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

@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 --- a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
 +++ b/third_party/blink/renderer/core/css/parser/css_supports_parser.cc
-@@ -393,7 +393,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -397,7 +397,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
              feature_name.Value().Utf8()) &&
          guard.Release()) {
        stream.ConsumeWhitespace();
@@ -28,7 +28,7 @@ diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
-@@ -581,7 +581,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+@@ -578,7 +578,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
      HeapVector<CSSSelector> arena;
      CSSPropertyValueSet* empty_properties =
          ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),

build/patches/Disable-CSSDynamicRangeLimit.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1250,7 +1250,7 @@
+@@ -1288,7 +1288,7 @@
      },
      {
        name: "CSSDynamicRangeLimit",

build/patches/Disable-Compose-feature.patch

@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -8372,6 +8372,12 @@ static_library("browser") {
+@@ -8414,6 +8414,12 @@ static_library("browser") {
      deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
    }
  
@@ -26,15 +26,15 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    if (enable_compose) {
      sources += [
        "compose/chrome_compose_client.cc",
-@@ -8387,7 +8393,6 @@ static_library("browser") {
+@@ -8429,7 +8435,6 @@ static_library("browser") {
      ]
  
      deps += [
 -      ":compose_optimization_guide_proto",
        "//chrome/common/compose",
        "//chrome/common/compose:mojo_bindings",
-       "//components/autofill/content/browser:browser",
+       "//components/autofill/content/browser",
-@@ -8848,7 +8853,7 @@ source_set("font_pref") {
+@@ -8888,7 +8893,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
-@@ -372,7 +372,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -352,7 +352,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
        base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
  
  #if BUILDFLAG(ENABLE_COMPOSE)

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

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

@@ -0,0 +1,32 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Wed, 10 Sep 2025 07:46:17 +0000
+Subject: Disable Device Attributes API
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/browser/device_api/device_service_impl.cc | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/device_api/device_service_impl.cc
+--- a/chrome/browser/device_api/device_service_impl.cc
++++ b/chrome/browser/device_api/device_service_impl.cc
+@@ -166,6 +166,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
+ 
+ bool IsTrustedContext(content::RenderFrameHost& host,
+                       const url::Origin& origin) {
++  if ((true)) return false;
+   // Do not create the service for the incognito mode.
+   if (GetProfile(host)->IsIncognitoProfile()) {
+     return false;
+@@ -361,6 +362,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
+ void DeviceServiceImpl::GetDeviceAttribute(
+     void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback),
+     DeviceAttributeCallback callback) {
++  if ((true)) {
++    device_attribute_api_->ReportNotAllowedError(std::move(callback));
++    return;
++  }
+   if (!IsAffiliatedUser()) {
+     device_attribute_api_->ReportNotAffiliatedError(std::move(callback));
+     return;
+--

build/patches/Disable-FedCm.patch

@@ -15,8 +15,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -674,7 +674,7 @@ void ContentSettingsRegistry::Init() {
+@@ -671,7 +671,7 @@ void ContentSettingsRegistry::Init() {
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
    Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
 -           "webid-auto-reauthn", CONTENT_SETTING_ALLOW,
@@ -39,7 +39,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2075,7 +2075,7 @@
+@@ -2093,7 +2093,7 @@
      {
        name: "FedCm",
        public: true,

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

@@ -6,12 +6,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../src/org/chromium/base/PackageUtils.java   |  1 +
  .../chrome/browser/IntentHandler.java         |  6 ----
- .../chrome/browser/share/LensUtils.java       | 14 ++-------
+ .../chrome/browser/share/LensUtils.java       | 14 ++------
- .../chromium/chrome/browser/gsa/GSAUtils.java | 29 ++++---------------
+ .../chromium/chrome/browser/gsa/GSAUtils.java | 34 +++----------------
- .../GoogleBottomBarActionsHandler.java        | 19 ++----------
+ .../GoogleBottomBarActionsHandler.java        | 19 ++---------
  .../chrome/browser/pdf/PdfCoordinator.java    |  2 +-
  .../Disable-GSA-by-default.inc                |  1 +
- 7 files changed, 12 insertions(+), 60 deletions(-)
+ 7 files changed, 12 insertions(+), 65 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc
 
 diff --git a/base/android/java/src/org/chromium/base/PackageUtils.java b/base/android/java/src/org/chromium/base/PackageUtils.java
@@ -34,9 +34,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
 -import org.chromium.chrome.browser.gsa.GSAUtils;
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
+ import org.chromium.chrome.browser.pdf.PdfUtils;
  import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.profiles.ProfileManager;
+@@ -293,9 +292,6 @@ public class IntentHandler {
-@@ -279,9 +278,6 @@ public class IntentHandler {
  
      public static final String EXTRA_CCT_EARLY_NAV = "org.chromium.chrome.browser.cct_early_nav";
  
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
      private static Pair<Integer, String> sPendingReferrer;
      private static int sReferrerId;
      private static String sPendingIncognitoUrl;
-@@ -557,8 +553,6 @@ public class IntentHandler {
+@@ -588,8 +584,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -58,7 +58,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils.java
-@@ -10,7 +10,6 @@ import android.os.Build;
+@@ -9,7 +9,6 @@ import android.content.Context;
  import org.chromium.base.ResettersForTesting;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
  import org.chromium.components.externalauth.ExternalAuthUtils;
  
  /** This class provides utilities for intenting into Google Lens. */
-@@ -49,12 +48,7 @@ public class LensUtils {
+@@ -48,12 +47,7 @@ public class LensUtils {
              if (context == null) {
                  return "";
              }
@@ -79,7 +79,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
          }
      }
  
-@@ -92,15 +86,11 @@ public class LensUtils {
+@@ -76,15 +70,11 @@ public class LensUtils {
       * @return Whether the package is valid.
       */
      public static boolean isValidAgsaPackage() {
@@ -100,7 +100,7 @@ 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
-@@ -14,19 +14,12 @@ import org.chromium.build.annotations.Nullable;
+@@ -15,19 +15,12 @@ import org.chromium.build.annotations.Nullable;
  /** This class provides utilities for the state of Google Search App. */
  @NullMarked
  public class GSAUtils {
@@ -121,7 +121,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
      }
  
      /**
-@@ -38,6 +31,7 @@ public class GSAUtils {
+@@ -39,6 +32,7 @@ public class GSAUtils {
       */
      public static boolean isAgsaVersionBelowMinimum(
              @Nullable String installedVersionName, @Nullable String minimumVersionName) {
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
          if (TextUtils.isEmpty(installedVersionName) || TextUtils.isEmpty(minimumVersionName)) {
              return true;
          }
-@@ -68,8 +62,8 @@ public class GSAUtils {
+@@ -69,8 +63,8 @@ public class GSAUtils {
       * @return The version name of the Agsa package or null if it can't be found.
       */
      public static @Nullable String getAgsaVersionName() {
@@ -140,7 +140,7 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
      }
  
      /**
-@@ -78,19 +72,6 @@ public class GSAUtils {
+@@ -79,20 +73,7 @@ public class GSAUtils {
       * @return Whether the AGSA is enabled
       */
      public static boolean isAgsaEnabled() {
@@ -160,6 +160,18 @@ diff --git a/chrome/browser/gsa/java/src/org/chromium/chrome/browser/gsa/GSAUtil
 -        return sPackageInfo;
 +        return false;
      }
+ 
+     /**
+@@ -101,10 +82,5 @@ public class GSAUtils {
+      * @param packageInfo The package info to set for AGSA.
+      */
+     public static void setAgsaPackageInfoForTesting(@Nullable PackageInfo packageInfo) {
+-        sPackageInfo = packageInfo;
+-        ResettersForTesting.register(
+-                () -> {
+-                    sPackageInfo = null;
+-                });
+     }
  }
 diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java b/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
 --- a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarActionsHandler.java
@@ -220,7 +232,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
-@@ -265,7 +265,7 @@ public class PdfCoordinator {
+@@ -266,7 +266,7 @@ public class PdfCoordinator {
      }
  
      @Nullable String requestAssistContent(String filename, boolean isWorkProfile) {

build/patches/Disable-GetInstalledRelatedApps-API.patch

@@ -58,7 +58,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2766,9 +2766,8 @@
+@@ -2795,9 +2795,8 @@
        status: "stable",
      },
      {

build/patches/Disable-Paint-Preview-by-default.patch

@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelper.java
-@@ -114,7 +114,7 @@ public class StartupPaintPreviewHelper implements Destroyable {
+@@ -118,7 +118,7 @@ public class StartupPaintPreviewHelper implements Destroyable {
  
      /** Enables Paint Preview show attempt on restoration of a tab. */
      public static void enableShowOnRestore() {

build/patches/Disable-PrivacyGuide.patch

@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc
 --- a/chrome/browser/ui/webui/settings/settings_ui.cc
 +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
-@@ -346,8 +346,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -326,8 +326,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
    bool show_privacy_guide =

build/patches/Disable-Real-Box.patch

@@ -4,16 +4,16 @@ Subject: Disable Real Box
 
 Real-box is search box in ntp
 ---
- chrome/browser/prefs/browser_prefs.cc                  |  2 +-
+ chrome/browser/prefs/browser_prefs.cc                 |  2 +-
- chrome/browser/resources/new_tab_page/app.html         | 10 ----------
+ chrome/browser/resources/new_tab_page/app.html        | 11 -----------
- chrome/browser/ui/webui/searchbox/searchbox_handler.cc |  1 +
+ .../browser/ui/webui/searchbox/searchbox_handler.cc   |  1 +
- components/search/ntp_features.cc                      |  6 +++---
+ components/search/ntp_features.cc                     |  6 +++---
- 4 files changed, 5 insertions(+), 14 deletions(-)
+ 4 files changed, 5 insertions(+), 15 deletions(-)
 
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2276,7 +2276,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2272,7 +2272,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,12 +25,13 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
-@@ -19,16 +19,6 @@
+@@ -21,17 +21,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
-       ?hidden="${!this.logoEnabled_}">
+       .theme="${this.theme_}" ?hidden="${!this.logoEnabled_}">
    </ntp-logo>
    <div id="searchboxContainer">
 -    <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
 -        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
+-        @open-composebox="${this.toggleComposebox_}"
 -        @open-lens-search="${this.onOpenLensSearch_}"
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
@@ -39,13 +40,13 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
 -        ?compose-button-enabled="${this.composeButtonEnabled}"
 -        ?composebox-enabled="${this.composeboxEnabled}">
 -    </cr-searchbox>
-     ${this.showLensUploadDialog_ ? html`
+     ${this.showComposebox_ ? html`
-       <ntp-lens-upload-dialog id="lensUploadDialog"
+       <ntp-composebox id="composebox" ?is_collapsible="false" @close-composebox="${this.closeComposebox_}">
-           @close-lens-search="${this.onCloseLensSearch_}">
+       </ntp-composebox>
 diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
 --- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
 +++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -438,6 +438,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+@@ -452,6 +452,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                              Profile* profile,
                                              bool enable_voice_search,
                                              bool enable_lens_search) {
@@ -56,7 +57,7 @@ diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/bro
 diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.cc
 --- a/components/search/ntp_features.cc
 +++ b/components/search/ntp_features.cc
-@@ -138,7 +138,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
+@@ -127,7 +127,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
  
  // If enabled, logo will be shown.
  // This is a kill switch. Keep indefinitely.
@@ -65,7 +66,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.
-@@ -191,8 +191,8 @@ BASE_FEATURE(kNtpModulesLoad,
+@@ -186,8 +186,8 @@ BASE_FEATURE(kNtpModuleSignInRequirement,
  // If enabled, OneGoogleBar will be shown.
  // This is a kill switch. Keep indefinitely.
  BASE_FEATURE(kNtpOneGoogleBar,

build/patches/Disable-TLS-resumption.patch

@@ -90,7 +90,7 @@ diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
 diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 --- a/net/quic/quic_session_pool.cc
 +++ b/net/quic/quic_session_pool.cc
-@@ -85,6 +85,7 @@
+@@ -86,6 +86,7 @@
  #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_flags.h"
  #include "net/traffic_annotation/network_traffic_annotation.h"
  #include "third_party/boringssl/src/include/openssl/aead.h"
@@ -98,7 +98,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
  #include "url/gurl.h"
  #include "url/scheme_host_port.h"
  #include "url/url_constants.h"
-@@ -371,6 +372,38 @@ void LogSessionKeyMismatch(QuicSessionKeyPartialMatchResult result,
+@@ -372,6 +373,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() {
-@@ -2365,7 +2398,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
+@@ -2373,7 +2406,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
                cert_verifier_, transport_security_state_, sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
                key.network_anonymization_key),
@@ -149,7 +149,7 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
 --- a/net/socket/ssl_client_socket_impl.cc
 +++ b/net/socket/ssl_client_socket_impl.cc
-@@ -290,7 +290,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -292,7 +292,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
    CHECK(context_);
  }
  
@@ -183,7 +183,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    Disconnect();
  }
  
-@@ -681,6 +707,8 @@ int SSLClientSocketImpl::Init() {
+@@ -700,6 +726,8 @@ int SSLClientSocketImpl::Init() {
      }
      if (session)
        SSL_set_session(ssl_.get(), session.get());
@@ -192,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    }
  
    transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -966,6 +994,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -985,6 +1013,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }
@@ -228,7 +228,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
    UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
  
    // Measure TLS connections that implement the renegotiation_info and EMS
-@@ -1582,6 +1639,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1624,6 +1681,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
  }
  
  bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -240,9 +240,9 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 diff --git a/net/socket/ssl_client_socket_impl.h b/net/socket/ssl_client_socket_impl.h
 --- a/net/socket/ssl_client_socket_impl.h
 +++ b/net/socket/ssl_client_socket_impl.h
-@@ -123,6 +123,8 @@ class SSLClientSocketImpl : public SSLClientSocket,
+@@ -127,6 +127,8 @@ class NET_EXPORT_PRIVATE SSLClientSocketImpl
-   friend class SSLClientSocket;
    friend class SSLContext;
+   FRIEND_TEST_ALL_PREFIXES(SSLClientSocketTest, ParseServerTrustAnchorIDs);
  
 +  void Log_ssl_session_data(const std::string& tag, SSL_SESSION* session);
 +

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

@@ -7,22 +7,23 @@ getHighEntropyValues will return only the major version
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- .../renderer/core/frame/navigator_ua_data.cc     | 16 ++++++++++++++--
+ .../renderer/core/frame/navigator_ua_data.cc    | 17 +++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
+ 1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -7,6 +7,8 @@
+@@ -7,6 +7,9 @@
  #include "base/compiler_specific.h"
  #include "base/task/single_thread_task_runner.h"
  #include "third_party/blink/public/common/features.h"
 +#include "base/version.h"
 +#include "base/strings/strcat.h"
++#include "base/strings/string_number_conversions.h"
  #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
  #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
  #include "third_party/blink/public/common/privacy_budget/identifiable_surface.h"
-@@ -65,6 +67,16 @@ void MaybeRecordMetric(bool record_identifiability,
+@@ -65,6 +68,16 @@ void MaybeRecordMetric(bool record_identifiability,
                      execution_context);
  }
  
@@ -39,7 +40,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
  }  // namespace
  
  NavigatorUAData::NavigatorUAData(ExecutionContext* context)
-@@ -103,7 +115,7 @@ void NavigatorUAData::SetFullVersionList(
+@@ -103,7 +116,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 +49,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
    }
  }
  
-@@ -125,7 +137,7 @@ void NavigatorUAData::SetModel(const String& model) {
+@@ -125,7 +138,7 @@ void NavigatorUAData::SetModel(const String& model) {
  }
  
  void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {

build/patches/Disable-Viewport-Segments.patch

@@ -21,7 +21,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -5200,8 +5200,7 @@
+@@ -5317,8 +5317,7 @@
        status: "stable",
      },
      {
@@ -30,5 +30,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      name: "ViewportSegments", status: "test", public: true
      },
      {
-       name: "ViewTransitionLongCallbackTimeoutForTesting",
+       name: "ViewTransitionAnimationDelayInherit",
 --

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

@@ -14,9 +14,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -372,8 +372,13 @@ void ContentSettingsRegistry::Init() {
+@@ -378,8 +378,13 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
+            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS);
  
 +#if BUILDFLAG(IS_ANDROID)
    Register(ContentSettingsType::BLUETOOTH_GUARD, "bluetooth-guard",

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
-@@ -555,6 +555,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -547,6 +547,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
  
    WebRuntimeFeatures::EnableRemotePlayback(false);
  
@@ -20,7 +20,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +
    WebRuntimeFeatures::EnableBackForwardCache(
        content::IsBackForwardCacheEnabled());
- }
+ 
 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
@@ -36,7 +36,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
-@@ -157,6 +157,8 @@ GPU::GPU(NavigatorBase& navigator)
+@@ -159,6 +159,8 @@ GPU::GPU(NavigatorBase& navigator)
  GPU::~GPU() = default;
  
  WGSLLanguageFeatures* GPU::wgslLanguageFeatures() const {
@@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blin
    return wgsl_language_features_.Get();
  }
  
-@@ -427,6 +429,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -436,6 +438,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
          "WebGPU is experimental on this platform. See "
          "https://github.com/gpuweb/gpuweb/wiki/"
          "Implementation-Status#implementation-status"));

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

@@ -18,7 +18,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1699,6 +1699,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1747,6 +1747,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      }
  
      private boolean maybeShowPromo(Profile profile) {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -167,7 +167,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -172,7 +172,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
  
    registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                  false);
@@ -41,10 +41,10 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
 diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
 --- a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
 +++ b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
-@@ -40,6 +40,7 @@ ui::ElementContext ProfilePickerFeaturePromoController::GetAnchorContext()
+@@ -36,6 +36,7 @@ user_education::FeaturePromoResult
- user_education::FeaturePromoResult
  ProfilePickerFeaturePromoController::CanShowPromoForElement(
-     ui::TrackedElement* anchor_element) const {
+     ui::TrackedElement* anchor_element,
+     const user_education::UserEducationContextPtr&) const {
 +  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
    return ProfilePicker::IsOpen()
               ? user_education::FeaturePromoResult::Success()
@@ -52,18 +52,18 @@ diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_contr
 diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 --- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
 +++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
-@@ -63,6 +63,7 @@ ui::ElementContext BrowserFeaturePromoController20::GetAnchorContext() const {
+@@ -45,6 +45,7 @@ user_education::FeaturePromoResult
- user_education::FeaturePromoResult
  BrowserFeaturePromoController20::CanShowPromoForElement(
-     ui::TrackedElement* anchor_element) const {
+     ui::TrackedElement* anchor_element,
+     const user_education::UserEducationContextPtr& context) const {
 +  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
-   // Trying to show an IPH while the browser is closing can cause problems;
+   auto* const browser_context = context->AsA<BrowserUserEducationContext>();
-   // see https://crbug.com/346461762 for an example. This can also crash
+   CHECK(browser_context && browser_context->IsValid());
-   // unit_tests that use a BrowserWindow but not a browser, so also check if
+   auto* const browser_view = &browser_context->GetBrowserView();
 diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 --- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 +++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
-@@ -119,6 +119,7 @@ public class UserEducationHelper {
+@@ -120,6 +120,7 @@ public class UserEducationHelper {
      }
  
      private void showIph(Tracker tracker, IphCommand iphCommand) {
@@ -74,7 +74,7 @@ diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/
 diff --git a/chrome/browser/user_education/user_education_service_factory.cc b/chrome/browser/user_education/user_education_service_factory.cc
 --- a/chrome/browser/user_education/user_education_service_factory.cc
 +++ b/chrome/browser/user_education/user_education_service_factory.cc
-@@ -109,6 +109,7 @@ UserEducationServiceFactory::BuildServiceInstanceForBrowserContextImpl(
+@@ -112,6 +112,7 @@ UserEducationServiceFactory::BuildServiceInstanceForBrowserContextImpl(
  
  // static
  bool UserEducationServiceFactory::ProfileAllowsUserEducation(Profile* profile) {
@@ -104,8 +104,8 @@ diff --git a/components/user_education/common/feature_promo/feature_promo_regist
 diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
 --- a/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
 +++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_20.cc
-@@ -100,6 +100,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
+@@ -106,6 +106,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
-     const FeaturePromoParams& params,
+     const UserEducationContextPtr& context,
      ShowSource source,
      CanShowPromoOutputs* outputs) const {
 +  if ((true)) return FeaturePromoResult::kBlockedByContext;
@@ -116,16 +116,16 @@ diff --git a/components/user_education/common/feature_promo/impl/feature_promo_c
 --- 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
 @@ -189,6 +189,7 @@ FeaturePromoController25::~FeaturePromoController25() {
- 
  FeaturePromoResult FeaturePromoController25::CanShowPromo(
-     const FeaturePromoParams& params) const {
+     const FeaturePromoParams& params,
+     const UserEducationContextPtr& context) const {
 +  if ((true)) return FeaturePromoResult::kBlockedByContext;
    auto* const spec = registry()->GetParamsForFeature(*params.feature);
    if (!spec) {
      return FeaturePromoResult::kError;
-@@ -209,7 +210,7 @@ void FeaturePromoController25::MaybeShowStartupPromo(
+@@ -211,7 +212,7 @@ void FeaturePromoController25::MaybeShowStartupPromo(
- 
+ void FeaturePromoController25::MaybeShowPromo(FeaturePromoParams params,
- void FeaturePromoController25::MaybeShowPromo(FeaturePromoParams params) {
+                                               UserEducationContextPtr context) {
    auto* const spec = registry()->GetParamsForFeature(*params.feature);
 -  if (!spec) {
 +  if (((true)) || !spec) {

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

@@ -12,7 +12,6 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  .../browser/aw_content_browser_client.cc      |   3 +
- ..._token_key_commitments_component_loader.cc |   1 +
  .../chromium/android_webview/AwSettings.java  |   4 +-
  chrome/android/java/AndroidManifest.xml       |   4 -
  .../ChromeSiteSettingsDelegate.java           |   2 +
@@ -47,14 +46,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  third_party/blink/renderer/core/page/page.cc  |   2 +-
  .../platform/runtime_enabled_features.json5   |  20 +-
  ui/events/android/motion_event_android.cc     |   8 +-
- 36 files changed, 104 insertions(+), 430 deletions(-)
+ 35 files changed, 103 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
-@@ -1339,6 +1339,7 @@ network::mojom::AttributionSupport
+@@ -1354,6 +1354,7 @@ network::mojom::AttributionSupport
  AwContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -62,7 +61,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
    // WebView only supports OS-level attribution and not web-attribution.
    switch (state) {
      case AttributionReportingOsApiState::kDisabled:
-@@ -1357,6 +1358,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1372,6 +1373,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -71,21 +70,10 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
    AwBrowserContext* aw_context =
        static_cast<AwBrowserContext*>(browser_context);
    // WebView only supports OS-level attribution and not web-attribution.
-diff --git a/android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc b/android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc
---- a/android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc
-+++ b/android_webview/browser/component_updater/trust_token_key_commitments_component_loader.cc
-@@ -20,6 +20,7 @@ namespace android_webview {
- // Tokens is enabled.
- void LoadTrustTokenKeyCommitmentsComponent(
-     ComponentLoaderPolicyVector& policies) {
-+  if ((true)) return;
-   DVLOG(1)
-       << "Registering Trust Token Key Commitments component for loading in "
-          "embedded WebView.";
 diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 --- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java
 +++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java
-@@ -171,7 +171,7 @@ public class AwSettings {
+@@ -177,7 +177,7 @@ public class AwSettings {
      private boolean mSpatialNavigationEnabled; // Default depends on device features.
      private boolean mEnableSupportedHardwareAcceleratedFeatures;
      private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
@@ -94,7 +82,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
  
      @SpeculativeLoadingAllowedFlags
      private int mSpeculativeLoadingAllowedFlags =
-@@ -1789,7 +1789,7 @@ public class AwSettings {
+@@ -1804,7 +1804,7 @@ public class AwSettings {
      public void setAttributionBehavior(@AttributionBehavior int behavior) {
          synchronized (mAwSettingsLock) {
              if (mAttributionBehavior != behavior) {
@@ -114,7 +102,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
      <uses-permission-sdk-23 android:name="android.permission.BLUETOOTH_CONNECT"/>
      <!--
-@@ -1169,9 +1168,6 @@ by a child template that "extends" this file.
+@@ -1179,9 +1178,6 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
          </activity>
  
@@ -127,7 +115,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
-@@ -149,6 +149,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();
@@ -139,7 +127,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
 diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
 --- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
 +++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
-@@ -119,7 +119,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
+@@ -120,7 +120,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
  
  void KAnonymityTrustTokenGetter::TryGetTrustTokenAndKey(
      TryGetTrustTokenAndKeyCallback callback) {
@@ -151,7 +139,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
-@@ -592,11 +592,6 @@
+@@ -588,11 +588,6 @@
            </category-setting-exceptions>
          </settings-subpage>
        </template>
@@ -166,7 +154,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>) {
+@@ -84,7 +84,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
          r.SITE_SETTINGS.createChild('smartCardReaders');
    }
    // </if>
@@ -210,9 +198,9 @@ 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
-@@ -683,7 +683,7 @@ void ContentSettingsRegistry::Init() {
+@@ -680,7 +680,7 @@ void ContentSettingsRegistry::Init() {
             ContentSettingsInfo::INHERIT_IN_INCOGNITO,
-            ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
+            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
  
 -  Register(ContentSettingsType::ANTI_ABUSE, "anti-abuse", CONTENT_SETTING_ALLOW,
 +  Register(ContentSettingsType::ANTI_ABUSE, "anti-abuse", CONTENT_SETTING_BLOCK,
@@ -231,7 +219,7 @@ diff --git a/components/embedder_support/origin_trials/features.cc b/components/
 diff --git a/components/renderer_context_menu/render_view_context_menu_base.cc b/components/renderer_context_menu/render_view_context_menu_base.cc
 --- a/components/renderer_context_menu/render_view_context_menu_base.cc
 +++ b/components/renderer_context_menu/render_view_context_menu_base.cc
-@@ -525,9 +525,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
+@@ -541,9 +541,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
  
    open_url_params.source_site_instance = site_instance_;
  
@@ -276,7 +264,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
-@@ -806,11 +806,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
+@@ -821,11 +821,9 @@ class AttributionDataHostManagerImpl::PendingRegistrationData {
          headers->GetNormalizedHeader(
              attribution_reporting::kAttributionReportingRegisterTriggerHeader);
  
@@ -290,7 +278,7 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager
  
      const bool has_source =
          web_source_header.has_value() || os_source_header.has_value();
-@@ -1169,6 +1167,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -1184,6 +1182,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
      Registrations& registrations,
      HeaderPendingDecode pending_decode,
      Registrar registrar) {
@@ -311,18 +299,18 @@ diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content
  #endif
  }
  
-@@ -347,6 +345,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -348,6 +346,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
      return;
    }
  
 +  if ((true)) return;
    auto* attribution_manager =
        AttributionManager::FromWebContents(web_contents());
-   DCHECK(attribution_manager);
+   CHECK(attribution_manager);
 diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc
 --- a/content/browser/attribution_reporting/attribution_manager_impl.cc
 +++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
-@@ -593,11 +593,7 @@ bool IsOperationAllowed(
+@@ -612,11 +612,7 @@ bool IsOperationAllowed(
  }
  
  std::unique_ptr<AttributionOsLevelManager> CreateOsLevelManager() {
@@ -333,7 +321,7 @@ diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b
 -#endif
  }
  
- // Returns new report time if any.
+ base::Time GetReportExpiryTime(const AttributionReport& report) {
 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
@@ -408,7 +396,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -10374,6 +10374,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
+@@ -10465,6 +10465,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
      return false;
    }
  
@@ -416,7 +404,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
    if (!IsActive()) {
      // reportEvent is not allowed when this RenderFrameHost or one of its
      // ancestors is not active.
-@@ -14256,6 +14257,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
+@@ -14415,6 +14416,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
      return;
    }
  
@@ -436,7 +424,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
-@@ -1469,15 +1469,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1484,15 +1484,6 @@ void StoragePartitionImpl::Initialize(
  
    bucket_manager_ = std::make_unique<BucketManager>(this);
  
@@ -452,7 +440,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
    if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
      // Auction worklets on non-Android use dedicated processes; on Android due
      // to high cost of process launch they try to reuse renderers.
-@@ -1529,9 +1520,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1544,9 +1535,6 @@ void StoragePartitionImpl::Initialize(
  
    font_access_manager_ = FontAccessManager::Create();
  
@@ -465,7 +453,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
-@@ -202,8 +202,6 @@ android_library("content_full_java") {
+@@ -205,8 +205,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",
@@ -939,7 +927,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
-@@ -622,6 +622,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -631,6 +631,7 @@ void ContentBrowserClient::OnAuctionComplete(
  network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -947,7 +935,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;
-@@ -639,13 +640,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -648,13 +649,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -963,7 +951,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
  }
  
  bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -653,7 +654,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -662,7 +663,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
      content::RenderFrameHost* rfh,
      const url::Origin& context_origin,
      const url::Origin& reporting_origin) {
@@ -1017,7 +1005,7 @@ diff --git a/services/network/attribution/request_headers_internal.cc b/services
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1300,6 +1300,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
+@@ -1318,6 +1318,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
  
  void NetworkContext::ClearTrustTokenSessionOnlyData(
      ClearTrustTokenSessionOnlyDataCallback callback) {
@@ -1028,7 +1016,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
    // Only called when Private State Tokens is enabled, i.e.,
    // `trust_token_store_` is non-null.
    DCHECK(trust_token_store_);
-@@ -2688,26 +2692,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2731,26 +2735,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
      builder.set_network_quality_estimator(
          network_service_->network_quality_estimator());
    }
@@ -1058,7 +1046,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
 diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network/public/cpp/attribution_utils.cc
 --- a/services/network/public/cpp/attribution_utils.cc
 +++ b/services/network/public/cpp/attribution_utils.cc
-@@ -10,6 +10,7 @@
+@@ -9,6 +9,7 @@
  namespace network {
  
  bool HasAttributionOsSupport(mojom::AttributionSupport attribution_support) {
@@ -1066,7 +1054,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
    switch (attribution_support) {
      case mojom::AttributionSupport::kOs:
      case mojom::AttributionSupport::kWebAndOs:
-@@ -23,6 +24,7 @@ bool HasAttributionOsSupport(mojom::AttributionSupport attribution_support) {
+@@ -21,6 +22,7 @@ bool HasAttributionOsSupport(mojom::AttributionSupport attribution_support) {
  }
  
  bool HasAttributionWebSupport(mojom::AttributionSupport attribution_support) {
@@ -1089,7 +1077,7 @@ diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/t
 diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
 --- a/third_party/blink/renderer/core/page/page.cc
 +++ b/third_party/blink/renderer/core/page/page.cc
-@@ -1630,7 +1630,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1604,7 +1604,7 @@ void Page::UpdateBrowsingContextGroup(
  
  void Page::SetAttributionSupport(
      network::mojom::AttributionSupport attribution_support) {
@@ -1112,8 +1100,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        origin_trial_feature_name: "AdInterestGroupAPI",
        implied_by: ["Fledge", "Parakeet"],
        public: true,
-@@ -541,8 +541,8 @@
+@@ -558,8 +558,8 @@
-       name: "AtomicMoveRangePreservation",
+       status: "stable",
      },
      {
 -      name: "AttributionReporting",
@@ -1123,7 +1111,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -3781,8 +3781,8 @@
+@@ -3778,8 +3778,8 @@
        base_feature: "none",
      },
      {
@@ -1134,8 +1122,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        base_feature: "none",
        public: true,
      },
-@@ -4901,16 +4901,16 @@
+@@ -4983,16 +4983,16 @@
-       status: "experimental",
+       status: "stable",
      },
      {
 -      name: "TopicsAPI",
@@ -1158,10 +1146,10 @@ 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
-@@ -365,8 +365,12 @@ MotionEventAndroid::ToolType MotionEventAndroid::FromAndroidToolType(
+@@ -30,8 +30,12 @@ namespace ui {
- #undef TOOL_TYPE_CASE
+ namespace {
  
- base::TimeTicks MotionEventAndroid::FromAndroidTime(base::TimeTicks time) {
+ base::TimeTicks FromAndroidTime(base::TimeTicks time) {
 -  ValidateEventTimeClock(&time);
 -  return time;
 +  base::TimeTicks timestamp;
@@ -1172,5 +1160,5 @@ diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motio
 +  return timestamp;
  }
  
- float MotionEventAndroid::ToValidFloat(float x) {
+ float ToValidFloat(float x) {
 --

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
-@@ -2644,15 +2644,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2719,15 +2719,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
-@@ -15869,6 +15869,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -16087,6 +16087,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
-@@ -10221,7 +10221,7 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -10263,7 +10263,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
-@@ -107,7 +107,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
+@@ -102,7 +102,7 @@ void GenerateJavaScriptCallStack(v8::Isolate* isolate, void* data) {
      return;
    }
    ExecutionContext* execution_context = ToExecutionContext(script_state);

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

@@ -20,7 +20,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1376,8 +1376,7 @@
+@@ -1436,8 +1436,7 @@
        status: "test",
      },
      {

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

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

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

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

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

@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../firstrun/VariationsSeedFetcher.java       | 36 +++----------------
  components/variations/net/BUILD.gn            |  2 --
  .../variations/net/variations_http_headers.cc |  2 ++
- .../variations_field_trial_creator_base.cc    |  6 ++--
+ .../service/variations_field_trial_creator.cc |  6 ++--
  .../variations/service/variations_service.cc  | 19 ++--------
  .../browser/loader/url_loader_throttles.cc    |  7 ----
  .../origin_trials/origin_trials_utils.cc      |  2 +-
@@ -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
-@@ -500,6 +500,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -514,6 +514,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
  
  content::OriginTrialsControllerDelegate*
  AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -157,7 +157,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -862,7 +862,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
+@@ -930,7 +930,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
-@@ -192,6 +192,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
+@@ -203,6 +203,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
  
  UkmRecorderImpl::UkmRecorderImpl()
      : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -281,10 +281,10 @@ diff --git a/components/variations/net/variations_http_headers.cc b/components/v
      // Note the criteria for attaching client experiment headers:
      // 1. We only transmit to Google owned domains which can evaluate
      // experiments.
-diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
+diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
---- a/components/variations/service/variations_field_trial_creator_base.cc
+--- a/components/variations/service/variations_field_trial_creator.cc
-+++ b/components/variations/service/variations_field_trial_creator_base.cc
++++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -132,6 +132,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
+@@ -126,6 +126,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
  }
  
  #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -292,27 +292,27 @@ 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
-@@ -339,9 +340,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
+@@ -319,9 +320,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
-         synthetic_trial_registry, std::move(client_filterable_state));
+         std::move(client_filterable_state));
    }
  
 -  platform_field_trials->SetUpClientSideFieldTrials(
--      used_seed, entropy_providers, feature_list.get());
+-      create_trials_result.applied_seed, entropy_providers, feature_list.get());
 -
    platform_field_trials->RegisterFeatureOverrides(feature_list.get());
  
    base::FeatureList::SetInstance(std::move(feature_list));
-@@ -653,6 +651,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
+@@ -651,6 +649,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+     base::FeatureList* feature_list,
      SafeSeedManagerBase* safe_seed_manager,
-     SyntheticTrialRegistry* synthetic_trial_registry,
      std::unique_ptr<ClientFilterableState> client_state) {
-+  if ((true)) return false;
++  if ((true)) return CreateTrialsResult{.applied_seed = false};
    // This histogram name uses "VariationsFieldTrialCreator" rather than
-   // "VariationsFieldTrialCreatorBase" for consistency with historical data
+   // "VariationsFieldTrialCreator" for consistency with historical data
    TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
-@@ -765,6 +764,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
+@@ -764,6 +763,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
  
- void VariationsFieldTrialCreatorBase::LoadSeedFromJsonFile(
+ void VariationsFieldTrialCreator::LoadSeedFromJsonFile(
      const base::FilePath& json_seed_path) {
 +  if ((true)) return;
    VLOG(1) << "Loading seed from JSON file:" << 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
-@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -223,22 +223,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
@@ -345,7 +345,7 @@ diff --git a/components/variations/service/variations_service.cc b/components/va
  }
  
  // Returns the already downloaded first run seed, and clear the seed from the
-@@ -640,7 +625,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -626,7 +611,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
    // debugger or if the machine was suspended) and OnURLFetchComplete() hasn't
    // had a chance to run yet from the previous request. In this case, don't
    // start a new request and just let the previous one finish.
@@ -393,7 +393,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -838,6 +838,7 @@ void PersistOriginTrialsFromHeaders(
+@@ -843,6 +843,7 @@ void PersistOriginTrialsFromHeaders(
      const network::mojom::URLResponseHead* response,
      BrowserContext* browser_context,
      ukm::SourceId source_id) {
@@ -437,7 +437,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -208,13 +208,6 @@ std::vector<int> CopyInitiatorOriginTrials(
+@@ -209,13 +209,6 @@ std::vector<int> CopyInitiatorOriginTrials(
      const Vector<mojom::blink::OriginTrialFeature>&
          initiator_origin_trial_features) {
    std::vector<int> result;

build/patches/Disable-idle-detection.patch

@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 --- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 +++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
-@@ -369,6 +369,7 @@
+@@ -375,6 +375,7 @@
      {
        name: "IdleDetection",
        permissions_policy_name: "idle-detection",

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

@@ -15,15 +15,15 @@ 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
-@@ -107,6 +107,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -111,6 +111,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
  }
  
  bool MediaRouterEnabled(content::BrowserContext* context) {
 +  if ((true)) return false;
- #if !BUILDFLAG(IS_ANDROID)
+ #if !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
    if (!base::FeatureList::IsEnabled(kMediaRouter)) {
      return false;
-@@ -153,7 +154,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -158,7 +159,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(
@@ -32,9 +32,9 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
    registry->RegisterBooleanPref(
        media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
        true);
-@@ -215,4 +216,7 @@ bool IsCastMessageLoggingEnabled() {
+@@ -221,4 +222,7 @@ bool IsCastMessageLoggingEnabled() {
- }
+ #endif  // !BUILDFLAG(IS_ANDROID) ||
- #endif  // !BUILDFLAG(IS_ANDROID)
+         // BUILDFLAG(ENABLE_DESKTOP_ANDROID_EXTENSIONS)
  
 +#if !BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kMediaRouter);
@@ -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
-@@ -548,6 +548,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -540,6 +540,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
      WebRuntimeFeatures::EnableV8IdleTasks(true);
    }
  
@@ -63,7 +63,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +
    WebRuntimeFeatures::EnableBackForwardCache(
        content::IsBackForwardCacheEnabled());
- }
+ 
 diff --git a/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc b/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
 --- a/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
 +++ b/third_party/blink/renderer/modules/remoteplayback/remote_playback.cc
@@ -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
-@@ -3939,14 +3939,10 @@
+@@ -3969,14 +3969,10 @@
        base_feature: "none",
      },
      {
@@ -96,5 +96,5 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +      status: "experimental",        // by default
      },
      {
-       name: "RemoveDanglingMarkupInTarget",
+       // This feature acts as a kill switch for ISO-2022-JP auto-detection.
 --