Rebase to v132 (#1724)

Rebase to v132

build/RELEASE

@@ -1 +1 @@
-131.0.6778.205
+132.0.6834.83

build/cromite_patches_list.txt

@@ -124,7 +124,6 @@ Add-flag-to-disable-vibration.patch
 mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
 Client-hints-overrides.patch
 Allow-building-without-enable_reporting.patch
-Disable-lock-icon-in-address-bar-by-default.patch
 Experimental-user-scripts-support.patch
 Keep-empty-tabs-between-sessions.patch
 Disable-third-party-origin-trials.patch

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

@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -3408,6 +3408,10 @@
+@@ -3290,6 +3290,10 @@
      "name": "enable-identity-in-auth-error",
      "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],
      "expiry_milestone": 135
@@ -145,7 +145,7 @@ diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_lis
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -53,6 +53,11 @@ BASE_FEATURE(kUseGles2ForOopR,
+@@ -59,6 +59,11 @@ BASE_FEATURE(kAggressiveShaderCacheLimits,
               base::FEATURE_DISABLED_BY_DEFAULT);
  
  #if BUILDFLAG(IS_ANDROID)
@@ -160,9 +160,9 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 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
-@@ -24,6 +24,7 @@ GPU_EXPORT BASE_DECLARE_FEATURE(kUseGles2ForOopR);
- // All features in alphabetical order. The features should be documented
- // alongside the definition of their values in the .cc file.
+@@ -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);
@@ -171,7 +171,7 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h
 diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
 --- a/gpu/config/gpu_util.cc
 +++ b/gpu/config/gpu_util.cc
-@@ -126,6 +126,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
+@@ -125,6 +125,9 @@ GpuFeatureStatus GetAndroidSurfaceControlFeatureStatus(
  #if !BUILDFLAG(IS_ANDROID)
    return kGpuFeatureStatusDisabled;
  #else
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc
    if (!gpu_preferences.enable_android_surface_control)
      return kGpuFeatureStatusDisabled;
  
-@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
+@@ -378,6 +381,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,
            kGpuFeatureStatusSoftware;
      }
    }
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc
  #endif
  
  #if BUILDFLAG(ENABLE_VULKAN)
-@@ -702,6 +703,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
+@@ -701,6 +702,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,
    }
  #endif  // BUILDFLAG(IS_WIN)
  

build/patches/Add-AllowUserCertificates-flag.patch

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -227,6 +227,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
+@@ -223,6 +223,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;
  import org.chromium.content_public.browser.SelectionPopupController;
  import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.common.ContentSwitches;
@@ -28,10 +28,10 @@ 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;
-@@ -1044,6 +1045,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -1056,6 +1057,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+         super.onStartWithNative();
  
          ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
-         ChromeCachedFlags.getInstance().cacheNativeFlags();
 +        X509Util.AllowUserCertificates = ChromeFeatureList.isEnabled(
 +                                            ChromeFeatureList.ALLOW_USER_CERTIFICATES);
  
@@ -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
-@@ -161,6 +161,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -165,6 +165,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &feed::kFeedPerformanceStudy,
      &feed::kFeedShowSignInCommand,
      &feed::kFeedSignedOutViewDemotion,
@@ -51,7 +51,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -161,6 +161,7 @@ public abstract class ChromeFeatureList {
+@@ -155,6 +155,7 @@ public abstract class ChromeFeatureList {
      /* Alphabetical: */
      public static final String ACCOUNT_REAUTHENTICATION_RECENT_TIME_WINDOW =
              "AccountReauthenticationRecentTimeWindow";
@@ -59,7 +59,7 @@ 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 ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
-@@ -609,6 +610,8 @@ public abstract class ChromeFeatureList {
+@@ -586,6 +587,8 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =
              newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);
      public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -67,15 +67,15 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
      public static final CachedFlag sAsyncNotificationManager =
              newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false);
-     public static final CachedFlag sBackGestureActivityTabProvider =
-@@ -780,6 +783,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sBlockIntentsWhileLocked =
+@@ -744,6 +747,7 @@ public abstract class ChromeFeatureList {
      public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =
              List.of(
                      sAccountReauthenticationRecentTimeWindow,
 +                    sAllowUserCertificates,
                      sAndroidAppIntegration,
+                     sAndroidAppIntegrationV2,
                      sAndroidAppIntegrationWithFavicon,
-                     sAndroidBottomToolbar,
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
 new file mode 100644
 --- /dev/null

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
-@@ -392,6 +392,8 @@ public class KeyboardShortcuts {
+@@ -403,6 +403,8 @@ public class KeyboardShortcuts {
                  R.string.keyboard_shortcut_address_bar,
                  KeyEvent.KEYCODE_L,
                  KeyEvent.META_CTRL_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
-@@ -383,6 +383,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -371,6 +371,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
        }
      }
  

build/patches/Add-PartialLowEndModeOnMidRangeDevices-flag.patch

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/base/features.cc b/base/features.cc
 --- a/base/features.cc
 +++ b/base/features.cc
-@@ -121,6 +121,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
+@@ -115,6 +115,10 @@ BASE_FEATURE(kPostGetMyMemoryStateToBackground,
               FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_ANDROID)
  
@@ -29,7 +29,7 @@ diff --git a/base/features.cc b/base/features.cc
 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
-@@ -21,6 +21,7 @@
+@@ -22,6 +22,7 @@
  #include "base/base_switches.h"
  #include "base/command_line.h"
  #include "base/feature_list.h"

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

@@ -5,16 +5,19 @@ Subject: Add a flag to disable GamePad API
 Adds restrict-gamepad-access flag (default active) to disable GamePad API.
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/flag-metadata.json                           | 4 ++--
- chrome/browser/flag_descriptions.cc                         | 2 +-
- device/gamepad/public/cpp/gamepad_features.cc               | 1 +
- .../blink/renderer/modules/gamepad/navigator_gamepad.cc     | 6 ++++++
- 4 files changed, 10 insertions(+), 3 deletions(-)
+ chrome/browser/flag-metadata.json                         | 4 ++--
+ content/child/runtime_features.cc                         | 2 ++
+ .../about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc  | 7 +++++++
+ device/gamepad/public/cpp/gamepad_features.cc             | 8 ++++++++
+ device/gamepad/public/cpp/gamepad_features.h              | 2 ++
+ .../blink/renderer/modules/gamepad/navigator_gamepad.cc   | 7 +++++++
+ 6 files changed, 28 insertions(+), 2 deletions(-)
+ create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc
 
 diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
 --- a/chrome/browser/flag-metadata.json
 +++ b/chrome/browser/flag-metadata.json
-@@ -7807,9 +7807,9 @@
+@@ -7726,9 +7726,9 @@
      "expiry_milestone" : 130
    },
    {
@@ -26,46 +29,87 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
    },
    {
      "name": "retain-omnibox-on-focus",
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -3331,7 +3331,7 @@ const char kResetShortcutCustomizationsDescription[] =
- 
- const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
- const char kRestrictGamepadAccessDescription[] =
--    "Enables Permissions Policy and Secure Context restrictions on the Gamepad "
-+    "Disable the Gamepad "
-     "API";
- 
- #if BUILDFLAG(IS_ANDROID)
+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
+@@ -271,6 +271,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+            raw_ref(features::kPeriodicBackgroundSync)},
+           {wf::EnablePushMessagingSubscriptionChange,
+            raw_ref(features::kPushSubscriptionChangeEvent)},
++          {wf::EnableRestrictGamepadAccess,
++           raw_ref(features::kRestrictGamepadAccess)},
+           {wf::EnableSecurePaymentConfirmation,
+            raw_ref(features::kSecurePaymentConfirmation)},
+           {wf::EnableSecurePaymentConfirmationDebug,
+diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc
+new file mode 100644
+--- /dev/null
++++ b/cromite_flags/chrome/browser/about_flags_cc/Add-a-flag-to-disable-GamePad-API.inc
+@@ -0,0 +1,7 @@
++#ifdef FLAG_SECTION
++
++    {"restrict-gamepad-access", "Restrict gamepad access",
++     "Disable the Gamepad API", kOsAll,
++     FEATURE_VALUE_TYPE(features::kRestrictGamepadAccess)},
++
++#endif
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc
-@@ -64,4 +64,5 @@ bool IsGamepadMultitouchEnabled() {
+@@ -27,4 +27,12 @@ bool IsGamepadMultitouchEnabled() {
    return false;
  }
  
-+SET_CROMITE_FEATURE_ENABLED(kRestrictGamepadAccess);
++CROMITE_FEATURE(kRestrictGamepadAccess,
++                "RestrictGamepadAccess",
++                base::FEATURE_ENABLED_BY_DEFAULT);
++
++bool IsRestrictGamepadAccessEnabled() {
++  return base::FeatureList::IsEnabled(kRestrictGamepadAccess);
++}
++
  }  // namespace features
+diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
+--- a/device/gamepad/public/cpp/gamepad_features.h
++++ b/device/gamepad/public/cpp/gamepad_features.h
+@@ -11,8 +11,10 @@
+ namespace features {
+ 
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
++GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
+ 
+ GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
++GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
+ 
+ }  // namespace features
+ 
 diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
 --- a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
 +++ b/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc
-@@ -120,6 +120,10 @@ void RecordGamepadsForIdentifiabilityStudy(
+@@ -27,6 +27,7 @@
+ 
+ #include "base/auto_reset.h"
+ #include "device/gamepad/public/cpp/gamepads.h"
++#include "device/gamepad/public/cpp/gamepad_features.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_metric_builder.h"
+ #include "third_party/blink/public/common/privacy_budget/identifiability_study_settings.h"
+ #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom-blink.h"
+@@ -112,6 +113,10 @@ void RecordGamepadsForIdentifiabilityStudy(
  HeapVector<Member<Gamepad>> NavigatorGamepad::getGamepads(
      Navigator& navigator,
      ExceptionState& exception_state) {
-+  if (base::FeatureList::IsEnabled(::features::kRestrictGamepadAccess)) {
++  if (::features::IsRestrictGamepadAccessEnabled()) {
 +    exception_state.ThrowSecurityError("Access to the feature \"gamepad\" is denied");
 +    return HeapVector<Member<Gamepad>>();
 +  }
    if (!navigator.DomWindow()) {
      // Using an existing NavigatorGamepad if one exists, but don't create one
      // for a detached window, as its subclasses depend on a non-null window.
-@@ -442,6 +446,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
+@@ -418,6 +423,8 @@ void NavigatorGamepad::SampleAndCompareGamepadState() {
  
  void NavigatorGamepad::DispatchGamepadEvent(const AtomicString& event_name,
                                              Gamepad* gamepad) {
-+  if (base::FeatureList::IsEnabled(::features::kRestrictGamepadAccess))
++  if (::features::IsRestrictGamepadAccessEnabled())
 +    return;
    // Ensure that we're blocking re-entrancy.
    DCHECK(processing_events_);

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

@@ -29,9 +29,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/browser/resources/proxy_config.html    |  77 ++++
  chrome/browser/resources/proxy_config.js      | 278 +++++++++++++
  chrome/browser/ui/BUILD.gn                    |   2 +
- .../webui/chrome_web_ui_controller_factory.cc |   5 +-
+ .../browser/ui/webui/chrome_web_ui_configs.cc |   4 +
  chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
- chrome/browser/ui/webui/proxy_config_ui.h     |  31 ++
+ chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++
  chrome/common/webui_url_constants.cc          |   2 +
  chrome/common/webui_url_constants.h           |   2 +
  .../pref_proxy_config_tracker_impl.cc         |   5 +-
@@ -40,7 +40,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../proxy_config/proxy_policy_handler.cc      |   2 +-
  net/proxy_resolution/proxy_config.cc          |  51 ++-
  net/proxy_resolution/proxy_config.h           |   3 +
- 25 files changed, 974 insertions(+), 18 deletions(-)
+ 25 files changed, 984 insertions(+), 17 deletions(-)
  create mode 100644 chrome/browser/resources/proxy_config.css
  create mode 100644 chrome/browser/resources/proxy_config.html
  create mode 100644 chrome/browser/resources/proxy_config.js
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -75,6 +75,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -76,6 +76,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private static final String PREF_SAFE_BROWSING = "safe_browsing";
      private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
      private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -112,7 +112,7 @@ diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resou
 diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
 +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
-@@ -392,7 +392,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
+@@ -372,7 +372,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
          return std::nullopt;
        }
        return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -202,6 +202,8 @@
+@@ -198,6 +198,8 @@
  #include "printing/buildflags/buildflags.h"
  #include "rlz/buildflags/buildflags.h"
  
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
  #include "chrome/browser/background/background_mode_manager.h"
  #endif
-@@ -1652,6 +1654,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1615,6 +1617,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    component_updater::RegisterPrefs(registry);
    domain_reliability::RegisterPrefs(registry);
    embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -660,7 +660,7 @@ new file mode 100644
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -238,6 +238,8 @@ static_library("ui") {
+@@ -224,6 +224,8 @@ static_library("ui") {
      "webui/metrics_internals/metrics_internals_ui.h",
      "webui/net_export_ui.cc",
      "webui/net_export_ui.h",
@@ -669,28 +669,25 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
      "webui/net_internals/net_internals_ui.cc",
      "webui/net_internals/net_internals_ui.h",
      "webui/ntp_tiles_internals_ui.cc",
-diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
---- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -32,6 +32,7 @@
- #include "chrome/browser/ui/webui/about/about_ui.h"
- #include "chrome/browser/ui/webui/components/components_ui.h"
- #include "chrome/browser/ui/webui/crashes_ui.h"
+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
+@@ -56,6 +56,9 @@
+ #include "extensions/buildflags/buildflags.h"
+ #include "printing/buildflags/buildflags.h"
+ 
 +#include "chrome/browser/ui/webui/proxy_config_ui.h"
- #include "chrome/browser/ui/webui/download_internals/download_internals_ui.h"
- #include "chrome/browser/ui/webui/flags/flags_ui.h"
- #include "chrome/browser/ui/webui/webui_util.h"
-@@ -261,7 +262,9 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
-       history_clusters_internals::kChromeUIHistoryClustersInternalsHost) {
-     return &NewWebUI<HistoryClustersInternalsUI>;
-   }
--
-+  if (url.host_piece() == chrome::kChromeUIProxyConfigHost) {
-+    return &NewWebUI<ProxyConfigUI>;
-+  }
- #if !BUILDFLAG(IS_ANDROID)
-   if (url.host_piece() == chrome::kChromeUINewTabHost) {
-     // The URL chrome://newtab/ can be either a virtual or a real URL,
++
++
+ #if BUILDFLAG(ENABLE_NACL)
+ #include "chrome/browser/ui/webui/nacl_ui.h"
+ #endif
+@@ -410,4 +413,5 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<SigninErrorUIConfig>());
+   map.AddWebUIConfig(std::make_unique<SigninEmailConfirmationUIConfig>());
+ #endif  //  !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
++  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
+ }
 diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc
 new file mode 100644
 --- /dev/null
@@ -893,7 +890,7 @@ new file mode 100644
 +      state.SetByDottedPath("config.rules.fallback_proxies", base::Value(omitDirect(rules.fallback_proxies.ToPacString())));
 +      break;
 +    default:
-+     NOTREACHED_NORETURN();
++     NOTREACHED();
 +  }
 +  state.SetByDottedPath("config.rules.type", base::Value(type));
 +  state.SetByDottedPath("config.rules.bypass_rules", base::Value(rules.bypass_rules.ToString()));
@@ -1089,7 +1086,7 @@ diff --git a/chrome/browser/ui/webui/proxy_config_ui.h b/chrome/browser/ui/webui
 new file mode 100644
 --- /dev/null
 +++ b/chrome/browser/ui/webui/proxy_config_ui.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,41 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1110,7 +1107,9 @@ new file mode 100644
 +#ifndef CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +#define CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 +
++#include "chrome/common/webui_url_constants.h"
 +#include "content/public/browser/web_ui_controller.h"
++#include "content/public/browser/webui_config.h"
 +
 +// The WebUI for chrome://proxy/.
 +class ProxyConfigUI : public content::WebUIController {
@@ -1120,6 +1119,14 @@ new file mode 100644
 +  explicit ProxyConfigUI(content::WebUI* web_ui);
 +};
 +
++class ProxyConfigUIConfig
++    : public content::DefaultWebUIConfig<ProxyConfigUI> {
++ public:
++  ProxyConfigUIConfig()
++      : DefaultWebUIConfig(content::kChromeUIScheme,
++                           chrome::kChromeUIProxyConfigHost) {}
++};
++
 +#endif  // CHROME_BROWSER_UI_WEBUI_PROXY_CONFIG_UI_H_
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
@@ -1321,8 +1328,8 @@ diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_
 diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_config.cc
 --- a/net/proxy_resolution/proxy_config.cc
 +++ b/net/proxy_resolution/proxy_config.cc
-@@ -131,7 +131,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
-             url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP,
+@@ -129,7 +129,7 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
+             std::move(url_scheme), &single_proxies, ProxyServer::SCHEME_HTTP,
              allow_bracketed_proxy_chains, is_quic_allowed);
          type = Type::PROXY_LIST;
 -        return;
@@ -1330,7 +1337,7 @@ diff --git a/net/proxy_resolution/proxy_config.cc b/net/proxy_resolution/proxy_c
        }
  
        // Trim whitespace off the url scheme.
-@@ -162,6 +162,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
+@@ -160,6 +160,55 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules,
    }
  }
  

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

@@ -79,12 +79,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../browser/autocomplete_provider_client.cc   |   4 +
  .../browser/autocomplete_provider_client.h    |   1 +
  .../omnibox/browser/base_search_provider.cc   |   2 +-
- components/omnibox/browser/search_provider.cc |   7 +-
+ components/omnibox/browser/search_provider.cc |   3 +-
  .../add-an-always-incognito-mode.inc          |  13 ++
  .../add-an-always-incognito-mode.inc          |   1 +
  .../add-an-always-incognito-mode.inc          |   3 +
  .../add-an-always-incognito-mode.inc          |   1 +
- 65 files changed, 787 insertions(+), 113 deletions(-)
+ 65 files changed, 784 insertions(+), 112 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
@@ -97,7 +97,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
-@@ -626,6 +626,7 @@ chrome_java_resources = [
+@@ -627,6 +627,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",
@@ -108,15 +108,15 @@ 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
-@@ -3,6 +3,7 @@
- # found in the LICENSE file.
+@@ -5,6 +5,7 @@
+ import("//content/public/common/features.gni")
  
  chrome_java_sources = [
 +  "java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.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",
-@@ -952,6 +953,7 @@ chrome_java_sources = [
+@@ -947,6 +948,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",
@@ -243,7 +243,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
-@@ -72,6 +72,10 @@ import org.chromium.base.task.TaskTraits;
+@@ -70,6 +70,10 @@ import org.chromium.base.task.TaskTraits;
  import org.chromium.build.annotations.UsedByReflection;
  import org.chromium.cc.input.BrowserControlsState;
  import org.chromium.chrome.R;
@@ -254,7 +254,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.IntentHandler.TabOpenType;
  import org.chromium.chrome.browser.app.ChromeActivity;
  import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;
-@@ -686,14 +690,19 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -699,14 +703,19 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  
              Profile profile = mTabModelSelector.getCurrentModel().getProfile();
              // For saving non-incognito tab closures for Recent Tabs.
@@ -281,7 +281,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
              // Defer creation of this helper so it triggers after TabGroupModelFilter observers.
              mUndoRefocusHelper =
                      new UndoRefocusHelper(
-@@ -2383,8 +2392,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2443,8 +2452,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  
          // We determine the model as soon as possible so every systems get initialized coherently.
          boolean startIncognito =
@@ -296,7 +296,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
-@@ -94,6 +94,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
+@@ -92,6 +92,7 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
  import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
@@ -304,7 +304,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
  import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
  import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
  import org.chromium.chrome.browser.device.DeviceClassManager;
-@@ -1981,6 +1982,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2005,6 +2006,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              throw new IllegalStateException(
                      "Attempting to access TabCreator before initialization");
          }
@@ -326,7 +326,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
  import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils;
  import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
-@@ -100,6 +102,10 @@ import java.util.ArrayList;
+@@ -102,6 +104,10 @@ import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.List;
  
@@ -337,7 +337,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  /**
   * Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
   * items based on activity state.
-@@ -584,6 +590,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -593,6 +599,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
      }
  
      private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -351,7 +351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
          // We have to iterate all menu items since same menu item ID may be associated with more
          // than one menu items.
          boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
-@@ -647,7 +660,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -656,7 +669,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
              }
  
              if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -368,7 +368,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
              }
              if (item.getItemId() == R.id.menu_select_tabs) {
                  item.setVisible(isMenuSelectTabsVisible);
-@@ -861,8 +882,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -870,8 +891,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                  && !isNativePage
                  && !isFileScheme
                  && !isContentScheme
@@ -391,7 +391,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
  import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
  import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
  import org.chromium.chrome.browser.download.DownloadUtils;
-@@ -271,6 +272,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -267,6 +268,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
      public List<Pair<Integer, ModelList>> buildContextMenu() {
          mShowEphemeralTabNewLabel = null;
  
@@ -401,7 +401,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
          List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
  
          if (mParams.isAnchor()) {
-@@ -281,6 +285,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -277,6 +281,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  if (mMode == ContextMenuMode.NORMAL) {
                      linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
                      linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
@@ -409,7 +409,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
                      if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
                          linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
                      }
-@@ -305,7 +310,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -301,7 +306,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                  }
              }
              if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -421,29 +421,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java
-@@ -71,45 +71,6 @@ public class CustomTabActivityLifecycleUmaTracker
+@@ -70,45 +70,6 @@ public class CustomTabActivityLifecycleUmaTracker
      private boolean mIsInitialResume = true;
  
      private void recordIncognitoLaunchReason() {
 -        // TODO(crbug.com/352525607): Separate Ephemeral and Incognito CCT metrics.
--        @IntentHandler.IncognitoCCTCallerId int incognitoCCTCallerId;
+-        @IntentHandler.IncognitoCctCallerId int incognitoCctCallerId;
 -        if (mIntentDataProvider.getCustomTabMode() == CustomTabProfileType.INCOGNITO) {
--            incognitoCCTCallerId =
+-            incognitoCctCallerId =
 -                    ((IncognitoCustomTabIntentDataProvider) mIntentDataProvider)
 -                            .getFeatureIdForMetricsCollection();
 -        } else {
--            incognitoCCTCallerId =
+-            incognitoCctCallerId =
 -                    ((EphemeralCustomTabIntentDataProvider) mIntentDataProvider)
 -                            .getFeatureIdForMetricsCollection();
 -        }
 -
 -        RecordHistogram.recordEnumeratedHistogram(
--                "CustomTabs.IncognitoCCTCallerId",
--                incognitoCCTCallerId,
--                IntentHandler.IncognitoCCTCallerId.NUM_ENTRIES);
+-                "CustomTabs.IncognitoCctCallerId",
+-                incognitoCctCallerId,
+-                IntentHandler.IncognitoCctCallerId.NUM_ENTRIES);
 -
 -        // Record which 1P app launched Incognito CCT.
--        if (incognitoCCTCallerId == IntentHandler.IncognitoCCTCallerId.GOOGLE_APPS) {
+-        if (incognitoCctCallerId == IntentHandler.IncognitoCctCallerId.GOOGLE_APPS) {
 -            String sendersPackageName = mIntentDataProvider.getClientPackageName();
 -            @IntentHandler.ExternalAppId
 -            int externalId = IntentHandler.mapPackageToExternalAppId(sendersPackageName);
@@ -478,7 +478,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
  import org.chromium.chrome.browser.app.appmenu.DividerLineMenuItemViewBinder;
-@@ -213,6 +214,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -218,6 +219,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
                  openInChromeItemVisible = false;
                  tryAddingReadAloud = false;
              }
@@ -501,7 +501,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;
-@@ -1222,6 +1225,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1231,6 +1234,13 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
          return getInitialActivityWidth() > 0;
      }
  
@@ -537,7 +537,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/Downlo
  /** A class containing some utility static methods. */
  public class DownloadUtils {
      private static final String TAG = "download";
-@@ -297,7 +302,16 @@ public class DownloadUtils {
+@@ -298,7 +303,16 @@ public class DownloadUtils {
          // Offline pages isn't supported in Incognito. This should be checked before calling
          // OfflinePageBridge.getForProfile because OfflinePageBridge instance will not be found
          // for incognito profile.
@@ -683,7 +683,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;
-@@ -316,7 +317,8 @@ public class NativePageFactory {
+@@ -320,7 +321,8 @@ public class NativePageFactory {
              String url, NativePage candidatePage, Tab tab, boolean isIncognito, PdfInfo pdfInfo) {
          NativePage page;
  
@@ -722,7 +722,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
          mActiveTab = tab;
          mTabModelSelector = tabModelSelector;
          mShowHistoryManager = showHistoryManager;
-@@ -273,6 +283,22 @@ public class RecentTabsManager
+@@ -269,6 +279,22 @@ public class RecentTabsManager
       */
      public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
          if (mIsDestroyed) return;
@@ -923,7 +923,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
  import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
  import org.chromium.components.browser_ui.settings.FragmentSettingsNavigation;
  import org.chromium.components.browser_ui.site_settings.BaseSiteSettingsFragment;
-@@ -271,6 +272,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -270,6 +271,9 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
              safetyHubFragment.setCustomTabIntentHelper(
                      LaunchIntentDispatcher::createCustomTabActivityIntent);
          }
@@ -936,7 +936,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
-@@ -23,6 +23,8 @@ import java.util.HashMap;
+@@ -22,6 +22,8 @@ import java.util.HashMap;
  import java.util.List;
  import java.util.Set;
  
@@ -945,7 +945,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
  /** A tab model observer for managing bulk closures. */
  public class HistoricalTabModelObserver implements TabModelObserver {
      private final TabGroupModelFilter mTabGroupModelFilter;
-@@ -71,9 +73,10 @@ public class HistoricalTabModelObserver implements TabModelObserver {
+@@ -70,9 +72,10 @@ public class HistoricalTabModelObserver implements TabModelObserver {
          if (tabs.isEmpty() || !canRestore) return;
  
          if (tabs.size() == 1) {
@@ -1042,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -158,6 +158,8 @@ import org.chromium.ui.InsetObserver;
+@@ -159,6 +159,8 @@ import org.chromium.ui.InsetObserver;
  import org.chromium.ui.UiUtils;
  import org.chromium.ui.base.ActivityWindowAndroid;
  import org.chromium.ui.base.DeviceFormFactor;
@@ -1051,7 +1051,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
  import org.chromium.ui.base.IntentRequestTracker;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.dragdrop.DragDropGlobalState;
-@@ -1017,7 +1019,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1029,7 +1031,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                              () -> {
                                  mTabCreatorManagerSupplier
                                          .get()
@@ -1085,15 +1085,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
-@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
- import androidx.annotation.VisibleForTesting;
+@@ -12,6 +12,7 @@ import androidx.annotation.VisibleForTesting;
  
  import org.chromium.base.supplier.OneshotSupplier;
+ import org.chromium.base.supplier.Supplier;
 +import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
  import org.chromium.chrome.browser.flags.ActivityType;
  import org.chromium.chrome.browser.ntp.RecentlyClosedBridge;
  import org.chromium.chrome.browser.profiles.ProfileProvider;
-@@ -106,6 +107,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
+@@ -117,6 +118,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
          ProfileProvider profileProvider = mProfileProviderSupplier.get();
          assert profileProvider != null;
  
@@ -1139,7 +1139,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
  import org.chromium.chrome.browser.back_press.BackPressManager;
-@@ -669,7 +670,7 @@ public class ToolbarManager
+@@ -699,7 +700,7 @@ public class ToolbarManager
                                  TraceEvent.end("isOfflinePage");
                                  return ret;
                              }
@@ -1245,7 +1245,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
    DCHECK_EQ(root_ids.size(), group_titles.size());
    DCHECK_EQ(root_ids.size(), group_colors.size());
    DCHECK_EQ(root_ids.size(), optional_tab_group_ids.size());
-@@ -319,11 +330,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
+@@ -318,11 +329,12 @@ static void JNI_HistoricalTabSaverImpl_CreateHistoricalTab(
      JNIEnv* env,
      const JavaParamRef<jobject>& jtab_android,
      const JavaParamRef<jobject>& state,
@@ -1318,7 +1318,7 @@ diff --git a/chrome/browser/autocomplete/remote_suggestions_service_factory.cc b
 diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
 +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
-@@ -18,6 +18,7 @@
+@@ -17,6 +17,7 @@
  #include "chrome/browser/search_engines/template_url_service_factory.h"
  #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
  #include "chrome/common/buildflags.h"
@@ -1326,7 +1326,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
  #include "components/content_settings/core/browser/content_settings_pref_provider.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
  #include "components/permissions/features.h"
-@@ -104,9 +105,25 @@ scoped_refptr<RefcountedKeyedService>
+@@ -103,9 +104,25 @@ scoped_refptr<RefcountedKeyedService>
    if (profile->IsOffTheRecord() && !profile->IsGuestSession())
      GetForProfile(original_profile);
  
@@ -1353,7 +1353,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
        /*store_last_modified=*/true, profile->ShouldRestoreOldSessionCookies(),
        profiles::IsRegularUserProfile(profile)));
  
-@@ -115,6 +132,9 @@ scoped_refptr<RefcountedKeyedService>
+@@ -114,6 +131,9 @@ scoped_refptr<RefcountedKeyedService>
    settings_map->RegisterProvider(ProviderType::kWebuiAllowlistProvider,
                                   std::move(allowlist_provider));
  
@@ -1376,7 +1376,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"
-@@ -488,6 +491,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
+@@ -489,6 +492,13 @@ void HistoryTabHelper::TitleWasSet(NavigationEntry* entry) {
  history::HistoryService* HistoryTabHelper::GetHistoryService() {
    Profile* profile =
        Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ -1390,7 +1390,7 @@ diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/histo
    if (profile->IsOffTheRecord())
      return nullptr;
  
-@@ -495,6 +505,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
+@@ -496,6 +506,16 @@ history::HistoryService* HistoryTabHelper::GetHistoryService() {
        profile, ServiceAccessType::IMPLICIT_ACCESS);
  }
  
@@ -1454,7 +1454,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"
-@@ -758,9 +761,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
+@@ -757,9 +760,15 @@ void OfflinePageBridge::GetPageByOfflineIdDone(
    }
  
    if (offline_page_model_->IsArchiveInInternalDir(offline_page->file_path)) {
@@ -1739,7 +1739,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -251,6 +251,7 @@
+@@ -247,6 +247,7 @@
  
  #if BUILDFLAG(IS_ANDROID)
  #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
@@ -1747,7 +1747,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
  #include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
  #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
-@@ -2105,6 +2106,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2068,6 +2069,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
    variations::VariationsService::RegisterProfilePrefs(registry);
    webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1908,7 +1908,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1419,6 +1419,31 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1411,6 +1411,31 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
          Deletes history from all synced devices
        </message>
@@ -1943,15 +1943,15 @@ 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
-@@ -162,6 +162,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -160,6 +160,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+     protected GURL mVisibleGurl = GURL.emptyGURL();
      protected String mFormattedFullUrl;
      protected String mUrlForDisplay;
-     private boolean mOmniboxUpdatedConnectionSecurityIndicatorsEnabled;
 +    private boolean mIsAlwaysIncognito;
  
      // 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
-@@ -185,7 +186,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
+@@ -183,7 +184,9 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro
              Context context,
              NewTabPageDelegate newTabPageDelegate,
              @NonNull UrlFormatter urlFormatter,
@@ -2009,7 +2009,7 @@ new file mode 100644
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -4211,6 +4211,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
+@@ -4193,6 +4193,12 @@ inline constexpr char kOutOfProcessSystemDnsResolutionEnabled[] =
      "net.out_of_process_system_dns_resolution_enabled";
  #endif  // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
  
@@ -2075,7 +2075,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
-@@ -263,6 +263,7 @@ struct ContentSettingEntry {
+@@ -266,6 +266,7 @@ struct ContentSettingEntry {
  
  HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
                                                 bool is_off_the_record,
@@ -2083,7 +2083,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                                                 bool store_last_modified,
                                                 bool restore_session,
                                                 bool should_record_metrics)
-@@ -272,6 +273,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -275,6 +276,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
  #endif
        prefs_(prefs),
        is_off_the_record_(is_off_the_record),
@@ -2091,7 +2091,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()) {
-@@ -285,7 +287,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+@@ -288,7 +290,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
    policy_provider->AddObserver(this);
  
    auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2111,7 +2111,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
                           bool store_last_modified,
                           bool restore_session,
                           bool should_record_metrics);
-@@ -510,6 +511,8 @@ class HostContentSettingsMap : public content_settings::Observer,
+@@ -502,6 +503,8 @@ class HostContentSettingsMap : public content_settings::Observer,
    // Whether this settings map is for an incognito or guest session.
    bool is_off_the_record_;
  
@@ -2145,39 +2145,28 @@ 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
-@@ -386,7 +386,7 @@ bool BaseSearchProvider::CanSendSuggestRequestWithoutPageURL(
-   }
+@@ -395,7 +395,7 @@ bool BaseSearchProvider::CanSendSuggestRequest(
  
-   // Don't make a suggest request if in incognito mode.
--  if (client->IsOffTheRecord()) {
-+  if (client->IsOffTheRecord() && client->IsAlwaysIncognitoEnabled() == false) {
+   // Don't make a suggest request if in incognito mode; unless for the Lens
+   // searchboxes.
+-  if (client->IsOffTheRecord() &&
++  if (client->IsOffTheRecord() && !client->IsAlwaysIncognitoEnabled() &&
+       !omnibox::IsLensSearchbox(page_classification)) {
      return false;
    }
- 
 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
-@@ -778,7 +778,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
-   // keyword input to a keyword suggest server, if any.)
-   const TemplateURL* default_url = providers_.GetDefaultProviderURL();
-   const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
--  return !client()->IsOffTheRecord() && client()->SearchSuggestEnabled() &&
-+  return (client()->IsOffTheRecord() == false ||
-+                client()->IsAlwaysIncognitoEnabled() == true) &&
-+         client()->SearchSuggestEnabled() &&
-          ((default_url && !default_url->suggestions_url().empty() &&
-            !*query_is_private) ||
-           (keyword_url && !keyword_url->suggestions_url().empty()));
-@@ -937,7 +939,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
-   // purpose of such a request is to signal the server to warm up; no info
+@@ -915,7 +915,8 @@ std::unique_ptr<network::SimpleURLLoader> SearchProvider::CreateSuggestLoader(
    // is required.
-   // Request for suggestions in OTR contexts is not allowed.
--  DCHECK(!client()->IsOffTheRecord());
+   // Request for suggestions in OTR contexts is not allowed; except for the Lens
+   // searchboxes.
+-  DCHECK(!client()->IsOffTheRecord() ||
 +  if (!client()->IsAlwaysIncognitoEnabled())
-+    DCHECK(!client()->IsOffTheRecord());
++    DCHECK(!client()->IsOffTheRecord() ||
+          omnibox::IsLensSearchbox(input.current_page_classification()));
    return client()
        ->GetRemoteSuggestionsService(/*create_if_necessary=*/true)
-       ->StartSuggestionsRequest(
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc b/cromite_flags/chrome/browser/about_flags_cc/add-an-always-incognito-mode.inc
 new file mode 100644
 --- /dev/null

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

@@ -299,7 +299,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
  #include "third_party/blink/public/platform/web_media_player.h"
  #include "third_party/blink/public/web/web_local_frame.h"
  #include "third_party/blink/public/web/web_local_frame_client.h"
-@@ -338,6 +339,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
+@@ -337,6 +338,8 @@ void AutoplayPolicy::TryUnlockingUserGesture() {
  }
  
  bool AutoplayPolicy::IsGestureNeededForPlayback() const {
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi
    if (!IsLockedPendingUserGesture())
      return false;
  
-@@ -450,6 +453,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
+@@ -449,6 +452,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {
    }
  }
  

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

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/java/AndroidManifest.xml       |   1 -
  .../menu/bookmark_toolbar_menu_improved.xml   |  14 +
  .../browser/TabbedModeTabDelegateFactory.java |   5 +-
- .../app/bookmarks/BookmarkActivity.java       |  32 ++
+ .../app/bookmarks/BookmarkActivity.java       |  30 ++
  .../browser/bookmarks/BookmarkBridge.java     | 285 ++++++++++++++++++
  .../browser/bookmarks/BookmarkDelegate.java   |  10 +
  .../bookmarks/BookmarkManagerCoordinator.java |   9 +
@@ -53,7 +53,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
  ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
  ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 42 files changed, 900 insertions(+), 30 deletions(-)
+ 42 files changed, 898 insertions(+), 30 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -104,7 +104,7 @@ 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;
+@@ -54,7 +55,7 @@ import org.chromium.ui.modaldialog.ModalDialogManager;
   * {@link ChromeTabbedActivity}.
   */
  public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -113,7 +113,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;
-@@ -84,7 +85,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+@@ -83,7 +84,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
      private NativePageFactory mNativePageFactory;
  
      public TabbedModeTabDelegateFactory(
@@ -125,19 +125,17 @@ 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
-@@ -21,6 +21,11 @@ import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.profiles.ProfileProvider;
- import org.chromium.components.bookmarks.BookmarkId;
- import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -25,6 +25,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
+ import org.chromium.ui.modaldialog.ModalDialogManager;
+ import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
+ 
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.base.IntentRequestTracker;
 +
-+import org.chromium.ui.modaldialog.ModalDialogManager;
-+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
- 
  /**
   * The activity that displays the bookmark UI on the phone. It keeps a {@link
-@@ -33,6 +38,9 @@ public class BookmarkActivity extends SnackbarActivity {
+  * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should
+@@ -36,6 +39,9 @@ public class BookmarkActivity extends SnackbarActivity {
      public static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
      public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
  
@@ -147,14 +145,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onCreate(Bundle savedInstanceState) {
          super.onCreate(savedInstanceState);
-@@ -58,8 +66,23 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -61,8 +67,23 @@ public class BookmarkActivity extends SnackbarActivity {
                  getOnBackPressedDispatcher(),
                  mBookmarkManagerCoordinator,
                  SecondaryActivity.BOOKMARK);
 +
 +        final boolean listenToActivityState = true;
 +        mIntentRequestTracker = IntentRequestTracker.createFromActivity(this);
-+        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker);
++        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState, mIntentRequestTracker, /*InsetObserver*/ null);
 +        mWindowAndroid.getIntentRequestTracker().restoreInstanceState(savedInstanceState);
 +        mBookmarkManagerCoordinator.setWindow(mWindowAndroid,
 +                            new ModalDialogManager(
@@ -171,7 +169,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
      @Override
      protected void onDestroy() {
          super.onDestroy();
-@@ -69,6 +92,7 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -72,6 +93,7 @@ public class BookmarkActivity extends SnackbarActivity {
      @Override
      protected void onActivityResult(int requestCode, int resultCode, Intent data) {
          super.onActivityResult(requestCode, resultCode, data);
@@ -179,8 +177,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
          if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
              BookmarkId bookmarkId =
                      BookmarkId.getBookmarkIdFromString(
-@@ -77,6 +101,14 @@ public class BookmarkActivity extends SnackbarActivity {
-         }
+@@ -85,6 +107,14 @@ public class BookmarkActivity extends SnackbarActivity {
+         return new ModalDialogManager(new AppModalPresenter(this), ModalDialogType.APP);
      }
  
 +    @Override
@@ -542,7 +540,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
  import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
-@@ -296,6 +298,13 @@ public class BookmarkManagerCoordinator
+@@ -302,6 +304,13 @@ public class BookmarkManagerCoordinator
  
      // Public API implementation.
  
@@ -559,7 +557,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -55,6 +55,8 @@ import org.chromium.components.commerce.core.SubscriptionsObserver;
+@@ -57,6 +57,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;
@@ -568,7 +566,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
  import org.chromium.ui.accessibility.AccessibilityState;
  import org.chromium.ui.listmenu.ListMenu;
  import org.chromium.ui.listmenu.ListMenuItemProperties;
-@@ -79,6 +81,9 @@ class BookmarkManagerMediator
+@@ -81,6 +83,9 @@ class BookmarkManagerMediator
  
      private static boolean sPreventLoadingForTesting;
  
@@ -578,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /** Keeps track of whether drag is enabled / active for bookmark lists. */
      private class BookmarkDragStateDelegate implements DragStateDelegate {
          private BookmarkDelegate mBookmarkDelegate;
-@@ -534,6 +539,14 @@ class BookmarkManagerMediator
+@@ -552,6 +557,14 @@ class BookmarkManagerMediator
          mNativePage = nativePage;
      }
  
@@ -593,7 +591,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
      /** See BookmarkManager(Coordinator)#updateForUrl */
      void updateForUrl(String url) {
          // Bookmark model is null if the manager has been destroyed.
-@@ -714,6 +727,16 @@ class BookmarkManagerMediator
+@@ -732,6 +745,16 @@ class BookmarkManagerMediator
          }
      }
  
@@ -639,7 +637,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
 +        mBookmarkManagerCoordinator.setWindow(activity.getWindowAndroid(),
 +                           new ModalDialogManager(
 +                                new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP));
-         mTitle = host.getContext().getResources().getString(R.string.bookmarks);
+         mTitle = host.getContext().getString(R.string.bookmarks);
  
          initWithView(mBookmarkManagerCoordinator.getView());
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -814,7 +812,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -207,6 +207,8 @@ static_library("browser") {
+@@ -205,6 +205,8 @@ static_library("browser") {
      "bluetooth/chrome_bluetooth_delegate_impl_client.h",
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
@@ -823,7 +821,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",
-@@ -1707,6 +1709,13 @@ static_library("browser") {
+@@ -1679,6 +1681,13 @@ static_library("browser") {
      "webid/identity_provider_permission_request.h",
    ]
  
@@ -837,7 +835,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    configs += [
      "//build/config/compiler:wexit_time_destructors",
      "//build/config:precompiled_headers",
-@@ -3508,8 +3517,6 @@ static_library("browser") {
+@@ -3486,8 +3495,6 @@ static_library("browser") {
        "bookmarks/bookmark_expanded_state_tracker.h",
        "bookmarks/bookmark_expanded_state_tracker_factory.cc",
        "bookmarks/bookmark_expanded_state_tracker_factory.h",
@@ -1339,28 +1337,28 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
 @@ -206,6 +206,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kCastDeviceFilter,
      &kCCTAuthTab,
      &kCCTAuthTabDisableAllExternalIntents,
+     &kCCTAuthTabEnableHttpsRedirects,
 +    &kBookmarksExportUseSaf,
      &kCCTBeforeUnload,
      &kCCTClientDataHeader,
-     &kCCTExtendTrustedCdnPublisher,
+     &kCCTEarlyNav,
 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
-@@ -560,6 +560,7 @@ public abstract class ChromeFeatureList {
+@@ -546,6 +546,7 @@ public abstract class ChromeFeatureList {
      public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
              "UseLibunwindstackNativeUnwinderAndroid";
      public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
 +    public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
      public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
-     public static final String WEB_APK_ALLOW_ICON_UPDATE = "WebApkAllowIconUpdate";
      public static final String WEB_APK_BACKUP_AND_RESTORE_BACKEND = "WebApkBackupAndRestoreBackend";
+     public static final String WEB_APK_INSTALL_FAILURE_NOTIFICATION =
 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(
+@@ -124,6 +124,16 @@ void ProfileWriter::AddBookmarks(
      return;
  
    BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile_);
@@ -1403,7 +1401,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
-@@ -104,6 +104,8 @@ public final class ChromePreferenceKeys {
+@@ -103,6 +103,8 @@ public final class ChromePreferenceKeys {
              "enhanced_bookmark_last_used_parent_folder";
      public static final String BOOKMARKS_SORT_ORDER = "Chrome.Bookmarks.BookmarkRowSortOrder";
      public static final String BOOKMARKS_VISUALS_PREF = "Chrome.Bookmarks.BookmarkRowDisplay";
@@ -1412,7 +1410,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";
-@@ -922,6 +924,7 @@ public final class ChromePreferenceKeys {
+@@ -919,6 +921,7 @@ public final class ChromePreferenceKeys {
                  AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
                  APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                  APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1473,7 +1471,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
        "importer/bookmarks_file_importer.cc",
        "importer/bookmarks_file_importer.h",
        "importer/external_process_importer_bridge.cc",
-@@ -225,6 +223,11 @@ static_library("utility") {
+@@ -227,6 +225,11 @@ static_library("utility") {
      ]
    }
  
@@ -1506,7 +1504,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
  // 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,
-@@ -85,6 +88,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
+@@ -88,6 +91,7 @@ void DataURLToFaviconUsage(const GURL& link_url,
  
    favicons->push_back(usage);
  }
@@ -1514,7 +1512,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
  
  }  // namespace
  
-@@ -105,14 +109,29 @@ static std::string stripDt(const std::string& lineDt) {
+@@ -108,14 +112,29 @@ static std::string stripDt(const std::string& lineDt) {
  }
  
  void ImportBookmarksFile(
@@ -1547,7 +1545,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
    std::vector<std::string> lines = base::SplitString(
        content, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
  
-@@ -125,6 +144,7 @@ void ImportBookmarksFile(
+@@ -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.
@@ -1555,7 +1553,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/im
    for (size_t i = 0;
         i < lines.size() &&
             (cancellation_callback.is_null() || !cancellation_callback.Run());
-@@ -217,10 +237,12 @@ void ImportBookmarksFile(
+@@ -219,10 +239,12 @@ void ImportBookmarksFile(
        }
        bookmarks->push_back(entry);
  
@@ -1635,7 +1633,7 @@ new file mode 100644
 diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 --- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
 +++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
-@@ -46,6 +46,7 @@ import org.chromium.base.task.AsyncTask;
+@@ -45,6 +45,7 @@ import org.chromium.base.task.AsyncTask;
  import org.chromium.base.task.PostTask;
  import org.chromium.base.task.TaskTraits;
  import org.chromium.ui.R;
@@ -1643,7 +1641,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
  import org.chromium.ui.UiUtils;
  
  import java.io.File;
-@@ -68,6 +69,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -67,6 +68,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
      private static final String TAG = "SelectFileDialog";
      private static final String IMAGE_TYPE = "image";
      private static final String VIDEO_TYPE = "video";
@@ -1651,7 +1649,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      private static final String AUDIO_TYPE = "audio";
      private static final String ALL_TYPES = "*/*";
      private static final String GENERIC_TYPE = "application/octet-stream";
-@@ -313,6 +315,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -312,6 +314,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          mMimeTypes = convertToSupportedMimeTypes(mFileTypes);
      }
  
@@ -1663,7 +1661,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
      /**
       * Creates and starts an intent based on the passed fileTypes and capture value.
       *
-@@ -359,7 +366,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -374,7 +381,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          List<String> missingPermissions = new ArrayList<>();
          String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
          boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1672,7 +1670,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
              // The permission scenario for accessing media has evolved a bit over the years:
              // Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
              // later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
-@@ -412,7 +419,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -427,7 +434,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
  
                                  // TODO(finnur): Remove once we figure out the cause of
                                  // crbug.com/950024.
@@ -1681,7 +1679,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                      if (permissions.length != requestPermissions.length) {
                                          throw new RuntimeException(
                                                  String.format(
-@@ -429,7 +436,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -444,7 +451,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                                      }
                                  }
  
@@ -1690,7 +1688,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
                                      if (permissions[i].equals(storagePermission)
                                              || permissions[i].equals(
                                                      Manifest.permission.READ_MEDIA_IMAGES)
-@@ -740,6 +747,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -751,6 +758,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                  mimeTypes.add(mimeType);
              }
          }
@@ -1698,7 +1696,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
          return mimeTypes;
      }
  
-@@ -1120,6 +1128,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1121,6 +1129,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
          return countAcceptTypesFor(superType) == mMimeTypes.size();
      }
  
@@ -1737,7 +1735,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
-@@ -160,6 +160,12 @@ void SelectFileDialogImpl::SelectFileImpl(
+@@ -161,6 +161,12 @@ void SelectFileDialogImpl::SelectFileImpl(
        accept_multiple_files, owning_window->GetJavaObject());
  }
  

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

@@ -28,6 +28,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/settings/SettingsActivity.java    |  42 ++++-
  chrome/browser/about_flags.cc                 |  11 ++
  chrome/browser/browser_features.cc            |   1 +
+ chrome/browser/browser_features.h             |   1 +
  chrome/browser/flags/BUILD.gn                 |  13 ++
  .../flags/android/chrome_feature_list.cc      |   1 +
  .../flags/android/chrome_feature_list.h       |   1 +
@@ -35,7 +36,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../flags/cromite/include_all_directory.java  |   1 +
  .../java_template/CromiteCachedFlag.java.tmpl |  47 +++++
  chrome/browser/settings/BUILD.gn              |   1 +
- .../settings/ChromeBaseSettingsFragment.java  |  50 ++++++
+ .../settings/ChromeBaseSettingsFragment.java  |  50 +++++
  .../strings/android_chrome_strings.grd        |   1 +
  .../Add-cromite-flags-support.grdp            |   9 +
  .../placeholder.txt                           |   1 +
@@ -43,8 +44,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  chrome/common/chrome_features.cc              |   1 +
  .../res/xml/accessibility_preferences.xml     |   3 +-
  .../android/java/res/values/attrs.xml         |   4 +
- .../settings/ChromeSwitchPreference.java      |  20 +++
- .../components/cached_flags/CachedFlag.java   |   8 +-
+ .../settings/ChromeSwitchPreference.java      |  20 ++
+ .../components/cached_flags/CachedFlag.java   |   9 +-
  components/components_strings.grd             |   1 +
  .../content_settings/core/common/features.cc  |   1 +
  .../placeholder.txt                           |   1 +
@@ -66,9 +67,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  content/common/features.cc                    |   1 +
  content/public/common/content_features.cc     |   1 +
  content/public/common/content_features.h      |   1 +
- cromite_flags/BUILD.gn                        | 168 ++++++++++++++++++
+ cromite_flags/BUILD.gn                        | 174 ++++++++++++++++++
  .../browser/about_flags_cc/placeholder.txt    |   1 +
  .../browser_features_cc/placeholder.txt       |   1 +
+ .../browser_features_h/placeholder.txt        |   1 +
  .../chrome_feature_list_cc/placeholder.txt    |   1 +
  .../chrome_feature_list_h/placeholder.txt     |   1 +
  .../browser/ui/ui_features_cc/placeholder.txt |   1 +
@@ -102,7 +104,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 +
- 89 files changed, 792 insertions(+), 28 deletions(-)
+ 91 files changed, 801 insertions(+), 28 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
@@ -111,6 +113,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  create mode 100755 cromite_flags/BUILD.gn
  create mode 100755 cromite_flags/chrome/browser/about_flags_cc/placeholder.txt
  create mode 100755 cromite_flags/chrome/browser/browser_features_cc/placeholder.txt
+ create mode 100755 cromite_flags/chrome/browser/browser_features_h/placeholder.txt
  create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt
  create mode 100755 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/placeholder.txt
  create mode 100755 cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt
@@ -138,7 +141,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
-@@ -185,6 +185,8 @@ use_epoll = is_linux || is_chromeos || is_android
+@@ -163,6 +163,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") {
@@ -147,7 +150,7 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn
    sources = [
      "allocator/allocator_check.cc",
      "allocator/allocator_check.h",
-@@ -1025,7 +1027,7 @@ component("base") {
+@@ -1005,7 +1007,7 @@ component("base") {
      "//build/config/compiler:wglobal_constructors",
    ]
  
@@ -239,7 +242,7 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 +      return key;
 +    }
 +  }
-+  NOTREACHED_NORETURN();
++  NOTREACHED();
 +}
 +
 +// static
@@ -259,13 +262,13 @@ diff --git a/base/feature_list.cc b/base/feature_list.cc
 +      return value == base::FEATURE_ENABLED_BY_DEFAULT;
 +    }
 +  }
-+  NOTREACHED_NORETURN();
++  NOTREACHED();
 +}
 +
  // static
  bool FeatureList::IsValidFeatureOrFieldTrialName(std::string_view name) {
    return IsStringASCII(name) && name.find_first_of(",<*") == std::string::npos;
-@@ -739,6 +804,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
+@@ -735,6 +800,17 @@ void FeatureList::VisitFeaturesAndParams(FeatureVisitor& visitor,
  
  void FeatureList::FinalizeInitialization() {
    DCHECK(!initialized_);
@@ -445,14 +448,14 @@ 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/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -18,6 +18,7 @@ import org.chromium.chrome.R;
+@@ -19,6 +19,7 @@ import org.chromium.chrome.R;
  import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsController;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.settings.SettingsNavigationFactory;
 +import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
  import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
  import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
+ import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
 @@ -37,7 +38,7 @@ import org.chromium.content_public.browser.ContentFeatureList;
  import org.chromium.content_public.browser.ContentFeatureMap;
  
@@ -460,9 +463,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 -public class AccessibilitySettings extends PreferenceFragmentCompat
 +public class AccessibilitySettings extends ChromeBaseSettingsFragment
          implements EmbeddableSettingsPage, Preference.OnPreferenceChangeListener {
-     public static final String PREF_TEXT_SCALE = "text_scale";
      public static final String PREF_PAGE_ZOOM_DEFAULT_ZOOM = "page_zoom_default_zoom";
-@@ -101,7 +102,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
+     public static final String PREF_PAGE_ZOOM_INCLUDE_OS_ADJUSTMENT =
+@@ -85,7 +86,7 @@ public class AccessibilitySettings extends PreferenceFragmentCompat
      }
  
      @Override
@@ -470,7 +473,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
 +    public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
          SettingsUtils.addPreferencesFromResource(this, R.xml.accessibility_preferences);
  
-         mTextScalePref = (TextScalePreference) findPreference(PREF_TEXT_SCALE);
+         mPageZoomDefaultZoomPref = (PageZoomPreference) findPreference(PREF_PAGE_ZOOM_DEFAULT_ZOOM);
 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
@@ -486,7 +489,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -80,7 +80,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -81,7 +81,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
  
      @Override
@@ -576,7 +579,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;
-@@ -83,6 +88,40 @@ import java.util.Locale;
+@@ -85,6 +90,40 @@ import java.util.Locale;
   */
  public class SettingsActivity extends ChromeBaseAppCompatActivity
          implements PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, SnackbarManageable {
@@ -617,7 +620,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";
  
-@@ -141,7 +180,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -151,7 +190,8 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                          mProfile,
                          mSnackbarManagerSupplier,
                          mBottomSheetControllerSupplier,
@@ -630,7 +633,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 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
-@@ -388,6 +388,10 @@ using flags_ui::kOsLinux;
+@@ -392,6 +392,10 @@ using flags_ui::kOsLinux;
  using flags_ui::kOsMac;
  using flags_ui::kOsWin;
  
@@ -641,8 +644,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  namespace about_flags {
  
  namespace {
-@@ -4210,6 +4214,10 @@ const FeatureEntry::FeatureVariation
-          1, nullptr},
+@@ -4315,6 +4319,10 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
+      std::size(kServiceWorkerAutoPreload_SWNotRunningOnly), nullptr},
  };
  
 +#define FEATURE_PARAM_SECTION
@@ -652,7 +655,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
  // RECORDING USER METRICS FOR FLAGS:
  // -----------------------------------------------------------------------------
  // The first line of the entry is the internal name.
-@@ -4236,6 +4244,9 @@ const FeatureEntry::FeatureVariation
+@@ -4341,6 +4349,9 @@ const FeatureEntry::FeatureVariation kServiceWorkerAutoPreloadVariations[] = {
  const FeatureEntry kFeatureEntries[] = {
  // Include generated flags for flag unexpiry; see //docs/flag_expiry.md and
  // //tools/flags/generate_unexpire_flags.py.
@@ -665,12 +668,23 @@ 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
-@@ -392,4 +392,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
+@@ -372,4 +372,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCapture,
               "RemovalOfIWAsFromTabCapture",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_browser_features_cc.inc"
  }  // namespace features
+diff --git a/chrome/browser/browser_features.h b/chrome/browser/browser_features.h
+--- a/chrome/browser/browser_features.h
++++ b/chrome/browser/browser_features.h
+@@ -145,6 +145,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
+ // module, e.g.
+ // //chrome/browser/<foo_module>/features.h
+ //
++#include "cromite_flags/chrome_browser_browser_features_h.inc"
+ }  // namespace features
+ 
+ #endif  // CHROME_BROWSER_BROWSER_FEATURES_H_
 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
@@ -713,8 +727,8 @@ 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
-@@ -1096,5 +1096,6 @@ BASE_FEATURE(kWebApkAllowIconUpdate,
-              "WebApkAllowIconUpdate",
+@@ -1063,5 +1063,6 @@ BASE_FEATURE(kWebOtpCrossDeviceSimpleString,
+              "WebOtpCrossDeviceSimpleString",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_flags_android_chrome_feature_list_cc.inc"
@@ -723,7 +737,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
 --- a/chrome/browser/flags/android/chrome_feature_list.h
 +++ b/chrome/browser/flags/android/chrome_feature_list.h
-@@ -222,6 +222,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
+@@ -215,6 +215,7 @@ constexpr base::FeatureParam<std::string> kQuickDeleteAndroidSurveyTriggerId(
      "trigger_id",
      /*default_value=*/"");
  
@@ -734,7 +748,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -18,6 +18,10 @@ import org.chromium.components.cached_flags.DoubleCachedFieldTrialParameter;
+@@ -17,6 +17,10 @@ import org.chromium.components.cached_flags.DoubleCachedFieldTrialParameter;
  import org.chromium.components.cached_flags.IntCachedFieldTrialParameter;
  import org.chromium.components.cached_flags.StringCachedFieldTrialParameter;
  
@@ -745,7 +759,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
  import java.util.List;
  import java.util.Map;
  
-@@ -766,7 +770,7 @@ public abstract class ChromeFeatureList {
+@@ -730,7 +734,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sWebApkMinShellApkVersion =
              newCachedFlag(WEB_APK_MIN_SHELL_APK_VERSION, true);
  
@@ -754,7 +768,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
              List.of(
                      sAccountReauthenticationRecentTimeWindow,
                      sAndroidAppIntegration,
-@@ -867,6 +871,13 @@ public abstract class ChromeFeatureList {
+@@ -823,6 +827,13 @@ public abstract class ChromeFeatureList {
                      sUseLibunwindstackNativeUnwinderAndroid,
                      sWebApkMinShellApkVersion);
  
@@ -765,9 +779,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +    public static final List<CachedFlag> sFlagsCachedFullBrowser =
 +            concatenateLists(CromiteCachedFlagImplBase.getList(), sFlagsCachedFullBrowserChromium);
 +
-     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser =
-             List.of(sExperimentsForAgsa);
+     public static final List<CachedFlag> sFlagsCachedInMinimalBrowser = List.of();
  
+     public static final List<CachedFlag> sTestCachedFlags =
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/include_all_directory.java
 new file mode 100644
 --- /dev/null
@@ -943,16 +957,16 @@ new file mode 100644
 diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc
 --- a/chrome/browser/ui/ui_features.cc
 +++ b/chrome/browser/ui/ui_features.cc
-@@ -458,4 +458,5 @@ BASE_FEATURE(kPageSpecificDataDialogRelatedInstalledAppsSection,
-              "PageSpecificDataDialogRelatedInstalledAppsSection",
-              base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -487,4 +487,5 @@ BASE_FEATURE(kInlineFullscreenPerfExperiment,
+              "InlineFullscreenPerfExperiment",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +#include "cromite_flags/chrome_browser_ui_ui_features_cc.inc"
  }  // namespace features
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -1737,4 +1737,5 @@ BASE_FEATURE(kPeriodicLogUploadMigration,
+@@ -1629,4 +1629,5 @@ BASE_FEATURE(kPeriodicLogUploadMigration,
               base::FEATURE_DISABLED_BY_DEFAULT);
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
@@ -969,8 +983,8 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
 +                  xmlns:app="http://schemas.android.com/apk/res-auto">
  
-     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
-         android:key="text_scale"
+     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
+         android:key="page_zoom_default_zoom"
 diff --git a/components/browser_ui/settings/android/java/res/values/attrs.xml b/components/browser_ui/settings/android/java/res/values/attrs.xml
 --- a/components/browser_ui/settings/android/java/res/values/attrs.xml
 +++ b/components/browser_ui/settings/android/java/res/values/attrs.xml
@@ -1032,7 +1046,15 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 diff --git a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 --- a/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
 +++ b/components/cached_flags/android/java/src/org/chromium/components/cached_flags/CachedFlag.java
-@@ -147,7 +147,7 @@ public class CachedFlag extends Flag {
+@@ -5,6 +5,7 @@
+ package org.chromium.components.cached_flags;
+ 
+ import android.content.SharedPreferences;
++import androidx.annotation.Nullable;
+ 
+ import org.chromium.base.FeatureList;
+ import org.chromium.base.FeatureMap;
+@@ -136,7 +137,7 @@ public class CachedFlag extends Flag {
          editor.putBoolean(getSharedPreferenceKey(), isEnabledInNative);
      }
  
@@ -1041,7 +1063,7 @@ diff --git a/components/cached_flags/android/java/src/org/chromium/components/ca
          // Create the key only once to avoid String concatenation every flag check.
          if (mPreferenceKey == null) {
              mPreferenceKey = CachedFlagsSharedPreferences.FLAGS_CACHED.createKey(mFeatureName);
-@@ -155,6 +155,12 @@ public class CachedFlag extends Flag {
+@@ -144,6 +145,12 @@ public class CachedFlag extends Flag {
          return mPreferenceKey;
      }
  
@@ -1101,7 +1123,7 @@ diff --git a/components/flags_ui/flags_state.cc b/components/flags_ui/flags_stat
 +          continue;
 +        }
 +      }
-+      NOTREACHED_NORETURN();
++      NOTREACHED();
 +    }
      CHECK(entry_it != name_to_switch_map.end(), base::NotFatalUntil::M130);
  
@@ -1436,8 +1458,8 @@ 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
-@@ -181,4 +181,5 @@ BASE_FEATURE(kEncryptAllPasswordsWithOSCryptAsync,
-              "EncryptAllPasswordsWithOSCryptAsync",
+@@ -193,4 +193,5 @@ BASE_FEATURE(kImprovedPasswordChangeService,
+              "ImprovedPasswordChangeService",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
 +#include "cromite_flags/components_password_manager_core_browser_features_password_features_cc.inc"
@@ -1519,7 +1541,7 @@ diff --git a/components/version_ui/version_handler_helper.cc b/components/versio
 diff --git a/content/common/features.cc b/content/common/features.cc
 --- a/content/common/features.cc
 +++ b/content/common/features.cc
-@@ -615,4 +615,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
+@@ -619,4 +619,5 @@ BASE_FEATURE(kLimitCrossOriginNonActivatedPaintHolding,
  
  // Please keep features in alphabetical order.
  
@@ -1528,7 +1550,7 @@ diff --git a/content/common/features.cc b/content/common/features.cc
 diff --git a/content/public/common/content_features.cc b/content/public/common/content_features.cc
 --- a/content/public/common/content_features.cc
 +++ b/content/public/common/content_features.cc
-@@ -1442,4 +1442,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
+@@ -1498,4 +1498,5 @@ bool IsVideoCaptureServiceEnabledForBrowserProcess() {
           VideoCaptureServiceConfiguration::kEnabledForBrowserProcess;
  }
  
@@ -1537,7 +1559,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
-@@ -334,6 +334,7 @@ CONTENT_EXPORT extern const base::FeatureParam<CapturingState>
+@@ -352,6 +352,7 @@ CONTENT_EXPORT extern const base::FeatureParam<std::string>
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForOutOfProcess();
  CONTENT_EXPORT bool IsVideoCaptureServiceEnabledForBrowserProcess();
  
@@ -1549,7 +1571,7 @@ diff --git a/cromite_flags/BUILD.gn b/cromite_flags/BUILD.gn
 new file mode 100755
 --- /dev/null
 +++ b/cromite_flags/BUILD.gn
-@@ -0,0 +1,168 @@
+@@ -0,0 +1,174 @@
 +# This file is part of Bromite.
 +
 +# Bromite is free software: you can redistribute it and/or modify
@@ -1620,6 +1642,11 @@ new file mode 100755
 +  output_file = "chrome_browser_browser_features_cc.inc"
 +}
 +
++cpp_bromite_include("chrome_browser_browser_features_h") {
++  inputs = [ "//cromite_flags/chrome/browser/browser_features_h/placeholder.txt" ]
++  output_file = "chrome_browser_browser_features_h.inc"
++}
++
 +cpp_bromite_include("chrome_browser_ui_ui_features_cc") {
 +  inputs = [ "//cromite_flags/chrome/browser/ui/ui_features_cc/placeholder.txt" ]
 +  output_file = "chrome_browser_ui_ui_features_cc.inc"
@@ -1710,6 +1737,7 @@ new file mode 100755
 +    ":chrome_browser_flags_android_chrome_feature_list_h",
 +    ":chrome_browser_ui_ui_features_cc",
 +    ":chrome_browser_browser_features_cc",
++    ":chrome_browser_browser_features_h",
 +    ":services_network_public_cpp_features_cc",
 +    ":services_network_public_cpp_features_h",
 +    ":third_party_blink_common_features_cc",
@@ -1730,6 +1758,12 @@ new file mode 100755
 +++ b/cromite_flags/chrome/browser/browser_features_cc/placeholder.txt
 @@ -0,0 +1 @@
 +this file is intentionally empty
+diff --git a/cromite_flags/chrome/browser/browser_features_h/placeholder.txt b/cromite_flags/chrome/browser/browser_features_h/placeholder.txt
+new file mode 100755
+--- /dev/null
++++ b/cromite_flags/chrome/browser/browser_features_h/placeholder.txt
+@@ -0,0 +1 @@
++this file is intentionally empty
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/placeholder.txt
 new file mode 100755
 --- /dev/null
@@ -1871,7 +1905,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
-@@ -1906,5 +1906,5 @@ uint32_t GetPassthroughAudioFormats() {
+@@ -1837,5 +1837,5 @@ uint32_t GetPassthroughAudioFormats() {
    return 0;
  #endif  // BUILDFLAG(ENABLE_PASSTHROUGH_AUDIO_CODECS)
  }
@@ -1881,7 +1915,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
-@@ -585,5 +585,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
+@@ -572,5 +572,5 @@ MEDIA_EXPORT OOPVDMode GetOutOfProcessVideoDecodingMode();
  MEDIA_EXPORT uint32_t GetPassthroughAudioFormats();
  
  }  // namespace media
@@ -1891,18 +1925,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
-@@ -616,4 +616,5 @@ const base::FeatureParam<DiskCacheBackend> kDiskCacheBackendParam{
-     &kDiskCacheBackendExperiment, "backend", DiskCacheBackend::kBlockfile,
-     &kDiskCacheBackendOptions};
+@@ -629,4 +629,5 @@ BASE_FEATURE(kIgnoreHSTSForLocalhost,
+              "IgnoreHSTSForLocalhost",
+              base::FEATURE_ENABLED_BY_DEFAULT);
  
 +#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
-@@ -628,6 +628,7 @@ NET_EXPORT BASE_DECLARE_FEATURE(kDiskCacheBackendExperiment);
- NET_EXPORT extern const base::FeatureParam<DiskCacheBackend>
-     kDiskCacheBackendParam;
+@@ -650,6 +650,7 @@ NET_EXPORT extern const base::FeatureParam<DiskCacheBackend>
+ // If enabled, ignore Strict-Transport-Security for [*.]localhost hosts.
+ NET_EXPORT BASE_DECLARE_FEATURE(kIgnoreHSTSForLocalhost);
  
 +#include "cromite_flags/net_base_features_h.inc"
  }  // namespace net::features
@@ -1911,18 +1945,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
-@@ -515,4 +515,5 @@ BASE_FEATURE(kStorageAccessHeadersTrial,
-              "StorageAccessHeadersTrial",
+@@ -475,4 +475,5 @@ BASE_FEATURE(kEnableLockCookieDatabaseByDefault,
               base::FEATURE_ENABLED_BY_DEFAULT);
+ #endif  // BUILDFLAG(IS_WIN)
  
 +#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
-@@ -204,6 +204,7 @@ COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeaders);
- // Enables the Storage Access Headers Origin Trial.
- COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kStorageAccessHeadersTrial);
+@@ -211,6 +211,7 @@ COMPONENT_EXPORT(NETWORK_CPP)
+ BASE_DECLARE_FEATURE(kEnableLockCookieDatabaseByDefault);
+ #endif  // BUILDFLAG(IS_WIN)
  
 +#include "cromite_flags/services_network_public_cpp_features_h.inc"
  }  // namespace network::features
@@ -1931,7 +1965,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
-@@ -2801,4 +2801,5 @@ bool IsCanvasSharedBitmapConversionEnabled() {
+@@ -2932,4 +2932,5 @@ bool IsCanvasSharedBitmapConversionEnabled() {
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -1940,7 +1974,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
-@@ -1879,6 +1879,7 @@ BLINK_COMMON_EXPORT bool IsCanvasSharedBitmapConversionEnabled();
+@@ -1886,6 +1886,7 @@ BLINK_COMMON_EXPORT bool IsCanvasSharedBitmapConversionEnabled();
  //
  // DO NOT ADD NEW FEATURES HERE.
  
@@ -1951,7 +1985,7 @@ diff --git a/third_party/blink/public/common/features.h b/third_party/blink/publ
 diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 --- a/ui/base/ui_base_features.cc
 +++ b/ui/base/ui_base_features.cc
-@@ -554,4 +554,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
+@@ -503,4 +503,5 @@ BASE_FEATURE(kAsyncFullscreenWindowState,
               "AsyncFullscreenWindowState",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -1960,7 +1994,7 @@ diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
 diff --git a/ui/base/ui_base_features.h b/ui/base/ui_base_features.h
 --- a/ui/base/ui_base_features.h
 +++ b/ui/base/ui_base_features.h
-@@ -273,6 +273,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle);
+@@ -259,6 +259,7 @@ BASE_DECLARE_FEATURE(kWriteBookmarkWithoutTitle);
  COMPONENT_EXPORT(UI_BASE_FEATURES)
  BASE_DECLARE_FEATURE(kAsyncFullscreenWindowState);
  

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

@@ -56,7 +56,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
-@@ -58,6 +58,9 @@ import java.lang.annotation.Retention;
+@@ -64,6 +64,9 @@ import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.util.Set;
  
@@ -66,7 +66,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.
-@@ -244,6 +247,9 @@ public class LaunchIntentDispatcher {
+@@ -266,6 +269,9 @@ public class LaunchIntentDispatcher {
      @OptIn(markerClass = ExperimentalAuthTab.class)
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
          Log.w(
                  TAG,
                  "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -272,6 +278,10 @@ public class LaunchIntentDispatcher {
+@@ -294,6 +300,10 @@ public class LaunchIntentDispatcher {
          // Make sure the result of the CustomTabActivity is forwarded to the client.
          newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
  
@@ -87,7 +87,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());
-@@ -445,6 +455,17 @@ public class LaunchIntentDispatcher {
+@@ -490,6 +500,17 @@ public class LaunchIntentDispatcher {
  
          if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                  && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
-@@ -1229,7 +1229,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1238,7 +1238,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
      public @CustomTabProfileType int getCustomTabMode() {
          return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                  ? CustomTabProfileType.INCOGNITO
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java
-@@ -958,6 +958,7 @@ public class CustomTabsConnection {
+@@ -969,6 +969,7 @@ public class CustomTabsConnection {
          PostTask.postTask(
                  TaskTraits.UI_DEFAULT,
                  () -> {
@@ -156,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 @@ -216,6 +222,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
      }
  
-     public static boolean isValidIncognitoIntent(Intent intent) {
+     public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
 +        if (ContextUtils.getAppSharedPreferences()
 +                .getBoolean(PrivacySettings.PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, false)) {
 +            return true;
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
          if (!isIncognitoRequested(intent)) return false;
          var session = CustomTabsSessionToken.getSessionTokenFromIntent(intent);
          if (isIntentFromThirdPartyAllowed()
-@@ -326,6 +336,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -329,6 +339,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
  
      @Override
      public @CustomTabProfileType int getCustomTabMode() {
@@ -178,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -56,6 +56,15 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
+@@ -57,6 +57,15 @@ import org.chromium.components.signin.identitymanager.ConsentLevel;
  import org.chromium.components.user_prefs.UserPrefs;
  import org.chromium.ui.text.SpanApplier;
  
@@ -194,7 +194,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import androidx.annotation.Nullable;
  import androidx.preference.PreferenceCategory;
  import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
-@@ -103,6 +112,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -104,6 +113,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private IncognitoLockSettings mIncognitoLockSettings;
      private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
  
@@ -266,7 +266,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -692,6 +692,7 @@ public abstract class ChromeFeatureList {
+@@ -662,6 +662,7 @@ public abstract class ChromeFeatureList {
      public static final CachedFlag sLogoPolishAnimationKillSwitch =
              newCachedFlag(LOGO_POLISH_ANIMATION_KILL_SWITCH, true);
      public static final CachedFlag sMagicStackAndroid = newCachedFlag(MAGIC_STACK_ANDROID, true);
@@ -274,7 +274,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final CachedFlag sMostVisitedTilesReselect =
              newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
      public static final CachedFlag sMultiInstanceApplicationStatusCleanup =
-@@ -833,6 +834,7 @@ public abstract class ChromeFeatureList {
+@@ -792,6 +793,7 @@ public abstract class ChromeFeatureList {
                      sLogoPolishAnimationKillSwitch,
                      sNotificationTrampoline,
                      sMagicStackAndroid,
@@ -346,7 +346,7 @@ 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
-@@ -28,4 +28,5 @@ BASE_FEATURE(kTranslateOpenSettings,
+@@ -32,4 +32,5 @@ BASE_FEATURE(kDisableGeoLanguageModel,
  // Params:
  const char kContentLanguagesDisableObserversParam[] = "disable_observers";
  

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

@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -157,6 +157,9 @@ found in the LICENSE file.
+@@ -160,6 +160,9 @@ found in the LICENSE file.
          <item android:id="@+id/managed_by_menu_id"
              android:title="@string/managed_browser"
              android:icon="@drawable/ic_business" />
@@ -26,7 +26,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
      </group>
  
      <!-- Items shown only in the tab switcher -->
-@@ -186,6 +189,9 @@ found in the LICENSE file.
+@@ -189,6 +192,9 @@ found in the LICENSE file.
          <item android:id="@id/preferences_id"
              android:title="@string/menu_settings"
              android:icon="@drawable/settings_cog" />
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -277,6 +277,8 @@ import java.util.Set;
+@@ -276,6 +276,8 @@ import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.function.DoubleConsumer;
  
@@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  /**
   * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
   * accessible via a chrome specific tab switching UI.
-@@ -2826,6 +2828,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2887,6 +2889,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          } else if (id == R.id.close_tab) {
              getCurrentTabModel().closeTabs(TabClosureParams.closeTab(currentTab).build());
              RecordUserAction.record("MobileTabClosed");
@@ -60,7 +60,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -61,6 +61,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
+@@ -60,6 +60,7 @@ import org.chromium.base.supplier.UnownedUserDataSupplier;
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.ActivityTabProvider;
  import org.chromium.chrome.browser.ActivityUtils;
@@ -68,7 +68,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;
-@@ -2505,6 +2506,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2432,6 +2433,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return true;
          }
  
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4379,6 +4379,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4385,6 +4385,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_MENU_AUTO_DARK_WEB_CONTENTS" desc="Menu item in Chrome's overflow/options menu. When Chrome's browser UI is set to dark theme and this option is checked, sites will have a dark theme automatically applied as well. [CHAR_LIMIT=24]">
          Dark theme
        </message>

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

@@ -26,7 +26,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
  #include "base/feature_list.h"
  #include "base/format_macros.h"
  #include "base/functional/bind.h"
-@@ -535,6 +536,15 @@ AutocompleteController::AutocompleteController(
+@@ -536,6 +537,15 @@ AutocompleteController::AutocompleteController(
            provider_client_->GetOmniboxTriggeredFeatureService()),
        steady_state_omnibox_position_(
            metrics::OmniboxEventProto::UNKNOWN_POSITION) {
@@ -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"
-@@ -647,6 +648,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -631,6 +632,9 @@ void SearchProvider::Run(bool query_is_private) {
  }
  
  void SearchProvider::DoHistoryQuery(bool minimal_changes) {

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

@@ -45,7 +45,7 @@ new file mode 100644
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1101,6 +1101,7 @@ component("net") {
+@@ -1102,6 +1102,7 @@ component("net") {
      "//components/miracle_parameter/common",
      "//components/network_time/time_tracker",
      "//net/http:transport_security_state_generated_files",
@@ -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"
-@@ -1430,6 +1431,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1426,6 +1427,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
      return OK;
    }
  

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

@@ -186,7 +186,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
      private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
              ExternalNavigationParams params,
              Intent targetIntent,
-@@ -1594,6 +1600,21 @@ public class ExternalNavigationHandler {
+@@ -1588,6 +1594,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
-@@ -103,6 +103,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -104,6 +104,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
    if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
      WebRuntimeFeatures::EnableMediaSession(false);
    }
@@ -78,7 +78,7 @@ diff --git a/third_party/blink/renderer/modules/vibration/vibration_controller.c
  
  // Maximum number of entries in a vibration pattern.
  const unsigned kVibrationPatternLengthMax = 99;
-@@ -109,6 +110,8 @@ bool VibrationController::vibrate(Navigator& navigator,
+@@ -108,6 +109,8 @@ bool VibrationController::vibrate(Navigator& navigator,
    // reference to |window| or |navigator| was retained in another window.
    if (!navigator.DomWindow())
      return false;
@@ -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
-@@ -791,6 +791,10 @@
+@@ -793,6 +793,10 @@
        status: {"Android": "stable"},
        base_feature: "none",
      },

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

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -1964,7 +1964,6 @@ config("default_warnings") {
+@@ -1984,7 +1984,6 @@ config("default_warnings") {
          # TODO(crbug.com/40284799): Fix and re-enable.
          "-Wno-thread-safety-reference-return",
        ]
@@ -22,8 +22,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
        cflags_cc += [
          # TODO(crbug.com/328490295): Fix and re-enable for C flags.
          "-Wenum-compare-conditional",
-@@ -1987,6 +1986,16 @@ config("default_warnings") {
-           cflags_cc += [ "-Wno-deprecated-literal-operator" ]
+@@ -2007,6 +2006,16 @@ config("default_warnings") {
+           cflags += [ "-Wno-nontrivial-memaccess" ]
          }
        }
 +      if (skip_clangd_unsupported_options) {

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

@@ -176,7 +176,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
  OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
  
  OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
-@@ -258,6 +284,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
+@@ -257,6 +283,11 @@ void OneTimePermissionsTracker::NotifyLastPageFromOriginClosed(
    for (auto& observer : observer_list_) {
      observer.OnLastPageFromOriginClosed(origin);
    }
@@ -242,7 +242,7 @@ diff --git a/chrome/browser/ui/views/permissions/chip/chip_controller.cc b/chrom
 diff --git a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
 --- a/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
 +++ b/chrome/browser/ui/views/permissions/embedded_permission_prompt.cc
-@@ -654,7 +654,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) {
+@@ -660,7 +660,7 @@ void EmbeddedPermissionPrompt::SendDelegateAction(Action action) {
        delegate_->Accept();
        break;
      case Action::kAllowThisTime:
@@ -289,7 +289,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/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
-@@ -568,6 +568,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -589,6 +589,11 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
          }
      }
  
@@ -301,7 +301,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      private void setUpClearDataPreference() {
          ClearWebsiteStorage preference = findPreference(PREF_CLEAR_DATA);
          long usage = mSite.getTotalUsage();
-@@ -1102,6 +1107,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1154,6 +1159,10 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
                      AppCompatResources.getColorStateList(getContext(), mHighlightColor)
                              .getDefaultColor());
          }
@@ -327,7 +327,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
-@@ -654,6 +654,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>
@@ -342,7 +342,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -160,6 +160,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
+@@ -161,6 +161,42 @@ bool IsConstraintPersistent(const ContentSettingConstraints& constraints) {
    return constraints.session_model() == mojom::SessionModel::DURABLE;
  }
  
@@ -461,7 +461,7 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
              }
          }
  
-@@ -126,13 +131,15 @@ public class PermissionParamsListBuilder {
+@@ -127,13 +132,15 @@ public class PermissionParamsListBuilder {
          public final String nameMidSentence;
          public final int type;
          public final @ContentSettingValues int setting;
@@ -481,7 +481,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
-@@ -164,6 +164,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -166,6 +166,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
  
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
@@ -490,7 +490,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)) {
-@@ -172,6 +174,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -174,6 +176,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
        if (setting_to_display) {
          user_specified_settings_to_display[permission.type] =
              *setting_to_display;
@@ -499,7 +499,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
        }
      }
    }
-@@ -188,7 +192,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -190,7 +194,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
            ConvertUTF16ToJavaString(env, setting_title),
            ConvertUTF16ToJavaString(env, setting_title_mid_sentence),
            static_cast<jint>(permission),
@@ -509,7 +509,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
      }
    }
  
-@@ -201,7 +206,8 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -203,7 +208,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),
@@ -522,7 +522,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
-@@ -1188,6 +1188,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1201,6 +1201,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
    permission_info.is_one_time =
        (info.metadata.session_model() ==
         content_settings::mojom::SessionModel::ONE_TIME);
@@ -1120,7 +1120,7 @@ diff --git a/components/permissions/permission_request.cc b/components/permissio
  PermissionRequest::~PermissionRequest() {
    DCHECK(delete_callback_.is_null());
  }
-@@ -406,19 +414,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
+@@ -404,19 +412,37 @@ bool PermissionRequest::ShouldUseTwoOriginPrompt() const {
    return request_type() == RequestType::kStorageAccess;
  }
  

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

@@ -13,6 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../bookmark_merged_surface_service.cc        |  2 +
  .../dialogs/DownloadLocationCustomView.java   |  4 +-
  .../strings/android_chrome_strings.grd        |  3 +
+ .../bookmark_ui_operations_helper.cc          |  2 +
  .../views/bookmarks/bookmark_menu_delegate.cc |  2 +
  components/bookmark_bar_strings.grdp          |  6 ++
  .../bookmarks/browser/bookmark_codec.cc       | 20 +++++-
@@ -28,7 +29,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/bookmarks/browser/bookmark_uuids.h |  1 +
  components/bookmarks/browser/model_loader.cc  |  8 ++-
  .../bookmark_specifics_conversions.cc         |  1 +
- 24 files changed, 245 insertions(+), 15 deletions(-)
+ 25 files changed, 247 insertions(+), 15 deletions(-)
 
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
@@ -44,7 +45,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
          <item android:id="@+id/recent_tabs_menu_id"
              android:title="@string/menu_recent_tabs"
              android:icon="@drawable/devices_black_24dp" />
-@@ -180,6 +184,9 @@ found in the LICENSE file.
+@@ -183,6 +187,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" />
@@ -57,7 +58,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -97,6 +97,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
+@@ -95,6 +95,7 @@ import org.chromium.chrome.browser.base.ColdStartTracker;
  import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
  import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
  import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -65,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
  import org.chromium.chrome.browser.compositor.layouts.Layout;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
  import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -2858,6 +2859,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2919,6 +2920,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                      getTabModelSelectorSupplier().get(),
                      closeAllTabsRunnable);
              RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -74,7 +75,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
          } else if (id == R.id.close_all_incognito_tabs_menu_id) {
              // Close only incognito tabs
              Runnable closeAllTabsRunnable =
-@@ -2944,6 +2947,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -3005,6 +3008,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
      }
  
@@ -360,7 +361,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
        NotifyOnFinish(BookmarksExportObserver::Result::kCouldNotWriteNodes);
        return;
      }
-@@ -464,6 +469,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
+@@ -460,6 +465,8 @@ void BookmarkFaviconFetcher::ExportBookmarks() {
        BookmarkModelFactory::GetForBrowserContext(profile_)->other_node());
    ExtractUrls(
        BookmarkModelFactory::GetForBrowserContext(profile_)->mobile_node());
@@ -372,7 +373,7 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
 diff --git a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
 --- a/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
 +++ b/chrome/browser/bookmarks/bookmark_merged_surface_service.cc
-@@ -42,6 +42,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
+@@ -43,6 +43,8 @@ std::optional<PermanentFolderType> GetIfPermanentFolderType(
  
      case BookmarkNode::Type::URL:
        NOTREACHED();
@@ -405,7 +406,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
-@@ -4506,6 +4506,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4512,6 +4512,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>
@@ -415,10 +416,22 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_MENU_GET_IMAGE_DESCRIPTIONS" desc="Menu item to start getting alt text accessibility image labels/descriptions [CHAR_LIMIT=27]">
          Get image descriptions
        </message>
+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
+@@ -54,6 +54,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
+   if (is_reorder) {
+     base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target);
+     switch (GetParentType()) {
++      case bookmarks::BookmarkNode::TABS_COLLECTION:
++        break;
+       case bookmarks::BookmarkNode::URL:
+         NOTREACHED();
+       case bookmarks::BookmarkNode::FOLDER:
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
-@@ -157,6 +157,8 @@ BookmarkParentFolder GetBookmarkParentFolderForNode(
+@@ -103,6 +103,8 @@ BookmarkParentFolder GetBookmarkParentFolderForNode(
        return BookmarkParentFolder::OtherFolder();
      case bookmarks::BookmarkNode::MOBILE:
        return BookmarkParentFolder::MobileFolder();

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

@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/
 diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
 --- a/chrome/android/java/res/menu/main_menu.xml
 +++ b/chrome/android/java/res/menu/main_menu.xml
-@@ -110,6 +110,9 @@ found in the LICENSE file.
+@@ -113,6 +113,9 @@ found in the LICENSE file.
          <item android:id="@+id/universal_install"
              android:title="@string/menu_add_to_homescreen"
              android:icon="@drawable/ic_add_to_home_screen" />
@@ -42,7 +42,7 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -2891,6 +2891,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2952,6 +2952,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
              }
              RecordUserAction.record("MobileMenuDownloadManager");
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -2649,6 +2649,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -2576,6 +2576,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              return doOpenWebApk(currentTab);
          }
  
@@ -69,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
-@@ -566,6 +566,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -575,6 +575,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
                          isNativePage, isFileScheme, isContentScheme, isIncognito, url));
  
          updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isNativePage);
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
  
          updateAutoDarkMenuItem(menu, currentTab, isNativePage);
  
-@@ -1277,6 +1278,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
+@@ -1286,6 +1287,23 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
          findInPageMenuRow.setVisible(itemVisible);
      }
  
@@ -104,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
-@@ -293,6 +293,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+@@ -300,6 +300,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  
              updateRequestDesktopSiteMenuItem(
                      menu, currentTab, requestDesktopSiteVisible, isNativePage);

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

@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
-@@ -397,7 +397,12 @@ class TabGridViewBinder {
+@@ -398,7 +398,12 @@ class TabGridViewBinder {
                      if (result != null) {
                          TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                      } else {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                      }
                  };
          if (sThumbnailFetcherForTesting != null) {
-@@ -438,6 +443,7 @@ class TabGridViewBinder {
+@@ -439,6 +444,7 @@ class TabGridViewBinder {
       */
      private static void setFavicon(
              ImageView faviconView, PropertyModel model, TabListFaviconProvider.TabFavicon favicon) {
@@ -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
-@@ -142,6 +142,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
+@@ -140,6 +140,7 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
  import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,7 +92,7 @@ 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;
-@@ -715,7 +716,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -709,7 +710,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                      new TabContentManager(
                              this,
                              mBrowserControlsManagerSupplier.get(),
@@ -112,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.base.supplier.ObservableSupplier;
  import org.chromium.base.supplier.ObservableSupplierImpl;
  import org.chromium.base.ContextUtils;
-@@ -75,12 +76,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -76,12 +77,26 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
  import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
  import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
  
@@ -140,7 +140,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";
-@@ -166,6 +181,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -167,6 +182,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
              }
          }
  
@@ -198,7 +198,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
-@@ -6027,6 +6027,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6033,6 +6033,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

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++
  .../chrome/browser/app/ChromeActivity.java    |  4 +++-
  .../overlays/strip/StripLayoutHelper.java     | 10 ++++++--
- .../strip/StripLayoutHelperManager.java       |  5 +++-
+ .../strip/StripLayoutHelperManager.java       |  6 ++++-
  .../init/ChromeBrowserInitializer.java        |  2 ++
  .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +++-
  .../chrome/browser/ui/RootUiCoordinator.java  |  6 ++++-
@@ -37,7 +37,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../res/xml/accessibility_preferences.xml     |  5 ++++
  .../AccessibilitySettingsDelegate.java        | 11 +++++++++
  .../chromium/ui/base/DeviceFormFactor.java    | 14 +++++++++++
- 33 files changed, 176 insertions(+), 27 deletions(-)
+ 33 files changed, 177 insertions(+), 27 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
 --- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
@@ -98,14 +98,14 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
-@@ -50,6 +50,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
+@@ -51,6 +51,7 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
  import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder;
  import org.chromium.chrome.browser.night_mode.NightModeStateProvider;
  import org.chromium.chrome.browser.night_mode.NightModeUtils;
 +import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
+ import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeManager;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
- import org.chromium.components.browser_ui.util.AutomotiveUtils;
- import org.chromium.components.cached_flags.BooleanCachedFieldTrialParameter;
 @@ -115,6 +116,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
      protected void attachBaseContext(Context newBase) {
          super.attachBaseContext(newBase);
@@ -118,7 +118,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
-@@ -62,6 +62,7 @@ import org.chromium.content_public.browser.WebContents;
+@@ -63,6 +63,7 @@ import org.chromium.content_public.browser.WebContents;
  import org.chromium.content_public.browser.WebContentsObserver;
  import org.chromium.net.NetId;
  import org.chromium.ui.LayoutInflaterUtils;
@@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
  import org.chromium.ui.base.WindowAndroid;
  import org.chromium.ui.display.DisplayUtil;
  import org.chromium.url.GURL;
-@@ -463,7 +464,9 @@ public class WarmupManager {
+@@ -469,7 +470,9 @@ public class WarmupManager {
              ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
  
              if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -140,25 +140,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -20,6 +20,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.preferences.Pref;
  import org.chromium.chrome.browser.settings.SettingsNavigationFactory;
  import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
  import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate;
 +import org.chromium.components.browser_ui.accessibility.AccessibilitySettingsDelegate.BooleanPreferenceDelegate;
  import org.chromium.components.browser_ui.accessibility.FontSizePrefs;
- import org.chromium.components.browser_ui.accessibility.FontSizePrefs.FontSizePrefsObserver;
  import org.chromium.components.browser_ui.accessibility.PageZoomPreference;
-@@ -51,6 +52,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+ import org.chromium.components.browser_ui.accessibility.PageZoomUma;
+@@ -50,6 +51,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
      public static final String PREF_ZOOM_INFO = "zoom_info";
      public static final String PREF_IMAGE_DESCRIPTIONS = "image_descriptions";
  
 +    private BooleanPreferenceDelegate mForceTabletUIDelegate;
 +    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
 +
-     private TextScalePreference mTextScalePref;
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -153,6 +157,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -124,6 +128,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
                  mPrefService.getBoolean(Pref.READER_FOR_ACCESSIBILITY));
          readerForAccessibilityPref.setOnPreferenceChangeListener(this);
  
@@ -171,10 +171,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -231,6 +241,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
-             mFontSizePrefs.setUserFontScaleFactor((Float) newValue);
-         } else if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
-             mFontSizePrefs.setForceEnableZoomFromUser((Boolean) newValue);
+@@ -185,6 +195,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     public boolean onPreferenceChange(Preference preference, Object newValue) {
+         if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
+             mFontSizePrefs.setForceEnableZoom((Boolean) newValue);
 +        } else if (PREF_FORCE_TABLET_UI.equals(preference.getKey())) {
 +            mForceTabletUIDelegate.setEnabled((Boolean) newValue);
 +            mDelegate.requestRestart(getActivity());
@@ -213,7 +213,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
-@@ -860,7 +860,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
+@@ -850,7 +850,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
              // Inflate the correct toolbar layout for the device.
              int toolbarLayoutId = getToolbarLayoutId();
              if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -227,15 +227,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -93,6 +93,7 @@ import org.chromium.components.feature_engagement.Tracker;
+@@ -99,6 +99,7 @@ import org.chromium.components.feature_engagement.Tracker;
  import org.chromium.components.prefs.PrefService;
  import org.chromium.components.tab_groups.TabGroupColorId;
  import org.chromium.ui.MotionEventUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.base.LocalizationUtils;
  import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.interpolators.Interpolators;
-@@ -4655,8 +4656,13 @@ public class StripLayoutHelper
+ import org.chromium.ui.modaldialog.ModalDialogManager;
+@@ -4277,8 +4278,13 @@ public class StripLayoutHelper
          mTabMenu.setAnchorView(tabView);
          // 3. Set the vertical offset to align the tab menu with bottom of the tab strip
          int tabHeight = mManagerHost.getHeight();
@@ -254,7 +254,15 @@ 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
-@@ -457,7 +457,10 @@ public class StripLayoutHelperManager
+@@ -91,6 +91,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;
++import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.base.LocalizationUtils;
+ import org.chromium.ui.base.PageTransition;
+ import org.chromium.ui.base.WindowAndroid;
+@@ -439,7 +440,10 @@ public class StripLayoutHelperManager
  
          mIsLayoutOptimizationsEnabled =
                  ToolbarFeatures.isTabStripWindowLayoutOptimizationEnabled(true);
@@ -288,7 +296,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
-@@ -570,7 +570,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -576,7 +576,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
  
      @Override
      public int getControlContainerHeightResource() {
@@ -302,7 +310,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
-@@ -102,6 +102,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -104,6 +104,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
  import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
  import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
  import org.chromium.chrome.browser.pdf.PdfPage;
@@ -311,7 +319,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.price_insights.PriceInsightsButtonController;
  import org.chromium.chrome.browser.price_tracking.CurrentTabPriceTrackingStateSupplier;
  import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
-@@ -1758,7 +1760,9 @@ public class RootUiCoordinator
+@@ -1773,7 +1775,9 @@ public class RootUiCoordinator
          if (!mSupportsFindInPageSupplier.getAsBoolean()) return;
  
          int stubId = R.id.find_toolbar_stub;
@@ -326,7 +334,7 @@ diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BU
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
 @@ -26,6 +26,7 @@ android_library("java") {
-     "//components/browser_ui/site_settings/android:constants_java",
+     "//components/cached_flags:java",
      "//third_party/androidx:androidx_annotation_annotation_java",
      "//third_party/jni_zero:jni_zero_java",
 +    "//ui/android:ui_java",
@@ -336,7 +344,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
-@@ -265,6 +265,7 @@ public final class ChromePreferenceKeys {
+@@ -262,6 +262,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";
@@ -376,12 +384,12 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -57,6 +57,7 @@ public class LegacyChromePreferenceKeys {
+@@ -55,6 +55,7 @@ public class LegacyChromePreferenceKeys {
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_COMPLETE,
+                 ChromePreferenceKeys.FIRST_RUN_FLOW_SIGNIN_SETUP,
                  ChromePreferenceKeys.FIRST_RUN_LIGHTWEIGHT_FLOW_COMPLETE,
-                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
-                 ChromePreferenceKeys.FONT_USER_FONT_SCALE_FACTOR,
 +                ChromePreferenceKeys.FLAGS_FORCE_TABLET_UI_ENABLED,
-                 ChromePreferenceKeys.FONT_USER_SET_FORCE_ENABLE_ZOOM,
+                 ChromePreferenceKeys.FIRST_RUN_SKIP_WELCOME_PAGE,
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
 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
@@ -389,7 +397,7 @@ diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/c
 +++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderCoordinator.java
 @@ -34,6 +34,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils.DesktopWi
  import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
- import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
  import org.chromium.components.browser_ui.edge_to_edge.EdgeToEdgeStateProvider;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.InsetObserver;
@@ -406,7 +414,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
-@@ -782,7 +782,7 @@ public class LocationBarCoordinator
+@@ -786,7 +786,7 @@ public class LocationBarCoordinator
      }
  
      private boolean isTabletWindow() {
@@ -418,7 +426,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
-@@ -1742,6 +1742,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1710,6 +1710,13 @@ Your Google account may have other forms of browsing history like searches and a
          Hide your IP address
        </message>
  
@@ -524,7 +532,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/values/dimens.xml b/chro
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/ControlContainer.java
-@@ -22,7 +22,7 @@ public interface ControlContainer {
+@@ -23,7 +23,7 @@ public interface ControlContainer {
       * Initialize the control container with the specified toolbar.
       * @param toolbarLayoutId The ID of the toolbar layout to use.
       */
@@ -544,7 +552,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
  import android.graphics.Canvas;
  import android.graphics.PorterDuff;
  import android.graphics.Rect;
-@@ -128,8 +129,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+@@ -143,8 +144,29 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
      }
  
      @Override
@@ -578,15 +586,15 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils;
+ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
  import org.chromium.components.feature_engagement.Tracker;
- import org.chromium.ui.UiUtils;
  import org.chromium.ui.base.ViewUtils;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.util.TokenHolder;
  import org.chromium.url.GURL;
  
-@@ -642,7 +643,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -590,7 +591,9 @@ public abstract class ToolbarLayout extends FrameLayout
       * not have a tab strip.
       */
      protected int getTabStripHeightFromResource() {
@@ -600,33 +608,33 @@ 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
-@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
+@@ -28,6 +28,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;
 +import org.chromium.ui.base.DeviceFormFactor;
  import org.chromium.ui.resources.dynamics.DynamicResourceReadyOnceCallback;
+ import org.chromium.ui.util.TokenHolder;
  
- /**
-@@ -450,6 +451,7 @@ class HeightTransitionHandler {
+@@ -542,6 +543,7 @@ class HeightTransitionHandler {
          if (TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting != null) {
              return TabStripTransitionCoordinator.sHeightTransitionThresholdForTesting;
          }
 +        if (DeviceFormFactor.isForceTabletUI()) return 0;
          return TRANSITION_THRESHOLD_DP;
      }
- }
+ 
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java
 @@ -27,6 +27,7 @@ import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
  import org.chromium.components.browser_ui.desktop_windowing.AppHeaderState;
- import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider;
- import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateProvider.AppHeaderObserver;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
+ import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager.AppHeaderObserver;
 +import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.util.TokenHolder;
  
  /** Class used to manage tab strip visibility and height updates. */
+ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHeaderObserver {
 @@ -151,7 +152,10 @@ public class TabStripTransitionCoordinator implements ComponentCallbacks, AppHea
          mTabStripReservedTopPadding =
                  controlContainerView()
@@ -642,7 +650,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -46,6 +46,11 @@ found in the LICENSE file.
+@@ -41,6 +41,11 @@ found in the LICENSE file.
          android:summary="@string/jump_start_omnibox_summary"
          android:title="@string/jump_start_omnibox_title" />
  

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

@@ -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;
-@@ -1551,8 +1552,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1590,8 +1591,10 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              boolean hadCipherData =
                      CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
  
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
  import org.chromium.chrome.R;
  import org.chromium.chrome.browser.enterprise.util.ManagedBrowserUtils;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
-@@ -85,6 +88,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -86,6 +89,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      private final SharedPreferencesManager mSharedPreferencesManager =
              ChromeSharedPreferences.getInstance();
  
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -5536,6 +5536,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -5542,6 +5542,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
        <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context menu tab when the item pressed contains more than one type. This indicates that all the actions are related to the image.">
          IMAGE
        </message>

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

@@ -23,7 +23,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/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
-@@ -23,6 +23,7 @@ import org.chromium.chrome.R;
+@@ -22,6 +22,7 @@ import org.chromium.base.supplier.OneshotSupplier;
  import org.chromium.chrome.browser.data_sharing.DataSharingServiceFactory;
  import org.chromium.chrome.browser.data_sharing.ui.shared_image_tiles.SharedImageTilesCoordinator;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -31,7 +31,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
  import org.chromium.chrome.browser.layouts.LayoutStateProvider;
  import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
  import org.chromium.chrome.browser.layouts.LayoutType;
-@@ -408,10 +409,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -408,10 +409,15 @@ public class TabGroupUiMediator implements BackPressHandler, ThemeColorObserver,
                      assert relatedTabs.size() > 0;
  
                      Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -51,7 +51,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/TabUiUtils.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUtils.java
-@@ -43,6 +43,8 @@ import org.chromium.components.tab_groups.TabGroupColorId;
+@@ -48,6 +48,8 @@ import org.chromium.components.tab_groups.TabGroupColorId;
  import org.chromium.content_public.browser.LoadUrlParams;
  import org.chromium.ui.modaldialog.ModalDialogManager;
  import org.chromium.ui.modaldialog.ModalDialogUtils;
@@ -59,8 +59,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 +import org.chromium.url.GURL;
  
  import java.util.List;
- import java.util.Objects;
-@@ -204,8 +206,13 @@ public class TabUiUtils {
+ 
+@@ -210,8 +212,13 @@ public class TabUiUtils {
          List<Tab> relatedTabs = filter.getRelatedTabList(tabId);
          assert relatedTabs.size() > 0;
  
@@ -191,7 +191,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
-@@ -278,6 +278,7 @@ public final class ChromePreferenceKeys {
+@@ -275,6 +275,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";
  
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 --- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
 +++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/LegacyChromePreferenceKeys.java
-@@ -61,6 +61,7 @@ public class LegacyChromePreferenceKeys {
+@@ -59,6 +59,7 @@ public class LegacyChromePreferenceKeys {
                  ChromePreferenceKeys.HISTORY_SHOW_HISTORY_INFO,
                  ChromePreferenceKeys.HOMEPAGE_ENABLED,
                  ChromePreferenceKeys.HOMEPAGE_USE_DEFAULT_URI,
@@ -213,7 +213,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1528,6 +1528,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1520,6 +1520,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>
@@ -238,7 +238,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
-@@ -1373,6 +1373,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
+@@ -1339,6 +1339,10 @@ inline constexpr char kShowHomeButton[] = "browser.show_home_button";
  // toolbar.
  inline constexpr char kShowForwardButton[] = "browser.show_forward_button";
  

build/patches/Add-search-engine.patch

@@ -108,7 +108,7 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se
 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
-@@ -178,10 +178,7 @@ void RecordChoiceScreenDefaultSearchProviderType(SearchEngineType engine_type) {
+@@ -186,10 +186,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
  }
  
  void RecordChoiceScreenSelectedIndex(int selected_engine_index) {

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

@@ -14,7 +14,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
  .../chrome_browsing_data_remover_constants.h  |  3 +-
  .../chrome_browsing_data_remover_delegate.cc  | 14 ++++
- chrome/browser/dips/dips_service_impl.cc      |  2 +-
+ chrome/browser/dips/dips_service_impl.cc      |  3 +-
  .../api/settings_private/prefs_util.cc        | 17 +++++
  .../browser/profiles/ProfileManagerUtils.java |  5 ++
  .../profiles/android/profile_manager_utils.cc |  5 ++
@@ -33,13 +33,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  components/browsing_data/core/pref_names.h    | 10 +++
  .../search_engines/template_url_service.cc    |  1 +
  content/browser/storage_partition_impl.cc     |  1 +
- 29 files changed, 323 insertions(+), 23 deletions(-)
+ 29 files changed, 324 insertions(+), 23 deletions(-)
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 
 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
-@@ -311,6 +311,7 @@ chrome_java_sources = [
+@@ -309,6 +309,7 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAdvanced.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java",
    "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java",
@@ -50,7 +50,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
 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
-@@ -182,6 +182,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -180,6 +180,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;
@@ -58,7 +58,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;
-@@ -1551,7 +1552,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1590,7 +1591,11 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
              Intent intent = getIntent();
  
              boolean hadCipherData =
@@ -74,7 +74,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/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
-@@ -460,6 +460,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -456,6 +456,10 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
      /** Returns whether is a basic or advanced Clear Browsing Data tab. */
      protected abstract @ClearBrowsingDataTab int getClearBrowsingDataTabType();
  
@@ -85,7 +85,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.
       *
-@@ -540,6 +544,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -534,6 +538,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
       * options.
       */
      private void onClearButtonClicked() {
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
          if (shouldShowImportantSitesDialog()) {
              showImportantDialogThenClear();
              return;
-@@ -572,6 +577,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
+@@ -566,6 +571,7 @@ public abstract class ClearBrowsingDataFragment extends PreferenceFragmentCompat
          Button clearButton = (Button) getView().findViewById(R.id.clear_button);
          boolean isEnabled = !getSelectedOptions().isEmpty();
          clearButton.setEnabled(isEnabled);
@@ -183,16 +183,16 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataTabsFragment.java
-@@ -28,7 +28,7 @@ import org.chromium.chrome.browser.settings.SettingsActivity;
-  * Fragment with a {@link TabLayout} containing a basic and an advanced version of the CBD dialog.
+@@ -32,7 +32,7 @@ import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
   */
- public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDependentSetting {
+ public class ClearBrowsingDataTabsFragment extends Fragment
+         implements ProfileDependentSetting, EmbeddableSettingsPage {
 -    public static final int CBD_TAB_COUNT = 2;
 +    public static final int CBD_TAB_COUNT = 3;
  
      private Profile mProfile;
      private ClearBrowsingDataFetcher mFetcher;
-@@ -109,6 +109,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -117,6 +117,8 @@ public class ClearBrowsingDataTabsFragment extends Fragment
                  return getActivity().getString(R.string.clear_browsing_data_basic_tab_title);
              case 1:
                  return getActivity().getString(R.string.prefs_section_advanced);
@@ -201,7 +201,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
              default:
                  throw new RuntimeException("invalid position: " + position);
          }
-@@ -154,6 +156,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment implements ProfileDe
+@@ -167,6 +169,9 @@ public class ClearBrowsingDataTabsFragment extends Fragment
                  case 1:
                      fragment = new ClearBrowsingDataFragmentAdvanced();
                      break;
@@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 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
-@@ -2332,6 +2332,16 @@
+@@ -2324,6 +2324,16 @@
    <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
      Delete browsing data
    </message>
@@ -246,7 +246,7 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
-@@ -312,8 +312,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -311,8 +311,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
  
  void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
      bool keep_browser_alive) {
@@ -274,7 +274,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
  
    if (!data_types.empty() &&
        IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -422,6 +439,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -421,6 +438,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
  bool ChromeBrowsingDataLifetimeManager::
      IsConditionSatisfiedForBrowsingDataRemoval(
          const syncer::UserSelectableTypeSet sync_types) {
@@ -298,7 +298,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_constants
 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
-@@ -460,6 +460,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -464,6 +464,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
            CreateTaskCompletionClosure(TracingDataType::kHistory),
            &history_task_tracker_);
      }
@@ -308,7 +308,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      if (ClipboardRecentContent::GetInstance())
        ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
  
-@@ -557,6 +560,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -572,6 +575,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()) {
@@ -320,7 +320,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&)>()
-@@ -585,9 +593,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -600,9 +608,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
      }
  
      device_event_log::Clear(delete_begin_, delete_end_);
@@ -334,7 +334,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
      content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
          delete_begin_, delete_end_);
  
-@@ -1282,6 +1294,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1302,6 +1314,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
  
      if (should_clear_zero_suggest_and_session_token && template_url_service)
        template_url_service->ClearSessionToken();
@@ -346,7 +346,15 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/dips/dips_service_impl.cc b/chrome/browser/dips/dips_service_impl.cc
 --- a/chrome/browser/dips/dips_service_impl.cc
 +++ b/chrome/browser/dips/dips_service_impl.cc
-@@ -200,7 +200,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
+@@ -26,6 +26,7 @@
+ #include "base/time/time.h"
+ #include "base/types/pass_key.h"
+ #include "chrome/browser/chrome_content_browser_client.h"
++#include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
+ #include "chrome/browser/dips/chrome_dips_delegate.h"
+ #include "chrome/browser/dips/dips_redirect_info.h"
+ #include "chrome/browser/dips/dips_service_factory.h"
+@@ -195,7 +196,7 @@ class StateClearer : public content::BrowsingDataRemover::Observer {
      }
      remover->RemoveWithFilterAndReply(
          base::Time::Min(), base::Time::Max(),
@@ -358,7 +366,7 @@ diff --git a/chrome/browser/dips/dips_service_impl.cc b/chrome/browser/dips/dips
 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
-@@ -539,6 +539,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -540,6 +540,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
    (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
        settings_api::PrefType::kNumber;
  
@@ -436,7 +444,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_ ||
-@@ -2115,7 +2128,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2114,7 +2127,7 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
    Profile* original_profile = profile->GetOriginalProfile();
    // Do nothing if the closed window is not the last window of the same profile.
    for (Browser* browser_iter : *BrowserList::GetInstance()) {
@@ -533,7 +541,7 @@ diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1462,7 +1462,7 @@ For example, some websites may respond to this request by showing you ads that a
+@@ -1454,7 +1454,7 @@ For example, some websites may respond to this request by showing you ads that a
          Delete browsing data
        </message>
        <message name="IDS_CLEAR_BROWSING_DATA_SUMMARY" desc="Summary of the settings item that opens the Delete Browsing Data dialog.">
@@ -542,7 +550,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_CLEAR_BROWSING_DATA_HISTORY_DIALOG_TITLE" desc="Title of a dialog that is shown after the deletion of browsing history finished.">
          Deleted Chrome data
-@@ -1623,6 +1623,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1615,6 +1615,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>
@@ -555,7 +563,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 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
-@@ -1861,6 +1861,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -1839,6 +1839,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        {"clearedData", IDS_SETTINGS_CLEARED_DATA},
        {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
        {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
@@ -641,7 +649,7 @@ diff --git a/components/browsing_data/core/browsing_data_policies_utils.h b/comp
 diff --git a/components/browsing_data/core/browsing_data_utils.cc b/components/browsing_data/core/browsing_data_utils.cc
 --- a/components/browsing_data/core/browsing_data_utils.cc
 +++ b/components/browsing_data/core/browsing_data_utils.cc
-@@ -346,6 +346,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -347,6 +347,37 @@ bool GetDeletionPreferenceFromDataType(
      BrowsingDataType data_type,
      ClearBrowsingDataTab clear_browsing_data_tab,
      std::string* out_pref) {
@@ -741,7 +749,7 @@ diff --git a/components/browsing_data/core/pref_names.h b/components/browsing_da
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -796,6 +796,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -777,6 +777,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 &&

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

@@ -70,17 +70,17 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettings.java
-@@ -60,6 +60,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -59,6 +59,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
      private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
      private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
  
 +    static final String PREF_ALWAYS_SHOW_CONTEXTMENU_ON_LINKS = "always_show_contextmenu_on_links";
 +    private BooleanPreferenceDelegate mShowAlwaysContextMenuOnLinksDelegate;
 +
-     private TextScalePreference mTextScalePref;
      private PageZoomPreference mPageZoomDefaultZoomPref;
      private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
-@@ -184,6 +187,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
+@@ -155,6 +158,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
          mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.isEnabled());
          mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
  
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
          Preference captions = findPreference(PREF_CAPTIONS);
          captions.setOnPreferenceClickListener(
                  preference -> {
-@@ -279,6 +288,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -233,6 +242,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
              mDelegate.requestRestart(getActivity());
          } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
              mDisableToolbarSwipeUpDelegate.setEnabled((Boolean) newValue);
@@ -164,7 +164,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
-@@ -279,6 +279,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -275,6 +275,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
  
          if (mParams.isAnchor()) {
              ModelList linkGroup = new ModelList();
@@ -174,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
              if (FirstRunStatus.getFirstRunFlowComplete()
                      && !isEmptyUrl(mParams.getUrl())
                      && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -661,6 +664,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -657,6 +660,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                                  getProfile(),
                                  false);
                      });
@@ -186,7 +186,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
-@@ -327,6 +327,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -326,6 +326,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
          mTab.loadUrl(loadUrlParams);
      }
  
@@ -204,10 +204,10 @@ 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
-@@ -326,6 +326,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -325,6 +325,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabDragDropAndroid,
+     &kToolbarPhoneCleanup,
      &kTabGroupCreationDialogAndroid,
-     &kTabGroupParityAndroid,
-     &kTabletTabSwitcherLongPressMenu,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
      &kTabletToolbarReordering,
      &kTabResumptionModuleAndroid,
@@ -215,7 +215,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -403,6 +403,8 @@ public abstract class ChromeFeatureList {
+@@ -391,6 +391,8 @@ public abstract class ChromeFeatureList {
              "DisableToolbarSwipeUp";
      public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
              "MoveTopToolbarToBottom";
@@ -224,16 +224,16 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
      public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
      public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
              "NotificationPermissionBottomSheet";
-@@ -726,6 +728,8 @@ public abstract class ChromeFeatureList {
+@@ -696,6 +698,8 @@ public abstract class ChromeFeatureList {
              newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
      public static final CachedFlag sMoveTopToolbarToBottom =
              newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
 +    public static final CachedFlag sShowAlwaysContextMenuOnLinks =
 +            newCachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false);
-     public static final CachedFlag sPrivacyGuidePreloadAndroid =
-             newCachedFlag(PRIVACY_GUIDE_PRELOAD_ANDROID, false);
-     public static final CachedFlag sOptimizationGuidePushNotifications =
-@@ -893,6 +897,7 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
+     public static final CachedFlag sPostGetMyMemoryStateToBackground =
+             newCachedFlag(POST_GET_MEMORY_PRESSURE_TO_BACKGROUND, false);
+@@ -849,6 +853,7 @@ public abstract class ChromeFeatureList {
                      sTabWindowManagerReportIndicesMismatch,
                      sTraceBinderIpc,
                      sUseChimeAndroidSdk,
@@ -244,7 +244,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1807,6 +1807,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1775,6 +1775,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>
@@ -257,7 +257,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]">
-@@ -3293,6 +3299,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3314,6 +3320,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>
@@ -270,7 +270,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -36,6 +36,11 @@ found in the LICENSE file.
+@@ -31,6 +31,11 @@ found in the LICENSE file.
          android:summary="@string/page_zoom_always_show_preference_summary"
          android:title="@string/page_zoom_always_show_preference_title" />
  
@@ -467,7 +467,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
  #include "third_party/blink/renderer/core/paint/timing/paint_timing.h"
  #include "third_party/blink/renderer/core/probe/core_probes.h"
  #include "third_party/blink/renderer/core/resize_observer/resize_observer_entry.h"
-@@ -798,6 +800,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
+@@ -797,6 +799,21 @@ void HTMLImageElement::DidFinishLifecycleUpdate(
    }
  }
  
@@ -504,7 +504,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_p
 diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/third_party/blink/renderer/core/page/context_menu_controller.cc
 --- a/third_party/blink/renderer/core/page/context_menu_controller.cc
 +++ b/third_party/blink/renderer/core/page/context_menu_controller.cc
-@@ -232,14 +232,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
+@@ -190,14 +190,16 @@ void ContextMenuController::DocumentDetached(Document* document) {
    }
  }
  
@@ -524,7 +524,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
      mouse_event->SetDefaultHandled();
  }
  
-@@ -457,7 +459,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
+@@ -415,7 +417,8 @@ bool ContextMenuController::ShouldShowContextMenuFromTouch(
  bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
                                              const PhysicalOffset& point,
                                              WebMenuSourceType source_type,
@@ -534,7 +534,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
    // Displaying the context menu in this function is a big hack as we don't
    // have context, i.e. whether this is being invoked via a script or in
    // response to user input (Mouse event WM_RBUTTONDOWN,
-@@ -480,6 +483,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -438,6 +441,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
    if (!result.InnerNodeOrImageMapImage())
      return false;
  
@@ -551,9 +551,9 @@ 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;
-@@ -836,11 +849,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -793,11 +806,13 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+ 
    SetAutofillData(result.InnerNode(), data);
-   SetPasswordManagerData(result.InnerElement(), data);
  
 -  const bool from_touch = source_type == kMenuSourceTouch ||
 -                          source_type == kMenuSourceLongPress ||

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
-@@ -160,6 +160,7 @@
+@@ -162,6 +162,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"
@@ -112,7 +112,7 @@ diff --git a/components/feature_engagement/public/feature_configurations.cc b/co
 diff --git a/components/site_engagement/content/site_engagement_score.cc b/components/site_engagement/content/site_engagement_score.cc
 --- a/components/site_engagement/content/site_engagement_score.cc
 +++ b/components/site_engagement/content/site_engagement_score.cc
-@@ -23,6 +23,7 @@
+@@ -19,6 +19,7 @@
  #include "components/content_settings/core/common/content_settings.h"
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/content_settings/core/common/content_settings_utils.h"
@@ -120,7 +120,7 @@ diff --git a/components/site_engagement/content/site_engagement_score.cc b/compo
  #include "components/site_engagement/content/engagement_type.h"
  #include "components/site_engagement/content/site_engagement_metrics.h"
  #include "third_party/blink/public/mojom/site_engagement/site_engagement.mojom.h"
-@@ -280,6 +281,10 @@ void SiteEngagementScore::Commit() {
+@@ -276,6 +277,10 @@ void SiteEngagementScore::Commit() {
    if (!UpdateScoreDict(*score_dict_))
      return;
  

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

@@ -20,7 +20,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
  import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
  import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
  import org.chromium.components.browser_ui.util.TraceEventVectorDrawableCompat;
-@@ -436,8 +437,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -458,8 +459,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
-@@ -125,6 +125,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(
+@@ -130,6 +130,16 @@ void JNI_ContentUriUtils_AddFileInfoToVector(
                         Time::FromMillisecondsSinceUnixEpoch(last_modified));
  }
  
@@ -44,8 +44,8 @@ diff --git a/base/android/content_uri_utils.h b/base/android/content_uri_utils.h
 +BASE_EXPORT File OpenContentUriForWrite(const FilePath& content_uri);
 +
  // Returns true if file exists and results are populated, else returns false.
- // Java code requires a Content-URI to look up file info such as is-dir, size,
- // and last-mod, so code that needs to support Content-URI should use
+ bool ContentUriGetFileInfo(const FilePath& content_uri,
+                            FileEnumerator::FileInfo* results);
 diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base/android/java/src/org/chromium/base/ContentUriUtils.java
 --- a/base/android/java/src/org/chromium/base/ContentUriUtils.java
 +++ b/base/android/java/src/org/chromium/base/ContentUriUtils.java
@@ -57,9 +57,9 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
  import android.provider.DocumentsContract;
  import android.provider.MediaStore;
  import android.text.TextUtils;
-@@ -25,6 +26,9 @@ import org.jni_zero.NativeMethods;
- 
+@@ -26,6 +27,9 @@ import org.jni_zero.NativeMethods;
  import java.io.IOException;
+ import java.util.List;
  
 +import android.system.Os;
 +import android.content.ContentProviderClient;
@@ -67,7 +67,7 @@ diff --git a/base/android/java/src/org/chromium/base/ContentUriUtils.java b/base
  /** This class provides methods to access content URI schemes. */
  @JNINamespace("base")
  public abstract class ContentUriUtils {
-@@ -53,6 +57,36 @@ public abstract class ContentUriUtils {
+@@ -59,6 +63,36 @@ public abstract class ContentUriUtils {
          return -1;
      }
  

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

@@ -84,7 +84,7 @@ Enabled by default
 diff --git a/DEPS b/DEPS
 --- a/DEPS
 +++ b/DEPS
-@@ -482,6 +482,10 @@ vars = {
+@@ -464,6 +464,10 @@ vars = {
    # Three lines of non-changing comments so that
    # the commit queue can handle CLs rolling feed
    # and whatever else without interference from each other.
@@ -92,10 +92,10 @@ diff --git a/DEPS b/DEPS
 +  # Three lines of non-changing comments so that
 +  # the commit queue can handle CLs rolling feed
 +  # and whatever else without interference from each other.
-   'highway_revision': '8295336dd70f1201d42c22ab5b0861de38cf8fbf',
+   'highway_revision': '00fe003dac355b979f36157f9407c7c46448958e',
    # Three lines of non-changing comments so that
    # the commit queue can handle CLs rolling ffmpeg
-@@ -1659,6 +1663,9 @@ deps = {
+@@ -1655,6 +1659,9 @@ deps = {
    'src/third_party/dawn':
      Var('dawn_git') + '/dawn.git' + '@' +  Var('dawn_revision'),
  
@@ -316,7 +316,7 @@ diff --git a/media/BUILD.gn b/media/BUILD.gn
 diff --git a/media/media_options.gni b/media/media_options.gni
 --- a/media/media_options.gni
 +++ b/media/media_options.gni
-@@ -132,6 +132,9 @@ declare_args() {
+@@ -137,6 +137,9 @@ declare_args() {
    # `enable_libaom` should likely also be overriddent to false.
    enable_av1_decoder = enable_dav1d_decoder
  
@@ -329,7 +329,7 @@ diff --git a/media/media_options.gni b/media/media_options.gni
 diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
 --- a/net/base/mime_util.cc
 +++ b/net/base/mime_util.cc
-@@ -165,6 +165,7 @@ static const MimeInfo kPrimaryMappings[] = {
+@@ -166,6 +166,7 @@ static const MimeInfo kPrimaryMappings[] = {
      {"image/avif", "avif"},
      {"image/gif", "gif"},
      {"image/jpeg", "jpeg,jpg"},
@@ -337,8 +337,8 @@ diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
      {"image/png", "png"},
      {"image/apng", "png,apng"},
      {"image/svg+xml", "svg,svgz"},
-@@ -661,6 +662,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
-                                                   "image/gif",
+@@ -664,6 +665,7 @@ static const char* const kStandardImageTypes[] = {"image/avif",
+                                                   "image/heif",
                                                    "image/ief",
                                                    "image/jpeg",
 +                                                  "image/jxl",
@@ -375,7 +375,7 @@ diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc
 diff --git a/third_party/.gitignore b/third_party/.gitignore
 --- a/third_party/.gitignore
 +++ b/third_party/.gitignore
-@@ -82,6 +82,7 @@
+@@ -79,6 +79,7 @@
  /libgifcodec
  /libjingle/source
  /libupnp
@@ -419,7 +419,7 @@ diff --git a/third_party/blink/common/loader/network_utils.cc b/third_party/blin
 diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink/common/mime_util/mime_util.cc
 --- a/third_party/blink/common/mime_util/mime_util.cc
 +++ b/third_party/blink/common/mime_util/mime_util.cc
-@@ -15,6 +15,7 @@
+@@ -16,6 +16,7 @@
  #include "media/media_buildflags.h"
  #include "net/base/mime_util.h"
  #include "third_party/blink/public/common/buildflags.h"
@@ -427,7 +427,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util.cc b/third_party/blink
  
  #if !BUILDFLAG(IS_IOS)
  // iOS doesn't use and must not depend on //media
-@@ -43,6 +44,9 @@ constexpr auto kSupportedImageTypes = base::MakeFixedFlatSet<std::string_view>({
+@@ -44,6 +45,9 @@ constexpr auto kSupportedImageTypes = base::MakeFixedFlatSet<std::string_view>({
  #if BUILDFLAG(ENABLE_AV1_DECODER)
      "image/avif",
  #endif
@@ -464,7 +464,7 @@ diff --git a/third_party/blink/common/mime_util/mime_util_unittest.cc b/third_pa
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -4542,6 +4542,7 @@ domain Emulation
+@@ -4577,6 +4577,7 @@ domain Emulation
    experimental type DisabledImageType extends string
      enum
        avif
@@ -605,7 +605,7 @@ diff --git a/third_party/blink/renderer/modules/webcodecs/image_decoder_fuzzer.c
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
-@@ -2383,6 +2383,10 @@ source_set("blink_platform_unittests_sources") {
+@@ -2392,6 +2392,10 @@ source_set("blink_platform_unittests_sources") {
      sources += [ "text/locale_icu_test.cc" ]
    }
  
@@ -616,7 +616,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
    sources += [ "testing/run_all_tests.cc" ]
  
    configs += [
-@@ -2429,6 +2433,7 @@ source_set("blink_platform_unittests_sources") {
+@@ -2438,6 +2442,7 @@ source_set("blink_platform_unittests_sources") {
      "//third_party/blink/renderer/platform/wtf",
      "//third_party/dawn/src/dawn/native",
      "//third_party/dawn/src/dawn/wire",
@@ -674,8 +674,8 @@ diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_metrics.h
 diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn
 +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn
-@@ -72,6 +72,15 @@ component("image_decoders") {
-     "//third_party/libyuv",
+@@ -78,6 +78,15 @@ component("image_decoders") {
+     "//ui/gfx/geometry:geometry_skia",
    ]
  
 +  if (enable_jxl_decoder) {
@@ -693,7 +693,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third
 diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
 +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  
  #include "base/containers/heap_array.h"
  #include "base/logging.h"
@@ -701,7 +701,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  #include "base/numerics/byte_conversions.h"
  #include "base/numerics/safe_conversions.h"
  #include "base/trace_event/trace_event.h"
-@@ -55,6 +56,10 @@
+@@ -56,6 +57,10 @@
  #include "third_party/blink/renderer/platform/image-decoders/avif/crabbyavif_image_decoder.h"
  #endif
  
@@ -712,7 +712,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  namespace blink {
  
  namespace {
-@@ -82,6 +87,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
+@@ -83,6 +88,11 @@ cc::ImageType FileExtensionToImageType(String image_extension) {
    if (image_extension == "avif") {
      return cc::ImageType::kAVIF;
    }
@@ -724,7 +724,7 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  #endif
    return cc::ImageType::kInvalid;
  }
-@@ -203,6 +213,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
+@@ -204,6 +214,12 @@ String SniffMimeTypeInternal(scoped_refptr<SegmentReader> reader) {
      return "image/avif";
    }
  #endif
@@ -737,9 +737,9 @@ diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc
  
    return String();
  }
-@@ -318,6 +334,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
+@@ -319,6 +335,13 @@ std::unique_ptr<ImageDecoder> ImageDecoder::CreateByMimeType(
            alpha_option, high_bit_depth_decoding_option, color_behavior,
-           max_decoded_bytes, animation_option);
+           aux_image, max_decoded_bytes, animation_option);
      }
 +#endif
 +#if BUILDFLAG(ENABLE_JXL_DECODER)
@@ -2215,7 +2215,7 @@ diff --git a/third_party/blink/tools/commit_stats/git-dirs.txt b/third_party/bli
 diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations
 --- a/third_party/blink/web_tests/TestExpectations
 +++ b/third_party/blink/web_tests/TestExpectations
-@@ -4851,6 +4851,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
+@@ -5094,6 +5094,12 @@ crbug.com/1199522 http/tests/devtools/layers/layers-3d-view-hit-testing.js [ Fai
  # Started failing after rolling new version of check-layout-th.js
  css3/flexbox/perpendicular-writing-modes-inside-flex-item.html [ Failure ]
  
@@ -2231,7 +2231,7 @@ diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/we
 diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites
 --- a/third_party/blink/web_tests/VirtualTestSuites
 +++ b/third_party/blink/web_tests/VirtualTestSuites
-@@ -489,6 +489,15 @@
+@@ -466,6 +466,15 @@
      "args": ["--enable-blink-features=FractionalScrollOffsets"],
      "expires": "Jun 1, 2025"
    },
@@ -2646,7 +2646,7 @@ new file mode 100644
 diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
 --- a/tools/metrics/histograms/enums.xml
 +++ b/tools/metrics/histograms/enums.xml
-@@ -20745,6 +20745,7 @@ from previous Chrome versions.
+@@ -20712,6 +20712,7 @@ from previous Chrome versions.
    <int value="188610022" label="NewMessageListView:enabled"/>
    <int value="189728101" label="FasterLocationReload:disabled"/>
    <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>

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

@@ -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"
-@@ -881,6 +882,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -879,6 +880,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
        // origin.
        WebRTCIPHandlingPolicy policy =
            GetWebRTCIPHandlingPolicy(webrtc_ip_handling_policy);
@@ -246,7 +246,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_rtp_sender.cc
  #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_encoding_options.h"
  #include "third_party/blink/renderer/bindings/modules/v8/v8_rtc_insertable_streams.h"
-@@ -1031,6 +1033,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1030,6 +1032,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
    if (kind != "audio" && kind != "video")
      return nullptr;
  

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

@@ -41,7 +41,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
-@@ -1462,6 +1462,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1464,6 +1464,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
    }
  }
  
@@ -49,7 +49,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->ForEachRenderFrameHostWithAction(
-@@ -1475,6 +1476,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1477,6 +1478,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
        });
    return urls;
  }
@@ -124,7 +124,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
-@@ -15114,12 +15114,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -15172,12 +15172,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
        }
      }
    }
@@ -217,7 +217,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc
 --- a/content/browser/web_package/signed_exchange_reporter.cc
 +++ b/content/browser/web_package/signed_exchange_reporter.cc
-@@ -128,6 +128,7 @@ void ReportResult(
+@@ -127,6 +127,7 @@ void ReportResult(
      FrameTreeNodeId frame_tree_node_id,
      network::mojom::SignedExchangeReportPtr report,
      const net::NetworkAnonymizationKey& network_anonymization_key) {
@@ -225,7 +225,7 @@ diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/b
    FrameTreeNode* frame_tree_node =
        FrameTreeNode::GloballyFindByID(frame_tree_node_id);
    if (!frame_tree_node)
-@@ -142,6 +143,7 @@ void ReportResult(
+@@ -141,6 +142,7 @@ void ReportResult(
    DCHECK(partition);
    partition->GetNetworkContext()->QueueSignedExchangeReport(
        std::move(report), network_anonymization_key);
@@ -254,7 +254,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
-@@ -215,6 +215,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
+@@ -207,6 +207,7 @@ extern const base::FeatureParam<base::TimeDelta> kTimeoutTcpConnectAttemptMax(
      base::Seconds(30));
  
  #if BUILDFLAG(ENABLE_REPORTING)
@@ -281,7 +281,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
-@@ -466,14 +466,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -468,14 +468,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
        const GURL& url,
        const std::optional<base::UnguessableToken>& reporting_source,
        const net::NetworkAnonymizationKey& network_anonymization_key,
@@ -302,7 +302,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 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
-@@ -1489,7 +1489,6 @@ mojom("mojom") {
+@@ -1560,7 +1560,6 @@ mojom("mojom") {
      export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
      export_header_blink = "third_party/blink/public/platform/web_common.h"
      if (enable_reporting) {
@@ -313,7 +313,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1240,6 +1240,7 @@ interface NetworkContext {
+@@ -1181,6 +1181,7 @@ interface NetworkContext {
    // provided `network_anonymization_key`.
    //
    // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -321,7 +321,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1247,6 +1248,7 @@ interface NetworkContext {
+@@ -1188,6 +1189,7 @@ interface NetworkContext {
                NetworkAnonymizationKey network_anonymization_key,
                mojo_base.mojom.DictionaryValue body);
  
@@ -329,7 +329,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
    QueueEnterpriseReport(string type,
                string group,
                url.mojom.Url url,
-@@ -1257,6 +1259,7 @@ interface NetworkContext {
+@@ -1198,6 +1200,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`.
@@ -348,7 +348,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
  #include "base/containers/contains.h"
  #include "base/debug/dump_without_crashing.h"
  #include "base/ranges/algorithm.h"
-@@ -1247,6 +1248,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1243,6 +1244,7 @@ void ContentSecurityPolicy::ReportViolation(
      return;
    }
  
@@ -356,7 +356,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
    PostViolationReport(violation_data, context_frame, report_endpoints,
                        use_reporting_api);
  
-@@ -1254,6 +1256,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1250,6 +1252,7 @@ void ContentSecurityPolicy::ReportViolation(
    // `context_frame` (i.e. we're not processing 'frame-ancestors').
    if (delegate_ && !context_frame)
      delegate_->DispatchViolationEvent(*violation_data, element);
@@ -375,7 +375,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"
-@@ -2784,9 +2785,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2789,9 +2790,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
    return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
  }
  
@@ -398,7 +398,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
  #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
  #include "mojo/public/cpp/bindings/pending_receiver.h"
  #include "services/metrics/public/cpp/ukm_source_id.h"
-@@ -658,8 +659,9 @@ class CORE_EXPORT LocalFrame final
+@@ -659,8 +660,9 @@ class CORE_EXPORT LocalFrame final
    void FinishedScrollSequence();
  
    SmoothScrollSequencer* GetSmoothScrollSequencer() const;

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

@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -757,7 +757,6 @@ if (current_toolchain == default_toolchain) {
+@@ -771,7 +771,6 @@ if (current_toolchain == default_toolchain) {
        "//components/offline_pages/core:offline_page_model_enums_java",
        "//components/sharing_message:sharing_dialog_type_generated_enum",
        "//components/sharing_message:sharing_send_message_result_generated_enum",
@@ -88,7 +88,7 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -667,10 +667,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);
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
  
    // Changes in the profile avatar.
    pref_change_registrar_.Add(
-@@ -1627,6 +1623,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1649,6 +1645,7 @@ GURL ProfileImpl::GetHomePage() {
  }
  
  void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -121,7 +121,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
  #if !BUILDFLAG(IS_ANDROID)
    if (profile->IsNewProfile()) {
      profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, false);
-@@ -1968,9 +1964,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -1967,9 +1963,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
    init_params.icon_index =
        profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
  
@@ -148,7 +148,7 @@ diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/w
 diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc
 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc
 +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -589,10 +589,6 @@ bool ManagementUIHandler::managed() const {
+@@ -580,10 +580,6 @@ bool ManagementUIHandler::managed() const {
  
  void ManagementUIHandler::RegisterPrefChange(
      PrefChangeRegistrar& pref_registrar) {
@@ -204,10 +204,10 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 -      prefs::kSupervisedUserId,
 -      base::BindRepeating(&SupervisedUserService::OnSupervisedUserIdChanged,
 -                          base::Unretained(this)));
-   FirstTimeInterstitialBannerState banner_state =
-       static_cast<FirstTimeInterstitialBannerState>(
-           user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState));
-@@ -166,6 +162,7 @@ FirstTimeInterstitialBannerState SupervisedUserService::GetUpdatedBannerState(
+   SetActive(supervised_user::IsSubjectToParentalControls(user_prefs_.get()));
+ }
+ 
+@@ -139,6 +135,7 @@ SupervisedUserService::SupervisedUserService(
  }
  
  void SupervisedUserService::SetActive(bool active) {
@@ -229,7 +229,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_utils.cc b/
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -191,4 +191,10 @@ bool IsKidFriendlyContentFeedAvailable() {
+@@ -181,4 +181,10 @@ bool IsKidFriendlyContentFeedAvailable() {
    return base::FeatureList::IsEnabled(kKidFriendlyContentFeed);
  }
  

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 --- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 +++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
-@@ -1264,6 +1264,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
+@@ -1305,6 +1305,12 @@ void WebMediaPlayerImpl::OnSelectedVideoTrackChanged(
    pipeline_controller_->OnSelectedVideoTrackChanged(selected);
  }
  
@@ -24,7 +24,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
  void WebMediaPlayerImpl::EnabledAudioTracksChanged(
      const WebVector<WebMediaPlayer::TrackId>& enabled_track_ids) {
    DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3667,7 +3673,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3709,7 +3715,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;
  

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

@@ -18,14 +18,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
  import org.chromium.chrome.browser.DefaultBrowserInfo;
  import org.chromium.chrome.browser.IntentHandler;
  import org.chromium.chrome.browser.bookmarks.BookmarkModel;
-@@ -35,6 +36,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -34,6 +35,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
  import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
  import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge;
  import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
+ import org.chromium.chrome.browser.tabmodel.TabGroupFeatureUtils;
  import org.chromium.chrome.browser.tabmodel.TabGroupModelFilter;
  import org.chromium.chrome.browser.tabmodel.TabModelSelector;
- import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
 @@ -250,6 +252,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
              Referrer referrer,
              boolean navigateToTab,

build/patches/Android-Toolbar-Scroll-Ablation-setting.patch

@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -78,6 +78,12 @@ found in the LICENSE file.
+@@ -73,6 +73,12 @@ found in the LICENSE file.
          android:key="disable_toolbar_swipeup"
          android:title="@string/disable_toolbar_swipe_up" />
  

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

@@ -281,7 +281,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1169,7 +1169,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1181,7 +1181,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                          mActivity,
                          mStatusIndicatorCoordinator,
                          isUrlBarFocusedSupplier,
@@ -296,7 +296,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorBase.java
-@@ -337,6 +337,13 @@ public abstract class TabModelSelectorBase
+@@ -335,6 +335,13 @@ public abstract class TabModelSelectorBase
          return null;
      }
  
@@ -362,7 +362,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
 --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
 +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java
-@@ -17,10 +17,14 @@ import org.chromium.base.supplier.SupplierUtils;
+@@ -17,12 +17,16 @@ import org.chromium.base.supplier.SupplierUtils;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tab.TabSelectionType;
  import org.chromium.content_public.browser.WebContents;
@@ -370,14 +370,16 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
  import org.chromium.ui.base.WindowAndroid;
  
  import java.util.ArrayList;
+ import java.util.Collection;
  import java.util.List;
+ import java.util.function.Predicate;
 +import java.util.Collections;
 +import java.util.stream.IntStream;
 +import java.util.stream.Collectors;
  
  /**
   * A set of convenience methods used for interacting with {@link TabList}s and {@link TabModel}s.
-@@ -89,6 +93,20 @@ public class TabModelUtils {
+@@ -91,6 +95,20 @@ public class TabModelUtils {
          return TabModel.INVALID_TAB_INDEX;
      }
  
@@ -401,7 +403,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
 --- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
 +++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManager.java
-@@ -103,6 +103,8 @@ public interface TabWindowManager {
+@@ -107,6 +107,8 @@ public interface TabWindowManager {
       */
      int getIncognitoTabCount();
  
@@ -413,7 +415,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
 --- a/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
 +++ b/chrome/browser/tabmodel/internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerImpl.java
-@@ -456,6 +456,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
+@@ -459,6 +459,16 @@ public class TabWindowManagerImpl implements ActivityStateListener, TabWindowMan
          return null;
      }
  
@@ -472,7 +474,7 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/snackbar.xml b/c
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java
-@@ -130,6 +130,8 @@ public class Snackbar {
+@@ -133,6 +133,8 @@ public class Snackbar {
      private String mTemplateText;
      private String mActionText;
      private Object mActionData;
@@ -481,7 +483,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      private String mAccessibilityActionAnnouncement;
      private int mBackgroundColor;
      private int mTextApperanceResId;
-@@ -198,6 +200,20 @@ public class Snackbar {
+@@ -200,6 +202,20 @@ public class Snackbar {
          return this;
      }
  
@@ -521,7 +523,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java
-@@ -51,6 +51,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -52,6 +52,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      protected final ViewGroup mSnackbarView;
      protected final TemplatePreservingTextView mMessageView;
      private final TextView mActionButtonView;
@@ -529,7 +531,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      private final ImageView mProfileImageView;
      private final int mAnimationDuration;
      private final boolean mIsTablet;
-@@ -97,11 +98,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -98,11 +99,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
              OnClickListener listener,
@@ -543,7 +545,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
      }
  
      /**
-@@ -120,6 +122,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -121,6 +123,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
      public SnackbarView(
              Activity activity,
              OnClickListener listener,
@@ -551,7 +553,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
              Snackbar snackbar,
              ViewGroup parentView,
              @Nullable WindowAndroid windowAndroid,
-@@ -141,6 +144,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -142,6 +145,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
                  (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
          mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
          mActionButtonView.setOnClickListener(listener);
@@ -560,7 +562,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
          mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
          mEdgeToEdgeSupplier = edgeToEdgeSupplier;
          mEdgeToEdgePadAdjuster =
-@@ -376,6 +381,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -377,6 +382,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
              mActionButtonView.setVisibility(View.VISIBLE);
              mActionButtonView.setContentDescription(snackbar.getActionText());
              setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -576,7 +578,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
-@@ -904,6 +904,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
+@@ -898,6 +898,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, jboolean focused) {
    view->SetFocus(focused);
  }
  
@@ -602,7 +604,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
-@@ -197,6 +197,7 @@ class CONTENT_EXPORT WebContentsAndroid {
+@@ -194,6 +194,7 @@ class CONTENT_EXPORT WebContentsAndroid {
  
    void OnScaleFactorChanged(JNIEnv* env);
    void SetFocus(JNIEnv* env, jboolean focused);
@@ -613,7 +615,7 @@ diff --git a/content/browser/web_contents/web_contents_android.h b/content/brows
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3574,8 +3574,10 @@ void WebContentsImpl::Stop() {
+@@ -3676,8 +3676,10 @@ void WebContentsImpl::Stop() {
  void WebContentsImpl::SetPageFrozen(bool frozen) {
    TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
  
@@ -627,7 +629,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
 diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
-@@ -1156,6 +1156,12 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+@@ -1146,6 +1146,12 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
          WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
      }
  
@@ -640,7 +642,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
      @Override
      public void setDisplayCutoutSafeArea(Rect insets) {
          if (mNativeWebContentsAndroid == 0) return;
-@@ -1438,6 +1444,8 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
+@@ -1428,6 +1434,8 @@ public class WebContentsImpl implements WebContents, RenderFrameHostDelegate, Wi
  
          void setFocus(long nativeWebContentsAndroid, boolean focused);
  
@@ -709,7 +711,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4250,6 +4250,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4267,6 +4267,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
  }
  
  void Document::DispatchFreezeEvent() {
@@ -720,7 +722,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -3226,6 +3226,7 @@ void LocalFrame::DidFreeze() {
+@@ -3231,6 +3231,7 @@ void LocalFrame::DidFreeze() {
    LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
    GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
    Loader().SetDefersLoading(freeze_mode);
@@ -728,7 +730,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
  }
  
  void LocalFrame::DidResume() {
-@@ -3240,6 +3241,7 @@ void LocalFrame::DidResume() {
+@@ -3245,6 +3246,7 @@ void LocalFrame::DidResume() {
    GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
    Loader().SetDefersLoading(LoaderFreezeMode::kNone);
  
@@ -739,7 +741,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
 --- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
 +++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl.cc
-@@ -982,7 +982,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -979,7 +979,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
    if (!parent_page_scheduler_)
      return SchedulingLifecycleState::kNotThrottled;
    if (parent_page_scheduler_->IsFrozen()) {

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

@@ -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"
-@@ -594,7 +595,9 @@ double AudioContext::baseLatency() const {
+@@ -612,7 +613,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"
-@@ -697,6 +698,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -709,6 +710,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
    return To<LocalDOMWindow>(GetExecutionContext());
  }
  
@@ -207,7 +207,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -440,9 +440,8 @@
+@@ -449,9 +449,8 @@
      {
        // AudioContext.playoutStats interface.
        // https://chromestatus.com/feature/5172818344148992

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

@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
 --- a/third_party/blink/renderer/core/execution_context/execution_context.cc
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
-@@ -709,6 +709,21 @@ void ExecutionContext::WriteIntoTrace(
+@@ -708,6 +708,21 @@ void ExecutionContext::WriteIntoTrace(
    proto->set_world_type(GetWorldType(*this));
  }
  
@@ -40,7 +40,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 +    case network::mojom::IPAddressSpace::kLocal:
 +      return "local";
 +  }
-+  NOTREACHED_NORETURN();
++  NOTREACHED();
 +}
 +
  bool ExecutionContext::CrossOriginIsolatedCapabilityOrDisabledWebSecurity()
@@ -71,7 +71,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -945,6 +945,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -965,6 +965,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
    return should_block_request;
  }
  
@@ -101,7 +101,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -179,6 +179,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -182,6 +182,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
    bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
    std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
        override;

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

@@ -25,7 +25,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -4682,7 +4682,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -4689,7 +4689,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
-@@ -775,6 +775,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -820,6 +820,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_;
  }
  
-@@ -2840,6 +2845,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2893,6 +2898,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
-@@ -783,7 +783,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -778,7 +778,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

@@ -107,7 +107,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
 diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
 --- a/content/browser/child_process_security_policy_impl.cc
 +++ b/content/browser/child_process_security_policy_impl.cc
-@@ -872,6 +872,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
+@@ -951,6 +951,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl()
    RegisterPseudoScheme(url::kJavaScriptScheme);
    RegisterPseudoScheme(kViewSourceScheme);
    RegisterPseudoScheme(kGoogleChromeScheme);
@@ -118,7 +118,7 @@ diff --git a/content/browser/child_process_security_policy_impl.cc b/content/bro
 diff --git a/net/BUILD.gn b/net/BUILD.gn
 --- a/net/BUILD.gn
 +++ b/net/BUILD.gn
-@@ -1067,6 +1067,8 @@ component("net") {
+@@ -1068,6 +1068,8 @@ component("net") {
      "url_request/url_request_http_job.cc",
      "url_request/url_request_http_job.h",
      "url_request/url_request_interceptor.cc",
@@ -211,7 +211,7 @@ diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
  
  namespace net {
  
-@@ -637,6 +639,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
+@@ -635,6 +637,12 @@ URLRequest::URLRequest(base::PassKey<URLRequestContext> pass_key,
    // Sanity check out environment.
    DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
  
@@ -235,7 +235,7 @@ diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/ur
  #include "net/url_request/url_request_context.h"
  #include "net/url_request/url_request_job_factory.h"
  #include "url/url_constants.h"
-@@ -596,6 +597,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+@@ -601,6 +602,8 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
      job_factory->SetProtocolHandler(scheme_handler.first,
                                      std::move(scheme_handler.second));
    }

build/patches/Bromite-auto-updater.patch

@@ -68,7 +68,7 @@ diff --git a/build/android/java/templates/BuildConfig.template b/build/android/j
 diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 --- a/build/config/android/rules.gni
 +++ b/build/config/android/rules.gni
-@@ -1951,6 +1951,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1952,6 +1952,9 @@ if (!is_robolectric && enable_java_templates) {
        sources = [ "//build/android/java/templates/BuildConfig.template" ]
        defines = []
  
@@ -81,7 +81,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -869,6 +869,8 @@ chrome_java_sources = [
+@@ -864,6 +864,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",
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
      private static final String PREF_OS_VERSION = "os_version";
      private static final String PREF_LEGAL_INFORMATION = "legal_information";
  
-@@ -61,6 +67,13 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
+@@ -63,6 +69,13 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
          p = findPreference(PREF_LEGAL_INFORMATION);
          int currentYear = Calendar.getInstance().get(Calendar.YEAR);
          p.setSummary(getString(R.string.legal_information_summary, currentYear));
@@ -142,7 +142,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
      }
  
      @Override
-@@ -130,4 +143,17 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
+@@ -132,4 +145,17 @@ public class AboutChromeSettings extends PreferenceFragmentCompat
          }
          return true;
      }
@@ -672,7 +672,7 @@ new file mode 100644
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2520,6 +2520,12 @@ static_library("browser") {
+@@ -2502,6 +2502,12 @@ static_library("browser") {
    }
  
    if (is_android) {
@@ -1085,7 +1085,7 @@ new file mode 100644
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -283,6 +283,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -284,6 +284,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kPriceChangeModule,
      &kPwaRestoreUi,
      &kPwaRestoreUiAtStartup,
@@ -1096,9 +1096,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
-@@ -367,6 +367,7 @@ public abstract class ChromeFeatureList {
-     public static final String INCOGNITO_REAUTHENTICATION_FOR_ANDROID =
-             "IncognitoReauthenticationForAndroid";
+@@ -356,6 +356,7 @@ public abstract class ChromeFeatureList {
+             "HideTabletToolbarDownloadButton";
+     public static final String HISTORY_JOURNEYS = "Journeys";
      public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
 +    public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
      public static final String INTEREST_FEED_V2_HEARTS = "InterestFeedV2Hearts";
@@ -1650,7 +1650,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
-@@ -62,9 +62,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -76,9 +76,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
          if (mSigninManager != null) {
              mSigninManager.addSignInStateObserver(this);
          }
@@ -1660,7 +1660,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
      }
  
      void addObserver(Observer observer) {
-@@ -80,8 +77,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
+@@ -94,8 +91,6 @@ public class SafetyHubFetchService implements SigninManager.SignInStateObserver,
          if (mSigninManager != null) {
              mSigninManager.removeSignInStateObserver(this);
          }
@@ -1672,7 +1672,7 @@ diff --git a/chrome/browser/safety_hub/android/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -2406,6 +2406,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2409,6 +2409,12 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_DEPRECATION_WARNING" desc="Warning about Chrome updates no longer being supported">
          Chrome updates are no longer supported for this version of Android
        </message>
@@ -1685,7 +1685,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
  
        <!-- Account management UI strings. -->
        <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR_LIMIT=32]">
-@@ -4360,7 +4366,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4366,7 +4372,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
  
        <!-- Main menu items -->
        <message name="IDS_MENU_UPDATE" desc="Menu item for updating chrome. [CHAR_LIMIT=24]">
@@ -1697,7 +1697,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_MENU_UPDATE_SUMMARY_DEFAULT" desc="Summary string for update menu item explaining that a newer version of Chrome is available. [CHAR_LIMIT=30]">
          Newer version is available
-@@ -4371,6 +4380,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4377,6 +4386,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>
@@ -1731,7 +1731,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  namespace {
  const char kContentTypeKey[] = "Content-Type";
  const char kDeveloperKey[] = "X-Developer-Key";
-@@ -78,6 +83,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -83,6 +88,7 @@ EndpointFetcher::EndpointFetcher(
        http_method_(http_method),
        content_type_(content_type),
        timeout_(timeout),
@@ -1739,7 +1739,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        post_data_(post_data),
        headers_(headers),
        cors_exempt_headers_(cors_exempt_headers),
-@@ -98,6 +104,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -103,6 +109,7 @@ EndpointFetcher::EndpointFetcher(
        http_method_("GET"),
        content_type_(std::string()),
        timeout_(base::Milliseconds(0)),
@@ -1747,7 +1747,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        post_data_(std::string()),
        annotation_tag_(annotation_tag),
        url_loader_factory_(url_loader_factory),
-@@ -123,6 +130,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -128,6 +135,7 @@ EndpointFetcher::EndpointFetcher(
        http_method_(http_method),
        content_type_(content_type),
        timeout_(timeout),
@@ -1755,7 +1755,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        post_data_(post_data),
        annotation_tag_(annotation_tag),
        url_loader_factory_(url_loader_factory),
-@@ -150,6 +158,7 @@ EndpointFetcher::EndpointFetcher(
+@@ -155,6 +163,7 @@ EndpointFetcher::EndpointFetcher(
        http_method_(http_method),
        content_type_(content_type),
        timeout_(timeout),
@@ -1763,7 +1763,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
        post_data_(post_data),
        headers_(headers),
        cors_exempt_headers_(cors_exempt_headers),
-@@ -162,11 +171,29 @@ EndpointFetcher::EndpointFetcher(
+@@ -167,11 +176,29 @@ EndpointFetcher::EndpointFetcher(
  EndpointFetcher::EndpointFetcher(
      const net::NetworkTrafficAnnotationTag& annotation_tag)
      : timeout_(kDefaultTimeOut),
@@ -1793,7 +1793,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  EndpointFetcher::~EndpointFetcher() = default;
  
  void EndpointFetcher::Fetch(EndpointFetcherCallback endpoint_fetcher_callback) {
-@@ -224,11 +251,9 @@ void EndpointFetcher::PerformRequest(
+@@ -229,11 +256,9 @@ void EndpointFetcher::PerformRequest(
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->method = http_method_;
    resource_request->url = url_;
@@ -1808,7 +1808,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
    if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
      resource_request->headers.SetHeader(kContentTypeKey, content_type_);
    }
-@@ -256,25 +281,50 @@ void EndpointFetcher::PerformRequest(
+@@ -261,10 +286,27 @@ void EndpointFetcher::PerformRequest(
      default:
        break;
    }
@@ -1836,6 +1836,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  
    if (base::EqualsCaseInsensitiveASCII(http_method_, "POST")) {
      simple_url_loader_->AttachStringForUpload(post_data_, content_type_);
+@@ -275,15 +317,23 @@ void EndpointFetcher::PerformRequest(
    }
    simple_url_loader_->SetRetryOptions(GetMaxRetries(),
                                        network::SimpleURLLoader::RETRY_ON_5XX);
@@ -1865,7 +1866,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  }
  
  void EndpointFetcher::OnResponseFetched(
-@@ -352,24 +402,6 @@ void EndpointFetcher::OnSanitizationResult(
+@@ -361,24 +411,6 @@ void EndpointFetcher::OnSanitizationResult(
    std::move(endpoint_fetcher_callback).Run(std::move(response));
  }
  
@@ -1890,7 +1891,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
  int EndpointFetcher::GetMaxRetries() {
    if (!request_params_.has_value()) {
      return kNumRetries;
-@@ -393,3 +425,38 @@ bool EndpointFetcher::GetSetSiteForCookies() {
+@@ -412,3 +444,38 @@ UploadProgressCallback EndpointFetcher::GetUploadProgressCallback() {
  std::string EndpointFetcher::GetUrlForTesting() {
    return url_.spec();
  }
@@ -1950,7 +1951,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    int http_status_code{-1};
    std::optional<FetchErrorType> error_type;
  };
-@@ -159,6 +163,14 @@ class EndpointFetcher {
+@@ -175,6 +179,14 @@ class EndpointFetcher {
        const GURL& url,
        const net::NetworkTrafficAnnotationTag& annotation_tag);
  
@@ -1965,7 +1966,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    // Used for tests. Can be used if caller constructs their own
    // url_loader_factory and identity_manager.
    EndpointFetcher(
-@@ -215,6 +227,11 @@ class EndpointFetcher {
+@@ -231,6 +243,11 @@ class EndpointFetcher {
    void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
                              EndpointFetcherCallback endpoint_fetcher_callback,
                              data_decoder::JsonSanitizer::Result result);
@@ -1977,7 +1978,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
  
    network::mojom::CredentialsMode GetCredentialsMode();
    int GetMaxRetries();
-@@ -226,10 +243,11 @@ class EndpointFetcher {
+@@ -243,10 +260,11 @@ class EndpointFetcher {
    // Members set in constructor to be passed to network::ResourceRequest or
    // network::SimpleURLLoader.
    const std::string oauth_consumer_name_;
@@ -1990,7 +1991,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
    const std::string post_data_;
    const std::vector<std::string> headers_;
    const std::vector<std::string> cors_exempt_headers_;
-@@ -255,6 +273,9 @@ class EndpointFetcher {
+@@ -271,6 +289,9 @@ class EndpointFetcher {
        access_token_fetcher_;
    std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
  

build/patches/Bromite-subresource-adblocker.patch

@@ -66,8 +66,8 @@ 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
-@@ -319,6 +319,7 @@ if (current_toolchain == default_toolchain) {
-       "//chrome/android/modules/cablev2_authenticator/public:java",
+@@ -324,6 +324,7 @@ if (current_toolchain == default_toolchain) {
+       "//chrome/android/features/tab_ui/public:ui_java_resources",
        "//chrome/android/modules/stack_unwinder/provider:java",
        "//chrome/android/webapk/libs/client:client_java",
 +      "//chrome/browser/endpoint_fetcher:java",
@@ -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",
-@@ -614,6 +615,7 @@ chrome_java_resources = [
+@@ -615,6 +616,7 @@ chrome_java_resources = [
    "java/res/xml/about_chrome_preferences.xml",
    "java/res/xml/account_management_preferences.xml",
    "java/res/xml/ad_services_config.xml",
@@ -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
-@@ -947,6 +947,8 @@ chrome_java_sources = [
+@@ -942,6 +942,8 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
    "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
    "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -426,7 +426,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
-@@ -863,9 +863,7 @@ public class TabModelImpl extends TabModelJniBridge {
+@@ -905,9 +905,7 @@ public class TabModelImpl extends TabModelJniBridge {
                  .createTabWithWebContents(
                          parent,
                          webContents,
@@ -440,7 +440,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
 diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
 --- a/chrome/app/generated_resources.grd
 +++ b/chrome/app/generated_resources.grd
-@@ -15996,6 +15996,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -16478,6 +16478,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
        Never show this again.
      </message>
  
@@ -511,7 +511,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1228,6 +1228,34 @@ BrowserProcessImpl::component_updater() {
+@@ -1223,6 +1223,34 @@ BrowserProcessImpl::component_updater() {
    return component_updater_.get();
  }
  
@@ -568,7 +568,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
 --- a/chrome/browser/chrome_browser_main.cc
 +++ b/chrome/browser/chrome_browser_main.cc
-@@ -468,6 +468,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -469,6 +469,9 @@ StartupProfileInfo CreateInitialProfile(
    // missing code in the above test.
    CHECK(profile_info.profile) << "Cannot get default profile.";
  
@@ -679,7 +679,7 @@ new file mode 100755
 diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc
 --- a/chrome/browser/net/system_network_context_manager.cc
 +++ b/chrome/browser/net/system_network_context_manager.cc
-@@ -637,6 +637,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -638,6 +638,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRegistrySimple* registry) {
    StubResolverConfigReader::RegisterPrefs(registry);
    DefaultDnsOverHttpsConfigSource::RegisterPrefs(registry);
  
@@ -693,7 +693,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
 --- a/chrome/browser/sessions/session_restore_android.cc
 +++ b/chrome/browser/sessions/session_restore_android.cc
-@@ -57,8 +57,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
+@@ -58,8 +58,11 @@ content::WebContents* SessionRestore::RestoreForeignSessionTab(
    DCHECK(current_tab);
    // If swapped, return the current tab's most up-to-date web contents.
    if (disposition == WindowOpenDisposition::CURRENT_TAB) {
@@ -734,7 +734,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 --- a/chrome/common/pref_names.h
 +++ b/chrome/common/pref_names.h
-@@ -2857,6 +2857,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2837,6 +2837,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
  inline constexpr char kAudioCaptureAllowedUrls[] =
      "hardware.audio_capture_allowed_urls";
  
@@ -749,7 +749,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
 diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp
 --- a/components/browser_ui/strings/android/site_settings.grdp
 +++ b/components/browser_ui/strings/android/site_settings.grdp
-@@ -373,6 +373,9 @@
+@@ -379,6 +379,9 @@
    <message name="IDS_INTRUSIVE_ADS_INFORMATION" desc="The extra information at the top of the Site Details page when the site tends to show intrusive ads">
      This site shows intrusive or misleading ads
    </message>
@@ -775,7 +775,7 @@ diff --git a/components/component_updater/BUILD.gn b/components/component_update
      "component_updater_service.cc",
      "component_updater_service.h",
      "component_updater_service_internal.h",
-@@ -49,9 +55,11 @@ static_library("component_updater") {
+@@ -47,9 +53,11 @@ static_library("component_updater") {
      "//components/update_client",
      "//components/version_info",
      "//net",

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
-@@ -224,6 +224,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
+@@ -220,6 +220,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
        command = IDC_RELOAD;
      }
  
@@ -34,8 +34,8 @@ 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
 @@ -1235,6 +1235,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
-   void SetAllowScreenshots(bool allow);
-   bool AreScreenshotsAllowed();
+   void OnChildAdded(Widget* child_widget);
+   void OnChildRemoved(Widget* child_widget);
  
 +  // Type of ways to ignore activation changes.
 +  enum class DisableActivationChangeHandlingType {

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

@@ -6,7 +6,7 @@ In site settings added ability to block all popups per site
 
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../tab_under_navigation_throttle.cc          |   1 +
+ .../tab_under_navigation_throttle.cc          |  11 +-
  .../android/popup_blocked_message_delegate.cc |  20 +++-
  .../android/popup_blocked_message_delegate.h  |   1 +
  components/blocked_content/popup_blocker.cc   |   3 +
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../bromite_content_settings/popups.grdp      |  12 ++
  .../bromite_content_settings/popups.inc       |   8 ++
  .../core/browser/content_settings_registry.cc |   2 +-
- 9 files changed, 153 insertions(+), 3 deletions(-)
+ 9 files changed, 160 insertions(+), 6 deletions(-)
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromitePopupContentSetting.java
  create mode 100644 components/browser_ui/strings/bromite_content_settings/popups.grdp
  create mode 100644 components/content_settings/core/browser/bromite_content_settings/popups.inc
@@ -23,14 +23,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
 +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
-@@ -65,6 +65,7 @@ void LogTabUnderAttempt(content::NavigationHandle* handle) {
- BASE_FEATURE(kBlockTabUnders,
-              "BlockTabUnders",
-              base::FEATURE_DISABLED_BY_DEFAULT);
-+SET_CROMITE_FEATURE_ENABLED(kBlockTabUnders);
+@@ -140,9 +140,14 @@ TabUnderNavigationThrottle::MaybeBlockNavigation() {
  
- // static
- std::unique_ptr<content::NavigationThrottle>
+   LogTabUnderAttempt(navigation_handle());
+ 
+-  // We unconditionally proceed. There used to be a tab-under blocking
+-  // experiment, but it never launched.
+-  return content::NavigationThrottle::PROCEED;
++  content::WebContents* web_contents = navigation_handle()->GetWebContents();
++  const std::string error =
++      base::StringPrintf(kBlockTabUnderFormatMessage,
++                          navigation_handle()->GetURL().spec().c_str());
++  web_contents->GetPrimaryMainFrame()->AddMessageToConsole(
++      blink::mojom::ConsoleMessageLevel::kError, error.c_str());
++  ShowUI();
++  return content::NavigationThrottle::CANCEL;
+ }
+ 
+ void TabUnderNavigationThrottle::ShowUI() {
 diff --git a/components/blocked_content/android/popup_blocked_message_delegate.cc b/components/blocked_content/android/popup_blocked_message_delegate.cc
 --- a/components/blocked_content/android/popup_blocked_message_delegate.cc
 +++ b/components/blocked_content/android/popup_blocked_message_delegate.cc

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

@@ -17,19 +17,22 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../developer_private_api.cc                  | 38 +++++++++++-
  .../developer_private/developer_private_api.h |  3 +
  .../webstore_private/webstore_private_api.cc  | 15 ++++-
- chrome/browser/extensions/cws_info_service.cc |  1 +
+ .../extensions/cws_info_service_factory.cc    |  3 +-
+ .../extensions/extension_management.cc        |  1 +
+ .../extension_safety_check_utils.cc           |  3 +-
+ .../browser/extensions/extension_service.cc   |  4 +-
  .../extensions/extension_system_impl.cc       |  2 +
  .../chrome_extension_downloader_factory.cc    |  1 -
  .../extensions/updater/extension_updater.cc   | 40 ++++++++-----
  .../extensions/updater/extension_updater.h    |  4 ++
  .../extensions/webstore_install_helper.cc     |  2 +-
  .../browser/extensions/webstore_installer.cc  |  2 +-
- .../browser/resources/extensions/manager.html |  1 +
- .../browser/resources/extensions/manager.ts   |  7 +++
+ .../resources/extensions/manager.html.ts      |  1 +
+ .../browser/resources/extensions/manager.ts   |  5 ++
  .../browser/resources/extensions/service.ts   |  5 ++
  .../browser/resources/extensions/toolbar.css  |  5 ++
- .../browser/resources/extensions/toolbar.html |  7 +++
- .../browser/resources/extensions/toolbar.ts   | 21 +++++++
+ .../resources/extensions/toolbar.html.ts      |  7 +++
+ .../browser/resources/extensions/toolbar.ts   | 17 ++++++
  .../resources/webstore_app/manifest.json      |  7 +--
  .../ui/webui/extensions/extensions_ui.cc      |  8 +++
  .../chrome_update_query_params_delegate.cc    | 13 ++--
@@ -44,7 +47,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  extensions/common/extension_features.cc       | 15 +++++
  extensions/common/extension_features.h        |  5 ++
  .../definitions/developer_private.d.ts        |  2 +
- 31 files changed, 258 insertions(+), 103 deletions(-)
+ 34 files changed, 256 insertions(+), 109 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
@@ -166,7 +169,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  #include "extensions/common/manifest.h"
  #include "extensions/common/manifest_constants.h"
  #include "extensions/common/manifest_handlers/permissions_parser.h"
-@@ -220,6 +221,8 @@ WebstorePrivateApi::Delegate* test_delegate = nullptr;
+@@ -219,6 +220,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) {
@@ -175,7 +178,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
      return profile->GetPrefs()->GetString(kWebstoreLogin);
    }
-@@ -227,11 +230,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -226,11 +229,15 @@ std::string GetWebstoreLogin(Profile* profile) {
  }
  
  void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -191,7 +194,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
    switch (status) {
      case kCanRequest:
        return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1152,7 +1159,8 @@ ExtensionFunction::ResponseAction
+@@ -1151,7 +1158,8 @@ ExtensionFunction::ResponseAction
  WebstorePrivateIsInIncognitoModeFunction::Run() {
    Profile* profile = Profile::FromBrowserContext(browser_context());
    return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
@@ -201,7 +204,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1247,11 +1255,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1246,11 +1254,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
    request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
        recent_navigations_to_collect);
  
@@ -217,17 +220,64 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
  }
  
  WebstorePrivateGetExtensionStatusFunction::
-diff --git a/chrome/browser/extensions/cws_info_service.cc b/chrome/browser/extensions/cws_info_service.cc
---- a/chrome/browser/extensions/cws_info_service.cc
-+++ b/chrome/browser/extensions/cws_info_service.cc
-@@ -163,6 +163,7 @@ namespace extensions {
- BASE_FEATURE(kCWSInfoService,
-              "CWSInfoService",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-+SET_CROMITE_FEATURE_DISABLED(kCWSInfoService);
+diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/browser/extensions/cws_info_service_factory.cc
+--- a/chrome/browser/extensions/cws_info_service_factory.cc
++++ b/chrome/browser/extensions/cws_info_service_factory.cc
+@@ -47,7 +47,8 @@ CWSInfoServiceFactory::CWSInfoServiceFactory()
+ std::unique_ptr<KeyedService>
+ CWSInfoServiceFactory::BuildServiceInstanceForBrowserContext(
+     content::BrowserContext* context) const {
+-  return std::make_unique<CWSInfoService>(Profile::FromBrowserContext(context));
++  // Disallow periodic retrieval of extensions metadata from the Chrome Web Store
++  return nullptr;
+ }
  
- // Increase the frequency of periodic retrieval of extensions metadata from
- // CWS. This feature is used only for testing purposes.
+ bool CWSInfoServiceFactory::ServiceIsCreatedWithBrowserContext() const {
+diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
+--- a/chrome/browser/extensions/extension_management.cc
++++ b/chrome/browser/extensions/extension_management.cc
+@@ -379,6 +379,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+ 
+ bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
+     const Extension* extension) {
++  if ((true)) return true;
+   // This policy only applies to extensions that update from CWS.
+   if (!UpdatesFromWebstore(*extension)) {
+     return true;
+diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/browser/extensions/extension_safety_check_utils.cc
+--- a/chrome/browser/extensions/extension_safety_check_utils.cc
++++ b/chrome/browser/extensions/extension_safety_check_utils.cc
+@@ -240,8 +240,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
+   developer::SafetyCheckWarningReason acknowledged_reason =
+       GetPrefAcknowledgeSafetyCheckWarningReason(extension,
+                                                  ExtensionPrefs::Get(profile));
+-  std::optional<CWSInfoService::CWSInfo> cws_info =
+-      cws_info_service->GetCWSInfo(extension);
++  std::optional<CWSInfoService::CWSInfo> cws_info;
+   bool valid_cws_info = cws_info.has_value() && cws_info->is_present;
+   if (unpublished_only) {
+     if (valid_cws_info && cws_info->unpublished_long_ago) {
+diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
+--- a/chrome/browser/extensions/extension_service.cc
++++ b/chrome/browser/extensions/extension_service.cc
+@@ -443,8 +443,6 @@ ExtensionService::ExtensionService(
+ 
+   UpgradeDetector::GetInstance()->AddObserver(this);
+ 
+-  cws_info_service_observation_.Observe(CWSInfoService::Get(profile_));
+-
+   ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
+ 
+   // Set up the ExtensionUpdater.
+@@ -1930,7 +1928,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.
+-  if (profile_->GetPrefs()->GetInteger(
++  if (((false)) && profile_->GetPrefs()->GetInteger(
+           pref_names::kExtensionUnpublishedAvailability) !=
+       kAllowUnpublishedExtensions) {
+     CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo();
 diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
 --- a/chrome/browser/extensions/extension_system_impl.cc
 +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -442,50 +492,48 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows
 diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -624,7 +624,7 @@ void WebstoreInstaller::StartDownload(
-       download_url_, render_process_host_id, render_frame_host->GetRoutingID(),
+@@ -625,7 +625,7 @@ void WebstoreInstaller::StartDownload(
        traffic_annotation));
    params->set_file_path(file);
+   params->set_initiator(render_frame_host->GetLastCommittedOrigin());
 -  if (controller.GetVisibleEntry()) {
 +  if ((false) && controller.GetVisibleEntry()) {
      content::Referrer referrer = content::Referrer::SanitizeForRequest(
          download_url_,
          content::Referrer(controller.GetVisibleEntry()->GetURL(),
-diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/resources/extensions/manager.html
---- a/chrome/browser/resources/extensions/manager.html
-+++ b/chrome/browser/resources/extensions/manager.html
-@@ -64,6 +64,7 @@
- <extensions-drop-overlay drag-enabled="[[inDevMode]]">
+diff --git a/chrome/browser/resources/extensions/manager.html.ts b/chrome/browser/resources/extensions/manager.html.ts
+--- a/chrome/browser/resources/extensions/manager.html.ts
++++ b/chrome/browser/resources/extensions/manager.html.ts
+@@ -12,6 +12,7 @@ export function getHtml(this: ExtensionsManagerElement) {
+ <extensions-drop-overlay ?drag-enabled="${this.inDevMode}">
  </extensions-drop-overlay>
- <extensions-toolbar id="toolbar" in-dev-mode="[[inDevMode]]"
-+    is-ext-update-enabled="[[isExtUpdateEnabled]]"
-     can-load-unpacked="[[canLoadUnpacked]]"
-     is-child-account="[[isChildAccount_]]"
-     dev-mode-controlled-by-policy="[[devModeControlledByPolicy]]"
+ <extensions-toolbar id="toolbar" ?in-dev-mode="${this.inDevMode}"
++    ?is-ext-update-enabled="${this.isExtUpdateEnabled}"
+     ?can-load-unpacked="${this.canLoadUnpacked}"
+     ?is-child-account="${this.isChildAccount_}"
+     ?dev-mode-controlled-by-policy="${this.devModeControlledByPolicy}"
 diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts
 --- a/chrome/browser/resources/extensions/manager.ts
 +++ b/chrome/browser/resources/extensions/manager.ts
-@@ -120,6 +120,11 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-         value: () => loadTimeData.getBoolean('MV2DeprecationNoticeDismissed'),
-       },
+@@ -142,6 +142,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+        */
+       didInitPage_: {type: Boolean},
  
-+      isExtUpdateEnabled: {
-+        type: Boolean,
-+        value: () => loadTimeData.getBoolean('isExtUpdateEnabled'),
-+      },
++      isExtUpdateEnabled: {type: Boolean},
 +
-       showActivityLog: {
-         type: Boolean,
-         value: () => loadTimeData.getBoolean('showActivityLog'),
-@@ -210,6 +215,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
-   delegate: Service;
-   inDevMode: boolean;
-   isMv2DeprecationNoticeDismissed: boolean;
-+  isExtUpdateEnabled: boolean;
-   showActivityLog: boolean;
-   enableEnhancedSiteControls: boolean;
-   devModeControlledByPolicy: boolean;
-@@ -277,6 +283,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+       narrow_: {type: Boolean},
+ 
+       showDrawer_: {type: Boolean},
+@@ -163,6 +165,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+   inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
+   isMv2DeprecationNoticeDismissed: boolean =
+       loadTimeData.getBoolean('MV2DeprecationNoticeDismissed');
++  isExtUpdateEnabled: boolean =
++      loadTimeData.getBoolean('isExtUpdateEnabled');
+   showActivityLog: boolean = loadTimeData.getBoolean('showActivityLog');
+   enableEnhancedSiteControls: boolean =
+       loadTimeData.getBoolean('enableEnhancedSiteControls');
+@@ -224,6 +228,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
            this.canLoadUnpacked = profileInfo.canLoadUnpacked;
            this.isMv2DeprecationNoticeDismissed =
                profileInfo.isMv2DeprecationNoticeDismissed;
@@ -496,7 +544,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
 diff --git a/chrome/browser/resources/extensions/service.ts b/chrome/browser/resources/extensions/service.ts
 --- a/chrome/browser/resources/extensions/service.ts
 +++ b/chrome/browser/resources/extensions/service.ts
-@@ -290,6 +290,11 @@ export class Service implements ServiceInterface {
+@@ -293,6 +293,11 @@ export class Service implements ServiceInterface {
          {inDeveloperMode: inDevMode});
    }
  
@@ -523,18 +571,18 @@ diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/re
  cr-toolbar {
    --cr-toolbar-center-basis: 680px;
    --cr-toolbar-field-max-width: var(--cr-toolbar-center-basis);
-diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/resources/extensions/toolbar.html
---- a/chrome/browser/resources/extensions/toolbar.html
-+++ b/chrome/browser/resources/extensions/toolbar.html
-@@ -15,6 +15,13 @@
-         ?checked="${this.inDevMode}" aria-labelledby="devModeLabel">
+diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browser/resources/extensions/toolbar.html.ts
+--- a/chrome/browser/resources/extensions/toolbar.html.ts
++++ b/chrome/browser/resources/extensions/toolbar.html.ts
+@@ -25,6 +25,13 @@ export function getHtml(this: ToolbarElement) {
+         aria-labelledby="devModeLabel">
      </cr-toggle>
    </div>
 +  <div class="more-actions">
 +    <span>$i18n{toolbarExtensionUpdateEnabled}
-+      <span id="need-update" hidden="[[!shouldShowRelaunchDialog]]">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
++      <span id="need-update" ?hidden="${!this.shouldShowRelaunchDialog}">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
 +    </span>
-+    <cr-toggle on-change="onExtUpdateEnabledChanged_" checked="[[isExtUpdateEnabled]]">
++    <cr-toggle @change="${this.onExtUpdateEnabledChanged_}" ?checked="${this.isExtUpdateEnabled}">
 +    </cr-toggle>
 +  </div>
  </cr-toolbar>
@@ -560,21 +608,19 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
  }
  
  export interface ExtensionsToolbarElement {
-@@ -79,6 +82,13 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -79,6 +82,11 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
          reflect: true,
        },
  
 +      isExtUpdateEnabled: {
 +        type: Boolean,
-+        value: false,
-+        observer: 'onExtUpdateEnabledChanged_',
-+        reflectToAttribute: true,
++        reflect: true,
 +      },
 +
        devModeControlledByPolicy: {type: Boolean},
        isChildAccount: {type: Boolean},
  
-@@ -91,6 +101,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -91,6 +99,7 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
  
        expanded_: {type: Boolean},
        showPackDialog_: {type: Boolean},
@@ -582,25 +628,23 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
  
        /**
         * Prevents initiating update while update is in progress.
-@@ -102,6 +113,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -102,6 +111,8 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
    extensions: chrome.developerPrivate.ExtensionInfo[] = [];
    delegate: ToolbarDelegate = new DummyToolbarDelegate();
    inDevMode: boolean = false;
-+  isExtUpdateEnabled: boolean;
++  isExtUpdateEnabled: boolean = false;
 +  shouldShowRelaunchDialog: boolean = false;
    devModeControlledByPolicy: boolean = false;
    isChildAccount: boolean = false;
  
-@@ -154,6 +167,14 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
+@@ -154,6 +165,12 @@ export class ExtensionsToolbarElement extends ExtensionsToolbarElementBase {
          'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
    }
  
-+  private onExtUpdateEnabledChanged_(evt: Event, value: boolean, _old: boolean) {
-+    if (evt instanceof Event) {
-+      this.delegate.setExtUpdateEnabled(value);
-+      this.shouldShowRelaunchDialog = true;
-+      this.isExtUpdateEnabled = value;
-+    }
++  protected onExtUpdateEnabledChanged_(e: CustomEvent<boolean>) {
++    this.delegate.setExtUpdateEnabled(e.detail);
++    this.shouldShowRelaunchDialog = true;
++    this.isExtUpdateEnabled = e.detail;
 +  }
 +
    private onInDevModeChanged_(_current: boolean, previous: boolean) {
@@ -834,7 +878,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      return RespondNow(Error(keys::kNoExtensionError, params->id));
    }
-@@ -548,8 +572,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
+@@ -547,8 +571,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
    // Extension could have been uninstalled externally while previous check was
    // happening.
    const Extension* extension =
@@ -845,7 +889,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -592,8 +616,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
+@@ -591,8 +615,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
    // Extension can be uninstalled externally while the previous check was
    // happening async.
    const Extension* extension =
@@ -856,7 +900,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
    if (!extension) {
      FinishEnable(Error(keys::kNoExtensionError));
      return;
-@@ -737,8 +761,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
+@@ -736,8 +760,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
  }
  
  const Extension* ManagementSetEnabledFunction::GetExtension() {
@@ -867,7 +911,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
  }
  
  ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
-@@ -763,8 +787,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -762,8 +786,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                                ->GetDelegate();
    target_extension_id_ = target_extension_id;
    const Extension* target_extension =
@@ -877,7 +921,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_));
-@@ -829,8 +852,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -828,8 +851,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 =
@@ -887,7 +931,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                               ExtensionRegistry::EVERYTHING);
    std::string error;
    bool success = false;
-@@ -907,8 +929,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -906,8 +928,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
        management::CreateAppShortcut::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -897,7 +941,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)));
-@@ -961,8 +982,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -960,8 +981,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
        management::SetLaunchType::Params::Create(args());
    EXTENSION_FUNCTION_VALIDATE(params);
    const Extension* extension =
@@ -1104,7 +1148,7 @@ diff --git a/extensions/browser/updater/extension_downloader.h b/extensions/brow
 diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/browser/updater/manifest_fetch_data.cc
 --- a/extensions/browser/updater/manifest_fetch_data.cc
 +++ b/extensions/browser/updater/manifest_fetch_data.cc
-@@ -107,7 +107,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
+@@ -106,7 +106,7 @@ ManifestFetchData::ManifestFetchData(const GURL& update_url,
      : base_url_(update_url),
        full_url_(update_url),
        brand_code_(brand_code),
@@ -1113,7 +1157,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
        fetch_priority_(fetch_priority) {
    UpdateFullUrl(base_query_params);
    request_ids_.insert(request_id);
-@@ -161,18 +161,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
+@@ -159,18 +159,12 @@ bool ManifestFetchData::AddExtension(const std::string& id,
    // Compute the string we'd append onto the full_url_, and see if it fits.
    std::vector<std::string> parts;
    parts.push_back("id=" + id);
@@ -1146,7 +1190,7 @@ 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
-@@ -198,4 +198,19 @@ BASE_FEATURE(kSilentDebuggerExtensionAPI,
+@@ -191,4 +191,19 @@ BASE_FEATURE(kSilentDebuggerExtensionAPI,
               "SilentDebuggerExtensionAPI",
               base::FEATURE_DISABLED_BY_DEFAULT);
  
@@ -1169,7 +1213,7 @@ 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
-@@ -235,6 +235,11 @@ BASE_DECLARE_FEATURE(kDeclarativeNetRequestHeaderSubstitution);
+@@ -228,6 +228,11 @@ BASE_DECLARE_FEATURE(kDeclarativeNetRequestHeaderSubstitution);
  
  // Show no warning banner when an extension uses CDP's `chrome.debugger`.
  BASE_DECLARE_FEATURE(kSilentDebuggerExtensionAPI);

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

@@ -79,7 +79,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1282,6 +1282,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1322,6 +1322,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
-@@ -187,9 +187,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -191,9 +191,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
    bool parse_result = base::StringToInt(major_version, &major_version_number);
    DCHECK(parse_result);
    std::optional<std::string> brand;
@@ -52,7 +52,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  #include "ui/display/display.h"
  #include "ui/display/screen.h"
  #include "url/origin.h"
-@@ -722,7 +723,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
+@@ -706,7 +707,8 @@ void UpdateNavigationRequestClientUaHeadersImpl(
      // value, disable them. This overwrites previous decision from UI.
      disable_due_to_custom_ua = !ua_metadata.has_value();
    }
@@ -62,7 +62,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
    if (!disable_due_to_custom_ua) {
      if (!ua_metadata.has_value())
        ua_metadata = delegate->GetUserAgentMetadata();
-@@ -904,10 +906,12 @@ void AddRequestClientHintsHeaders(
+@@ -888,10 +890,12 @@ void AddRequestClientHintsHeaders(
      AddEctHeader(headers, network_quality_tracker, url);
    }
  
@@ -79,7 +79,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
  
    if (ShouldAddClientHint(data, WebClientHintsType::kPrefersColorScheme)) {
      AddPrefersColorSchemeHeader(headers, frame_tree_node);
-@@ -1001,6 +1005,7 @@ ParseAndPersistAcceptCHForNavigation(
+@@ -985,6 +989,7 @@ ParseAndPersistAcceptCHForNavigation(
      BrowserContext* context,
      ClientHintsControllerDelegate* delegate,
      FrameTreeNode* frame_tree_node) {
@@ -90,7 +90,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
 diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc
 --- a/content/browser/loader/navigation_url_loader_impl.cc
 +++ b/content/browser/loader/navigation_url_loader_impl.cc
-@@ -1225,6 +1225,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
+@@ -1224,6 +1224,11 @@ void NavigationURLLoaderImpl::OnAcceptCHFrameReceived(
      return;
    }
  
@@ -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
-@@ -395,6 +395,11 @@
+@@ -400,6 +400,11 @@
        name: "AriaNotify",
        status: "test",
      },

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

@@ -87,7 +87,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -457,7 +457,7 @@ const base::FeatureParam<bool> kIpPrivacyCacheTokensByGeo{
+@@ -463,7 +463,7 @@ const base::FeatureParam<bool> kIpPrivacyOnlyInIncognito{
  // NetworkChangeNotifier::AreNetworkHandlesSupported).
  #if BUILDFLAG(IS_ANDROID)
  inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =

build/patches/Content-settings-infrastructure.patch

@@ -30,7 +30,7 @@ Require: bromite-build-utils.patch
  .../ui/views/page_info/page_info_main_view.cc |  28 +-
  .../views/page_info/page_info_view_factory.cc |  20 +
  .../views/page_info/page_info_view_factory.h  |   5 +
- .../page_info/permission_toggle_row_view.cc   | 173 +++++++-
+ .../page_info/permission_toggle_row_view.cc   | 179 +++++++-
  .../page_info/permission_toggle_row_view.h    |  18 +-
  .../settings_localized_strings_provider.cc    |  54 +++
  .../ui/webui/settings/site_settings_helper.cc |  46 +-
@@ -43,8 +43,8 @@ Require: bromite-build-utils.patch
  .../BromiteCustomContentSettingImpl.java      | 412 ++++++++++++++++++
  ...tomTriStateSiteSettingsPreferenceImpl.java |  24 +
  .../ContentSettingsResources.java             |  16 +-
- .../site_settings/SingleCategorySettings.java |  50 ++-
- .../site_settings/SingleWebsiteSettings.java  |  54 ++-
+ .../site_settings/SingleCategorySettings.java |  55 ++-
+ .../site_settings/SingleWebsiteSettings.java  |  58 ++-
  .../site_settings/SiteSettings.java           |  31 +-
  .../site_settings/SiteSettingsCategory.java   |  18 +-
  .../site_settings/SiteSettingsDelegate.java   |   2 +
@@ -75,7 +75,7 @@ Require: bromite-build-utils.patch
  .../renderer/content_settings_agent_impl.cc   |  71 +++
  .../renderer/content_settings_agent_impl.h    |   9 +
  .../PageInfoPermissionsController.java        |   9 +
- .../PermissionParamsListBuilder.java          |   1 +
+ .../PermissionParamsListBuilder.java          |   8 +-
  .../android/page_info_controller_android.cc   |  18 +
  components/page_info/page_info.cc             |  23 +-
  components/page_info/page_info_ui.cc          |  25 ++
@@ -83,7 +83,7 @@ Require: bromite-build-utils.patch
  .../platform/web_content_settings_client.h    |  13 +
  .../execution_context/execution_context.cc    |  16 +
  .../execution_context/execution_context.h     |   5 +
- 72 files changed, 1919 insertions(+), 93 deletions(-)
+ 72 files changed, 1931 insertions(+), 103 deletions(-)
  create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
  create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
@@ -97,8 +97,8 @@ Require: bromite-build-utils.patch
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java
-@@ -64,6 +64,10 @@ import org.chromium.url.GURL;
- 
+@@ -69,6 +69,10 @@ import org.chromium.url.GURL;
+ import java.util.List;
  import java.util.Set;
  
 +import android.content.Intent;
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
  /** A SiteSettingsDelegate instance that contains Chrome-specific Site Settings logic. */
  public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
      public static final String EMBEDDED_CONTENT_HELP_CENTER_URL =
-@@ -229,7 +233,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -240,7 +244,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
  
      @Override
      public boolean isHelpAndFeedbackEnabled() {
@@ -117,8 +117,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
      }
  
      @Override
-@@ -366,6 +370,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
-         return mPrivacySandboxBridge.getFirstPartySetOwner(memberOrigin);
+@@ -402,6 +406,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+         return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin);
      }
  
 +    @Override
@@ -138,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
 diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
 --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
 +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc
-@@ -162,7 +162,7 @@ namespace {
+@@ -199,7 +199,7 @@ namespace {
  void GetGuestViewDefaultContentSettingRules(
      bool incognito,
      RendererContentSettingRules* rules) {
@@ -150,7 +150,7 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_dele
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-@@ -1491,4 +1491,5 @@
+@@ -1493,4 +1493,5 @@
            </settings-subpage>
          </template>
        </template>
@@ -262,7 +262,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
  
  /**
   * Add all of the child routes that originate from the privacy route,
-@@ -163,6 +164,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -167,6 +168,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
      r.SITE_SETTINGS_WEB_APP_INSTALLATION =
          r.SITE_SETTINGS.createChild('webApplications');
    }
@@ -692,7 +692,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
  /**
   * Determine localization string for i18n for a given content settings type.
   * Sorted alphabetically by |ContentSettingsType|.
-@@ -107,6 +155,13 @@ export function getLocalizationStringForContentType(
+@@ -108,6 +156,13 @@ export function getLocalizationStringForContentType(
      case ContentSettingsTypes.SMART_CARD_READERS:
        return null;
      default:
@@ -709,15 +709,15 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1808,6 +1808,7 @@ static_library("ui") {
-       "//components/commerce/core:shopping_service",
+@@ -1759,6 +1759,7 @@ static_library("ui") {
+       "//components/commerce/core/mojom:mojo_bindings",
        "//components/commerce/core/webui",
        "//components/endpoint_fetcher:endpoint_fetcher",
 +      "//components/content_settings/core/browser:browser",
        "//components/enterprise/common:files_scan_data",
        "//components/feedback/proto",
        "//components/headless/policy",
-@@ -5047,6 +5048,7 @@ static_library("ui") {
+@@ -5007,6 +5008,7 @@ static_library("ui") {
        "//components/power_bookmarks/storage",
        "//components/reading_list/features:flags",
        "//components/segmentation_platform/embedder/default_model:default_model",
@@ -876,11 +876,12 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome
 diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc
 --- a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc
 +++ b/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc
-@@ -39,6 +39,30 @@
+@@ -39,6 +39,31 @@
  #include "ui/views/controls/styled_label.h"
  #include "ui/views/style/typography.h"
  #include "ui/views/view_class_properties.h"
 +#include "components/content_settings/core/browser/content_settings_registry.h"
++#include "ui/base/mojom/menu_source_type.mojom.h"
 +
 +namespace {
 +  bool IsAllowed(const PageInfo::PermissionInfo& permission) {
@@ -907,7 +908,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
  
  DEFINE_CLASS_ELEMENT_IDENTIFIER_VALUE(PermissionToggleRowView,
                                        kRowSubTitleCameraElementId);
-@@ -62,16 +86,12 @@ PermissionToggleRowView::PermissionToggleRowView(
+@@ -62,16 +87,12 @@ PermissionToggleRowView::PermissionToggleRowView(
    // instead of adding it as the only child.
    SetUseDefaultFillLayout(true);
    row_view_ = AddChildView(std::make_unique<RichControlsContainerView>());
@@ -925,7 +926,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
    if (permission.requesting_origin.has_value()) {
      std::u16string requesting_origin_string;
      switch (permission.type) {
-@@ -168,6 +188,90 @@ void PermissionToggleRowView::UpdatePermission(
+@@ -168,6 +189,90 @@ void PermissionToggleRowView::UpdatePermission(
    UpdateUiOnPermissionChanged();
  }
  
@@ -979,7 +980,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
 +  sources_menu_runner_->RunMenuAt(
 +      choose_button_->GetWidget(), nullptr,
 +      choose_button_->GetAnchorBoundsInScreen(),
-+      views::MenuAnchorPosition::kTopLeft, ui::MENU_SOURCE_MOUSE);
++      views::MenuAnchorPosition::kTopLeft, ui::mojom::MenuSourceType::kMouse);
 +}
 +
 +bool PermissionToggleRowView::IsCommandIdChecked(int command_id) const {
@@ -1016,12 +1017,15 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
  void PermissionToggleRowView::OnToggleButtonPressed() {
    PageInfoUI::ToggleBetweenAllowAndBlock(permission_);
    PermissionChanged();
-@@ -176,24 +280,19 @@ void PermissionToggleRowView::OnToggleButtonPressed() {
- void PermissionToggleRowView::InitForUserSource(
-     bool should_show_spacer_view,
-     const std::u16string& toggle_accessible_name) {
--  const int icon_label_spacing = ChromeLayoutProvider::Get()->GetDistanceMetric(
--      views::DISTANCE_RELATED_LABEL_HORIZONTAL);
+@@ -176,27 +281,19 @@ void PermissionToggleRowView::OnToggleButtonPressed() {
+ void PermissionToggleRowView::AddToggleButton(
+     const std::u16string& toggle_accessible_name,
+     int icon_label_spacing) {
+-  // This skips adding a toggle for 'CAPTURED_SURFACE_CONTROL' pemrission type.
+-  // We want to use the toggle inside the submenu and not here.
+-  if (permission_.type == ContentSettingsType::CAPTURED_SURFACE_CONTROL) {
+-    return;
+-  }
 -
 -  auto toggle_button = std::make_unique<views::ToggleButton>(
 -      base::BindRepeating(&PermissionToggleRowView::OnToggleButtonPressed,
@@ -1045,10 +1049,10 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
  
 -  toggle_button_ = row_view_->AddControl(std::move(toggle_button));
 +  choose_button_ = row_view_->AddControlUnderLabel(std::move(toggle_button));
+ }
  
-   const int icon_size = GetLayoutConstant(PAGE_INFO_ICON_SIZE);
- 
-@@ -227,9 +326,6 @@ void PermissionToggleRowView::InitForUserSource(
+ void PermissionToggleRowView::InitForUserSource(
+@@ -238,9 +335,6 @@ void PermissionToggleRowView::InitForUserSource(
        auto spacer_view = std::make_unique<views::View>();
        spacer_view->SetPreferredSize(gfx::Size(icon_size, icon_size));
        spacer_view_ = row_view_->AddControl(std::move(spacer_view));
@@ -1058,20 +1062,22 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.cc b/c
      }
    }
  }
-@@ -256,6 +352,12 @@ void PermissionToggleRowView::InitForManagedSource(
+@@ -267,6 +361,14 @@ void PermissionToggleRowView::InitForManagedSource(
  }
  
  void PermissionToggleRowView::UpdateUiOnPermissionChanged() {
-+  choose_button_->SetEnabledTextColors(std::nullopt);
-+  if (permission_.setting == CONTENT_SETTING_DEFAULT) {
-+    choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL,
-+      ui::kColorLabelForeground);
++  if (choose_button_) {
++    choose_button_->SetEnabledTextColors(std::nullopt);
++    if (permission_.setting == CONTENT_SETTING_DEFAULT) {
++      choose_button_->SetTextColorId(views::Button::ButtonState::STATE_NORMAL,
++        ui::kColorLabelForeground);
++    }
 +  }
 +
    if (blocked_on_system_level_label_) {
      if (permission_.setting == CONTENT_SETTING_DEFAULT) {
        permission_blocked_on_system_level_ = false;
-@@ -301,6 +403,37 @@ void PermissionToggleRowView::UpdateUiOnPermissionChanged() {
+@@ -312,6 +414,37 @@ void PermissionToggleRowView::UpdateUiOnPermissionChanged() {
        }
      }
    }
@@ -1117,7 +1123,7 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch
  #include "ui/views/view.h"
  
 +#include "components/content_settings/core/browser/website_settings_registry.h"
-+#include "ui/base/models/simple_menu_model.h"
++#include "ui/menus/simple_menu_model.h"
 +#include "ui/views/controls/menu/menu_runner.h"
 +#include "ui/views/controls/button/md_text_button_with_down_arrow.h"
 +
@@ -1145,9 +1151,9 @@ diff --git a/chrome/browser/ui/views/page_info/permission_toggle_row_view.h b/ch
 +  void ExecuteCommand(int command_id, int event_flags) override;
 +
    void OnToggleButtonPressed();
-   void InitForUserSource(bool should_show_spacer_view,
-                          const std::u16string& toggle_accessible_name);
-@@ -84,6 +96,10 @@ class PermissionToggleRowView : public views::View {
+   void AddToggleButton(const std::u16string& toggle_accessible_name,
+                        int icon_label_spacing);
+@@ -86,6 +98,10 @@ class PermissionToggleRowView : public views::View {
    raw_ptr<views::ToggleButton, DanglingUntriaged> toggle_button_ = nullptr;
    raw_ptr<views::View, DanglingUntriaged> spacer_view_ = nullptr;
  
@@ -1169,17 +1175,17 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
  #include "build/branding_buildflags.h"
  #include "build/build_config.h"
  #include "build/buildflag.h"
-@@ -78,6 +79,9 @@
+@@ -77,6 +78,9 @@
+ #include "components/google/core/common/google_util.h"
  #include "components/history/core/common/pref_names.h"
  #include "components/history_embeddings/history_embeddings_features.h"
- #include "components/omnibox/common/omnibox_features.h"
 +#include "components/content_settings/core/browser/content_settings_registry.h"
 +#include "components/content_settings/core/browser/website_settings_info.h"
 +#include "components/content_settings/core/browser/website_settings_registry.h"
  #include "components/password_manager/core/browser/leak_detection_dialog_utils.h"
  #include "components/password_manager/core/browser/manage_passwords_referrer.h"
  #include "components/password_manager/core/common/password_manager_features.h"
-@@ -3809,6 +3813,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3773,6 +3777,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
  
@@ -1269,7 +1275,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
  
  struct SiteSettingSourceStringMapping {
    SiteSettingSource source;
-@@ -504,6 +506,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
+@@ -503,6 +505,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
        return true;
      }
    }
@@ -1283,7 +1289,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    return false;
  }
  
-@@ -517,11 +526,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
+@@ -516,11 +525,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
        return entry.type;
      }
    }
@@ -1309,15 +1315,15 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
    for (const auto& entry : kContentSettingsTypeGroupNames) {
      if (type == entry.type) {
        // Content setting types that aren't represented in the settings UI
-@@ -536,7 +558,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
+@@ -535,7 +557,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
        return entry.name ? entry.name : std::string_view();
      }
    }
 -
-   NOTREACHED_IN_MIGRATION() << static_cast<int32_t>(type)
-                             << " is not a recognized content settings type.";
-   return std::string_view();
-@@ -643,6 +664,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
+   NOTREACHED() << static_cast<int32_t>(type)
+                << " is not a recognized content settings type.";
+ }
+@@ -642,6 +663,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
        base_types->push_back(ContentSettingsType::WEB_APP_INSTALLATION);
      }
  
@@ -1334,7 +1340,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn
 --- a/components/browser_ui/settings/android/BUILD.gn
 +++ b/components/browser_ui/settings/android/BUILD.gn
-@@ -84,6 +84,7 @@ android_resources("java_resources") {
+@@ -86,6 +86,7 @@ android_resources("java_resources") {
      "java/res/layout/managed_disclaimer_preference_for_radio_groups.xml",
      "java/res/layout/preference_chrome_image_view.xml",
      "java/res/layout/preference_spinner.xml",
@@ -1497,7 +1503,7 @@ diff --git a/components/browser_ui/settings/android/widget/java/src/org/chromium
 diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/browser_ui/site_settings/android/BUILD.gn
 --- a/components/browser_ui/site_settings/android/BUILD.gn
 +++ b/components/browser_ui/site_settings/android/BUILD.gn
-@@ -146,6 +146,23 @@ android_library("java") {
+@@ -147,6 +147,23 @@ android_library("java") {
      ":site_settings_jni_headers",
      "//components/content_settings/android:java_pref_names_srcjar",
    ]
@@ -1521,7 +1527,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
  }
  
  android_library("javatests") {
-@@ -194,6 +211,7 @@ robolectric_library("junit") {
+@@ -195,6 +212,7 @@ robolectric_library("junit") {
  }
  
  android_resources("java_resources") {
@@ -2178,7 +2184,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                  int icon,
                  int title,
                  @ContentSettingValues @Nullable Integer defaultEnabledValue,
-@@ -425,6 +425,8 @@ public class ContentSettingsResources {
+@@ -435,6 +435,8 @@ public class ContentSettingsResources {
                          R.string.website_settings_category_vr_blocked,
                          R.string.website_settings_category_vr_a11y);
          }
@@ -2187,7 +2193,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          assert false; // NOTREACHED
          return null;
      }
-@@ -583,6 +585,14 @@ public class ContentSettingsResources {
+@@ -593,6 +595,14 @@ public class ContentSettingsResources {
          return getResourceItem(contentType).getDefaultDisabledValue();
      }
  
@@ -2202,7 +2208,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      /**
       * Returns the string resource id for a given ContentSetting to show with a permission category.
       *
-@@ -746,6 +756,8 @@ public class ContentSettingsResources {
+@@ -756,6 +766,8 @@ public class ContentSettingsResources {
       *         Blocked states, in that order.
       */
      public static int[] getTriStateSettingDescriptionIDs(int contentType) {
@@ -2276,25 +2282,31 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          if (BINARY_TOGGLE_KEY.equals(preference.getKey())) {
              assert !mCategory.isManaged();
              boolean toggleValue = (boolean) newValue;
-@@ -812,6 +831,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
-                                         .website_settings_allowed_group_heading_request_desktop_site;
-                 break;
+@@ -791,7 +810,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+                         ? R.string.website_settings_blocked_group_heading_request_desktop_site
+                         : R.string.website_settings_allowed_group_heading_request_desktop_site;
          }
-+        if (resource == 0)
-+            resource = BromiteCustomContentSettingImpl.getAddExceptionDialogMessage(mCategory);
-         assert resource > 0;
-         return getString(resource);
+-        return 0;
++        return BromiteCustomContentSettingImpl.getAddExceptionDialogMessage(mCategory);
      }
-@@ -927,6 +948,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+ 
+     // OnPreferenceClickListener:
+@@ -904,10 +923,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
              default:
                  break;
          }
+-
+-        int exceptionDialogMessageResourceId = getAddExceptionDialogMessageResourceId();
+-        assert allowSpecifyingExceptions == (exceptionDialogMessageResourceId != 0);
 +        Boolean allow = BromiteCustomContentSettingImpl.allowSpecifyingExceptions(mCategory);
 +        if (allow != null) allowSpecifyingExceptions = (boolean)allow;
          if (allowSpecifyingExceptions) {
++            int exceptionDialogMessageResourceId = getAddExceptionDialogMessageResourceId();
++            assert exceptionDialogMessageResourceId != 0;
              getPreferenceScreen()
                      .addPreference(
-@@ -1112,8 +1135,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+                             new AddExceptionPreference(
+@@ -1092,8 +1112,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
      private boolean isBlocked() {
          switch (mGlobalToggleLayout) {
              case GlobalToggleLayout.TRI_STATE_TOGGLE:
@@ -2311,7 +2323,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                  return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
              case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE:
                  TriStateCookieSettingsPreference triStateCookieToggle =
-@@ -1180,7 +1211,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1160,7 +1188,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          } else if (mCategory.getType() == SiteSettingsCategory.Type.STORAGE_ACCESS) {
              infoText.setSummary(getStorageAccessSummary());
          } else {
@@ -2324,7 +2336,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          }
  
          // Hide the anti-abuse text preferences, as needed.
-@@ -1217,6 +1252,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1197,6 +1229,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          } else {
              screen.removePreference(mLocationTriStatePref);
          }
@@ -2332,7 +2344,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
          if (permissionBlockedByOs) {
              maybeShowOsWarning(screen);
-@@ -1373,7 +1409,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1355,7 +1388,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                          getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
          int[] descriptionIds =
                  ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@@ -2341,7 +2353,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      private void configureBinaryToggle(ChromeSwitchPreference binaryToggle, int contentType) {
-@@ -1497,6 +1533,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1479,6 +1512,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
          @ContentSettingValues
          Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
  
@@ -2367,16 +2379,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
  
  /** Shows the permissions and other settings for a particular website. */
  public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-@@ -172,7 +173,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-             case ContentSettingsType.CLIPBOARD_READ_WRITE:
-                 return "clipboard_permission_list";
+@@ -175,7 +176,7 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+             case ContentSettingsType.FILE_SYSTEM_WRITE_GUARD:
+                 return "file_system_write_guard_permission_list";
              default:
 -                return null;
 +                return BromiteCustomContentSettingImpl.getProfilePrefKey(type);
          }
      }
  
-@@ -543,8 +544,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -564,8 +565,21 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
  
      private void setupContentSettingsPreferences() {
          mMaxPermissionOrder = findPreference(PREF_PERMISSIONS_HEADER).getOrder();
@@ -2400,7 +2412,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              preference.setKey(getPreferenceKey(type));
  
              if (type == ContentSettingsType.ADS) {
-@@ -1090,20 +1104,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1142,20 +1156,32 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
              @ContentSettingValues @Nullable Integer value,
              boolean isEmbargoed,
              boolean isOneTime) {
@@ -2417,7 +2429,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          setUpPreferenceCommon(preference, value);
  
 -        ChromeSwitchPreference switchPreference = (ChromeSwitchPreference) preference;
--        switchPreference.setChecked(value == ContentSettingValues.ALLOW);
+-        @ContentSettingsType.EnumType
+-        int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
+-        switchPreference.setChecked(value == getEnabledValue(contentType));
 +        Preference switchPreference = preference;
 +        if (preference instanceof ChromeSwitchPreference) {
 +            ((ChromeSwitchPreference)switchPreference).setChecked(value != ContentSettingValues.BLOCK);
@@ -2430,18 +2444,18 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 -                        : getString(ContentSettingsResources.getCategorySummary(value, isOneTime)));
 +                        : getString(ContentSettingsResources.getCategorySummary(content_type, value, isOneTime)));
          switchPreference.setOnPreferenceChangeListener(this);
-         @ContentSettingsType.EnumType
-         int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
 -        if (contentType == mHighlightedPermission) {
 -            switchPreference.setBackgroundColor(
++        @ContentSettingsType.EnumType
++        int contentType = getContentSettingsTypeFromPreferenceKey(preference.getKey());
 +        if (preference instanceof ChromeSwitchPreference && contentType == mHighlightedPermission) {
 +            ((ChromeSwitchPreference)switchPreference).setBackgroundColor(
                      AppCompatResources.getColorStateList(getContext(), mHighlightColor)
                              .getDefaultColor());
          }
-@@ -1321,14 +1347,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
-             permission =
-                     (Boolean) newValue ? ContentSettingValues.ALLOW : ContentSettingValues.BLOCK;
+@@ -1376,14 +1402,20 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+         if (newValue instanceof Boolean) {
+             permission = (Boolean) newValue ? getEnabledValue(type) : ContentSettingValues.BLOCK;
          } else {
 -            permission = (Integer) newValue;
 +            Integer newPermission =
@@ -2491,7 +2505,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              Preference p = findPreference(prefCategory);
              int contentType = SiteSettingsCategory.contentSettingsType(prefCategory);
              // p can be null if the Preference was removed in configurePreferences.
-@@ -171,19 +172,21 @@ public class SiteSettings extends BaseSiteSettingsFragment
+@@ -174,19 +175,21 @@ public class SiteSettings extends BaseSiteSettingsFragment
              } else if (Type.ZOOM == prefCategory) {
                  // Don't want to set a summary for Zoom because we don't want any message to display
                  // under the Zoom row on site settings.
@@ -2528,25 +2542,25 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java
-@@ -73,7 +73,7 @@ public class SiteSettingsCategory {
-         Type.ZOOM,
+@@ -74,7 +74,7 @@ public class SiteSettingsCategory {
          Type.STORAGE_ACCESS,
          Type.TRACKING_PROTECTION,
+         Type.FILE_EDITING,
 -        Type.NUM_ENTRIES
 +        Type.NUM_ENTRIES_CHROMIUM
      })
      @Retention(RetentionPolicy.SOURCE)
      public @interface Type {
-@@ -113,7 +113,7 @@ public class SiteSettingsCategory {
-         int HAND_TRACKING = 31;
+@@ -115,7 +115,7 @@ public class SiteSettingsCategory {
+         int FILE_EDITING = 32;
  
          /** Number of handled categories used for calculating array sizes. */
--        int NUM_ENTRIES = 32;
-+        int NUM_ENTRIES_CHROMIUM = 32;
+-        int NUM_ENTRIES = 33;
++        int NUM_ENTRIES_CHROMIUM = 33;
      }
  
      private final BrowserContextHandle mBrowserContextHandle;
-@@ -162,6 +162,9 @@ public class SiteSettingsCategory {
+@@ -164,6 +164,9 @@ public class SiteSettingsCategory {
          } else {
              permission = "";
          }
@@ -2556,7 +2570,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
          return new SiteSettingsCategory(browserContextHandle, type, permission);
      }
  
-@@ -170,7 +173,7 @@ public class SiteSettingsCategory {
+@@ -172,7 +175,7 @@ public class SiteSettingsCategory {
              @ContentSettingsType.EnumType int contentSettingsType) {
          assert contentSettingsType != -1;
          assert Type.ALL_SITES == 0;
@@ -2565,7 +2579,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (contentSettingsType(i) == contentSettingsType) {
                  return createFromType(browserContextHandle, i);
              }
-@@ -181,7 +184,7 @@ public class SiteSettingsCategory {
+@@ -183,7 +186,7 @@ public class SiteSettingsCategory {
      public static SiteSettingsCategory createFromPreferenceKey(
              BrowserContextHandle browserContextHandle, String preferenceKey) {
          assert Type.ALL_SITES == 0;
@@ -2574,7 +2588,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
              if (preferenceKey(i).equals(preferenceKey)) {
                  return createFromType(browserContextHandle, i);
              }
-@@ -254,8 +257,7 @@ public class SiteSettingsCategory {
+@@ -258,8 +261,7 @@ public class SiteSettingsCategory {
              case Type.TRACKING_PROTECTION:
                  return ContentSettingsType.DEFAULT; // Conversion unavailable.
          }
@@ -2584,7 +2598,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
      }
  
      /**
-@@ -342,8 +344,12 @@ public class SiteSettingsCategory {
+@@ -348,8 +350,12 @@ public class SiteSettingsCategory {
              case Type.ZOOM:
                  return "zoom";
              default:
@@ -2600,7 +2614,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsDelegate.java
-@@ -198,6 +198,8 @@ public interface SiteSettingsDelegate {
+@@ -217,6 +217,8 @@ public interface SiteSettingsDelegate {
       */
      String getRelatedWebsiteSetOwner(String memberOrigin);
  
@@ -2656,7 +2670,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/Website.java
-@@ -326,7 +326,11 @@ public final class Website implements WebsiteEntry {
+@@ -327,7 +327,11 @@ public final class Website implements WebsiteEntry {
                  RecordUserAction.record("SoundContentSetting.UnmuteBy.SiteSettings");
              }
          }
@@ -2672,7 +2686,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePermissionsFetcher.java
-@@ -108,7 +108,7 @@ public class WebsitePermissionsFetcher {
+@@ -110,7 +110,7 @@ public class WebsitePermissionsFetcher {
              case ContentSettingsType.USB_GUARD:
                  return WebsitePermissionsType.CHOSEN_OBJECT_INFO;
              default:
@@ -2838,7 +2852,7 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util.
 diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
 --- a/components/content_settings/core/browser/content_settings_utils.cc
 +++ b/components/content_settings/core/browser/content_settings_utils.cc
-@@ -19,6 +19,7 @@
+@@ -20,6 +20,7 @@
  #include "build/build_config.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -2846,7 +2860,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
  #include "components/content_settings/core/common/content_settings.h"
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/content_settings/core/common/content_settings_utils.h"
-@@ -127,6 +128,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) {
+@@ -128,6 +129,17 @@ PatternPair ParsePatternString(const std::string& pattern_str) {
  
  void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                      RendererContentSettingRules* rules) {
@@ -3291,7 +3305,11 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
 diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 --- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
 +++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
-@@ -109,6 +109,7 @@ public class PermissionParamsListBuilder {
+@@ -106,10 +106,10 @@ public class PermissionParamsListBuilder {
+ 
+         switch (permission.setting) {
+             case ContentSettingValues.ALLOW:
+-            case ContentSettingValues.ASK:
                  permissionParams.allowed = true;
                  break;
              case ContentSettingValues.BLOCK:
@@ -3299,6 +3317,19 @@ diff --git a/components/page_info/android/java/src/org/chromium/components/page_
                  permissionParams.allowed = false;
                  break;
              default:
+@@ -120,6 +120,12 @@ public class PermissionParamsListBuilder {
+                                 + permission.type;
+         }
+ 
++        if (permission.type == ContentSettingsType.FILE_SYSTEM_WRITE_GUARD
++                && permission.setting == ContentSettingValues.ASK) {
++            // see https://source.chromium.org/chromium/chromium/src/+/e3e48613de29440ae1cf11b0ff7fa7c613d9f416
++            permissionParams.allowed = true;
++        }
++
+         return permissionParams;
+     }
+ 
 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
@@ -3310,7 +3341,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
  #include "components/content_settings/core/common/content_settings.h"
  #include "components/content_settings/core/common/content_settings_types.h"
  #include "components/page_info/android/page_info_client.h"
-@@ -162,6 +163,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
+@@ -164,6 +165,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
    }
      permissions_to_display.push_back(ContentSettingsType::STORAGE_ACCESS);
  
@@ -3326,7 +3357,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
    std::map<ContentSettingsType, ContentSetting>
        user_specified_settings_to_display;
    std::map<ContentSettingsType, bool>
-@@ -221,6 +231,14 @@ std::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
+@@ -223,6 +233,14 @@ std::optional<ContentSetting> PageInfoControllerAndroid::GetSettingToDisplay(
      return permission.setting;
    }
  
@@ -3352,7 +3383,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
  #include "components/content_settings/browser/ui/cookie_controls_controller.h"
  #include "components/content_settings/core/browser/content_settings_registry.h"
  #include "components/content_settings/core/browser/content_settings_uma_util.h"
-@@ -1249,6 +1250,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
+@@ -1262,6 +1263,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
  // applies to permissions listed in |kPermissionType|.
  bool PageInfo::ShouldShowPermission(
      const PageInfo::PermissionInfo& info) const {
@@ -3367,7 +3398,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
    // Note |ContentSettingsType::ADS| will show up regardless of its default
    // value when it has been activated on the current origin.
    if (info.type == ContentSettingsType::ADS) {
-@@ -1370,7 +1379,19 @@ void PageInfo::PresentSitePermissions() {
+@@ -1378,7 +1387,19 @@ void PageInfo::PresentSitePermissions() {
  
    HostContentSettingsMap* content_settings = GetContentSettings();
    DCHECK(web_contents_);
@@ -3413,7 +3444,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    switch (type) {
      case ContentSettingsType::GEOLOCATION:
        message_id = IDS_PAGE_INFO_STATE_TEXT_LOCATION_ASK;
-@@ -630,6 +638,12 @@ PageInfoUI::~PageInfoUI() = default;
+@@ -627,6 +635,12 @@ PageInfoUI::~PageInfoUI() = default;
  
  // static
  std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -3426,7 +3457,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id);
-@@ -641,6 +655,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -637,6 +651,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
  // static
  std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
      ContentSettingsType type) {
@@ -3439,7 +3470,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
    for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
      if (info.type == type)
        return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
-@@ -1086,6 +1106,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -1078,6 +1098,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
      if (info.type == type)
        return true;
    }

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
-@@ -633,7 +633,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",
@@ -245,7 +245,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
-@@ -143,7 +143,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -144,7 +144,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
          mPageTitle.set(getString(R.string.prefs_privacy_security));
  
@@ -253,7 +253,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 +        SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences_cromite);
  
          Preference fpProtectionPreference = findPreference(PREF_FP_PROTECTION);
-         fpProtectionPreference.setVisible(shouldShowFpProtectionUI());
+         fpProtectionPreference.setVisible(shouldShowFpProtectionUi());
 diff --git a/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp b/chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
 new file mode 100644
 --- /dev/null

build/patches/Cromite-Branding.patch

@@ -55,9 +55,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../chromium/product_logo_white.png           | Bin 2512 -> 6790 bytes
  .../version_ui/resources/about_version.ts     |   2 +-
  .../resources/about_version_mobile.css        |   9 ++
- content/child/runtime_features.cc             |  23 +++--
+ content/child/runtime_features.cc             |  24 +++--
  tools/grit/grit/grd_reader.py                 |  35 +++++++
- 53 files changed, 187 insertions(+), 117 deletions(-)
+ 53 files changed, 187 insertions(+), 118 deletions(-)
 
 diff --git a/build/BUILD.gn b/build/BUILD.gn
 --- a/build/BUILD.gn
@@ -80,7 +80,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
-@@ -183,6 +183,10 @@ declare_args() {
+@@ -186,6 +186,10 @@ declare_args() {
    clang_unsafe_buffers_paths = ""
  }
  
@@ -9199,7 +9199,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
-@@ -288,7 +288,7 @@
+@@ -283,7 +283,7 @@
      Change
    </message>
    <message name="IDS_SETTINGS_WEB_STORE" desc="Sub-label about choosing something from the Chrome Web Store.">
@@ -13153,7 +13153,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
-@@ -1852,6 +1852,7 @@ static_library("browser") {
+@@ -1835,6 +1835,7 @@ static_library("browser") {
      "//build:chromeos_buildflags",
      "//build/config/chromebox_for_meetings:buildflags",
      "//build/config/compiler:compiler_buildflags",
@@ -13242,7 +13242,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
-@@ -2471,7 +2471,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2474,7 +2474,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">
@@ -13287,15 +13287,15 @@ 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
-@@ -986,7 +986,7 @@
+@@ -984,7 +984,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]">
 -        Accessibility
 +        Accessibility and UI
        </message>
-       <message name="IDS_FONT_SIZE" desc="Title for font size preference.">
-         Text scaling
+       <message name="IDS_FONT_SIZE_ACCESSIBILITY_LABEL" desc="Accessibility label for control to allow user to change font size.">
+         Text scaling set to <ph name="TEXT_SCALING">%1$s<ex>100%</ex></ph>
 diff --git a/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png b/components/browser_ui/styles/android/java/res_chromium/drawable-hdpi/fre_product_logo.png
 index 2353496bafc8f8559a8fcbf6d609302327dc820c..9d123a8918eea5e93f6139534d7dc01a88c4278f 100644
 GIT binary patch
@@ -18896,7 +18896,7 @@ EKU(of)Bpeg
 diff --git a/components/version_ui/resources/about_version.ts b/components/version_ui/resources/about_version.ts
 --- a/components/version_ui/resources/about_version.ts
 +++ b/components/version_ui/resources/about_version.ts
-@@ -183,7 +183,7 @@ function initialize() {
+@@ -220,7 +220,7 @@ function initialize() {
    // </if>
  
    chrome.send('requestVersionInfo');
@@ -19001,12 +19001,13 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
          << "AttributionReportingCrossAppWeb cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="
-@@ -712,7 +711,7 @@ void ResolveInvalidConfigurations() {
+@@ -712,8 +711,7 @@ void ResolveInvalidConfigurations() {
    }
  
    if (!base::FeatureList::IsEnabled(blink::features::kInterestGroupStorage)) {
--    LOG_IF(WARNING, WebRuntimeFeatures::IsAdInterestGroupAPIEnabled())
-+    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabled())
+-    LOG_IF(WARNING,
+-           WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
++    CHECK(!WebRuntimeFeatures::IsAdInterestGroupAPIEnabledByRuntimeFlag())
          << "AdInterestGroupAPI cannot be enabled in this "
             "configuration. Use --"
          << switches::kEnableFeatures << "="

build/patches/Customize-selection-popup.patch

@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActionMod
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -752,10 +752,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -765,10 +765,17 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                                  @TabLaunchType int type,
                                  @TabCreationState int creationState,
                                  boolean markedForSelection) {
@@ -87,7 +87,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
-@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
+@@ -18,6 +18,7 @@ import androidx.annotation.Nullable;
  import androidx.annotation.VisibleForTesting;
  
  import org.chromium.base.Callback;
@@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
  import org.chromium.base.ObserverList;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.supplier.ObservableSupplier;
-@@ -235,6 +236,13 @@ public class LayoutManagerImpl
+@@ -236,6 +237,13 @@ public class LayoutManagerImpl
                                                  != TabLaunchType
                                                          .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
                                  || (!getTabModelSelector().isIncognitoSelected() && incognito);
@@ -112,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java
-@@ -343,8 +343,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -342,8 +342,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
      public void onOpenImageInNewTab(GURL url, Referrer referrer) {
          LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
          loadUrlParams.setReferrer(referrer);
@@ -130,15 +130,15 @@ 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
-@@ -26,6 +26,7 @@ import androidx.appcompat.content.res.AppCompatResources;
- 
+@@ -27,6 +27,7 @@ import androidx.appcompat.content.res.AppCompatResources;
+ import org.chromium.base.BuildInfo;
  import org.chromium.base.Callback;
  import org.chromium.base.CallbackController;
 +import org.chromium.base.ContextUtils;
  import org.chromium.base.TraceEvent;
  import org.chromium.base.lifetime.Destroyable;
  import org.chromium.base.metrics.RecordUserAction;
-@@ -824,11 +825,16 @@ public class RootUiCoordinator
+@@ -827,11 +828,16 @@ public class RootUiCoordinator
                      TrackerFactory.getTrackerForProfile(tab.getProfile())
                              .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
  
@@ -198,7 +198,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -78,4 +78,28 @@ found in the LICENSE file.
+@@ -73,4 +73,28 @@ found in the LICENSE file.
          android:key="disable_toolbar_swipeup"
          android:title="@string/disable_toolbar_swipe_up" />
  
@@ -230,7 +230,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectActionMenuHelper.java
-@@ -29,6 +29,7 @@ import androidx.core.content.ContextCompat;
+@@ -28,6 +28,7 @@ import androidx.core.content.ContextCompat;
  import org.chromium.base.ApiCompatibilityUtils;
  import org.chromium.base.ContextUtils;
  import org.chromium.base.Log;
@@ -238,7 +238,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
  import org.chromium.base.PackageManagerUtils;
  import org.chromium.base.StrictModeContext;
  import org.chromium.content.R;
-@@ -55,38 +56,84 @@ import java.util.TreeSet;
+@@ -54,38 +55,84 @@ import java.util.TreeSet;
  public class SelectActionMenuHelper {
      private static final String TAG = "SelectActionMenu"; // 20 char limit.
  
@@ -353,7 +353,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
      }
  
      @Retention(RetentionPolicy.SOURCE)
-@@ -198,7 +245,7 @@ public class SelectActionMenuHelper {
+@@ -197,7 +244,7 @@ public class SelectActionMenuHelper {
          }
          SelectionMenuGroup primaryAssistGroup =
                  new SelectionMenuGroup(
@@ -371,7 +371,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
          List<SelectionMenuItem.Builder> menuItemBuilders = new ArrayList<>();
          menuItemBuilders.add(cut(delegate.canCut()));
          menuItemBuilders.add(copy(delegate.canCopy()));
-@@ -256,7 +303,7 @@ public class SelectActionMenuHelper {
+@@ -254,7 +301,7 @@ public class SelectActionMenuHelper {
          // menu items if there is selected text.
          @IdRes int groupId = selectedText.isEmpty() ? Menu.NONE : android.R.id.textAssist;
          SelectionMenuGroup secondaryAssistItems =
@@ -380,7 +380,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
  
          if (selectedText.isEmpty() && selectionActionMenuDelegate != null) {
              List<SelectionMenuItem> additionalMenuItems =
-@@ -318,7 +365,7 @@ public class SelectActionMenuHelper {
+@@ -316,7 +363,7 @@ public class SelectActionMenuHelper {
          SelectionMenuGroup textProcessingItems =
                  new SelectionMenuGroup(
                          R.id.select_action_menu_text_processing_items,
@@ -389,7 +389,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
          if (isSelectionPassword || intentHandler == null) {
              addAdditionalTextProcessingItems(textProcessingItems, selectionActionMenuDelegate);
              return textProcessingItems;
-@@ -425,7 +472,7 @@ public class SelectActionMenuHelper {
+@@ -422,7 +469,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_cut)
                  .setIconAttr(android.R.attr.actionModeCutDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.CUT)
@@ -398,7 +398,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -437,7 +484,7 @@ public class SelectActionMenuHelper {
+@@ -434,7 +481,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_copy)
                  .setIconAttr(android.R.attr.actionModeCopyDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.COPY)
@@ -407,7 +407,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -449,7 +496,7 @@ public class SelectActionMenuHelper {
+@@ -446,7 +493,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_paste)
                  .setIconAttr(android.R.attr.actionModePasteDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.PASTE)
@@ -416,7 +416,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -463,7 +510,7 @@ public class SelectActionMenuHelper {
+@@ -460,7 +507,7 @@ public class SelectActionMenuHelper {
          return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_share))
                  .setId(R.id.select_action_menu_share)
                  .setIconAttr(android.R.attr.actionModeShareDrawable)
@@ -425,7 +425,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -475,7 +522,7 @@ public class SelectActionMenuHelper {
+@@ -472,7 +519,7 @@ public class SelectActionMenuHelper {
                  .setId(R.id.select_action_menu_select_all)
                  .setIconAttr(android.R.attr.actionModeSelectAllDrawable)
                  .setAlphabeticShortcut(ItemKeyShortcuts.SELECT_ALL)
@@ -434,7 +434,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                  .setShowAsActionFlags(
                          MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                  .setIsEnabled(isEnabled)
-@@ -488,7 +535,7 @@ public class SelectActionMenuHelper {
+@@ -484,7 +531,7 @@ public class SelectActionMenuHelper {
          SelectionMenuItem.Builder builder =
                  new SelectionMenuItem.Builder(android.R.string.paste_as_plain_text)
                          .setId(R.id.select_action_menu_paste_as_plain_text)
@@ -443,7 +443,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                          .setShowAsActionFlags(
                                  MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT)
                          .setIsEnabled(isEnabled);
-@@ -508,7 +555,7 @@ public class SelectActionMenuHelper {
+@@ -504,7 +551,7 @@ public class SelectActionMenuHelper {
          return new SelectionMenuItem.Builder(context.getString(R.string.actionbar_web_search))
                  .setId(R.id.select_action_menu_web_search)
                  .setIconAttr(android.R.attr.actionModeWebSearchDrawable)

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

@@ -10,9 +10,9 @@ Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
  chrome/android/java/res/layout/url_bar.xml    |  1 +
- .../browser/omnibox/LocationBarMediator.java  | 13 +++++++++--
- .../chrome/browser/omnibox/UrlBar.java        | 23 +++++++++++++++++++
- 3 files changed, 35 insertions(+), 2 deletions(-)
+ .../browser/omnibox/LocationBarMediator.java  | 13 ++++++++--
+ .../chrome/browser/omnibox/UrlBar.java        | 24 +++++++++++++++++++
+ 3 files changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/res/layout/url_bar.xml
 --- a/chrome/android/java/res/layout/url_bar.xml
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/layout/url_bar.xml b/chrome/android/java/re
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
-@@ -288,8 +288,17 @@ class LocationBarMediator
+@@ -289,8 +289,17 @@ class LocationBarMediator
              if (mNativeInitialized) RecordUserAction.record("FocusLocation");
              boolean shouldRetainOmniboxOnFocus = OmniboxFeatures.shouldRetainOmniboxOnFocus();
              if (!mUrlFocusedWithPastedText && !shouldRetainOmniboxOnFocus) {
@@ -58,18 +58,19 @@ 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;
-@@ -114,6 +115,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -107,6 +108,7 @@ public class UrlBar extends AutocompleteEditText {
      private boolean mAllowFocus = true;
-     private boolean mTypingStartedEventSent;
+     private boolean mShouldSendTypingStartedEvent;
  
 +    private boolean mPendingSelectAll;
      private boolean mPendingScroll;
  
      // Captures the current intended text scroll type.
-@@ -355,6 +357,27 @@ public class UrlBar extends AutocompleteEditText {
-             mPendingScroll = false;
-         }
+@@ -332,6 +334,28 @@ public class UrlBar extends AutocompleteEditText {
          fixupTextDirection();
+ 
+         mShouldSendTypingStartedEvent = focused;
++
 +        if (mPendingSelectAll) {
 +            UrlBar sender = this;
 +            new Handler().post(new Runnable() {

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

@@ -36,13 +36,13 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 +        android:summary="@string/enable_accessibility_summary"
 +        android:title="@string/enable_accessibility_title" />
 +
-     <org.chromium.chrome.browser.accessibility.settings.TextScalePreference
-         android:key="text_scale"
-         android:title="@string/font_size"
+     <org.chromium.components.browser_ui.accessibility.PageZoomPreference
+         android:key="page_zoom_default_zoom"
+         android:selectable="false" />
 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
-@@ -1080,6 +1080,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1079,6 +1079,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
              structure.setChildCount(0);
              return;
          }

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
-@@ -227,7 +227,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -389,7 +389,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
              feature_name.Value().Utf8()) &&
          guard.Release()) {
        stream.ConsumeWhitespace();
@@ -28,12 +28,12 @@ diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
-@@ -585,7 +585,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
-     HeapVector<Member<StyleRule>> selectors;
+@@ -586,7 +586,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
      HeapVector<CSSSelector> arena;
      CSSPropertyValueSet* empty_properties =
--        ImmutableCSSPropertyValueSet::Create(nullptr, 0, kUASheetMode);
-+        ImmutableCSSPropertyValueSet::Create(nullptr, 0, kHTMLStandardMode);
+         ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),
+-                                             kUASheetMode);
++                                             kHTMLStandardMode);
      CSSParserContext* css_parser_context =
          MakeGarbageCollected<CSSParserContext>(*execution_context);
      for (auto* raw_selector : raw_selectors) {

build/patches/Disable-Component-Updates.patch

@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 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
-@@ -106,6 +106,7 @@
+@@ -107,6 +107,7 @@
  namespace component_updater {
  
  void RegisterComponentsForUpdate() {
@@ -34,7 +34,7 @@ diff --git a/components/component_updater/component_installer.cc b/components/co
 diff --git a/components/component_updater/component_updater_service.cc b/components/component_updater/component_updater_service.cc
 --- a/components/component_updater/component_updater_service.cc
 +++ b/components/component_updater/component_updater_service.cc
-@@ -541,14 +541,8 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
+@@ -542,14 +542,8 @@ std::unique_ptr<ComponentUpdateService> ComponentUpdateServiceFactory(
  
  // Register prefs required by the component update service.
  void RegisterComponentUpdateServicePrefs(PrefRegistrySimple* registry) {

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
-@@ -8389,6 +8389,12 @@ static_library("browser") {
+@@ -8407,6 +8407,12 @@ static_library("browser") {
      deps += [ "//components/segmentation_platform/internal:optimization_guide_segmentation_handler" ]
    }
  
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
    if (enable_compose) {
      sources += [
        "compose/chrome_compose_client.cc",
-@@ -8404,7 +8410,6 @@ static_library("browser") {
+@@ -8422,7 +8428,6 @@ static_library("browser") {
      ]
  
      deps += [
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "//chrome/common/compose",
        "//chrome/common/compose:mojo_bindings",
        "//components/autofill/content/browser:browser",
-@@ -8845,7 +8850,7 @@ source_set("font_pref") {
+@@ -8869,7 +8874,7 @@ source_set("font_pref") {
    deps = [ "//chrome/common" ]
  }
  
@@ -46,19 +46,19 @@ 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
-@@ -586,7 +586,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
-       optimization_guide::features::kAiSettingsPageRefresh);
+@@ -389,7 +389,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+       base::FeatureList::IsEnabled(features::kLinkedServicesSetting));
  
-   if (ai_settings_refresh_enabled) {
--    const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile);
-+    const bool compose_enabled = false;
-     const bool tab_organization_enabled =
-         TabOrganizationUtils::GetInstance()->IsEnabled(profile);
-     const bool wallpaper_search_enabled =
+ #if BUILDFLAG(ENABLE_COMPOSE)
+-  const bool compose_enabled = ComposeEnabling::IsEnabledForProfile(profile);
++  const bool compose_enabled = false;
+ #else
+   const bool compose_enabled = false;
+ #endif  // BUILDFLAG(ENABLE_COMPOSE)
 diff --git a/components/compose/core/browser/compose_features.cc b/components/compose/core/browser/compose_features.cc
 --- a/components/compose/core/browser/compose_features.cc
 +++ b/components/compose/core/browser/compose_features.cc
-@@ -108,4 +108,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
+@@ -104,4 +104,6 @@ BASE_FEATURE(kComposeUpfrontInputModes,
               "ComposeUpfrontInputModes",
               base::FEATURE_DISABLED_BY_DEFAULT);
  

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

build/patches/Disable-FedCm.patch

@@ -26,7 +26,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1782,7 +1782,7 @@
+@@ -1795,7 +1795,7 @@
      {
        name: "FedCm",
        public: true,

build/patches/Disable-GSA-by-default.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/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
-@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler;
  import org.chromium.chrome.browser.externalnav.IntentWithRequestMetadataHandler.RequestMetadata;
  import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -23,9 +23,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
  import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
  import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.profiles.ProfileManager;
-@@ -256,9 +255,6 @@ public class IntentHandler {
-     public static final String EXTRA_APP_SPECIFIC_HISTORY =
-             "org.chromium.chrome.browser.app_specific_history";
+@@ -262,9 +261,6 @@ public class IntentHandler {
+     public static final String EXTRA_SKIP_PRECONNECT =
+             "org.chromium.chrome.browser.skip_preconnect";
  
 -    /** The package name for the Google Search App. */
 -    public static final String PACKAGE_GSA = GSAUtils.GSA_PACKAGE_NAME;
@@ -33,7 +33,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;
-@@ -524,8 +520,6 @@ public class IntentHandler {
+@@ -526,8 +522,6 @@ public class IntentHandler {
              return ExternalAppId.LINE;
          } else if (packageName.equals(PACKAGE_WHATSAPP)) {
              return ExternalAppId.WHATSAPP;
@@ -66,15 +66,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
          }
      }
  
-@@ -93,15 +87,11 @@ public class LensUtils {
+@@ -92,15 +86,11 @@ public class LensUtils {
       * @return Whether the package is valid.
       */
-     public static boolean isValidAgsaPackage(final ExternalAuthUtils externalAuthUtils) {
+     public static boolean isValidAgsaPackage() {
 -        if (sFakePassableLensEnvironmentForTesting) {
 -            return true;
 -        }
 -
--        return externalAuthUtils.isGoogleSigned(IntentHandler.PACKAGE_GSA);
+-        return ExternalAuthUtils.getInstance().isGoogleSigned(IntentHandler.PACKAGE_GSA);
 +        return false;
      }
  

build/patches/Disable-GetInstalledRelatedApps-API.patch

@@ -8,8 +8,8 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../browser/installedapp/installed_app_provider_impl.cc    | 2 +-
  .../features_cc/Disable-GetInstalledRelatedApps-API.inc    | 7 +++++++
  .../Disable-GetInstalledRelatedApps-API.inc                | 2 ++
- .../blink/renderer/platform/runtime_enabled_features.json5 | 2 +-
- 5 files changed, 12 insertions(+), 2 deletions(-)
+ .../blink/renderer/platform/runtime_enabled_features.json5 | 3 +--
+ 5 files changed, 12 insertions(+), 3 deletions(-)
  create mode 100644 cromite_flags/content/common/features_cc/Disable-GetInstalledRelatedApps-API.inc
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-GetInstalledRelatedApps-API.inc
 
@@ -58,12 +58,12 @@ 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
-@@ -2455,9 +2455,9 @@
-       status: {"Android": "test", "default": "stable"},
+@@ -2458,9 +2458,8 @@
+       name: "InspectorGhostRules",
      },
      {
-+      // disable GetInstalledRelatedApps
-       name: "InstalledApp",
+-      name: "InstalledApp",
++      name: "InstalledApp", // disable GetInstalledRelatedApps
        public: true,
 -      status: "stable",
        base_feature: "none",

build/patches/Disable-PrivacyGuide.patch

@@ -4,11 +4,9 @@ Subject: Disable PrivacyGuide
 
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/android/java/res/xml/privacy_preferences.xml         | 1 +
- chrome/browser/ui/webui/settings/settings_ui.cc             | 3 +--
- .../common/chrome_features_cc/Disable-PrivacyGuide.inc      | 6 ++++++
- 3 files changed, 8 insertions(+), 2 deletions(-)
- create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc
+ chrome/android/java/res/xml/privacy_preferences.xml | 1 +
+ chrome/browser/ui/webui/settings/settings_ui.cc     | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -24,8 +22,8 @@ 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
-@@ -363,8 +363,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
- #endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -354,8 +354,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+ #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
    bool show_privacy_guide =
 -      base::FeatureList::IsEnabled(features::kPrivacyGuideForceAvailable) ||
@@ -34,15 +32,4 @@ diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui
    html_source->AddBoolean("showPrivacyGuide", show_privacy_guide);
  
    html_source->AddBoolean(
-diff --git a/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc
-new file mode 100644
---- /dev/null
-+++ b/cromite_flags/chrome/common/chrome_features_cc/Disable-PrivacyGuide.inc
-@@ -0,0 +1,6 @@
-+#if BUILDFLAG(IS_ANDROID)
-+
-+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuideAndroid3);
-+SET_CROMITE_FEATURE_DISABLED(kPrivacyGuidePreloadAndroid);
-+
-+#endif
 --

build/patches/Disable-Real-Box.patch

@@ -13,7 +13,7 @@ Real-box is search box in ntp
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2327,7 +2327,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2289,7 +2289,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
    registry->RegisterBooleanPref(
        prefs::kLensRegionSearchEnabled, true,
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res
 diff --git a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
 --- a/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
 +++ b/chrome/browser/ui/webui/searchbox/searchbox_handler.cc
-@@ -459,6 +459,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
+@@ -420,6 +420,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
                                              Profile* profile,
                                              bool enable_voice_search,
                                              bool enable_lens_search) {
@@ -54,7 +54,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
-@@ -118,7 +118,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
+@@ -126,7 +126,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles,
  
  // If enabled, logo will be shown.
  // This is a kill switch. Keep indefinitely.
@@ -63,7 +63,7 @@ diff --git a/components/search/ntp_features.cc b/components/search/ntp_features.
  
  // If enabled, middle slot promo will be shown.
  // This is a kill switch. Keep indefinitely.
-@@ -186,8 +186,8 @@ BASE_FEATURE(kNtpModulesRedesigned,
+@@ -189,8 +189,8 @@ BASE_FEATURE(kNtpModulesRedesigned,
  // 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
-@@ -82,6 +82,7 @@
+@@ -84,6 +84,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"
-@@ -248,6 +249,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log,
+@@ -250,6 +251,38 @@ void LogUsingExistingSession(const NetLogWithSource& request_net_log,
  
  }  // 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() {
-@@ -2094,7 +2127,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
+@@ -2122,7 +2155,7 @@ QuicSessionPool::CreateCryptoConfigHandle(
                cert_verifier_, transport_security_state_, sct_auditing_delegate_,
                HostsFromOrigins(params_.origins_to_force_quic_on),
                actual_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
-@@ -284,7 +284,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -283,7 +283,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();
  }
  
-@@ -672,6 +698,8 @@ int SSLClientSocketImpl::Init() {
+@@ -670,6 +696,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>(
-@@ -958,6 +986,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -956,6 +984,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                      : SSLHandshakeDetails::kTLS13Full;
      }
    }

build/patches/Disable-WebGPU.patch

@@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -234,7 +234,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -253,7 +253,7 @@ BASE_FEATURE(kEnableDrDc,
  // enabled by default on supported platforms.
  #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
      BUILDFLAG(IS_ANDROID)
@@ -36,7 +36,7 @@ diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
 --- a/third_party/blink/renderer/modules/webgpu/gpu.cc
 +++ b/third_party/blink/renderer/modules/webgpu/gpu.cc
-@@ -389,6 +389,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
+@@ -401,6 +401,7 @@ ScriptPromise<IDLNullable<GPUAdapter>> GPU::requestAdapter(
          "WebGPU is experimental on this platform. See "
          "https://github.com/gpuweb/gpuweb/wiki/"
          "Implementation-Status#implementation-status"));

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

@@ -5,7 +5,7 @@ Subject: Disable all predictors code
 Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
- chrome/browser/BUILD.gn                           |  2 --
+ chrome/browser/BUILD.gn                           |  3 ---
  .../preloading_model_keyed_service.cc             |  3 +++
  .../preloading_model_keyed_service_factory.cc     |  4 +---
  .../optimization_guide/chrome_hints_manager.cc    |  1 +
@@ -14,12 +14,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../predictors/autocomplete_action_predictor.cc   |  2 ++
  .../predictors/loading_predictor_config.cc        |  4 ++--
  chrome/browser/predictors/predictors_features.cc  |  3 +--
+ chrome/browser/safe_browsing/BUILD.gn             |  1 -
+ ...ification_content_detection_service_factory.cc |  5 +++++
  chrome/browser/ui/tab_helpers.cc                  |  1 -
  .../ui/webui/omnibox/omnibox_page_handler.cc      |  2 ++
- .../accessibility/read_aloud_app_model.cc         |  8 ++++++++
- .../renderer/accessibility/read_aloud_app_model.h |  7 +++++++
- .../accessibility/read_anything_app_controller.cc | 12 ++++++++++++
- .../accessibility/read_anything_app_controller.h  |  4 ++++
+ .../read_anything/read_aloud_app_model.cc         |  8 ++++++++
+ .../read_anything/read_aloud_app_model.h          |  7 +++++++
+ .../read_anything/read_anything_app_controller.cc | 12 ++++++++++++
+ .../read_anything/read_anything_app_controller.h  |  4 ++++
  chrome/utility/BUILD.gn                           |  2 +-
  chrome/utility/services.cc                        |  8 --------
  .../core/browser/autofill_optimization_guide.cc   |  5 +++--
@@ -31,6 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../core/prediction_model_fetcher_impl.cc         |  1 +
  components/optimization_guide/features.gni        |  3 +--
  .../core/page_content_annotations_features.cc     |  5 +++++
+ components/safe_browsing/core/common/features.cc  |  1 +
  .../Disable-all-predictors-code.inc               |  3 +++
  .../Disable-all-predictors-code.inc               |  1 +
  .../Disable-all-predictors-code.inc               |  1 +
@@ -40,7 +43,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  services/webnn/features.gni                       |  2 +-
  .../document_speculation_rules.cc                 |  1 +
  .../platform/runtime_enabled_features.json5       |  2 +-
- 35 files changed, 96 insertions(+), 35 deletions(-)
+ 38 files changed, 102 insertions(+), 37 deletions(-)
  create mode 100644 cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-all-predictors-code.inc
  create mode 100644 cromite_flags/chrome/common/chrome_features_cc/Disable-all-predictors-code.inc
@@ -51,7 +54,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -759,8 +759,6 @@ static_library("browser") {
+@@ -760,8 +760,6 @@ static_library("browser") {
      "navigation_predictor/navigation_predictor_keyed_service_factory.h",
      "navigation_predictor/navigation_predictor_metrics_document_data.cc",
      "navigation_predictor/navigation_predictor_metrics_document_data.h",
@@ -60,6 +63,14 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "navigation_predictor/preloading_model_keyed_service.cc",
      "navigation_predictor/preloading_model_keyed_service.h",
      "navigation_predictor/preloading_model_keyed_service_factory.cc",
+@@ -2242,7 +2240,6 @@ static_library("browser") {
+     "//components/safe_browsing/content/browser",
+     "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/browser:safe_browsing_service",
+-    "//components/safe_browsing/content/browser/notification_content_detection",
+     "//components/safe_browsing/content/browser/password_protection",
+     "//components/safe_browsing/content/browser/web_ui",
+     "//components/safe_browsing/core/browser",
 diff --git a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 --- a/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
 +++ b/chrome/browser/navigation_predictor/preloading_model_keyed_service.cc
@@ -163,7 +174,7 @@ diff --git a/chrome/browser/optimization_guide/model_validator_keyed_service.cc
 diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
 +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
-@@ -564,7 +564,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
+@@ -497,7 +497,6 @@ void OptimizationGuideKeyedService::RemoveObserverForOptimizationTargetModel(
  void OptimizationGuideKeyedService::RegisterOptimizationTypes(
      const std::vector<optimization_guide::proto::OptimizationType>&
          optimization_types) {
@@ -210,10 +221,50 @@ diff --git a/chrome/browser/predictors/predictors_features.cc b/chrome/browser/p
  
  }  // namespace
  
+diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsing/BUILD.gn
+--- a/chrome/browser/safe_browsing/BUILD.gn
++++ b/chrome/browser/safe_browsing/BUILD.gn
+@@ -51,7 +51,6 @@ static_library("safe_browsing") {
+     "//components/safe_browsing/content/browser",
+     "//components/safe_browsing/content/browser:client_side_detection",
+     "//components/safe_browsing/content/browser:client_side_detection_service",
+-    "//components/safe_browsing/content/browser/notification_content_detection:notification_content_detection",
+     "//components/safe_browsing/content/browser/triggers:suspicious_site_trigger",
+     "//components/safe_browsing/content/browser/web_ui",
+     "//components/safe_browsing/core/browser",
+diff --git a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
+--- a/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
++++ b/chrome/browser/safe_browsing/notification_content_detection_service_factory.cc
+@@ -14,6 +14,7 @@
+ #include "components/safe_browsing/content/browser/notification_content_detection/notification_content_detection_service.h"
+ #include "components/safe_browsing/core/browser/db/database_manager.h"
+ #include "components/safe_browsing/core/common/features.h"
++#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
+ #include "content/public/browser/browser_context.h"
+ 
+ namespace safe_browsing {
+@@ -63,6 +64,7 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
+     return nullptr;
+   }
+ 
++#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
+   auto database_manager =
+       g_browser_process->safe_browsing_service()->database_manager();
+   scoped_refptr<base::SequencedTaskRunner> background_task_runner =
+@@ -70,6 +72,9 @@ std::unique_ptr<KeyedService> NotificationContentDetectionServiceFactory::
+           {base::MayBlock(), base::TaskPriority::BEST_EFFORT});
+   return std::make_unique<NotificationContentDetectionService>(
+       opt_guide, background_task_runner, database_manager, context);
++#else
++  return nullptr;
++#endif
+ }
+ 
+ }  // namespace safe_browsing
 diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -444,7 +444,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
+@@ -439,7 +439,6 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
    }
    MixedContentSettingsTabHelper::CreateForWebContents(web_contents);
    NavigationMetricsRecorder::CreateForWebContents(web_contents);
@@ -234,9 +285,9 @@ diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/br
  #include "components/optimization_guide/machine_learning_tflite_buildflags.h"
  #include "components/search_engines/template_url.h"
  #include "content/public/browser/web_ui.h"
-diff --git a/chrome/renderer/accessibility/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_aloud_app_model.cc
---- a/chrome/renderer/accessibility/read_aloud_app_model.cc
-+++ b/chrome/renderer/accessibility/read_aloud_app_model.cc
+diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
+--- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
++++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.cc
 @@ -6,7 +6,9 @@
  
  #include "base/strings/utf_string_conversions.h"
@@ -289,18 +340,18 @@ diff --git a/chrome/renderer/accessibility/read_aloud_app_model.cc b/chrome/rend
  
  // TODO(crbug.com/40927698): Update to use AXRange to better handle multiple
  // nodes. This may require updating GetText in ax_range.h to return AXNodeIds.
-diff --git a/chrome/renderer/accessibility/read_aloud_app_model.h b/chrome/renderer/accessibility/read_aloud_app_model.h
---- a/chrome/renderer/accessibility/read_aloud_app_model.h
-+++ b/chrome/renderer/accessibility/read_aloud_app_model.h
+diff --git a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
+--- a/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
++++ b/chrome/renderer/accessibility/read_anything/read_aloud_app_model.h
 @@ -9,7 +9,10 @@
  #include "base/values.h"
- #include "chrome/common/accessibility/read_anything.mojom.h"
- #include "chrome/common/accessibility/read_anything_constants.h"
+ #include "chrome/common/read_anything/read_anything.mojom.h"
+ #include "chrome/common/read_anything/read_anything_constants.h"
 +#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
 +#endif
- #include "chrome/renderer/accessibility/read_aloud_traversal_utils.h"
+ #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
  #include "ui/accessibility/ax_node_position.h"
  
 @@ -87,7 +90,9 @@ class ReadAloudAppModel {
@@ -325,20 +376,20 @@ diff --git a/chrome/renderer/accessibility/read_aloud_app_model.h b/chrome/rende
  
    // Whether Read Aloud speech is currently playing or not.
    bool speech_playing_ = false;
-diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything_app_controller.cc
---- a/chrome/renderer/accessibility/read_anything_app_controller.cc
-+++ b/chrome/renderer/accessibility/read_anything_app_controller.cc
+diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
+--- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
++++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.cc
 @@ -21,7 +21,9 @@
  #include "base/strings/utf_string_conversions.h"
- #include "chrome/common/accessibility/read_anything_constants.h"
+ #include "chrome/common/read_anything/read_anything_constants.h"
  #include "chrome/renderer/accessibility/ax_tree_distiller.h"
 +#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
  #include "chrome/renderer/accessibility/phrase_segmentation/dependency_parser_model.h"
 +#endif
- #include "chrome/renderer/accessibility/read_aloud_traversal_utils.h"
- #include "chrome/renderer/accessibility/read_anything_node_utils.h"
+ #include "chrome/renderer/accessibility/read_anything/read_aloud_traversal_utils.h"
+ #include "chrome/renderer/accessibility/read_anything/read_anything_node_utils.h"
  #include "components/language/core/common/locale_util.h"
-@@ -364,11 +366,13 @@ SkBitmap CorrectColorOfBitMap(SkBitmap& originalBitmap) {
+@@ -363,11 +365,13 @@ SkBitmap CorrectColorOfBitMap(SkBitmap& originalBitmap) {
    return converted;
  }
  
@@ -352,7 +403,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
  
  }  // namespace
  
-@@ -1474,6 +1478,7 @@ void ReadAnythingAppController::OnConnected() {
+@@ -1457,6 +1461,7 @@ void ReadAnythingAppController::OnConnected() {
    render_frame()->GetBrowserInterfaceBroker().GetInterface(
        std::move(page_handler_factory_receiver));
  
@@ -360,7 +411,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
    // Get the dependency parser model used by phrase-based highlighting.
    DependencyParserModel& dependency_parser_model = GetDependencyParserModel();
    if (dependency_parser_model.IsAvailable()) {
-@@ -1483,6 +1488,7 @@ void ReadAnythingAppController::OnConnected() {
+@@ -1466,6 +1471,7 @@ void ReadAnythingAppController::OnConnected() {
    page_handler_->GetDependencyParserModel(
        base::BindOnce(&ReadAnythingAppController::UpdateDependencyParserModel,
                       weak_ptr_factory_.GetWeakPtr()));
@@ -368,7 +419,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
  }
  
  void ReadAnythingAppController::OnCopy() const {
-@@ -1692,6 +1698,7 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
+@@ -1675,6 +1681,7 @@ std::vector<ui::AXNodeID> ReadAnythingAppController::GetCurrentText() {
  }
  
  void ReadAnythingAppController::PreprocessTextForSpeech() {
@@ -376,7 +427,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
    const std::set<ui::AXNodeID>* node_ids = model_.selection_node_ids().empty()
                                                 ? &model_.display_node_ids()
                                                 : &model_.selection_node_ids();
-@@ -1701,6 +1708,7 @@ void ReadAnythingAppController::PreprocessTextForSpeech() {
+@@ -1684,6 +1691,7 @@ void ReadAnythingAppController::PreprocessTextForSpeech() {
      DependencyParserModel& model = GetDependencyParserModel();
      read_aloud_model_.PreprocessPhrasesForText(model);
    }
@@ -384,7 +435,7 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
  }
  
  void ReadAnythingAppController::MovePositionToNextGranularity() {
-@@ -1874,14 +1882,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
+@@ -1857,14 +1865,18 @@ bool ReadAnythingAppController::IsDocsLoadMoreButtonVisible() const {
  
  void ReadAnythingAppController::UpdateDependencyParserModel(
      base::File model_file) {
@@ -403,10 +454,10 @@ diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chr
  
  void ReadAnythingAppController::OnTreeAdded(ui::AXTree* tree) {
    auto observation =
-diff --git a/chrome/renderer/accessibility/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything_app_controller.h
---- a/chrome/renderer/accessibility/read_anything_app_controller.h
-+++ b/chrome/renderer/accessibility/read_anything_app_controller.h
-@@ -47,7 +47,9 @@ class MojoUkmRecorder;
+diff --git a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h
+--- a/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h
++++ b/chrome/renderer/accessibility/read_anything/read_anything_app_controller.h
+@@ -46,7 +46,9 @@ class MojoUkmRecorder;
  }  // namespace ukm
  
  class AXTreeDistiller;
@@ -441,7 +492,7 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 --- a/chrome/utility/services.cc
 +++ b/chrome/utility/services.cc
-@@ -246,13 +246,6 @@ auto RunMirroringService(
+@@ -243,13 +243,6 @@ auto RunMirroringService(
        std::move(receiver), content::UtilityThread::Get()->GetIOTaskRunner());
  }
  
@@ -455,7 +506,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
  #endif  // !BUILDFLAG(IS_ANDROID)
  
  #if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
-@@ -459,7 +452,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
+@@ -466,7 +459,6 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) {
  #if !BUILDFLAG(IS_ANDROID)
    services.Add(RunProfileImporter);
    services.Add(RunMirroringService);
@@ -466,7 +517,7 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc
 diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/components/autofill/core/browser/autofill_optimization_guide.cc
 --- a/components/autofill/core/browser/autofill_optimization_guide.cc
 +++ b/components/autofill/core/browser/autofill_optimization_guide.cc
-@@ -209,6 +209,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
+@@ -208,6 +208,7 @@ void AutofillOptimizationGuide::OnDidParseForm(
    // If we do not have any optimization types to register, do not do anything.
    if (!optimization_types.empty()) {
      // Register all optimization types that we need based on `form_structure`.
@@ -474,7 +525,7 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
      decider_->RegisterOptimizationTypes(
          std::vector<optimization_guide::proto::OptimizationType>(
              std::move(optimization_types).extract()));
-@@ -260,7 +261,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
+@@ -259,7 +260,7 @@ bool AutofillOptimizationGuide::ShouldBlockSingleFieldSuggestions(
      const AutofillField* field) const {
    // If the field's storable type is `IBAN_VALUE`, check whether IBAN
    // suggestions should be blocked based on `url`.
@@ -483,7 +534,7 @@ diff --git a/components/autofill/core/browser/autofill_optimization_guide.cc b/c
      optimization_guide::OptimizationGuideDecision decision =
          decider_->CanApplyOptimization(
              url, optimization_guide::proto::IBAN_AUTOFILL_BLOCKED,
-@@ -286,7 +287,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
+@@ -285,7 +286,7 @@ bool AutofillOptimizationGuide::ShouldBlockFormFieldSuggestion(
      const CreditCard& card) const {
    if (auto optimization_type =
            GetVcnMerchantOptOutOptimizationTypeForCard(card);
@@ -524,7 +575,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/optimization_guide/core/hints_fetcher.cc
 --- a/components/optimization_guide/core/hints_fetcher.cc
 +++ b/components/optimization_guide/core/hints_fetcher.cc
-@@ -198,6 +198,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
+@@ -196,6 +196,7 @@ bool HintsFetcher::FetchOptimizationGuideServiceHints(
      bool skip_cache,
      HintsFetchedCallback hints_fetched_callback,
      std::optional<proto::RequestContextMetadata> request_context_metadata) {
@@ -535,7 +586,7 @@ diff --git a/components/optimization_guide/core/hints_fetcher.cc b/components/op
 diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
 --- a/components/optimization_guide/core/hints_manager.cc
 +++ b/components/optimization_guide/core/hints_manager.cc
-@@ -393,6 +393,7 @@ void HintsManager::Shutdown() {
+@@ -391,6 +391,7 @@ void HintsManager::Shutdown() {
  OptimizationGuideDecision
  HintsManager::GetOptimizationGuideDecisionFromOptimizationTypeDecision(
      OptimizationTypeDecision optimization_type_decision) {
@@ -543,7 +594,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
    switch (optimization_type_decision) {
      case OptimizationTypeDecision::kAllowedByOptimizationFilter:
      case OptimizationTypeDecision::kAllowedByHint:
-@@ -1116,6 +1117,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
+@@ -1114,6 +1115,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
      OnDemandOptimizationGuideDecisionRepeatingCallback callback,
      std::optional<proto::RequestContextMetadata> request_context_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -551,7 +602,7 @@ diff --git a/components/optimization_guide/core/hints_manager.cc b/components/op
  
    InsertionOrderedSet<GURL> urls_to_fetch;
    InsertionOrderedSet<std::string> hosts_to_fetch;
-@@ -1421,6 +1423,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
+@@ -1417,6 +1419,9 @@ OptimizationTypeDecision HintsManager::CanApplyOptimization(
      bool skip_cache,
      OptimizationMetadata* optimization_metadata) {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -576,7 +627,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
  
  }  // namespace
  
-@@ -415,8 +411,7 @@ size_t MaxURLKeyedHintCacheSize() {
+@@ -422,8 +418,7 @@ size_t MaxURLKeyedHintCacheSize() {
  }
  
  bool ShouldPersistHintsToDisk() {
@@ -586,7 +637,7 @@ diff --git a/components/optimization_guide/core/optimization_guide_features.cc b
  }
  
  RequestContextSet GetAllowedContextsForPersonalizedMetadata() {
-@@ -874,5 +869,13 @@ int GetOnDeviceModelValidationAttemptCount() {
+@@ -864,5 +859,13 @@ int GetOnDeviceModelValidationAttemptCount() {
    return kParam.Get();
  }
  
@@ -664,7 +715,7 @@ diff --git a/components/optimization_guide/features.gni b/components/optimizatio
 diff --git a/components/page_content_annotations/core/page_content_annotations_features.cc b/components/page_content_annotations/core/page_content_annotations_features.cc
 --- a/components/page_content_annotations/core/page_content_annotations_features.cc
 +++ b/components/page_content_annotations/core/page_content_annotations_features.cc
-@@ -280,4 +280,9 @@ size_t MaxRelatedSearchesCacheSize() {
+@@ -263,4 +263,9 @@ size_t MaxRelatedSearchesCacheSize() {
        "max_related_searches_cache_size", 10);
  }
  
@@ -674,6 +725,17 @@ diff --git a/components/page_content_annotations/core/page_content_annotations_f
 +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsValidation);
 +SET_CROMITE_FEATURE_DISABLED(kPageContentAnnotationsPersistSalientImageMetadata);
  }  // namespace page_content_annotations::features
+diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
+--- a/components/safe_browsing/core/common/features.cc
++++ b/components/safe_browsing/core/common/features.cc
+@@ -228,6 +228,7 @@ BASE_FEATURE(kLogAccountEnhancedProtectionStateInProtegoPings,
+ BASE_FEATURE(kOnDeviceNotificationContentDetectionModel,
+              "OnDeviceNotificationContentDetectionModel",
+              base::FEATURE_DISABLED_BY_DEFAULT);
++SET_CROMITE_FEATURE_DISABLED(kOnDeviceNotificationContentDetectionModel);
+ 
+ constexpr base::FeatureParam<int>
+     kOnDeviceNotificationContentDetectionModelAllowlistSamplingRate{
 diff --git a/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc b/cromite_flags/chrome/browser/browser_features_cc/Disable-all-predictors-code.inc
 new file mode 100644
 --- /dev/null
@@ -730,7 +792,7 @@ diff --git a/services/webnn/features.gni b/services/webnn/features.gni
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
-@@ -643,6 +643,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
+@@ -642,6 +642,7 @@ void DocumentSpeculationRules::UpdateSpeculationCandidates() {
      return;
    }
  
@@ -741,7 +803,7 @@ diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculat
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3346,7 +3346,7 @@
+@@ -3363,7 +3363,7 @@
        //
        // It also has some feature params defined throughout the codebase.
        name: "Prerender2",

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

@@ -6,18 +6,18 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java     | 1 +
  chrome/browser/ui/browser_ui_prefs.cc                           | 2 +-
- .../ui/views/user_education/browser_feature_promo_controller.cc | 1 +
+ .../views/profiles/profile_picker_feature_promo_controller.cc   | 1 +
+ .../user_education/impl/browser_feature_promo_controller_20.cc  | 1 +
  .../chrome/browser/user_education/UserEducationHelper.java      | 1 +
- components/user_education/common/feature_promo_controller.cc    | 1 +
- components/user_education/common/feature_promo_registry.cc      | 1 +
- .../browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc     | 1 +
- 7 files changed, 7 insertions(+), 1 deletion(-)
- create mode 100755 cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc
+ .../common/feature_promo/feature_promo_registry.cc              | 2 ++
+ .../common/feature_promo/impl/feature_promo_controller_20.cc    | 1 +
+ .../common/feature_promo/impl/feature_promo_controller_25.cc    | 1 +
+ 8 files changed, 9 insertions(+), 1 deletion(-)
 
 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
-@@ -1361,6 +1361,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1379,6 +1379,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
      }
  
      private boolean maybeShowPromo(Profile profile) {
@@ -37,12 +37,23 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_u
    registry->RegisterBooleanPref(
        prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, true);
    registry->RegisterBooleanPref(prefs::kScreenCaptureAllowed, true);
-diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
---- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
-+++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
-@@ -82,6 +82,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const {
+diff --git a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
+--- a/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
++++ b/chrome/browser/ui/views/profiles/profile_picker_feature_promo_controller.cc
+@@ -38,6 +38,7 @@ ui::ElementContext ProfilePickerFeaturePromoController::GetAnchorContext()
  
- bool BrowserFeaturePromoController::CanShowPromoForElement(
+ bool ProfilePickerFeaturePromoController::CanShowPromoForElement(
+     ui::TrackedElement* anchor_element) const {
++  if ((true)) return false;
+   return ProfilePicker::IsOpen();
+ }
+ 
+diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
+--- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
++++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
+@@ -59,6 +59,7 @@ ui::ElementContext BrowserFeaturePromoController20::GetAnchorContext() const {
+ 
+ bool BrowserFeaturePromoController20::CanShowPromoForElement(
      ui::TrackedElement* anchor_element) const {
 +  if ((true)) return false;
    // Trying to show an IPH while the browser is closing can cause problems;
@@ -51,28 +62,17 @@ diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_contro
 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
-@@ -126,6 +126,7 @@ public class UserEducationHelper {
+@@ -117,6 +117,7 @@ public class UserEducationHelper {
      }
  
-     private void showIPH(Tracker tracker, IPHCommand iphCommand) {
+     private void showIph(Tracker tracker, IphCommand iphCommand) {
 +        if ((true)) return;
          // Activity was destroyed; don't show IPH.
          View anchorView = iphCommand.anchorView;
          if (mActivity == null
-diff --git a/components/user_education/common/feature_promo_controller.cc b/components/user_education/common/feature_promo_controller.cc
---- a/components/user_education/common/feature_promo_controller.cc
-+++ b/components/user_education/common/feature_promo_controller.cc
-@@ -640,6 +640,7 @@ FeaturePromoResult FeaturePromoControllerCommon::CanShowPromoCommon(
-     const FeaturePromoSpecification** display_spec_out,
-     std::unique_ptr<FeaturePromoLifecycle>* lifecycle_out,
-     ui::TrackedElement** anchor_element_out) const {
-+  if ((true)) return FeaturePromoResult::kBlockedByContext;
-   const bool for_demo = source == ShowSource::kDemo;
- 
-   // Ensure that this promo isn't already queued for startup.
-diff --git a/components/user_education/common/feature_promo_registry.cc b/components/user_education/common/feature_promo_registry.cc
---- a/components/user_education/common/feature_promo_registry.cc
-+++ b/components/user_education/common/feature_promo_registry.cc
+diff --git a/components/user_education/common/feature_promo/feature_promo_registry.cc b/components/user_education/common/feature_promo/feature_promo_registry.cc
+--- a/components/user_education/common/feature_promo/feature_promo_registry.cc
++++ b/components/user_education/common/feature_promo/feature_promo_registry.cc
 @@ -20,6 +20,7 @@ FeaturePromoRegistry& FeaturePromoRegistry::operator=(
  FeaturePromoRegistry::~FeaturePromoRegistry() = default;
  
@@ -81,10 +81,34 @@ diff --git a/components/user_education/common/feature_promo_registry.cc b/compon
    const base::Feature* const iph_feature = spec.feature();
    CHECK(iph_feature);
    CHECK_NE(FeaturePromoSpecification::PromoType::kUnspecified,
-diff --git a/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc b/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc
-new file mode 100755
---- /dev/null
-+++ b/cromite_flags/chrome/browser/ui/ui_features_cc/Disable-all-promo-dialogs.inc
-@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_DISABLED(kChromeLabs);
+@@ -35,6 +36,7 @@ NewBadgeRegistry& NewBadgeRegistry::operator=(
+ NewBadgeRegistry::~NewBadgeRegistry() = default;
+ 
+ void NewBadgeRegistry::RegisterFeature(NewBadgeSpecification spec) {
++  if ((true)) return;
+   const base::Feature* const iph_feature = spec.feature;
+   CHECK(iph_feature);
+   FeatureRegistry<NewBadgeSpecification>::RegisterFeature(*iph_feature,
+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
+@@ -89,6 +89,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
+     const FeaturePromoParams& params,
+     ShowSource source,
+     CanShowPromoOutputs* outputs) const {
++  if ((true)) return FeaturePromoResult::kBlockedByContext;
+   const bool for_demo = source == ShowSource::kDemo;
+ 
+   // Ensure that this promo isn't already queued for startup.
+diff --git a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
+--- a/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
++++ b/components/user_education/common/feature_promo/impl/feature_promo_controller_25.cc
+@@ -48,6 +48,7 @@ FeaturePromoResult FeaturePromoController25::CanShowPromoCommon(
+     const FeaturePromoParams& params,
+     ShowSource source,
+     CanShowPromoOutputs* outputs) const {
++  if ((true)) return FeaturePromoResult::kBlockedByContext;
+   return FeaturePromoResult::kError;
+ }
+ 
 --

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

@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  .../render_view_context_menu_base.cc          |   3 -
  .../aggregatable_report_sender.cc             |  15 +-
  .../aggregation_service_features.cc           |   1 +
- .../attribution_data_host_manager_impl.cc     |   1 +
+ .../attribution_data_host_manager_impl.cc     |   2 +
  .../attribution_reporting/attribution_host.cc |   1 +
  .../attribution_os_level_manager.cc           |   3 +-
  .../attribution_report_network_sender.cc      |   9 +
@@ -37,14 +37,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   |  10 +-
  ui/events/android/motion_event_android.cc     |   8 +-
- 26 files changed, 78 insertions(+), 382 deletions(-)
+ 26 files changed, 79 insertions(+), 382 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
-@@ -1337,6 +1337,7 @@ network::mojom::AttributionSupport
+@@ -1321,6 +1321,7 @@ network::mojom::AttributionSupport
  AwContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -52,7 +52,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:
-@@ -1355,6 +1356,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1339,6 +1340,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -93,7 +93,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"/>
      <!--
-@@ -1136,9 +1135,6 @@ by a child template that "extends" this file.
+@@ -1128,9 +1127,6 @@ by a child template that "extends" this file.
              android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
          </activity>
  
@@ -118,8 +118,8 @@ diff --git a/components/attribution_reporting/aggregatable_trigger_config.cc b/c
 diff --git a/components/attribution_reporting/features.cc b/components/attribution_reporting/features.cc
 --- a/components/attribution_reporting/features.cc
 +++ b/components/attribution_reporting/features.cc
-@@ -29,4 +29,5 @@ BASE_FEATURE(kAttributionScopes,
-              "AttributionScopes",
+@@ -29,4 +29,5 @@ BASE_FEATURE(kAttributionAggregatableNamedBudgets,
+              "AttributionAggregatableNamedBudgets",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kConversionMeasurement);
@@ -137,7 +137,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
-@@ -509,9 +509,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
+@@ -521,9 +521,6 @@ RenderViewContextMenuBase::GetOpenURLParamsWithExtraHeaders(
  
    open_url_params.source_site_instance = site_instance_;
  
@@ -181,7 +181,7 @@ diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b
 diff --git a/content/browser/aggregation_service/aggregation_service_features.cc b/content/browser/aggregation_service/aggregation_service_features.cc
 --- a/content/browser/aggregation_service/aggregation_service_features.cc
 +++ b/content/browser/aggregation_service/aggregation_service_features.cc
-@@ -20,4 +20,5 @@ BASE_FEATURE(kPrivacySandboxAggregationServiceFilteringIds,
+@@ -14,4 +14,5 @@ BASE_FEATURE(kPrivacySandboxAggregationServiceFilteringIds,
               "PrivacySandboxAggregationServiceFilteringIds",
               base::FEATURE_ENABLED_BY_DEFAULT);
  
@@ -190,18 +190,19 @@ diff --git a/content/browser/aggregation_service/aggregation_service_features.cc
 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
-@@ -1155,6 +1155,7 @@ void AttributionDataHostManagerImpl::ParseHeader(
+@@ -1112,6 +1112,8 @@ void AttributionDataHostManagerImpl::ParseHeader(
+     Registrations& registrations,
      HeaderPendingDecode pending_decode,
      Registrar registrar) {
-   CHECK(it != registrations_.end());
 +  if ((true)) return;
- 
-   switch (it->eligibility()) {
++
+   switch (registrations.eligibility()) {
      case RegistrationEligibility::kSourceOrTrigger:
+       break;
 diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
 --- a/content/browser/attribution_reporting/attribution_host.cc
 +++ b/content/browser/attribution_reporting/attribution_host.cc
-@@ -257,6 +257,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -312,6 +312,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
      return;
    }
  
@@ -234,7 +235,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
 @@ -144,6 +144,9 @@ void AttributionReportNetworkSender::SendReport(GURL url,
                                                  url::Origin origin,
-                                                 const std::string& body,
+                                                 std::string body,
                                                  UrlLoaderCallback callback) {
 +  // this is never called on Bromite but nothing would be sent if it were
 +  if ((true)) return;
@@ -242,7 +243,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
    auto resource_request = std::make_unique<network::ResourceRequest>();
    resource_request->url = std::move(url);
    resource_request->method = net::HttpRequestHeaders::kPostMethod;
-@@ -218,6 +221,12 @@ void AttributionReportNetworkSender::OnReportSent(
+@@ -219,6 +222,12 @@ void AttributionReportNetworkSender::OnReportSent(
      ReportSentCallback sent_callback,
      UrlLoaderList::iterator it,
      scoped_refptr<net::HttpResponseHeaders> headers) {
@@ -258,7 +259,7 @@ diff --git a/content/browser/attribution_reporting/attribution_report_network_se
 diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc
 --- a/content/browser/attribution_reporting/attribution_storage_sql.cc
 +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
-@@ -507,6 +507,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -535,6 +535,8 @@ void AssignSourceForDeactivationOrDeletion(
    }
  }
  
@@ -267,7 +268,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
  }  // namespace
  
  // static
-@@ -529,9 +531,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -557,9 +559,9 @@ bool AttributionStorageSql::Transaction::Commit() {
  AttributionStorageSql::AttributionStorageSql(
      const base::FilePath& user_data_directory,
      AttributionResolverDelegate* delegate)
@@ -302,7 +303,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
-@@ -196,8 +196,6 @@ android_library("content_full_java") {
+@@ -197,8 +197,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",
@@ -776,7 +777,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
-@@ -569,6 +569,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -581,6 +581,7 @@ void ContentBrowserClient::OnAuctionComplete(
  network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
      AttributionReportingOsApiState state,
      bool client_os_disabled) {
@@ -784,7 +785,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;
-@@ -586,13 +587,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -598,13 +599,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -800,7 +801,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
  }
  
  bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -600,7 +601,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -612,7 +613,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
      content::RenderFrameHost* rfh,
      const url::Origin& context_origin,
      const url::Origin& reporting_origin) {
@@ -875,7 +876,7 @@ diff --git a/services/network/public/cpp/attribution_utils.cc b/services/network
 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
-@@ -1590,7 +1590,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1562,7 +1562,7 @@ void Page::UpdateBrowsingContextGroup(
  
  void Page::SetAttributionSupport(
      network::mojom::AttributionSupport attribution_support) {
@@ -887,7 +888,7 @@ diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/re
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -284,7 +284,7 @@
+@@ -275,7 +275,7 @@
      {
        // Interest Group JS API/runtimeflag.
        name: "AdInterestGroupAPI",
@@ -896,7 +897,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        origin_trial_feature_name: "AdInterestGroupAPI",
        implied_by: ["Fledge", "Parakeet"],
        public: true,
-@@ -412,15 +412,15 @@
+@@ -417,15 +417,15 @@
      },
      {
        name: "AttributionReporting",
@@ -914,7 +915,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
      },
      {
        // This only exists so we can use RuntimeEnabled in the IDL file
-@@ -4273,15 +4273,15 @@
+@@ -4329,15 +4329,15 @@
      },
      {
        name: "TopicsAPI",
@@ -930,12 +931,12 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
        public: true,
 -      status: "stable",
      },
-     {
-       name: "TopLevelTpcd",
+     // This is a killswitch for the behavior where popover.showPopover() and
+     // dialog.showModal() throw DOM exceptions if the document isn't active.
 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
-@@ -389,8 +389,12 @@ MotionEventAndroid::ToolType MotionEventAndroid::FromAndroidToolType(
+@@ -383,8 +383,12 @@ MotionEventAndroid::ToolType MotionEventAndroid::FromAndroidToolType(
  #undef TOOL_TYPE_CASE
  
  base::TimeTicks MotionEventAndroid::FromAndroidTime(base::TimeTicks time) {

build/patches/Disable-crash-reporting.patch

@@ -11,7 +11,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
-@@ -2737,15 +2737,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2745,15 +2745,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
          base::NumberToString(pid));
    }
  #endif

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
-@@ -140,4 +140,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
+@@ -135,4 +135,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
           !base::FeatureList::IsEnabled(kWebFeedKillSwitch);
  }
  

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

@@ -120,8 +120,8 @@ diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/s
 diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 --- a/chrome/browser/metrics/chrome_browser_sampling_trials.cc
 +++ b/chrome/browser/metrics/chrome_browser_sampling_trials.cc
-@@ -55,6 +55,8 @@ void CreateFallbackSamplingTrial(
-     const int sampled_in_rate_per_mille,
+@@ -60,6 +60,8 @@ void CreateFallbackSamplingTrial(
+     const int reporting_full_rate_per_mille,
      const bool starts_active,
      base::FeatureList* feature_list) {
 +  if ((true))
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_sampling_trials.cc b/chrome/b
    scoped_refptr<base::FieldTrial> trial(
        base::FieldTrialList::FactoryGetFieldTrial(
            trial_name, /*total_probability=*/1000, "Default", entropy_provider));
-@@ -98,6 +100,8 @@ void CreateFallbackUkmSamplingTrial(
+@@ -111,6 +113,8 @@ void CreateFallbackUkmSamplingTrial(
      const base::FieldTrial::EntropyProvider& entropy_provider,
      bool is_stable_channel,
      base::FeatureList* feature_list) {
@@ -141,7 +141,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
-@@ -851,7 +851,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
+@@ -852,7 +852,6 @@ void SystemNetworkContextManager::AddSSLConfigToNetworkContextParams(
  
  void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(
      network::mojom::NetworkContextParams* network_context_params) {
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 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
-@@ -194,6 +194,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
+@@ -189,6 +189,9 @@ std::string WebDXFeaturesToStringForDebug(const std::set<int32_t>& features) {
  
  UkmRecorderImpl::UkmRecorderImpl()
      : sampling_seed_(static_cast<uint32_t>(base::RandUint64())) {
@@ -221,10 +221,10 @@ diff --git a/components/variations/android/java/src/org/chromium/components/vari
      }
  
      private void recordFetchResultOrCode(int resultOrCode) {
-@@ -551,7 +525,7 @@ public class VariationsSeedFetcher {
-      * @param currInfo optional currently saved seed info to set the `If-None-Match` header.
+@@ -552,7 +526,7 @@ public class VariationsSeedFetcher {
       * @return the object holds the request result and seed data with its related header fields.
       */
+     @SuppressWarnings("Finally")
 -    public SeedFetchInfo downloadContent(SeedFetchParameters params, SeedInfo currInfo) {
 +    private SeedFetchInfo downloadContent(SeedFetchParameters params, SeedInfo currInfo) {
          SeedFetchInfo fetchInfo = new SeedFetchInfo();
@@ -280,17 +280,17 @@ 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
-@@ -331,9 +332,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
+@@ -327,9 +328,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
                               safe_seed_manager, synthetic_trial_registry);
    }
  
 -  platform_field_trials->SetUpClientSideFieldTrials(
--      used_seed, *entropy_providers, feature_list.get());
+-      used_seed, entropy_providers, feature_list.get());
 -
    platform_field_trials->RegisterFeatureOverrides(feature_list.get());
  
    base::FeatureList::SetInstance(std::move(feature_list));
-@@ -630,6 +628,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
+@@ -626,6 +624,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
      base::FeatureList* feature_list,
      SafeSeedManagerBase* safe_seed_manager,
      SyntheticTrialRegistry* synthetic_trial_registry) {
@@ -298,7 +298,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c
    // This histogram name uses "VariationsFieldTrialCreator" rather than
    // "VariationsFieldTrialCreatorBase" for consistency with historical data
    TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
-@@ -746,6 +745,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
+@@ -742,6 +741,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed(
  
  void VariationsFieldTrialCreatorBase::LoadSeedFromJsonFile(
      const base::FilePath& json_seed_path) {
@@ -309,7 +309,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
-@@ -227,17 +227,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -225,17 +225,8 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
  // Variations seed fetching is only enabled in official Chrome builds, if a URL
  // is specified on the command line, and for testing.
  bool IsFetchingEnabled() {
@@ -329,7 +329,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
-@@ -628,7 +619,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -634,7 +625,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.
@@ -402,7 +402,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
-@@ -207,13 +207,6 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -208,13 +208,6 @@ WebVector<int> CopyInitiatorOriginTrials(
      const Vector<mojom::blink::OriginTrialFeature>&
          initiator_origin_trial_features) {
    WebVector<int> result;

build/patches/Disable-idle-detection.patch

@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-@@ -320,6 +320,7 @@
+@@ -326,6 +326,7 @@
      {
        name: "IdleDetection",
        permissions_policy_name: "idle-detection",
@@ -55,7 +55,7 @@ diff --git a/third_party/blink/renderer/modules/idle/idle_detector.idl b/third_p
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -2364,6 +2364,11 @@
+@@ -2359,6 +2359,11 @@
        name: "HTMLSelectElementShowPicker",
        status: "stable",
      },

build/patches/Disable-lock-icon-in-address-bar-by-default.patch

@@ -1,24 +0,0 @@
-From: csagan5 <32685696+csagan5@users.noreply.github.com>
-Date: Fri, 8 Oct 2021 00:30:26 +0200
-Subject: Disable lock icon in address bar by default
-
-License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
----
- components/omnibox/common/omnibox_features.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/components/omnibox/common/omnibox_features.cc b/components/omnibox/common/omnibox_features.cc
---- a/components/omnibox/common/omnibox_features.cc
-+++ b/components/omnibox/common/omnibox_features.cc
-@@ -250,8 +250,8 @@ BASE_FEATURE(kOmniboxAssistantVoiceSearch,
- // used, on non-Android platforms this is controlled through the
- // ChromeRefresh2023 flag.
- BASE_FEATURE(kUpdatedConnectionSecurityIndicators,
--             "OmniboxUpdatedConnectionSecurityIndicators",
--             ENABLED);
-+             "OmniboxUpdatedConnectionSecurityIndicators",    // enabled by default
-+             ENABLED);               // in Bromite
- 
- // Feature used to default typed navigations to use HTTPS instead of HTTP.
- // This only applies to navigations that don't have a scheme such as
---

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

@@ -15,7 +15,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
 --- a/chrome/browser/media/router/media_router_feature.cc
 +++ b/chrome/browser/media/router/media_router_feature.cc
-@@ -113,6 +113,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
+@@ -116,6 +116,7 @@ void ClearMediaRouterStoredPrefsForTesting() {
  }
  
  bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -23,7 +23,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
  #if !BUILDFLAG(IS_ANDROID)
    if (!base::FeatureList::IsEnabled(kMediaRouter))
      return false;
-@@ -157,7 +158,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -160,7 +161,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
                                 PrefRegistry::PUBLIC);
    registry->RegisterBooleanPref(
@@ -32,8 +32,8 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
    registry->RegisterBooleanPref(
        media_router::prefs::kMediaRouterShowCastSessionsStartedByOtherDevices,
        true);
-@@ -221,4 +222,7 @@ std::optional<base::TimeDelta> GetCastMirroringPlayoutDelay() {
- 
+@@ -227,4 +228,7 @@ bool IsCastMessageLoggingEnabled() {
+ }
  #endif  // !BUILDFLAG(IS_ANDROID)
  
 +#if !BUILDFLAG(IS_ANDROID)
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browse
 diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -423,7 +423,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -427,7 +427,7 @@ void ProfileImpl::RegisterProfilePrefs(
  #endif
  
    registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -562,6 +562,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -560,6 +560,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
    WebRuntimeFeatures::EnableBackForwardCache(
        content::IsBackForwardCacheEnabled());
  
@@ -67,7 +67,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 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
-@@ -94,7 +94,7 @@ KURL GetAvailabilityUrl(const WebURL& source,
+@@ -94,7 +94,7 @@ KURL GetAvailabilityUrl(const KURL& source,
  }
  
  bool IsBackgroundAvailabilityMonitoringDisabled() {
@@ -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
-@@ -3514,14 +3514,10 @@
+@@ -3533,14 +3533,10 @@
        base_feature: "none",
      },
      {

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

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

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

@@ -9,16 +9,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
  .../ShareSheetBottomSheetContent.java         |  4 +-
  .../EphemeralTabSheetContent.java             |  3 +-
  .../chrome_location_bar_model_delegate.cc     |  2 +-
- .../ui/views/page_info/page_info_main_view.cc | 67 ++++++++++---------
+ .../ui/views/page_info/page_info_main_view.cc | 68 ++++++++++---------
  .../components/bookmarks/BookmarkItem.java    |  1 +
  .../omnibox/browser/titled_url_match_utils.cc |  2 +-
  .../page_info/PageInfoController.java         |  3 +-
- 7 files changed, 41 insertions(+), 41 deletions(-)
+ 7 files changed, 42 insertions(+), 41 deletions(-)
 
 diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
 +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
-@@ -267,9 +267,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
+@@ -269,9 +269,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
              ShareSheetLinkToggleCoordinator shareSheetLinkToggleCoordinator) {
          // Default preview is to show title + url.
          String title = mParams.getTitle();
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
 diff --git a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
 --- a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
 +++ b/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome/browser/ephemeraltab/EphemeralTabSheetContent.java
-@@ -234,8 +234,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
+@@ -235,8 +235,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
      /** Sets the ephemeral tab URL. */
      public void updateURL(GURL url) {
          TextView originView = mToolbarView.findViewById(R.id.origin);
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/ui/android/ephemeraltab/java/src/org/chromium/chrome
 diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
 +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
-@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
+@@ -255,5 +255,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
  // static
  void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/c
 diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
 --- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
-@@ -575,38 +575,41 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
+@@ -575,38 +575,42 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
  }
  
  std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
@@ -94,10 +94,11 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
 +  auto cromite_header = std::make_unique<views::ScrollView>();
 +  cromite_header->SetVerticalScrollBarMode(views::ScrollView::ScrollBarMode::kHiddenButEnabled);
 +  cromite_header->SetHorizontalScrollBarMode(views::ScrollView::ScrollBarMode::kDisabled);
-+  cromite_header->ClipHeightTo(0, 150);
++  cromite_header->ClipHeightTo(0, 30);
 +  auto scroll_contents = std::make_unique<views::View>();
 +  scroll_contents->SetLayoutManager(std::make_unique<views::FlexLayout>())
-+      ->SetInteriorMargin(gfx::Insets::VH(0, 20));
++      ->SetInteriorMargin(gfx::Insets::VH(0, 20))
++      .SetCollapseMargins(true);
 +  title_ = scroll_contents->AddChildView(std::make_unique<views::Label>(
 +      std::u16string(), views::style::CONTEXT_DIALOG_TITLE,
 +      views::style::STYLE_HEADLINE_4,

build/patches/Disable-plugins-enumeration.patch

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

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

@@ -26,7 +26,7 @@ diff --git a/third_party/blink/renderer/core/css/media_query_exp.cc b/third_part
 diff --git a/third_party/blink/renderer/core/css/parser/media_query_parser.cc b/third_party/blink/renderer/core/css/parser/media_query_parser.cc
 --- a/third_party/blink/renderer/core/css/parser/media_query_parser.cc
 +++ b/third_party/blink/renderer/core/css/parser/media_query_parser.cc
-@@ -81,8 +81,8 @@ class MediaQueryFeatureSet : public MediaQueryParser::FeatureSet {
+@@ -82,8 +82,8 @@ class MediaQueryFeatureSet : public MediaQueryParser::FeatureSet {
             feature == media_feature_names::kUpdateMediaFeature ||
             (feature == media_feature_names::kPrefersReducedDataMediaFeature &&
              RuntimeEnabledFeatures::PrefersReducedDataEnabled()) ||
@@ -51,7 +51,7 @@ diff --git a/third_party/blink/renderer/core/preferences/preference_manager.idl
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3333,6 +3333,10 @@
+@@ -3349,6 +3349,10 @@
        name: "PrefersReducedData",
        status: "experimental",
      },

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

@@ -65,7 +65,7 @@ diff --git a/chrome/browser/password_manager/android/password_store_android_loca
 diff --git a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
 --- a/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
 +++ b/chrome/browser/password_manager/generated_password_leak_detection_pref.cc
-@@ -20,8 +20,7 @@ namespace {
+@@ -22,8 +22,7 @@ namespace {
  
  // Returns whether the user can use the leak detection feature.
  bool IsUserAllowedToUseLeakDetection(Profile* profile) {
@@ -156,7 +156,7 @@ diff --git a/components/password_manager/core/browser/leak_detection/leak_detect
 diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
 --- a/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
 +++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_impl.cc
-@@ -192,8 +192,7 @@ bool LeakDetectionCheckImpl::HasAccountForRequest(
+@@ -194,8 +194,7 @@ bool LeakDetectionCheckImpl::HasAccountForRequest(
      const signin::IdentityManager* identity_manager) {
    // On desktop HasPrimaryAccount(signin::ConsentLevel::kSignin) will
    // always return something if the user is signed in.

build/patches/Disable-privacy-sandbox.patch

@@ -36,7 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -3509,6 +3509,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -3520,6 +3520,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
      const url::Origin* destination_origin,
      const url::Origin* reporting_origin,
      bool* can_bypass) {
@@ -81,7 +81,7 @@ diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service.cc
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1409,7 +1409,7 @@ void RegisterProfilePrefsForMigration(
+@@ -1337,7 +1337,7 @@ void RegisterProfilePrefsForMigration(
    registry->RegisterTimePref(kPlusAddressLastFetchedTime, base::Time());
  
    // Deprecated 03/2024.
@@ -93,15 +93,15 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_service_impl.cc
-@@ -626,7 +626,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
- void PrivacySandboxServiceImpl::SetFirstPartySetsDataAccessEnabled(
+@@ -612,7 +612,7 @@ bool PrivacySandboxServiceImpl::IsRestrictedNoticeEnabled() {
+ void PrivacySandboxServiceImpl::SetRelatedWebsiteSetsDataAccessEnabled(
      bool enabled) {
    pref_service_->SetBoolean(prefs::kPrivacySandboxRelatedWebsiteSetsEnabled,
 -                            enabled);
 +                            false);
  }
  
- bool PrivacySandboxServiceImpl::IsFirstPartySetsDataAccessEnabled() const {
+ bool PrivacySandboxServiceImpl::IsRelatedWebsiteSetsDataAccessEnabled() const {
 diff --git a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
 --- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
 +++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
@@ -149,7 +149,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
 diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
 --- a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc
-@@ -395,8 +395,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
+@@ -402,8 +402,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed(
    if (attestations_map.has_value() &&
        (!file_version_.IsValid() || file_version_.CompareTo(version) < 0)) {
      // Parsing succeeded and the attestations file has newer version.
@@ -161,9 +161,9 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san
 diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc
 --- a/components/privacy_sandbox/privacy_sandbox_features.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_features.cc
-@@ -253,4 +253,8 @@ BASE_FEATURE(kPrivacySandboxSentimentSurvey,
- const base::FeatureParam<std::string> kPrivacySandboxSentimentSurveyTriggerId{
-     &kPrivacySandboxSentimentSurvey, "sentiment-survey-trigger-id", ""};
+@@ -250,4 +250,8 @@ BASE_FEATURE(kPrivacySandboxAdsApiUxEnhancements,
+              "PrivacySandboxAdsApiUxEnhancements",
+              base::FEATURE_DISABLED_BY_DEFAULT);
  
 +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxSettings4);
 +SET_CROMITE_FEATURE_ENABLED(kDisablePrivacySandboxPrompts);
@@ -182,19 +182,19 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_prefs.cc b/components/pr
  
    registry->RegisterTimePref(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                               base::Time());
-@@ -49,7 +49,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
-   registry->RegisterBooleanPref(
-       prefs::kPrivacySandboxFirstPartySetsDataAccessAllowedInitialized, false);
+@@ -50,7 +50,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+       prefs::kPrivacySandboxRelatedWebsiteSetsDataAccessAllowedInitialized,
+       false);
    registry->RegisterBooleanPref(
 -      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, true,
 +      prefs::kPrivacySandboxRelatedWebsiteSetsEnabled, false,  // must be disabled
        user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
- 
-   registry->RegisterBooleanPref(prefs::kPrivacySandboxTopicsConsentGiven,
+   registry->RegisterTimePref(
+       prefs::kPrivacySandboxFakeNoticePromptShownTimeSync, base::Time(),
 diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 --- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
 +++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
-@@ -129,7 +129,7 @@ std::set<browsing_topics::Topic> GetTopicsSetFromString(
+@@ -131,7 +131,7 @@ std::set<browsing_topics::Topic> GetTopicsSetFromString(
  
  // static
  bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -203,7 +203,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
  }
  
  // static
-@@ -254,7 +254,8 @@ PrivacySandboxSettingsImpl::GetFinchPrioritizedTopics() {
+@@ -259,7 +259,8 @@ PrivacySandboxSettingsImpl::GetFinchPrioritizedTopics() {
    return finch_prioritized_topics_;
  }
  
@@ -213,7 +213,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    Status status = GetM1TopicAllowedStatus();
    JoinHistogram(kIsTopicsAllowedHistogram, status);
    return IsAllowed(status);
-@@ -286,7 +287,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
+@@ -291,7 +292,8 @@ bool PrivacySandboxSettingsImpl::IsTopicsAllowedForContext(
    return IsAllowed(status);
  }
  
@@ -223,7 +223,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    const auto& blocked_topics =
        pref_service_->GetList(prefs::kPrivacySandboxBlockedTopics);
  
-@@ -488,6 +490,7 @@ bool PrivacySandboxSettingsImpl::
+@@ -494,6 +496,7 @@ bool PrivacySandboxSettingsImpl::
  void PrivacySandboxSettingsImpl::SetFledgeJoiningAllowed(
      const std::string& top_frame_etld_plus1,
      bool allowed) {
@@ -231,7 +231,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    ScopedDictPrefUpdate scoped_pref_update(
        pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
  
-@@ -559,7 +562,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
+@@ -565,7 +568,8 @@ void PrivacySandboxSettingsImpl::ClearFledgeJoiningAllowedSettings(
  }
  
  bool PrivacySandboxSettingsImpl::IsFledgeJoiningAllowed(
@@ -241,7 +241,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    ScopedDictPrefUpdate scoped_pref_update(
        pref_service_, prefs::kPrivacySandboxFledgeJoinBlocked);
    auto& pref_data = scoped_pref_update.Get();
-@@ -906,7 +910,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
+@@ -908,7 +912,10 @@ void PrivacySandboxSettingsImpl::SetDelegateForTesting(
    delegate_ = std::move(delegate);
  }
  
@@ -253,7 +253,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    pref_service_->SetTime(prefs::kPrivacySandboxTopicsDataAccessibleSince,
                           base::Time::Now());
  
-@@ -919,6 +926,7 @@ PrivacySandboxSettingsImpl::Status
+@@ -921,6 +928,7 @@ PrivacySandboxSettingsImpl::Status
  PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
      const url::Origin& top_frame_origin,
      const GURL& url) const {
@@ -261,7 +261,7 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc b/compo
    // Relying on |host_content_settings_map_| instead of |cookie_settings_|
    // allows to query whether the site associated with the |url| is allowed to
    // access Site data (aka ContentSettingsType::COOKIES) without considering any
-@@ -933,6 +941,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
+@@ -935,6 +943,7 @@ PrivacySandboxSettingsImpl::GetSiteAccessAllowedStatus(
  PrivacySandboxSettingsImpl::Status
  PrivacySandboxSettingsImpl::GetPrivacySandboxAllowedStatus(
      bool should_ignore_restriction /*=false*/) const {
@@ -320,7 +320,7 @@ new file mode 100644
 diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
 --- a/third_party/blink/common/features.cc
 +++ b/third_party/blink/common/features.cc
-@@ -2740,6 +2740,7 @@ BASE_FEATURE(kReleaseResourceDecodedDataOnMemoryPressure,
+@@ -2871,6 +2871,7 @@ BASE_FEATURE(kReleaseResourceDecodedDataOnMemoryPressure,
  // constants for features in the section above.
  
  bool IsAllowURNsInIframeEnabled() {

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

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

build/patches/Disable-remote-altsvc-for-h3-connections.patch

@@ -26,7 +26,7 @@ diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_p
 diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc
 --- a/net/http/http_stream_factory_job_controller.cc
 +++ b/net/http/http_stream_factory_job_controller.cc
-@@ -1308,11 +1308,7 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal(
+@@ -1307,11 +1307,7 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal(
      // single user on a multi-user system to hijack the alternate protocol.
      // These systems also enforce ports <1024 as restricted ports.  So don't
      // allow protocol upgrades to user-controllable ports.
@@ -39,7 +39,7 @@ diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stre
        continue;
      }
  
-@@ -1356,8 +1352,7 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal(
+@@ -1355,8 +1351,7 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal(
  
      GURL destination = CreateAltSvcUrl(
          original_url, alternative_service_info.host_port_pair());
@@ -52,7 +52,7 @@ diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stre
 diff --git a/net/quic/quic_context.h b/net/quic/quic_context.h
 --- a/net/quic/quic_context.h
 +++ b/net/quic/quic_context.h
-@@ -202,7 +202,7 @@ struct NET_EXPORT QuicParams {
+@@ -203,7 +203,7 @@ struct NET_EXPORT QuicParams {
    bool allow_server_migration = true;
    // If true, allows QUIC to use alternative services with a different
    // hostname from the origin.

build/patches/Disable-safety-check.patch

@@ -7,16 +7,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  chrome/android/BUILD.gn                       |  5 ---
  chrome/android/chrome_java_sources.gni        |  1 -
  .../android/java/res/xml/main_preferences.xml |  5 ---
- .../settings/FragmentDependencyProvider.java  | 37 -------------------
- .../settings/SettingsNavigationImpl.java      | 13 +------
+ .../settings/FragmentDependencyProvider.java  | 36 -------------------
+ .../settings/SettingsNavigationImpl.java      | 13 ++-----
  chrome/browser/BUILD.gn                       |  1 -
  .../suggestions/action/OmniboxPedal.java      |  3 --
- 7 files changed, 2 insertions(+), 63 deletions(-)
+ 7 files changed, 2 insertions(+), 62 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -435,7 +435,6 @@ if (current_toolchain == default_toolchain) {
+@@ -444,7 +444,6 @@ if (current_toolchain == default_toolchain) {
        "//chrome/browser/recent_tabs:helper_java",
        "//chrome/browser/recent_tabs:java",
        "//chrome/browser/safe_browsing/android:java",
@@ -24,7 +24,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
        "//chrome/browser/safety_hub/android:java",
        "//chrome/browser/screenshot_monitor:java",
        "//chrome/browser/search_engines/android:java",
-@@ -1099,8 +1098,6 @@ if (current_toolchain == default_toolchain) {
+@@ -1121,8 +1120,6 @@ if (current_toolchain == default_toolchain) {
        "//chrome/browser/recent_tabs:java",
        "//chrome/browser/recent_tabs:junit",
        "//chrome/browser/recent_tabs/internal:junit",
@@ -33,7 +33,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
        "//chrome/browser/safety_hub/android:java",
        "//chrome/browser/safety_hub/android:junit",
        "//chrome/browser/screenshot_monitor:java",
-@@ -1772,8 +1769,6 @@ if (current_toolchain == default_toolchain) {
+@@ -1801,8 +1798,6 @@ if (current_toolchain == default_toolchain) {
        "//chrome/browser/readaloud/android:java",
        "//chrome/browser/safe_browsing/android:java",
        "//chrome/browser/safe_browsing/android:javatests",
@@ -45,7 +45,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 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
-@@ -985,7 +985,6 @@ chrome_java_sources = [
+@@ -980,7 +980,6 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
    "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsNavigation.java",
@@ -107,7 +107,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
          if (fragment instanceof PasswordCheckFragmentView) {
              PasswordCheckComponentUiFactory.create(
                      (PasswordCheckFragmentView) fragment,
-@@ -260,18 +238,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -260,17 +238,6 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
              ((AutofillLocalIbanEditor) fragment)
                      .setModalDialogManagerSupplier(mModalDialogManagerSupplier);
          }
@@ -116,8 +116,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
 -                    new SafetyHubModuleDelegateImpl(
 -                            mProfile,
 -                            mModalDialogManagerSupplier,
--                            SigninAndHistorySyncActivityLauncherImpl.get(),
--                            SyncConsentActivityLauncherImpl.get()));
+-                            SigninAndHistorySyncActivityLauncherImpl.get()));
 -            // TODO(crbug.com/40751023): Create a shared interface for fragments that need access to
 -            // LaunchIntentDispatcher::createCustomTabActivityIntent.
 -            safetyHubFragment.setCustomTabIntentHelper(
@@ -126,7 +125,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Fragme
          if (fragment instanceof INeedSnackbarManager) {
              ((INeedSnackbarManager)fragment).setSnackbarManagerSupplier(mSnackbarManagerSupplier);
          }
-@@ -286,8 +252,5 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
+@@ -285,8 +252,5 @@ public class FragmentDependencyProvider extends FragmentManager.FragmentLifecycl
          if (fragment instanceof ManageSyncSettings) {
              ((ManageSyncSettings) fragment).setSnackbarManagerSupplier(mSnackbarManagerSupplier);
          }
@@ -175,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -3301,7 +3301,6 @@ static_library("browser") {
+@@ -3273,7 +3273,6 @@ static_library("browser") {
        "//chrome/browser/reading_list/android",
        "//chrome/browser/recent_tabs:jni_headers",
        "//chrome/browser/safe_browsing/android:safe_browsing_enums",

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

@@ -44,7 +44,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearc
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -212,6 +212,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -213,6 +213,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
      &kCCTExtendTrustedCdnPublisher,
      &kCCTFeatureUsage,
      &kCCTEphemeralMode,
@@ -55,7 +55,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -489,6 +489,7 @@ public abstract class ChromeFeatureList {
+@@ -471,6 +471,7 @@ public abstract class ChromeFeatureList {
      public static final String SHARE_CUSTOM_ACTIONS_IN_CCT = "ShareCustomActionsInCCT";
      public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid";
      public static final String SEED_ACCOUNTS_REVAMP = "SeedAccountsRevamp";
@@ -66,7 +66,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
-@@ -1087,7 +1087,6 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+@@ -1090,7 +1090,6 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
      public boolean canWebSearch() {
          return hasSelection()
                  && !isFocusedNodeEditable()

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

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1593,7 +1593,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1591,7 +1591,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
        site_isolation::prefs::kWebTriggeredIsolatedOrigins);
    registry->RegisterDictionaryPref(
        prefs::kDevToolsBackgroundServicesExpirationDict);

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

@@ -31,7 +31,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -1693,7 +1693,7 @@ ChromeContentRendererClient::CreateWorkerContentSettingsClient(
+@@ -1674,7 +1674,7 @@ ChromeContentRendererClient::CreateWorkerContentSettingsClient(
  std::unique_ptr<media::SpeechRecognitionClient>
  ChromeContentRendererClient::CreateSpeechRecognitionClient(
      content::RenderFrame* render_frame) {

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

@@ -22,10 +22,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
 +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
-@@ -378,7 +378,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
+@@ -376,7 +376,7 @@ void PrefsTabHelper::RegisterProfilePrefs(
+       prefs::kEnableReferrers,
+       !base::FeatureList::IsEnabled(features::kNoReferrers));
    registry->RegisterBooleanPref(prefs::kEnableEncryptedMedia, true);
-   registry->RegisterStringPref(prefs::kPrefixedVideoFullscreenApiAvailability,
-                                "runtime-enabled");
 -  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, true);
 +  registry->RegisterBooleanPref(prefs::kScrollToTextFragmentEnabled, false);
  #if BUILDFLAG(IS_ANDROID)
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -288,6 +288,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -284,6 +284,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
  #endif
            {wf::EnableTouchDragAndContextMenu,
             raw_ref(features::kTouchDragAndContextMenu)},
@@ -74,7 +74,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -4520,9 +4520,14 @@ void Document::SetURL(const KURL& url) {
+@@ -4536,9 +4536,14 @@ void Document::SetURL(const KURL& url) {
                           TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT,
                           "url", new_url.GetString().Utf8());
  
@@ -92,7 +92,7 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -4214,10 +4214,9 @@
+@@ -4259,10 +4259,9 @@
      },
      {
        name: "TextFragmentIdentifiers",

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

@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/origin_trials/origin_trial_policy_impl.
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -9177,7 +9177,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
+@@ -9195,7 +9195,6 @@ void NavigationRequest::SetSourceSiteInstanceToInitiatorIfNeeded() {
  void NavigationRequest::ForceEnableOriginTrials(
      const std::vector<std::string>& trials) {
    DCHECK(!HasCommitted());
@@ -116,7 +116,7 @@ diff --git a/content/browser/renderer_host/origin_trial_state_host_impl.cc b/con
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -540,10 +540,6 @@ void FillNavigationParamsRequest(
+@@ -538,10 +538,6 @@ void FillNavigationParamsRequest(
          common_params.initiator_origin.value();
    }
  
@@ -127,7 +127,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    navigation_params->was_discarded = commit_params.was_discarded;
    navigation_params->document_ukm_source_id =
        commit_params.document_ukm_source_id;
-@@ -571,12 +567,6 @@ void FillNavigationParamsRequest(
+@@ -569,12 +565,6 @@ void FillNavigationParamsRequest(
    navigation_params->had_transient_user_activation =
        common_params.has_user_gesture;
  
@@ -140,7 +140,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    if (!commit_params.early_hints_preloaded_resources.empty()) {
      navigation_params->early_hints_preloaded_resources = WebVector<WebURL>();
      for (const auto& resource : commit_params.early_hints_preloaded_resources) {
-@@ -637,11 +627,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -635,11 +625,6 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
            info->url_request.GetURLRequestExtraData().get());
    DCHECK(url_request_extra_data);
  
@@ -152,7 +152,7 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_fra
    blink::NavigationDownloadPolicy download_policy;
    download_policy.ApplyDownloadFramePolicy(
        info->is_opener_navigation, info->url_request.HasUserGesture(),
-@@ -669,7 +654,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
+@@ -667,7 +652,7 @@ blink::mojom::CommonNavigationParamsPtr MakeCommonNavigationParams(
        info->url_request.HasUserGesture(),
        info->url_request.HasTextFragmentToken(),
        info->should_check_main_world_content_security_policy,
@@ -204,7 +204,7 @@ diff --git a/third_party/blink/common/origin_trials/trial_token_validator.cc b/t
 diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
 --- a/third_party/blink/renderer/core/loader/document_loader.cc
 +++ b/third_party/blink/renderer/core/loader/document_loader.cc
-@@ -193,13 +193,6 @@ namespace {
+@@ -194,13 +194,6 @@ namespace {
  Vector<mojom::blink::OriginTrialFeature> CopyInitiatorOriginTrials(
      const WebVector<int>& initiator_origin_trial_features) {
    Vector<mojom::blink::OriginTrialFeature> result;
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -213,18 +206,12 @@ WebVector<int> CopyInitiatorOriginTrials(
+@@ -214,18 +207,12 @@ WebVector<int> CopyInitiatorOriginTrials(
  Vector<String> CopyForceEnabledOriginTrials(
      const WebVector<WebString>& force_enabled_origin_trials) {
    Vector<String> result;
@@ -237,7 +237,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
    return result;
  }
  
-@@ -3195,10 +3182,6 @@ void DocumentLoader::CreateParserPostCommit() {
+@@ -3243,10 +3230,6 @@ void DocumentLoader::CreateParserPostCommit() {
      }
  #endif  // BUILDFLAG(IS_CHROMEOS)
  
@@ -263,7 +263,7 @@ diff --git a/third_party/blink/renderer/core/loader/http_equiv.cc b/third_party/
 diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
 --- a/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
 +++ b/third_party/blink/renderer/core/origin_trials/origin_trial_context.cc
-@@ -313,6 +313,9 @@ void OriginTrialContext::AddToken(const String& token) {
+@@ -312,6 +312,9 @@ void OriginTrialContext::AddToken(const String& token) {
  void OriginTrialContext::AddTokenFromExternalScript(
      const String& token,
      const Vector<scoped_refptr<SecurityOrigin>>& external_origins) {
@@ -273,7 +273,7 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
    Vector<OriginInfo> script_origins;
    for (const scoped_refptr<SecurityOrigin>& origin : external_origins) {
      OriginInfo origin_info = {.origin = origin,
-@@ -450,8 +453,6 @@ bool OriginTrialContext::InstallSettingFeature(
+@@ -449,8 +452,6 @@ bool OriginTrialContext::InstallSettingFeature(
  }
  
  void OriginTrialContext::AddFeature(mojom::blink::OriginTrialFeature feature) {
@@ -282,7 +282,7 @@ diff --git a/third_party/blink/renderer/core/origin_trials/origin_trial_context.
  }
  
  bool OriginTrialContext::IsFeatureEnabled(
-@@ -495,6 +496,7 @@ void OriginTrialContext::AddForceEnabledTrials(
+@@ -494,6 +495,7 @@ void OriginTrialContext::AddForceEnabledTrials(
  }
  
  bool OriginTrialContext::CanEnableTrialFromName(const StringView& trial_name) {

build/patches/Disable-update-scheduler.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/background_task_scheduler/ChromeBackgroundTaskFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/background_task_scheduler/ChromeBackgroundTaskFactory.java
-@@ -68,7 +68,7 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
+@@ -69,7 +69,7 @@ public class ChromeBackgroundTaskFactory implements BackgroundTaskFactory {
              case TaskIds.WEBAPK_UPDATE_JOB_ID:
                  return new WebApkUpdateTask();
              case TaskIds.COMPONENT_UPDATE_JOB_ID:

build/patches/Disable-various-metrics.patch

@@ -92,7 +92,7 @@ diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/br
 diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
 --- a/chrome/browser/browser_process_impl.cc
 +++ b/chrome/browser/browser_process_impl.cc
-@@ -1122,7 +1122,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -1121,7 +1121,7 @@ void BrowserProcessImpl::RegisterPrefs(PrefRegistrySimple* registry) {
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
  
    registry->RegisterBooleanPref(metrics::prefs::kMetricsReportingEnabled,
@@ -112,7 +112,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #include "chrome/browser/media/audio_service_util.h"
  #include "chrome/browser/media/prefs/capture_device_ranking.h"
  #include "chrome/browser/media/router/media_router_feature.h"
-@@ -5357,16 +5356,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -5362,16 +5361,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      content::NavigationHandle* handle) {
    std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
  
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
  #if BUILDFLAG(IS_ANDROID)
    // TODO(davidben): This is insufficient to integrate with prerender properly.
    // https://crbug.com/370595
-@@ -5488,10 +5477,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -5493,10 +5482,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
      }
    }
  
@@ -157,7 +157,7 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/
 diff --git a/chrome/browser/ui/search/ntp_user_data_logger.cc b/chrome/browser/ui/search/ntp_user_data_logger.cc
 --- a/chrome/browser/ui/search/ntp_user_data_logger.cc
 +++ b/chrome/browser/ui/search/ntp_user_data_logger.cc
-@@ -394,8 +394,6 @@ void NTPUserDataLogger::LogMostVisitedImpression(
+@@ -384,8 +384,6 @@ void NTPUserDataLogger::LogMostVisitedImpression(
  
  void NTPUserDataLogger::LogMostVisitedNavigation(
      const ntp_tiles::NTPTileImpression& impression) {
@@ -166,7 +166,7 @@ diff --git a/chrome/browser/ui/search/ntp_user_data_logger.cc b/chrome/browser/u
    // Records the action. This will be available as a time-stamped stream
    // server-side and can be used to compute time-to-long-dwell.
    base::RecordAction(base::UserMetricsAction("MostVisited_Clicked"));
-@@ -424,10 +422,8 @@ void NTPUserDataLogger::EmitNtpStatistics(base::TimeDelta load_time,
+@@ -414,10 +412,8 @@ void NTPUserDataLogger::EmitNtpStatistics(base::TimeDelta load_time,
      if (!impression.has_value()) {
        break;
      }

build/patches/Disable-visited-pseudo-class.patch

@@ -54,7 +54,7 @@ diff --git a/components/visitedlink/browser/visitedlink_writer.cc b/components/v
 diff --git a/components/visitedlink/common/visitedlink_common.cc b/components/visitedlink/common/visitedlink_common.cc
 --- a/components/visitedlink/common/visitedlink_common.cc
 +++ b/components/visitedlink/common/visitedlink_common.cc
-@@ -79,6 +79,7 @@ bool VisitedLinkCommon::IsVisited(const GURL& link_url,
+@@ -78,6 +78,7 @@ bool VisitedLinkCommon::IsVisited(const GURL& link_url,
  }
  
  bool VisitedLinkCommon::IsVisited(Fingerprint fingerprint) const {

build/patches/Disallow-Android-App-Scheme-as-referrer.patch

@@ -9,7 +9,7 @@ Subject: Disallow Android App Scheme as referrer
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
-@@ -572,11 +572,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
+@@ -569,11 +569,6 @@ void ChromeContentRendererClient::RenderThreadStarted() {
    // TODO(nyquist): Add test to ensure this happens when the flag is set.
    WebSecurityPolicy::RegisterURLSchemeAsDisplayIsolated(dom_distiller_scheme);
  

build/patches/Do-not-build-API-keys-infobar.patch

@@ -11,7 +11,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -1201,8 +1201,6 @@ static_library("ui") {
+@@ -1164,8 +1164,6 @@ static_library("ui") {
        "startup/default_browser_prompt/default_browser_prompt_manager.h",
        "startup/default_browser_prompt/default_browser_prompt_prefs.cc",
        "startup/default_browser_prompt/default_browser_prompt_prefs.h",

build/patches/Do-not-compile-QR-code-sharing.patch

@@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -3664,7 +3664,6 @@ generate_jni("chrome_jni_headers") {
+@@ -3694,7 +3694,6 @@ generate_jni("chrome_jni_headers") {
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/link_to_text/LinkToTextBridge.java",
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabService.java",
      "../browser/share/android/java/src/org/chromium/chrome/browser/share/long_screenshots/bitmap_generation/LongScreenshotsTabServiceFactory.java",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
-@@ -121,7 +121,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
+@@ -123,7 +123,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
  import org.chromium.chrome.browser.share.ShareUtils;
  import org.chromium.chrome.browser.share.page_info_sheet.PageInfoSharingControllerImpl;
  import org.chromium.chrome.browser.share.page_info_sheet.PageSummaryButtonController;
@@ -38,7 +38,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
  import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
  import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
  import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
-@@ -589,10 +588,6 @@ public class RootUiCoordinator
+@@ -591,10 +590,6 @@ public class RootUiCoordinator
      }
  
      public void onAttachFragment(Fragment fragment) {
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -1937,7 +1937,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1900,7 +1900,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(prefs::kUiAutomationProviderEnabled, false);
  #endif
  
@@ -75,7 +75,7 @@ diff --git a/chrome/browser/share/BUILD.gn b/chrome/browser/share/BUILD.gn
 diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java
 --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java
 +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/ChromeProvidedSharingOptionsProviderBase.java
-@@ -20,7 +20,6 @@ import org.chromium.chrome.browser.profiles.Profile;
+@@ -21,7 +21,6 @@ import org.chromium.chrome.browser.profiles.Profile;
  import org.chromium.chrome.browser.share.ChromeShareExtras.DetailedContentType;
  import org.chromium.chrome.browser.share.ShareContentTypeHelper.ContentType;
  import org.chromium.chrome.browser.share.ShareMetricsUtils.ShareCustomAction;
@@ -83,7 +83,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
  import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
  import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfCoordinator;
  import org.chromium.chrome.browser.share.share_sheet.ChromeOptionShareCallback;
-@@ -291,9 +290,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
+@@ -292,9 +291,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
      }
  
      private void maybeAddQrCodeFirstPartyOption() {
@@ -93,7 +93,7 @@ diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/s
      }
  
      private void maybeAddLongScreenshotFirstPartyOption() {
-@@ -424,25 +420,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
+@@ -428,25 +424,6 @@ public abstract class ChromeProvidedSharingOptionsProviderBase {
                  .build();
      }
  
@@ -155,7 +155,7 @@ diff --git a/chrome/browser/sharing_hub/sharing_hub_features.cc b/chrome/browser
 diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
 --- a/chrome/browser/ui/browser_command_controller.cc
 +++ b/chrome/browser/ui/browser_command_controller.cc
-@@ -1783,10 +1783,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
+@@ -1782,10 +1782,10 @@ void BrowserCommandController::UpdateCommandsForFullscreenMode() {
    command_updater_.UpdateCommandEnabled(IDC_CHROME_WHATS_NEW, show_main_ui);
  #endif
    command_updater_.UpdateCommandEnabled(IDC_CONTENT_CONTEXT_SHARING_SUBMENU,
@@ -172,7 +172,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui
 diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
 --- a/chrome/browser/ui/browser_commands.cc
 +++ b/chrome/browser/ui/browser_commands.cc
-@@ -1683,6 +1683,7 @@ void SendTabToSelf(Browser* browser) {
+@@ -1680,6 +1680,7 @@ void SendTabToSelf(Browser* browser) {
  }
  
  bool CanGenerateQrCode(const Browser* browser) {

build/patches/Do-not-link-with-libatomic.patch

@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/base/BUILD.gn b/base/BUILD.gn
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -1099,7 +1099,7 @@ component("base") {
+@@ -1079,7 +1079,7 @@ component("base") {
    # more robust check for this.
    if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
        host_toolchain != "//build/toolchain/cros:host") {