[AUTO][FILECONTROL] - version 149.0.7827.59

[TOOLS] Removed xdg-mime and xdg-settings from linux release
ungoogled-chromium: Disable translate integration: fix desktop build
2026-06-03 06:50:25 +00:00 · 2026-05-21 17:55:57 +02:00 · 2026-05-20 17:40:29 +02:00 · 2026-05-19 15:40:33 +02:00 · 2026-05-19 12:46:35 +02:00 · 2026-05-19 12:43:30 +02:00
710 changed files with 44043 additions and 46711 deletions
@@ -93,6 +93,7 @@ body:
      multiple: false
      description: What version of Android are you running?
      options:
+        - Android 16
        - Android 15
        - Android 14
        - Android 13
@@ -148,6 +148,36 @@ jobs:
            fi
          fi

+      - name: Create issue ${{ env.VERSION }}
+        if: "${{ env.NEW_VERSION != '' }}"
+        shell: bash
+        run: |
+          GH=../../gh_2.18.1_linux_amd64/bin/gh
+          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
+          tar xfz gh_2.18.1_linux_amd64.tar.gz
+
+          cd cromite/tools
+          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
+
+          echo Custom Release $CHR_VERSION >body.txt
+
+          if [[ "$LATEST_WIN" == "$CHR_VERSION" ]]; then
+             echo Using Windows Release >body.txt
+             echo "\`\`\`" >>body.txt
+             curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Windows&num=10&offset=0' | \
+                 jq --arg LATEST "$LATEST_WIN" '.[] | select( .version == $LATEST )' >>body.txt
+             echo "\`\`\`" >>body.txt
+          fi
+
+          if [[ "$LATEST_ANDROID" == "$CHR_VERSION" ]]; then
+             echo Using Android Release >body.txt
+             echo "\`\`\`" >>body.txt
+             curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Android&num=10&offset=0' | \
+                 jq --arg LATEST "$LATEST_ANDROID" '.[] | select( .version == $LATEST )' >>body.txt
+             echo "\`\`\`" >>body.txt
+          fi
+          $GH issue create -t "$CHR_VERSION: new chromium version" -F body.txt
+
      - name: Update files under control 
        shell: bash
        run: |
@@ -196,34 +226,4 @@ jobs:
          title: '[AUTO][FILECONTROL] - version ${{ env.NEW_VERSION }}'
          body: ${{ env.MESSAGE }}
          delete-branch: true
-          branch-suffix: short-commit-hash
-
-      - name: Create issue ${{ env.VERSION }}
-        if: "${{ env.NEW_VERSION != '' }}"
-        shell: bash
-        run: |
-          GH=../../gh_2.18.1_linux_amd64/bin/gh
-          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
-          tar xfz gh_2.18.1_linux_amd64.tar.gz
-
-          cd cromite/tools
-          echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
-
-          echo Custom Release $CHR_VERSION >body.txt
-
-          if [[ "$LATEST_WIN" == "$CHR_VERSION" ]]; then
-             echo Using Windows Release >body.txt
-             echo "\`\`\`" >>body.txt
-             curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Windows&num=10&offset=0' | \
-                 jq --arg LATEST "$LATEST_WIN" '.[] | select( .version == $LATEST )' >>body.txt
-             echo "\`\`\`" >>body.txt
-          fi
-
-          if [[ "$LATEST_ANDROID" == "$CHR_VERSION" ]]; then
-             echo Using Android Release >body.txt
-             echo "\`\`\`" >>body.txt
-             curl -s 'https://chromiumdash.appspot.com/fetch_releases?channel=Stable&platform=Android&num=10&offset=0' | \
-                 jq --arg LATEST "$LATEST_ANDROID" '.[] | select( .version == $LATEST )' >>body.txt
-             echo "\`\`\`" >>body.txt
-          fi
-          $GH issue create -t "$CHR_VERSION: new chromium version" -F body.txt
+          branch-suffix: short-commit-hash
@@ -134,7 +134,6 @@ jobs:
          cp "/win_sdk/sdks/Win11SDK_10.0.26100.0/Windows Kits/10/Redist/D3D/x64/d3dcompiler_47.dll" chrome-win/
          cp $OUTPUTFILE_WIN/elevation_service.exe chrome-win/
          cp "$OUTPUTFILE_WIN/First Run" chrome-win/
-          cp $OUTPUTFILE_WIN/headless_lib_data.pak chrome-win/
          cp $OUTPUTFILE_WIN/icudtl.dat chrome-win/
          cp $OUTPUTFILE_WIN/libEGL.dll chrome-win/
          cp $OUTPUTFILE_WIN/libGLESv2.dll chrome-win/
@@ -156,6 +155,10 @@ jobs:
          $GH release upload $VERSION-$CROMITE_SHA chrome-win.zip
          echo "::endgroup::"

+          TIMESTAMP=$(date +%s -r chrome-win.zip)
+          echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$CROMITE_SHA"
+          $GH release upload $VERSION-$CROMITE_SHA updateurl.txt
+
          ## linux
          echo "::group::-------- linux x64"
          mkdir chrome-lin/
@@ -175,8 +178,6 @@ jobs:
          cp $OUTPUTFILE_LIN/product_logo_48.png chrome-lin/
          cp $OUTPUTFILE_LIN/resources.pak chrome-lin/
          cp $OUTPUTFILE_LIN/snapshot_blob.bin chrome-lin/
-          cp $OUTPUTFILE_LIN/xdg-mime chrome-lin/
-          cp $OUTPUTFILE_LIN/xdg-settings chrome-lin/
          cp $OUTPUTFILE_LIN/chrome_sandbox chrome-lin/

          tar -czvf chrome-lin64.tar.gz chrome-lin/
@@ -206,10 +207,6 @@ jobs:
          $GH release upload $VERSION-$CROMITE_SHA arm64_SystemWebViewShell.apk
          echo "::endgroup::"

-          TIMESTAMP=$(date +%s -r chrome-win.zip)
-          echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/cromite/releases;download=https://github.com/uazo/cromite/releases/latest/download/chrome-win.zip;version=$(cat $OUTPUTFILE_WIN/RELEASE);revision=1;commit=$CROMITE_SHA"
-          $GH release upload $VERSION-$CROMITE_SHA updateurl.txt
-
          $GH release edit $VERSION-$CROMITE_SHA -t $VERSION-$CROMITE_SHA

          if [ $IS_DRAFT == "false" ]; then
@@ -1 +1 @@
-145.0.7632.76
+148.0.7778.168
@@ -1,7 +1,6 @@
 android_channel="stable"
 blink_symbol_level=1
 build_contextual_search=false
-build_with_tflite_lib=false
 chrome_pgo_phase=0
 dcheck_always_on=false
 disable_fieldtrial_testing_config=true
@@ -20,10 +19,8 @@ rtc_build_examples=false
 symbol_level=1
 treat_warnings_as_errors=true
 use_debug_fission=true
-use_errorprone_java_compiler=false
 use_official_google_api_keys=false
 use_rtti=false
-webview_includes_weblayer=false
 enable_arcore=false
 enable_openxr=false
 enable_cardboard=false
@@ -82,9 +79,6 @@ enable_request_header_integrity = false
 # Disable precompiled headers because they are incompatible with the unsafe_buffers configuration
 enable_precompiled_headers = false

-# Disable integration with Gemini
-enable_glic = false
-
 # Disable TFLite with XNNPACK
 build_tflite_with_xnnpack = false

@@ -105,6 +99,8 @@ if (target_os == "android") {

  chrome_pgo_phase = 2 # enable pgo

+  use_errorprone_java_compiler = false
+
  # do not split Developer UI split into a separate Dynamic Feature Module
  dfmify_dev_ui = false

@@ -244,7 +244,7 @@ Always-allow-inspect-fallback.patch
 Add-PartialLowEndModeOnMidRangeDevices-flag.patch
 Use-list-mode-for-tab-switcher.patch
 Chrome-web-store-protection.patch
-Enable-search-engine-settings-desktop-ui.patch
+Enables-keyword-based-site-search-on-Android-devices.patch
 Disable-Android-AppRestrictions.patch
 Customize-selection-popup.patch
 Enables-deactivation-of-the-js-debugger-statement.patch
@@ -305,6 +305,9 @@ Disable-device-bound-session.patch
 Keep-disabled-CpuPerformance.patch
 Immediately-destroy-shared-workers-when-closing-the-page.patch
 Disable-minikin-hyphenation.patch
+Disable-integration-with-Gemini.patch
+Disable-AppRating.patch
+Enable-Android-DevTools-Frontend.patch

 # temporary or wip patches
 Temp-disable-predictive-back-gesture.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
-@@ -260,6 +260,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
+@@ -256,6 +256,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.SelectionPopupController;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 import org.chromium.printing.PrintManagerDelegateImpl;
 import org.chromium.printing.PrintingController;
 import org.chromium.printing.PrintingControllerImpl;
-@@ -1118,6 +1119,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -1137,6 +1138,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         super.onStartWithNative();
 
         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -196,6 +196,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -206,6 +206,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &feed::kFeedNoViewCache,
     &feed::kFeedPerformanceStudy,
     &feed::kFeedRecyclerBinderUnmountOnDetach,
@@ -51,31 +51,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
 diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
 +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
-@@ -167,6 +167,7 @@ public abstract class ChromeFeatureList {
+@@ -168,6 +168,7 @@ public abstract class ChromeFeatureList {
             "AccountForSuppressedKeyboardInsets";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
             "AdaptiveButtonInTopToolbarCustomizationV2";
 +    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
             "AdaptiveButtonInTopToolbarPageSummary";
-     public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =
-@@ -795,6 +796,8 @@ public abstract class ChromeFeatureList {
-     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
-             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
+     // Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by
+@@ -836,6 +837,8 @@ public abstract class ChromeFeatureList {
+     public static final CachedFlag sAndroidXrImmersivePlayer =
+             newCachedFlag(ANDROID_XR_IMMERSIVE_PLAYER, false);
     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
 +    public static final CachedFlag sAllowUserCertificates =
 +            newCachedFlag(ALLOW_USER_CERTIFICATES, false);
     public static final CachedFlag sAppSpecificHistoryViewIntent =
             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
     public static final CachedFlag sAsyncNotificationManager =
-@@ -1121,6 +1124,7 @@ public abstract class ChromeFeatureList {
-                     // keep-sorted start
+@@ -1217,6 +1220,7 @@ public abstract class ChromeFeatureList {
                     sAccountForSuppressedKeyboardInsets,
                     sAndroidAnimatedProgressBarInBrowser,
+                     sAndroidApb144Patch1,
 +                    sAllowUserCertificates,
-                     sAndroidAppIntegrationModule,
-                     sAndroidAppIntegrationMultiDataSource,
-                     sAndroidAutoMintedTwa,
+                     sAndroidApb144Patch2,
+                     sAndroidApb144Patch3,
+                     sAndroidApb144Patch4,
 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
@@ -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
-@@ -917,6 +917,12 @@ public class KeyboardShortcuts {
+@@ -939,6 +939,12 @@ public class KeyboardShortcuts {
                     KeyEvent.KEYCODE_ESCAPE,
                     KeyEvent.META_CTRL_ON);
         }
@@ -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
-@@ -401,6 +401,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
+@@ -403,6 +403,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
       }
     }
 
@@ -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
-@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() {
+@@ -199,6 +199,10 @@ bool IsReducePPMsEnabled() {
   return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
 }
 
@@ -37,7 +37,7 @@ diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_p
 #include "content/renderer/render_process_impl.h"
 
 #include "build/build_config.h"
-@@ -122,10 +123,18 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -123,10 +124,18 @@ RenderProcessImpl::RenderProcessImpl()
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisallowV8FeatureFlagOverrides);
   if (!disallow_v8_feature_flag_overrides) {
@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -264,6 +264,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
+@@ -246,6 +246,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
           {wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
           {wf::EnablePeriodicBackgroundSync,
            raw_ref(features::kPeriodicBackgroundSync)},
@@ -40,7 +40,7 @@ new file mode 100644
 diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
 --- a/device/gamepad/public/cpp/gamepad_features.cc
 +++ b/device/gamepad/public/cpp/gamepad_features.cc
-@@ -53,4 +53,12 @@ bool IsGamepadMultitouchEnabled() {
+@@ -59,4 +59,12 @@ bool IsGamepadMultitouchEnabled() {
   return false;
 }
 
@@ -56,16 +56,16 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ
 diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
 --- a/device/gamepad/public/cpp/gamepad_features.h
 +++ b/device/gamepad/public/cpp/gamepad_features.h
-@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
- GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
-     kEnableSimulatedGamepadDataFetcher);
+@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
 GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kGamepadRawInputChangeEvent);
+ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
+     kClaimDuplicateGamepadsProductIdentifier);
 +GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);
 
 #if BUILDFLAG(IS_WIN)
 GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kIgnorePS5GamepadsInWgi);
-@@ -27,6 +28,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAllowlistHidrawGamepads);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -34,6 +35,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
+ #endif  // BUILDFLAG(IS_APPLE)
 
 GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
 +GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
@@ -93,7 +93,7 @@ diff --git a/third_party/blink/renderer/modules/gamepad/navigator_gamepad.cc b/t
   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.
-@@ -432,6 +436,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(
+@@ -433,6 +437,8 @@ void NavigatorGamepad::MaybeDispatchGamepadEvents(
 void NavigatorGamepad::DispatchGamepadConnectionChangedEvent(
     const AtomicString& event_name,
     Gamepad* gamepad) {
@@ -33,7 +33,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/ui/webui/chrome_web_ui_configs.cc |   5 +-
 chrome/browser/ui/webui/proxy_config_ui.cc    | 389 ++++++++++++++++++
 chrome/browser/ui/webui/proxy_config_ui.h     |  41 ++
- chrome/common/webui_url_constants.cc          |   2 +
+ chrome/common/webui_url_constants.cc          |   1 +
 chrome/common/webui_url_constants.h           |   2 +
 .../pref_proxy_config_tracker_impl.cc         |   5 +-
 .../proxy_config/proxy_config_dictionary.cc   |  30 +-
@@ -43,7 +43,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 net/proxy_resolution/pac_file_fetcher_impl.cc |   8 -
 net/proxy_resolution/proxy_config.cc          |  53 ++-
 net/proxy_resolution/proxy_config.h           |   3 +
- 27 files changed, 987 insertions(+), 27 deletions(-)
+ 27 files changed, 986 insertions(+), 27 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
@@ -80,7 +80,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
-@@ -105,6 +105,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -110,6 +110,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
-@@ -412,6 +412,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+@@ -420,6 +420,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
 #endif
   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -102,7 +102,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
 diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
 --- a/chrome/browser/browser_resources.grd
 +++ b/chrome/browser/browser_resources.grd
-@@ -237,6 +237,9 @@
+@@ -236,6 +236,9 @@
       <if expr="_google_chrome">
         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
       </if>
@@ -115,7 +115,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
-@@ -375,7 +375,7 @@ std::optional<base::Value::Dict> CreateProxyConfigDict(
+@@ -383,7 +383,7 @@ std::optional<base::DictValue> CreateProxyConfigDict(
         return std::nullopt;
       }
       return ProxyConfigDictionary::CreateFixedServers(proxy_rules_string,
@@ -152,7 +152,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr
 -  return std::make_unique<PrefProxyConfigTrackerImpl>(profile_prefs, nullptr);
 +  // Migrate from profile_prefs to local_state_prefs
 +  if (local_state_prefs->GetBoolean("proxy_migrated") == false) {
-+    const base::Value::Dict& dict =
+    const base::DictValue& dict =
 +        profile_prefs->GetDict(proxy_config::prefs::kProxy);
 +
 +    LOG(INFO) << "CreatePrefProxyConfigTrackerOfProfile: Migration from profile to local state";
@@ -199,7 +199,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
-@@ -206,6 +206,8 @@
+@@ -212,6 +212,8 @@
 #include "printing/buildflags/buildflags.h"
 #include "rlz/buildflags/buildflags.h"
 
@@ -208,7 +208,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
 #include "chrome/browser/background/extensions/background_mode_manager.h"
 #endif
-@@ -1355,6 +1357,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+@@ -1374,6 +1376,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
   component_updater::RegisterPrefs(registry);
   domain_reliability::RegisterPrefs(registry);
   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -663,7 +663,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
-@@ -161,6 +161,8 @@ static_library("ui") {
+@@ -156,6 +156,8 @@ static_library("ui") {
     "webui/metrics_internals/metrics_internals_ui.h",
     "webui/net_export_ui.cc",
     "webui/net_export_ui.h",
@@ -675,7 +675,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
 diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 --- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
 +++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
-@@ -59,6 +59,9 @@
+@@ -64,6 +64,9 @@
 #include "extensions/buildflags/buildflags.h"
 #include "printing/buildflags/buildflags.h"
 
@@ -685,10 +685,10 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
 #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
 #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
 #endif
-@@ -439,7 +442,7 @@ void RegisterChromeWebUIConfigs() {
-   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());
-   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());
- #endif
+@@ -453,7 +456,7 @@ void RegisterChromeWebUIConfigs() {
+   map.AddWebUIConfig(std::make_unique<SigninErrorUIConfig>());
+   map.AddWebUIConfig(std::make_unique<SigninEmailConfirmationUIConfig>());
+ #endif  //  !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
 -
 +  map.AddWebUIConfig(std::make_unique<ProxyConfigUIConfig>());
 #if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
@@ -774,9 +774,9 @@ new file mode 100644
 +  void RegisterMessages() override;
 +
 +  // Messages
-+  void OnEnableNotifyUIWithState(const base::Value::List& args);
-+  void OnApply(const base::Value::List& args);
-+  void OnClear(const base::Value::List& args);
+  void OnEnableNotifyUIWithState(const base::ListValue& args);
+  void OnApply(const base::ListValue& args);
+  void OnClear(const base::ListValue& args);
 +
 +  // net::ProxyConfigService::Observer implementation:
 +  // Calls ProxyConfigView.onProxyConfigChanged JavaScript function in the
@@ -793,7 +793,7 @@ new file mode 100644
 +  std::unique_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 +  bool is_observing_;
 +
-+  void encodeConfig(const net::ProxyConfig& config, base::Value::Dict& state);
+  void encodeConfig(const net::ProxyConfig& config, base::DictValue& state);
 +
 +  void apply(const net::ProxyConfig& config);
 +
@@ -833,7 +833,7 @@ new file mode 100644
 +  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
 +         !BrowserThread::IsThreadInitialized(BrowserThread::UI));
 +
-+  base::Value::Dict state;
+  base::DictValue state;
 +  bool pending = false;
 +  switch (availability) {
 +    case net::ProxyConfigService::CONFIG_VALID:
@@ -861,7 +861,7 @@ new file mode 100644
 +  return pacString;
 +}
 +
-+void ProxyConfigMessageHandler::encodeConfig(const net::ProxyConfig& config, base::Value::Dict& state) {
+void ProxyConfigMessageHandler::encodeConfig(const net::ProxyConfig& config, base::DictValue& state) {
 +  // when automatic settings are enabled they take precedence over manual settings
 +  // automatic settings are either the "auto-detect" flag or the existance of a PAC URL
 +
@@ -932,7 +932,7 @@ new file mode 100644
 +// The proxy configuration UI is not notified of state changes until this function runs.
 +// After this function, OnProxyConfigChanged() will be called on all proxy state changes.
 +void ProxyConfigMessageHandler::OnEnableNotifyUIWithState(
-+    const base::Value::List& list) {
+    const base::ListValue& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
 +  if (!is_observing_) {
@@ -954,23 +954,23 @@ new file mode 100644
 +  OnProxyConfigChanged(config, availability);
 +}
 +
-+void ProxyConfigMessageHandler::OnClear(const base::Value::List& list) {
+void ProxyConfigMessageHandler::OnClear(const base::ListValue& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
-+  const base::Value::Dict cfg = ProxyConfigDictionary::CreateSystem();
+  const base::DictValue cfg = ProxyConfigDictionary::CreateSystem();
 +  pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  pref_service_->CommitPendingWrite();
 +  OnEnableNotifyUIWithState(list);
 +}
 +
-+void ProxyConfigMessageHandler::OnApply(const base::Value::List& list) {
+void ProxyConfigMessageHandler::OnApply(const base::ListValue& list) {
 +  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 +
 +  if ((list.size() != 1) || !list[0].is_dict()) {
 +    return;
 +  }
 +
-+  const base::Value::Dict& config = list[0].GetDict();
+  const base::DictValue& config = list[0].GetDict();
 +
 +  if (config.FindBool("auto_detect").value_or(false)) {
 +    apply(net::ProxyConfig::CreateAutoDetect());
@@ -986,7 +986,7 @@ new file mode 100644
 +    return;
 +  }
 +
-+  const base::Value::Dict* rules = config.FindDict("rules");
+  const base::DictValue* rules = config.FindDict("rules");
 +  if (rules == nullptr)
 +    return;
 +
@@ -1023,7 +1023,7 @@ new file mode 100644
 +  } else if (*type == "direct") {
 +      proxyConfig.proxy_rules().type = net::ProxyConfig::ProxyRules::Type::EMPTY;
 +  } else if (*type == "none") {
-+      base::Value::List empty;
+      base::ListValue empty;
 +      OnClear(empty);
 +      return;
 +  } else {
@@ -1049,26 +1049,26 @@ new file mode 100644
 +
 +void ProxyConfigMessageHandler::apply(const net::ProxyConfig& proxyConfig) {
 +  if (proxyConfig.auto_detect()) {
-+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateAutoDetect();
+    const base::DictValue cfg = ProxyConfigDictionary::CreateAutoDetect();
 +    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else if (proxyConfig.has_pac_url()) {
-+    const base::Value::Dict cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
+    const base::DictValue cfg = ProxyConfigDictionary::CreatePacScript(proxyConfig.pac_url().spec(), proxyConfig.pac_mandatory());
 +    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else if (proxyConfig.proxy_rules().type == net::ProxyConfig::ProxyRules::Type::EMPTY) {
-+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateDirect();
+    const base::DictValue cfg = ProxyConfigDictionary::CreateDirect();
 +    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  } else {
 +    auto proxyRulesAsString = proxyConfig.proxy_rules().ToString();
 +    auto bypassRulesAsString = proxyConfig.proxy_rules().bypass_rules.ToString();
 +
 +    // fixed servers
-+    const base::Value::Dict cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
+    const base::DictValue cfg = ProxyConfigDictionary::CreateFixedServers(proxyRulesAsString,
 +                            bypassRulesAsString, proxyConfig.proxy_rules().reverse_bypass);
 +    pref_service_->SetDict(proxy_config::prefs::kProxy, cfg.Clone());
 +  }
 +  pref_service_->CommitPendingWrite();
 +
-+  base::Value::List empty;
+  base::ListValue empty;
 +  OnEnableNotifyUIWithState(empty);
 +}
 +
@@ -1137,15 +1137,7 @@ new file mode 100644
 diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc
 --- a/chrome/common/webui_url_constants.cc
 +++ b/chrome/common/webui_url_constants.cc
-@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {
-       kChromeUILockScreenNetworkHost,
-       kChromeUILockScreenStartReauthHost,
-       kChromeUIMobileSetupHost,
-+      kChromeUIProxyConfigHost,
-       kChromeUIMultiDeviceSetupHost,
-       kChromeUINetworkHost,
-       kChromeUINotificationTesterHost,
-@@ -74,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view host) {
+@@ -120,6 +120,7 @@ bool IsSystemWebUIHost(std::string_view host) {
 // These hosts will also be suggested by BuiltinProvider.
 base::span<const base::cstring_view> ChromeURLHosts() {
   static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({
@@ -1156,7 +1148,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
 diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
 --- a/chrome/common/webui_url_constants.h
 +++ b/chrome/common/webui_url_constants.h
-@@ -197,6 +197,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
+@@ -210,6 +210,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
 inline constexpr char kChromeUINewTabHost[] = "newtab";
 inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";
@@ -1186,7 +1178,7 @@ diff --git a/components/proxy_config/pref_proxy_config_tracker_impl.cc b/compone
   registry->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies, false);
   registry->RegisterListPref(proxy_config::prefs::kProxyOverrideRules);
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -699,6 +699,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
+@@ -705,6 +705,7 @@ bool PrefProxyConfigTrackerImpl::PrefConfigToNetConfig(
       if (proxy_dict.GetBypassList(&proxy_bypass)) {
         proxy_config.proxy_rules().bypass_rules.ParseFromString(proxy_bypass);
       }
@@ -1218,26 +1210,26 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 +  return value->GetBool();
 +}
 +
- const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
+ const base::DictValue& ProxyConfigDictionary::GetDictionary() const {
   return dict_;
 }
-@@ -83,13 +93,13 @@ const base::Value::Dict& ProxyConfigDictionary::GetDictionary() const {
+@@ -83,13 +93,13 @@ const base::DictValue& ProxyConfigDictionary::GetDictionary() const {
 // static
- base::Value::Dict ProxyConfigDictionary::CreateDirect() {
+ base::DictValue ProxyConfigDictionary::CreateDirect() {
   return CreateDictionary(ProxyPrefs::MODE_DIRECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
- base::Value::Dict ProxyConfigDictionary::CreateAutoDetect() {
+ base::DictValue ProxyConfigDictionary::CreateAutoDetect() {
   return CreateDictionary(ProxyPrefs::MODE_AUTO_DETECT, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
-@@ -97,16 +107,17 @@ base::Value::Dict ProxyConfigDictionary::CreatePacScript(
+@@ -97,16 +107,17 @@ base::DictValue ProxyConfigDictionary::CreatePacScript(
     const std::string& pac_url,
     bool pac_mandatory) {
   return CreateDictionary(ProxyPrefs::MODE_PAC_SCRIPT, pac_url, pac_mandatory,
@@ -1246,7 +1238,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
 }
 
 // static
- base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
+ base::DictValue ProxyConfigDictionary::CreateFixedServers(
     const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
@@ -1258,26 +1250,26 @@ diff --git a/components/proxy_config/proxy_config_dictionary.cc b/components/pro
   } else {
     return CreateDirect();
   }
-@@ -115,7 +126,7 @@ base::Value::Dict ProxyConfigDictionary::CreateFixedServers(
+@@ -115,7 +126,7 @@ base::DictValue ProxyConfigDictionary::CreateFixedServers(
 // static
- base::Value::Dict ProxyConfigDictionary::CreateSystem() {
+ base::DictValue ProxyConfigDictionary::CreateSystem() {
   return CreateDictionary(ProxyPrefs::MODE_SYSTEM, std::string(), false,
 -                          std::string(), std::string());
 +                          std::string(), std::string(), false);
 }
 
 // static
-@@ -124,7 +135,8 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
+@@ -124,7 +135,8 @@ base::DictValue ProxyConfigDictionary::CreateDictionary(
     const std::string& pac_url,
     bool pac_mandatory,
     const std::string& proxy_server,
 -    const std::string& bypass_list) {
 +    const std::string& bypass_list,
 +    bool reverse_bypass) {
-   base::Value::Dict dict;
+   base::DictValue dict;
   dict.Set(kProxyMode, base::Value(ProxyModeToString(mode)));
   if (!pac_url.empty()) {
-@@ -133,8 +145,10 @@ base::Value::Dict ProxyConfigDictionary::CreateDictionary(
+@@ -133,8 +145,10 @@ base::DictValue ProxyConfigDictionary::CreateDictionary(
   }
   if (!proxy_server.empty())
     dict.Set(kProxyServer, base::Value(proxy_server));
@@ -1298,27 +1290,27 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox
   bool HasBypassList() const;
 +  bool HasReverseBypass() const;
 
-   const base::Value::Dict& GetDictionary() const;
+   const base::DictValue& GetDictionary() const;
 
@@ -50,7 +51,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-   static base::Value::Dict CreatePacScript(const std::string& pac_url,
-                                            bool pac_mandatory);
-   static base::Value::Dict CreateFixedServers(const std::string& proxy_server,
-                                              const std::string& bypass_list);
-+                                              const std::string& bypass_list,
+   static base::DictValue CreatePacScript(const std::string& pac_url,
+                                          bool pac_mandatory);
+   static base::DictValue CreateFixedServers(const std::string& proxy_server,
+-                                            const std::string& bypass_list);
+                                            const std::string& bypass_list,
 +                                              bool reverse_bypass);
-   static base::Value::Dict CreateSystem();
+   static base::DictValue CreateSystem();
 
   // Encodes the proxy server as "<url-scheme>=<proxy-scheme>://<proxy>".
@@ -66,7 +68,8 @@ class PROXY_CONFIG_EXPORT ProxyConfigDictionary {
-                                             const std::string& pac_url,
-                                             bool pac_mandatory,
-                                             const std::string& proxy_server,
-                                            const std::string& bypass_list);
-+                                            const std::string& bypass_list,
+                                           const std::string& pac_url,
+                                           bool pac_mandatory,
+                                           const std::string& proxy_server,
+-                                          const std::string& bypass_list);
+                                          const std::string& bypass_list,
 +                                            bool reverse_bypass);
 
-   base::Value::Dict dict_;
+   base::DictValue dict_;
 };
 diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc
 --- a/components/proxy_config/proxy_policy_handler.cc
@@ -1347,7 +1339,7 @@ diff --git a/net/features.gni b/net/features.gni
 diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
 --- a/net/proxy_resolution/pac_file_fetcher_impl.cc
 +++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
-@@ -359,14 +359,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
+@@ -364,14 +364,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
     return false;
   }
 
@@ -14,16 +14,16 @@ 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 ++
- .../native_page/NativePageFactory.java        |   9 +-
- chrome/browser/BUILD.gn                       |  11 +-
+ .../app/bookmarks/BookmarkActivity.java       |  20 ++
+ .../native_page/NativePageFactory.java        |   7 +-
+ chrome/browser/BUILD.gn                       |   7 +
 .../bookmarks/android/bookmark_bridge.cc      | 193 ++++++++++++
 .../bookmarks/android/bookmark_bridge.h       |  30 +-
 .../browser/bookmarks/BookmarkBridge.java     |  39 +++
 .../browser/bookmarks/BookmarkDelegate.java   |  10 +
 .../bookmarks/BookmarkManagerCoordinator.java |   9 +
 .../bookmarks/BookmarkManagerMediator.java    | 283 ++++++++++++++++++
- .../browser/bookmarks/BookmarkPage.java       |   9 +-
+ .../browser/bookmarks/BookmarkPage.java       |   8 +-
 .../browser/bookmarks/BookmarkToolbar.java    |  27 ++
 .../bookmarks/BookmarkToolbarMediator.java    |   4 +
 .../bookmarks/BookmarkToolbarProperties.java  |   8 +-
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +
 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +
 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +
- 40 files changed, 806 insertions(+), 24 deletions(-)
+ 40 files changed, 790 insertions(+), 21 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
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu_improved.xml b/c
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java
-@@ -11,6 +11,7 @@ import org.chromium.base.supplier.ObservableSupplier;
+@@ -11,6 +11,7 @@ import org.chromium.base.supplier.NonNullObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.build.annotations.Nullable;
@@ -102,24 +102,24 @@ 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.back_press.BackPressManager;
 import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
-@@ -63,7 +64,7 @@ import java.util.function.Supplier;
+@@ -61,7 +62,7 @@ import java.util.function.Supplier;
  */
 @NullMarked
 public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
 -    private final Activity mActivity;
 +    private final ChromeActivity mActivity;
     private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
-     private final Supplier<ShareDelegate> mShareDelegateSupplier;
-     private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
-@@ -97,7 +98,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
+     private final Supplier<@Nullable ShareDelegate> mShareDelegateSupplier;
+     private final Supplier<@Nullable EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
+@@ -93,7 +94,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
     private final RecentlyClosedEntriesManager mRecentlyClosedEntriesManager;
 
     public TabbedModeTabDelegateFactory(
 -            Activity activity,
 +            ChromeActivity activity,
             BrowserControlsVisibilityDelegate appBrowserControlsVisibilityDelegate,
-             Supplier<ShareDelegate> shareDelegateSupplier,
-             Supplier<EphemeralTabCoordinator> ephemeralTabCoordinatorSupplier,
+             Supplier<@Nullable ShareDelegate> shareDelegateSupplier,
+             Supplier<@Nullable EphemeralTabCoordinator> ephemeralTabCoordinatorSupplier,
 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
@@ -132,50 +132,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
 import android.content.ComponentName;
 import android.content.Intent;
 import android.text.TextUtils;
-@@ -36,6 +38,9 @@ import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
- 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;
-+
- /**
-  * The activity that displays the bookmark UI on the phone. It keeps a {@link
-  * BookmarkManagerCoordinator} inside of it and creates a snackbar manager. This activity should
-@@ -51,6 +56,9 @@ public class BookmarkActivity extends SnackbarActivity {
-     private @Nullable BookmarkOpener mBookmarkOpener;
-     private @Nullable OnKeyDownHandler mOnKeyDownHandler;
- 
-+    private ActivityWindowAndroid mWindowAndroid;
-+    private IntentRequestTracker mIntentRequestTracker;
-+
-     @Override
-     protected void onProfileAvailable(Profile profile) {
-         super.onProfileAvailable(profile);
-@@ -84,6 +92,14 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -125,6 +127,9 @@ public class BookmarkActivity extends SnackbarActivity {
         mOnKeyDownHandler =
                 BackPressHelper.create(
                         this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator);
 +
-+        final boolean listenToActivityState = true;
-+        mIntentRequestTracker = IntentRequestTracker.createFromActivity(this);
-+        mWindowAndroid = new ActivityWindowAndroid(this, listenToActivityState,
-+                                                   mIntentRequestTracker, /*InsetObserver*/ null,
-+                                                   /* trackOcclusion= */ true);
-+        mBookmarkManagerCoordinator.setWindow(mWindowAndroid,
+        mBookmarkManagerCoordinator.setWindow(getWindowAndroid(),
 +            getModalDialogManagerSupplier().get());
     }
 
     @Override
-@@ -111,6 +127,7 @@ public class BookmarkActivity extends SnackbarActivity {
-     @Override
-     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-         super.onActivityResult(requestCode, resultCode, data);
-+        mWindowAndroid.getIntentRequestTracker().onActivityResult(requestCode, resultCode, data);
-         if (requestCode == EDIT_BOOKMARK_REQUEST_CODE && resultCode == RESULT_OK) {
-             assumeNonNull(data);
-             BookmarkId bookmarkId =
-@@ -120,6 +137,21 @@ public class BookmarkActivity extends SnackbarActivity {
+@@ -167,6 +172,21 @@ public class BookmarkActivity extends SnackbarActivity {
         }
     }
 
@@ -183,13 +150,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
 +    protected void onSaveInstanceState(Bundle outState) {
 +        super.onSaveInstanceState(outState);
 +
-+        mWindowAndroid.getIntentRequestTracker().saveInstanceState(outState);
+        getWindowAndroid().getIntentRequestTracker().saveInstanceState(outState);
 +    }
 +
 +    @Override
 +    public void onRequestPermissionsResult(
 +            int requestCode, String[] permissions, int[] grantResults) {
-+        if (mWindowAndroid.handlePermissionResult(requestCode, permissions, grantResults))
+        if (getWindowAndroid().handlePermissionResult(requestCode, permissions, grantResults))
 +            return;
 +        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 +    }
@@ -208,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
 import org.chromium.chrome.browser.app.download.home.DownloadPage;
 import org.chromium.chrome.browser.back_press.BackPressManager;
 import org.chromium.chrome.browser.bookmarks.BookmarkPage;
-@@ -83,7 +84,7 @@ import java.util.function.Supplier;
+@@ -82,7 +83,7 @@ import java.util.function.Supplier;
  */
 @NullMarked
 public class NativePageFactory {
@@ -217,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
     private final BottomSheetController mBottomSheetController;
     private final BrowserControlsManager mBrowserControlsManager;
     private final Supplier<@Nullable Tab> mCurrentTabSupplier;
-@@ -111,7 +112,7 @@ public class NativePageFactory {
+@@ -108,7 +109,7 @@ public class NativePageFactory {
     private final RecentlyClosedEntriesManager mRecentlyClosedEntriesManager;
 
     public NativePageFactory(
@@ -226,7 +193,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
             BottomSheetController sheetController,
             BrowserControlsManager browserControlsManager,
             Supplier<@Nullable Tab> currentTabSupplier,
-@@ -198,7 +199,7 @@ public class NativePageFactory {
+@@ -189,7 +190,7 @@ public class NativePageFactory {
 
     @VisibleForTesting
     static class NativePageBuilder {
@@ -235,29 +202,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
         private final BottomSheetController mBottomSheetController;
         private final Supplier<NewTabPageCreationTracker> mNewTabPageCreationTracker;
         private final BrowserControlsManager mBrowserControlsManager;
-@@ -326,7 +327,7 @@ public class NativePageFactory {
-                             mTabModelSelector,
-                             mEdgeToEdgeControllerSupplier),
-                     mActivity.getComponentName(),
-                    mBackPressManager);
-+                    mBackPressManager, mActivity);
-         }
- 
-         protected NativePage buildDownloadsPage(Tab tab) {
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -208,6 +208,8 @@ static_library("browser") {
-     "bad_message.h",
-     "bookmarks/bookmark_model_factory.cc",
-     "bookmarks/bookmark_model_factory.h",
-+    "bookmarks/bookmark_html_writer.cc",
-+    "bookmarks/bookmark_html_writer.h",
-     "bookmarks/chrome_bookmark_client.cc",
-     "bookmarks/chrome_bookmark_client.h",
-     "bookmarks/managed_bookmark_service_factory.cc",
-@@ -1531,6 +1533,13 @@ static_library("browser") {
-     "webdata_services/web_data_service_factory.cc",
+@@ -1060,6 +1060,13 @@ static_library("browser") {
+     "webauthn/webauthn_switches.cc",
   ]
 
 +  if (is_android) {
@@ -270,15 +219,6 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
   configs += [
     "//build/config/compiler:wexit_time_destructors",
     "//build/config:precompiled_headers",
-@@ -3703,8 +3712,6 @@ static_library("browser") {
-       "bookmarks/bookmark_expanded_state_tracker.h",
-       "bookmarks/bookmark_expanded_state_tracker_factory.cc",
-       "bookmarks/bookmark_expanded_state_tracker_factory.h",
-      "bookmarks/bookmark_html_writer.cc",
-      "bookmarks/bookmark_html_writer.h",
-       "bookmarks/bookmark_merged_surface_ordering_storage.cc",
-       "bookmarks/bookmark_merged_surface_ordering_storage.h",
-       "bookmarks/bookmark_merged_surface_service.cc",
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -292,7 +232,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +#include "chrome/browser/bookmarks/bookmark_html_writer.h"
 +#include "chrome/browser/importer/profile_writer.h"
 +#include "chrome/browser/platform_util.h"
-+#include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/browser/ui/select_file_policy/chrome_select_file_policy.h"
 +#include "components/user_data_importer/common/imported_bookmark_entry.h"
 +#include "components/user_data_importer/content/content_bookmark_parser.h"
 +#include "components/user_data_importer/content/content_bookmark_parser_utils.h"
@@ -322,7 +262,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 }
 
 void BookmarkBridge::Destroy(JNIEnv* env) {
-@@ -844,6 +870,173 @@ jint BookmarkBridge::GetTotalBookmarkCount(
+@@ -841,6 +867,173 @@ int32_t BookmarkBridge::GetTotalBookmarkCount(JNIEnv* env,
   return count;
 }
 
@@ -494,8 +434,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 +void BookmarkBridge::FileSelectionCanceled() {}
 +
 void BookmarkBridge::SetBookmarkTitle(JNIEnv* env,
-                                       jlong id,
-                                       jint type,
+                                       int64_t id,
+                                       int32_t type,
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser/bookmarks/android/bookmark_bridge.h
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.h
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.h
@@ -540,8 +480,8 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 
   void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env);
@@ -119,6 +129,17 @@ class BookmarkBridge : public ProfileObserver,
-                                                              jlong id,
-                                                              jint type);
+                                                              int64_t id,
+                                                              int32_t type);
 
 +  void ImportBookmarks(JNIEnv* env,
 +                        const base::android::JavaRef<jobject>& obj,
@@ -557,7 +497,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   void GetAllFoldersWithDepths(
       JNIEnv* env,
       const base::android::JavaRef<jobject>& j_folders_obj,
-@@ -379,6 +400,8 @@ class BookmarkBridge : public ProfileObserver,
+@@ -372,6 +393,8 @@ class BookmarkBridge : public ProfileObserver,
   void CreateOrDestroyAccountReadingListManagerIfNeeded();
 
   const raw_ptr<Profile> profile_;  // weak
@@ -566,7 +506,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   base::android::ScopedJavaGlobalRef<jobject> java_bookmark_model_;
   const raw_ptr<bookmarks::BookmarkModel> bookmark_model_;  // weak
   const raw_ptr<bookmarks::ManagedBookmarkService>
-@@ -393,6 +416,7 @@ class BookmarkBridge : public ProfileObserver,
+@@ -386,6 +409,7 @@ class BookmarkBridge : public ProfileObserver,
   std::unique_ptr<bookmarks::ScopedGroupBookmarkActions>
       grouped_bookmark_actions_;
   PrefChangeRegistrar pref_change_registrar_;
@@ -574,7 +514,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
-@@ -427,6 +451,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -420,6 +444,10 @@ class BookmarkBridge : public ProfileObserver,
   base::TimeTicks load_start_time_;
   bool loading_notification_sent_ = false;
 
@@ -678,16 +618,16 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerCoordinator.java
-@@ -60,6 +60,8 @@ import org.chromium.components.image_fetcher.ImageFetcherConfig;
- import org.chromium.components.image_fetcher.ImageFetcherFactory;
- import org.chromium.ui.KeyboardVisibilityDelegate;
+@@ -66,6 +66,8 @@ import org.chromium.ui.base.ActivityResultTracker;
+ import org.chromium.ui.base.Clipboard;
+ import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.edge_to_edge.EdgeToEdgePadAdjuster;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogType;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
-@@ -354,6 +356,13 @@ public class BookmarkManagerCoordinator
+@@ -369,6 +371,13 @@ public class BookmarkManagerCoordinator
 
     // Public API implementation.
 
@@ -704,16 +644,16 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
-@@ -64,6 +64,8 @@ import org.chromium.components.commerce.core.ShoppingService;
+@@ -68,6 +68,8 @@ import org.chromium.components.commerce.core.ShoppingService;
 import org.chromium.components.commerce.core.SubscriptionsObserver;
 import org.chromium.components.power_bookmarks.PowerBookmarkMeta;
 import org.chromium.components.power_bookmarks.PowerBookmarkType;
 +import org.chromium.ui.base.ActivityWindowAndroid;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
 import org.chromium.ui.accessibility.AccessibilityState;
+ import org.chromium.ui.base.Clipboard;
 import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.base.DeviceInput;
-@@ -85,6 +87,47 @@ import java.util.function.BooleanSupplier;
+@@ -91,6 +93,47 @@ import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -761,7 +701,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 /** Responsible for BookmarkManager business logic. */
 // TODO(crbug.com/40256938): Remove BookmarkDelegate if possible.
 @NullMarked
-@@ -95,6 +138,9 @@ class BookmarkManagerMediator
+@@ -101,6 +144,9 @@ class BookmarkManagerMediator
 
     private static boolean sPreventLoadingForTesting;
 
@@ -771,7 +711,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
     /** Keeps track of whether drag is enabled / active for bookmark lists. */
     private class BookmarkDragStateDelegate implements DragStateDelegate {
         private BookmarkDelegate mBookmarkDelegate;
-@@ -647,6 +693,14 @@ class BookmarkManagerMediator
+@@ -651,6 +697,14 @@ class BookmarkManagerMediator
         mNativePage = nativePage;
     }
 
@@ -1025,27 +965,26 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 --- a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
 +++ b/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
-@@ -16,6 +16,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
- import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
- import org.chromium.chrome.browser.ui.native_page.NativePageHost;
- import org.chromium.components.embedder_support.util.UrlConstants;
+@@ -22,6 +22,9 @@ import org.chromium.ui.base.ActivityResultTracker;
+ import org.chromium.ui.base.WindowAndroid;
+ 
+ import java.util.function.Supplier;
 +import org.chromium.chrome.browser.app.ChromeActivity;
 +import org.chromium.ui.modaldialog.ModalDialogManager;
 +import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
 
 /** A native page holding a {@link BookmarkManagerCoordinator} on _tablet_. */
 @NullMarked
-@@ -37,7 +40,8 @@ public class BookmarkPage extends BasicNativePage {
-             Profile profile,
-             NativePageHost host,
-             @Nullable ComponentName componentName,
-            BackPressManager backPressManager) {
-+            BackPressManager backPressManager,
-+            ChromeActivity activity) {
-         super(host);
- 
-         mTitle = host.getContext().getString(R.string.bookmarks);
-@@ -65,6 +69,9 @@ public class BookmarkPage extends BasicNativePage {
+@@ -48,7 +51,7 @@ public class BookmarkPage extends BasicNativePage {
+      */
+     public BookmarkPage(
+             WindowAndroid windowAndroid,
+-            Activity activity,
+            ChromeActivity activity,
+             SnackbarManager snackbarManager,
+             Supplier<BottomSheetController> bottomSheetControllerSupplier,
+             ActivityResultTracker activityResultTracker,
+@@ -87,6 +90,9 @@ public class BookmarkPage extends BasicNativePage {
                         backPressManager);
 
         mBookmarkManagerCoordinator.setBasicNativePage(this);
@@ -1247,10 +1186,10 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -257,6 +257,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kAvoidDoubleMultiwindowChanges,
+@@ -279,6 +279,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kBlockIntentsWhileLocked,
     &kBookmarkPaneAndroid,
+     &kBottomSheetAsBrowserControls,
 +    &kBookmarksExportUseSaf,
     &kBrowserControlsDebugging,
     &kBrowserControlsEarlyResize,
@@ -1258,7 +1197,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
-@@ -694,6 +694,7 @@ public abstract class ChromeFeatureList {
+@@ -724,6 +724,7 @@ public abstract class ChromeFeatureList {
             "UseLibunwindstackNativeUnwinderAndroid";
     public static final String VERIFY_QWACS = "VerifyQWACs";
     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";
@@ -1321,7 +1260,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";
-@@ -1167,6 +1169,7 @@ public final class ChromePreferenceKeys {
+@@ -1131,6 +1133,7 @@ public final class ChromePreferenceKeys {
                 AUXILIARY_SEARCH_SCHEMA_VERSION,
                 APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
                 APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1332,7 +1271,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
-@@ -267,6 +267,24 @@ CHAR_LIMIT guidelines:
+@@ -277,6 +277,24 @@ CHAR_LIMIT guidelines:
       <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
         Sites
       </message>
@@ -1360,7 +1299,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
 --- a/chrome/utility/BUILD.gn
 +++ b/chrome/utility/BUILD.gn
-@@ -212,6 +212,13 @@ static_library("utility") {
+@@ -215,6 +215,13 @@ static_library("utility") {
     deps += [ "//chrome/services/pdf:lib" ]
   }
 
@@ -1462,7 +1401,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
-@@ -51,6 +51,7 @@ import org.chromium.build.annotations.Initializer;
+@@ -52,6 +52,7 @@ import org.chromium.build.annotations.Initializer;
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.build.annotations.Nullable;
 import org.chromium.ui.R;
@@ -1505,7 +1444,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
-@@ -460,7 +473,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -447,7 +460,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
 
                                 // TODO(finnur): Remove once we figure out the cause of
                                 // crbug.com/950024.
@@ -1514,7 +1453,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(
-@@ -477,7 +490,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -464,7 +477,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                                     }
                                 }
 
@@ -1523,7 +1462,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)
-@@ -783,6 +796,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -775,6 +788,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
                 mimeTypes.add(mimeType);
             }
         }
@@ -1531,7 +1470,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
         return mimeTypes;
     }
 
-@@ -1168,6 +1182,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
+@@ -1160,6 +1174,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
         return countAcceptTypesFor(superType) == mMimeTypes.size();
     }
 
@@ -1570,8 +1509,8 @@ 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
-@@ -196,6 +196,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
-       suggested_name.value(), owning_window->GetJavaObject());
+@@ -171,6 +171,12 @@ void SelectFileDialogImpl::SelectFileImpl(Type type,
+       owning_window->GetJavaObject());
 }
 
 +void SelectFileDialogImpl::ShowToast(const std::string& message) {
@@ -73,7 +73,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
-@@ -149,6 +149,7 @@ import org.chromium.ui.base.SelectFileDialog;
+@@ -145,6 +145,7 @@ import org.chromium.ui.base.SelectFileDialog;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.edge_to_edge.EdgeToEdgeStateProvider;
 import org.chromium.url.GURL;
@@ -81,7 +81,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
-@@ -729,7 +730,10 @@ public class ProcessInitializationHandler {
+@@ -696,7 +697,10 @@ public class ProcessInitializationHandler {
 
         tasks.add(
                 () -> {
@@ -96,9 +96,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tracing/settings/DeveloperSettings.java
-@@ -38,7 +38,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
-     private final ObservableSupplier<String> mPageTitle =
-             new ObservableSupplierImpl<>(MSG_DEVELOPER_OPTIONS_TITLE);
+@@ -39,7 +39,7 @@ public class DeveloperSettings extends ChromeBaseSettingsFragment implements Emb
+     private final NonNullObservableSupplier<String> mPageTitle =
+             ObservableSuppliers.createNonNull(MSG_DEVELOPER_OPTIONS_TITLE);
 
 -    private static @Nullable Boolean sIsEnabledForTests;
 +    private static @Nullable Boolean sIsEnabledForTests = true;
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tracing/setting
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -191,6 +191,11 @@ source_set("shell_integration") {
+@@ -204,6 +204,11 @@ source_set("shell_integration") {
 # require many files from it. This makes linking more efficient.
 static_library("browser") {
   sources = [
@@ -179,7 +179,7 @@ diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b
 #include "chrome/browser/chrome_browser_interface_binders_webui.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chrome_content_browser_client_parts.h"
-@@ -497,6 +498,15 @@ void ChromeContentBrowserClient::
+@@ -491,6 +492,15 @@ void ChromeContentBrowserClient::
                                                     render_frame_host);
       },
       &render_frame_host));
@@ -237,7 +237,7 @@ new file mode 100644
 +
 +  update_client::CrxUpdateItem item;
 +  if (component_updater->GetComponentDetails(id, &item) && item.component) {
-+    base::Value::Dict dict;
+    base::DictValue dict;
 +    dict.Set("id", id);
 +    dict.Set("version", item.component->version.GetString());
 +    dict.Set("status", (int)item.state);
@@ -412,7 +412,7 @@ new file mode 100644
 diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
 --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
 +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/permissions/NotificationPermissionController.java
-@@ -181,6 +181,7 @@ public class NotificationPermissionController {
+@@ -175,6 +175,7 @@ public class NotificationPermissionController {
      * @return True if any UI was shown (either rationale dialog or OS prompt), false otherwise.
      */
     public boolean requestPermissionIfNeeded(boolean contextual) {
@@ -423,7 +423,7 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/b
 diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc
 +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -220,6 +220,7 @@ static const std::variant<const base::Feature*, const char*>
+@@ -223,6 +223,7 @@ static const std::variant<const base::Feature*, const char*>
 
 #if BUILDFLAG(IS_ANDROID)
         &chrome::android::kCommandLineOnNonRooted,
@@ -434,7 +434,7 @@ diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/s
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 --- a/chrome/common/BUILD.gn
 +++ b/chrome/common/BUILD.gn
-@@ -666,6 +666,7 @@ mojom("mojo_bindings") {
+@@ -668,6 +668,7 @@ mojom("mojo_bindings") {
     "actor.mojom",
     "chrome_render_frame.mojom",
     "google_accounts_private_api_extension.mojom",
@@ -457,7 +457,7 @@ new file mode 100644
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -79,6 +79,8 @@ static_library("renderer") {
+@@ -81,6 +81,8 @@ static_library("renderer") {
     "chrome_render_thread_observer.cc",
     "chrome_render_thread_observer.h",
     "custom_menu_commands.h",
@@ -477,7 +477,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
 #include "chrome/renderer/google_accounts_private_api_extension.h"
 #include "chrome/renderer/loadtimes_extension_bindings.h"
 #include "chrome/renderer/media/flash_embed_rewrite.h"
-@@ -650,6 +651,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -663,6 +664,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
 
   TrustedVaultEncryptionKeysExtension::Create(render_frame);
   GoogleAccountsPrivateApiExtension::Create(render_frame);
@@ -785,7 +785,7 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/json/json_writer.h"
-@@ -47,6 +48,7 @@
+@@ -46,6 +47,7 @@
 #include "content/public/browser/devtools_socket_factory.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
@@ -793,10 +793,10 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
-@@ -608,9 +610,12 @@ void DevToolsHttpHandler::OnJsonRequest(
+@@ -616,9 +618,12 @@ void DevToolsHttpHandler::OnJsonRequest(
 
   if (command == "version") {
-     base::Value::Dict version;
+     base::DictValue version;
 +    auto browser = GetContentClient()->browser()->GetProduct();
 +    if (base::FeatureList::IsEnabled(features::kEnableCromiteTestSupport))
 +      browser = "Chrome/0.0.0.0";
@@ -851,7 +851,7 @@ diff --git a/content/browser/log_console_message.h b/content/browser/log_console
 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
-@@ -318,6 +318,8 @@
+@@ -335,6 +335,8 @@
 #include "url/origin.h"
 #include "url/url_constants.h"
 
@@ -860,7 +860,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 #if BUILDFLAG(IS_ANDROID)
 #include "base/android/scoped_service_binding_batch.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
-@@ -4867,7 +4869,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -5049,7 +5051,8 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
   if (delegate_->DidAddMessageToConsole(this, log_level, message, line_no,
                                         updated_source_id,
                                         untrusted_stack_trace)) {
@@ -870,7 +870,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
   }
 
   // Pass through log severity only on builtin components pages to limit console
-@@ -4884,8 +4887,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
+@@ -5066,8 +5069,14 @@ void RenderFrameHostImpl::DidAddMessageToConsole(
   const bool is_off_the_record =
       GetSiteInstance()->GetBrowserContext()->IsOffTheRecord();
 
@@ -57,15 +57,15 @@ 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
-@@ -22,6 +22,7 @@ import androidx.core.os.BuildCompat;
- 
+@@ -23,6 +23,7 @@ import androidx.core.os.BuildCompat;
+ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.CommandLine;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
-@@ -51,6 +52,9 @@ import java.lang.annotation.Retention;
+@@ -53,6 +54,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Set;
 
@@ -75,7 +75,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.
-@@ -137,6 +141,9 @@ public class LaunchIntentDispatcher {
+@@ -139,6 +143,9 @@ public class LaunchIntentDispatcher {
      */
     public static boolean isCustomTabIntent(Intent intent) {
         if (intent == null) return false;
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
         Log.w(
                 TAG,
                 "CustomTabsIntent#shouldAlwaysUseBrowserUI() = "
-@@ -163,6 +170,10 @@ public class LaunchIntentDispatcher {
+@@ -165,6 +172,10 @@ public class LaunchIntentDispatcher {
         // Make sure the result of the CustomTabActivity is forwarded to the client.
         newIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
@@ -96,7 +96,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());
-@@ -333,6 +344,17 @@ public class LaunchIntentDispatcher {
+@@ -342,6 +353,17 @@ public class LaunchIntentDispatcher {
 
         if (Intent.ACTION_VIEW.equals(newIntent.getAction())
                 && !IntentHandler.wasIntentSenderChrome(newIntent)) {
@@ -117,7 +117,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
-@@ -239,16 +239,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -248,16 +248,16 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
 
     // Extra whose value is an array of ints that is supplied to
     // SyntheticTrialRegistry::RegisterExternalExperiments().
@@ -140,7 +140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 
     /**
      * Extra that, if set, makes the Custom Tab Activity's height to be x pixels, the Custom Tab
-@@ -697,7 +697,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -727,7 +727,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
                                 TrustedWebActivityIntentBuilder.EXTRA_SCREEN_ORIENTATION,
                                 ScreenOrientation.DEFAULT));
 
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 
         mBreakPointDp = getActivityBreakPointFromIntent(intent);
         mInitialActivityHeight = getInitialActivityHeightFromIntent(intent);
-@@ -710,8 +710,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -740,8 +740,8 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
                         intent, EXTRA_ACTIVITY_HEIGHT_RESIZE_BEHAVIOR, ACTIVITY_HEIGHT_DEFAULT);
         mIsPartialCustomTabFixedHeight = activityHeightResizeBehavior == ACTIVITY_HEIGHT_FIXED;
 
@@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
             @BackgroundInteractBehavior
             int backgroundInteractBehavior =
                     IntentUtils.safeGetIntExtra(
-@@ -1369,7 +1369,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
+@@ -1410,7 +1410,9 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
     public @CustomTabProfileType int getCustomTabMode() {
         return AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()
                 ? CustomTabProfileType.INCOGNITO
@@ -194,7 +194,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/IncognitoCustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/IncognitoCustomTabIntentDataProvider.java
-@@ -44,6 +44,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
+@@ -45,6 +45,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -204,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 /**
  * A model class that parses the incoming intent for incognito Custom Tabs specific customization
  * data.
-@@ -133,6 +136,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -134,6 +137,9 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     private static boolean isIntentFromThirdPartyAllowed() {
@@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
         return ChromeFeatureList.sCctIncognitoAvailableToThirdParty.isEnabled();
     }
 
-@@ -230,6 +236,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -231,6 +237,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
     }
 
     public static boolean isValidIncognitoIntent(Intent intent, boolean recordMetrics) {
@@ -225,7 +225,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
         if (!isIncognitoRequested(intent)) return false;
         var session = SessionHolder.getSessionHolderFromIntent(intent);
         if (isIntentFromThirdPartyAllowed()
-@@ -340,6 +350,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
+@@ -341,6 +351,10 @@ public class IncognitoCustomTabIntentDataProvider extends BrowserServicesIntentD
 
     @Override
     public @CustomTabProfileType int getCustomTabMode() {
@@ -239,15 +239,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -11,6 +11,7 @@ import android.content.Context;
+@@ -12,6 +12,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
 +import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableString;
- import android.text.style.ClickableSpan;
-@@ -83,6 +84,15 @@ import org.chromium.ui.text.SpanApplier;
+ import android.text.SpannableStringBuilder;
+@@ -88,6 +89,15 @@ import org.chromium.ui.widget.ChromeBulletSpan;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -263,7 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 import androidx.preference.PreferenceCategory;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.base.shared_preferences.SharedPreferencesManager;
-@@ -150,6 +160,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -163,6 +173,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 startTag, endTag, new ChromeClickableSpan(context, onClickCallback));
     }
 
@@ -273,7 +273,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
-@@ -391,6 +404,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -420,6 +433,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                 new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
     }
 
@@ -283,7 +283,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
-@@ -411,6 +427,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -440,6 +456,31 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
         } else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -315,7 +315,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -443,6 +484,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -472,6 +513,16 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                     UserPrefs.get(getProfile()).getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
         }
 
@@ -335,7 +335,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
 --- a/chrome/browser/flags/android/chrome_feature_list.cc
 +++ b/chrome/browser/flags/android/chrome_feature_list.cc
-@@ -696,7 +696,9 @@ BASE_FEATURE(kMagicStackAndroid, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -741,7 +741,9 @@ BASE_FEATURE(kLogoViewRefactor, base::FEATURE_DISABLED_BY_DEFAULT);
 // Enables an experimental feature which forces mayLaunchUrl to use a different
 // storage partition. This may reduce performance. This should not be enabled by
 // default.
@@ -349,7 +349,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
-@@ -969,6 +969,8 @@ public abstract class ChromeFeatureList {
+@@ -1053,6 +1053,8 @@ public abstract class ChromeFeatureList {
                     MOST_VISITED_TILES_CUSTOMIZATION,
                     /* defaultValue= */ true,
                     /* defaultValueInTests= */ true);
@@ -358,18 +358,18 @@ 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 sMoveToFrontInLaunchIntentDispatcher =
-@@ -1217,6 +1219,7 @@ public abstract class ChromeFeatureList {
+@@ -1330,6 +1332,7 @@ public abstract class ChromeFeatureList {
                     sMaliciousApkDownloadCheck,
                     sMostVisitedTilesCustomization,
                     sMostVisitedTilesReselect,
 +                    sMayLaunchurlUsesSeparateStoragePartition,
                     sMoveToFrontInLaunchIntentDispatcher,
-                     sMultiInstanceApplicationStatusCleanup,
+                     sMultiInstanceSharedPrefsMigration,
                     sMvcUpdateViewWhenModelChanged,
 diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 --- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
 +++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/TabAssociatedApp.java
-@@ -88,7 +88,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
+@@ -90,7 +90,11 @@ public final class TabAssociatedApp extends TabWebContentsUserData implements Im
     public static boolean isOpenedFromExternalApp(Tab tab) {
         TabAssociatedApp app = get(tab);
         if (app == null) return false;
@@ -17,18 +17,18 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -125,6 +125,7 @@ found in the LICENSE file.
+@@ -126,6 +126,7 @@ found in the LICENSE file.
     <item type="id" name="ntp_feed_header_menu_item_toggle_switch" />
 
     <!-- App Menu -->
 +    <item type="id" name="exit_id" />
     <item type="id" name="icon_row_menu_id" />
     <item type="id" name="submenu_header_menu_id" />
-     <item type="id" name="forward_menu_id" />
+     <item type="id" name="back_menu_id" />
 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
-@@ -372,6 +372,8 @@ import java.util.Set;
+@@ -401,6 +401,8 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 /**
  * This is the main activity for ChromeMobile when not running in document mode. All the tabs are
  * accessible via a chrome specific tab switching UI.
-@@ -3878,6 +3880,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -4160,6 +4162,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                     .closeTabs(
                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);
             RecordUserAction.record("MobileTabClosed");
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -71,6 +71,7 @@ import org.chromium.base.supplier.SettableObservableSupplier;
+@@ -69,6 +69,7 @@ import org.chromium.base.supplier.SettableNullableObservableSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.ActivityUtils;
@@ -57,7 +57,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 import org.chromium.chrome.browser.ChromeActivitySessionTracker;
 import org.chromium.chrome.browser.ChromeApplicationImpl;
 import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
-@@ -2654,6 +2655,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -2718,6 +2719,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             return true;
         }
 
@@ -91,26 +91,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -425,6 +425,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-             maybeAddDividerLine(modelList, R.id.menu_item_content_filter_divider_line_id);
+@@ -492,6 +492,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
             modelList.add(buildContentFilterHelpCenterMenuItem(currentTab));
         }
-+
+ 
 +        modelList.add(new MVCListAdapter.ListItem(
 +                AppMenuHandler.AppMenuItemType.STANDARD,
 +                buildModelForStandardMenuItem(
 +                        R.id.exit_id,
 +                        R.string.menu_exit,
 +                        shouldShowIconBeforeItem() ? R.drawable.ic_exit_to_app_white_24dp : 0)));
-     }
- 
-     private Runnable buildUpdateStateChangedObserver() {
+
+         // Default browser promo menu item (entry point).
+         if (shouldShowDefaultBrowserPromo()) {
+             maybeAddDividerLine(modelList, R.id.divider_line_id);
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -4460,6 +4460,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
+@@ -4572,6 +4572,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+       <message name="IDS_MENU_MORE_TOOLS" desc="Menu item to more tools. [CHAR_LIMIT=27]">
+         More tools
       </message>
 +      <message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
 +        Exit
@@ -10,9 +10,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/autocomplete_controller.cc        | 10 ++++++
 .../omnibox/browser/history_url_provider.cc   |  3 ++
 components/omnibox/browser/search_provider.cc |  4 +++
- components/url_formatter/url_fixer.cc         |  4 +++
+ components/url_formatter/url_fixer.cc         |  3 ++
 ...lag-for-omnibox-autocomplete-filtering.inc | 32 +++++++++++++++++++
- 5 files changed, 53 insertions(+)
+ 5 files changed, 52 insertions(+)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-flag-for-omnibox-autocomplete-filtering.inc

 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
@@ -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"
-@@ -552,6 +553,15 @@ AutocompleteController::AutocompleteController(
+@@ -549,6 +550,15 @@ AutocompleteController::AutocompleteController(
       steady_state_omnibox_position_(
           metrics::OmniboxEventProto::UNKNOWN_POSITION),
       config_(config) {
@@ -34,9 +34,9 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 +    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");
 +    config_.provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |
 +        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;
-+    if (!base::Contains(flag_value, "bookmarks"))
+    if (!flag_value.contains("bookmarks"))
 +      config_.provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;
-+    if (!base::Contains(flag_value, "chrome"))
+    if (!flag_value.contains("chrome"))
 +      config_.provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;
 +  }
   config_.provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
@@ -45,7 +45,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
 diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc
 --- a/components/omnibox/browser/history_url_provider.cc
 +++ b/components/omnibox/browser/history_url_provider.cc
-@@ -488,6 +488,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
+@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,
   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
     matches_.push_back(what_you_typed_match);
 
@@ -66,7 +66,7 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 #include "base/functional/callback.h"
 #include "base/i18n/break_iterator.h"
 #include "base/i18n/case_conversion.h"
-@@ -658,6 +659,9 @@ void SearchProvider::Run(bool query_is_private) {
+@@ -662,6 +663,9 @@ void SearchProvider::Run(bool query_is_private) {
 }
 
 void SearchProvider::DoHistoryQuery(bool minimal_changes) {
@@ -79,21 +79,20 @@ diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/
 diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/url_fixer.cc
 --- a/components/url_formatter/url_fixer.cc
 +++ b/components/url_formatter/url_fixer.cc
-@@ -11,6 +11,8 @@
+@@ -11,6 +11,7 @@
 
 #include "base/check_op.h"
 #include "base/compiler_specific.h"
-+#include "base/containers/contains.h"
 +#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/char_iterator.h"
-@@ -640,6 +642,8 @@ GURL FixupURLInternal(const std::string& text,
- 
-     FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
+@@ -635,6 +636,8 @@ GURL FixupURLInternal(const std::string& text,
+                  desired_tld, &url);
+     }
     if (chrome_url && !parts.host.is_valid()) {
 +     if (!base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering") ||
-+         base::Contains(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering"), "chrome"))
+         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering").contains("chrome"))
       url.append(kChromeUIDefaultHost);
     }
     FixupPort(trimmed, parts.port, &url);
@@ -11,8 +11,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../common/network_switch_list.h                |  4 ++++
 .../spoof_checks/top_domains/BUILD.gn           |  1 +
 ...o-configure-maximum-connections-per-host.inc | 17 +++++++++++++++++
- net/socket/client_socket_pool_manager.cc        | 17 +++++++++++++++++
- 4 files changed, 39 insertions(+)
+ net/socket/client_socket_pool_manager.cc        | 16 ++++++++++++++++
+ 4 files changed, 38 insertions(+)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-flag-to-configure-maximum-connections-per-host.inc

 diff --git a/components/network_session_configurator/common/network_switch_list.h b/components/network_session_configurator/common/network_switch_list.h
@@ -65,7 +65,7 @@ new file mode 100644
 diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
 --- a/net/socket/client_socket_pool_manager.cc
 +++ b/net/socket/client_socket_pool_manager.cc
-@@ -21,6 +21,10 @@
+@@ -22,6 +22,10 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool.h"
 #include "net/socket/connect_job.h"
@@ -76,12 +76,11 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 #include "net/ssl/ssl_config.h"
 #include "url/gurl.h"
 #include "url/scheme_host_port.h"
-@@ -165,6 +169,19 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(
+@@ -169,6 +173,18 @@ void ClientSocketPoolManager::set_socket_soft_cap_per_pool_for_test(
+ // static
 size_t ClientSocketPoolManager::max_sockets_per_group(
     HttpNetworkSession::SocketPoolType pool_type) {
-   DCHECK_LT(pool_type, HttpNetworkSession::NUM_SOCKET_POOL_TYPES);
-+
-+  if (pool_type == HttpNetworkSession::NORMAL_SOCKET_POOL) {
+  if (pool_type == net::HttpNetworkSession::SocketPoolType::kNormal) {
 +      int maxConnectionsPerHost = 0;
 +      auto value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kMaxConnectionsPerHost);
 +      if (!value.empty() && !base::StringToInt(value, &maxConnectionsPerHost)) {
@@ -93,7 +92,7 @@ diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket
 +      // fallthrough for default value
 +  }
 +
-   return g_max_sockets_per_group[pool_type];
+   return g_max_sockets_per_group[std::to_underlying(pool_type)];
 }
 
 --
@@ -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
-@@ -1200,6 +1200,7 @@ component("net") {
+@@ -1219,6 +1219,7 @@ component("net") {
     ":net_deps",
     "//components/network_time/time_tracker",
     "//components/unexportable_keys",
@@ -56,7 +56,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
 diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 --- a/net/dns/host_resolver_manager.cc
 +++ b/net/dns/host_resolver_manager.cc
-@@ -116,6 +116,7 @@
+@@ -114,6 +114,7 @@
 #include "net/log/net_log_event_type.h"
 #include "net/log/net_log_source.h"
 #include "net/log/net_log_source_type.h"
@@ -64,7 +64,7 @@ diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc
 #include "net/log/net_log_with_source.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
-@@ -1499,6 +1500,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
+@@ -1505,6 +1506,13 @@ int HostResolverManager::StartIPv6ReachabilityCheck(
     return OK;
   }
 
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java
-@@ -38,6 +38,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
+@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.ephemeraltab.EphemeralTabCoordinator;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.flags.ActivityType;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
-@@ -135,7 +136,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+@@ -139,7 +140,8 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
     @Override
     public boolean shouldDisableExternalIntentRequestsForUrl(
             ExternalNavigationParams params, Intent intent) {
@@ -86,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
     }
 
     @Override
-@@ -316,7 +318,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
+@@ -320,7 +322,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
                 && params.isInitialNavigationInFrame()
                 // TODO(crbug.com/452537438): Figure out a better way to check whether we are in
                 // desktop windowing mode or if the device can enter desktop windowing mode.
@@ -150,7 +150,7 @@ new file mode 100644
 diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
 --- a/components/external_intents/android/external_intents_features.cc
 +++ b/components/external_intents/android/external_intents_features.cc
-@@ -32,7 +32,13 @@ BASE_FEATURE(kExternalNavigationDebugLogs, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -32,8 +32,14 @@ BASE_FEATURE(kExternalNavigationDebugLogs, base::FEATURE_DISABLED_BY_DEFAULT);
 BASE_FEATURE(kNavigationCaptureRefactorAndroid,
              base::FEATURE_DISABLED_BY_DEFAULT);
 
@@ -158,12 +158,13 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
 +                "IntentBlockExternalFormRedirectsNoGesture",
 +                base::FEATURE_ENABLED_BY_DEFAULT);
 +
- static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
+ static int64_t JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env,
+                                                       int32_t ordinal) {
 +  if (ordinal == -1)
-+    return reinterpret_cast<jlong>(&kIntentBlockExternalFormRedirectsNoGesture);
-   return reinterpret_cast<jlong>(UNSAFE_TODO(kFeaturesExposedToJava[ordinal]));
+    return reinterpret_cast<int64_t>(&kIntentBlockExternalFormRedirectsNoGesture);
+   return reinterpret_cast<int64_t>(
+       UNSAFE_TODO(kFeaturesExposedToJava[ordinal]));
 }
- 
 diff --git a/components/external_intents/android/external_intents_features.h b/components/external_intents/android/external_intents_features.h
 --- a/components/external_intents/android/external_intents_features.h
 +++ b/components/external_intents/android/external_intents_features.h
@@ -194,7 +195,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
 diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 --- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
 +++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
-@@ -1745,6 +1745,12 @@ public class ExternalNavigationHandler {
+@@ -1793,6 +1793,12 @@ public class ExternalNavigationHandler implements ExternalNavigationHelper {
         return false;
     }
 
@@ -207,7 +208,7 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
     private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
             ExternalNavigationParams params,
             Intent targetIntent,
-@@ -1832,6 +1838,21 @@ public class ExternalNavigationHandler {
+@@ -1880,6 +1886,21 @@ public class ExternalNavigationHandler implements ExternalNavigationHelper {
             return OverrideUrlLoadingResult.forNoOverride();
         }
 
@@ -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
-@@ -106,6 +106,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
+@@ -82,6 +82,7 @@ void SetRuntimeFeatureDefaultsForPlatform(
   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI)) {
     WebRuntimeFeatures::EnableMediaSession(false);
   }
@@ -62,7 +62,7 @@ diff --git a/third_party/blink/public/platform/web_runtime_features.h b/third_pa
@@ -70,6 +70,7 @@ class BLINK_PLATFORM_EXPORT WebRuntimeFeatures : public WebRuntimeFeaturesBase {
   static void EnableFingerprintingCanvasImageDataNoise(bool);
   static void EnableFluentScrollbars(bool);
-   static void EnableFluentOverlayScrollbars(bool);
+   static void EnableDesktopAndroidScrollbars(bool);
 +  static void EnableVibration(bool);
 
   static void EnableLocalNetworkAccessWebRTC(bool);
@@ -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
-@@ -1142,6 +1142,10 @@
+@@ -1242,6 +1242,10 @@
     {
       name: "CompositingDecisionAtAnimationPhaseBoundaries"
     },
@@ -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
-@@ -736,7 +736,7 @@ config("compiler") {
+@@ -681,7 +681,7 @@ config("compiler") {
     # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.
     # It also causes segfault on Linux s390x:
     # https://github.com/llvm/llvm-project/issues/149511
@@ -23,7 +23,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
       cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
     }
   }
-@@ -1833,7 +1833,7 @@ config("clang_revision") {
+@@ -1886,7 +1886,7 @@ config("clang_revision") {
 # e.g. by setting in the the project's .gn file.
 config("clang_warning_suppression") {
   # Some build configs use older versions of clang that don't support WSMs
@@ -32,7 +32,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
     from_build_root =
         rebase_path(clang_warning_suppression_file, root_build_dir)
     inputs = [ clang_warning_suppression_file ]
-@@ -2196,7 +2196,9 @@ config("default_warnings") {
+@@ -2283,7 +2283,9 @@ config("default_warnings") {
       # TODO(crbug.com/432275627): Fix and re-enable.
       "-Wno-uninitialized-const-pointer",
     ]
@@ -43,7 +43,7 @@ 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",
-@@ -2250,6 +2252,15 @@ config("default_warnings") {
+@@ -2337,6 +2339,15 @@ config("default_warnings") {
       ldflags += [ "-Wno-version-check" ]
     }
 
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../bookmarks/bookmark_parent_folder.cc       |  1 +
 .../permanent_folder_ordering_tracker.cc      |  2 +
 .../dialogs/DownloadLocationCustomView.java   |  4 +-
- .../strings/android_chrome_strings.grd        |  3 ++
+ .../strings/android_chrome_strings.grd        |  6 +--
 .../bookmark_ui_operations_helper.cc          |  2 +
 .../bookmark_bar_page_handler.cc              |  2 +
 components/bookmark_bar_strings.grdp          |  6 +++
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/bookmark_load_details.cc          | 15 +++++--
 .../bookmarks/browser/bookmark_load_details.h |  2 +
 .../bookmarks/browser/bookmark_model.cc       |  3 +-
- components/bookmarks/browser/bookmark_model.h |  7 +++
+ components/bookmarks/browser/bookmark_model.h |  8 ++++
 components/bookmarks/browser/bookmark_node.cc | 13 ++++++
 components/bookmarks/browser/bookmark_node.h  |  4 ++
 .../bookmarks/browser/bookmark_storage.cc     |  2 +
@@ -31,15 +31,15 @@ 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  |  9 +++-
 .../bookmark_specifics_conversions.cc         |  1 +
- 27 files changed, 251 insertions(+), 11 deletions(-)
+ 27 files changed, 252 insertions(+), 14 deletions(-)

 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -197,6 +197,7 @@ found in the LICENSE file.
-     <item type="id" name="menu_item_content_filter_divider_line_id" />
-     <item type="id" name="menu_item_content_filter_help_center_id" />
+@@ -206,6 +206,7 @@ found in the LICENSE file.
     <item type="id" name="duplicate_tab_menu_id" />
+     <item type="id" name="glic_menu_id" />
+     <item type="id" name="open_in_app_menu_id" />
 +    <item type="id" name="bookmark_all_tabs_menu_id" />
 
     <!-- Custom Tabs -->
@@ -47,7 +47,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -109,6 +109,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
+@@ -114,6 +114,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPane;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
 import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -55,26 +55,26 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
-@@ -309,6 +310,9 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
- import org.chromium.chrome.browser.ui.browser_window.BrowserWindowType;
- import org.chromium.chrome.browser.ui.desktop_windowing.AppHeaderUtils;
+@@ -333,6 +334,9 @@ import org.chromium.chrome.browser.ui.browser_window.BrowserWindowType;
+ import org.chromium.chrome.browser.ui.default_browser_promo.DefaultBrowserPromoUtils;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
+ import org.chromium.chrome.browser.ui.edge_to_edge.TransitiveTopInsetProvider;
 +import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarController;
 import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityClient;
 import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityExtras.IntentOrigin;
 import org.chromium.chrome.browser.ui.signin.BottomSheetSigninAndHistorySyncConfig;
-@@ -325,6 +329,8 @@ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
- import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionInitializerImpl;
- import org.chromium.chrome.browser.xr.scenecore.XrSceneCoreSessionManagerImpl;
+@@ -350,6 +354,8 @@ import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
+ import org.chromium.chrome.browser.util.DefaultBrowserInfo;
+ import org.chromium.chrome.browser.xr.scenecore.XrModule;
 import org.chromium.components.browser_ui.accessibility.AccessibilityFeatureMap;
 +import org.chromium.components.bookmarks.BookmarkId;
 +import org.chromium.components.bookmarks.BookmarkItem;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
 import org.chromium.components.browser_ui.share.ShareParams;
 import org.chromium.components.browser_ui.util.BrowserControlsVisibilityDelegate;
-@@ -3906,6 +3912,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -4188,6 +4194,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
             CloseAllTabsDialog.show(
                     this, getModalDialogManagerSupplier(), tabModelSelector, closeAllTabsRunnable);
             RecordUserAction.record("MobileMenuCloseAllTabs");
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
         } else if (id == R.id.close_all_incognito_tabs_menu_id) {
             boolean allowUndo = TabClosureParamsUtils.shouldAllowUndo(triggeringMotion);
 
-@@ -4038,6 +4046,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -4335,6 +4343,41 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
         getTabModalLifetimeHandler().onOmniboxFocusChanged(hasFocus);
     }
 
@@ -128,7 +128,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -294,6 +294,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+@@ -328,6 +328,14 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
         // Bookmarks
         modelList.add(buildBookmarksItem());
 
@@ -141,12 +141,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 +                        shouldShowIconBeforeItem() ? R.drawable.ic_folder_blue_24dp : 0)));
 +
         // Recent Tabs
-         if (shouldShowRecentTabsItem()) modelList.add(buildRecentTabsItem());
- 
-@@ -479,6 +487,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.SUBMENUS_IN_APP_MENU)
+                 && shouldShowRecentTabsItem()) {
+@@ -551,6 +559,13 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
         modelList.add(buildNewTabGroupItem());
         modelList.add(buildCloseAllTabsItem());
-         if (shouldShowTinkerTank()) modelList.add(buildTinkerTankItem());
+         if (shouldShowSelectTabsItem()) modelList.add(buildSelectTabsItem());
 +        // Add bookmark all item
 +        modelList.add(new MVCListAdapter.ListItem(
 +                AppMenuHandler.AppMenuItemType.STANDARD,
@@ -154,9 +154,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 +                        R.id.bookmark_all_tabs_menu_id,
 +                        R.string.menu_bookmark_all_tabs,
 +                        shouldShowIconBeforeItem() ? R.drawable.ic_folder_blue_24dp : 0)));
-         modelList.add(buildSelectTabsItem());
         if (shouldShowQuickDeleteItem()) modelList.add(buildQuickDeleteItem());
         modelList.add(buildSettingsItem());
+     }
 diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc
 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc
 +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -194,7 +194,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
 base::android::ScopedJavaLocalRef<jobject>
 BookmarkBridge::GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env,
                                                          const GURL& url) {
-@@ -449,6 +476,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
+@@ -448,6 +475,7 @@ void BookmarkBridge::GetAllFoldersWithDepths(
   // Vector to temporarily contain all child bookmarks at same level for sorting
   std::vector<const BookmarkNode*> bookmarks = {
       bookmark_model_->mobile_node(),
@@ -202,7 +202,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
       bookmark_model_->bookmark_bar_node(),
       bookmark_model_->other_node(),
   };
-@@ -557,6 +585,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
+@@ -556,6 +584,9 @@ std::vector<const BookmarkNode*> BookmarkBridge::GetTopLevelFolderIdsImpl(
     top_level_folders.push_back(other_node);
   }
 
@@ -212,7 +212,7 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browse
   const BookmarkNode* reading_list_node =
       local_or_syncable_reading_list_manager_->GetRoot();
   if (IsPermanentFolderVisible(
-@@ -1229,6 +1260,17 @@ void BookmarkBridge::GetBookmarksOfType(
+@@ -1223,6 +1254,17 @@ void BookmarkBridge::GetBookmarksOfType(
   AddBookmarkNodesToBookmarkIdList(env, j_list, results);
 }
 
@@ -244,9 +244,9 @@ diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.h b/chrome/browser
   base::android::ScopedJavaLocalRef<jobject>
   GetMostRecentlyAddedUserBookmarkIdForUrl(JNIEnv* env, const GURL& url);
   const bookmarks::BookmarkNode* GetMostRecentlyAddedUserBookmarkIdForUrlImpl(
-@@ -240,6 +244,10 @@ class BookmarkBridge : public ProfileObserver,
+@@ -232,6 +236,10 @@ class BookmarkBridge : public ProfileObserver,
                           const base::android::JavaRef<jobject>& j_list,
-                           jint type);
+                           int32_t type);
 
 +  base::android::ScopedJavaLocalRef<jobject> GetTabsCollectionFolderId(
 +      JNIEnv* env,
@@ -370,14 +370,14 @@ diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/b
       CHECK(!model->account_other_node());
       CHECK(!model->account_mobile_node());
@@ -210,6 +211,9 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
-     base::Value::Dict* mobile_folder_value = local_permanent_folders->FindDict(
+     base::DictValue* mobile_folder_value = local_permanent_folders->FindDict(
         BookmarkCodec::kMobileBookmarkFolderNameKey);
     CHECK(mobile_folder_value);
-+    base::Value::Dict* tabs_collection_value =
+    base::DictValue* tabs_collection_value =
 +        local_permanent_folders->FindDict(BookmarkCodec::kTabsBookmarkFolderNameKey);
 +    CHECK(tabs_collection_value);
 
-     base::Value::Dict* account_permanent_folders =
+     base::DictValue* account_permanent_folders =
         account_bookmarks_.FindDict(BookmarkCodec::kRootsKey);
@@ -285,6 +289,10 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
       return bookmark_html_writer::Result::kCouldNotWriteNodes;
@@ -460,7 +460,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
-@@ -4585,6 +4585,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4703,6 +4703,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>
@@ -470,10 +470,20 @@ 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>
+@@ -4742,9 +4745,6 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+       <message name="IDS_MENU_REOPEN_CLOSED_GROUP" desc="Menu item for reopening the last closed tab group.">
+         Reopen closed group
+       </message>
+-      <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item for bookmarking all tabs.">
+-        Bookmark all tabs
+-      </message>
+ 
+       <!-- Bookmarks strings -->
+       <message name="IDS_BOOKMARKS" desc="Title of the bookmarks page, which shows a list of the user's bookmarks. [CHAR_LIMIT=18]">
 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
-@@ -105,6 +105,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
+@@ -114,6 +114,8 @@ ui::mojom::DragOperation BookmarkUIOperationsHelper::DropBookmarks(
   if (is_reorder) {
     base::UmaHistogramEnumeration("Bookmarks.ReorderDropTarget", target);
     switch (target_parent()->GetType()) {
@@ -528,15 +538,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 const char BookmarkCodec::kVersionKey[] = "version";
 const char BookmarkCodec::kChecksumKey[] = "checksum";
 const char BookmarkCodec::kChecksumSHA256Key[] = "checksum_sha256";
-@@ -98,6 +99,7 @@ base::Value::Dict BookmarkCodec::Encode(
-     const BookmarkNode* bookmark_bar_node,
-     const BookmarkNode* other_folder_node,
-     const BookmarkNode* mobile_folder_node,
-+    const BookmarkNode* tabs_folder_node,
-     std::string sync_metadata_str) {
+@@ -97,6 +98,7 @@ BookmarkCodec::~BookmarkCodec() = default;
+ base::DictValue BookmarkCodec::Encode(const BookmarkNode* bookmark_bar_node,
+                                       const BookmarkNode* other_folder_node,
+                                       const BookmarkNode* mobile_folder_node,
+                                      const BookmarkNode* tabs_folder_node,
+                                       std::string sync_metadata_str) {
   ids_reassigned_ = false;
   uuids_reassigned_ = false;
-@@ -123,6 +125,8 @@ base::Value::Dict BookmarkCodec::Encode(
+@@ -122,6 +124,8 @@ base::DictValue BookmarkCodec::Encode(const BookmarkNode* bookmark_bar_node,
     roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
     roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
     roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
@@ -545,7 +555,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
   } else {
     // No permanent node should have been provided.
     CHECK(!other_folder_node);
-@@ -143,6 +147,7 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -142,6 +146,7 @@ bool BookmarkCodec::Decode(const base::DictValue& value,
                            BookmarkNode* bb_node,
                            BookmarkNode* other_folder_node,
                            BookmarkNode* mobile_folder_node,
@@ -553,7 +563,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                            int64_t* max_id,
                            std::string* sync_metadata_str) {
   if (sync_metadata_str) {
-@@ -155,13 +160,15 @@ bool BookmarkCodec::Decode(const base::Value::Dict& value,
+@@ -154,13 +159,15 @@ bool BookmarkCodec::Decode(const base::DictValue& value,
             base::Uuid::ParseLowercase(kBookmarkBarNodeUuid),
             base::Uuid::ParseLowercase(kOtherBookmarksNodeUuid),
             base::Uuid::ParseLowercase(kMobileBookmarksNodeUuid),
@@ -570,24 +580,24 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
                               value, sync_metadata_str);
   ReassignIDsIfRequired();
 
-@@ -219,6 +226,7 @@ base::Value::Dict BookmarkCodec::EncodeMetaInfo(
+@@ -218,6 +225,7 @@ base::DictValue BookmarkCodec::EncodeMetaInfo(
 bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
                                  BookmarkNode* other_folder_node,
                                  BookmarkNode* mobile_folder_node,
 +                                 BookmarkNode* tabs_folder_node,
-                                  const base::Value::Dict& value,
+                                  const base::DictValue& value,
                                  std::string* sync_metadata_str) {
   std::optional<int> version = value.FindInt(kVersionKey);
-@@ -242,6 +250,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -240,6 +248,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
       roots->FindDict(kOtherBookmarkFolderNameKey);
-   const base::Value::Dict* mobile_folder_value =
+   const base::DictValue* mobile_folder_value =
       roots->FindDict(kMobileBookmarkFolderNameKey);
-+  const base::Value::Dict* tabs_folder_value =
+  const base::DictValue* tabs_folder_value =
 +      roots->FindDict(kTabsBookmarkFolderNameKey);
 
   if (!bb_value || !other_folder_value || !mobile_folder_value)
     return false;
-@@ -249,6 +259,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
+@@ -247,6 +257,8 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node,
   DecodeNode(*bb_value, nullptr, bb_node);
   DecodeNode(*other_folder_value, nullptr, other_folder_node);
   DecodeNode(*mobile_folder_value, nullptr, mobile_folder_node);
@@ -599,15 +609,15 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
 diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
 --- a/components/bookmarks/browser/bookmark_codec.h
 +++ b/components/bookmarks/browser/bookmark_codec.h
-@@ -44,6 +44,7 @@ class BookmarkCodec {
-       const BookmarkNode* bookmark_bar_node,
-       const BookmarkNode* other_folder_node,
-       const BookmarkNode* mobile_folder_node,
-+      const BookmarkNode* tabs_folder_node,
-       std::string sync_metadata_str);
+@@ -43,6 +43,7 @@ class BookmarkCodec {
+   base::DictValue Encode(const BookmarkNode* bookmark_bar_node,
+                          const BookmarkNode* other_folder_node,
+                          const BookmarkNode* mobile_folder_node,
+                         const BookmarkNode* tabs_folder_node,
+                          std::string sync_metadata_str);
 
   // Decodes the previously encoded value to the specified nodes as well as
-@@ -62,6 +63,7 @@ class BookmarkCodec {
+@@ -61,6 +62,7 @@ class BookmarkCodec {
               BookmarkNode* bb_node,
               BookmarkNode* other_folder_node,
               BookmarkNode* mobile_folder_node,
@@ -615,7 +625,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
               int64_t* max_node_id,
               std::string* sync_metadata_str);
 
-@@ -95,6 +97,7 @@ class BookmarkCodec {
+@@ -94,6 +96,7 @@ class BookmarkCodec {
   static const char kBookmarkBarFolderNameKey[];
   static const char kOtherBookmarkFolderNameKey[];
   static const char kMobileBookmarkFolderNameKey[];
@@ -623,12 +633,12 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
   static const char kVersionKey[];
   static const char kChecksumKey[];
   static const char kChecksumSHA256Key[];
-@@ -128,6 +131,7 @@ class BookmarkCodec {
+@@ -127,6 +130,7 @@ class BookmarkCodec {
   bool DecodeHelper(BookmarkNode* bb_node,
                     BookmarkNode* other_folder_node,
                     BookmarkNode* mobile_folder_node,
 +                    BookmarkNode* tabs_folder_node,
-                     const base::Value::Dict& value,
+                     const base::DictValue& value,
                     std::string* sync_metadata_str);
 
 diff --git a/components/bookmarks/browser/bookmark_load_details.cc b/components/bookmarks/browser/bookmark_load_details.cc
@@ -713,7 +723,7 @@ diff --git a/components/bookmarks/browser/bookmark_load_details.h b/components/b
 diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
 --- a/components/bookmarks/browser/bookmark_model.cc
 +++ b/components/bookmarks/browser/bookmark_model.cc
-@@ -907,7 +907,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
+@@ -946,7 +946,7 @@ bool BookmarkModel::HasUserCreatedBookmarksOrFolders() const {
          (account_bookmark_bar_node_ &&
           !account_bookmark_bar_node_->children().empty()) ||
          (account_other_node_ && !account_other_node_->children().empty()) ||
@@ -722,7 +732,7 @@ diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmar
 }
 
 bool BookmarkModel::IsBookmarked(const GURL& url) const {
-@@ -1239,6 +1239,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
+@@ -1278,6 +1278,7 @@ void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
   bookmark_bar_node_ = details->bb_node();
   other_node_ = details->other_folder_node();
   mobile_node_ = details->mobile_folder_node();
@@ -746,14 +756,15 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmark
   bool is_root_node(const BookmarkNode* node) const {
     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     return node == root_;
-@@ -627,6 +633,7 @@ class BookmarkModel : public BookmarkUndoProvider,
-   raw_ptr<BookmarkPermanentNode> account_bookmark_bar_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> account_other_node_ = nullptr;
-   raw_ptr<BookmarkPermanentNode> account_mobile_node_ = nullptr;
-+  raw_ptr<BookmarkPermanentNode> tabs_collection_node_ = nullptr;
+@@ -633,6 +639,8 @@ class BookmarkModel : public BookmarkUndoProvider,
+       nullptr;
+   raw_ptr<BookmarkPermanentNode, AcrossTasksDanglingUntriaged> mobile_node_ =
+       nullptr;
+  raw_ptr<BookmarkPermanentNode, AcrossTasksDanglingUntriaged> tabs_collection_node_ =
+      nullptr;
 
-   // The maximum ID assigned to the bookmark nodes in the model.
-   int64_t next_node_id_ = 1;
+   // Permanent nodes for account storage.
+   raw_ptr<BookmarkPermanentNode> account_bookmark_bar_node_ = nullptr;
 diff --git a/components/bookmarks/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
 --- a/components/bookmarks/browser/bookmark_node.cc
 +++ b/components/bookmarks/browser/bookmark_node.cc
@@ -808,7 +819,7 @@ diff --git a/components/bookmarks/browser/bookmark_node.h b/components/bookmarks
 diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
 --- a/components/bookmarks/browser/bookmark_storage.cc
 +++ b/components/bookmarks/browser/bookmark_storage.cc
-@@ -45,6 +45,7 @@ base::Value::Dict EncodeModelToDict(
+@@ -92,6 +92,7 @@ base::DictValue EncodeModelToDict(
     case BookmarkStorage::kSelectLocalOrSyncableNodes:
       return codec.Encode(
           model->bookmark_bar_node(), model->other_node(), model->mobile_node(),
@@ -816,7 +827,7 @@ diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookm
           model->client()->EncodeLocalOrSyncableBookmarkSyncMetadata());
     case BookmarkStorage::kSelectAccountNodes:
       // Either all permanent folders or none should exist.
-@@ -61,6 +62,7 @@ base::Value::Dict EncodeModelToDict(
+@@ -108,6 +109,7 @@ base::DictValue EncodeModelToDict(
       return codec.Encode(model->account_bookmark_bar_node(),
                           model->account_other_node(),
                           model->account_mobile_node(),
@@ -851,34 +862,34 @@ diff --git a/components/bookmarks/browser/bookmark_uuids.h b/components/bookmark
 diff --git a/components/bookmarks/browser/model_loader.cc b/components/bookmarks/browser/model_loader.cc
 --- a/components/bookmarks/browser/model_loader.cc
 +++ b/components/bookmarks/browser/model_loader.cc
-@@ -74,6 +74,9 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+@@ -255,6 +255,9 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
     std::unique_ptr<BookmarkPermanentNode> account_mobile_folder_node =
-         BookmarkPermanentNode::CreateMobileBookmarks(
-             0, /*is_account_node=*/true);
+         BookmarkPermanentNode::CreateMobileBookmarks(0,
+                                                      /*is_account_node=*/true);
 +    std::unique_ptr<BookmarkPermanentNode> tabs_collection_folder_node =
 +        BookmarkPermanentNode::CreateTabsCollectionBookmarks(
 +            0, /*is_account_node=*/true);
 
-     std::optional<base::Value::Dict> root_dict =
-         LoadFileToDict(account_file_path);
-@@ -81,7 +84,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
-     if (root_dict.has_value() &&
-         codec.Decode(*root_dict, /*already_assigned_ids=*/{},
-                      account_bb_node.get(), account_other_folder_node.get(),
-                     account_mobile_folder_node.get(), &max_node_id,
-+                     account_mobile_folder_node.get(),
-+                     tabs_collection_folder_node.get(), &max_node_id,
-                      &sync_metadata_str)) {
+     const base::expected<std::string, metrics::BookmarksFileLoadResult>
+         json_string = ReadFile(
+@@ -273,7 +276,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+     } else if (codec.Decode(*root_dict, /*already_assigned_ids=*/{},
+                             account_bb_node.get(),
+                             account_other_folder_node.get(),
+-                            account_mobile_folder_node.get(), &max_node_id,
+                            account_mobile_folder_node.get(),
+                            tabs_collection_folder_node.get(), &max_node_id,
+                             &sync_metadata_str)) {
       ids_assigned_to_account_nodes = codec.release_assigned_ids();
 
-@@ -123,7 +127,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
-     if (root_dict.has_value() &&
-         codec.Decode(*root_dict, std::move(ids_assigned_to_account_nodes),
-                      details->bb_node(), details->other_folder_node(),
-                     details->mobile_folder_node(), &max_node_id,
-+                     details->mobile_folder_node(),
-+                     details->tabs_collection_folder_node(), &max_node_id,
-                      &sync_metadata_str)) {
+@@ -360,7 +364,8 @@ std::unique_ptr<BookmarkLoadDetails> LoadBookmarks(
+     } else if (codec.Decode(*root_dict,
+                             std::move(ids_assigned_to_account_nodes),
+                             details->bb_node(), details->other_folder_node(),
+-                            details->mobile_folder_node(), &max_node_id,
+                            details->mobile_folder_node(),
+                            details->tabs_collection_folder_node(), &max_node_id,
+                             &sync_metadata_str)) {
       details->set_local_or_syncable_sync_metadata_str(
           std::move(sync_metadata_str));
 diff --git a/components/sync_bookmarks/bookmark_specifics_conversions.cc b/components/sync_bookmarks/bookmark_specifics_conversions.cc
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -136,6 +136,7 @@ found in the LICENSE file.
+@@ -138,6 +138,7 @@ found in the LICENSE file.
     <item type="id" name="update_menu_id" />
     <item type="id" name="new_tab_menu_id" />
     <item type="id" name="new_incognito_tab_menu_id" />
@@ -27,7 +27,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/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
-@@ -3942,6 +3942,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -4225,6 +4225,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
             }
             RecordUserAction.record("MobileMenuDownloadManager");
@@ -39,8 +39,8 @@ 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
-@@ -2818,6 +2818,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
-             return doOpenWebApk(currentTab);
+@@ -2884,6 +2884,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+             return AppInstallMenuHandler.doOpenWebApk(this, currentTab);
         }
 
 +        if (id == R.id.view_source_id) {
@@ -54,7 +54,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
-@@ -1031,6 +1031,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
+@@ -1076,6 +1076,30 @@ public abstract class AppMenuPropertiesDelegateImpl implements AppMenuProperties
         return false;
     }
 
@@ -88,8 +88,8 @@ 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
-@@ -401,6 +401,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
-             modelList.add(buildAddToHomescreenListItem(currentTab, false));
+@@ -412,6 +412,9 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
+             modelList.add(buildOpenInAppItem());
         }
 
 +        // Add view source item
@@ -101,8 +101,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
-@@ -373,6 +373,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
-             modelList.add(buildAddToHomescreenListItem(currentTab, shouldShowIconBeforeItem()));
+@@ -438,6 +438,9 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+             modelList.add(buildOpenInAppItem());
         }
 
 +        // Add view source item
@@ -114,8 +114,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 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
-@@ -342,6 +342,10 @@ CHAR_LIMIT guidelines:
-         Chrome Tips
+@@ -355,6 +355,10 @@ CHAR_LIMIT guidelines:
+         Chrome finds
       </message>
 
 +      <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">
@@ -15,10 +15,10 @@ 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
-@@ -512,7 +512,12 @@ class TabGridViewBinder {
-                     if (result != null) {
+@@ -536,7 +536,12 @@ class TabGridViewBinder {
                         TabUtils.setDrawableAndUpdateImageMatrix(thumbnail, result, thumbnailSize);
                     } else {
+                         thumbnail.setThumbnailViewState(ThumbnailViewState.PLACEHOLDER_LOADED);
 -                        thumbnail.setImageDrawable(null);
 +                        TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
 +                        if (tabFavicon != null) {
@@ -29,7 +29,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                     }
                 };
         if (sThumbnailFetcherForTesting != null) {
-@@ -550,6 +555,7 @@ class TabGridViewBinder {
+@@ -574,6 +579,7 @@ class TabGridViewBinder {
      */
     private static void setFavicon(
             ImageView faviconView, PropertyModel model, @Nullable TabFavicon favicon) {
@@ -40,7 +40,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java
-@@ -130,6 +130,9 @@ public class TabProperties {
+@@ -131,6 +131,9 @@ public class TabProperties {
     public static final WritableBooleanPropertyKey FAVICON_FETCHED =
             new WritableBooleanPropertyKey();
 
@@ -50,7 +50,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
     /** Property for lazily fetching favicons when required by an item in a UI. */
     public static final WritableObjectPropertyKey<TabListFaviconProvider.TabFaviconFetcher>
             FAVICON_FETCHER = new WritableObjectPropertyKey<>();
-@@ -224,6 +227,7 @@ public class TabProperties {
+@@ -233,6 +236,7 @@ public class TabProperties {
                 CARD_TYPE,
                 CONTENT_DESCRIPTION_TEXT_RESOLVER,
                 ACTION_BUTTON_DESCRIPTION_TEXT_RESOLVER,
@@ -58,7 +58,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
                 QUICK_DELETE_ANIMATION_STATUS,
                 TAB_GROUP_COLOR_VIEW_PROVIDER,
                 TAB_GROUP_CARD_COLOR,
-@@ -264,6 +268,7 @@ public class TabProperties {
+@@ -274,6 +278,7 @@ public class TabProperties {
                 TAB_ACTION_BUTTON_DATA,
                 FAVICON_FETCHED,
                 FAVICON_FETCHER,
@@ -84,7 +84,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
-@@ -162,6 +162,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -161,6 +161,7 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
 import org.chromium.chrome.browser.printing.TabPrinter;
@@ -92,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.ProfileManagerUtils;
-@@ -691,7 +692,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -699,7 +700,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
                     new TabContentManager(
                             this,
                             mBrowserControlsManagerSupplier.get(),
@@ -105,15 +105,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/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
-@@ -28,6 +28,7 @@ import org.chromium.base.ContextUtils;
+@@ -31,6 +31,7 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 +import java.util.function.Supplier;
- import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.ObservableSupplierImpl;
- import org.chromium.build.annotations.NullMarked;
-@@ -102,13 +103,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+ import org.chromium.base.supplier.MonotonicObservableSupplier;
+ import org.chromium.base.supplier.ObservableSuppliers;
+ import org.chromium.base.supplier.SettableMonotonicObservableSupplier;
+@@ -107,13 +108,27 @@ import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
@@ -142,7 +142,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";
-@@ -193,6 +208,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -206,6 +221,21 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
         if (shouldHideSandboxPref(privacySandboxBridge)) {
             getPreferenceScreen().removePreference(sandboxPreference);
         }
@@ -164,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
         // Record the launch of PG from the S&P link-row entry point
         privacyGuidePreference.setOnPreferenceClickListener(
-@@ -448,6 +478,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -477,6 +507,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
 
     public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
     public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
@@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-@@ -494,6 +525,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -523,6 +554,13 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
             SharedPreferences.Editor sharedPreferencesEditor = ContextUtils.getAppSharedPreferences().edit();
             sharedPreferencesEditor.putBoolean(PREF_OPEN_EXTERNAL_LINKS_INCOGNITO, (boolean)newValue);
             sharedPreferencesEditor.apply();
@@ -186,7 +186,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
         }
         return true;
     }
-@@ -544,6 +582,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -573,6 +611,10 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             : R.string.text_off);
         }
 
@@ -200,7 +200,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
-@@ -6543,6 +6543,14 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6691,6 +6691,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>
 
@@ -6,13 +6,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../layout/custom_tabs_control_container.xml  |  2 +-
 .../java/res/layout/recent_tabs_page.xml      |  2 +-
- .../java/res/values-sw600dp/dimens.xml        |  4 ++--
- chrome/android/java/res/values/dimens.xml     |  6 +++++-
+ .../java/res/values-sw600dp/dimens.xml        |  3 ++-
+ chrome/android/java/res/values/dimens.xml     |  3 ++-
 .../browser/ChromeBaseAppCompatActivity.java  |  3 +++
 .../chrome/browser/WarmupManager.java         |  7 +++++--
 .../ChromeAccessibilitySettingsDelegate.java  | 19 +++++++++++++++++++
 .../chrome/browser/app/ChromeActivity.java    |  5 ++++-
- .../overlays/strip/StripLayoutHelper.java     | 10 ++++++++--
+ .../overlays/strip/StripLayoutHelper.java     |  1 +
 .../strip/StripLayoutHelperManager.java       |  6 +++++-
 .../scene_layer/TabStripSceneLayer.java       |  8 ++++++++
 .../init/ChromeBrowserInitializer.java        |  2 ++
@@ -29,7 +29,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../java/res/layout/toolbar_tablet.xml        |  2 +-
 .../java/res/values-sw600dp/dimens.xml        |  5 +++--
 .../toolbar/java/res/values/dimens.xml        |  6 ++++--
- .../toolbar/top/ToolbarControlContainer.java  | 19 +++++++++++++++++++
+ .../toolbar/top/ToolbarControlContainer.java  |  6 ++++++
 .../browser/toolbar/top/ToolbarLayout.java    |  5 ++++-
 .../tab_strip/HeightTransitionHandler.java    |  2 ++
 .../TabStripTransitionCoordinator.java        |  6 +++++-
@@ -37,7 +37,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../accessibility/AccessibilitySettings.java  | 13 +++++++++++++
 .../AccessibilitySettingsDelegate.java        |  2 ++
 .../chromium/ui/base/DeviceFormFactor.java    | 14 ++++++++++++++
- 33 files changed, 172 insertions(+), 25 deletions(-)
+ 33 files changed, 149 insertions(+), 22 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
@@ -66,39 +66,33 @@ diff --git a/chrome/android/java/res/layout/recent_tabs_page.xml b/chrome/androi
 diff --git a/chrome/android/java/res/values-sw600dp/dimens.xml b/chrome/android/java/res/values-sw600dp/dimens.xml
 --- a/chrome/android/java/res/values-sw600dp/dimens.xml
 +++ b/chrome/android/java/res/values-sw600dp/dimens.xml
-@@ -14,8 +14,8 @@ found in the LICENSE file.
+@@ -14,7 +14,8 @@ found in the LICENSE file.
     <dimen name="compositor_tab_title_text_size">14sp</dimen>
 
     <!-- Full Screen Dimensions -->
 -    <dimen name="control_container_height">96dp</dimen>
-    <dimen name="custom_tabs_control_container_height">64dp</dimen>
 +    <dimen name="control_container_height_cromite">96dp</dimen>
-+    <dimen name="control_container_height_tabletui">96dp</dimen>
+    <dimen name="control_container_height_tabletui">56dp</dimen>
 
     <!-- NTP dimensions -->
     <dimen name="ntp_search_box_transition_start_offset">60dp</dimen>
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -116,9 +116,13 @@ found in the LICENSE file.
+@@ -116,7 +116,8 @@ found in the LICENSE file.
     <dimen name="signin_screen_top_padding">50dp</dimen>
 
     <!-- Should match toolbar_height_no_shadow -->
 -    <dimen name="control_container_height">@dimen/default_action_bar_height</dimen>
 +    <dimen name="control_container_height_cromite">@dimen/default_action_bar_height</dimen>
-+    <dimen name="control_container_height_tabletui">96dp</dimen>
+    <dimen name="control_container_height_tabletui">56dp</dimen>
     <dimen name="custom_tabs_control_container_height">@dimen/default_action_bar_height</dimen>
 
-+    <!-- The combined height of the tab strip and toolbar. -->
-+    <dimen name="tab_strip_and_toolbar_height_cromite">56dp</dimen>
-+
     <!-- Find in Page dimensions -->
-     <dimen name="find_in_page_popup_width">375dp</dimen>
-     <dimen name="find_in_page_popup_height">64dp</dimen>
 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
-@@ -66,6 +66,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
+@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeController;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeControllerCreator;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeFieldTrialImpl;
 import org.chromium.chrome.browser.ui.edge_to_edge.EdgeToEdgeUtils;
@@ -106,7 +100,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
 import org.chromium.chrome.browser.ui.edge_to_edge.SimpleEdgeToEdgeController;
 import org.chromium.components.browser_ui.styles.SemanticColorUtils;
 import org.chromium.components.browser_ui.util.AutomotiveUtils;
-@@ -155,6 +156,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
+@@ -154,6 +155,8 @@ public class ChromeBaseAppCompatActivity extends AppCompatActivity
     protected void attachBaseContext(Context newBase) {
         super.attachBaseContext(newBase);
 
@@ -118,7 +112,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCo
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.java
-@@ -63,6 +63,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
+@@ -64,6 +64,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.LayoutInflaterUtils;
@@ -126,7 +120,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;
-@@ -472,8 +473,10 @@ public class WarmupManager {
+@@ -475,8 +476,10 @@ public class WarmupManager {
             ControlContainer controlContainer = mainView.findViewById(R.id.control_container);
 
             if (toolbarId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -142,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WarmupManager.j
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -65,6 +65,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -67,6 +67,25 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
         }
     }
 
@@ -171,7 +165,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
-@@ -842,7 +842,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
+@@ -850,7 +850,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
             // Inflate the correct toolbar layout for the device.
             int toolbarLayoutId = getToolbarLayoutId();
             if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
@@ -186,7 +180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
-@@ -141,6 +141,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
+@@ -138,6 +138,7 @@ import org.chromium.components.tab_group_sync.TabGroupSyncService;
 import org.chromium.components.tab_group_sync.TriggerSource;
 import org.chromium.components.tab_groups.TabGroupColorId;
 import org.chromium.ui.accessibility.AccessibilityState;
@@ -194,34 +188,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.util.ColorUtils;
-@@ -5249,8 +5250,13 @@ public class StripLayoutHelper
-         mCloseButtonMenu.setAnchorView(tabView);
-         // 3. Set the vertical offset to align the close button menu with bottom of the tab strip
-         int tabHeight = mManagerHost.getHeight();
-        int verticalOffset =
-                -(tabHeight - (int) mContext.getResources().getDimension(R.dimen.tab_strip_height));
-+        int tab_strip_height =
-+            (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_cromite);
-+        if (DeviceFormFactor.isForceTabletUI()) {
-+            tab_strip_height =
-+                (int) mContext.getResources().getDimension(R.dimen.tab_strip_height_tabletui);
-+        }
-+        int verticalOffset = -(tabHeight - tab_strip_height);
-         mCloseButtonMenu.setVerticalOffset(verticalOffset);
- 
-         // 4. Set the horizontal offset to align the close button menu with the right side of the
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
-@@ -107,6 +107,7 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
+@@ -118,6 +118,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.gesture.BackPressHandler;
- 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;
-@@ -505,7 +506,10 @@ public class StripLayoutHelperManager
+@@ -584,7 +585,10 @@ public class StripLayoutHelperManager
         mIsHeaderCustomizationSupported =
                 ToolbarFeatures.isAppHeaderCustomizationSupported(
                         /* isTablet= */ true, DisplayUtil.isContextInDefaultDisplay(mContext));
@@ -236,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java
-@@ -120,6 +120,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
+@@ -124,6 +124,14 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
         if (mNativePtr == 0) return;
         final boolean visible = yOffset > -layoutHelper.getHeight();
 
@@ -273,7 +251,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
-@@ -811,7 +811,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -934,7 +934,9 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
 
     @Override
     public int getControlContainerHeightResource() {
@@ -287,7 +265,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
-@@ -125,6 +125,8 @@ import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
+@@ -135,6 +135,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;
@@ -296,7 +274,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteController;
 import org.chromium.chrome.browser.quick_delete.QuickDeleteDelegateImpl;
-@@ -1959,7 +1961,9 @@ public class RootUiCoordinator
+@@ -2096,7 +2098,9 @@ public class RootUiCoordinator
 
     protected int getFindToolbarStub() {
         int stubId = R.id.find_toolbar_stub;
@@ -310,7 +288,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
 diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn
 --- a/chrome/browser/preferences/BUILD.gn
 +++ b/chrome/browser/preferences/BUILD.gn
-@@ -25,6 +25,7 @@ android_library("java") {
+@@ -27,6 +27,7 @@ android_library("java") {
     "//components/cached_flags:java",
     "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/jni_zero:jni_zero_java",
@@ -321,7 +299,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
-@@ -393,6 +393,7 @@ public final class ChromePreferenceKeys {
+@@ -413,6 +413,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";
@@ -372,15 +350,15 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
 --- a/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
 +++ b/chrome/browser/ui/android/desktop_windowing/java/src/org/chromium/chrome/browser/ui/desktop_windowing/AppHeaderUtils.java
-@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.Activit
- import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
+@@ -20,6 +20,7 @@ import org.chromium.build.annotations.Nullable;
+ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher.ActivityState;
 import org.chromium.components.browser_ui.desktop_windowing.DesktopWindowStateManager;
 +import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.display.DisplayUtil;
 import org.chromium.ui.insets.InsetsRectProvider;
 
-@@ -245,6 +246,7 @@ public class AppHeaderUtils {
+@@ -169,6 +170,7 @@ public class AppHeaderUtils {
      */
     static @DesktopWindowHeuristicResult int checkIsInDesktopWindow(
             InsetsRectProvider insetsRectProvider, Context context) {
@@ -391,7 +369,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
-@@ -1022,7 +1022,7 @@ public class LocationBarCoordinator
+@@ -1050,7 +1050,7 @@ public class LocationBarCoordinator
     }
 
     private boolean isTabletWindow() {
@@ -403,7 +381,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
-@@ -1504,6 +1504,13 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1635,6 +1635,13 @@ Your Google account may have other forms of browsing history like searches and a
         Privacy guide explanation closed
       </message>
 
@@ -457,14 +435,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/control_container
 diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
 +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml
-@@ -15,7 +15,7 @@ found in the LICENSE file.
+@@ -14,7 +14,7 @@ found in the LICENSE file.
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/toolbar_height_no_shadow"
 -    android:layout_marginTop="@dimen/tab_strip_height"
 +    android:layout_marginTop="@dimen/tab_strip_height_tabletui"
     android:background="@macro/default_bg_color"
-      >
+     >
 
 diff --git a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml b/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
 --- a/chrome/browser/ui/android/toolbar/java/res/values-sw600dp/dimens.xml
@@ -506,27 +484,14 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-@@ -174,6 +175,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
+@@ -176,6 +177,11 @@ public class ToolbarControlContainer extends OptimizedFrameLayout
     @Initializer
     public void initWithToolbar(int toolbarLayoutId, int toolbarLayoutHeightResId) {
         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
 +            if (DeviceFormFactor.isForceTabletUI() && toolbarLayoutHeightResId != 0) {
-+                toolbarLayoutHeightResId = R.dimen.tab_strip_height_tabletui;
+                toolbarLayoutHeightResId = R.dimen.control_container_height_tabletui;
 +                Resources res = getContext().getResources();
 +                setMinimumHeight((int) res.getDimension(toolbarLayoutHeightResId));
-+                int tab_strip_height =
-+                    (int) res.getDimension(R.dimen.tab_strip_height_tabletui);
-+
-+                View view = findViewById(R.id.toolbar_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
-+
-+                view = findViewById(R.id.toolbar_hairline);
-+                if (view != null) view.setVisibility(View.GONE);
-+
-+                view = findViewById(R.id.find_toolbar_stub);
-+                if (view != null)
-+                    ((MarginLayoutParams)view.getLayoutParams()).topMargin = tab_strip_height;
 +            }
             mToolbarContainer = findViewById(R.id.toolbar_container);
             mToolbarLayoutHeight = getResources().getDimensionPixelSize(toolbarLayoutHeightResId);
@@ -534,7 +499,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
 +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java
-@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
+@@ -67,6 +67,7 @@ import org.chromium.chrome.browser.util.BrowserUiUtils.ModuleTypeOnStartAndNtp;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.base.ViewUtils;
 import org.chromium.ui.util.MotionEventUtils;
@@ -542,7 +507,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
 import org.chromium.ui.util.TokenHolder;
 import org.chromium.url.GURL;
 
-@@ -600,7 +601,9 @@ public abstract class ToolbarLayout extends FrameLayout
+@@ -599,7 +600,9 @@ public abstract class ToolbarLayout extends FrameLayout
      * @see Toolbar#getTabStripHeight()
      */
     public int getTabStripHeightFromResource() {
@@ -598,7 +563,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
-@@ -41,6 +41,11 @@ found in the LICENSE file.
+@@ -46,6 +46,11 @@ found in the LICENSE file.
         android:summary="@string/caret_browsing_summary"
         android:title="@string/caret_browsing_title" />
 
@@ -613,7 +578,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -35,6 +35,7 @@ import org.chromium.content_public.browser.ContentFeatureMap;
+@@ -39,6 +39,7 @@ import org.chromium.content_public.browser.ContentFeatureMap;
 import org.chromium.ui.base.UiAndroidFeatureList;
 
 import org.chromium.chrome.browser.settings.ChromeBaseSettingsFragment;
@@ -621,9 +586,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 
 /** Fragment to keep track of all the accessibility related preferences. */
 @NullMarked
-@@ -55,6 +56,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
-     public static final String PREF_TOUCHPAD_OVERSCROLL_HISTORY_NAVIGATION =
-             "touchpad_overscroll_history_navigation";
+@@ -80,6 +81,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+                 }
+             };
 
 +    private BooleanPreferenceDelegate mForceTabletUIDelegate;
 +    static final String PREF_FORCE_TABLET_UI = "force_tablet_ui";
@@ -631,9 +596,9 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
     private PageZoomPreference mPageZoomDefaultZoomPref;
     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -131,6 +135,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
-                 mDelegate.getReaderAccessibilityDelegate().getValue());
-         readerForAccessibilityPref.setOnPreferenceChangeListener(this);
+@@ -167,6 +171,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+             readerEnableLinks.setOnPreferenceChangeListener(this);
+         }
 
 +        ChromeSwitchPreference forceTabletUiPref =
 +                (ChromeSwitchPreference) findPreference(PREF_FORCE_TABLET_UI);
@@ -644,7 +609,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
         Preference captions = findPreference(PREF_CAPTIONS);
         captions.setOnPreferenceClickListener(
                 preference -> {
-@@ -217,6 +227,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -262,6 +272,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (PREF_FORCE_ENABLE_ZOOM.equals(preference.getKey())) {
             mDelegate.getForceEnableZoomAccessibilityDelegate().setValue((Boolean) newValue);
@@ -657,7 +622,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettingsDelegate.java
-@@ -41,6 +41,8 @@ public interface AccessibilitySettingsDelegate {
+@@ -42,6 +42,8 @@ public interface AccessibilitySettingsDelegate {
      */
     BrowserContextHandle getBrowserContextHandle();
 
@@ -29,7 +29,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -53,6 +53,7 @@ import org.chromium.base.ApplicationStatus;
+@@ -58,6 +58,7 @@ import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
 import org.chromium.base.CallbackUtils;
@@ -37,8 +37,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 import org.chromium.base.CommandLine;
 import org.chromium.base.DeviceInfo;
 import org.chromium.base.IntentUtils;
-@@ -2201,8 +2202,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
-                         CipherLazyHolder.sCipherInstance.restoreFromBundle(getSavedInstanceState());
+@@ -2309,8 +2310,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+                         ActivityRestoreState.NUM_ENTRIES);
             }
 
 +            String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -9,6 +9,7 @@ import static org.chromium.components.content_settings.PrefNames.COOKIE_CONTROLS
+@@ -10,6 +10,7 @@ import static org.chromium.ui.R.drawable.gshield_colorful;
 
 import android.content.Context;
 import android.content.Intent;
@@ -60,15 +60,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
-@@ -22,6 +23,7 @@ import androidx.annotation.VisibleForTesting;
- import androidx.preference.Preference;
+@@ -25,6 +26,7 @@ import androidx.preference.Preference;
 
+ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Callback;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.IntentUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-@@ -116,6 +118,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -121,6 +123,8 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     private final SharedPreferencesManager mSharedPreferencesManager =
             ChromeSharedPreferences.getInstance();
 
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
     @VisibleForTesting static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
     private static final String PREF_ADVANCED_PROTECTION_INFO = "advanced_protection_info";
-@@ -389,7 +393,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -418,7 +422,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
             UserPrefs.get(getProfile())
                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
         } else if (PREF_HTTPS_FIRST_MODE_LEGACY.equals(key)) {
-@@ -449,6 +457,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -478,6 +486,11 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
                             getContext(), getProfile()));
         }
 
@@ -128,7 +128,7 @@ diff --git a/chrome/browser/tab_group_sync/android/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
-@@ -2896,6 +2896,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3021,6 +3021,12 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
       <message name="IDS_ACCESSIBILITY_TAB_SWITCHER_TITLE" desc="Accessibility label of the current window when Grid Tab Switcher is shown.">
         All tabs
       </message>
@@ -24,7 +24,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
 +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java
-@@ -101,6 +101,7 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationTyp
+@@ -102,6 +102,7 @@ import org.chromium.components.collaboration.messaging.PersistentNotificationTyp
 import org.chromium.components.data_sharing.DataSharingService;
 import org.chromium.components.data_sharing.GroupMember;
 import org.chromium.components.data_sharing.member_role.MemberRole;
@@ -32,7 +32,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 import org.chromium.components.tab_group_sync.EitherId.EitherGroupId;
 import org.chromium.components.tab_group_sync.LocalTabGroupId;
 import org.chromium.components.tab_group_sync.TabGroupSyncService;
-@@ -121,6 +122,9 @@ import java.util.Objects;
+@@ -122,6 +123,9 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -42,7 +42,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 /**
  * A mediator for the TabGridDialog component, responsible for communicating with the components'
  * coordinator as well as managing the business logic for dialog show/hide.
-@@ -1023,9 +1027,15 @@ public class TabGridDialogMediator
+@@ -1017,9 +1021,15 @@ public class TabGridDialogMediator
             UrlConstantResolver urlConstantResolver =
                     UrlConstantResolverFactory.getForProfile(profile);
 
@@ -70,7 +70,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
 import org.chromium.chrome.browser.layouts.LayoutStateProvider.LayoutStateObserver;
 import org.chromium.chrome.browser.layouts.LayoutType;
 import org.chromium.chrome.browser.profiles.Profile;
-@@ -425,10 +426,15 @@ public class TabGroupUiMediator implements BackPressHandler {
+@@ -426,10 +427,15 @@ public class TabGroupUiMediator implements BackPressHandler {
                             UrlConstantResolverFactory.getForProfile(currentTabProfile);
 
                     Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);
@@ -105,7 +105,7 @@ diff --git a/chrome/android/java/res/xml/homepage_preferences.xml b/chrome/andro
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabGroupContextMenuCoordinator.java
-@@ -92,6 +92,9 @@ import java.util.List;
+@@ -96,6 +96,9 @@ import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 
@@ -115,7 +115,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
 /**
  * A coordinator for the context menu on the tab strip by long-pressing on the group titles. It is
  * responsible for creating a list of menu items, setting up the menu and displaying the menu.
-@@ -245,9 +248,14 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper<Tok
+@@ -249,9 +252,14 @@ public class TabGroupContextMenuCoordinator extends TabStripReorderingHelper<Tok
                 UrlConstantResolver resolver =
                         UrlConstantResolverFactory.getForProfile(
                                 tabGroupModelFilter.getTabModel().getProfile());
@@ -160,7 +160,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/Homepa
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/settings/HomepageSettings.java
-@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
+@@ -28,6 +28,7 @@ import org.chromium.components.browser_ui.settings.SettingsUtils;
 import org.chromium.components.embedder_support.util.UrlUtilities;
 import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.url.GURL;
@@ -168,7 +168,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 
 /** Fragment that allows the user to configure homepage related preferences. */
 @NullMarked
-@@ -36,6 +37,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+@@ -37,6 +38,8 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
     @VisibleForTesting
     public static final String PREF_HOMEPAGE_RADIO_GROUP = "homepage_radio_group";
 
@@ -176,8 +176,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/settin
 +
     private HomepageManager mHomepageManager;
     private RadioButtonGroupHomepagePreference mRadioButtons;
-     private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-@@ -103,6 +106,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
+     private final SettableMonotonicObservableSupplier<String> mPageTitle =
+@@ -105,6 +108,15 @@ public class HomepageSettings extends ChromeBaseSettingsFragment {
         mRadioButtons.setOnHomepagePreferenceChangeListener(this::onRadioButtonGroupChanged);
         mRadioButtons.setupPreferenceValues(createPreferenceValuesForRadioGroup());
 
@@ -207,7 +207,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/LaunchM
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
-@@ -25,6 +25,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
+@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingDelegateFact
 import org.chromium.chrome.browser.app.tab_activity_glue.ReparentingTask;
 import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -215,7 +215,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
 import org.chromium.chrome.browser.profiles.Profile;
-@@ -576,6 +577,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
+@@ -575,6 +576,13 @@ public class ChromeTabCreator implements TabCreator, NeedsTabModel, NeedsTabMode
      */
     public @Nullable Tab launchUrl(
             String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {
@@ -232,7 +232,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
-@@ -406,6 +406,7 @@ public final class ChromePreferenceKeys {
+@@ -426,6 +426,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";
 
@@ -254,7 +254,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
-@@ -1345,6 +1345,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1465,6 +1465,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>
@@ -267,19 +267,19 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -123,6 +123,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -128,6 +128,8 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
                                 pref_registration_flags);
   registry->RegisterBooleanPref(prefs::kPinSplitTabButton, false,
                                 pref_registration_flags);
 +  registry->RegisterBooleanPref(prefs::kNewTabPageIsHomePage, false,
 +                                PrefRegistry::NO_REGISTRATION_FLAGS);
 
-   registry->RegisterInt64Pref(prefs::kDefaultBrowserLastDeclined, 0);
+   registry->RegisterInt64Pref(prefs::kDefaultBrowserInfobarLastDeclined, 0);
   registry->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true);
 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
-@@ -1344,6 +1344,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
+@@ -868,6 +868,10 @@ inline constexpr char kSplitViewDragAndDropNudgeUsedCount[] =
 // by enterprise policy.
 inline constexpr char kGeminiSettings[] = "browser.gemini_settings";
 
@@ -55,7 +55,7 @@ HcmV?d00001
 diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
 --- a/components/search_engines/BUILD.gn
 +++ b/components/search_engines/BUILD.gn
-@@ -72,6 +72,7 @@ static_library("search_engines") {
+@@ -74,6 +74,7 @@ static_library("search_engines") {
     "//third_party/metrics_proto",
     "//third_party/omnibox_proto",
     "//third_party/search_engines_data:prepopulated_engines",
@@ -63,18 +63,18 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUIL
   ]
 
   deps = [
-@@ -161,6 +162,7 @@ source_set("search_engine_utils") {
-     ":search_engine_type",
-     "//components/google/core/common",
+@@ -165,6 +166,7 @@ source_set("search_engine_utils") {
+     "//components/regional_capabilities",
+     "//components/regional_capabilities:switches",
     "//third_party/search_engines_data:prepopulated_engines",
 +    "cromite:cromite_prepopulated_engines",
   ]
 
   deps = [ "//url" ]
-@@ -256,6 +258,7 @@ source_set("unit_tests") {
-     "//testing/gmock",
+@@ -264,6 +266,7 @@ source_set("unit_tests") {
     "//testing/gtest",
     "//third_party/search_engines_data:prepopulated_engines",
+     "//third_party/search_engines_data:regional_settings",
 +    "cromite:cromite_prepopulated_engines",
     "//ui/base",
     "//url",
@@ -141,7 +141,7 @@ new file mode 100644
 diff --git a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 --- a/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
 +++ b/components/search_engines/search_engine_choice/search_engine_choice_utils.cc
-@@ -209,14 +209,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
+@@ -211,14 +211,7 @@ void RecordChoiceScreenDefaultSearchProviderType(
 }
 
 void RecordChoiceScreenSelectedIndex(int selected_engine_index) {
@@ -160,12 +160,12 @@ diff --git a/components/search_engines/search_engine_choice/search_engine_choice
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -98,11 +98,16 @@ enum SearchEngineType {
-   SEARCH_ENGINE_FREESPOKE = 78,
+@@ -99,11 +99,16 @@ enum SearchEngineType {
   SEARCH_ENGINE_KAGI = 79,
   SEARCH_ENGINE_STARTER_PACK_AI_MODE = 80,
-+  SEARCH_ENGINE_GOOGLE_EN = 81,
-+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 82,
+   SEARCH_ENGINE_YAHOO_JP = 81,
+  SEARCH_ENGINE_GOOGLE_EN = 82,
+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 83,
 
   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
 };
@@ -180,7 +180,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -27,6 +27,8 @@
+@@ -29,6 +29,8 @@
 #include "components/search_engines/template_url_data_util.h"
 #include "third_party/search_engines_data/resources/definitions/prepopulated_engines.h"
 
@@ -189,8 +189,8 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 namespace TemplateURLPrepopulateData {
 
 // Helpers --------------------------------------------------------------------
-@@ -153,7 +155,7 @@ int GetDataVersion(PrefService* prefs) {
-       kCurrentDataVersion;
+@@ -172,7 +174,7 @@ int GetDataVersion(PrefService* prefs) {
+   return kCurrentDataVersion;
 }
 
 -std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
@@ -198,7 +198,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
     PrefService& prefs,
     const std::vector<const PrepopulatedEngine*>&
         regional_prepopulated_engines) {
-@@ -169,6 +171,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
+@@ -188,6 +190,17 @@ std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
                         &PrepopulatedEngineToTemplateURLData);
 }
 
@@ -216,7 +216,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon
 std::unique_ptr<TemplateURLData> GetPrepopulatedEngine(
     PrefService& prefs,
     const std::vector<const PrepopulatedEngine*>& regional_prepopulated_engines,
-@@ -189,10 +202,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
+@@ -208,10 +221,14 @@ std::vector<std::unique_ptr<TemplateURLData>> GetLocalPrepopulatedEngines(
     return std::vector<std::unique_ptr<TemplateURLData>>();
   }
 
@@ -402,7 +402,7 @@ diff --git a/tools/json_to_struct/struct_generator.py b/tools/json_to_struct/str
 diff --git a/tools/variations/fieldtrial_to_struct.py b/tools/variations/fieldtrial_to_struct.py
 --- a/tools/variations/fieldtrial_to_struct.py
 +++ b/tools/variations/fieldtrial_to_struct.py
-@@ -235,14 +235,14 @@ def main(arguments):
+@@ -210,14 +210,14 @@ def main(arguments):
   json_to_struct.GenerateStruct(
       basepath, output_root, opts.namespace, schema, description,
       os.path.split(description_filename)[1], os.path.split(opts.schema)[1],
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browsing_data/BrowsingDataBridge.java     | 12 +--
 .../ClearBrowsingDataFragment.java            | 37 +++++++--
 .../ClearBrowsingDataFragmentAtStart.java     | 79 +++++++++++++++++++
- chrome/app/settings_strings.grdp              | 10 +++
+ chrome/app/settings_strings.grdp              |  8 ++
 chrome/browser/about_flags.cc                 |  1 +
 .../browsing_data/browsing_data_bridge.cc     | 17 +++-
 .../chrome_browsing_data_lifetime_manager.cc  | 22 +++++-
@@ -20,18 +20,24 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../profiles/android/profile_manager_utils.cc |  5 ++
 chrome/browser/profiles/profile_manager.cc    | 17 +++-
 chrome/browser/profiles/profile_manager.h     |  2 +
- .../clear_browsing_data_dialog.html           | 44 +++++++++++
- .../clear_browsing_data_dialog.ts             |  2 +
+ .../clear_browsing_data_browser_proxy.ts      |  1 +
+ .../clear_browsing_data_dialog_v2.html        | 20 ++++-
+ .../clear_browsing_data_dialog_v2.ts          | 62 ++++++++++++++-
+ .../clear_browsing_data_time_picker.ts        |  6 +-
+ .../settings/privacy_page/privacy_page.html   | 12 +++
+ .../settings/privacy_page/privacy_page.ts     | 10 +++
+ .../privacy_page/privacy_page_index.ts        |  2 +-
+ chrome/browser/resources/settings/route.ts    |  2 +
+ chrome/browser/resources/settings/router.ts   |  1 +
 .../strings/android_chrome_strings.grd        |  3 +
 .../Add-setting-to-clear-data-on-exit.grdp    |  9 +++
- .../settings_localized_strings_provider.cc    |  1 +
+ .../settings_localized_strings_provider.cc    |  4 +
 .../content/browsing_data_helper.cc           |  9 ++-
 components/browsing_data/core/BUILD.gn        |  5 ++
 .../core/browsing_data_policies_utils.cc      | 20 ++---
 .../core/browsing_data_policies_utils.h       | 11 +++
 .../browsing_data/core/browsing_data_utils.cc | 31 ++++++++
 .../core/clear_browsing_data_tab.h            |  3 +-
- components/browsing_data/core/features.h      |  1 +
 components/browsing_data/core/pref_names.cc   | 17 ++++
 components/browsing_data/core/pref_names.h    | 10 +++
 components/favicon/core/favicon_database.cc   |  9 +++
@@ -41,7 +47,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 content/browser/storage_partition_impl.cc     |  2 +
 .../public/browser/browsing_data_remover.h    |  7 +-
 .../Add-setting-to-clear-data-on-exit.inc     |  8 ++
- 37 files changed, 415 insertions(+), 35 deletions(-)
+ 43 files changed, 473 insertions(+), 47 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentAtStart.java
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-clear-data-on-exit.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-clear-data-on-exit.inc
@@ -49,7 +55,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -273,6 +273,7 @@ chrome_java_sources = [
+@@ -295,6 +295,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataCheckBoxPreference.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFetcher.java",
   "java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java",
@@ -75,7 +81,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -219,6 +219,7 @@ import org.chromium.chrome.browser.profiles.ProfileProvider;
+@@ -231,6 +231,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;
@@ -83,7 +89,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;
-@@ -2206,7 +2207,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -2293,7 +2294,11 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
             }
             if (!hadCipherData) {
                 hadCipherData =
@@ -95,7 +101,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 +                }
             }
 
-             String PREF_CLOSE_TABS_ON_EXIT = "close_tabs_on_exit";
+             boolean hasSavedOrPersistentInstanceState =
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridge.java
@@ -137,7 +143,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/B
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
-@@ -167,6 +167,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -168,6 +168,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
             assert mCheckbox == preference;
 
             mParent.updateButtonState();
@@ -150,16 +156,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
             return true;
         }
 
-@@ -248,7 +254,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -249,7 +255,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
     private @TimePeriod int mLastSelectedTimePeriod;
     private boolean mShouldShowPostDeleteFeedback;
 
-    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
-+    protected final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+-    private final SettableMonotonicObservableSupplier<String> mPageTitle =
+    protected final SettableMonotonicObservableSupplier<String> mPageTitle =
+             ObservableSuppliers.createMonotonic();
 
     /**
-      * @return All available {@link DialogOption} entries.
-@@ -354,7 +360,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -356,7 +362,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
     }
 
     /** Called when browsing data is about to be cleared. */
@@ -168,7 +174,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         RecordUserAction.record("ClearBrowsingData_AdvancedTab");
     }
 
-@@ -440,6 +446,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -442,6 +448,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
             BrowsingDataBridge.getForProfile(getProfile())
                     .setBrowsingDataDeletionPreference(
                             ClearBrowsingDataFragment.getDataType(item.getOption()),
@@ -176,7 +182,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
                             item.isSelected());
         }
 
-@@ -447,8 +454,16 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -449,8 +456,16 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                 .setBrowsingDataDeletionTimePeriod(mLastSelectedTimePeriod);
     }
 
@@ -194,7 +200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         String referrer =
                 fragmentArgs.getString(
                         ClearBrowsingDataFragment.CLEAR_BROWSING_DATA_REFERRER, null);
-@@ -474,6 +489,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -476,6 +491,10 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                 DialogOption.CLEAR_SITE_SETTINGS);
     }
 
@@ -205,7 +211,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.
      *
-@@ -482,7 +501,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -484,7 +503,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      */
     private boolean isOptionSelectedByDefault(@DialogOption int option) {
         return BrowsingDataBridge.getForProfile(getProfile())
@@ -214,7 +220,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     }
 
     /**
-@@ -550,6 +569,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -552,6 +571,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
      * options.
      */
     private void onClearButtonClicked() {
@@ -222,7 +228,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
         if (shouldShowImportantSitesDialog()) {
             showImportantDialogThenClear();
             return;
-@@ -579,6 +599,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -581,6 +601,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
         Button clearButton = (Button) assumeNonNull(getView()).findViewById(R.id.clear_button);
         boolean isEnabled = !getSelectedOptions().isEmpty();
         clearButton.setEnabled(isEnabled);
@@ -230,7 +236,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
     }
 
     private int getSpinnerIndex(
-@@ -656,7 +677,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -658,7 +679,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                             .getBoolean(Pref.ALLOW_DELETING_BROWSER_HISTORY)) {
                 enabled = false;
                 browsingDataBridge.setBrowsingDataDeletionPreference(
@@ -239,7 +245,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
             }
 
             // Disable tabs closure if the user is in multi-window mode.
-@@ -686,8 +707,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -688,8 +709,12 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
         mSigninManager.addSignInStateObserver(this);
 
         setHasOptionsMenu(true);
@@ -250,9 +256,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/C
 +    protected void onCustomizePreferences(Bundle savedInstanceState, String rootKey) {}
 +
     @Override
-     public ObservableSupplier<String> getPageTitle() {
+     public MonotonicObservableSupplier<String> getPageTitle() {
         return mPageTitle;
-@@ -989,7 +1014,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
+@@ -990,7 +1015,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
                 public void updateDynamicPreferences(
                         Context context, SettingsIndexData indexData, Profile profile) {
                     Bundle args = createFragmentArgs(context.getClass().getName());
@@ -348,18 +354,16 @@ new file mode 100644
 diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 --- a/chrome/app/settings_strings.grdp
 +++ b/chrome/app/settings_strings.grdp
-@@ -2228,6 +2228,16 @@
+@@ -2222,6 +2222,14 @@
   <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA" desc="Text for delete browsing data button in Privacy options">
     Delete browsing data
   </message>
 +  <if expr="is_win or is_linux">
-+    <message name="IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE" desc="The title of the tab showing the at start clear browsing data options.">
-+      At Close
+    <message name="IDS_SETTINGS_CLEAR_BROWSING_DATA_AT_CLOSE" desc="The title of the tab showing the at close clear browsing data options.">
+      Clear browsing data when closing Cromite
 +    </message>
-+  </if>
-+  <if expr="is_android">
-+    <message name="IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE" desc="The title of the tab showing the at start clear browsing data options.">
-+      At Startup
+    <message name="IDS_SETTINGS_CLEAR_DATA_AT_CLOSE_DESCRIPTION" desc="Description for delete browsing data button at close in Privacy options. 'History' refers to browsing history. 'Cookies' refers to the technical meaning of a cookie, i.e. data saved by a website on the user's computer, as in when a website saves your preferences.">
+      Choose what to automatically delete when you close Cromite
 +    </message>
 +  </if>
   <message name="IDS_SETTINGS_CLEAR_DATA_DESCRIPTION" desc="Description for delete browsing data button in Privacy options. 'History' refers to browsing history. 'Cookies' refers to the technical meaning of a cookie, i.e. data saved by a website on the user's computer, as in when a website saves your preferences.">
@@ -368,7 +372,7 @@ diff --git a/chrome/app/settings_strings.grdp b/chrome/app/settings_strings.grdp
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -105,6 +105,7 @@
+@@ -113,6 +113,7 @@
 #include "components/enterprise/client_certificates/core/features.h"
 #include "components/enterprise/data_controls/core/browser/features.h"
 #include "components/error_page/common/error_page_switches.h"
@@ -379,7 +383,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
 +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
-@@ -66,6 +66,15 @@ PrefService* GetPrefService(Profile* profile) {
+@@ -65,6 +65,15 @@ PrefService* GetPrefService(Profile* profile) {
   return profile->GetOriginalProfile()->GetPrefs();
 }
 
@@ -395,17 +399,17 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
 void OnBrowsingDataModelBuilt(JNIEnv* env,
                               const ScopedJavaGlobalRef<jobject>& java_callback,
                               std::unique_ptr<BrowsingDataModel> model) {
-@@ -218,7 +227,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
+@@ -217,7 +226,8 @@ static void JNI_BrowsingDataBridge_MarkOriginAsImportantForTesting(
 static bool JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
     JNIEnv* env,
     Profile* profile,
-    jint data_type) {
-+    jint data_type,
+-    int32_t data_type) {
+    int32_t data_type,
 +    jint clear_browsing_data_tab) {
   DCHECK_GE(data_type, 0);
   DCHECK_LE(data_type,
             static_cast<int>(browsing_data::BrowsingDataType::MAX_VALUE));
-@@ -230,7 +240,7 @@ static bool JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
+@@ -229,7 +239,7 @@ static bool JNI_BrowsingDataBridge_GetBrowsingDataDeletionPreference(
   std::string pref;
   if (!browsing_data::GetDeletionPreferenceFromDataType(
           static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -414,15 +418,15 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chro
     return false;
   }
 
-@@ -241,6 +251,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+@@ -240,6 +250,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
     JNIEnv* env,
     Profile* profile,
-     jint data_type,
+     int32_t data_type,
 +    jint clear_browsing_data_tab,
     bool value) {
   DCHECK_GE(data_type, 0);
   DCHECK_LE(data_type,
-@@ -249,7 +260,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
+@@ -248,7 +259,7 @@ static void JNI_BrowsingDataBridge_SetBrowsingDataDeletionPreference(
   std::string pref;
   if (!browsing_data::GetDeletionPreferenceFromDataType(
           static_cast<browsing_data::BrowsingDataType>(data_type),
@@ -434,13 +438,13 @@ 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
-@@ -327,8 +327,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
+@@ -325,8 +325,25 @@ void ChromeBrowsingDataLifetimeManager::Shutdown() {
 
 void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
     bool keep_browser_alive) {
-  const base::Value::List& data_types = profile_->GetPrefs()->GetList(
+-  const base::ListValue& data_types = profile_->GetPrefs()->GetList(
 -      browsing_data::prefs::kClearBrowsingDataOnExitList);
-+  base::Value::List data_types = profile_->GetPrefs()->GetList(
+  base::ListValue data_types = profile_->GetPrefs()->GetList(
 +      browsing_data::prefs::kClearBrowsingDataOnExitList).Clone();
 +
 +  if (profile_->GetPrefs()->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistoryAtStart))
@@ -462,7 +466,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 
   if (!data_types.empty() &&
       IsConditionSatisfiedForBrowsingDataRemoval(GetSyncTypesForPolicyPref(
-@@ -437,6 +454,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
+@@ -435,6 +452,7 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
 bool ChromeBrowsingDataLifetimeManager::
     IsConditionSatisfiedForBrowsingDataRemoval(
         const syncer::UserSelectableTypeSet sync_types) {
@@ -473,7 +477,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.
 diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
 +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
-@@ -321,6 +321,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -317,6 +317,7 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     uint64_t origin_type_mask,
     base::OnceCallback<void(uint64_t)> callback) {
   CHECK(((remove_mask &
@@ -481,7 +485,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
           ~content::BrowsingDataRemover::DATA_TYPE_AVOID_CLOSING_CONNECTIONS &
           ~constants::FILTERABLE_DATA_TYPES) == 0) ||
         filter_builder->MatchesAllOriginsAndDomains());
-@@ -424,6 +425,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -420,6 +421,9 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
           CreateTaskCompletionClosure(TracingDataType::kHistory),
           &history_task_tracker_);
     }
@@ -491,7 +495,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     if (ClipboardRecentContent::GetInstance())
       ClipboardRecentContent::GetInstance()->SuppressClipboardContent();
 
-@@ -532,6 +536,11 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -527,6 +531,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()) {
@@ -503,7 +507,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&)>()
-@@ -560,9 +569,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -555,9 +564,13 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
     }
 
     device_event_log::Clear(delete_begin_, delete_end_);
@@ -517,7 +521,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
     content::BackgroundTracingManager::GetInstance().DeleteTracesInDateRange(
         delete_begin_, delete_end_);
 
-@@ -1287,6 +1300,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
+@@ -1276,6 +1289,8 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
 
     if (should_clear_zero_suggest_and_session_token && template_url_service)
       template_url_service->ClearSessionToken();
@@ -529,7 +533,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
 diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chrome/browser/extensions/api/settings_private/prefs_util.cc
 --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
 +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -557,6 +557,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
+@@ -591,6 +591,23 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlistedKeys() {
   (*s_allowlist)[browsing_data::prefs::kLastClearBrowsingDataTab] =
       settings_api::PrefType::kNumber;
 
@@ -556,7 +560,7 @@ diff --git a/chrome/browser/extensions/api/settings_private/prefs_util.cc b/chro
 diff --git a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 --- a/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
 +++ b/chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManagerUtils.java
-@@ -56,11 +56,16 @@ public class ProfileManagerUtils {
+@@ -69,11 +69,16 @@ public class ProfileManagerUtils {
         }
     }
 
@@ -589,7 +593,7 @@ diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/b
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1523,6 +1523,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
+@@ -1566,6 +1566,19 @@ void ProfileManager::DoFinalInit(ProfileInfo* profile_info,
   }
 }
 
@@ -609,7 +613,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_ ||
-@@ -2192,9 +2205,9 @@ void ProfileManager::OnBrowserClosed(Browser* browser) {
+@@ -2307,9 +2320,9 @@ void ProfileManager::OnBrowserClosed(BrowserWindowInterface* browser) {
   // Do nothing if the closed window is not the last window of the same profile.
   bool has_other_window = false;
   ForEachCurrentBrowserWindowInterfaceOrderedByActivation(
@@ -624,7 +628,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
 --- a/chrome/browser/profiles/profile_manager.h
 +++ b/chrome/browser/profiles/profile_manager.h
-@@ -231,6 +231,8 @@ class ProfileManager : public Profile::Delegate {
+@@ -264,6 +264,8 @@ class ProfileManager : public Profile::Delegate {
   //   profiles.
   std::vector<Profile*> GetLoadedProfiles() const;
 
@@ -633,83 +637,356 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles
   // If a profile with the given path is currently managed by this object and
   // fully initialized, return a pointer to the corresponding Profile object;
   // otherwise return null.
-diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
-+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html
-@@ -297,6 +297,50 @@
-                 disabled="[[clearingInProgress_]]" no-set-pref>
-             </settings-checkbox>
-           </div>
-+          <div id="atstart-tab">
-+           <settings-checkbox
-+                pref="{{prefs.browser.clear_data.browsing_history_at_start}}"
-+                label="$i18n{clearBrowsingHistory}"
-+                sub-label="[[counters_.browsing_history]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                pref="{{prefs.browser.clear_data.download_history_at_start}}"
-+                label="$i18n{clearDownloadHistory}"
-+                sub-label="[[counters_.download_history]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                class="cookies-checkbox"
-+                pref="{{prefs.browser.clear_data.cookies_at_start}}"
-+                label="$i18n{clearCookies}"
-+                sub-label="[[counters_.cookies]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                class="cache-checkbox"
-+                pref="{{prefs.browser.clear_data.cache_at_start}}"
-+                label="$i18n{clearCache}"
-+                sub-label="[[counters_.cache]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                pref="{{prefs.browser.clear_data.passwords_at_start}}"
-+                label="$i18n{clearPasswords}"
-+                sub-label="[[counters_.passwords]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                pref="{{prefs.browser.clear_data.form_data_at_start}}"
-+                label="$i18n{clearFormData}"
-+                sub-label="[[counters_.form_data]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                pref="{{prefs.browser.clear_data.site_settings_at_start}}"
-+                label="$i18nPolymer{siteSettings}"
-+                sub-label="[[counters_.site_settings]]">
-+            </settings-checkbox>
-+            <settings-checkbox
-+                pref="{{prefs.browser.clear_data.hosted_apps_data_at_start}}"
-+                label="$i18n{clearHostedAppData}"
-+                sub-label="[[counters_.hosted_apps_data]]">
-+            </settings-checkbox>
-+          </div>
-         </cr-page-selector>
-       </div>
-       <div slot="button-container">
-diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.ts
-@@ -216,6 +216,7 @@ export class SettingsClearBrowsingDataDialogElement extends
-         value: () =>
-             [loadTimeData.getString('basicPageTitle'),
-              loadTimeData.getString('advancedPageTitle'),
-+             loadTimeData.getString('atStartPageTitle'),
-     ],
-       },
+diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts
+--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts
+@@ -42,6 +42,7 @@ export enum BrowsingDataType {
+   SITE_SETTINGS = 5,
+   DOWNLOADS = 6,
+   HOSTED_APPS_DATA = 7,
+  PASSWORDS = 8,
+   // TABS = 8, Not used on Desktop.
+ }
+ // LINT.ThenChange(/components/browsing_data/core/browsing_data_utils.h:BrowsingDataType)
+diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.html b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.html
+--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.html
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.html
+@@ -40,6 +40,8 @@
 
-@@ -344,6 +345,7 @@ export class SettingsClearBrowsingDataDialogElement extends
-     }
-     this.clearButtonDisabled_ =
-         this.getSelectedDataTypes_(page as HTMLElement).length === 0;
-+    if ((page as HTMLElement).id == "atstart-tab") this.clearButtonDisabled_ = true;
+   #deleteBrowsingDataDialog::part(dialog) {
+     max-height: var(--dbd-dialog-max-height);
+    top: 300px;
+    width: 590px;
   }
 
-   /**
+   #deletingDataAlert {
+@@ -99,18 +101,25 @@
+ <cr-dialog id="deleteBrowsingDataDialog" close-text="$i18n{close}"
+     show-on-attach ignore-popstate ignore-enter-key
+     hidden="[[showOtherGoogleDataDialog_]]">
+<template is="dom-if" if="[[!clearBrowsingDialogAtClose]]">
+   <div slot="title" class="dialog-title">$i18n{clearBrowsingData}</div>
+</template>
+<template is="dom-if" if="[[clearBrowsingDialogAtClose]]">
+  <div slot="title" class="dialog-title">$i18n{clearBrowsingDataAtClose}</div>
+</template>
+   <div slot="header">
+<template is="dom-if" if="[[!clearBrowsingDialogAtClose]]">
+     <settings-clear-browsing-data-time-picker id="timePicker" prefs="{{prefs}}"
+         on-selected-time-period-change="onTimePeriodChanged_">
+     </settings-clear-browsing-data-time-picker>
+</template>
+   </div>
+   <div slot="body">
+     <div id="checkboxContainer">
+       <template is="dom-repeat"
+           items="[[expandedBrowsingDataTypeOptionsList_]]">
+-        <settings-checkbox pref="{{item.pref}}" no-set-pref
+-            sub-label-html="[[item.subLabel]]"
+        <settings-checkbox pref="{{item.pref}}" no-set-pref="[[!clearBrowsingDialogAtClose]]"
+            sub-label-html="[[shouldShowSubLabel_(item.subLabel)]]"
+             disabled="[[isDeletionInProgress_]]"
+             on-sub-label-link-clicked="onCheckboxSubLabelLinkClick_">
+           <div class="checkbox-title">[[item.label]]</div>
+@@ -137,12 +146,14 @@
+       <cr-icon icon="cr:expand-more" aria-hidden="true" role="presentation">
+       </cr-icon>
+     </cr-button>
+<template is="dom-if" if="[[!clearBrowsingDialogAtClose]]">
+     <cr-link-row id="manageOtherGoogleDataRow"
+         label="[[otherGoogleDataRowLabel_]]"
+         sub-label="[[otherGoogleDataRowSubLabel_]]"
+         on-click="onManageOtherGoogleDataRowClick_"
+         role-description="$i18n{subpageArrowRoleDescription}">
+     </cr-link-row>
+</template>
+   </div>
+   <div slot="button-container" class="row-aligned">
+ <if expr="not is_chromeos">
+@@ -152,9 +163,10 @@
+     <div id="spinner" class="spinner" hidden="[[!isDeletionInProgress_]]"></div>
+     <cr-button id="cancelButton" class="cancel-button" on-click="onCancelClick_"
+         disabled="[[isDeletionInProgress_]]" autofocus>
+-      $i18n{cancel}
+      $i18n{close}
+     </cr-button>
+     <cr-button id="deleteButton" class="action-button"
+        hidden="[[clearBrowsingDialogAtClose]]"
+         on-click="onDeleteBrowsingDataClick_"
+         disabled="[[shouldDisableDeleteButton_(
+             isDeletionInProgress_, isNoDatatypeSelected_)]]">
+@@ -177,4 +189,4 @@
+ <template is="dom-if" if="[[showOtherGoogleDataDialog_]]" restamp>
+   <settings-other-google-data-dialog on-cancel="onOtherGoogleDataDialogClose_">
+   </settings-other-google-data-dialog>
+-</template>
+\ No newline at end of file
+</template>
+diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
+--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog_v2.ts
+@@ -91,6 +91,17 @@ const ALL_BROWSING_DATATYPES_LIST: BrowsingDataType[] = [
+   BrowsingDataType.HOSTED_APPS_DATA,
+ ];
+ 
+const ALL_BROWSING_DATATYPES_LIST_AT_CLOSE: BrowsingDataType[] = [
+  BrowsingDataType.HISTORY,
+  BrowsingDataType.SITE_DATA,
+  BrowsingDataType.CACHE,
+  BrowsingDataType.DOWNLOADS,
+  BrowsingDataType.FORM_DATA,
+  BrowsingDataType.SITE_SETTINGS,
+  BrowsingDataType.PASSWORDS,
+  BrowsingDataType.HOSTED_APPS_DATA,
+];
+
+ /** The list of Browsing Data types that should be expanded by default. */
+ const DEFAULT_BROWSING_DATATYPES_LIST: BrowsingDataType[] = [
+   BrowsingDataType.HISTORY,
+@@ -120,12 +131,36 @@ function getDataTypeLabel(datatypes: BrowsingDataType) {
+       return loadTimeData.getString('clearDownloadHistory');
+     case BrowsingDataType.HOSTED_APPS_DATA:
+       return loadTimeData.getString('clearHostedAppData');
+    case BrowsingDataType.PASSWORDS:
+      return loadTimeData.getString('clearPasswords');
+     default:
+       assertNotReachedCase(datatypes);
+   }
+ }
+ 
+-export function getDataTypePrefName(datatypes: BrowsingDataType) {
+export function getDataTypePrefName(datatypes: BrowsingDataType, atclose: boolean) {
+  if (atclose) {
+    switch (datatypes) {
+      case BrowsingDataType.HISTORY:
+        return 'browser.clear_data.browsing_history_at_start';
+      case BrowsingDataType.CACHE:
+        return 'browser.clear_data.cache_at_start';
+      case BrowsingDataType.SITE_DATA:
+        return 'browser.clear_data.cookies_at_start';
+      case BrowsingDataType.FORM_DATA:
+        return 'browser.clear_data.form_data_at_start';
+      case BrowsingDataType.SITE_SETTINGS:
+        return 'browser.clear_data.site_settings_at_start';
+      case BrowsingDataType.DOWNLOADS:
+        return 'browser.clear_data.download_history_at_start';
+      case BrowsingDataType.HOSTED_APPS_DATA:
+        return 'browser.clear_data.hosted_apps_data_at_start';
+      case BrowsingDataType.PASSWORDS:
+        return 'browser.clear_data.passwords_at_start';
+      default:
+        assertNotReachedCase(datatypes);
+    }
+  }
+   switch (datatypes) {
+     case BrowsingDataType.HISTORY:
+       return 'browser.clear_data.browsing_history';
+@@ -141,6 +176,8 @@ export function getDataTypePrefName(datatypes: BrowsingDataType) {
+       return 'browser.clear_data.download_history';
+     case BrowsingDataType.HOSTED_APPS_DATA:
+       return 'browser.clear_data.hosted_apps_data';
+    case BrowsingDataType.PASSWORDS:
+      return 'browser.clear_data.passwords';
+     default:
+       assertNotReachedCase(datatypes);
+   }
+@@ -161,6 +198,12 @@ export class SettingsClearBrowsingDataDialogV2Element extends
+ 
+   static get properties() {
+     return {
+      clearBrowsingDialogAtClose: {
+        type: Boolean,
+        value: '',
+        reflectToAttribute: true,
+      },
+
+       dataTypesExpanded_: {
+         type: Boolean,
+         value: false,
+@@ -224,6 +267,8 @@ export class SettingsClearBrowsingDataDialogV2Element extends
+     };
+   }
+ 
+  declare private clearBrowsingDialogAtClose: boolean;
+
+   declare private dataTypesExpanded_: boolean;
+   declare private deleteButtonLabel_: string;
+   declare private deletingDataAlertString_: string;
+@@ -310,10 +355,14 @@ export class SettingsClearBrowsingDataDialogV2Element extends
+     const expandedOptionsList: BrowsingDataTypeOption[] = [];
+     const moreOptionsList: BrowsingDataTypeOption[] = [];
+ 
+-    ALL_BROWSING_DATATYPES_LIST.forEach((datatype) => {
+    var list = ALL_BROWSING_DATATYPES_LIST;
+    if (this.clearBrowsingDialogAtClose)
+      list = ALL_BROWSING_DATATYPES_LIST_AT_CLOSE;
+
+    list.forEach((datatype) => {
+       const datatypeOption = {
+         label: getDataTypeLabel(datatype),
+-        pref: this.getPref(getDataTypePrefName(datatype)),
+        pref: this.getPref(getDataTypePrefName(datatype, this.clearBrowsingDialogAtClose)),
+       };
+ 
+       if (this.shouldDataTypeBeExpanded_(datatype)) {
+@@ -362,7 +411,12 @@ export class SettingsClearBrowsingDataDialogV2Element extends
+ 
+   private shouldDataTypeBeExpanded_(datatype: BrowsingDataType) {
+     return DEFAULT_BROWSING_DATATYPES_LIST.includes(datatype) ||
+-        this.getPref(getDataTypePrefName(datatype)).value;
+        this.getPref(getDataTypePrefName(datatype, this.clearBrowsingDialogAtClose)).value ||
+        this.clearBrowsingDialogAtClose;
+  }
+
+  private shouldShowSubLabel_(value: string) {
+    return this.clearBrowsingDialogAtClose ? '' : value;
+   }
+ 
+   private computeDeleteButtonLabel_() {
+diff --git a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_time_picker.ts b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_time_picker.ts
+--- a/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_time_picker.ts
+++ b/chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_time_picker.ts
+@@ -80,7 +80,7 @@ export class SettingsClearBrowsingDataTimePicker extends
+       selectedTimePeriod_: {
+         type: Number,
+         observer: 'onTimePeriodSelectionChanged_',
+-        value: TimePeriod.LAST_HOUR,
+        value: TimePeriod.ALL_TIME,
+       },
+ 
+       /**
+@@ -91,12 +91,12 @@ export class SettingsClearBrowsingDataTimePicker extends
+         readOnly: true,
+         type: Array,
+         value: [
+          TimePeriod.ALL_TIME,
+           TimePeriod.LAST_15_MINUTES,
+           TimePeriod.LAST_HOUR,
+           TimePeriod.LAST_DAY,
+           TimePeriod.LAST_WEEK,
+           TimePeriod.FOUR_WEEKS,
+-          TimePeriod.ALL_TIME,
+         ],
+       },
+ 
+@@ -125,7 +125,7 @@ export class SettingsClearBrowsingDataTimePicker extends
+        */
+       maxChipsShown_: {
+         type: Number,
+-        value: 4,
+        value: 6,
+       },
+     };
+   }
+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
+@@ -6,6 +6,13 @@
+           on-browsing-data-deleted="onBrowsingDataDeleted_">
+       </settings-clear-browsing-data-dialog-v2>
+     </template>
+    <template is="dom-if" if="[[showClearBrowsingAtCloseDataDialog_]]" restamp>
+      <settings-clear-browsing-data-dialog-v2 prefs="{{prefs}}"
+          clear-browsing-dialog-at-close="true"
+          on-close="onCbdDialogClosed_"
+          on-browsing-data-deleted="onBrowsingDataDeleted_">
+      </settings-clear-browsing-data-dialog-v2>
+    </template>
+     <template is="dom-if" if="[[showPrivacyGuideDialog_]]" restamp>
+       <settings-privacy-guide-dialog id="privacyGuideDialog" prefs="{{prefs}}"
+           on-close="onPrivacyGuideDialogClosed_">
+@@ -16,6 +23,11 @@
+         label="$i18n{clearBrowsingData}"
+         sub-label="$i18n{clearBrowsingDataDescription}"
+         on-click="onClearBrowsingDataClick_"></cr-link-row>
+    <cr-link-row id="clearBrowsingDataAtClose"
+        start-icon="cr:delete"
+        label="$i18n{clearBrowsingDataAtClose}"
+        sub-label="$i18n{clearBrowsingDataAtCloseDescription}"
+        on-click="onClearBrowsingDataAtCloseClick_"></cr-link-row>
+     <template is="dom-if" if="[[isPrivacyGuideAvailable]]">
+       <cr-link-row id="privacyGuideLinkRow" class="hr"
+           start-icon="privacy20:signpost"
+diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
+@@ -81,6 +81,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
+       },
+ 
+       showClearBrowsingDataDialog_: Boolean,
+      showClearBrowsingAtCloseDataDialog_: Boolean,
+       showPrivacyGuideDialog_: Boolean,
+ 
+       isPrivacySandboxRestricted_: {
+@@ -126,6 +127,7 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
+ 
+   declare private historyExpireDaysThresholdOptions_: object[];
+   declare private showClearBrowsingDataDialog_: boolean;
+  declare private showClearBrowsingAtCloseDataDialog_: boolean;
+   declare private showPrivacyGuideDialog_: boolean;
+   declare private referersPolicyOptions_: object[];
+   declare private isPrivacySandboxRestricted_: boolean;
+@@ -142,6 +144,8 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
+ 
+     this.showClearBrowsingDataDialog_ =
+         Router.getInstance().getCurrentRoute() === routes.CLEAR_BROWSER_DATA;
+    this.showClearBrowsingAtCloseDataDialog_ =
+        Router.getInstance().getCurrentRoute() === routes.CLEAR_BROWSER_DATA_AT_CLOSE;
+     this.showPrivacyGuideDialog_ =
+         Router.getInstance().getCurrentRoute() === routes.PRIVACY_GUIDE &&
+         this.isPrivacyGuideAvailable;
+@@ -153,6 +157,12 @@ export class SettingsPrivacyPageElement extends SettingsPrivacyPageElementBase {
+     Router.getInstance().navigateTo(routes.CLEAR_BROWSER_DATA);
+   }
+ 
+  private onClearBrowsingDataAtCloseClick_() {
+    this.interactedWithPage_();
+
+    Router.getInstance().navigateTo(routes.CLEAR_BROWSER_DATA_AT_CLOSE);
+  }
+
+   private onCookiesClick_() {
+     this.interactedWithPage_();
+ 
+diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.ts
+@@ -252,7 +252,7 @@ export class SettingsPrivacyPageIndexElement extends
+   }
+ 
+   private isRouteHostedWithinPrivacyView_(route: Route): boolean {
+-    const nestedRoutes = [routes.CLEAR_BROWSER_DATA];
+    const nestedRoutes = [routes.CLEAR_BROWSER_DATA, routes.CLEAR_BROWSER_DATA_AT_CLOSE];
+     if (loadTimeData.getBoolean('showPrivacyGuide')) {
+       nestedRoutes.push(routes.PRIVACY_GUIDE);
+     }
+diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
+--- a/chrome/browser/resources/settings/route.ts
+++ b/chrome/browser/resources/settings/route.ts
+@@ -17,6 +17,8 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+   assert(r.PRIVACY);
+   r.CLEAR_BROWSER_DATA = r.PRIVACY.createChild('/clearBrowserData');
+   r.CLEAR_BROWSER_DATA.isNavigableDialog = true;
+  r.CLEAR_BROWSER_DATA_AT_CLOSE = r.PRIVACY.createChild('/clearBrowserDataAtClose');
+  r.CLEAR_BROWSER_DATA_AT_CLOSE.isNavigableDialog = true;
+ 
+   const visibility = pageVisibility || {};
+ 
+diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
+--- a/chrome/browser/resources/settings/router.ts
+++ b/chrome/browser/resources/settings/router.ts
+@@ -24,6 +24,7 @@ export interface SettingsRoutes {
+   BASIC: Route;
+   CAPTIONS: Route;
+   CLEAR_BROWSER_DATA: Route;
+  CLEAR_BROWSER_DATA_AT_CLOSE: Route;
+   COMPARE: Route;
+   COOKIES: Route;
+   DEFAULT_BROWSER: Route;
 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
-@@ -1440,6 +1440,9 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1560,6 +1560,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>
@@ -736,11 +1013,14 @@ new file mode 100644
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -2263,6 +2263,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
+@@ -2305,6 +2305,10 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
       {"clearedData", IDS_SETTINGS_CLEARED_DATA},
       {"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
       {"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
-+      {"atStartPageTitle", IDS_CLEAR_BROWSING_DATA_ATSTART_TAB_TITLE},
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
+      {"clearBrowsingDataAtClose", IDS_SETTINGS_CLEAR_BROWSING_DATA_AT_CLOSE},
+      {"clearBrowsingDataAtCloseDescription", IDS_SETTINGS_CLEAR_DATA_AT_CLOSE_DESCRIPTION},
+#endif
       {"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
       {"safeBrowsingEnableExtendedReportingDesc",
        IDS_SETTINGS_SAFEBROWSING_ENABLE_REPORTING_DESC},
@@ -788,7 +1068,7 @@ diff --git a/components/browsing_data/core/BUILD.gn b/components/browsing_data/c
 diff --git a/components/browsing_data/core/browsing_data_policies_utils.cc b/components/browsing_data/core/browsing_data_policies_utils.cc
 --- a/components/browsing_data/core/browsing_data_policies_utils.cc
 +++ b/components/browsing_data/core/browsing_data_policies_utils.cc
-@@ -18,21 +18,21 @@
+@@ -17,21 +17,21 @@
 
 namespace browsing_data {
 
@@ -844,7 +1124,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
-@@ -418,6 +418,37 @@ bool GetDeletionPreferenceFromDataType(
+@@ -417,6 +417,37 @@ bool GetDeletionPreferenceFromDataType(
     BrowsingDataType data_type,
     ClearBrowsingDataTab clear_browsing_data_tab,
     std::string* out_pref) {
@@ -895,17 +1175,6 @@ diff --git a/components/browsing_data/core/clear_browsing_data_tab.h b/component
 
 }  // namespace browsing_data
 
-diff --git a/components/browsing_data/core/features.h b/components/browsing_data/core/features.h
--- a/components/browsing_data/core/features.h
-+++ b/components/browsing_data/core/features.h
-@@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBrowsingDataModel);
- // updates to history counter logic and removal of the bulk password deletion
- // option from the dialog.
- BASE_DECLARE_FEATURE(kDbdRevampDesktop);
-+SET_CROMITE_FEATURE_DISABLED(kDbdRevampDesktop);
- 
- // When enabled, calls to browsingData.removePasswords extension API would
- // result in an error response instead of a console warning.
 diff --git a/components/browsing_data/core/pref_names.cc b/components/browsing_data/core/pref_names.cc
 --- a/components/browsing_data/core/pref_names.cc
 +++ b/components/browsing_data/core/pref_names.cc
@@ -967,7 +1236,7 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/co
 // Description of database tables:
 //
 // icon_mapping
-@@ -505,6 +509,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
+@@ -501,6 +505,11 @@ bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id,
 
 bool FaviconDatabase::SetFaviconsOutOfDateBetween(base::Time begin,
                                                   base::Time end) {
@@ -1002,18 +1271,18 @@ diff --git a/components/favicon/core/favicon_database.h b/components/favicon/cor
 diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
 --- a/components/search_engines/template_url_service.cc
 +++ b/components/search_engines/template_url_service.cc
-@@ -923,6 +923,7 @@ void TemplateURLService::RemoveAutoGeneratedForUrlsBetween(
+@@ -931,6 +931,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 &&
 +        turl->is_active() != TemplateURLData::ActiveStatus::kTrue &&
-         turl->starter_pack_id() == 0 && !MatchesDefaultSearchProvider(turl) &&
-         (url_filter.is_null() ||
-          url_filter.Run(turl->GenerateSearchURL(search_terms_data())))) {
+         turl->starter_pack_id() ==
+             template_url_starter_pack_data::StarterPackId::kNone &&
+         !MatchesDefaultSearchProvider(turl) &&
 diff --git a/content/browser/btm/btm_service_impl.cc b/content/browser/btm/btm_service_impl.cc
 --- a/content/browser/btm/btm_service_impl.cc
 +++ b/content/browser/btm/btm_service_impl.cc
-@@ -251,7 +251,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
+@@ -231,7 +231,7 @@ class StateClearer : public BrowsingDataRemover::Observer {
     remove_mask &= ~BrowsingDataRemover::DATA_TYPE_PRIVACY_SANDBOX;
     remover->RemoveWithFilterAndReply(
         base::Time::Min(), base::Time::Max(),
@@ -1033,7 +1302,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
 #include "base/functional/bind.h"
 #include "base/functional/callback_helpers.h"
 #include "base/functional/concurrent_closures.h"
-@@ -1556,6 +1557,7 @@ void StoragePartitionImpl::Initialize(
+@@ -1510,6 +1511,7 @@ void StoragePartitionImpl::Initialize(
                             .AppendASCII("Code Cache");
     }
     DCHECK_GE(settings.size_in_bytes(), 0);
@@ -10,18 +10,18 @@ Conditional immediate support is disabled.

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../settings/PasswordSettings.java            | 27 +++++++++++++++++
+ .../settings/PasswordSettings.java            | 27 +++++++++++++++++++
 .../touch_to_fill_controller.cc               |  2 ++
- ...etting-to-enable-Credman-for-passkeys.grdp | 12 ++++++++
- .../webauthn/AuthenticatorImpl.java           | 29 +++++++------------
+ ...etting-to-enable-Credman-for-passkeys.grdp | 12 +++++++++
+ .../webauthn/AuthenticatorImpl.java           | 24 +++++++----------
 .../components/webauthn/WebauthnFeatures.java |  2 ++
- .../cred_man/CredManSupportProvider.java      | 25 ++++------------
+ .../cred_man/CredManSupportProvider.java      | 25 +++++------------
 .../webauthn/android/webauthn_feature_map.cc  |  1 +
 components/webauthn/features.cc               |  4 +++
- components/webauthn/features.h                |  3 ++
- device/fido/public/features.cc                |  2 ++
+ components/webauthn/features.h                |  3 +++
+ device/fido/public/features.cc                |  1 +
 .../authentication_credentials_container.cc   |  5 ++++
- 11 files changed, 75 insertions(+), 37 deletions(-)
+ 11 files changed, 73 insertions(+), 33 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Add-setting-to-enable-Credman-for-passkeys.grdp

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -35,7 +35,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
-@@ -67,6 +68,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
+@@ -68,6 +69,10 @@ import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
 import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
 
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 /**
  * The "Passwords" screen in Settings, which allows the user to enable or disable password saving,
  * to view saved passwords (just the username and URL), and to delete saved passwords.
-@@ -332,6 +337,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+@@ -334,6 +339,7 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
         createSavePasswordsSwitch();
         createAutoSignInCheckbox();
         createEnableAndroidAutofillSwitch();
@@ -54,7 +54,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
 
         PasswordManagerHandlerProvider.getForProfile(getProfile())
                 .getPasswordManagerHandler()
-@@ -685,6 +691,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
+@@ -687,6 +693,27 @@ public class PasswordSettings extends ChromeBaseSettingsFragment
                 getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_AUTOSIGNIN));
     }
 
@@ -129,8 +129,8 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 +import org.chromium.components.webauthn.cred_man.CredManSupportProvider;
 import org.chromium.components.ukm.UkmRecorder;
 import org.chromium.content_public.browser.RenderFrameHost;
- import org.chromium.content_public.browser.WebContents;
-@@ -166,8 +168,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+ import org.chromium.content_public.browser.Visibility;
+@@ -167,8 +169,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
         mIsPaymentRequest = options.isPaymentCredentialCreation;
         mRequestCallback = requestCallback;
         mRequestCallback.setCompletionCallback(this::cleanupRequest);
@@ -140,7 +140,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
             mRequestCallback.onComplete(
                     WebauthnRequestResponse.forFailedMakeCredential(
                             AuthenticatorStatus.NOT_IMPLEMENTED,
-@@ -250,8 +251,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -254,8 +255,7 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
                         && DeviceFeatureMap.isEnabled(
                                 DeviceFeatureList
                                         .WEBAUTHN_AUTHENTICATOR_PASSWORDS_ONLY_IMMEDIATE_REQUESTS);
@@ -150,7 +150,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
                 || (options.publicKey == null && !isPasswordOnlyFlux)) {
             RequestMetrics metrics =
                     new RequestMetrics.Builder()
-@@ -291,12 +291,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -300,12 +300,11 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
     }
 
     private boolean couldSupportConditionalMediation() {
@@ -165,7 +165,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
     }
 
     @Override
-@@ -370,26 +369,20 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
+@@ -379,22 +378,19 @@ public final class AuthenticatorImpl implements Authenticator, AuthenticationCon
                             capabilities.add(
                                     createWebAuthnClientCapability(
                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_GET,
@@ -175,17 +175,12 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
                                     createWebAuthnClientCapability(
                                             AuthenticatorConstants.CAPABILITY_UVPAA,
 -                                            couldSupportUvpaa() && isUvpaa));
-                            boolean conditionalCreateEnabled =
-                                    couldSupportConditionalMediation()
-                                            && DeviceFeatureMap.isEnabled(
-                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE);
 +                                            true));
                             capabilities.add(
                                     createWebAuthnClientCapability(
                                             AuthenticatorConstants.CAPABILITY_CONDITIONAL_CREATE,
-                                            isUvpaa && conditionalCreateEnabled));
-+                                            DeviceFeatureMap.isEnabled(
-+                                                    DeviceFeatureList.WEBAUTHN_PASSKEY_UPGRADE)));
+-                                            isUvpaa && couldSupportConditionalMediation()));
+                                            true));
                             capabilities.add(
                                     createWebAuthnClientCapability(
                                             AuthenticatorConstants.CAPABILITY_IMMEDIATE_GET,
@@ -194,9 +189,9 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
 -                                                                    .WEBAUTHN_IMMEDIATE_GET)
 -                                                    && isUvpaa));
 +                                            false));
-                             boolean signalSupported =
-                                     isUvpaa
-                                             && DeviceFeatureMap.isEnabled(
+                             capabilities.add(
+                                     createWebAuthnClientCapability(
+                                             AuthenticatorConstants
 diff --git a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
 --- a/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
 +++ b/components/webauthn/android/java/src/org/chromium/components/webauthn/WebauthnFeatures.java
@@ -322,26 +317,18 @@ diff --git a/components/webauthn/features.h b/components/webauthn/features.h
 diff --git a/device/fido/public/features.cc b/device/fido/public/features.cc
 --- a/device/fido/public/features.cc
 +++ b/device/fido/public/features.cc
-@@ -188,6 +188,7 @@ BASE_FEATURE(kWebAuthnImmediateGet,
- #else
+@@ -183,6 +183,7 @@ BASE_FEATURE_PARAM(int,
+ BASE_FEATURE(kWebAuthnImmediateGet,
+              "WebAuthenticationImmediateGet",
              base::FEATURE_ENABLED_BY_DEFAULT);
- #endif  // BUILDFLAG(IS_ANDROID)
 +SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGet);
 
 BASE_FEATURE_PARAM(int,
                    kWebAuthnImmediateMediationTimeoutMilliseconds,
-@@ -200,6 +201,7 @@ BASE_FEATURE_PARAM(int,
- BASE_FEATURE(kWebAuthnImmediateGetAutoselect,
-              "WebAuthenticationImmediateGetAutoselect",
-              base::FEATURE_ENABLED_BY_DEFAULT);
-+SET_CROMITE_FEATURE_DISABLED(kWebAuthnImmediateGetAutoselect);
- 
- // Deprecation flag. Disabled by default in M142. Remove in or after M145.
- BASE_FEATURE(kWebAuthnSendPinGeneration,
 diff --git a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
 --- a/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
 +++ b/third_party/blink/renderer/modules/credentialmanagement/authentication_credentials_container.cc
-@@ -1135,6 +1135,11 @@ DOMException* AuthenticatorStatusToDOMException(
+@@ -1157,6 +1157,11 @@ DOMException* AuthenticatorStatusToDOMException(
     const WebAuthnDOMExceptionDetailsPtr& dom_exception_details) {
   DCHECK_EQ(status != AuthenticatorStatus::ERROR_WITH_DOM_EXCEPTION_DETAILS,
             dom_exception_details.is_null());
@@ -21,6 +21,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../accessibility/AccessibilitySettings.java  | 12 +++++++
 .../AccessibilitySettingsDelegate.java        |  2 ++
 .../contextmenu/ContextMenuItemDelegate.java  |  3 ++
+ .../ThinWebViewContextMenuItemDelegate.java   |  6 ++++
 ...Add-setting-to-invert-tap-and-long-tap.inc |  8 +++++
 ...Add-setting-to-invert-tap-and-long-tap.inc |  3 ++
 ...Add-setting-to-invert-tap-and-long-tap.inc |  1 +
@@ -30,7 +31,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../renderer/core/html/html_image_element.h   |  2 ++
 .../core/page/context_menu_controller.cc      | 23 +++++++++---
 .../core/page/context_menu_controller.h       |  5 +--
- 22 files changed, 164 insertions(+), 16 deletions(-)
+ 23 files changed, 170 insertions(+), 16 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Add-setting-to-invert-tap-and-long-tap.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_h/Add-setting-to-invert-tap-and-long-tap.inc
@@ -59,7 +60,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/contextmenu/A
 diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml
 --- a/chrome/android/java/res/values/ids.xml
 +++ b/chrome/android/java/res/values/ids.xml
-@@ -111,6 +111,7 @@ found in the LICENSE file.
+@@ -112,6 +112,7 @@ found in the LICENSE file.
 
     <!-- Menu item IDs for FullscreenActivities -->
     <item type="id" name="contextmenu_open_in_chrome" />
@@ -70,7 +71,7 @@ diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/va
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/accessibility/settings/ChromeAccessibilitySettingsDelegate.java
-@@ -165,6 +165,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
+@@ -167,6 +167,24 @@ public class ChromeAccessibilitySettingsDelegate implements AccessibilitySetting
             mSnackbarManagerSupplier.get().showSnackbar(mSnackbar);
     }
 
@@ -128,29 +129,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/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
-@@ -478,6 +478,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -495,6 +495,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
         }
         if (mParams.isAnchor()) {
             ModelList linkGroup = new ModelList();
 +            if (ChromeFeatureList.sShowAlwaysContextMenuOnLinks.isEnabled()) {
 +                linkGroup.add(createListItem(Item.FOLLOW_LINK));
 +            }
-             if (FirstRunStatus.getFirstRunFlowComplete()
+             if (areMandatoryFlowsCompleted(getProfile())
                     && !isEmptyUrl(mParams.getUrl())
                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
-@@ -1085,6 +1088,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
-                                 getProfile(),
-                                 false);
-                     });
+@@ -1141,6 +1144,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+                 title = mParams.getLinkText();
+             }
+             tabItemDelegate.onReadLater(mParams.getUrl(), title);
 +        } else if (itemId == R.id.contextmenu_open_in_tab) {
 +            mItemDelegate.onOpenUrl(mParams.getUrl(), mParams.getReferrer());
         } else if (itemId == R.id.contextmenu_open_in_chrome) {
             recordContextMenuSelection(ContextMenuUma.Action.OPEN_IN_CHROME);
-             mItemDelegate.onOpenInChrome(mParams.getUrl(), mParams.getPageUrl());
+             tabItemDelegate.onOpenInChrome(mParams.getUrl(), mParams.getPageUrl());
 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
-@@ -414,6 +414,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -388,6 +388,14 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
         mTab.loadUrl(loadUrlParams);
     }
 
@@ -168,8 +169,8 @@ 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
-@@ -437,6 +437,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
-     &kTabFreezingUsesDiscard,
+@@ -463,6 +463,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+     &kTabClosureMethodRefactor,
     &kTabModelInitFixes,
     &kTabStorageSqlitePrototype,
 +    &blink::features::kShowAlwaysContextMenuOnLinks,
@@ -179,16 +180,16 @@ 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
-@@ -506,6 +506,8 @@ public abstract class ChromeFeatureList {
+@@ -546,6 +546,8 @@ public abstract class ChromeFeatureList {
             "DisableToolbarSwipeUp";
     public static final String MOVE_TOP_TOOLBAR_TO_BOTTOM =
             "MoveTopToolbarToBottom";
 +    public static final String SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS =
 +            "ShowAlwaysContextMenuOnLinks";
-     public static final String NEW_TAB_PAGE_CUSTOMIZATION_TOOLBAR_BUTTON =
-             "NewTabPageCustomizationToolbarButton";
+     public static final String NEW_TAB_PAGE_CUSTOMIZATION_THEME_SYNC =
+             "NewTabPageCustomizationThemeSync";
     public static final String NEW_TAB_PAGE_CUSTOMIZATION_V2 = "NewTabPageCustomizationV2";
-@@ -1016,6 +1018,8 @@ public abstract class ChromeFeatureList {
+@@ -1107,6 +1109,8 @@ public abstract class ChromeFeatureList {
             newCachedFlag(DISABLE_TOOLBAR_SWIPE_UP, false);
     public static final CachedFlag sMoveTopToolbarToBottom =
             newCachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
@@ -196,8 +197,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
 +            newCachedFlag(SHOW_ALWAYS_CONTEXT_MENU_ON_LINKS, false);
     public static final CachedFlag sPaintPreviewDemo = newCachedFlag(PAINT_PREVIEW_DEMO, false);
     public static final CachedFlag sPersistAcrossReboots =
-             newCachedFlag(PERSIST_ACROSS_REBOOTS, false);
-@@ -1283,6 +1287,7 @@ public abstract class ChromeFeatureList {
+             newCachedFlag(PERSIST_ACROSS_REBOOTS, true);
+@@ -1399,6 +1403,7 @@ public abstract class ChromeFeatureList {
                     sTopControlsRefactorV2,
                     sTouchToSearchCallout,
                     sUnparcelIntentFileDescriptors,
@@ -208,7 +209,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
-@@ -1569,6 +1569,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1700,6 +1700,12 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_DISABLE_TOOLBAR_SWIPE_UP" desc="Summary of the preference that allows the user to disable toolbar swipeup.">
         Disable toolbar swipe up
       </message>
@@ -221,7 +222,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]">
-@@ -3235,6 +3241,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -3369,6 +3375,9 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
       <message name="IDS_CONTEXTMENU_OPEN_IN_NEW_CHROME_TAB" desc="Context sensitive menu item to open the selected link in a new Chrome tab from Chrome Custom Tab. [CHAR_LIMIT=30]">
         Open in new Chrome tab
       </message>
@@ -249,7 +250,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 --- a/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
 +++ b/components/browser_ui/accessibility/android/java/src/org/chromium/components/browser_ui/accessibility/AccessibilitySettings.java
-@@ -64,6 +64,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -89,6 +89,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
     private BooleanPreferenceDelegate mMoveTopToolbarToBottomDelegate;
     private BooleanPreferenceDelegate mDisableToolbarSwipeUpDelegate;
 
@@ -259,7 +260,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
     private PageZoomPreference mPageZoomDefaultZoomPref;
     private ChromeSwitchPreference mPageZoomIncludeOSAdjustment;
     private ChromeSwitchPreference mPageZoomAlwaysShowPref;
-@@ -162,6 +165,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -198,6 +201,12 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
         mDisableToolbarSwipeUpPref.setChecked(mDisableToolbarSwipeUpDelegate.getValue());
         mDisableToolbarSwipeUpPref.setOnPreferenceChangeListener(this);
 
@@ -272,7 +273,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
         Preference captions = findPreference(PREF_CAPTIONS);
         captions.setOnPreferenceClickListener(
                 preference -> {
-@@ -270,6 +279,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
+@@ -323,6 +332,9 @@ public class AccessibilitySettings extends ChromeBaseSettingsFragment
         } else if (PREF_DISABLE_TOOLBAR_SWIPE_UP.equals(preference.getKey())) {
             mDisableToolbarSwipeUpDelegate.setValue((Boolean) newValue);
             mDelegate.requestRestart(getActivity());
@@ -297,7 +298,7 @@ diff --git a/components/browser_ui/accessibility/android/java/src/org/chromium/c
 diff --git a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 --- a/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
 +++ b/components/embedder_support/android/java/src/org/chromium/components/embedder_support/contextmenu/ContextMenuItemDelegate.java
-@@ -10,6 +10,7 @@ import androidx.annotation.IntDef;
+@@ -11,6 +11,7 @@ import androidx.annotation.IntDef;
 
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.content_public.browser.WebContents;
@@ -305,8 +306,8 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
 import org.chromium.url.GURL;
 
 import java.lang.annotation.Retention;
-@@ -150,6 +151,8 @@ public interface ContextMenuItemDelegate {
-      */
+@@ -148,6 +149,8 @@ public interface ContextMenuItemDelegate {
+     /** Returns the page url. */
     GURL getPageUrl();
 
 +    void onOpenUrl(GURL url, Referrer referrer);
@@ -314,6 +315,29 @@ diff --git a/components/embedder_support/android/java/src/org/chromium/component
     /**
      * Called when the current embedder app is not the default to handle a View Intent.
      *
+diff --git a/components/thin_webview/internal/java/src/org/chromium/components/thinwebview/internal/ThinWebViewContextMenuItemDelegate.java b/components/thin_webview/internal/java/src/org/chromium/components/thinwebview/internal/ThinWebViewContextMenuItemDelegate.java
+--- a/components/thin_webview/internal/java/src/org/chromium/components/thinwebview/internal/ThinWebViewContextMenuItemDelegate.java
+++ b/components/thin_webview/internal/java/src/org/chromium/components/thinwebview/internal/ThinWebViewContextMenuItemDelegate.java
+@@ -6,6 +6,7 @@ package org.chromium.components.thinwebview.internal;
+ 
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.components.embedder_support.contextmenu.ContextMenuItemDelegate;
+import org.chromium.content_public.common.Referrer;
+ import org.chromium.content_public.browser.WebContents;
+ import org.chromium.ui.base.Clipboard;
+ import org.chromium.url.GURL;
+@@ -43,6 +44,11 @@ public class ThinWebViewContextMenuItemDelegate implements ContextMenuItemDelega
+         // Intentionally empty.
+     }
+ 
+    @Override
+    public void onOpenUrl(GURL url, Referrer referrer) {
+        // Intentionally empty. (Add setting to invert tap and long tap)
+    }
+
+     @Override
+     public GURL getPageUrl() {
+         return mWebContents.getVisibleUrl();
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-setting-to-invert-tap-and-long-tap.inc
 new file mode 100644
 --- /dev/null
@@ -344,7 +368,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third_party/blink/renderer/core/html/html_anchor_element.cc
 --- a/third_party/blink/renderer/core/html/html_anchor_element.cc
 +++ b/third_party/blink/renderer/core/html/html_anchor_element.cc
-@@ -68,6 +68,7 @@
+@@ -69,6 +69,7 @@
 #include "third_party/blink/renderer/core/loader/render_blocking_resource_manager.h"
 #include "third_party/blink/renderer/core/navigation_api/navigation_api.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
@@ -352,7 +376,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 #include "third_party/blink/renderer/core/page/page.h"
 #include "third_party/blink/renderer/core/scroll/scroll_into_view_util.h"
 #include "third_party/blink/renderer/core/speculation_rules/document_speculation_rules.h"
-@@ -421,6 +422,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -429,6 +430,17 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
     bool is_trusted,
     base::TimeTicks platform_time_stamp,
     KURL completed_url) {
@@ -370,7 +394,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   LocalDOMWindow* window = GetDocument().domWindow();
   if (!window) {
     return;
-@@ -501,6 +513,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
+@@ -511,6 +523,15 @@ void HTMLAnchorElementBase::NavigateToHyperlink(
     frame_request.SetImpression(impression);
   }
 
@@ -386,7 +410,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
   Frame* target_frame =
       frame->Tree().FindOrCreateFrameForNavigation(frame_request, target).frame;
 
-@@ -537,7 +558,7 @@ bool HTMLAnchorElementBase::IsValidInterestInvoker(Element& target) const {
+@@ -547,7 +568,7 @@ bool HTMLAnchorElementBase::IsValidInterestInvoker(Element& target) const {
   return IsLink();
 }
 
@@ -394,8 +418,8 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
 +void HTMLAnchorElementBase::HandleClick(MouseEvent& event, bool do_not_show_context_menu) {
   event.SetDefaultHandled();
 
-   LocalDOMWindow* window = GetDocument().domWindow();
-@@ -589,13 +610,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+   // It's unclear whether synthesized middle-button "click" events should be
+@@ -621,13 +642,12 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     return;
   }
 
@@ -413,7 +437,7 @@ diff --git a/third_party/blink/renderer/core/html/html_anchor_element.cc b/third
     // We distinguish single/double click with some modifiers.
     // See the comment of `EventHandler.delayed_navigation_task_handle_`.
     auto task_handle = PostDelayedCancellableTask(
-@@ -605,7 +625,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
+@@ -637,7 +657,9 @@ void HTMLAnchorElementBase::HandleClick(MouseEvent& event) {
     frame->GetEventHandler().SetDelayedNavigationTaskHandle(
         std::move(task_handle));
   } else {
@@ -459,7 +483,7 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 #include "third_party/blink/renderer/core/frame/attribution_src_loader.h"
 #include "third_party/blink/renderer/core/frame/deprecation/deprecation.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"
-@@ -65,6 +66,7 @@
+@@ -68,6 +69,7 @@
 #include "third_party/blink/renderer/core/media_type_names.h"
 #include "third_party/blink/renderer/core/page/chrome_client.h"
 #include "third_party/blink/renderer/core/page/page.h"
@@ -467,7 +491,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"
-@@ -782,6 +784,21 @@ void HTMLImageElement::DidFinishLayout() {
+@@ -796,6 +798,21 @@ void HTMLImageElement::DidFinishLayout() {
   }
 }
 
@@ -488,12 +512,12 @@ diff --git a/third_party/blink/renderer/core/html/html_image_element.cc b/third_
 +
 bool HTMLImageElement::draggable() const {
   // Image elements are draggable by default.
-   return !EqualIgnoringASCIICase(FastGetAttribute(html_names::kDraggableAttr),
+   return !EqualIgnoringAsciiCase(FastGetAttribute(html_names::kDraggableAttr),
 diff --git a/third_party/blink/renderer/core/html/html_image_element.h b/third_party/blink/renderer/core/html/html_image_element.h
 --- a/third_party/blink/renderer/core/html/html_image_element.h
 +++ b/third_party/blink/renderer/core/html/html_image_element.h
-@@ -211,6 +211,8 @@ class CORE_EXPORT HTMLImageElement
-   void DidAddUserAgentShadowRoot(ShadowRoot&) override;
+@@ -226,6 +226,8 @@ class CORE_EXPORT HTMLImageElement
+ 
   void AdjustStyle(ComputedStyleBuilder&) override;
 
 +  void DefaultEventHandler(Event&) override;
@@ -525,17 +549,17 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
     mouse_event->SetDefaultHandled();
 }
 
-@@ -440,7 +442,8 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
- bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
-                                             const PhysicalOffset& point,
-                                             WebMenuSourceType source_type,
-                                            const MouseEvent* mouse_event) {
-+                                            const MouseEvent* mouse_event,
-+                                            bool do_not_show_context_menu) {
+@@ -443,7 +445,8 @@ bool ContextMenuController::ShowContextMenu(
+     LocalFrame* frame,
+     const PhysicalOffset& point,
+     ui::mojom::blink::MenuSourceType source_type,
+-    const MouseEvent* mouse_event) {
+    const MouseEvent* mouse_event,
+    bool do_not_show_context_menu) {
   // 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,
-@@ -463,6 +466,16 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -466,6 +469,16 @@ bool ContextMenuController::ShowContextMenu(
   if (!result.InnerNodeOrImageMapImage())
     return false;
 
@@ -552,7 +576,7 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.cc b/t
   // Clear any previously set cached results if we are resetting the hit test
   // result.
   image_selection_cached_result_ = nullptr;
-@@ -844,7 +857,7 @@ bool ContextMenuController::ShowContextMenu(LocalFrame* frame,
+@@ -848,7 +861,7 @@ bool ContextMenuController::ShowContextMenu(
 
   SetAutofillData(result.InnerNode(), data);
 
@@ -573,10 +597,10 @@ diff --git a/third_party/blink/renderer/core/page/context_menu_controller.h b/th
   void ShowContextMenuAtPoint(LocalFrame*,
                               float x,
                               float y,
-@@ -127,7 +127,8 @@ class CORE_EXPORT ContextMenuController
+@@ -129,7 +129,8 @@ class CORE_EXPORT ContextMenuController
   virtual bool ShowContextMenu(LocalFrame*,
                                const PhysicalOffset&,
-                                WebMenuSourceType,
+                                ui::mojom::blink::MenuSourceType,
 -                               const MouseEvent* mouse_event);
 +                               const MouseEvent* mouse_event,
 +                               bool do_not_show_context_menu = false);
@@ -26,10 +26,10 @@ 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
-@@ -165,6 +165,7 @@
+@@ -171,6 +171,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"
+ #include "components/services/storage/dom_storage/features.h"
 +#include "components/site_engagement/core/features.h"
 #include "components/shared_highlighting/core/common/shared_highlighting_features.h"
 #include "components/sharing_message/features.h"
@@ -37,7 +37,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/engagement/important_sites_util.cc b/chrome/browser/engagement/important_sites_util.cc
 --- a/chrome/browser/engagement/important_sites_util.cc
 +++ b/chrome/browser/engagement/important_sites_util.cc
-@@ -30,6 +30,7 @@
+@@ -29,6 +29,7 @@
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/site_engagement/content/site_engagement_score.h"
 #include "components/site_engagement/content/site_engagement_service.h"
@@ -111,7 +111,7 @@ diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components
 #include "components/feature_engagement/internal/availability_model_impl.h"
 #include "components/feature_engagement/internal/blocked_iph_features.h"
 #include "components/feature_engagement/internal/chrome_variations_configuration.h"
-@@ -291,6 +292,8 @@ TrackerImpl::TrackerImpl(
+@@ -290,6 +291,8 @@ TrackerImpl::TrackerImpl(
 TrackerImpl::~TrackerImpl() = default;
 
 void TrackerImpl::NotifyEvent(const std::string& event) {
@@ -5,22 +5,14 @@ Subject: Add support for ISupportHelpAndFeedback
 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/settings/SettingsActivity.java        | 9 +++++++--
- .../components/browser_ui/settings/SettingsUtils.java    | 4 ++++
- 2 files changed, 11 insertions(+), 2 deletions(-)
+ .../chrome/browser/settings/SettingsActivity.java         | 8 ++++++--
+ .../components/browser_ui/settings/SettingsUtils.java     | 4 ++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)

 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -67,6 +67,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.Snackbar;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetControllerFactory;
- import org.chromium.components.browser_ui.bottomsheet.ManagedBottomSheetController;
-+import org.chromium.components.browser_ui.settings.SettingsUtils;
- import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
- import org.chromium.components.browser_ui.settings.EmbeddableSettingsPage;
- import org.chromium.components.browser_ui.settings.PreferenceUpdateObserver;
-@@ -904,8 +905,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -1102,8 +1102,12 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
             return true;
         } else if (item.getItemId() == R.id.menu_id_general_help) {
             RecordUserAction.record("Settings.MobileHelpAndFeedback");
@@ -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
-@@ -139,6 +139,16 @@ static void JNI_ContentUriUtils_AddFileInfoToVector(JNIEnv* env,
+@@ -140,6 +140,16 @@ static void JNI_ContentUriUtils_AddFileInfoToVector(
                        Time::FromMillisecondsSinceUnixEpoch(last_modified));
 }
 
@@ -206,7 +206,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/core/execution_context/execution_context.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -110,6 +110,8 @@ enum ReasonForCallingCanExecuteScripts {
+@@ -111,6 +111,8 @@ enum ReasonForCallingCanExecuteScripts {
 
 enum ReferrerPolicySource { kPolicySourceHttpHeader, kPolicySourceMetaTag };
 
@@ -218,7 +218,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -343,6 +343,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
+@@ -345,6 +345,13 @@ void WebGLRenderingContextBase::InitializeWebGLContextLimits(
   }
 }
 
@@ -232,7 +232,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 unsigned WebGLRenderingContextBase::CurrentMaxGLContexts() {
   base::AutoLock locker(WebGLContextLimitLock());
   DCHECK(webgl_context_limits_initialized_);
-@@ -613,25 +620,6 @@ static String ExtractWebGLContextCreationError(
+@@ -631,25 +638,6 @@ static String ExtractWebGLContextCreationError(
     const Platform::WebGLContextInfo& info) {
   StringBuilder builder;
   builder.Append("Could not create a WebGL context");
@@ -258,7 +258,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
   FormatWebGLStatusString("ErrorMessage", info.error_message.Utf8().c_str(),
                           builder);
   builder.Append('.');
-@@ -692,6 +680,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
+@@ -710,6 +698,12 @@ WebGLRenderingContextBase::CreateWebGraphicsContext3DProvider(
     const CanvasContextCreationAttributesCore& attributes,
     Platform::WebGLContextType context_type,
     Platform::WebGLContextInfo* context_info) {
@@ -274,7 +274,7 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_ba
 diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
 +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h
-@@ -2008,6 +2008,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
+@@ -1968,6 +1968,8 @@ class MODULES_EXPORT WebGLRenderingContextBase
                         DOMArrayBufferView* pixels,
                         int64_t offset);
 
@@ -187,7 +187,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/task_type.h"
@@ -195,7 +195,7 @@ diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_d
 #include "third_party/blink/public/platform/web_url.h"
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h"
 #include "third_party/blink/public/web/web_document.h"
-@@ -1046,6 +1047,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -1071,6 +1072,11 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
       // |request_multiple_routes|. Whether local IP addresses could be
       // collected depends on if mic/camera permission is granted for this
       // origin.
@@ -248,7 +248,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"
-@@ -1019,6 +1022,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
+@@ -1020,6 +1023,14 @@ RTCRtpCapabilities* RTCRtpSender::getCapabilities(ScriptState* state,
   if (kind != "audio" && kind != "video")
     return nullptr;
 
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chr
 diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
 --- a/content/browser/devtools/protocol/network_handler.cc
 +++ b/content/browser/devtools/protocol/network_handler.cc
-@@ -1542,6 +1542,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
+@@ -1670,6 +1670,7 @@ String BuildReportStatus(const net::ReportingReport::Status status) {
   }
 }
 
@@ -51,7 +51,7 @@ diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/brow
 std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
   std::vector<GURL> urls;
   frame_host->ForEachRenderFrameHostImplWithAction(
-@@ -1555,6 +1556,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
+@@ -1683,6 +1684,7 @@ std::vector<GURL> ComputeReportingURLs(RenderFrameHostImpl* frame_host) {
       });
   return urls;
 }
@@ -87,7 +87,7 @@ diff --git a/content/browser/network/cross_origin_embedder_policy_reporter.cc b/
 +  const std::optional<std::string>& endpoint =
 +      report_only ? report_only_endpoint_ : endpoint_;
   if (endpoint) {
-     base::Value::Dict body_to_pass;
+     base::DictValue body_to_pass;
     for (const auto& pair : body) {
@@ -125,6 +127,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
           network_anonymization_key_, std::move(body_to_pass));
@@ -108,10 +108,10 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 #include "content/browser/service_worker/service_worker_host.h"
 #include "content/browser/shared_storage/shared_storage_worklet_host.h"
 #include "content/browser/worker_host/dedicated_worker_host.h"
-@@ -241,12 +242,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
+@@ -250,12 +251,14 @@ class ReportingServiceProxyImpl : public blink::mojom::ReportingServiceProxy {
                    const std::string& group,
                    const std::string& type,
-                    base::Value::Dict body) {
+                    base::DictValue body) {
 +#if BUILDFLAG(ENABLE_REPORTING)
     auto* rph = RenderProcessHost::FromID(render_process_id_);
     if (!rph)
@@ -122,11 +122,11 @@ diff --git a/content/browser/network/reporting_service_proxy.cc b/content/browse
 +#endif
   }
 
-   const int render_process_id_;
+   const ChildProcessId render_process_id_;
 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
-@@ -16427,12 +16427,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
+@@ -16912,12 +16912,6 @@ void RenderFrameHostImpl::MaybeGenerateCrashReport(
       }
     }
   }
@@ -138,7 +138,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 -      std::move(body));
 }
 
- base::Value::Dict RenderFrameHostImpl::ReadCrashReportAPIBody() {
+ base::DictValue RenderFrameHostImpl::ReadCrashReportAPIBody() {
 diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 --- a/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
 +++ b/content/browser/security/coop/cross_origin_opener_policy_reporter.cc
@@ -201,7 +201,7 @@ diff --git a/content/browser/security/coop/cross_origin_opener_policy_reporter.c
 }
 
 void CrossOriginOpenerPolicyReporter::QueueNavigationReport(
-     base::Value::Dict body,
+     base::DictValue body,
     const std::string& endpoint,
     bool is_report_only) {
 +#if BUILDFLAG(ENABLE_REPORTING)
@@ -292,7 +292,7 @@ diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_
 diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc
 --- a/net/reporting/reporting_service.cc
 +++ b/net/reporting/reporting_service.cc
-@@ -236,6 +236,12 @@ class ReportingServiceImpl : public ReportingService {
+@@ -227,6 +227,12 @@ class ReportingServiceImpl : public ReportingService {
       int depth,
       base::TimeTicks queued_ticks,
       ReportingTargetType target_type) {
@@ -308,17 +308,17 @@ 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
-@@ -493,14 +493,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -504,14 +504,14 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
       const GURL& url,
       const std::optional<base::UnguessableToken>& reporting_source,
       const net::NetworkAnonymizationKey& network_anonymization_key,
-      base::Value::Dict body) override;
-+      base::Value::Dict body);
+-      base::DictValue body) override;
+      base::DictValue body);
   void QueueEnterpriseReport(const std::string& type,
                              const std::string& group,
                              const GURL& url,
-                             base::Value::Dict body) override;
-+                             base::Value::Dict body);
+-                             base::DictValue body) override;
+                             base::DictValue body);
   void QueueSignedExchangeReport(
       mojom::SignedExchangeReportPtr report,
 -      const net::NetworkAnonymizationKey& network_anonymization_key) override;
@@ -329,7 +329,7 @@ diff --git a/services/network/network_context.h b/services/network/network_conte
 diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/public/cpp/parsed_headers.cc
 --- a/services/network/public/cpp/parsed_headers.cc
 +++ b/services/network/public/cpp/parsed_headers.cc
-@@ -140,6 +140,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
+@@ -137,6 +137,7 @@ mojom::ParsedHeadersPtr PopulateParsedHeaders(
   }
 
 #if BUILDFLAG(ENABLE_REPORTING)
@@ -340,7 +340,7 @@ diff --git a/services/network/public/cpp/parsed_headers.cc b/services/network/pu
 diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mojom/BUILD.gn
 --- a/services/network/public/mojom/BUILD.gn
 +++ b/services/network/public/mojom/BUILD.gn
-@@ -1885,7 +1885,6 @@ mojom("mojom") {
+@@ -1899,7 +1899,6 @@ mojom("mojom") {
     export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
     export_header_blink = "third_party/blink/public/platform/web_common.h"
     if (enable_reporting) {
@@ -351,7 +351,7 @@ diff --git a/services/network/public/mojom/BUILD.gn b/services/network/public/mo
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1239,6 +1239,7 @@ interface NetworkContext {
+@@ -1252,6 +1252,7 @@ interface NetworkContext {
   // provided `network_anonymization_key`.
   //
   // Spec: https://w3c.github.io/reporting/#concept-reports
@@ -359,7 +359,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
   QueueReport(string type,
               string group,
               url.mojom.Url url,
-@@ -1246,6 +1247,7 @@ interface NetworkContext {
+@@ -1259,6 +1260,7 @@ interface NetworkContext {
               NetworkAnonymizationKey network_anonymization_key,
               mojo_base.mojom.DictionaryValue body);
 
@@ -367,7 +367,7 @@ diff --git a/services/network/public/mojom/network_context.mojom b/services/netw
   QueueEnterpriseReport(string type,
                         string group,
                         url.mojom.Url url,
-@@ -1256,6 +1258,7 @@ interface NetworkContext {
+@@ -1269,6 +1271,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`.
@@ -383,10 +383,10 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
 #include <utility>
 
 +#include "net/net_buildflags.h"
- #include "base/containers/contains.h"
 #include "base/debug/dump_without_crashing.h"
 #include "base/feature_list.h"
-@@ -1379,6 +1380,7 @@ void ContentSecurityPolicy::ReportViolation(
+ #include "base/metrics/histogram_functions.h"
+@@ -1383,6 +1384,7 @@ void ContentSecurityPolicy::ReportViolation(
       ShouldBypassContentSecurityPolicy(KURL(violation_data->sourceFile()))) {
     return;
   }
@@ -394,7 +394,7 @@ diff --git a/third_party/blink/renderer/core/frame/csp/content_security_policy.c
   PostViolationReport(violation_data, context_frame, report_endpoints,
                       use_reporting_api);
 
-@@ -1386,6 +1388,7 @@ void ContentSecurityPolicy::ReportViolation(
+@@ -1390,6 +1392,7 @@ void ContentSecurityPolicy::ReportViolation(
   // `context_frame` (i.e. we're not processing 'frame-ancestors').
   if (delegate_ && !context_frame)
     delegate_->DispatchViolationEvent(*violation_data, element);
@@ -413,7 +413,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 #include "services/network/public/cpp/features.h"
 #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
 #include "services/network/public/mojom/source_location.mojom-blink.h"
-@@ -2861,9 +2862,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
+@@ -2879,9 +2880,11 @@ DocumentResourceCoordinator* LocalFrame::GetDocumentResourceCoordinator() {
   return CHECK_DEREF(GetDocument()).GetResourceCoordinator();
 }
 
@@ -436,7 +436,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/b
 #include "net/storage_access_api/status.h"
 #include "services/metrics/public/cpp/ukm_source_id.h"
 #include "services/network/public/mojom/fetch_api.mojom-blink-forward.h"
-@@ -668,7 +669,9 @@ class CORE_EXPORT LocalFrame final
+@@ -674,7 +675,9 @@ class CORE_EXPORT LocalFrame final
     return client_hints_preferences_;
   }
 
@@ -501,7 +501,7 @@ diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_
   const String& type = report->type();
   if (!(type == ReportType::kCSPViolation || type == ReportType::kCSPHash ||
         type == ReportType::kDeprecation ||
-@@ -268,6 +276,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+@@ -269,6 +277,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
         url, endpoint, body->featureId(), body->disposition(), body->message(),
         body->sourceFile(), line_number, column_number);
   }
@@ -7,24 +7,25 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 chrome/android/BUILD.gn                                    | 1 -
 .../chrome/browser/feedback/ChromeFeedbackCollector.java   | 1 -
 chrome/browser/feedback/android/BUILD.gn                   | 2 --
- chrome/browser/prefs/chrome_pref_service_factory.cc        | 2 +-
+ chrome/browser/prefs/chrome_pref_service_factory.cc        | 6 ------
 chrome/browser/profiles/profile_attributes_entry.cc        | 2 +-
 chrome/browser/profiles/profile_impl.cc                    | 5 +----
 chrome/browser/profiles/profile_manager.cc                 | 7 -------
 .../supervised_user/supervised_user_browser_utils.cc       | 1 +
 chrome/browser/ui/webui/managed_ui_handler.cc              | 4 ----
 .../browser/ui/webui/management/management_ui_handler.cc   | 4 ----
+ .../browser/android/content_filters_observer_bridge.cc     | 2 +-
 .../core/browser/supervised_user_pref_store.cc             | 1 +
 .../core/browser/supervised_user_preferences.cc            | 6 +++++-
 .../core/browser/supervised_user_service.cc                | 1 +
- components/supervised_user/core/common/features.cc         | 3 ++-
+ components/supervised_user/core/common/features.cc         | 1 +
 extensions/browser/api/management/management_api.cc        | 1 +
- 15 files changed, 14 insertions(+), 27 deletions(-)
+ 16 files changed, 13 insertions(+), 32 deletions(-)

 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -810,7 +810,6 @@ if (_is_default_toolchain) {
+@@ -840,7 +840,6 @@ if (_is_default_toolchain) {
       "//components/offline_pages/core:offline_page_model_enums_java",
       "//components/sharing_message:sharing_dialog_type_generated_enum",
       "//components/sharing_message:sharing_send_message_result_generated_enum",
@@ -35,7 +36,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/feedback/ChromeFeedbackCollector.java
-@@ -95,7 +95,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
+@@ -96,7 +96,6 @@ public class ChromeFeedbackCollector extends FeedbackCollector<ChromeFeedbackCol
         // FamilyInfoFeedbackSource relies on IdentityManager which is not available for the
         // incognito profile.
         if (!initParams.profile.isOffTheRecord()) {
@@ -65,19 +66,23 @@ diff --git a/chrome/browser/feedback/android/BUILD.gn b/chrome/browser/feedback/
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -332,7 +332,7 @@ void PrepareFactory(
-     policy::BrowserPolicyConnector* policy_connector) {
-   factory->SetManagedPolicies(policy_service, policy_connector);
-   factory->SetRecommendedPolicies(policy_service, policy_connector);
-  if (supervised_user_settings) {
-+  if (((false)) && supervised_user_settings) {
-     // supervised_user_prefs handles the case when content_filters_service is
-     // nullptr. It's simply not subscribing to empty service's notifications.
-     scoped_refptr<PrefStore> supervised_user_prefs =
+@@ -351,12 +351,6 @@ void PrepareFactory(
+   PrepareFactory(factory, pref_filename, policy_service,
+                  std::move(user_pref_store), std::move(extension_prefs), async,
+                  policy_connector);
+-
+-  scoped_refptr<PrefStore> supervised_user_prefs =
+-      base::MakeRefCounted<SupervisedUserPrefStore>(
+-          family_link_settings_service, device_parental_controls);
+-  DCHECK(async || supervised_user_prefs->IsInitializationComplete());
+-  factory->set_supervised_user_prefs(supervised_user_prefs);
+ }
+ 
+ class ResetOnLoadObserverImpl : public prefs::mojom::ResetOnLoadObserver {
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -475,7 +475,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
+@@ -466,7 +466,7 @@ bool ProfileAttributesEntry::IsSigninRequired() const {
 }
 
 std::string ProfileAttributesEntry::GetSupervisedUserId() const {
@@ -89,7 +94,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
-@@ -680,10 +680,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
+@@ -689,10 +689,6 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) {
     prefs->SetTime(prefs::kProfileCreationTime, path_creation_time_);
 
   pref_change_registrar_.Init(prefs);
@@ -100,7 +105,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 
   // Changes in the profile avatar.
   pref_change_registrar_.Add(
-@@ -1604,6 +1600,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1618,6 +1614,7 @@ GURL ProfileImpl::GetHomePage() {
 }
 
 void ProfileImpl::UpdateSupervisedUserIdInStorage() {
@@ -111,7 +116,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
 diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
 --- a/chrome/browser/profiles/profile_manager.cc
 +++ b/chrome/browser/profiles/profile_manager.cc
-@@ -1265,10 +1265,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
+@@ -1308,10 +1308,6 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
   }
 
@@ -122,7 +127,7 @@ diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profile
 }
 
 void ProfileManager::RegisterTestingProfile(std::unique_ptr<Profile> profile,
-@@ -2051,9 +2047,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
+@@ -2114,9 +2110,6 @@ void ProfileManager::AddProfileToStorage(Profile* profile) {
   init_params.icon_index =
       profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
 
@@ -146,7 +151,7 @@ diff --git a/chrome/browser/supervised_user/supervised_user_browser_utils.cc b/c
 diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc
 --- a/chrome/browser/ui/webui/managed_ui_handler.cc
 +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
-@@ -89,10 +89,6 @@ void ManagedUIHandler::AddObservers() {
+@@ -88,10 +88,6 @@ void ManagedUIHandler::AddObservers() {
     auto domain = static_cast<policy::PolicyDomain>(i);
     policy_service->AddObserver(domain, this);
   }
@@ -160,7 +165,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
-@@ -622,10 +622,6 @@ bool ManagementUIHandler::managed() const {
+@@ -627,10 +627,6 @@ bool ManagementUIHandler::managed() const {
 
 void ManagementUIHandler::RegisterPrefChange(
     PrefChangeRegistrar& pref_registrar) {
@@ -171,17 +176,29 @@ diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrom
 }
 
 void ManagementUIHandler::UpdateManagedState() {
+diff --git a/components/supervised_user/core/browser/android/content_filters_observer_bridge.cc b/components/supervised_user/core/browser/android/content_filters_observer_bridge.cc
+--- a/components/supervised_user/core/browser/android/content_filters_observer_bridge.cc
+++ b/components/supervised_user/core/browser/android/content_filters_observer_bridge.cc
+@@ -39,7 +39,7 @@ void ContentFiltersObserverBridge::OnChange(JNIEnv* env, bool enabled) {
+ }
+ 
+ void ContentFiltersObserverBridge::SetEnabled(bool enabled) {
+-  enabled_ = enabled;
+  enabled_ = false;
+   NotifyObservers();
+ }
+ 
 diff --git a/components/supervised_user/core/browser/supervised_user_pref_store.cc b/components/supervised_user/core/browser/supervised_user_pref_store.cc
 --- a/components/supervised_user/core/browser/supervised_user_pref_store.cc
 +++ b/components/supervised_user/core/browser/supervised_user_pref_store.cc
-@@ -171,6 +171,7 @@ void SupervisedUserPrefStore::RecreatePreferences() {
+@@ -188,6 +188,7 @@ void SupervisedUserPrefStore::RecreatePreferences() {
     return;
   }
 
 +  if ((true)) return;
   std::unique_ptr<PrefValueMap> old_prefs = std::move(prefs_);
   prefs_ = std::make_unique<PrefValueMap>();
-   if (settings_service_ && settings_service_->IsActive()) {
+ 
 diff --git a/components/supervised_user/core/browser/supervised_user_preferences.cc b/components/supervised_user/core/browser/supervised_user_preferences.cc
 --- a/components/supervised_user/core/browser/supervised_user_preferences.cc
 +++ b/components/supervised_user/core/browser/supervised_user_preferences.cc
@@ -208,7 +225,7 @@ diff --git a/components/supervised_user/core/browser/supervised_user_preferences
 diff --git a/components/supervised_user/core/browser/supervised_user_service.cc b/components/supervised_user/core/browser/supervised_user_service.cc
 --- a/components/supervised_user/core/browser/supervised_user_service.cc
 +++ b/components/supervised_user/core/browser/supervised_user_service.cc
-@@ -204,6 +204,7 @@ SupervisedUserService::SupervisedUserService(
+@@ -160,6 +160,7 @@ SupervisedUserService::SupervisedUserService(
 }
 
 void SupervisedUserService::SetSettingsServiceActive(bool active) {
@@ -219,37 +236,23 @@ diff --git a/components/supervised_user/core/browser/supervised_user_service.cc
 diff --git a/components/supervised_user/core/common/features.cc b/components/supervised_user/core/common/features.cc
 --- a/components/supervised_user/core/common/features.cc
 +++ b/components/supervised_user/core/common/features.cc
-@@ -30,7 +30,6 @@ BASE_FEATURE(kAllowSubframeLocalWebApprovals,
- #else
-              base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
-
- #if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-     BUILDFLAG(IS_WIN)
- const int kLocalWebApprovalBottomSheetLoadTimeoutDefaultValueMs = 5000;
-@@ -116,6 +115,7 @@ const base::FeatureParam<std::string>
- 
- namespace {
- bool PlatformSupportsLocalSupervision() {
-+  if ((true)) return false;
-   int32_t major, minor, bugfix;
-   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-   bool supported_by_os = (major == 16 && minor >= 1) || major > 16;
-@@ -154,4 +154,5 @@ bool ClassifyUrlWithoutCredentialsForLocalSupervision() {
- BASE_FEATURE(kSupervisedUserUseUrlFilteringService,
-              base::FEATURE_DISABLED_BY_DEFAULT);
- 
+@@ -19,6 +19,7 @@ namespace supervised_user {
+ // Enables local parent approvals for the blocked website on the Family Link
+ // user's device.
+ BASE_FEATURE(kLocalWebApprovals, base::FEATURE_ENABLED_BY_DEFAULT);
 +SET_CROMITE_FEATURE_DISABLED(kLocalWebApprovals);
- }  // namespace supervised_user
+ 
+ // TODO(crbug.com/391799078): Support local web approval for subframes on
+ // Desktop.
 diff --git a/extensions/browser/api/management/management_api.cc b/extensions/browser/api/management/management_api.cc
 --- a/extensions/browser/api/management/management_api.cc
 +++ b/extensions/browser/api/management/management_api.cc
-@@ -324,6 +324,7 @@ void AddExtensionInfo(const Extension* source_extension,
- }
+@@ -693,6 +693,7 @@ bool ManagementSetEnabledFunction::HasUnsupportedRequirements(
 
- bool PlatformSupportsApprovalFlowForExtensions() {
+ bool ManagementSetEnabledFunction::IsSupervisedExtensionApprovalFlowRequired(
+     const Extension* target_extension) const {
 +  if ((true)) return false;
- #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-     BUILDFLAG(IS_WIN)
-   return true;
+   SupervisedUserExtensionsDelegate* supervised_user_extensions_delegate =
+       ManagementAPI::GetFactoryInstance()
+           ->Get(browser_context())
 --
@@ -23,7 +23,7 @@ diff --git a/content/public/renderer/render_frame_media_playback_options.cc b/co
 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
-@@ -1288,6 +1288,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
+@@ -1348,6 +1348,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
   return pipeline_metadata_.has_audio;
 }
 
@@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
 void WebMediaPlayerImpl::EnabledAudioTracksChanged(
     std::optional<WebMediaPlayer::TrackId> enabled_track_id) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
-@@ -3650,7 +3656,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
+@@ -3745,7 +3751,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
 
   const bool preserve_audio = HasUnmutedAudio() || audio_source_provider_->IsAudioBeingCaptured();
   // Audio only stream is allowed to play when in background.
@@ -51,7 +51,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
-@@ -211,6 +211,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
+@@ -214,6 +214,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
   bool HasVideo() const override;
   bool HasAudio() const override;
 
@@ -20,7 +20,7 @@ diff --git a/chrome/browser/resources/inspect/inspect.js b/chrome/browser/resour
   if (!HOST_CHROME_VERSION) {
     return false;
   }
-@@ -597,7 +598,7 @@ function formatValue(data, property) {
+@@ -600,7 +601,7 @@ function formatValue(data, property) {
 function addFavicon(row, data) {
   const favicon = document.createElement('img');
   if (data['faviconUrl']) {
@@ -15,18 +15,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.build.annotations.Nullable;
 +import org.chromium.cc.input.BrowserControlsState;
- import org.chromium.chrome.browser.DefaultBrowserInfo;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.bookmarks.BookmarkManagerOpenerImpl;
-@@ -45,6 +46,7 @@ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+@@ -43,6 +44,7 @@ import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManagerFactory;
 import org.chromium.chrome.browser.printing.TabPrinter;
 import org.chromium.chrome.browser.profiles.Profile;
 +import org.chromium.chrome.browser.tab.TabBrowserControlsConstraintsHelper;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
- import org.chromium.chrome.browser.tabmodel.document.ChromeAsyncTabLauncher;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
-@@ -348,6 +350,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+ import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
+@@ -322,6 +324,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
             @Nullable Referrer referrer,
             boolean navigateToTab,
             @Nullable AdditionalNavigationParams additionalNavigationParams) {
@@ -34,7 +34,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabContextM
         RecordUserAction.record("MobileNewTabOpened");
         RecordUserAction.record("LinkOpenedInNewTab");
         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
-@@ -368,6 +371,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -342,6 +345,7 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
      * @param url The URL to open.
      */
     public void onOpenInNewTabInGroup(GURL url, @Nullable Referrer referrer) {
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/partnercustomizations/java/src/org/chromium/chrome/b
 diff --git a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 --- a/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
 +++ b/components/search_engines/android/java/src/org/chromium/components/search_engines/TemplateUrl.java
-@@ -88,6 +88,7 @@ public class TemplateUrl {
+@@ -110,6 +110,7 @@ public class TemplateUrl {
      *     prepopulated_engines.json.
      */
     public String getNewTabURL() {
@@ -79,7 +79,7 @@ diff --git a/components/search_engines/android/java/src/org/chromium/components/
 diff --git a/components/search_engines/android/template_url_service_android.cc b/components/search_engines/android/template_url_service_android.cc
 --- a/components/search_engines/android/template_url_service_android.cc
 +++ b/components/search_engines/android/template_url_service_android.cc
-@@ -400,6 +400,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
+@@ -426,6 +426,7 @@ bool TemplateUrlServiceAndroid::SetPlayAPISearchEngine(
         jimage_translate_source_language_param_key,
     const base::android::JavaRef<jstring>&
         jimage_translate_target_language_param_key) {
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
 
     /**
      * Constructs a BrowserControlsVisibilityDelegate designed to deal with overrides driven by the
-@@ -64,7 +65,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
+@@ -65,7 +66,8 @@ public class BrowserStateBrowserControlsVisibilityDelegate extends BrowserContro
         long currentShowingTime = SystemClock.uptimeMillis() - mCurrentShowingStartTime;
         if (currentShowingTime >= MINIMUM_SHOW_DURATION_MS) return;
 
@@ -53,7 +53,7 @@ new file mode 100644
 diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 --- a/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
 +++ b/components/browser_ui/accessibility/android/java/res/xml/accessibility_preferences.xml
-@@ -84,6 +84,12 @@ found in the LICENSE file.
+@@ -89,6 +89,12 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -31,7 +31,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 content/child/BUILD.gn                        |    7 +
 content/renderer/BUILD.gn                     |    4 +
 .../renderer/renderer_blink_platform_impl.cc  |   55 +-
- ...renderer_main_platform_delegate_android.cc |    2 +-
+ content/renderer/renderer_main.cc             |    2 -
 ...ndroid-fonts-fingerprinting-mitigation.inc |   12 +
 ...ndroid-fonts-fingerprinting-mitigation.inc |    7 +
 ...ndroid-fonts-fingerprinting-mitigation.inc |    5 +
@@ -43,12 +43,12 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../skia/src/ports/SkFontConfigInterface.cpp  |    5 +
 .../ports/SkFontConfigInterface_direct.cpp    |    5 +
 .../src/ports/SkFontConfigInterface_direct.h  |    1 +
- .../skia/src/ports/SkFontMgr_android.cpp      |  282 ++-
+ .../skia/src/ports/SkFontMgr_android.cpp      |  286 ++-
 .../skia/src/ports/SkFontMgr_android_data.cpp | 1641 +++++++++++++++++
 .../skia/src/ports/SkFontMgr_android_ndk.cpp  |    2 +-
- .../src/ports/SkFontMgr_android_parser.cpp    |   66 +-
+ .../src/ports/SkFontMgr_android_parser.cpp    |   69 +-
 .../skia/src/ports/SkFontMgr_android_parser.h |    5 +-
- 42 files changed, 2448 insertions(+), 85 deletions(-)
+ 42 files changed, 2451 insertions(+), 89 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Android-fonts-fingerprinting-mitigation.grdp
 create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.cc
 create mode 100644 components/component_updater/installer_policies/fonts_pack_component_installer.h
@@ -60,7 +60,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
 +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
-@@ -929,6 +929,9 @@ public final class ProductionSupportedFlagList {
+@@ -998,6 +998,9 @@ public final class ProductionSupportedFlagList {
                 "Hides user preference on the system keyboard by setting the standard "
                  + "eng layout and removing the layout information from the "
                  + "javascript keyboard events."),
@@ -109,10 +109,10 @@ diff --git a/build/config/freetype/freetype.gni b/build/config/freetype/freetype
 diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/android/java/res/xml/developer_preferences.xml
 --- a/chrome/android/java/res/xml/developer_preferences.xml
 +++ b/chrome/android/java/res/xml/developer_preferences.xml
-@@ -23,4 +23,9 @@ found in the LICENSE file.
-         android:title="Hint: You can also enable Developer options on Beta/Stable channels by tapping the Chrome version in &quot;Settings > About Chrome&quot; multiple times."
-         app:allowDividerAbove="false"
-         app:allowDividerBelow="false" />
+@@ -28,4 +28,9 @@ found in the LICENSE file.
+         android:summary="@string/android_gpu_sandbox_summary"
+         app:featureName="android-gpu-sandbox"
+         app:needRestart="true" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:title="@string/android_fonts_fingerprinting_mitigation_title"
 +        android:summary="@string/android_fonts_fingerprinting_mitigation_summary"
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/res/xml/developer_preferences.xml b/chrome/andr
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -7999,6 +7999,13 @@ static_library("browser") {
+@@ -7326,6 +7326,13 @@ static_library("browser") {
     ]
   }
 
@@ -139,7 +139,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc
 --- a/chrome/browser/component_updater/registration.cc
 +++ b/chrome/browser/component_updater/registration.cc
-@@ -111,10 +111,20 @@
+@@ -103,6 +103,11 @@
 #include "chrome/browser/component_updater/file_type_policies_component_installer.h"
 #endif
 
@@ -150,6 +150,9 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
 +
 namespace component_updater {
 
+ namespace {
+@@ -135,6 +140,11 @@ void DeleteOldComponents(const base::FilePath& user_data_dir) {
+ 
 void RegisterComponentsForUpdate() {
   auto* const cus = g_browser_process->component_updater();
 +#if BUILDFLAG(IS_ANDROID)
@@ -187,7 +190,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 // If a font name in prefs default values starts with a comma, consider it's a
 // comma-separated font list and resolve it to the first available font.
 #define PREFS_FONT_LIST 1
-@@ -442,9 +441,9 @@ void PrefsTabHelper::RegisterProfilePrefs(
+@@ -447,9 +446,9 @@ void PrefsTabHelper::RegisterProfilePrefs(
         value = gfx::FontList::FirstAvailableOrFirst(value);
       }
 #else   // !PREFS_FONT_LIST
@@ -203,7 +206,7 @@ diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/pre
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -267,6 +267,10 @@ static_library("renderer") {
+@@ -270,6 +270,10 @@ static_library("renderer") {
     deps += [ "//components/strings" ]
   }
 
@@ -217,7 +220,7 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
 diff --git a/components/component_updater/installer_policies/BUILD.gn b/components/component_updater/installer_policies/BUILD.gn
 --- a/components/component_updater/installer_policies/BUILD.gn
 +++ b/components/component_updater/installer_policies/BUILD.gn
-@@ -32,6 +32,13 @@ static_library("installer_policies_no_content_deps") {
+@@ -30,6 +30,13 @@ static_library("installer_policies_no_content_deps") {
     "trust_token_key_commitments_component_installer_policy.h",
   ]
 
@@ -282,7 +285,7 @@ new file mode 100644
 +
 +update_client::CrxInstaller::Result
 +FontsPackComponentInstallerPolicy::OnCustomInstall(
-+    const base::Value::Dict& manifest,
+    const base::DictValue& manifest,
 +    const base::FilePath& install_dir) {
 +  return update_client::CrxInstaller::Result(0);  // Nothing custom here.
 +}
@@ -292,14 +295,14 @@ new file mode 100644
 +void FontsPackComponentInstallerPolicy::ComponentReady(
 +    const base::Version& version,
 +    const base::FilePath& install_dir,
-+    base::Value::Dict manifest) {
+    base::DictValue manifest) {
 +  DCHECK(!install_dir.empty());
 +  LOG(INFO) << "Fonts Pack Version Ready: " << install_dir.value();
 +}
 +
 +// Called during startup and installation before ComponentReady().
 +bool FontsPackComponentInstallerPolicy::VerifyInstallation(
-+    const base::Value::Dict& manifest,
+    const base::DictValue& manifest,
 +    const base::FilePath& install_dir) const {
 +  return base::PathExists(install_dir);
 +}
@@ -378,14 +381,14 @@ new file mode 100644
 +  bool SupportsGroupPolicyEnabledComponentUpdates() const override;
 +  bool RequiresNetworkEncryption() const override;
 +  update_client::CrxInstaller::Result OnCustomInstall(
-+      const base::Value::Dict& manifest,
+      const base::DictValue& manifest,
 +      const base::FilePath& install_dir) override;
 +  void OnCustomUninstall() override;
-+  bool VerifyInstallation(const base::Value::Dict& manifest,
+  bool VerifyInstallation(const base::DictValue& manifest,
 +                          const base::FilePath& install_dir) const override;
 +  void ComponentReady(const base::Version& version,
 +                      const base::FilePath& install_dir,
-+                      base::Value::Dict manifest) override;
+                      base::DictValue manifest) override;
 +  base::FilePath GetRelativeInstallDir() const override;
 +  void GetHash(std::vector<uint8_t>* hash) const override;
 +  std::string GetName() const override;
@@ -430,7 +433,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
 
 #include <set>
 #include <utility>
-@@ -25,6 +27,12 @@
+@@ -26,6 +28,12 @@
 #include "ui/gfx/font_fallback_linux.h"
 #include "ui/gfx/font_render_params.h"
 
@@ -443,7 +446,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
 #if BUILDFLAG(ENABLE_PDF)
 #include "components/services/font/pdf_fontconfig_matching.h"  // nogncheck
 #endif
-@@ -100,6 +108,7 @@ void FontServiceApp::BindReceiver(
+@@ -101,6 +109,7 @@ void FontServiceApp::BindReceiver(
 void FontServiceApp::MatchFamilyName(const std::string& family_name,
                                      mojom::TypefaceStylePtr requested_style,
                                      MatchFamilyNameCallback callback) {
@@ -451,7 +454,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
   TRACE_EVENT0("fonts", "FontServiceApp::MatchFamilyName");
 
   SkFontConfigInterface::FontIdentity result_identity;
-@@ -160,6 +169,7 @@ void FontServiceApp::MatchFamilyName(const std::string& family_name,
+@@ -161,6 +170,7 @@ void FontServiceApp::MatchFamilyName(const std::string& family_name,
 
   std::move(callback).Run(std::move(identity), result_family_cppstring,
                           std::move(style));
@@ -459,7 +462,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
 }
 
 void FontServiceApp::OpenStream(uint32_t id_number,
-@@ -174,12 +184,43 @@ void FontServiceApp::OpenStream(uint32_t id_number,
+@@ -175,12 +185,43 @@ void FontServiceApp::OpenStream(uint32_t id_number,
   std::move(callback).Run(std::move(file));
 }
 
@@ -503,7 +506,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
   gfx::FallbackFontData fallback_font;
   if (gfx::GetFallbackFontForChar(character, locale, &fallback_font)) {
     size_t index = FindOrAddPath(fallback_font.filepath);
-@@ -194,6 +235,7 @@ void FontServiceApp::FallbackFontForCharacter(
+@@ -195,6 +236,7 @@ void FontServiceApp::FallbackFontForCharacter(
   } else {
     std::move(callback).Run(nullptr, "", false, false);
   }
@@ -511,7 +514,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
 }
 
 void FontServiceApp::FontRenderStyleForStrike(
-@@ -237,6 +279,9 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
+@@ -238,6 +280,9 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
   TRACE_EVENT0("fonts",
                "FontServiceApp::MatchFontByPostscriptNameOrFullFontName");
 
@@ -521,7 +524,7 @@ diff --git a/components/services/font/font_service_app.cc b/components/services/
   std::optional<FontConfigLocalMatching::FontConfigMatchResult> match_result =
       FontConfigLocalMatching::FindFontByPostscriptNameOrFullFontName(family);
   if (match_result) {
-@@ -248,6 +293,7 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
+@@ -249,6 +294,7 @@ void FontServiceApp::MatchFontByPostscriptNameOrFullFontName(
     return;
   }
   std::move(callback).Run(nullptr);
@@ -667,7 +670,7 @@ diff --git a/components/services/font/public/mojom/font_service.mojom b/componen
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2602,6 +2602,17 @@ source_set("browser") {
+@@ -2648,6 +2648,17 @@ source_set("browser") {
     ]
   }
 
@@ -685,7 +688,7 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
   if (is_linux || is_chromeos) {
     sources -=
         [ "file_system_access/file_path_watcher/file_path_watcher_stub.cc" ]
-@@ -2648,6 +2659,13 @@ source_set("browser") {
+@@ -2694,6 +2705,13 @@ source_set("browser") {
     deps += [ "//components/services/font_data:lib" ]
   }
 
@@ -702,9 +705,9 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
 diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc b/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 --- a/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
 +++ b/content/browser/renderer_host/render_process_host_impl_receiver_bindings.cc
-@@ -52,6 +52,11 @@
- #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
- #endif
+@@ -56,6 +56,11 @@
+ #include "content/browser/renderer_host/p2p/socket_dispatcher_host.h"
+ #endif  // BUILDFLAG(IS_P2P_ENABLED)
 
 +#if BUILDFLAG(IS_ANDROID)
 +#include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
@@ -714,7 +717,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
 #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
 #include "content/browser/font_service.h"  // nogncheck
-@@ -351,6 +356,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
+@@ -356,6 +361,13 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHostReceiver(
   }
 #endif
 
@@ -731,7 +734,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl_receiver_bin
 diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 --- a/content/child/BUILD.gn
 +++ b/content/child/BUILD.gn
-@@ -135,6 +135,13 @@ target(link_target_type, "child") {
+@@ -137,6 +137,13 @@ target(link_target_type, "child") {
     ]
   }
 
@@ -748,7 +751,7 @@ diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
 diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 --- a/content/renderer/BUILD.gn
 +++ b/content/renderer/BUILD.gn
-@@ -350,6 +350,10 @@ target(link_target_type, "renderer") {
+@@ -351,6 +351,10 @@ target(link_target_type, "renderer") {
     deps += [ "//services/screen_ai/public/mojom" ]
   }
 
@@ -762,7 +765,7 @@ diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
 diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
 --- a/content/renderer/renderer_blink_platform_impl.cc
 +++ b/content/renderer/renderer_blink_platform_impl.cc
-@@ -142,6 +142,23 @@
+@@ -141,6 +141,23 @@
 #include "content/common/android/sync_compositor_statics.h"
 #endif
 
@@ -786,7 +789,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
 using blink::Platform;
 using blink::WebAudioDevice;
 using blink::WebAudioLatencyHint;
-@@ -192,6 +209,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
+@@ -191,6 +208,37 @@ viz::command_buffer_metrics::ContextType ToVizContextType(
   NOTREACHED();
 }
 
@@ -824,7 +827,7 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
 }  // namespace
 
 //------------------------------------------------------------------------------
-@@ -205,18 +253,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -204,18 +252,21 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
       is_locked_to_site_(false),
       main_thread_scheduler_(main_thread_scheduler),
       next_frame_sink_id_(uint32_t{std::numeric_limits<int32_t>::max()} + 1) {
@@ -847,19 +850,19 @@ diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer
 +#endif
 #endif
 
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-diff --git a/content/renderer/renderer_main_platform_delegate_android.cc b/content/renderer/renderer_main_platform_delegate_android.cc
--- a/content/renderer/renderer_main_platform_delegate_android.cc
-+++ b/content/renderer/renderer_main_platform_delegate_android.cc
-@@ -35,7 +35,7 @@ void RendererMainPlatformDelegate::PlatformInitialize() {
-   // Android 14+ user devices with updated system fonts will call statx and
-   // possibly other system calls that are not allowed in the sandbox.
-   // See https://crbug.com/40618213 for details.
-  [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
-+  // [[maybe_unused]] auto mgr = skia::DefaultFontMgr();
- }
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
+--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
+@@ -183,8 +183,6 @@ int RendererMain(MainFunctionParams parameters) {
+   // On Linux, Windows, and ChromeOS, the font manager is overridden or
+   // specially handled in RendererBlinkPlatformImpl(). On other platforms,
+   // initialise the default one on a thread pool, to avoid blocking on it later.
+-  base::ThreadPool::PostTask(FROM_HERE,
+-                             base::BindOnce([] { skia::DefaultFontMgr(); }));
+ #endif
 
- void RendererMainPlatformDelegate::PlatformUninitialize() {
+   // This function allows pausing execution using the --renderer-startup-dialog
 diff --git a/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc b/cromite_flags/chrome/browser/about_flags_cc/Android-fonts-fingerprinting-mitigation.inc
 new file mode 100644
 --- /dev/null
@@ -902,7 +905,7 @@ new file mode 100644
 diff --git a/skia/BUILD.gn b/skia/BUILD.gn
 --- a/skia/BUILD.gn
 +++ b/skia/BUILD.gn
-@@ -443,6 +443,18 @@ component("skia") {
+@@ -446,6 +446,18 @@ component("skia") {
     sources += skia_ports_fci_sources
   }
 
@@ -1371,28 +1374,26 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
         }
         this->buildNameToFamilyMap(families, custom ? custom->fIsolated : false);
         this->findDefaultStyleSet();
-@@ -309,12 +452,12 @@ protected:
+@@ -309,33 +452,53 @@ protected:
     }
 
-     enum class NameType { Self, Fallback };
+     using Matcher = bool (*)(const SkString& familyName, const NameToFamily&);
 -    static sk_sp<SkTypeface_AndroidSystem> find_family_style_character(
 +    sk_sp<SkTypeface> find_family_style_character(
             const SkString& familyName,
             const TArray<NameToFamily, true>& nameToFamilyMap,
-             NameType nameType,
             const SkFontStyle& style, bool elegant,
-            const SkString& langTag, SkUnichar character)
-+            const SkString& langTag, SkUnichar character) const
+             const SkString& langTag, SkUnichar character,
+-            Matcher matcher)
+            Matcher matcher) const
     {
         for (auto&& nameToFamily : nameToFamilyMap) {
-             SkFontStyleSet_Android* family = nameToFamily.styleSet;
-@@ -325,22 +468,42 @@ protected:
-                     continue;
-                 }
+             if (!matcher(familyName, nameToFamily)) {
+                 continue;
             }
-            sk_sp<SkTypeface_AndroidSystem> face(family->matchAStyle(style));
+-            sk_sp<SkTypeface_AndroidSystem> face(nameToFamily.styleSet->matchAStyle(style));
 +            if (custom_) {
-+                sk_sp<SkTypeface_AndroidSystemCustom> face(family->matchCromiteStyle(style));
+                sk_sp<SkTypeface_AndroidSystemCustom> face(nameToFamily.styleSet->matchCromiteStyle(style));
 +
 +                if (!langTag.isEmpty() &&
 +                    std::none_of(face->fLang.begin(), face->fLang.end(), [&](const SkLanguage& lang){
@@ -1420,7 +1421,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +                    return face;
 +                }
 +            } else {
-+                sk_sp<SkTypeface_AndroidSystem> face(family->matchAndroidStyle(style));
+                sk_sp<SkTypeface_AndroidSystem> face(nameToFamily.styleSet->matchAndroidStyle(style));
 +
 +                if (!langTag.isEmpty() &&
 +                    std::none_of(face->fLang.begin(), face->fLang.end(), [&](const SkLanguage& lang){
@@ -1429,29 +1430,41 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 +                {
 +                    continue;
 +                }
- 
-            if (face->unicharToGlyph(character) != 0) {
-                return face;
+
 +                if (SkToBool(face->fVariantStyle & kElegant_FontVariant) != elegant) {
 +                    continue;
 +                }
-+
+ 
+-            if (face->unicharToGlyph(character) != 0) {
+-                return face;
 +                if (face->unicharToGlyph(character) != 0) {
 +                    return face;
 +                }
             }
         }
         return nullptr;
-@@ -355,7 +518,7 @@ protected:
-         // The variant 'default' means 'compact and elegant'.
-         // As a result, it is not possible to know the variant context from the font alone.
-         // TODO: add 'is_elegant' and 'is_compact' bits to 'style' request.
+@@ -360,9 +523,9 @@ protected:
+ 
+         auto find = [this, &style, &character](const SkString& familyName,
+                                                const SkString& lang,
+-                                               bool elegant) -> sk_sp<SkTypeface_AndroidSystem>
+                                               bool elegant) -> sk_sp<SkTypeface>
+         {
+-            sk_sp<SkTypeface_AndroidSystem> matchingTypeface;
+            sk_sp<SkTypeface> matchingTypeface;
+             if (!familyName.isEmpty()) {
+                 matchingTypeface = find_family_style_character(
+                     familyName, fNameToFamilyMap, style, elegant, lang, character,
+@@ -410,7 +573,7 @@ protected:
+         };
+ 
+ 
 -        sk_sp<SkTypeface_AndroidSystem> matchingTypeface;
 +        sk_sp<SkTypeface> matchingTypeface;
-         SkString familyNameString(familyName);
-         for (const SkString& currentFamilyName : { familyNameString, SkString() }) {
-             // The first time match anything elegant, second time anything not elegant.
-@@ -435,6 +598,7 @@ protected:
+         // If familyName is empty, don't look through everything twice.
+         SkString familyNames[2] = { SkString(familyName), SkString() };
+         size_t familyNamesCount = familyNames[0].isEmpty() ? 1 : 2;
+@@ -475,6 +638,7 @@ protected:
 private:
 
     std::unique_ptr<SkFontScanner> fScanner;
@@ -1459,7 +1472,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
 
     TArray<sk_sp<SkFontStyleSet_Android>> fStyleSets;
     sk_sp<SkFontStyleSet> fDefaultStyleSet;
-@@ -456,7 +620,7 @@ private:
+@@ -496,7 +660,7 @@ private:
         }
 
         sk_sp<SkFontStyleSet_Android> newSet =
@@ -1468,7 +1481,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
         if (0 == newSet->count()) {
             return;
         }
-@@ -502,7 +666,11 @@ static char const * const gSystemFontUseStrings[] = {
+@@ -542,7 +706,11 @@ static char const * const gSystemFontUseStrings[] = {
 
 }  // namespace
 
@@ -1481,7 +1494,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia
                                        std::unique_ptr<SkFontScanner> scanner) {
     if (custom) {
         SkASSERT(0 <= custom->fSystemFontUse);
-@@ -515,5 +683,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
+@@ -555,5 +723,5 @@ sk_sp<SkFontMgr> SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust
                      custom->fFallbackFontsXml);
         }
     }
@@ -3149,7 +3162,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_ndk.cpp b/third_party/
 diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
 --- a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
 +++ b/third_party/skia/src/ports/SkFontMgr_android_parser.cpp
-@@ -654,14 +654,27 @@ static const XML_Memory_Handling_Suite sk_XML_alloc = {
+@@ -713,14 +713,27 @@ static const XML_Memory_Handling_Suite sk_XML_alloc = {
  */
 static int parse_config_file(const char* filename,
                              std::vector<std::unique_ptr<FontFamily>>& families,
@@ -3183,7 +3196,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
         return -1;
     }
 
-@@ -693,8 +706,8 @@ static int parse_config_file(const char* filename,
+@@ -752,8 +765,8 @@ static int parse_config_file(const char* filename,
             SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "could not buffer enough to continue\n");
             return -1;
         }
@@ -3194,7 +3207,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
         XML_Status status = XML_ParseBuffer(parser, len, done);
         if (XML_STATUS_ERROR == status) {
             XML_Error error = XML_GetErrorCode(parser);
-@@ -706,6 +719,23 @@ static int parse_config_file(const char* filename,
+@@ -765,6 +778,23 @@ static int parse_config_file(const char* filename,
             return -1;
         }
     }
@@ -3218,7 +3231,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
     return self.fVersion;
 }
 
-@@ -768,8 +798,10 @@ static void append_fallback_font_families_for_locale(
+@@ -827,8 +857,10 @@ static void append_fallback_font_families_for_locale(
 
 static void append_system_fallback_font_families(
     std::vector<std::unique_ptr<FontFamily>>& fallbackFonts,
@@ -3230,7 +3243,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
     parse_config_file(FALLBACK_FONTS_FILE, fallbackFonts, basePath, true);
     append_fallback_font_families_for_locale(fallbackFonts,
                                              LOCALE_FALLBACK_FONTS_SYSTEM_DIR,
-@@ -778,8 +810,10 @@ static void append_system_fallback_font_families(
+@@ -837,8 +869,10 @@ static void append_system_fallback_font_families(
 
 static void mixin_vendor_fallback_font_families(
         std::vector<std::unique_ptr<FontFamily>>& fallbackFonts,
@@ -3242,17 +3255,26 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
     std::vector<std::unique_ptr<FontFamily>> vendorFonts;
     parse_config_file(VENDOR_FONTS_FILE, vendorFonts, basePath, true);
     append_fallback_font_families_for_locale(vendorFonts,
-@@ -811,7 +845,8 @@ static void mixin_vendor_fallback_font_families(
+@@ -870,7 +904,8 @@ static void mixin_vendor_fallback_font_families(
 }
 
 void SkFontMgr_Android_Parser::GetSystemFontFamilies(
-        std::vector<std::unique_ptr<FontFamily>>& fontFamilies)
+-        std::vector<std::unique_ptr<FontFamily>>& fontFamilies) {
 +        std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
-+        const SkFontMgr_Android_CustomFonts* custom)
- {
+        const SkFontMgr_Android_CustomFonts* custom) {
+     static constexpr char kFontFilePrefix[] = "/fonts/";
+ 
     // Version 21 of the system font configuration does not need any fallback configuration files.
-     SkString basePath(getenv("ANDROID_ROOT"));
-@@ -823,8 +858,8 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+@@ -881,15 +916,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+         // Product fonts (fonts_customization.xml) leverage <fonts-modification version="21">
+         // Therefore, we only attempt to parse them on modern devices (Android Lollipop+).
+         // Pre-21 systems fall through to the legacy fallback fonts handling below.
+        if (!custom)
+         SkFontMgr_Android_Parser::GetCustomFontFamilies(
+-                fontFamilies, basePath, PRODUCT_CUSTOMIZATION_FILE, nullptr, nullptr);
+                fontFamilies, basePath, custom, PRODUCT_CUSTOMIZATION_FILE, nullptr, nullptr);
+         return;
+     }
 
     // Append all the fallback fonts to system fonts
     std::vector<std::unique_ptr<FontFamily>> fallbackFonts;
@@ -3263,7 +3285,7 @@ diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.cpp b/third_par
     fontFamilies.insert(fontFamilies.end(),
                         std::make_move_iterator(fallbackFonts.begin()),
                         std::make_move_iterator(fallbackFonts.end()));
-@@ -833,15 +868,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
+@@ -898,15 +934,16 @@ void SkFontMgr_Android_Parser::GetSystemFontFamilies(
 void SkFontMgr_Android_Parser::GetCustomFontFamilies(
         std::vector<std::unique_ptr<FontFamily>>& fontFamilies,
         const SkString& basePath,
@@ -23,7 +23,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../java/res/xml/homepage_preferences.xml     |   6 +
 .../ConnectivityDetector.java                 |   1 -
 .../indicator/OfflineDetector.java            | 111 +++++++++++++++++-
- .../OfflineIndicatorControllerV2.java         |  15 ++-
+ .../OfflineIndicatorControllerV2.java         |  14 ++-
 .../tabbed_mode/TabbedRootUiCoordinator.java  |   5 +-
 .../tabmodel/TabModelSelectorBase.java        |   7 ++
 .../sAskForRestartOnConnectionChange.java     |  32 +++++
@@ -49,7 +49,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../blink/renderer/core/frame/local_frame.cc  |   2 +
 .../main_thread/frame_scheduler_impl.cc       |   2 +
 .../main_thread/page_scheduler_impl.cc        |   9 +-
- 29 files changed, 320 insertions(+), 9 deletions(-)
+ 29 files changed, 319 insertions(+), 9 deletions(-)
 create mode 100644 chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/cromite/sAskForRestartOnConnectionChange.java
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Ask-for-restart-on-connection-change.grdp
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Ask-for-restart-on-connection-change.inc
@@ -95,7 +95,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 import org.chromium.components.variations.VariationsAssociatedData;
 
 +import android.app.Activity;
-+import org.chromium.base.supplier.ObservableSupplier;
+import org.chromium.base.supplier.MonotonicObservableSupplier;
 +import org.chromium.url.GURL;
 +import org.chromium.chrome.R;
 +import org.chromium.chrome.browser.app.tabwindow.TabWindowManagerSingleton;
@@ -135,8 +135,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
     private static final String TAG = "OfflineDetector";
 
 +    private long mLastNetworkId = 0;
-+    private ObservableSupplier<TabModelSelector> mTabModelSelectorSupplier;
-+    private ObservableSupplier<LayoutManager> mLayoutManager;
+    private MonotonicObservableSupplier<TabModelSelector> mTabModelSelectorSupplier;
+    private MonotonicObservableSupplier<LayoutManager> mLayoutManager;
 +    private Supplier<SnackbarManager> mSnackbarManagerSupplier;
 +
     /**
@@ -148,8 +148,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
             Callback<Boolean> isForegroundCallback,
 -            Context context) {
 +            Context context,
-+            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
-+            ObservableSupplier<LayoutManager> layoutManager,
+            MonotonicObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
+            MonotonicObservableSupplier<LayoutManager> layoutManager,
 +            Supplier<SnackbarManager> snackbarManagerSupplier) {
 +        mTabModelSelectorSupplier = tabModelSelectorSupplier;
 +        mSnackbarManagerSupplier = snackbarManagerSupplier;
@@ -244,11 +244,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/OfflineIndicatorControllerV2.java
-@@ -31,6 +31,11 @@ import java.lang.annotation.Retention;
+@@ -32,6 +32,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.function.Supplier;
 
-+import org.chromium.base.supplier.ObservableSupplierImpl;
 +import org.chromium.chrome.browser.layouts.LayoutManager;
 +import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 +import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -256,19 +255,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 /**
  * Class that controls visibility and content of {@link StatusIndicatorCoordinator} to relay
  * connectivity information.
-@@ -104,7 +109,10 @@ public class OfflineIndicatorControllerV2 {
+@@ -105,7 +109,10 @@ public class OfflineIndicatorControllerV2 {
             Context context,
             StatusIndicatorCoordinator statusIndicator,
-             ObservableSupplier<Boolean> isUrlBarFocusedSupplier,
+             NonNullObservableSupplier<Boolean> isUrlBarFocusedSupplier,
 -            Supplier<Boolean> canAnimateNativeBrowserControls) {
 +            Supplier<Boolean> canAnimateNativeBrowserControls,
-+            ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
-+            ObservableSupplierImpl<LayoutManager> layoutManager,
+            MonotonicObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
+            MonotonicObservableSupplier<LayoutManager> layoutManager,
 +            Supplier<SnackbarManager> snackbarManagerSupplier) {
         // If "force online connection state" switch is set, the offline indicator should never
         // show.
         assert !CommandLine.getInstance()
-@@ -130,7 +138,10 @@ public class OfflineIndicatorControllerV2 {
+@@ -131,7 +138,10 @@ public class OfflineIndicatorControllerV2 {
                     new OfflineDetector(
                             (Boolean offline) -> onConnectionStateChanged(offline),
                             (Boolean isForeground) -> onApplicationStateChanged(isForeground),
@@ -283,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/in
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -1534,7 +1534,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1693,7 +1693,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                             mActivity,
                             mStatusIndicatorCoordinator,
                             isUrlBarFocusedSupplier,
@@ -406,7 +405,7 @@ diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browse
 diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 --- a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
 +++ b/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManager.java
-@@ -138,6 +138,8 @@ public interface TabWindowManager {
+@@ -154,6 +154,8 @@ public interface TabWindowManager {
     /** Returns the total number of incognito tabs across all tab model selectors. */
     int getIncognitoTabCount();
 
@@ -418,14 +417,14 @@ diff --git a/chrome/browser/tabwindow/android/java/src/org/chromium/chrome/brows
 diff --git a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 --- a/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
 +++ b/chrome/browser/tabwindow/internal/android/java/src/org/chromium/chrome/browser/tabwindow/TabWindowManagerImpl.java
-@@ -567,6 +567,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
-         return tabGroupModelFilter.getTabsInGroup(tabGroupId);
+@@ -551,6 +551,16 @@ public class TabWindowManagerImpl implements TabWindowManager {
+         return tabModelSelector.getModel(isIncognito).getTabsInGroup(tabGroupId);
     }
 
 +    @Override
 +    public void setPagesFrozen(boolean frozen) {
-+        for (int i : mWindowIdToSelectors.keySet()) {
-+            TabModelSelector selector = mWindowIdToSelectors.get(i);
+        for (Map.Entry<@WindowId Integer, TabModelSelector> entry : mWindowIdToSelectors.entrySet()) {
+            TabModelSelector selector = entry.getValue();
 +            if (selector != null) {
 +                selector.setPagesFrozen(frozen);
 +            }
@@ -477,16 +476,16 @@ diff --git a/chrome/browser/ui/messages/android/java/res/layout/floating_snackba
 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
-@@ -141,6 +141,8 @@ public class Snackbar {
+@@ -149,6 +149,8 @@ public class Snackbar {
     private @Nullable String mTemplateText;
     private @Nullable String mActionText;
     private @Nullable Object mActionData;
 +    private String mDismissActionText;
 +    private Object mDismissActionData;
     private int mBackgroundColor;
-     private int mTextApperanceResId;
+     private int mTextAppearanceResId;
     private boolean mDefaultLines = true;
-@@ -247,6 +249,20 @@ public class Snackbar {
+@@ -255,6 +257,20 @@ public class Snackbar {
         return this;
     }
 
@@ -510,7 +509,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
 diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
 +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java
-@@ -341,6 +341,12 @@ public class SnackbarManager
+@@ -464,6 +464,12 @@ public class SnackbarManager
                         new SnackbarView(
                                 mActivity,
                                 this,
@@ -526,7 +525,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 {
+@@ -57,6 +57,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
     protected final ViewGroup mSnackbarView;
     protected final TemplatePreservingTextView mMessageView;
     private final TextView mActionButtonView;
@@ -534,7 +533,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 ViewGroup mOriginalParent;
-@@ -97,6 +98,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -110,6 +111,7 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
     public SnackbarView(
             Activity activity,
             SnackbarManager manager,
@@ -542,7 +541,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
             Snackbar snackbar,
             ViewGroup parentView,
             @Nullable WindowAndroid windowAndroid,
-@@ -128,6 +130,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -171,6 +173,8 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
                 (TemplatePreservingTextView) mContainerView.findViewById(R.id.snackbar_message);
         mActionButtonView = (TextView) mContainerView.findViewById(R.id.snackbar_button);
         mActionButtonView.setOnClickListener(manager);
@@ -551,7 +550,7 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/bro
         mProfileImageView = (ImageView) mContainerView.findViewById(R.id.snackbar_profile_image);
         // Add bottom margin to extend the snackbar view into the bottom window inset. This
         // margin has to be applied to the snackbar view itself to avoid weird visual clipping
-@@ -343,6 +347,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
+@@ -434,6 +438,12 @@ public class SnackbarView implements InsetObserver.WindowInsetObserver {
             mActionButtonView.setVisibility(View.VISIBLE);
             mActionButtonView.setContentDescription(snackbar.getActionText());
             setViewText(mActionButtonView, snackbar.getActionText(), animate);
@@ -567,7 +566,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
-@@ -908,6 +908,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, bool focused) {
+@@ -903,6 +903,22 @@ void WebContentsAndroid::SetFocus(JNIEnv* env, bool focused) {
   view->SetFocus(focused);
 }
 
@@ -593,7 +592,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
-@@ -198,6 +198,7 @@ class CONTENT_EXPORT WebContentsAndroid {
+@@ -199,6 +199,7 @@ class CONTENT_EXPORT WebContentsAndroid {
 
   void OnScaleFactorChanged(JNIEnv* env);
   void SetFocus(JNIEnv* env, bool focused);
@@ -604,7 +603,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
-@@ -4108,8 +4108,10 @@ void WebContentsImpl::Stop() {
+@@ -4217,8 +4217,10 @@ void WebContentsImpl::Stop() {
 void WebContentsImpl::SetPageFrozen(bool frozen) {
   TRACE_EVENT1("content", "WebContentsImpl::SetPageFrozen", "frozen", frozen);
 
@@ -618,7 +617,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
-@@ -1143,6 +1143,12 @@ public class WebContentsImpl
+@@ -1171,6 +1171,12 @@ public class WebContentsImpl
         WebContentsImplJni.get().setFocus(mNativeWebContentsAndroid, hasFocus);
     }
 
@@ -631,7 +630,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webcon
     @Override
     public void setDisplayCutoutSafeArea(Rect insets) {
         if (mNativeWebContentsAndroid == 0) return;
-@@ -1486,6 +1492,8 @@ public class WebContentsImpl
+@@ -1519,6 +1525,8 @@ public class WebContentsImpl
 
         void setFocus(long nativeWebContentsAndroid, boolean focused);
 
@@ -700,7 +699,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
-@@ -4659,6 +4659,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
+@@ -4626,6 +4626,7 @@ void Document::DispatchUnloadEvents(UnloadEventTimingInfo* unload_timing_info) {
 }
 
 void Document::DispatchFreezeEvent() {
@@ -711,7 +710,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
-@@ -3311,6 +3311,7 @@ void LocalFrame::DidFreeze() {
+@@ -3325,6 +3325,7 @@ void LocalFrame::DidFreeze() {
   LoaderFreezeMode freeze_mode = GetLoaderFreezeMode();
   GetDocument()->Fetcher()->SetDefersLoading(freeze_mode);
   Loader().SetDefersLoading(freeze_mode);
@@ -719,7 +718,7 @@ diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/
 }
 
 void LocalFrame::DidResume() {
-@@ -3325,6 +3326,7 @@ void LocalFrame::DidResume() {
+@@ -3339,6 +3340,7 @@ void LocalFrame::DidResume() {
   GetDocument()->Fetcher()->SetDefersLoading(LoaderFreezeMode::kNone);
   Loader().SetDefersLoading(LoaderFreezeMode::kNone);
 
@@ -730,7 +729,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
-@@ -1025,7 +1025,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
+@@ -1022,7 +1022,9 @@ SchedulingLifecycleState FrameSchedulerImpl::CalculateLifecycleState(
   if (!parent_page_scheduler_)
     return SchedulingLifecycleState::kNotThrottled;
   if (parent_page_scheduler_->IsFrozen()) {
@@ -743,7 +742,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_sch
 diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 --- a/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
 +++ b/third_party/blink/renderer/platform/scheduler/main_thread/page_scheduler_impl.cc
-@@ -236,10 +236,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
+@@ -235,10 +235,12 @@ void PageSchedulerImpl::SetPageFrozen(bool frozen) {
   // it is desirable to reject the page freeze to prevent the scheduler from
   // being put in a bad state. See https://crbug.com/873214 for context of how
   // this can happen on the browser side.
@@ -756,7 +755,7 @@ diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/page_sche
   PolicyUpdater policy_updater;
   SetPageFrozenImpl(frozen, policy_updater);
 }
-@@ -804,7 +806,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
+@@ -803,7 +805,12 @@ bool PageSchedulerImpl::IsBackgrounded() const {
   // expire immediately when a page is backgrounded, which is undesirable in
   // headless mode. To prevent that, a page is never considerer backgrounded
   // when virtual time is enabled.
@@ -52,7 +52,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc
-@@ -200,6 +200,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
+@@ -197,6 +197,20 @@ AudioBuffer::AudioBuffer(AudioBus* bus)
   }
 }
 
@@ -88,15 +88,15 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.h b/third_
 diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/third_party/blink/renderer/modules/webaudio/audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/audio_context.cc
-@@ -21,6 +21,7 @@
- #include "third_party/blink/public/common/features.h"
+@@ -22,6 +22,7 @@
 #include "third_party/blink/public/common/mediastream/media_devices.h"
+ #include "third_party/blink/public/mojom/permissions/permission_status.mojom-blink.h"
 #include "third_party/blink/public/platform/browser_interface_broker_proxy.h"
 +#include "third_party/blink/public/common/features.h"
 #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"
-@@ -969,7 +970,9 @@ double AudioContext::baseLatency() const {
+@@ -1138,7 +1139,9 @@ double AudioContext::baseLatency() const {
   DCHECK_CALLED_ON_VALID_SEQUENCE(main_thread_sequence_checker_);
   DCHECK(destination());
 
@@ -110,7 +110,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_context.cc b/thir
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.cc
-@@ -30,6 +30,7 @@
+@@ -28,6 +28,7 @@
 #include "base/metrics/histogram_functions.h"
 #include "build/build_config.h"
 #include "media/base/audio_bus.h"
@@ -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"
-@@ -776,6 +777,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
+@@ -775,6 +776,17 @@ LocalDOMWindow* BaseAudioContext::GetWindow() const {
   return To<LocalDOMWindow>(GetExecutionContext());
 }
 
@@ -139,7 +139,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.cc b
 diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 --- a/third_party/blink/renderer/modules/webaudio/base_audio_context.h
 +++ b/third_party/blink/renderer/modules/webaudio/base_audio_context.h
-@@ -327,6 +327,8 @@ class MODULES_EXPORT BaseAudioContext
+@@ -331,6 +331,8 @@ class MODULES_EXPORT BaseAudioContext
   // if the execution context does not exist.
   bool CheckExecutionContextAndThrowIfNecessary(ExceptionState&);
 
@@ -151,7 +151,7 @@ diff --git a/third_party/blink/renderer/modules/webaudio/base_audio_context.h b/
 diff --git a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 --- a/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
 +++ b/third_party/blink/renderer/modules/webaudio/offline_audio_context.cc
-@@ -412,6 +412,7 @@ void OfflineAudioContext::FireCompletionEvent() {
+@@ -418,6 +418,7 @@ void OfflineAudioContext::FireCompletionEvent() {
     if (!rendered_buffer) {
       return;
     }
@@ -170,17 +170,17 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 #include "third_party/blink/renderer/platform/audio/audio_bus.h"
 #include "third_party/blink/renderer/platform/audio/audio_utilities.h"
 #include "third_party/blink/renderer/platform/audio/vector_math.h"
-@@ -118,7 +119,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
+@@ -117,7 +118,8 @@ void RealtimeAnalyser::GetFloatFrequencyData(DOMFloat32Array* destination_array,
     for (unsigned i = 0; i < len; ++i) {
-       const float linear_value = UNSAFE_TODO(source[i]);
+       const float linear_value = magnitude_buffer_[i];
       const double db_mag = audio_utilities::LinearToDecibels(linear_value);
-      UNSAFE_TODO(destination[i]) = static_cast<float>(db_mag);
+-      destination[i] = static_cast<float>(db_mag);
 +      auto v = static_cast<float>(db_mag);
-+      UNSAFE_TODO(destination[i]) = BaseAudioContext::ShuffleAudioData(v, i);
+      destination[i] = BaseAudioContext::ShuffleAudioData(v, i);
     }
   }
 }
-@@ -156,9 +158,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
+@@ -153,9 +155,11 @@ void RealtimeAnalyser::GetByteFrequencyData(DOMUint8Array* destination_array,
 
       // The range m_minDecibels to m_maxDecibels will be scaled to byte values
       // from 0 to UCHAR_MAX.
@@ -191,24 +191,24 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/
 +      scaled_value = BaseAudioContext::ShuffleAudioData(scaled_value, i);
 +
       // Clip to valid range.
-       UNSAFE_TODO(destination[i]) =
+       destination[i] =
           static_cast<unsigned char>(ClampTo(scaled_value, 0, UCHAR_MAX));
-@@ -189,6 +193,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize]);
+@@ -184,6 +188,7 @@ void RealtimeAnalyser::GetFloatTimeDomainData(
+           input_buffer_[(i + write_index - fft_size + kInputBufferSize) %
+                         kInputBufferSize];
 
 +      value = BaseAudioContext::ShuffleAudioData(value, i);
-       UNSAFE_TODO(destination[i]) = value;
+       destination[i] = value;
     }
   }
-@@ -212,10 +217,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
- 
+@@ -205,10 +210,12 @@ void RealtimeAnalyser::GetByteTimeDomainData(DOMUint8Array* destination_array) {
+     base::span<unsigned char> destination = destination_array->AsSpan();
     for (unsigned i = 0; i < len; ++i) {
       // Buffer access is protected due to modulo operation.
-      const float value = UNSAFE_TODO(
-+      float value = UNSAFE_TODO(
-           input_buffer[(i + write_index - fft_size + kInputBufferSize) %
-                        kInputBufferSize]);
+-      const float value =
+      float value =
+           input_buffer_[(i + write_index - fft_size + kInputBufferSize) %
+                         kInputBufferSize];
 
 +      value = BaseAudioContext::ShuffleAudioData(value, i);
 +
@@ -218,7 +218,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
-@@ -643,9 +643,8 @@
+@@ -719,9 +719,8 @@
     {
       // AudioContext.playoutStats interface.
       // https://chromestatus.com/feature/5172818344148992
@@ -23,7 +23,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.h b/third_party/blink/renderer/core/execution_context/execution_context.h
 --- a/third_party/blink/renderer/core/execution_context/execution_context.h
 +++ b/third_party/blink/renderer/core/execution_context/execution_context.h
-@@ -387,6 +387,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
+@@ -388,6 +388,7 @@ class CORE_EXPORT ExecutionContext : public Supplementable<ExecutionContext>,
   void SetAddressSpace(network::mojom::blink::IPAddressSpace ip_address_space);
 
   HeapObserverList<ContextLifecycleObserver>& ContextLifecycleObserverSet();
@@ -45,7 +45,7 @@ diff --git a/third_party/blink/renderer/core/loader/base_fetch_context.h b/third
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc
-@@ -1133,6 +1133,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
+@@ -1134,6 +1134,26 @@ bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   return should_block_request;
 }
 
@@ -75,7 +75,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
 diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.h b/third_party/blink/renderer/core/loader/frame_fetch_context.h
 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.h
 +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.h
-@@ -192,6 +192,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
+@@ -197,6 +197,7 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext,
   bool ShouldBlockWebSocketByMixedContentCheck(const KURL&) const override;
   std::unique_ptr<WebSocketHandshakeThrottle> CreateWebSocketHandshakeThrottle()
       override;
@@ -148,7 +148,7 @@ diff --git a/third_party/blink/renderer/modules/background_fetch/background_fetc
 --- a/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
 +++ b/third_party/blink/renderer/modules/background_fetch/background_fetch_manager.cc
@@ -104,6 +104,30 @@ bool ShouldBlockDanglingMarkup(const KURL& request_url) {
-          request_url.ProtocolIsInHTTPFamily();
+          request_url.ProtocolIsInHttpFamily();
 }
 
 +bool ShouldBlockGateWayAttacks(ExecutionContext* execution_context,
@@ -205,8 +205,8 @@ diff --git a/third_party/blink/renderer/modules/websockets/websocket_channel_imp
 +  }
 +
   if (auto* scheduler = execution_context_->GetScheduler()) {
-     // Two features are registered here:
-     // - `kWebSocket`: a non-sticky feature that will disable BFCache for any
+     if (!RuntimeEnabledFeatures::DisconnectWebSocketOnBFCacheEnabled()) {
+       // Two features are registered here:
 diff --git a/third_party/blink/renderer/modules/websockets/websocket_common.cc b/third_party/blink/renderer/modules/websockets/websocket_common.cc
 --- a/third_party/blink/renderer/modules/websockets/websocket_common.cc
 +++ b/third_party/blink/renderer/modules/websockets/websocket_common.cc
@@ -10,14 +10,14 @@ leakage of certain information in sandbox iframes

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../browser/renderer_host/render_frame_host_impl.cc | 12 +++++++++++-
- .../Block-url-leakage-sandbox-iframe.inc            |  8 ++++++++
- .../Block-url-leakage-sandbox-iframe.inc            |  3 +++
- .../features_h/Block-url-leakage-sandbox-iframe.inc |  1 +
- third_party/blink/renderer/core/frame/location.cc   | 13 +++++++++++++
- .../blink/renderer/core/loader/document_loader.cc   | 12 ++++++++++++
- .../blink/renderer/core/loader/document_loader.h    |  2 +-
- 7 files changed, 49 insertions(+), 2 deletions(-)
+ .../renderer_host/render_frame_host_impl.cc       | 12 +++++++++++-
+ .../Block-url-leakage-sandbox-iframe.inc          |  8 ++++++++
+ .../Block-url-leakage-sandbox-iframe.inc          |  3 +++
+ .../Block-url-leakage-sandbox-iframe.inc          |  1 +
+ third_party/blink/renderer/core/frame/location.cc | 15 ++++++++++++++-
+ .../blink/renderer/core/loader/document_loader.cc | 12 ++++++++++++
+ .../blink/renderer/core/loader/document_loader.h  |  2 +-
+ 7 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Block-url-leakage-sandbox-iframe.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_cc/Block-url-leakage-sandbox-iframe.inc
 create mode 100644 cromite_flags/third_party/blink/common/features_h/Block-url-leakage-sandbox-iframe.inc
@@ -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
-@@ -5239,7 +5239,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
+@@ -5426,7 +5426,17 @@ void RenderFrameHostImpl::SetLastCommittedOrigin(
 }
 
 void RenderFrameHostImpl::SetInheritedBaseUrl(const GURL& inherited_base_url) {
@@ -82,31 +82,36 @@ diff --git a/third_party/blink/renderer/core/frame/location.cc b/third_party/bli
 #include "third_party/blink/renderer/bindings/core/v8/binding_security.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"
 #include "third_party/blink/renderer/core/dom/document.h"
-@@ -127,8 +128,20 @@ DOMStringList* Location::ancestorOrigins() const {
-   auto* origins = MakeGarbageCollected<DOMStringList>();
-   if (!IsAttached())
-     return origins;
+@@ -133,12 +134,24 @@ DOMStringList* Location::ancestorOrigins() {
+     }
+     return ancestor_origins_list_.Get();
+   }
+-
 +  if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
 +        && dom_window_->GetFrame()->GetSecurityContext()->IsSandboxed(
 +              network::mojom::WebSandboxFlags::kOrigin)) {
 +    // not allow any value for sandboxed frames
+    auto* origins = MakeGarbageCollected<DOMStringList>();
 +    return origins;
 +  }
-   for (Frame* frame = dom_window_->GetFrame()->Tree().Parent(); frame;
-        frame = frame->Tree().Parent()) {
-+    if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
-+          && frame->GetSecurityContext()->IsSandboxed(
-+                network::mojom::WebSandboxFlags::kOrigin)) {
-+      // blocks at first sandbox frame
-+      break;
-+    }
-     origins->Append(
-         frame->GetSecurityContext()->GetSecurityOrigin()->ToString());
-   }
+   if (!ancestor_origins_list_ ||
+       !RuntimeEnabledFeatures::AncestorOriginsStoredOnDocumentEnabled()) {
+     ancestor_origins_list_ = MakeGarbageCollected<DOMStringList>();
+     for (Frame* frame = dom_window_->GetFrame()->Tree().Parent(); frame;
+          frame = frame->Tree().Parent()) {
+      if (base::FeatureList::IsEnabled(blink::features::kBlockUrlLeakageSandboxIframe)
+            && frame->GetSecurityContext()->IsSandboxed(
+                  network::mojom::WebSandboxFlags::kOrigin)) {
+        // blocks at first sandbox frame
+        break;
+      }
+       ancestor_origins_list_->Append(
+           frame->GetSecurityContext()->GetSecurityOrigin()->ToString());
+     }
 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
-@@ -835,6 +835,11 @@ WebString DocumentLoader::HttpMethod() const {
+@@ -851,6 +851,11 @@ WebString DocumentLoader::HttpMethod() const {
 }
 
 const AtomicString& DocumentLoader::GetReferrer() const {
@@ -118,7 +123,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
   return referrer_;
 }
 
-@@ -2917,6 +2922,13 @@ void DocumentLoader::CommitNavigation() {
+@@ -2984,6 +2989,13 @@ void DocumentLoader::CommitNavigation() {
         response_.HttpHeaderField(http_names::kDocumentPolicyReportOnly));
   }
 
@@ -135,7 +140,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
-@@ -768,7 +768,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
+@@ -789,7 +789,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;
@@ -80,7 +80,7 @@ diff --git a/chrome/browser/bookmarks/android/java/src/org/chromium/chrome/brows
 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
-@@ -267,6 +267,9 @@ CHAR_LIMIT guidelines:
+@@ -277,6 +277,9 @@ CHAR_LIMIT guidelines:
       <message name="IDS_NOTIFICATION_CATEGORY_SITES" desc="Label for notifications from websites, within a list of notification categories. [CHAR_LIMIT=32]">
         Sites
       </message>
@@ -17,7 +17,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../chrome/browser/omaha/OmahaBase.java       |   7 +-
 .../browser/omaha/UpdateMenuItemHelper.java   |  89 +++++-
 .../inline/BromiteInlineUpdateController.java | 285 ++++++++++++++++++
- chrome/browser/BUILD.gn                       |   6 +
+ chrome/browser/BUILD.gn                       |  10 +
 chrome/browser/endpoint_fetcher/BUILD.gn      |  32 ++
 chrome/browser/endpoint_fetcher/DEPS          |   3 +
 chrome/browser/endpoint_fetcher/OWNERS        |   1 +
@@ -39,8 +39,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../strings/android_chrome_strings.grd        |  23 +-
 .../ui/lens/lens_overlay_query_controller.cc  |   2 +-
 components/commerce/core/account_checker.cc   |   2 +-
- .../core/compare/cluster_server_proxy.cc      |   2 +-
- .../product_specifications_server_proxy.cc    |   2 +-
 .../subscriptions_server_proxy.cc             |   2 +-
 .../internal/composebox_query_controller.cc   |   2 +-
 .../data_sharing_network_loader_impl.cc       |   2 +-
@@ -50,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 components/manta/base_provider.cc             |   4 +-
 .../Bromite-auto-updater.inc                  |   3 +
 .../Bromite-auto-updater.inc                  |   1 +
- 42 files changed, 1156 insertions(+), 106 deletions(-)
+ 40 files changed, 1158 insertions(+), 104 deletions(-)
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/CromiteUpdateStatusProvider.java
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
 create mode 100644 chrome/browser/endpoint_fetcher/BUILD.gn
@@ -79,7 +77,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
-@@ -1963,6 +1963,9 @@ if (!is_robolectric && enable_java_templates) {
+@@ -1980,6 +1980,9 @@ if (!is_robolectric && enable_java_templates) {
       sources = [ "//build/android/java/templates/BuildConfig.template" ]
       defines = []
 
@@ -92,7 +90,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
-@@ -880,6 +880,8 @@ chrome_java_sources = [
+@@ -921,6 +921,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",
@@ -119,7 +117,7 @@ diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/a
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
-@@ -31,10 +31,15 @@ import org.chromium.ui.widget.Toast;
+@@ -32,10 +32,15 @@ import org.chromium.ui.widget.Toast;
 
 import java.util.Calendar;
 
@@ -136,7 +134,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
     static {
         CalendarFactory.warmUp();
     }
-@@ -42,6 +47,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+@@ -43,6 +48,7 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
     private static final int TAPS_FOR_DEVELOPER_SETTINGS = 7;
 
     private static final String PREF_APPLICATION_VERSION = "application_version";
@@ -144,7 +142,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";
 
-@@ -80,6 +86,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+@@ -82,6 +88,13 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
         calendar.setTimeInMillis(System.currentTimeMillis());
         int currentYear = calendar.get(Calendar.YEAR);
         p.setSummary(getString(R.string.legal_information_summary, currentYear));
@@ -158,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/
     }
 
     @Override
-@@ -150,6 +163,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
+@@ -152,6 +165,19 @@ public class AboutChromeSettings extends ChromeBaseSettingsFragment
         return true;
     }
 
@@ -690,19 +688,23 @@ 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
-@@ -2614,6 +2614,12 @@ static_library("browser") {
+@@ -4383,6 +4383,16 @@ static_library("browser") {
+     }
   }
 
-   if (is_android) {
+  # static_library("browser")
+  if (is_android) {
 +    sources += [
 +      "endpoint_fetcher/endpoint_fetcher_android.cc",
 +    ]
 +    deps += [
 +      "//chrome/browser/endpoint_fetcher:jni_headers",
 +    ]
+  }
+
+   if (enable_screen_capture) {
     sources += [
-       "accessibility/accessibility_prefs/android/accessibility_prefs_controller.cc",
-       "accessibility/accessibility_prefs/android/accessibility_prefs_controller.h",
+       "media/capture_access_handler_base.cc",
 diff --git a/chrome/browser/endpoint_fetcher/BUILD.gn b/chrome/browser/endpoint_fetcher/BUILD.gn
 new file mode 100644
 --- /dev/null
@@ -1010,23 +1012,23 @@ 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
-@@ -383,6 +383,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
+@@ -420,6 +420,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
     &kProtectedTabsAndroid,
     &kPwaRestoreUi,
     &kPwaRestoreUiAtStartup,
 +    &kInlineUpdateFlow,
-     &kReadAloud,
     &kReadAloudAudioOverviews,
-     &kReadAloudAudioOverviewsFeedback,
+     &kReadAloudIPHMenuButtonHighlightCCT,
+     &kReadAloudPlayback,
 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
-@@ -463,6 +463,7 @@ public abstract class ChromeFeatureList {
+@@ -504,6 +504,7 @@ public abstract class ChromeFeatureList {
     public static final String INCOGNITO_NTP_SMALL_ICON = "IncognitoNtpSmallIcon";
     public static final String INCOGNITO_SCREENSHOT = "IncognitoScreenshot";
     public static final String INCOGNITO_THEME_OVERLAY_TESTING = "IncognitoThemeOverlayTesting";
 +    public static final String INLINE_UPDATE_FLOW = "InlineUpdateFlow";
-     public static final String INSTANCE_SWITCHER_V2 = "InstanceSwitcherV2";
+     public static final String INLINE_PDF_V2 = "InlinePdfV2";
     public static final String KEYBOARD_ESC_BACK_NAVIGATION = "KeyboardEscBackNavigation";
     public static final String LAUNCH_CAUSE_SCREEN_OFF_FIX = "LaunchCauseScreenOffFix";
 diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
@@ -1353,9 +1355,9 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 -            mMetrics.startUpdate();
 -
             Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mStatus.updateUrl));
-             if (newTask) intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-             context.startActivity(intent);
-@@ -201,9 +238,15 @@ public class UpdateStatusProvider {
+             // Ensure that the app vs browser disambiguation dialog is not shown.
+             intent.addFlags(Intent.FLAG_ACTIVITY_REQUIRE_NON_BROWSER);
+@@ -203,9 +240,15 @@ public class UpdateStatusProvider {
         return true;
     }
 
@@ -1373,7 +1375,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
     }
 
     @RequiresNonNull("mStatus")
-@@ -212,35 +255,52 @@ public class UpdateStatusProvider {
+@@ -214,35 +257,52 @@ public class UpdateStatusProvider {
     }
 
     private void resolveStatus() {
@@ -1435,7 +1437,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
             mCallback = resultReceiver;
         }
 
-@@ -252,7 +312,7 @@ public class UpdateStatusProvider {
+@@ -254,7 +314,7 @@ public class UpdateStatusProvider {
         protected UpdateStatus doInBackground() {
             UpdateStatus testStatus = getTestStatus();
             if (testStatus != null) return testStatus;
@@ -1444,7 +1446,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
         }
 
         @Override
-@@ -270,6 +330,8 @@ public class UpdateStatusProvider {
+@@ -272,6 +332,8 @@ public class UpdateStatusProvider {
             status.mIsSimulated = true;
             status.updateState = forcedUpdateState;
 
@@ -1453,7 +1455,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
             // Push custom configurations for certain update states.
             switch (forcedUpdateState) {
                 case UpdateState.UPDATE_AVAILABLE:
-@@ -287,31 +349,33 @@ public class UpdateStatusProvider {
+@@ -289,31 +351,33 @@ public class UpdateStatusProvider {
             return status;
         }
 
@@ -1623,7 +1625,7 @@ diff --git a/chrome/browser/save_to_drive/drive_uploader.cc b/chrome/browser/sav
 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
-@@ -2313,6 +2313,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2444,6 +2444,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>
@@ -1636,7 +1638,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]">
-@@ -4389,7 +4395,10 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4489,7 +4495,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]">
@@ -1648,7 +1650,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
-@@ -4400,6 +4409,18 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -4500,6 +4509,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>
@@ -1670,7 +1672,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 --- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
 +++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
-@@ -768,7 +768,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
+@@ -771,7 +771,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
           .SetTimeout(timeout)
           .SetUrl(fetch_url)
           .SetUploadProgressCallback(std::move(upload_progress_callback))
@@ -1682,7 +1684,7 @@ diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/br
 diff --git a/components/commerce/core/account_checker.cc b/components/commerce/core/account_checker.cc
 --- a/components/commerce/core/account_checker.cc
 +++ b/components/commerce/core/account_checker.cc
-@@ -327,7 +327,7 @@ std::unique_ptr<EndpointFetcher> AccountChecker::CreateEndpointFetcher(
+@@ -326,7 +326,7 @@ std::unique_ptr<EndpointFetcher> AccountChecker::CreateEndpointFetcher(
       .SetPostData(post_data);
   MaybeUseAlternateShoppingServer(request_params);
   return std::make_unique<EndpointFetcher>(
@@ -1691,30 +1693,6 @@ diff --git a/components/commerce/core/account_checker.cc b/components/commerce/c
 }
 
 }  // namespace commerce
-diff --git a/components/commerce/core/compare/cluster_server_proxy.cc b/components/commerce/core/compare/cluster_server_proxy.cc
--- a/components/commerce/core/compare/cluster_server_proxy.cc
-+++ b/components/commerce/core/compare/cluster_server_proxy.cc
-@@ -156,7 +156,7 @@ std::unique_ptr<EndpointFetcher> ClusterServerProxy::CreateEndpointFetcher(
-       .SetPostData(post_data);
-   commerce::MaybeUseAlternateShoppingServer(request_params);
-   return std::make_unique<EndpointFetcher>(
-      url_loader_factory_, identity_manager_, request_params.Build());
-+      url_loader_factory_, identity_manager_, request_params.Build(), kGetComparableProductsTrafficAnnotation);
- }
- 
- void ClusterServerProxy::HandleCompareResponse(
-diff --git a/components/commerce/core/compare/product_specifications_server_proxy.cc b/components/commerce/core/compare/product_specifications_server_proxy.cc
--- a/components/commerce/core/compare/product_specifications_server_proxy.cc
-+++ b/components/commerce/core/compare/product_specifications_server_proxy.cc
-@@ -296,7 +296,7 @@ ProductSpecificationsServerProxy::CreateEndpointFetcher(
-       .SetPostData(post_data);
-   MaybeUseAlternateShoppingServer(request_params);
-   return std::make_unique<EndpointFetcher>(
-      url_loader_factory_, identity_manager_, request_params.Build());
-+      url_loader_factory_, identity_manager_, request_params.Build(), kShoppingListTrafficAnnotation);
- }
- 
- std::optional<ProductSpecifications>
 diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 --- a/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
 +++ b/components/commerce/core/subscriptions/subscriptions_server_proxy.cc
@@ -1730,7 +1708,7 @@ diff --git a/components/commerce/core/subscriptions/subscriptions_server_proxy.c
 diff --git a/components/contextual_search/internal/composebox_query_controller.cc b/components/contextual_search/internal/composebox_query_controller.cc
 --- a/components/contextual_search/internal/composebox_query_controller.cc
 +++ b/components/contextual_search/internal/composebox_query_controller.cc
-@@ -705,7 +705,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
+@@ -1226,7 +1226,7 @@ ComposeboxQueryController::CreateEndpointFetcher(
           .SetTimeout(timeout)
           .SetUploadProgressCallback(std::move(upload_progress_callback))
           .SetUrl(fetch_url)
@@ -1754,7 +1732,7 @@ diff --git a/components/data_sharing/internal/data_sharing_network_loader_impl.c
 diff --git a/components/data_sharing/internal/preview_server_proxy.cc b/components/data_sharing/internal/preview_server_proxy.cc
 --- a/components/data_sharing/internal/preview_server_proxy.cc
 +++ b/components/data_sharing/internal/preview_server_proxy.cc
-@@ -346,7 +346,7 @@ std::unique_ptr<EndpointFetcher> PreviewServerProxy::CreateEndpointFetcher(
+@@ -345,7 +345,7 @@ std::unique_ptr<EndpointFetcher> PreviewServerProxy::CreateEndpointFetcher(
           .SetContentType(kContentType)
           .SetTimeout(kTimeout)
           .SetUrl(url)
@@ -21,12 +21,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../java/res/xml/adblock_preferences.xml      |  25 ++
 .../android/java/res/xml/main_preferences.xml |   5 +
 .../browser/settings/AdBlockEditor.java       |  91 ++++++
- .../browser/settings/AdBlockPreferences.java  |  74 +++++
+ .../browser/settings/AdBlockPreferences.java  |  76 +++++
 .../browser/settings/SettingsActivity.java    |   3 +
 chrome/app/generated_resources.grd            |  10 +
- chrome/browser/after_startup_task_utils.cc    |   4 +
- chrome/browser/browser_process.h              |   6 +
- chrome/browser/browser_process_impl.cc        |  28 ++
+ chrome/browser/after_startup_task_utils.cc    |   5 +
+ chrome/browser/browser_process.h              |   5 +
+ chrome/browser/browser_process_impl.cc        |  30 ++
 chrome/browser/browser_process_impl.h         |   2 +
 chrome/browser/chrome_browser_main.cc         |   3 +
 chrome/browser/flags/BUILD.gn                 |   3 +
@@ -50,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../browser/subresource_filter_features.cc    | 118 +-------
 .../core/browser/verified_ruleset_dealer.cc   |   4 +
 .../core/common/indexed_ruleset.cc            |   5 +-
- 38 files changed, 1284 insertions(+), 127 deletions(-)
+ 38 files changed, 1288 insertions(+), 127 deletions(-)
 create mode 100644 chrome/android/java/res/layout/adblock_editor.xml
 create mode 100644 chrome/android/java/res/xml/adblock_preferences.xml
 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
@@ -65,7 +65,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
-@@ -303,6 +303,7 @@ if (_is_default_toolchain) {
+@@ -317,6 +317,7 @@ if (_is_default_toolchain) {
       "//chrome/android/features/tab_ui/public:ui_java_resources",
       "//chrome/android/modules/stack_unwinder/provider:java",
       "//chrome/android/webapk/libs/client:client_java",
@@ -76,7 +76,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -431,6 +431,7 @@ chrome_java_resources = [
+@@ -438,6 +438,7 @@ chrome_java_resources = [
   "java/res/layout/account_management_account_row.xml",
   "java/res/layout/app_history_filter.xml",
   "java/res/layout/auto_pip_permission_dialog.xml",
@@ -84,7 +84,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",
-@@ -633,6 +634,7 @@ chrome_java_resources = [
+@@ -650,6 +651,7 @@ chrome_java_resources = [
   "java/res/xml/account_management_preferences.xml",
   "java/res/xml/ad_services_config.xml",
   "java/res/xml/appearance_preferences.xml",
@@ -95,7 +95,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
-@@ -951,6 +951,8 @@ chrome_java_sources = [
+@@ -992,6 +992,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/permissions/PermissionBlockedDialog.java",
   "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
@@ -251,9 +251,9 @@ new file mode 100644
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -107,6 +107,11 @@ found in the LICENSE file.
+@@ -119,6 +119,11 @@ found in the LICENSE file.
         android:key="toolbar_shortcut"
-         android:order="21"
+         android:order="22"
         android:title="@string/toolbar_shortcut"/>
 +    <Preference
 +        android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
@@ -262,7 +262,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 +        android:title="@string/prefs_adblock"/>
     <Preference
         android:key="notifications"
-         android:order="22"
+         android:order="23"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java
 new file mode 100644
 --- /dev/null
@@ -363,7 +363,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBloc
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,76 @@
 +// Copyright 2015 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -374,8 +374,9 @@ new file mode 100644
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceFragmentCompat;
 +
-+import org.chromium.base.supplier.ObservableSupplier;
-+import org.chromium.base.supplier.ObservableSupplierImpl;
+import org.chromium.base.supplier.MonotonicObservableSupplier;
+import org.chromium.base.supplier.ObservableSuppliers;
+import org.chromium.base.supplier.SettableMonotonicObservableSupplier;
 +import java.util.function.Supplier;
 +
 +import org.chromium.content_public.browser.BrowserContextHandle;
@@ -398,10 +399,11 @@ new file mode 100644
 +    private static final String PREF_ADBLOCK_EDIT = "adblock_edit";
 +
 +    private Preference mAdBlockEdit;
-+    private final ObservableSupplierImpl<String> mPageTitle = new ObservableSupplierImpl<>();
+    private final SettableMonotonicObservableSupplier<String> mPageTitle =
+        ObservableSuppliers.createMonotonic();
 +
 +    @Override
-+    public ObservableSupplier<String> getPageTitle() {
+    public MonotonicObservableSupplier<String> getPageTitle() {
 +        return mPageTitle;
 +    }
 +
@@ -441,7 +443,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
-@@ -94,6 +94,8 @@ import java.util.HashMap;
+@@ -109,6 +109,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -450,7 +452,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 /**
  * The Chrome settings activity.
  *
-@@ -1157,6 +1159,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+@@ -1376,6 +1378,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
                     && !MAIN_FRAGMENT_TAG.equals(fragment.getTag())) {
                 return;
             }
@@ -461,7 +463,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
 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
-@@ -17479,6 +17479,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -17455,6 +17455,16 @@ Please help our engineers fix this problem. Tell us what happened right before y
       Never show this again.
     </message>
 
@@ -481,16 +483,17 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
 diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_startup_task_utils.cc
 --- a/chrome/browser/after_startup_task_utils.cc
 +++ b/chrome/browser/after_startup_task_utils.cc
-@@ -24,6 +24,8 @@
+@@ -24,6 +24,9 @@
 #include "chrome/browser/ui/ash/login/login_display_host.h"
 #endif
 
 +#include "chrome/browser/browser_process.h"
+#include "components/component_updater/adblock_updater_service.h"
 +
 using content::BrowserThread;
 
 namespace {
-@@ -129,6 +131,8 @@ void SetBrowserStartupIsComplete() {
+@@ -129,6 +132,8 @@ void SetBrowserStartupIsComplete() {
   }
   GetAfterStartupTasks().clear();
   GetAfterStartupTasks().shrink_to_fit();
@@ -502,15 +505,7 @@ diff --git a/chrome/browser/after_startup_task_utils.cc b/chrome/browser/after_s
 diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -31,6 +31,7 @@
- #include "chrome/common/buildflags.h"
- #include "components/safe_browsing/buildflags.h"
- #include "media/media_buildflags.h"
-+#include "components/component_updater/adblock_updater_service.h"
- 
- class BackgroundModeManager;
- class BrowserProcessPlatformPart;
-@@ -96,6 +97,10 @@ namespace component_updater {
+@@ -96,6 +96,10 @@ namespace component_updater {
 class ComponentUpdateService;
 }
 
@@ -521,7 +516,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
 namespace gcm {
 class GCMDriver;
 }
-@@ -294,6 +299,7 @@ class BrowserProcess {
+@@ -294,6 +298,7 @@ class BrowserProcess {
   virtual activity_reporter::ActivityReporter* activity_reporter() = 0;
 
   virtual component_updater::ComponentUpdateService* component_updater() = 0;
@@ -532,7 +527,16 @@ 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
-@@ -1345,6 +1345,34 @@ BrowserProcessImpl::component_updater() {
+@@ -187,6 +187,8 @@
+ #include "ui/message_center/message_center.h"
+ #endif
+ 
+#include "components/component_updater/adblock_updater_service.h"
+
+ #if BUILDFLAG(IS_ANDROID)
+ #include "chrome/browser/accessibility/accessibility_prefs/android/accessibility_prefs_controller.h"
+ #include "chrome/browser/flags/android/chrome_feature_list.h"
+@@ -1414,6 +1416,34 @@ BrowserProcessImpl::component_updater() {
   return component_updater_.get();
 }
 
@@ -570,7 +574,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
 diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -220,6 +220,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -224,6 +224,7 @@ class BrowserProcessImpl : public BrowserProcess,
 
   activity_reporter::ActivityReporter* activity_reporter() override;
   component_updater::ComponentUpdateService* component_updater() override;
@@ -578,7 +582,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
 #if BUILDFLAG(IS_CHROMEOS)
   MediaFileSystemRegistry* media_file_system_registry() override;
 #endif
-@@ -439,6 +440,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -449,6 +450,7 @@ class BrowserProcessImpl : public BrowserProcess,
   // to concerns over integrity of data shared between profiles,
   // but some users of component updater only install per-user.
   std::unique_ptr<component_updater::ComponentUpdateService> component_updater_;
@@ -589,7 +593,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
-@@ -431,6 +431,9 @@ StartupProfileInfo CreateInitialProfile(
+@@ -449,6 +449,9 @@ StartupProfileInfo CreateInitialProfile(
   // missing code in the above test.
   CHECK(profile_info.profile) << "Cannot get default profile.";
 
@@ -716,8 +720,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/brows
 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
-@@ -239,6 +239,20 @@ CHAR_LIMIT guidelines:
-         Try searching the help center
+@@ -245,6 +245,20 @@ CHAR_LIMIT guidelines:
+         Delete
       </message>
 
 +      <!-- AdBlock settings -->
@@ -740,7 +744,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
-@@ -2982,6 +2982,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
+@@ -2416,6 +2416,11 @@ inline constexpr char kAudioCaptureAllowed[] = "hardware.audio_capture_enabled";
 inline constexpr char kAudioCaptureAllowedUrls[] =
     "hardware.audio_capture_allowed_urls";
 
@@ -755,7 +759,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
-@@ -427,6 +427,9 @@
+@@ -421,6 +421,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>
@@ -1598,7 +1602,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
       web_contents_helper_(web_contents_helper) {}
 
 ContentSubresourceFilterThrottleManager::
-@@ -659,6 +663,17 @@ ContentSubresourceFilterThrottleManager::
+@@ -658,6 +662,17 @@ ContentSubresourceFilterThrottleManager::
       throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
                                                 ad_tagging_state);
     }
@@ -1631,7 +1635,7 @@ diff --git a/components/subresource_filter/content/browser/content_subresource_f
 diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/components/subresource_filter/content/browser/ruleset_service.cc
 --- a/components/subresource_filter/content/browser/ruleset_service.cc
 +++ b/components/subresource_filter/content/browser/ruleset_service.cc
-@@ -50,12 +50,7 @@ namespace {
+@@ -49,12 +49,7 @@ namespace {
 void RecordIndexAndWriteRulesetResult(
     std::string_view uma_tag,
     RulesetService::IndexAndWriteRulesetResult result) {
@@ -1645,7 +1649,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
 }
 
 // Implements operations on a `sentinel file`, which is used as a safeguard to
-@@ -237,11 +232,13 @@ RulesetService::RulesetService(
+@@ -236,11 +231,13 @@ RulesetService::RulesetService(
 RulesetService::~RulesetService() = default;
 
 void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
@@ -1660,7 +1664,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
   // Trying to store a ruleset with the same version for a second time would
   // not only be futile, but would fail on Windows due to "File System
   // Tunneling" as long as the previously stored copy of the rules is still
-@@ -251,13 +248,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
+@@ -250,13 +247,16 @@ void RulesetService::IndexAndStoreAndPublishRulesetIfNeeded(
   if (most_recently_indexed_version.IsCurrentFormatVersion() &&
       most_recently_indexed_version.content_version ==
           unindexed_ruleset_info.content_version) {
@@ -1677,7 +1681,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
     return;
   }
 
-@@ -277,6 +277,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -276,6 +276,23 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
     const RulesetConfig& config,
     const base::FilePath& indexed_ruleset_base_dir,
     const UnindexedRulesetInfo& unindexed_ruleset_info) {
@@ -1701,7 +1705,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
-@@ -284,6 +301,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -283,6 +300,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
       unindexed_ruleset_info);
 
   if (!unindexed_ruleset_stream_generator.ruleset_stream()) {
@@ -1709,7 +1713,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedOpeningUnindexedRuleset);
-@@ -298,6 +316,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -297,6 +315,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
           indexed_ruleset_base_dir, indexed_version);
 
   if (!base::CreateDirectory(indexed_ruleset_version_dir)) {
@@ -1717,7 +1721,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
     RecordIndexAndWriteRulesetResult(
         config.uma_tag, IndexAndWriteRulesetResult::kFailedCreatingVersionDir);
     return IndexedRulesetVersion(config.filter_tag);
-@@ -305,13 +324,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -304,13 +323,11 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
 
   SentinelFile sentinel_file(indexed_ruleset_version_dir);
   if (sentinel_file.IsPresent()) {
@@ -1733,7 +1737,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedCreatingSentinelFile);
-@@ -326,6 +343,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -325,6 +342,7 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
   RulesetIndexer indexer;
   if (!(*g_index_ruleset_func)(config, &unindexed_ruleset_stream_generator,
                                &indexer)) {
@@ -1741,7 +1745,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
     RecordIndexAndWriteRulesetResult(
         config.uma_tag,
         IndexAndWriteRulesetResult::kFailedParsingUnindexedRuleset);
-@@ -346,9 +364,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
+@@ -345,9 +363,12 @@ IndexedRulesetVersion RulesetService::IndexAndWriteRuleset(
                    unindexed_ruleset_info.license_path, indexer.data());
   RecordIndexAndWriteRulesetResult(config.uma_tag, result);
   if (result != IndexAndWriteRulesetResult::kSuccess) {
@@ -1754,7 +1758,7 @@ diff --git a/components/subresource_filter/content/browser/ruleset_service.cc b/
   CHECK(indexed_version.IsValid());
   return indexed_version;
 }
-@@ -472,6 +493,7 @@ void RulesetService::IndexAndStoreRuleset(
+@@ -471,6 +492,7 @@ void RulesetService::IndexAndStoreRuleset(
 void RulesetService::OnWrittenRuleset(WriteRulesetCallback result_callback,
                                       const IndexedRulesetVersion& version) {
   CHECK(!result_callback.is_null());
@@ -1824,7 +1828,7 @@ diff --git a/components/subresource_filter/core/browser/ruleset_version.h b/comp
 diff --git a/components/subresource_filter/core/browser/subresource_filter_features.cc b/components/subresource_filter/core/browser/subresource_filter_features.cc
 --- a/components/subresource_filter/core/browser/subresource_filter_features.cc
 +++ b/components/subresource_filter/core/browser/subresource_filter_features.cc
-@@ -55,75 +55,8 @@ class CommaSeparatedStrings {
+@@ -54,75 +54,8 @@ class CommaSeparatedStrings {
   const std::vector<std::string_view> pieces_;
 };
 
@@ -1901,7 +1905,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
   // If ad tagging is enabled, turn on the dryrun automatically.
   bool ad_tagging_enabled = base::FeatureList::IsEnabled(kAdTagging);
   const struct {
-@@ -131,23 +64,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -130,23 +63,16 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
     bool enabled_by_default;
     Configuration (*factory_method)();
   } kAvailablePresetConfigurations[] = {
@@ -1927,7 +1931,7 @@ diff --git a/components/subresource_filter/core/browser/subresource_filter_featu
       enabled_configurations.push_back(available_preset.factory_method());
     }
   }
-@@ -155,48 +81,12 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
+@@ -154,48 +80,12 @@ std::vector<Configuration> FillEnabledPresetConfigurations(
   return enabled_configurations;
 }
 
@@ -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
-@@ -284,6 +284,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
+@@ -291,6 +291,14 @@ void ReloadButton::ButtonPressed(const ui::Event& event) {
       command = IDC_RELOAD;
     }
 
@@ -33,7 +33,7 @@ diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/u
 diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
 --- a/ui/views/widget/widget.h
 +++ b/ui/views/widget/widget.h
-@@ -1475,6 +1475,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1474,6 +1474,19 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   // initialized.
   void SaveWindowPlacementIfNeeded();
 
@@ -53,7 +53,7 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
  protected:
   // Creates the RootView to be used within this Widget. Subclasses may override
   // to create custom RootViews that do specialized event processing.
-@@ -1515,13 +1528,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1516,13 +1529,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   void set_widget_closed() { widget_closed_ = true; }
 
  private:
@@ -65,9 +65,9 @@ diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
 -  };
 -
   class PaintAsActiveLockImpl;
+   class ScopedCallStackLock;
 
-   friend class ButtonTest;
-@@ -1532,11 +1538,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
+@@ -1534,11 +1540,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   friend class ui_devtools::BubbleLocking;
   friend void DisableActivationChangeHandlingForTests();
 
@@ -8,15 +8,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../settings/site_settings/popups_page.html   |   2 +
 .../tab_under_navigation_throttle.cc          |  11 +-
- .../android/popup_blocked_message_delegate.cc |  20 +++-
+ .../android/popup_blocked_message_delegate.cc |  20 ++-
 .../android/popup_blocked_message_delegate.h  |   1 +
 components/blocked_content/popup_blocker.cc   |   3 +
 components/blocked_content_strings.grdp       |   3 +
- .../impl/BromitePopupContentSetting.java      | 106 ++++++++++++++++++
+ .../impl/BromitePopupContentSetting.java      | 115 ++++++++++++++++++
 .../bromite_content_settings/popups.grdp      |  18 +++
- .../bromite_content_settings/popups.inc       |  13 +++
+ .../bromite_content_settings/popups.inc       |  13 ++
 .../core/browser/content_settings_registry.cc |   2 +-
- 10 files changed, 173 insertions(+), 6 deletions(-)
+ 10 files changed, 182 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
@@ -146,7 +146,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 new file mode 100644
 --- /dev/null
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/impl/BromitePopupContentSetting.java
-@@ -0,0 +1,106 @@
+@@ -0,0 +1,115 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -239,6 +239,15 @@ new file mode 100644
 +    }
 +
 +    @Override
+    public int[] getTriStateSettingIconIDs() {
+            return new int[] {
+                R.drawable.permission_popups,
+                R.drawable.permission_popups,
+                R.drawable.sensors_off_24px
+            };
+    }
+
+    @Override
 +    public boolean showOnlyDescriptions() {
 +        return true;
 +    }
@@ -23,12 +23,11 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../extensions/cws_info_service_factory.cc    |  3 +-
 .../extensions/extension_management.cc        |  1 +
 .../extension_safety_check_utils.cc           |  3 +-
- .../browser/extensions/extension_service.cc   |  4 +-
+ .../browser/extensions/extension_service.cc   |  5 +-
 .../chrome_extension_downloader_factory.cc    |  1 -
- .../extensions/updater/extension_updater.cc   | 40 +++++++-----
+ .../extensions/updater/extension_updater.cc   | 26 ++++++--
 .../extensions/updater/extension_updater.h    |  4 ++
 .../extensions/webstore_install_helper.cc     |  2 +-
- .../browser/extensions/webstore_installer.cc  |  2 +-
 .../resources/extensions/manager.html.ts      |  1 +
 .../browser/resources/extensions/manager.ts   |  5 ++
 .../browser/resources/extensions/service.ts   |  5 ++
@@ -38,7 +37,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../resources/webstore_app/manifest.json      |  7 +--
 .../ui/webui/extensions/extensions_ui.cc      |  7 +++
 .../chrome_update_query_params_delegate.cc    | 13 ++--
- .../extensions/api/developer_private.idl      |  2 +
+ .../extensions/api/developer_private.webidl   |  2 +
 .../update_client/update_query_params.cc      |  5 +-
 .../about_flags_cc/Webstore-protection.inc    | 19 ++++++
 .../browser/api/management/management_api.cc  | 62 +++++++++++++------
@@ -46,16 +45,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/updater/extension_downloader.h    |  1 -
 .../browser/updater/manifest_fetch_data.cc    |  8 +--
 .../browser/updater/safe_manifest_parser.cc   |  1 +
+ extensions/browser/webstore_installer.cc      |  2 +-
 extensions/common/extension_features.cc       |  7 +++
 extensions/common/extension_features.h        | 10 +++
 .../definitions/developer_private.d.ts        |  2 +
- 36 files changed, 253 insertions(+), 107 deletions(-)
+ 36 files changed, 250 insertions(+), 97 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
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -88,6 +88,12 @@
+@@ -79,6 +79,12 @@
   <message name="IDS_EXTENSIONS_DISABLED_UNSUPPORTED_DEVELOPER_MODE_TOAST" desc="Text displayed in a toast popup message when extensions are disabled due to unsupported developer mode.">
     Developer Mode Off. Some extensions were disabled.
   </message>
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 namespace extensions {
 
 namespace developer = api::developer_private;
-@@ -69,6 +75,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
+@@ -70,6 +76,28 @@ DeveloperPrivateAPI::GetFactoryInstance() {
   return g_developer_private_api_factory.Pointer();
 }
 
@@ -129,7 +129,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_a
 diff --git a/chrome/browser/extensions/api/developer_private/developer_private_functions.cc b/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
 --- a/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
 +++ b/chrome/browser/extensions/api/developer_private/developer_private_functions.cc
-@@ -452,6 +452,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
+@@ -451,6 +451,7 @@ ExtensionFunction::ResponseAction DeveloperPrivateAutoUpdateFunction::Run() {
     ExtensionUpdater::CheckParams params;
     params.fetch_priority = DownloadFetchPriority::kForeground;
     params.install_immediately = true;
@@ -137,7 +137,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
     params.callback =
         base::BindOnce(&DeveloperPrivateAutoUpdateFunction::OnComplete, this);
     updater->CheckNow(std::move(params));
-@@ -588,7 +589,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -587,7 +588,7 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
 
   const developer::ProfileConfigurationUpdate& update = params->update;
 
@@ -146,7 +146,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/developer_private_f
     Profile* profile = Profile::FromBrowserContext(browser_context());
     CHECK(profile);
     if (supervised_user::AreExtensionsPermissionsEnabled(profile)) {
-@@ -602,6 +603,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
+@@ -601,6 +602,11 @@ DeveloperPrivateUpdateProfileConfigurationFunction::Run() {
         ->MarkNoticeAsAcknowledgedGlobally();
   }
 
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/extensions/api/developer_private/profile_info_genera
 diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
 +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
-@@ -255,6 +255,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
+@@ -253,6 +253,8 @@ Profile* GetProfileInIncognito(Profile* profile) {
 // there was previously stored data, or an empty string otherwise. The Set will
 // overwrite any previous login.
 std::string GetWebstoreLogin(Profile* profile) {
@@ -190,7 +190,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
   if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin)) {
     return profile->GetPrefs()->GetString(kWebstoreLogin);
   }
-@@ -262,11 +264,15 @@ std::string GetWebstoreLogin(Profile* profile) {
+@@ -260,11 +262,15 @@ std::string GetWebstoreLogin(Profile* profile) {
 }
 
 void SetWebstoreLogin(Profile* profile, const std::string& login) {
@@ -206,9 +206,9 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
   switch (status) {
     case kCanRequest:
       return api::webstore_private::ExtensionInstallStatus::kCanRequest;
-@@ -1205,7 +1211,8 @@ ExtensionFunction::ResponseAction
+@@ -1321,7 +1327,8 @@ ExtensionFunction::ResponseAction
 WebstorePrivateIsInIncognitoModeFunction::Run() {
-   Profile* profile = Profile::FromBrowserContext(browser_context());
+   Profile* profile = GetProfileInIncognito(Profile::FromBrowserContext(browser_context()));
   return RespondNow(ArgumentList(IsInIncognitoMode::Results::Create(
 -      profile != profile->GetOriginalProfile())));
 +      base::FeatureList::IsEnabled(extensions_features::kEnableExtensionManagementToChromeStore)
@@ -216,7 +216,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 }
 
 WebstorePrivateIsPendingCustodianApprovalFunction::
-@@ -1302,11 +1309,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
+@@ -1418,11 +1425,14 @@ WebstorePrivateGetReferrerChainFunction::Run() {
   request.mutable_referrer_chain_options()->set_recent_navigations_to_collect(
       recent_navigations_to_collect);
 
@@ -235,7 +235,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
 diff --git a/chrome/browser/extensions/chrome_extension_system.cc b/chrome/browser/extensions/chrome_extension_system.cc
 --- a/chrome/browser/extensions/chrome_extension_system.cc
 +++ b/chrome/browser/extensions/chrome_extension_system.cc
-@@ -96,6 +96,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
+@@ -100,6 +100,7 @@ UninstallPingSender::FilterResult ShouldSendUninstallPing(
     Profile* profile,
     const Extension* extension,
     UninstallReason reason) {
@@ -259,7 +259,7 @@ diff --git a/chrome/browser/extensions/cws_info_service_factory.cc b/chrome/brow
 diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
 --- a/chrome/browser/extensions/extension_management.cc
 +++ b/chrome/browser/extensions/extension_management.cc
-@@ -440,6 +440,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
+@@ -436,6 +436,7 @@ bool ExtensionManagement::IsExemptFromMV2DeprecationByPolicy(
 
 bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
     const Extension* extension) {
@@ -270,7 +270,7 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/
 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
-@@ -243,8 +243,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
+@@ -244,8 +244,7 @@ developer::SafetyCheckWarningReason GetSafetyCheckWarningReasonHelper(
   developer::SafetyCheckWarningReason acknowledged_reason =
       GetPrefAcknowledgeSafetyCheckWarningReason(extension,
                                                  ExtensionPrefs::Get(profile));
@@ -283,16 +283,17 @@ diff --git a/chrome/browser/extensions/extension_safety_check_utils.cc b/chrome/
 diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
 --- a/chrome/browser/extensions/extension_service.cc
 +++ b/chrome/browser/extensions/extension_service.cc
-@@ -247,8 +247,6 @@ ExtensionService::ExtensionService(
+@@ -250,9 +250,6 @@ ExtensionService::ExtensionService(
   UpgradeDetector::GetInstance()->AddObserver(this);
 #endif
 
-  cws_info_service_observation_.Observe(CWSInfoService::Get(profile_));
+-  cws_info_service_observation_.Observe(
+-      CWSInfoServiceFactory::GetForProfile(profile_));
 -
   ExtensionManagementFactory::GetForBrowserContext(profile_)->AddObserver(this);
 
-   if (autoupdate_enabled) {
-@@ -763,7 +761,7 @@ void ExtensionService::OnExtensionManagementSettingsChanged() {
+   if (auto* extension_install_policy_service =
+@@ -775,7 +772,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.
@@ -300,7 +301,7 @@ diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/ext
 +  if (((false)) && profile_->GetPrefs()->GetInteger(
           pref_names::kExtensionUnpublishedAvailability) !=
       kAllowUnpublishedExtensions) {
-     CWSInfoService::Get(profile_)->CheckAndMaybeFetchInfo();
+     CWSInfoServiceFactory::GetForProfile(profile_)->CheckAndMaybeFetchInfo();
 diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 --- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
 +++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
@@ -315,7 +316,7 @@ diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_facto
 diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
 --- a/chrome/browser/extensions/updater/extension_updater.cc
 +++ b/chrome/browser/extensions/updater/extension_updater.cc
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_id.h"
@@ -323,7 +324,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 #include "extensions/common/extension_set.h"
 #include "extensions/common/extension_updater_uma.h"
 #include "extensions/common/extension_urls.h"
-@@ -228,6 +229,10 @@ void ExtensionUpdater::Start() {
+@@ -230,6 +231,10 @@ void ExtensionUpdater::Start() {
   DCHECK(!weak_ptr_factory_.HasWeakPtrs());
   DCHECK(registry_);
   alive_ = true;
@@ -334,26 +335,16 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   // Check soon, and set up the first delayed check.
   if (!g_skip_scheduled_checks_for_tests) {
     CheckSoon();
-@@ -379,7 +384,8 @@ void ExtensionUpdater::AddToDownloader(
-     const Extension& extension = **extension_iter;
-     const ExtensionId& extension_id = extension.id();
-     if (!Manifest::IsAutoUpdateableLocation(extension.location())) {
-      VLOG(2) << "Extension " << extension_id << " is not auto updateable";
-+      LOG(INFO) << "Extension " << extension_id << " is not auto updateable: "
-+                << "location=" << extension.location();
-       continue;
-     }
-     // An extension might be overwritten by policy, and have its update url
-@@ -394,7 +400,7 @@ void ExtensionUpdater::AddToDownloader(
-       continue;
-     }
- 
-    if (CanUseUpdateService(extension_id)) {
-+    if ((false) && CanUseUpdateService(extension_id)) {
-       update_check_params->update_info[extension_id] =
-           GetExtensionUpdateData(extension_id);
-     } else if (AddExtensionToDownloader(extension, request_id,
-@@ -432,6 +438,12 @@ bool ExtensionUpdater::AddExtensionToDownloader(
+@@ -411,6 +416,8 @@ void ExtensionUpdater::EraseUnupdatableIds(std::set<ExtensionId>& ids) const {
+       }
+       // Remove extensions that aren't in an autoupdatable location.
+       if (!Manifest::IsAutoUpdateableLocation(extension->location())) {
+        LOG(INFO) << "Extension " << extension->id() << " is not auto updateable: "
+                  << "location=" << extension->location();
+         return true;
+       }
+     } else {
+@@ -427,6 +434,12 @@ void ExtensionUpdater::EraseUnupdatableIds(std::set<ExtensionId>& ids) const {
 }
 
 void ExtensionUpdater::CheckNow(CheckParams params) {
@@ -363,70 +354,38 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 +    LOG(INFO) << "Extensions autoupdate is disabled.";
 +    return;
 +  }
-   CHECK(enabled_);
-   if (params.ids.empty()) {
-     // Checking all extensions. Cancel pending DoCheckSoon() call if there's
-@@ -449,7 +461,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+   std::unique_ptr<ScopedProfileKeepAlive> keep_alive =
+       ScopedProfileKeepAlive::TryAcquire(
+           profile_, ProfileKeepAliveOrigin::kExtensionUpdater);
+@@ -440,7 +453,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+   CHECK(pending_extension_manager_);
 
   int request_id = next_request_id_++;
- 
 -  VLOG(2) << "Starting update check " << request_id;
 +  LOG(INFO) << "Starting extensions update check id: " << request_id;
-   if (params.ids.empty()) {
-     NotifyStarted();
-   }
-@@ -518,7 +530,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-         update_check_params.update_info[pending_id] =
-             GetExtensionUpdateData(pending_id);
-       } else if (!Manifest::IsAutoUpdateableLocation(info->install_source())) {
-        VLOG(2) << "Extension " << pending_id << " is not auto updateable";
-+        LOG(INFO) << "Extension " << pending_id << " is not auto updateable";
-         continue;
-       }
-       // We have to mark high-priority extensions (such as policy-forced
-@@ -528,7 +540,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-       // See https://crbug.com/904600 and https://crbug.com/965686.
-       const bool is_high_priority_extension_pending =
-           pending_extension_manager->HasHighPriorityPendingExtension();
-      if (CanUseUpdateService(pending_id)) {
-+      if ((false) && CanUseUpdateService(pending_id)) {
-         update_check_params.update_info[pending_id] =
-             GetExtensionUpdateData(pending_id);
-         update_check_params.update_info[pending_id].is_corrupt_reinstall =
-@@ -551,6 +563,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-           LOG(WARNING) << "Corrupt extension with id " << pending_id
-                        << " will be reinstalled with ExtensionDownloader.";
-         }
-+        LOG(INFO) << "Extension " << pending_id << " is auto updateable "
-+                  << "from " << info->update_url();
-       } else {
-         InstallStageTracker::Get(profile_)->ReportFailure(
-             pending_id,
-@@ -563,13 +577,6 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-     AddToDownloader(&registry_->disabled_extensions(), pending_ids, request_id,
-                     params.fetch_priority, &update_check_params);
-     ExtensionSet remotely_disabled_extensions;
-    for (auto extension : registry_->blocklisted_extensions()) {
-      if (blocklist_prefs::HasOmahaBlocklistState(
-              extension->id(), BitMapBlocklistState::BLOCKLISTED_MALWARE,
-              extension_prefs_)) {
-        remotely_disabled_extensions.Insert(extension);
-      }
-    }
-     AddToDownloader(&remotely_disabled_extensions, pending_ids, request_id,
-                     params.fetch_priority, &update_check_params);
-   } else {
-@@ -577,7 +584,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
-       const Extension* extension =
-           registry_->GetExtensionById(id, ExtensionRegistry::EVERYTHING);
-       if (extension) {
-        if (CanUseUpdateService(id)) {
-+        if ((false) && CanUseUpdateService(id)) {
-           update_check_params.update_info[id] = GetExtensionUpdateData(id);
-         } else if (AddExtensionToDownloader(*extension, request_id,
-                                             params.fetch_priority)) {
-@@ -721,7 +728,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
-       file.extension_id, InstallStageTracker::Stage::INSTALLING);
+ 
+   EnsureDownloaderCreated();
+ 
+@@ -513,7 +526,7 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+ 
+     // Note: If an extension is both installed and pending, but can't use
+     // update_service, pending_info takes priority.
+-    if (CanUseUpdateService(extension, pending_info)) {
+    if ((false) && CanUseUpdateService(extension, pending_info)) {
+       update_check_params.update_info[id] = GetExtensionUpdateData(id);
+       update_check_params.update_info[id].is_corrupt_reinstall =
+           is_corrupt_reinstall;
+@@ -525,6 +538,8 @@ void ExtensionUpdater::CheckNow(CheckParams params) {
+       InstallStageTrackerFactory::GetForBrowserContext(profile_)
+           ->ReportInstallationStage(id,
+                                     InstallStageTracker::Stage::DOWNLOADING);
+      LOG(INFO) << "Extension " << id << " is auto updateable "
+                << "from " << pending_info->update_url();
+     } else if (pending_info) {
+       InstallStageTrackerFactory::GetForBrowserContext(profile_)->ReportFailure(
+           id, InstallStageTracker::FailureReason::DOWNLOADER_ADD_FAILED);
+@@ -676,7 +691,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+                                 InstallStageTracker::Stage::INSTALLING);
   UpdatePingData(file.extension_id, ping);
 
 -  VLOG(2) << download_url << " written to " << file.path.value();
@@ -434,7 +393,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 
   FetchedCRXFile fetched(file, file_ownership_passed, request_ids,
                          std::move(callback));
-@@ -732,6 +739,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
+@@ -687,6 +702,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
 
 bool ExtensionUpdater::GetPingDataForExtension(const ExtensionId& id,
                                                DownloadPingData* ping_data) {
@@ -442,7 +401,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
   DCHECK(alive_);
   ping_data->rollcall_days =
       CalculatePingDaysForExtension(extension_prefs_->LastPingDay(id));
-@@ -851,7 +859,7 @@ bool ExtensionUpdater::CanUseUpdateService(
+@@ -798,7 +814,7 @@ bool ExtensionUpdater::CanUseUpdateService(
 void ExtensionUpdater::InstallCRXFile(FetchedCRXFile crx_file) {
   std::set<int> request_ids;
 
@@ -451,7 +410,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
           << crx_file.info.path.value();
 
   // The delegate is now responsible for cleaning up the temp file at
-@@ -1060,7 +1068,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
+@@ -1008,7 +1024,7 @@ void ExtensionUpdater::NotifyIfFinished(int request_id) {
   if (!request.in_progress_ids.empty() || request.awaiting_update_service) {
     return;  // This request is not done yet.
   }
@@ -463,7 +422,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/bro
 diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h
 --- a/chrome/browser/extensions/updater/extension_updater.h
 +++ b/chrome/browser/extensions/updater/extension_updater.h
-@@ -92,6 +92,8 @@ class ExtensionUpdater : public KeyedService,
+@@ -91,6 +91,8 @@ class ExtensionUpdater : public KeyedService,
     // right away.
     bool install_immediately = false;
 
@@ -472,7 +431,7 @@ diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/brow
     // An extension update check can be originated by a user or by a scheduled
     // task. When the value of |fetch_priority| is FOREGROUND, the update
     // request was initiated by a user.
-@@ -397,6 +399,8 @@ class ExtensionUpdater : public KeyedService,
+@@ -398,6 +400,8 @@ class ExtensionUpdater : public KeyedService,
   base::TimeDelta frequency_;
   bool will_check_soon_ = false;
 
@@ -493,18 +452,6 @@ diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/brows
     icon_decode_complete_ = true;
   } else {
     // No existing |icon_fetcher_| to avoid unbalanced AddRef().
-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
-@@ -595,7 +595,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.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
@@ -519,7 +466,7 @@ diff --git a/chrome/browser/resources/extensions/manager.html.ts b/chrome/browse
 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
-@@ -146,6 +146,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -143,6 +143,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
        */
       didInitPage_: {type: Boolean},
 
@@ -528,7 +475,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
       narrow_: {type: Boolean},
 
       showDrawer_: {type: Boolean},
-@@ -167,6 +169,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -164,6 +166,8 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
   accessor inDevMode: boolean = loadTimeData.getBoolean('inDevMode');
   accessor isMv2DeprecationNoticeDismissed: boolean =
       loadTimeData.getBoolean('MV2DeprecationNoticeDismissed');
@@ -537,7 +484,7 @@ diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/res
   accessor showActivityLog: boolean =
       loadTimeData.getBoolean('showActivityLog');
   accessor enableEnhancedSiteControls: boolean =
-@@ -231,6 +235,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
+@@ -247,6 +251,7 @@ export class ExtensionsManagerElement extends ExtensionsManagerElementBase {
           this.canLoadUnpacked = profileInfo.canLoadUnpacked;
           this.isMv2DeprecationNoticeDismissed =
               profileInfo.isMv2DeprecationNoticeDismissed;
@@ -569,7 +516,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/re
 
 +#need-update {
 +  color: red;
-+  margin-inline: 0px;
+  margin-inline: 0;
 +}
 +
 cr-toolbar {
@@ -578,7 +525,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.css b/chrome/browser/re
 diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browser/resources/extensions/toolbar.html.ts
 --- a/chrome/browser/resources/extensions/toolbar.html.ts
 +++ b/chrome/browser/resources/extensions/toolbar.html.ts
-@@ -32,6 +32,13 @@ export function getHtml(this: ToolbarElement) {
+@@ -33,6 +33,13 @@ export function getHtml(this: ToolbarElement) {
       <img srcset="images/product_logo.png" role="presentation">
     </picture>
   </if>
@@ -586,12 +533,12 @@ diff --git a/chrome/browser/resources/extensions/toolbar.html.ts b/chrome/browse
 +    <span>$i18n{toolbarExtensionUpdateEnabled}
 +      <span id="need-update" ?hidden="${!this.shouldShowRelaunchDialog}">$i18n{toolbarExtensionUpdateEnabledNeedRestart}</span>
 +    </span>
-+    <cr-toggle @change="${this.onExtUpdateEnabledChanged_}" ?checked="${this.isExtUpdateEnabled}">
+    <cr-toggle @change="${this.onExtUpdateEnabledChange_}" ?checked="${this.isExtUpdateEnabled}">
 +    </cr-toggle>
 +  </div>
 </cr-toolbar>
 ${this.showPackDialog_ ? html`
-   <extensions-pack-dialog .delegate="${this.delegate}"
+   <extensions-pack-dialog .delegate="${this.delegate as ServiceInterface}"
 diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts
 --- a/chrome/browser/resources/extensions/toolbar.ts
 +++ b/chrome/browser/resources/extensions/toolbar.ts
@@ -645,7 +592,7 @@ diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/res
         'Options_ToggleDeveloperMode_' + (e.detail ? 'Enabled' : 'Disabled'));
   }
 
-+  protected onExtUpdateEnabledChanged_(e: CustomEvent<boolean>) {
+  protected onExtUpdateEnabledChange_(e: CustomEvent<boolean>) {
 +    this.delegate.setExtUpdateEnabled(e.detail);
 +    this.shouldShowRelaunchDialog = true;
 +    this.isExtUpdateEnabled = e.detail;
@@ -673,7 +620,7 @@ diff --git a/chrome/browser/resources/webstore_app/manifest.json b/chrome/browse
 diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc
 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
 +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
-@@ -17,6 +17,7 @@
+@@ -16,6 +16,7 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ -681,7 +628,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
 #include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
 #include "chrome/browser/extensions/mv2_experiment_stage.h"
 #include "chrome/browser/extensions/permissions_url_constants.h"
-@@ -381,6 +382,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -386,6 +387,8 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
       {"itemSuspiciousInstallLearnMore",
        IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE_LEARN_MORE},
       {"toolbarDevMode", IDS_EXTENSIONS_DEVELOPER_MODE},
@@ -690,7 +637,7 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browse
       {"toolbarLoadUnpacked", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED},
       {"toolbarLoadUnpackedDone", IDS_EXTENSIONS_TOOLBAR_LOAD_UNPACKED_DONE},
       {"toolbarPack", IDS_EXTENSIONS_TOOLBAR_PACK},
-@@ -466,6 +469,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
+@@ -471,6 +474,10 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile,
       "hostPermissionsLearnMoreLink",
       extension_permissions_constants::kRuntimeHostPermissionsHelpURL);
   source->AddBoolean(kInDevModeKey, in_dev_mode);
@@ -724,25 +671,25 @@ diff --git a/chrome/browser/update_client/chrome_update_query_params_delegate.cc
 }
 
 // static
-diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl
--- a/chrome/common/extensions/api/developer_private.idl
-+++ b/chrome/common/extensions/api/developer_private.idl
-@@ -273,6 +273,7 @@ namespace developerPrivate {
-     boolean isIncognitoAvailable;
-     boolean isChildAccount;
-     boolean isMv2DeprecationNoticeDismissed;
-+    boolean isExtensionAutoupdateEnabled;
-   };
+diff --git a/chrome/common/extensions/api/developer_private.webidl b/chrome/common/extensions/api/developer_private.webidl
+--- a/chrome/common/extensions/api/developer_private.webidl
+++ b/chrome/common/extensions/api/developer_private.webidl
+@@ -264,6 +264,7 @@ dictionary ProfileInfo {
+   required boolean isIncognitoAvailable;
+   required boolean isChildAccount;
+   required boolean isMv2DeprecationNoticeDismissed;
+  boolean isExtensionAutoupdateEnabled;
+ };
 
-   dictionary GetExtensionsInfoOptions {
-@@ -296,6 +297,7 @@ namespace developerPrivate {
-   dictionary ProfileConfigurationUpdate {
-     boolean? inDeveloperMode;
-     boolean? isMv2DeprecationNoticeDismissed;
-+    boolean? isExtensionAutoupdateEnabled;
-   };
+ dictionary GetExtensionsInfoOptions {
+@@ -287,6 +288,7 @@ dictionary ExtensionConfigurationUpdate {
+ dictionary ProfileConfigurationUpdate {
+   boolean inDeveloperMode;
+   boolean isMv2DeprecationNoticeDismissed;
+  boolean? isExtensionAutoupdateEnabled;
+ };
 
-   dictionary ExtensionCommandUpdate {
+ dictionary ExtensionCommandUpdate {
 diff --git a/components/update_client/update_query_params.cc b/components/update_client/update_query_params.cc
 --- a/components/update_client/update_query_params.cc
 +++ b/components/update_client/update_query_params.cc
@@ -849,7 +796,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   for (ExtensionSet::const_iterator iter = extensions.begin();
        iter != extensions.end(); ++iter) {
     const Extension& extension = **iter;
-@@ -323,10 +352,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
+@@ -314,10 +343,9 @@ ExtensionFunction::ResponseAction ManagementGetFunction::Run() {
   std::optional<management::Get::Params> params =
       management::Get::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
@@ -861,7 +808,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!target_extension) {
     return RespondNow(Error(keys::kNoExtensionError, params->id));
   }
-@@ -347,8 +375,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
+@@ -338,8 +366,7 @@ ManagementGetPermissionWarningsByIdFunction::Run() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const Extension* extension =
@@ -871,7 +818,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!extension) {
     return RespondNow(Error(keys::kNoExtensionError, params->id));
   }
-@@ -419,8 +446,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
+@@ -410,8 +437,7 @@ ExtensionFunction::ResponseAction ManagementLaunchAppFunction::Run() {
   }
 
   const Extension* extension =
@@ -881,7 +828,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!extension) {
     return RespondNow(Error(keys::kNoExtensionError, params->id));
   }
-@@ -562,8 +588,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
+@@ -552,8 +578,8 @@ void ManagementSetEnabledFunction::CheckPermissionsIncrease() {
   // Extension could have been uninstalled externally while previous check was
   // happening.
   const Extension* extension =
@@ -892,7 +839,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!extension) {
     FinishEnable(Error(keys::kNoExtensionError));
     return;
-@@ -606,8 +632,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
+@@ -596,8 +622,8 @@ void ManagementSetEnabledFunction::CheckManifestV2Deprecation() {
   // Extension can be uninstalled externally while the previous check was
   // happening async.
   const Extension* extension =
@@ -903,7 +850,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
   if (!extension) {
     FinishEnable(Error(keys::kNoExtensionError));
     return;
-@@ -751,8 +777,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
+@@ -741,8 +767,8 @@ void ManagementSetEnabledFunction::OnSupervisedExtensionApprovalDone(
 }
 
 const Extension* ManagementSetEnabledFunction::GetExtension() {
@@ -914,7 +861,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
 }
 
 ManagementUninstallFunctionBase::ManagementUninstallFunctionBase() = default;
-@@ -777,8 +803,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
+@@ -767,8 +793,7 @@ ExtensionFunction::ResponseAction ManagementUninstallFunctionBase::Uninstall(
                                               ->GetDelegate();
   target_extension_id_ = target_extension_id;
   const Extension* target_extension =
@@ -924,7 +871,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_));
-@@ -843,8 +868,7 @@ void ManagementUninstallFunctionBase::UninstallExtension() {
+@@ -833,8 +858,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 =
@@ -934,7 +881,7 @@ diff --git a/extensions/browser/api/management/management_api.cc b/extensions/br
                              ExtensionRegistry::EVERYTHING);
   std::string error;
   bool success = false;
-@@ -928,8 +952,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
+@@ -918,8 +942,7 @@ ExtensionFunction::ResponseAction ManagementCreateAppShortcutFunction::Run() {
       management::CreateAppShortcut::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -944,7 +891,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)));
-@@ -983,8 +1006,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
+@@ -973,8 +996,7 @@ ExtensionFunction::ResponseAction ManagementSetLaunchTypeFunction::Run() {
       management::SetLaunchType::Params::Create(args());
   EXTENSION_FUNCTION_VALIDATE(params);
   const Extension* extension =
@@ -1017,7 +964,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
   ExtensionIdSet extension_ids_with_errors;
   for (const auto& failure : failures)
     extension_ids_with_errors.insert(failure.first.id);
-@@ -860,7 +843,7 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -861,7 +844,7 @@ ExtensionDownloader::GetUpdateAvailability(
     // extensions that have already existed in the system.
     if (!delegate_->GetExtensionExistingVersion(extension_id,
                                                 &extension_version)) {
@@ -1026,7 +973,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
       return UpdateAvailability::kBadUpdateSpecification;
     }
     VLOG(2) << extension_id << " is at '" << extension_version << "'";
-@@ -871,11 +854,11 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -872,11 +855,11 @@ ExtensionDownloader::GetUpdateAvailability(
     const std::string& update_version_str = update->version;
     if (VLOG_IS_ON(2)) {
       if (update_version_str.empty())
@@ -1040,7 +987,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
                 << " latest version is '" << update_version_str << "'";
     }
 
-@@ -885,21 +868,21 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -886,14 +869,14 @@ ExtensionDownloader::GetUpdateAvailability(
       // we don't want it.
       if (update_version_str.empty()) {
         // If update manifest doesn't have version number => no update.
@@ -1057,15 +1004,16 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
                 << update_version_str << "'";
         continue;
       }
- 
-       const base::Version existing_version(extension_version);
-       if (update_version.CompareTo(existing_version) <= 0) {
-        VLOG(2) << extension_id << " version is not older than '"
-+        LOG(INFO) << extension_id << " version is not older than '"
-                 << update_version_str << "'";
-         bool can_rollback =
-             update_version.CompareTo(existing_version) < 0 &&
-@@ -926,7 +909,9 @@ ExtensionDownloader::GetUpdateAvailability(
+@@ -921,7 +904,7 @@ ExtensionDownloader::GetUpdateAvailability(
+             update->browser_min_version)) {
+       // TODO(asargent) - We may want this to show up in the extensions UI
+       // eventually. (http://crbug.com/12547).
+-      DLOG(WARNING) << "Updated version of extension " << extension_id
+      LOG(INFO) << "Updated version of extension " << extension_id
+                     << " available, but requires chrome version "
+                     << update->browser_min_version;
+       has_noupdate = true;
+@@ -929,7 +912,9 @@ ExtensionDownloader::GetUpdateAvailability(
     }
 
     // Stop checking as soon as an update for |extension_id| is found.
@@ -1076,7 +1024,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
     *update_result_out = const_cast<UpdateManifestResult*>(update);
     return UpdateAvailability::kAvailable;
   }
-@@ -1171,7 +1156,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1175,7 +1160,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
   int load_flags = net::LOAD_DISABLE_CACHE;
   bool is_secure = fetch->url.SchemeIsCryptographic();
   extension_loader_resource_request_->load_flags = load_flags;
@@ -1085,7 +1033,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
     extension_loader_resource_request_->credentials_mode =
         network::mojom::CredentialsMode::kOmit;
   } else {
-@@ -1179,7 +1164,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1183,7 +1168,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
         net::SiteForCookies::FromUrl(fetch->url);
   }
 
@@ -1094,7 +1042,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
       is_secure) {
     if (access_token_.empty()) {
       // We should try OAuth2, but we have no token cached. This
-@@ -1202,7 +1187,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
+@@ -1206,7 +1191,7 @@ void ExtensionDownloader::CreateExtensionLoader() {
         base::StringPrintf("Bearer %s", access_token_.c_str()));
   }
 
@@ -1103,7 +1051,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
 
   StartExtensionLoader();
 }
-@@ -1224,7 +1209,7 @@ void ExtensionDownloader::StartExtensionLoader() {
+@@ -1228,7 +1213,7 @@ void ExtensionDownloader::StartExtensionLoader() {
           destination: WEBSITE
         }
         policy {
@@ -1112,7 +1060,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
           cookies_store: "user"
           setting:
             "This feature cannot be disabled. It is only enabled when the user "
-@@ -1295,6 +1280,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
+@@ -1299,6 +1284,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
     RETRY_HISTOGRAM("CrxFetchSuccess",
                     extensions_queue_.active_request_failure_count(),
                     url);
@@ -1120,7 +1068,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
     std::unique_ptr<ExtensionFetch> fetch_data =
         std::move(extensions_queue_.reset_active_request().fetch);
     delegate_->OnExtensionDownloadStageChanged(
-@@ -1315,7 +1301,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
+@@ -1319,7 +1305,7 @@ void ExtensionDownloader::OnExtensionLoadComplete(base::FilePath crx_path) {
   } else {
     const std::set<int> request_ids = active_request.GetRequestIds();
     const ExtensionDownloaderDelegate::PingResult& ping = ping_results_[id];
@@ -1129,7 +1077,7 @@ diff --git a/extensions/browser/updater/extension_downloader.cc b/extensions/bro
             << "' response code:" << response_code;
     if (ShouldRetryRequest(extension_loader_.get()) &&
         extensions_queue_.active_request_failure_count() < kMaxRetries) {
-@@ -1409,6 +1395,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailedWithList(
+@@ -1413,6 +1399,7 @@ void ExtensionDownloader::NotifyExtensionsDownloadFailedWithList(
 bool ExtensionDownloader::IterateFetchCredentialsAfterFailure(
     ExtensionFetch* fetch,
     int response_code) {
@@ -1182,7 +1130,7 @@ diff --git a/extensions/browser/updater/manifest_fetch_data.cc b/extensions/brow
 diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
 --- a/extensions/browser/updater/safe_manifest_parser.cc
 +++ b/extensions/browser/updater/safe_manifest_parser.cc
-@@ -203,6 +203,7 @@ void ParseXmlDone(ParseUpdateManifestCallback callback,
+@@ -202,6 +202,7 @@ void ParseXmlDone(ParseUpdateManifestCallback callback,
         std::move(callback).Run(/*results=*/nullptr, std::move(error));
       });
 
@@ -1190,12 +1138,24 @@ diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/bro
   auto results = std::make_unique<UpdateManifestResults>();
 
   // Parse the first <daystart> if it's present.
+diff --git a/extensions/browser/webstore_installer.cc b/extensions/browser/webstore_installer.cc
+--- a/extensions/browser/webstore_installer.cc
+++ b/extensions/browser/webstore_installer.cc
+@@ -604,7 +604,7 @@ void WebstoreInstaller::StartDownload(const ExtensionId& extension_id,
+       render_frame_host->CreateDownloadUrlParameters(download_url_,
+                                                      traffic_annotation);
+   params->set_file_path(file);
+-  if (controller.GetVisibleEntry()) {
+  if (((false)) && controller.GetVisibleEntry()) {
+     content::Referrer referrer = content::Referrer::SanitizeForRequest(
+         download_url_,
+         content::Referrer(controller.GetVisibleEntry()->GetURL(),
 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
-@@ -186,4 +186,11 @@ BASE_FEATURE(kSearchEngineUnconditionalDialog,
- BASE_FEATURE(kWebRequestPersistFilteredEvents,
-              base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -220,4 +220,11 @@ BASE_FEATURE(kWebRequestPersistFilteredEventsViaEventRouter,
+ 
+ BASE_FEATURE(kOptimizeWebRequestProxy, base::FEATURE_DISABLED_BY_DEFAULT);
 
 +CROMITE_FEATURE(kEnableExtensionAutoupdate,
 +                "EnableExtensionAutoupdate",
@@ -1208,9 +1168,9 @@ diff --git a/extensions/common/extension_features.cc b/extensions/common/extensi
 diff --git a/extensions/common/extension_features.h b/extensions/common/extension_features.h
 --- a/extensions/common/extension_features.h
 +++ b/extensions/common/extension_features.h
-@@ -310,6 +310,16 @@ BASE_DECLARE_FEATURE(kWebRequestSecurityInfo);
- // browser startup).
- BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEvents);
+@@ -320,6 +320,16 @@ BASE_DECLARE_FEATURE(kWebRequestPersistFilteredEventsViaEventRouter);
+ // optimizations like preconnect.
+ BASE_DECLARE_FEATURE(kOptimizeWebRequestProxy);
 
 +// Activates the auto update of extensions.
 +// the only data provided by default is the list of extensions.
@@ -1228,7 +1188,7 @@ diff --git a/extensions/common/extension_features.h b/extensions/common/extensio
 diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescript/definitions/developer_private.d.ts
 --- a/tools/typescript/definitions/developer_private.d.ts
 +++ b/tools/typescript/definitions/developer_private.d.ts
-@@ -265,6 +265,7 @@ declare global {
+@@ -264,6 +264,7 @@ declare global {
         isIncognitoAvailable: boolean;
         isChildAccount: boolean;
         isMv2DeprecationNoticeDismissed: boolean;
@@ -1236,7 +1196,7 @@ diff --git a/tools/typescript/definitions/developer_private.d.ts b/tools/typescr
       }
 
       export interface ExtensionConfigurationUpdate {
-@@ -282,6 +283,7 @@ declare global {
+@@ -281,6 +282,7 @@ declare global {
       export interface ProfileConfigurationUpdate {
         inDeveloperMode?: boolean;
         isMv2DeprecationNoticeDismissed?: boolean;
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/preflight_cache.cc
 --- a/services/network/cors/preflight_cache.cc
 +++ b/services/network/cors/preflight_cache.cc
-@@ -197,6 +197,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
+@@ -198,6 +198,10 @@ void PreflightCache::MayPurgeForTesting(size_t max_entries, size_t purge_unit) {
   MayPurge(max_entries, purge_unit);
 }
 
@@ -29,7 +29,7 @@ diff --git a/services/network/cors/preflight_cache.cc b/services/network/cors/pr
 diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/preflight_cache.h
 --- a/services/network/cors/preflight_cache.h
 +++ b/services/network/cors/preflight_cache.h
-@@ -75,6 +75,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
+@@ -76,6 +76,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) PreflightCache final {
   // `max_entries` for testing.
   void MayPurgeForTesting(size_t max_entries, size_t purge_unit);
 
@@ -41,7 +41,7 @@ diff --git a/services/network/cors/preflight_cache.h b/services/network/cors/pre
 diff --git a/services/network/cors/preflight_controller.cc b/services/network/cors/preflight_controller.cc
 --- a/services/network/cors/preflight_controller.cc
 +++ b/services/network/cors/preflight_controller.cc
-@@ -631,6 +631,10 @@ void PreflightController::ClearCorsPreflightCache(
+@@ -644,6 +644,10 @@ void PreflightController::ClearCorsPreflightCache(
   cache_.ClearCache(std::move(url_filter));
 }
 
@@ -79,12 +79,12 @@ 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
-@@ -1368,6 +1368,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
+@@ -1431,6 +1431,7 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
                                     base::Time end_time,
                                     mojom::ClearDataFilterPtr filter,
                                     ClearHttpCacheCallback callback) {
 +  cors_preflight_controller_.ClearCache();
-   // It's safe to use Unretained below as the HttpCacheDataRemover is owned by
-   // |this| and guarantees it won't call its callback if deleted.
-   http_cache_data_removers_.push_back(HttpCacheDataRemover::CreateAndStart(
+   if (base::FeatureList::IsEnabled(net::features::kLogicalClearHttpCache)) {
+     net::HttpCache* cache =
+         url_request_context_->http_transaction_factory()->GetCache();
 --
@@ -22,8 +22,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../renderer/core/frame/navigator_ua_data.cc    |  1 +
 .../renderer/core/frame/navigator_ua_data.idl   |  5 ++++-
 .../renderer/core/loader/frame_fetch_context.cc |  4 +++-
- .../platform/runtime_enabled_features.json5     |  8 ++++++--
- 16 files changed, 63 insertions(+), 16 deletions(-)
+ .../platform/runtime_enabled_features.json5     |  5 +++++
+ 16 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Client-hints-overrides.inc
 create mode 100644 cromite_flags/content/common/features_cc/Client-hints-overrides.inc
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Client-hints-overrides.inc
@@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
 --- a/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
 +++ b/android_webview/support_library/java/src/org/chromium/support_lib_glue/SupportLibWebViewChromiumFactory.java
-@@ -95,7 +95,7 @@ public class SupportLibWebViewChromiumFactory implements WebViewProviderFactoryB
+@@ -99,7 +99,7 @@ public class SupportLibWebViewChromiumFactory implements WebViewProviderFactoryB
                 Features.GET_COOKIE_INFO,
                 Features.WEB_MESSAGE_ARRAY_BUFFER,
                 Features.IMAGE_DRAG_DROP,
@@ -43,7 +43,7 @@ diff --git a/android_webview/support_library/java/src/org/chromium/support_lib_g
 diff --git a/components/client_hints/browser/client_hints.cc b/components/client_hints/browser/client_hints.cc
 --- a/components/client_hints/browser/client_hints.cc
 +++ b/components/client_hints/browser/client_hints.cc
-@@ -35,7 +35,7 @@ ParseInitializeClientHintsStorage() {
+@@ -36,7 +36,7 @@ ParseInitializeClientHintsStorage() {
   auto results =
       base::flat_map<url::Origin,
                      std::vector<network::mojom::WebClientHintsType>>();
@@ -52,7 +52,7 @@ diff --git a/components/client_hints/browser/client_hints.cc b/components/client
   std::string raw_client_hint_json =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kInitializeClientHintsStorage);
-@@ -200,7 +200,8 @@ void ClientHints::PersistClientHints(
+@@ -201,7 +201,8 @@ void ClientHints::PersistClientHints(
   // TODO(tbansal): crbug.com/735518. Disable updates to client hints settings
   // when cookies are disabled for |primary_origin|.
   content_settings::ContentSettingConstraints constraints;
@@ -65,7 +65,7 @@ diff --git a/components/client_hints/browser/client_hints.cc b/components/client
 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
-@@ -186,9 +186,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
+@@ -163,9 +163,7 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
   bool parse_result = base::StringToInt(major_version, &major_version_number);
   DCHECK(parse_result);
   std::optional<std::string> brand;
@@ -76,7 +76,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
 
   std::string brand_version =
       output_version_type == blink::UserAgentBrandVersionType::kFullVersion
-@@ -676,6 +674,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
+@@ -662,6 +660,7 @@ blink::UserAgentMetadata GetUserAgentMetadata(bool only_low_entropy_ch) {
   }
 
   // High entropy client hints.
@@ -156,7 +156,7 @@ new file mode 100644
 diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
 --- a/net/http/http_network_transaction.cc
 +++ b/net/http/http_network_transaction.cc
-@@ -114,6 +114,7 @@ const size_t kMaxRestarts = 32;
+@@ -120,6 +120,7 @@ const size_t kMaxRestarts = 32;
 
 // Returns true when Early Hints are allowed on the given protocol.
 bool EarlyHintsAreAllowedOn(HttpConnectionInfo connection_info) {
@@ -236,14 +236,14 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua.idl b/third_part
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.cc
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.cc
-@@ -114,6 +114,7 @@ const String& NavigatorUAData::platform() const {
+@@ -113,6 +113,7 @@ const String& NavigatorUAData::platform() const {
 }
 
 bool AllowedToCollectHighEntropyValues(ExecutionContext* execution_context) {
 +  if ((true)) return false;
-   // To determine whether a document is allowed to use the get high-entropy
+   // To determine whether a document is allowed to get high-entropy
   // client hints returned by navigator.userAgentData.getHighEntropyValues(),
-   // check the following:
+   // we need to check the "ch-ua-high-entropy-values" policy:
 diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.idl b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 --- a/third_party/blink/renderer/core/frame/navigator_ua_data.idl
 +++ b/third_party/blink/renderer/core/frame/navigator_ua_data.idl
@@ -271,7 +271,7 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/thi
   // For subresource requests, sending the hint in the fetch request based on
   // the permissions policy.
   if (!policy.IsFeatureEnabledForOrigin(
-@@ -726,7 +728,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
+@@ -725,7 +727,7 @@ void FrameFetchContext::AddClientHintsIfNecessary(
   }
 
   // Only send User Agent hints if the info is available
@@ -283,7 +283,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
-@@ -614,6 +614,11 @@
+@@ -678,6 +678,11 @@
       name: "AriaNotifyV2",
       status: {"Android": "test", "Win": "test", "Mac": "test", "Linux": "test"},
     },
@@ -295,14 +295,4 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
     {
       name: "AriaRowColIndexText",
       status: "stable",
-@@ -1020,8 +1025,7 @@
-       // Allows top-level sites to restrict collection of high-entropy UA client
-       // hints (from 3Ps, or itself) via the getHighEntropyValues API.
-       // crbug.com/385161047
-      name: "ClientHintUAHighEntropyValuesPermissionPolicy",
-      status: "stable",
-+      name: "ClientHintUAHighEntropyValuesPermissionPolicy",  // disabled by default
-     },
-     {
-       // Enables clipboardchange event API for listening for changes to the
 --
@@ -88,7 +88,7 @@ new file mode 100644
 diff --git a/net/base/features.cc b/net/base/features.cc
 --- a/net/base/features.cc
 +++ b/net/base/features.cc
-@@ -293,7 +293,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
+@@ -300,7 +300,7 @@ BASE_FEATURE(kRelatedWebsitePartitionAPI, base::FEATURE_DISABLED_BY_DEFAULT);
 // NetworkChangeNotifier::AreNetworkHandlesSupported).
 #if BUILDFLAG(IS_ANDROID)
 inline constexpr auto kMigrateSessionsOnNetworkChangeV2Default =
@@ -13,7 +13,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -579,6 +579,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -597,6 +597,7 @@ template("chrome_common_apk_or_module_tmpl") {
           [ "//components/crash/core/app:chrome_crashpad_handler_named_as_so" ]
       loadable_modules += [ "$root_out_dir/libchrome_crashpad_handler.so" ]
       library_always_compress += [ "libchrome_crashpad_handler.so" ]
@@ -17,7 +17,6 @@ Require: bromite-build-utils.patch
 .../privacy_page/privacy_page_index.ts        |  83 +++-
 chrome/browser/resources/settings/route.ts    |   2 +
 ...settings_category_default_radio_group.html |  12 +
- .../settings_category_default_radio_group.ts  |  23 +-
 .../settings/site_settings/site_details.html  |   1 +
 .../settings/site_settings/site_details.ts    |  33 +-
 .../site_details_permission.html              |   8 +-
@@ -41,10 +40,10 @@ Require: bromite-build-utils.patch
 .../browser_ui/site_settings/android/BUILD.gn |  18 +
 .../res/xml/site_settings_preferences.xml     |   7 +
 .../site_settings/AllSiteSettings.java        |   5 +-
- .../BromiteCustomContentSetting.java          | 155 +++++++
- .../BromiteCustomContentSettingImpl.java      | 416 ++++++++++++++++++
+ .../BromiteCustomContentSetting.java          | 159 +++++++
+ .../BromiteCustomContentSettingImpl.java      | 422 ++++++++++++++++++
 ...tomTriStateSiteSettingsPreferenceImpl.java |  24 +
- .../ContentSettingsResources.java             |  32 +-
+ .../ContentSettingsResources.java             |  34 +-
 .../site_settings/SingleCategorySettings.java |  57 ++-
 .../site_settings/SingleWebsiteSettings.java  |  48 +-
 .../site_settings/SiteSettings.java           |  35 +-
@@ -74,7 +73,7 @@ Require: bromite-build-utils.patch
 .../common/content_settings_mojom_traits.cc   |  12 +-
 .../common/content_settings_mojom_traits.h    |  24 +
 .../core/common/content_settings_types.mojom  |   2 +
- .../renderer/content_settings_agent_impl.cc   |  74 ++++
+ .../renderer/content_settings_agent_impl.cc   |  74 +++
 .../renderer/content_settings_agent_impl.h    |   9 +
 .../PageInfoPermissionsController.java        |   9 +
 .../android/page_info_controller_android.cc   |  18 +
@@ -84,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 +
- 73 files changed, 1964 insertions(+), 106 deletions(-)
+ 72 files changed, 1954 insertions(+), 105 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
@@ -109,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. */
 @NullMarked
 public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
-@@ -251,7 +255,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -246,7 +250,7 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
 
     @Override
     public boolean isHelpAndFeedbackEnabled() {
@@ -118,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
     }
 
     @Override
-@@ -378,6 +382,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
+@@ -373,6 +377,17 @@ public class ChromeSiteSettingsDelegate implements SiteSettingsDelegate {
         return mPrivacySandboxBridge.getRelatedWebsiteSetOwner(memberOrigin);
     }
 
@@ -139,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
-@@ -191,7 +191,7 @@ namespace {
+@@ -193,7 +193,7 @@ namespace {
 void GetGuestViewDefaultContentSettingRules(
     bool incognito,
     RendererContentSettingRules* rules) {
@@ -276,7 +275,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,
-@@ -155,6 +156,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+@@ -153,6 +154,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
     r.SITE_SETTINGS_LOOPBACK_NETWORK =
         r.SITE_SETTINGS.createChild('loopbackNetwork');
   }
@@ -287,8 +286,8 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
 diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.html b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.html
 --- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.html
 +++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.html
-@@ -54,5 +54,17 @@
-         icon="[[blockOptionIcon]]"
+@@ -68,5 +68,17 @@
+         hidden="[[!blockOptionLabel]]"
         no-collapse>
     </settings-collapse-radio-button>
 +    <settings-collapse-radio-button
@@ -305,85 +304,10 @@ diff --git a/chrome/browser/resources/settings/site_settings/settings_category_d
 +    </settings-collapse-radio-button>
   </settings-radio-group>
 </div>
-diff --git a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
--- a/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-+++ b/chrome/browser/resources/settings/site_settings/settings_category_default_radio_group.ts
-@@ -32,6 +32,7 @@ import {isSettingEnabled} from './site_settings_util.js';
- export enum SiteContentRadioSetting {
-   DISABLED = 0,
-   ENABLED = 1,
-+  ASK = 2,
- }
- 
- export interface SettingsCategoryDefaultRadioGroupElement {
-@@ -80,6 +81,10 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-       blockOptionSubLabel: String,
-       blockOptionIcon: String,
- 
-+      askOptionLabel: String,
-+      askOptionSubLabel: String,
-+      askOptionIcon: String,
-+
-       siteContentRadioSettingEnum_: {
-         type: Object,
-         value: SiteContentRadioSetting,
-@@ -115,6 +120,9 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-   declare blockOptionLabel: string;
-   declare blockOptionSubLabel: string;
-   declare blockOptionIcon: string;
-+  declare askOptionLabel: string;
-+  declare askOptionSubLabel: string;
-+  declare askOptionIcon: string;
-   declare private pref_: chrome.settingsPrivate.PrefObject<number>;
-   selected: boolean;
- 
-@@ -126,6 +134,13 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-         (category: ContentSettingsTypes) => this.onCategoryChanged_(category));
-   }
- 
-+  private showAskSetting_(
-+      category: ContentSettingsTypes): boolean {
-+    let obj = this.getSettingData(category);
-+    if (obj) return obj["allowed_ask"] === "1";
-+    return false;
-+  }
-+
-   private getAllowOptionForCategory_(): ContentSetting {
-     // Keep elements in alphabetical order within their groups.
-     switch (this.category) {
-@@ -178,6 +193,8 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-         // "Ask" vs "Blocked".
-         return ContentSetting.ASK;
-       default:
-+        let obj = this.getSettingData(this.category);
-+        if (obj) return ContentSetting.ALLOW;
-         assertNotReached('Invalid category: ' + this.category);
-     }
-   }
-@@ -202,6 +219,7 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-         /** @type {!ContentSetting} */ (this.getAllowOptionForCategory_());
-     this.browserProxy.setDefaultValueForContentType(
-         this.category,
-+        this.pref_.value === SiteContentRadioSetting.ASK ? "ask" :
-         this.categoryEnabled_ ? allowOption : ContentSetting.BLOCK);
-     if (this.selected !== this.categoryEnabled_) {
-       this.selected = this.categoryEnabled_;
-@@ -240,7 +258,10 @@ export class SettingsCategoryDefaultRadioGroupElement extends
-     }
- 
-     const enabled = isSettingEnabled(update.setting);
-    const prefValue = enabled ? SiteContentRadioSetting.ENABLED :
-+    const ask = this.computeIsSettingAsk(update.setting)
-+                 && this.showAskSetting_(this.category);
-+    const prefValue = ask ? SiteContentRadioSetting.ASK :
-+                      enabled ? SiteContentRadioSetting.ENABLED :
-                                 SiteContentRadioSetting.DISABLED;
-     this.selected = enabled;
-     this.set('pref_.value', prefValue);
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html
 --- a/chrome/browser/resources/settings/site_settings/site_details.html
 +++ b/chrome/browser/resources/settings/site_settings/site_details.html
-@@ -344,5 +344,6 @@
+@@ -352,5 +352,6 @@
             label="$i18n{siteSettingsLoopbackNetwork}">
         </site-details-permission>
       </template>
@@ -393,7 +317,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b
 diff --git a/chrome/browser/resources/settings/site_settings/site_details.ts b/chrome/browser/resources/settings/site_settings/site_details.ts
 --- a/chrome/browser/resources/settings/site_settings/site_details.ts
 +++ b/chrome/browser/resources/settings/site_settings/site_details.ts
-@@ -73,8 +73,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase {
+@@ -74,8 +74,39 @@ export class SiteDetailsElement extends SiteDetailsElementBase {
     return 'site-details';
   }
 
@@ -710,7 +634,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.
 /**
  * Determine localization string for i18n for a given content settings type.
  * Sorted alphabetically by |ContentSettingsType|.
-@@ -114,6 +162,13 @@ export function getLocalizationStringForContentType(
+@@ -113,6 +161,13 @@ export function getLocalizationStringForContentType(
     case ContentSettingsTypes.SMART_CARD_READERS:
       return null;
     default:
@@ -727,7 +651,7 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.
 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
-@@ -1626,6 +1626,7 @@ static_library("ui") {
+@@ -1723,6 +1723,7 @@ static_library("ui") {
       "//components/commerce/core/webui",
       "//components/contextual_search:public",
       "//components/endpoint_fetcher",
@@ -735,9 +659,9 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
       "//components/enterprise/common:files_scan_data",
       "//components/feedback/proto",
       "//components/headless/console_message_logger",
-@@ -4814,6 +4815,7 @@ static_library("ui") {
+@@ -4943,6 +4944,7 @@ static_library("ui") {
+       "//components/payments/core:currency_formatter",
       "//components/power_bookmarks/core",
-       "//components/power_bookmarks/storage",
       "//components/prefs",
 +      "//components/strings:components_strings_grit",
       "//components/services/app_service",
@@ -775,15 +699,15 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome
 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
-@@ -55,6 +55,7 @@
+@@ -57,6 +57,7 @@
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/metadata/view_factory.h"
 #include "ui/views/vector_icons.h"
 +#include "ui/views/layout/table_layout.h"
 #include "ui/views/view_class_properties.h"
+ #include "ui/views/widget/widget.h"
 
- #if BUILDFLAG(FULL_SAFE_BROWSING)
-@@ -259,8 +260,20 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -265,8 +266,20 @@ void PageInfoMainView::SetPermissionInfo(
   scroll_view->SetDrawOverflowIndicator(false);
   auto* content_view =
       scroll_view->SetContents(std::make_unique<views::View>());
@@ -806,7 +730,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
   content_view->SetID(PageInfoViewFactory::VIEW_ID_PAGE_INFO_PERMISSION_VIEW);
   content_view->SetProperty(views::kElementIdentifierKey,
                             kPermissionsElementId);
-@@ -275,11 +288,16 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -306,11 +319,16 @@ void PageInfoMainView::SetPermissionInfo(
     }
   }
 
@@ -823,7 +747,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
     toggle_row->SetProperty(views::kCrossAxisAlignmentKey,
                             views::LayoutAlignment::kStretch);
     syncable_permission_rows_.emplace(permission.type, toggle_row);
-@@ -287,6 +305,8 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -318,6 +336,8 @@ void PageInfoMainView::SetPermissionInfo(
   }
 
   for (auto& object : chosen_object_info_list) {
@@ -832,7 +756,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
     // The view takes ownership of the object info.
     auto object_view = std::make_unique<ChosenObjectView>(
         std::move(object),
-@@ -297,6 +317,10 @@ void PageInfoMainView::SetPermissionInfo(
+@@ -328,6 +348,10 @@ void PageInfoMainView::SetPermissionInfo(
         content_view->AddChildView(std::move(object_view)));
   }
 
@@ -840,9 +764,9 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/b
 +  if (++count % 2 == 0)
 +    content_view->AddChildView(std::make_unique<views::View>());
 +
-   const int controls_spacing = ChromeLayoutProvider::Get()->GetDistanceMetric(
-       views::DISTANCE_RELATED_CONTROL_VERTICAL);
   reset_button_ = content_view->AddChildView(
+       std::make_unique<views::MdTextButton>(base::BindRepeating(
+           [=](PageInfoMainView* view) {
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc
@@ -891,7 +815,7 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrom
 diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.h b/chrome/browser/ui/views/page_info/page_info_view_factory.h
 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.h
 +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.h
-@@ -95,6 +95,11 @@ class PageInfoViewFactory {
+@@ -96,6 +96,11 @@ class PageInfoViewFactory {
       const PageInfo::PermissionInfo& info,
       bool blocked_on_system_level = false);
 
@@ -1214,17 +1138,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"
-@@ -74,6 +75,9 @@
- #include "components/dom_distiller/core/dom_distiller_features.h"
- #include "components/google/core/common/google_util.h"
- #include "components/history/core/common/pref_names.h"
+@@ -80,6 +81,9 @@
+ #include "components/autofill/core/common/autofill_prefs.h"
+ #include "components/commerce/core/commerce_constants.h"
+ #include "components/content_settings/core/common/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"
-@@ -4190,6 +4194,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+ #include "components/device_reauth/device_authenticator.h"
+ #include "components/dom_distiller/core/dom_distiller_features.h"
+ #include "components/google/core/common/google_util.h"
+@@ -4325,6 +4329,56 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
   policy_indicator::AddLocalizedStrings(html_source);
   AddSecurityKeysStrings(html_source);
 
@@ -1256,7 +1180,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 +      if (info->mid_sentence_ui())
 +        html_source->AddLocalizedString(prefix + "MidSentence", info->mid_sentence_ui());
 +
-+      base::Value::Dict dict;
+      base::DictValue dict;
 +      dict.Set("name", name);
 +      dict.Set("type", (int)info->type());
 +      dict.Set("tag_ui", info->tag_ui());
@@ -1284,7 +1208,7 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provide
 diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc
 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc
 +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc
-@@ -46,6 +46,8 @@
+@@ -49,6 +49,8 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ -1293,8 +1217,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-@@ -262,13 +264,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
-     {ContentSettingsType::SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL, nullptr},
+@@ -263,13 +265,13 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array<
+     {ContentSettingsType::DEPRECATED_SUB_APP_INSTALLATION_PROMPTS, nullptr},
 });
 
 -static_assert(
@@ -1314,7 +1238,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
 
 struct SiteSettingSourceStringMapping {
   SiteSettingSource source;
-@@ -530,6 +532,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
+@@ -531,6 +533,13 @@ bool HasRegisteredGroupName(ContentSettingsType type) {
       return true;
     }
   }
@@ -1328,7 +1252,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   return false;
 }
 
-@@ -543,11 +552,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
+@@ -544,11 +553,24 @@ ContentSettingsType ContentSettingsTypeFromGroupName(std::string_view name) {
       return entry.type;
     }
   }
@@ -1354,7 +1278,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   for (const auto& entry : kContentSettingsTypeGroupNames) {
     if (type == entry.type) {
       // Content setting types that aren't represented in the settings UI
-@@ -562,7 +584,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
+@@ -563,7 +585,6 @@ std::string_view ContentSettingsTypeToGroupName(ContentSettingsType type) {
       return entry.name ? entry.name : std::string_view();
     }
   }
@@ -1362,7 +1286,7 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/b
   NOTREACHED() << static_cast<int32_t>(type)
                << " is not a recognized content settings type.";
 }
-@@ -671,6 +692,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
+@@ -672,6 +693,13 @@ std::vector<ContentSettingsType> GetVisiblePermissionCategories(
       }
     }
 
@@ -1379,14 +1303,14 @@ 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
-@@ -97,6 +97,7 @@ android_resources("java_resources") {
+@@ -100,6 +100,7 @@ android_resources("java_resources") {
     "java/res/layout/preference_chrome_button.xml",
     "java/res/layout/preference_chrome_image_view.xml",
     "java/res/layout/preference_spinner.xml",
 +    "java/res/layout/preference_spinner_single_widget.xml",
     "java/res/layout/preference_spinner_single_line.xml",
     "java/res/layout/preference_spinner_single_line_item.xml",
-     "java/res/layout/settings_action_bar_shadow.xml",
+     "java/res/layout/preference_widget_open_in_new.xml",
 diff --git a/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml b/components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml
 new file mode 100644
 --- /dev/null
@@ -1543,7 +1467,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
-@@ -156,6 +156,23 @@ android_library("java") {
+@@ -157,6 +157,23 @@ android_library("java") {
     ":site_settings_jni_headers",
     "//components/content_settings/android:java_pref_names_srcjar",
   ]
@@ -1567,7 +1491,7 @@ diff --git a/components/browser_ui/site_settings/android/BUILD.gn b/components/b
 }
 
 android_library("javatests") {
-@@ -211,6 +228,7 @@ robolectric_library("junit") {
+@@ -214,6 +231,7 @@ robolectric_library("junit") {
 }
 
 android_resources("java_resources") {
@@ -1593,7 +1517,7 @@ diff --git a/components/browser_ui/site_settings/android/java/res/xml/site_setti
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
-@@ -402,7 +402,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
+@@ -403,7 +403,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
                     if (queryHasChanged) getInfoForOrigins();
                 });
 
@@ -1603,7 +1527,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             MenuItem help =
                     menu.add(
                             Menu.NONE,
-@@ -412,6 +413,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
+@@ -413,6 +414,8 @@ public class AllSiteSettings extends BaseSiteSettingsFragment
             help.setIcon(
                     TraceEventVectorDrawableCompat.create(
                             getResources(), R.drawable.ic_help_24dp, getContext().getTheme()));
@@ -1616,7 +1540,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 new file mode 100644
 --- /dev/null
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,159 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -1764,6 +1688,10 @@ new file mode 100644
 +        return null;
 +    }
 +
+    public int[] getTriStateSettingIconIDs() {
+        return null;
+    }
+
 +    public boolean showOnlyDescriptions() {
 +        return false;
 +    }
@@ -1776,7 +1704,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 new file mode 100644
 --- /dev/null
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
-@@ -0,0 +1,416 @@
+@@ -0,0 +1,422 @@
 +/*
 +    This file is part of Bromite.
 +
@@ -2004,6 +1932,12 @@ new file mode 100644
 +        return null;
 +    }
 +
+    public static int[] getTriStateSettingIconIDs(@ContentSettingsType.EnumType int type) {
+        BromiteCustomContentSetting cs = getContentSetting(type);
+        if (cs != null) return cs.getTriStateSettingIconIDs();
+        return null;
+    }
+
 +    public static int getCategoryDescription(SiteSettingsCategory category) {
 +        for (BromiteCustomContentSetting cs : mItemList) {
 +            if (category.getType() == cs.getSiteSettingsCategory()) {
@@ -2225,7 +2159,7 @@ new file mode 100644
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
-@@ -40,7 +40,7 @@ import org.chromium.device.DeviceFeatureMap;
+@@ -39,7 +39,7 @@ import org.chromium.device.DeviceFeatureMap;
 @NullMarked
 public class ContentSettingsResources {
     /** An inner class contains all the resources for a ContentSettingsType */
@@ -2234,7 +2168,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         private final int mIcon;
         private final int mIconBlocked;
         private final int mTitle;
-@@ -53,7 +53,28 @@ public class ContentSettingsResources {
+@@ -52,7 +52,28 @@ public class ContentSettingsResources {
         private final int mDisabledPrimaryText;
         private int mDisabledDescriptionText;
 
@@ -2264,7 +2198,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                 int icon,
                 int title,
                 @ContentSetting @Nullable Integer defaultEnabledValue,
-@@ -689,6 +710,8 @@ public class ContentSettingsResources {
+@@ -687,6 +708,8 @@ public class ContentSettingsResources {
                         R.string.website_settings_window_management_ask,
                         R.string.website_settings_window_management_block);
         }
@@ -2273,7 +2207,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         assert false; // NOTREACHED
         return assumeNonNull(null);
     }
-@@ -869,6 +892,9 @@ public class ContentSettingsResources {
+@@ -867,6 +890,9 @@ public class ContentSettingsResources {
             @ContentSetting int value,
             boolean isOneTime,
             boolean isApproximateGeolocation) {
@@ -2283,19 +2217,28 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         return getCategorySummary(
                 type,
                 value,
-@@ -1069,6 +1095,8 @@ public class ContentSettingsResources {
+@@ -1066,6 +1092,8 @@ public class ContentSettingsResources {
+      *     that order.
      */
-     public static int @Nullable [] getTriStateSettingDescriptionIDs(
-             int contentType, boolean isPermissionSiteSettingsRadioButtonFeatureEnabled) {
+     public static int @Nullable [] getTriStateSettingDescriptionIDs(int contentType) {
 +        int[] value = BromiteCustomContentSettingImpl.getTriStateSettingDescriptionIDs(contentType);
 +        if (value != null) return value;
         if (contentType == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) {
-             if (isPermissionSiteSettingsRadioButtonFeatureEnabled) {
-                 int[] descriptionIDs = {
+             return new int[] {
+                 R.string.website_settings_protected_content_allow,
+@@ -1101,6 +1129,8 @@ public class ContentSettingsResources {
+      *     order.
+      */
+     public static int @Nullable [] getTriStateSettingIconIDs(int contentType) {
+        int[] value = BromiteCustomContentSettingImpl.getTriStateSettingIconIDs(contentType);
+        if (value != null) return value;
+         if (contentType == ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER) {
+             return new int[] {
+                 R.drawable.live_tv_24px, R.drawable.tv_24px, R.drawable.tv_off_24px,
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java
-@@ -368,6 +368,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -372,6 +372,10 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
         } else {
             @ContentSetting
             Integer contentSetting = website.site().getContentSetting(browserContextHandle, type);
@@ -2306,7 +2249,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             if (contentSetting != null) {
                 return ContentSetting.BLOCK == contentSetting;
             }
-@@ -559,6 +563,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -523,6 +527,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                         ? new HashSet<>(getArguments().getStringArrayList(EXTRA_SELECTED_DOMAINS))
                         : null;
 
@@ -2314,8 +2257,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         configureGlobalToggles();
         if (mCategory.getType() == SiteSettingsCategory.Type.REQUEST_DESKTOP_SITE) {
             RecordUserAction.record("DesktopSiteContentSetting.SettingsPage.Entered");
-@@ -600,7 +605,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
-                     if (queryHasChanged) getInfoForOrigins();
+@@ -570,7 +575,8 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+                     }
                 });
 
 -        if (getSiteSettingsDelegate().isHelpAndFeedbackEnabled()) {
@@ -2324,7 +2267,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             MenuItem help =
                     menu.add(
                             Menu.NONE,
-@@ -610,12 +616,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -580,12 +586,20 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
             help.setIcon(
                     TraceEventVectorDrawableCompat.create(
                             getResources(), R.drawable.ic_help_24dp, getContext().getTheme()));
@@ -2345,7 +2288,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             if (mCategory.getType() == SiteSettingsCategory.Type.PROTECTED_MEDIA) {
                 getSiteSettingsDelegate()
                         .launchProtectedContentHelpAndFeedbackActivity(getActivity());
-@@ -693,6 +707,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -660,6 +674,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         BrowserContextHandle browserContextHandle = getBrowserContextHandle();
         PrefService prefService = UserPrefs.get(browserContextHandle);
@@ -2357,7 +2300,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         if (BINARY_RADIO_BUTTON_KEY.equals(preference.getKey())
                 || BINARY_TOGGLE_KEY.equals(preference.getKey())) {
             assert !mCategory.isManaged();
-@@ -867,7 +886,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -834,7 +853,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                         ? R.string.website_settings_add_site_description_javascript_optimizer_block
                         : R.string.website_settings_add_site_description_javascript_optimizer_allow;
         }
@@ -2366,7 +2309,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
     }
 
     // OnPreferenceClickListener:
-@@ -985,17 +1004,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -952,17 +971,15 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                 break;
         }
 
@@ -2387,7 +2330,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             String exceptionDialogMessage =
                     exceptionDialogMessageResourceId != 0
                             ? getString(exceptionDialogMessageResourceId)
-@@ -1006,7 +1023,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -973,7 +990,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
                                     getStyledContext(),
                                     ADD_EXCEPTION_KEY,
                                     exceptionDialogMessage,
@@ -2396,7 +2339,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                                     mCategory,
                                     this));
 
-@@ -1190,8 +1207,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1149,8 +1166,16 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
     private boolean isBlocked() {
         switch (mGlobalToggleLayout) {
             case GlobalToggleLayout.TRI_STATE_TOGGLE:
@@ -2411,9 +2354,9 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                         getPreferenceScreen().findPreference(TRI_STATE_TOGGLE_KEY);
 +                if (triStateToggle == null) return true;
                 return (triStateToggle.getCheckedSetting() == ContentSetting.BLOCK);
-             case GlobalToggleLayout.TRI_STATE_COOKIE_TOGGLE:
-                 TriStateCookieSettingsPreference triStateCookieToggle =
-@@ -1348,7 +1373,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+             case GlobalToggleLayout.COOKIE_TOGGLE:
+                 CookieSettingsPreference cookieToggle =
+@@ -1310,7 +1335,11 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
         } else if (res_id != -1) {
             infoText.setSummary(res_id);
         } else {
@@ -2426,7 +2369,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         }
 
         // Hide the anti-abuse text preferences, as needed.
-@@ -1387,6 +1416,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1346,6 +1375,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
         } else {
             screen.removePreference(mLocationTriStatePref);
         }
@@ -2434,15 +2377,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 
         maybeShowReasonToggleDisabled(screen);
 
-@@ -1595,6 +1625,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
-             iconIds = ContentSettingsResources.getTriStateSettingIconIDs(contentType);
-         }
+@@ -1512,6 +1542,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+                 ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
+         int[] iconIds = ContentSettingsResources.getTriStateSettingIconIDs(contentType);
         triStateToggle.initialize(
 +                contentType,
                 setting,
                 descriptionIds,
                 iconIds,
-@@ -1906,6 +1937,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
+@@ -1822,6 +1853,14 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment
             setLocationAccessEnabled.accept(allowButton.isChecked());
         }
 
@@ -2507,7 +2450,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         boolean isOneTime = isOneTime(type);
         if (type == ContentSettingsType.GEOLOCATION_WITH_OPTIONS && !isOneTime) {
             return createTwoActionLocationSwitchPreference();
-@@ -1345,7 +1360,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1351,7 +1366,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
             value = ContentSetting.BLOCK;
         }
 
@@ -2523,7 +2466,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
         setUpPreferenceCommon(preference, value);
         preference.setOnPreferenceChangeListener(this);
 
-@@ -1395,10 +1417,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1401,10 +1423,14 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
                 oneTimePreference.setBackgroundColor(mHighlightColor);
             }
         } else {
@@ -2542,7 +2485,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
                         AppCompatResources.getColorStateList(getContext(), mHighlightColor)
                                 .getDefaultColor());
             }
-@@ -1704,7 +1730,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
+@@ -1710,7 +1736,13 @@ public class SingleWebsiteSettings extends BaseSiteSettingsFragment
         if (newValue instanceof Boolean) {
             permission = (Boolean) newValue ? getEnabledValue(type) : ContentSetting.BLOCK;
         } else {
@@ -2706,7 +2649,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
-@@ -188,6 +188,8 @@ public interface SiteSettingsDelegate {
+@@ -183,6 +183,8 @@ public interface SiteSettingsDelegate {
      */
     String getRelatedWebsiteSetOwner(String memberOrigin);
 
@@ -2726,15 +2669,15 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 
 /** A 3-state Allowed/Ask/Blocked radio group Preference used for SiteSettings. */
 @NullMarked
-@@ -30,6 +31,7 @@ public class TriStateSiteSettingsPreference extends Preference
+@@ -29,6 +30,7 @@ public class TriStateSiteSettingsPreference extends Preference
+     private RadioButtonWithDescription mBlocked;
     private RadioGroup mRadioGroup;
-     private boolean mIsPermissionSiteSettingsRadioButtonFeatureEnabled;
     private int mIconMarginEnd;
 +    private @ContentSettingsType.EnumType int mContentType;
 
     public TriStateSiteSettingsPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-@@ -50,11 +52,13 @@ public class TriStateSiteSettingsPreference extends Preference
+@@ -49,10 +51,12 @@ public class TriStateSiteSettingsPreference extends Preference
      *     Blocked states, in that order.
      */
     public void initialize(
@@ -2742,13 +2685,12 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
             @ContentSetting int setting,
             int @Nullable [] descriptionIds,
             int @Nullable [] iconIds,
-             boolean isPermissionSiteSettingsRadioButtonFeatureEnabled,
             int iconMarginEnd) {
 +        mContentType = contentType;
         mSetting = setting;
         mDescriptionIds = descriptionIds;
         mIconIds = iconIds;
-@@ -94,6 +98,13 @@ public class TriStateSiteSettingsPreference extends Preference
+@@ -90,6 +94,13 @@ public class TriStateSiteSettingsPreference extends Preference
         mRadioGroup = (RadioGroup) holder.findViewById(R.id.radio_button_layout);
         mRadioGroup.setOnCheckedChangeListener(this);
 
@@ -2760,8 +2702,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 +            mBlocked.setPrimaryText(getContext().getText(mDescriptionIds[2]));
 +        } else
         if (mDescriptionIds != null) {
-             if (mIsPermissionSiteSettingsRadioButtonFeatureEnabled) {
-                 mAllowed.setPrimaryText(getContext().getText(mDescriptionIds[0]));
+             mAllowed.setPrimaryText(getContext().getText(mDescriptionIds[0]));
+             mAsk.setPrimaryText(getContext().getText(mDescriptionIds[1]));
 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
@@ -2793,16 +2735,16 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
 diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
 +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/WebsitePreferenceBridge.java
-@@ -318,7 +318,7 @@ public class WebsitePreferenceBridge {
-             case ContentSettingsType.PROTECTED_MEDIA_IDENTIFIER:
-                 return true;
+@@ -328,7 +328,7 @@ public class WebsitePreferenceBridge {
+                 return DeviceFeatureMap.isEnabled(
+                         DeviceFeatureList.SENSORS_ALLOW_ASK_BLOCK_PERMISSION_MODEL);
             default:
 -                return false;
 +                return BromiteCustomContentSettingImpl.requiresTriStateContentSetting(contentSettingsType);
         }
     }
 
-@@ -334,7 +334,6 @@ public class WebsitePreferenceBridge {
+@@ -344,7 +344,6 @@ public class WebsitePreferenceBridge {
     public static boolean isCategoryEnabled(
             BrowserContextHandle browserContextHandle,
             @ContentSettingsType.EnumType int contentSettingsType) {
@@ -2889,7 +2831,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
 diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
 --- a/components/content_settings/core/browser/BUILD.gn
 +++ b/components/content_settings/core/browser/BUILD.gn
-@@ -81,6 +81,8 @@ static_library("browser") {
+@@ -85,6 +85,8 @@ static_library("browser") {
 
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
@@ -2898,7 +2840,7 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/cont
   # TODO(crbug.com/40145057): remove deprecated RWS and this include.
   # Allow access to /components/privacy_sandbox/privacy_sandbox_prefs.h
   # from /chrome/browser/ui/page_info/page_info_unittest.cc
-@@ -89,6 +91,11 @@ static_library("browser") {
+@@ -93,6 +95,11 @@ static_library("browser") {
   public_deps += [ "//components/privacy_sandbox:privacy_sandbox_prefs" ]
 }
 
@@ -2927,7 +2869,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 
 namespace content_settings {
 
-@@ -869,6 +870,7 @@ void ContentSettingsRegistry::Init() {
+@@ -842,6 +843,7 @@ void ContentSettingsRegistry::Init() {
            WebsiteSettingsRegistry::PLATFORM_CHROMEOS,
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
@@ -2938,7 +2880,7 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
 diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc
 --- a/components/content_settings/core/browser/content_settings_uma_util.cc
 +++ b/components/content_settings/core/browser/content_settings_uma_util.cc
-@@ -228,11 +228,7 @@ void RecordContentSettingsHistogram(const std::string& name,
+@@ -230,11 +230,7 @@ void RecordContentSettingsHistogram(const std::string& name,
 }
 
 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
@@ -3187,7 +3129,7 @@ diff --git a/components/content_settings/core/common/content_settings.h b/compon
 diff --git a/components/content_settings/core/common/content_settings.mojom b/components/content_settings/core/common/content_settings.mojom
 --- a/components/content_settings/core/common/content_settings.mojom
 +++ b/components/content_settings/core/common/content_settings.mojom
-@@ -73,6 +73,11 @@ struct RuleMetaData {
+@@ -74,6 +74,11 @@ struct RuleMetaData {
   mojo_base.mojom.Value rule_options;
 };
 
@@ -3199,7 +3141,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 // This mirrors the C++ type in content_settings.h.
 struct ContentSettingPatternSource {
   ContentSettingsPattern primary_pattern;
-@@ -86,5 +91,6 @@ struct ContentSettingPatternSource {
+@@ -87,5 +92,6 @@ struct ContentSettingPatternSource {
 // This mirrors the C++ type in content_settings.h.
 // TODO(crbug.com/40282541): This should be removed.
 struct RendererContentSettingRules {
@@ -3209,7 +3151,7 @@ diff --git a/components/content_settings/core/common/content_settings.mojom b/co
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.cc b/components/content_settings/core/common/content_settings_mojom_traits.cc
 --- a/components/content_settings/core/common/content_settings_mojom_traits.cc
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.cc
-@@ -115,12 +115,22 @@ bool StructTraits<content_settings::mojom::ContentSettingPatternSourceDataView,
+@@ -114,12 +114,22 @@ bool StructTraits<content_settings::mojom::ContentSettingPatternSourceDataView,
          data.ReadMetadata(&out->metadata) && data.ReadSource(&out->source);
 }
 
@@ -3236,7 +3178,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_mojom_traits.h b/components/content_settings/core/common/content_settings_mojom_traits.h
 --- a/components/content_settings/core/common/content_settings_mojom_traits.h
 +++ b/components/content_settings/core/common/content_settings_mojom_traits.h
-@@ -181,10 +181,34 @@ struct StructTraits<
+@@ -186,10 +186,34 @@ struct StructTraits<
       ContentSettingPatternSource* out);
 };
 
@@ -3274,7 +3216,7 @@ diff --git a/components/content_settings/core/common/content_settings_mojom_trai
 diff --git a/components/content_settings/core/common/content_settings_types.mojom b/components/content_settings/core/common/content_settings_types.mojom
 --- a/components/content_settings/core/common/content_settings_types.mojom
 +++ b/components/content_settings/core/common/content_settings_types.mojom
-@@ -496,5 +496,7 @@ enum ContentSettingsType {
+@@ -487,5 +487,7 @@ enum ContentSettingsType {
   // when suspicious warning is shown. If the user has selected this, the
   // notification permission will not be revoked based on suspicious verdict.
   SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL,
@@ -3421,16 +3363,16 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
 +#include "components/content_settings/core/browser/website_settings_registry.h"
 #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/features.h"
-@@ -213,6 +214,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
-     }
+ #include "components/content_settings/core/common/content_settings_utils.h"
+@@ -211,6 +212,15 @@ void PageInfoControllerAndroid::SetPermissionInfo(
   }
+   permissions_to_display.push_back(ContentSettingsType::SENSORS);
 
 +  content_settings::WebsiteSettingsRegistry* website_settings =
 +      content_settings::WebsiteSettingsRegistry::GetInstance();
 +  for (const content_settings::WebsiteSettingsInfo* info : *website_settings) {
 +    if (info->show_into_info_page() &&
-+          !base::Contains(permissions_to_display, info->type())) {
+          !std::ranges::contains(permissions_to_display, info->type())) {
 +       permissions_to_display.push_back(info->type());
 +    }
 +  }
@@ -3438,7 +3380,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
   std::map<ContentSettingsType, /*allowed*/ bool>
       user_specified_settings_to_display;
 
-@@ -291,6 +301,14 @@ std::optional<PermissionSetting> PageInfoControllerAndroid::GetSettingToDisplay(
+@@ -289,6 +299,14 @@ std::optional<PermissionSetting> PageInfoControllerAndroid::GetSettingToDisplay(
     return permission.setting;
   }
 
@@ -3464,7 +3406,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
 #include "components/content_settings/browser/ui/cookie_controls_controller.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/content_settings_uma_util.h"
-@@ -1393,6 +1394,14 @@ bool PageInfo::ShouldShowPermission(
+@@ -1411,6 +1412,14 @@ bool PageInfo::ShouldShowPermission(
   }
 #endif  // BUILDFLAG(IS_ANDROID)
 
@@ -3479,7 +3421,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
   // Note |ContentSettingsType::ADS| will show up regardless of its default
   // value when it has been activated on the current origin.
   if (info.type == ContentSettingsType::ADS) {
-@@ -1516,7 +1525,19 @@ void PageInfo::PresentSitePermissions() {
+@@ -1559,7 +1568,19 @@ void PageInfo::PresentSitePermissions() {
 
   HostContentSettingsMap* content_settings = GetContentSettings();
   DCHECK(web_contents_);
@@ -3492,7 +3434,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
 +      content_settings::WebsiteSettingsRegistry::GetInstance();
 +  for (const content_settings::WebsiteSettingsInfo* info : *website_settings) {
 +    if (info->show_into_info_page() &&
-+          !base::Contains(permission_list, info->type())) {
+          !std::ranges::contains(permission_list, info->type())) {
 +      permission_list.push_back(info->type());
 +    }
 +  }
@@ -3511,7 +3453,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
 #include "components/page_info/core/features.h"
 #include "components/page_info/page_info.h"
 #include "components/page_info/page_info_ui.h"
-@@ -256,6 +257,13 @@ void CreateOppositeToDefaultSiteException(
+@@ -258,6 +259,13 @@ void CreateOppositeToDefaultSiteException(
 std::u16string GetPermissionAskStateString(ContentSettingsType type) {
   int message_id = kInvalidResourceID;
 
@@ -3525,7 +3467,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
   switch (type) {
     case ContentSettingsType::GEOLOCATION:
       message_id = IDS_PAGE_INFO_STATE_TEXT_LOCATION_ASK;
-@@ -560,6 +568,12 @@ PageInfoUI::~PageInfoUI() = default;
+@@ -568,6 +576,12 @@ PageInfoUI::~PageInfoUI() = default;
 
 // static
 std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -3538,7 +3480,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
   for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
     if (info.type == type)
       return l10n_util::GetStringUTF16(info.string_id);
-@@ -570,6 +584,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
+@@ -578,6 +592,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
 // static
 std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
     ContentSettingsType type) {
@@ -3551,7 +3493,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
   for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
     if (info.type == type)
       return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
-@@ -963,6 +983,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
+@@ -971,6 +991,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
     if (info.type == type)
       return true;
   }
@@ -3640,7 +3582,7 @@ diff --git a/third_party/blink/renderer/core/execution_context/execution_context
 #include "third_party/blink/renderer/bindings/core/v8/sanitize_script_errors.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/execution_context/security_context.h"
-@@ -97,6 +98,10 @@ class SecurityOrigin;
+@@ -98,6 +99,10 @@ class SecurityOrigin;
 class ScriptState;
 class ScriptWrappable;
 class TrustedTypePolicyFactory;
@@ -8,17 +8,17 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 chrome/android/chrome_java_resources.gni      |   2 +-
 .../android/java/res/xml/main_preferences.xml |   4 +-
- .../res/xml/privacy_preferences_cromite.xml   | 191 ++++++++++++++++++
+ .../res/xml/privacy_preferences_cromite.xml   | 196 ++++++++++++++++++
 .../privacy/settings/PrivacySettings.java     |   6 +-
 .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 213 insertions(+), 5 deletions(-)
+ 5 files changed, 218 insertions(+), 5 deletions(-)
 create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp

 diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
 --- a/chrome/android/chrome_java_resources.gni
 +++ b/chrome/android/chrome_java_resources.gni
-@@ -658,7 +658,7 @@ chrome_java_resources = [
+@@ -675,7 +675,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",
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
         android:order="1001"
         android:title="@string/prefs_section_account_and_google_services"/>
     <org.chromium.chrome.browser.sync.settings.SignInPreference
-@@ -25,7 +25,7 @@ found in the LICENSE file.
+@@ -24,7 +24,7 @@ found in the LICENSE file.
         android:layout="@layout/account_management_account_row"
         android:title="@string/sync_category_title"/>
     <org.chromium.components.browser_ui.settings.ChromeBasePreference
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
-@@ -0,0 +1,191 @@
+@@ -0,0 +1,196 @@
 +<?xml version="1.0" encoding="utf-8"?><!--
 +Copyright 2022 The Chromium Authors
 +Use of this source code is governed by a BSD-style license that can be
@@ -178,6 +178,11 @@ new file mode 100644
 +        android:key="secure_dns"
 +        android:title="@string/settings_secure_dns_title"
 +        android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:title="@string/dangling_pointer_detector_title"
+        android:summary="@string/dangling_pointer_detector_summary"
+        app:featureName="enable-dangling-pointer-detector"
+        app:needRestart="true" />
 +
 +    <PreferenceCategory
 +        android:title="@string/services_category_title"/>
@@ -247,7 +252,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
-@@ -191,7 +191,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -204,7 +204,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
     public void onCreatePreferencesCromite(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
         mPageTitle.set(getString(R.string.prefs_privacy_security));
 
@@ -256,7 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
 
         Preference sandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
         // Overwrite the click listener to pass a correct referrer to the fragment.
-@@ -274,7 +274,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -291,7 +291,9 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
 
         ChromeSwitchPreference passwordLeakTogglePref =
                 (ChromeSwitchPreference) findPreference(PREF_PASSWORD_LEAK_DETECTION);
@@ -4,6 +4,7 @@ Subject: Cromite Branding

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
+ base/win/message_window.cc                    |   2 +-
 build/BUILD.gn                                |   8 ++
 build/config/BUILDCONFIG.gn                   |   4 +
 chrome/android/java/AndroidManifest.xml       |   2 +-
@@ -38,11 +39,13 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../theme/chromium/win/tiles/SmallLogo.png    | Bin 9784 -> 12363 bytes
 .../chromium/product_logo_32.png              | Bin 822 -> 2301 bytes
 chrome/browser/BUILD.gn                       |   1 +
+ .../external_registry_loader_win.cc           |   3 +-
 .../browser/hub/HubToolbarMediator.java       |   2 +-
- .../android/res/layout/hub_toolbar_layout.xml |  82 ++++++++-------
+ .../android/res/layout/hub_toolbar_layout.xml |  83 +++++++++-------
 .../chrome/browser/omaha/UpdateConfigs.java   |   2 +-
 chrome/browser/prefs/BUILD.gn                 |   1 +
 .../prefs/chrome_pref_service_factory.cc      |   6 +-
+ chrome/browser/process_singleton_win.cc       |   2 +-
 .../profiles/profile_shortcut_manager_win.cc  |   2 +-
 .../settings/settings_menu/settings_menu.html |  14 ++-
 .../tab_group_sync/TabGroupSyncUtils.java     |   5 +-
@@ -50,7 +53,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../strings/android_chrome_strings.grd        |   4 +-
 .../toolbar/chrome_labs/chrome_labs_utils.cc  |   1 +
 chrome/common/url_constants.h                 |   4 +-
- .../install_static/chromium_install_modes.cc  |   2 +-
+ .../install_static/chromium_install_modes.h   |   2 +-
 .../strings/android/browser_ui_strings.grd    |   2 +-
 .../drawable-hdpi/fre_product_logo.png        | Bin 3912 -> 22295 bytes
 .../drawable-mdpi/fre_product_logo.png        | Bin 2490 -> 12171 bytes
@@ -60,18 +63,31 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/autocomplete_controller.cc        |   1 +
 .../vector_icons/product_chrome_refresh.icon  |  93 +++++++++---------
 components/policy/core/common/policy_paths.cc |   2 +-
+ .../policy/tools/generate_policy_source.py    |   2 +-
 .../chromium/product_logo.png                 | Bin 1562 -> 3577 bytes
 .../chromium/product_logo_white.png           | Bin 1417 -> 3040 bytes
 .../chromium/product_logo.png                 | Bin 2714 -> 7923 bytes
 .../chromium/product_logo_white.png           | Bin 2512 -> 6790 bytes
 .../webui/version/resources/about_version.ts  |   4 +-
- .../resources/about_version_mobile.css        |   9 ++
+ .../resources/about_version_mobile.css        |  10 ++
 content/child/runtime_features.cc             |  44 ++++-----
 .../Cromite-Branding.inc                      |   1 +
 tools/grit/grit/grd_reader.py                 |  35 +++++++
- 65 files changed, 266 insertions(+), 174 deletions(-)
+ 69 files changed, 272 insertions(+), 179 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc

+diff --git a/base/win/message_window.cc b/base/win/message_window.cc
+--- a/base/win/message_window.cc
+++ b/base/win/message_window.cc
+@@ -29,7 +29,7 @@
+ // To avoid conflicts with the macro from the Windows SDK...
+ #undef FindWindow
+ 
+-const wchar_t kMessageWindowClassName[] = L"Chrome_MessageWindow";
+const wchar_t kMessageWindowClassName[] = L"Cromite_MessageWindow";
+ 
+ namespace {
+ 
 diff --git a/build/BUILD.gn b/build/BUILD.gn
 --- a/build/BUILD.gn
 +++ b/build/BUILD.gn
@@ -107,7 +123,7 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -200,7 +200,7 @@ by a child template that "extends" this file.
+@@ -198,7 +198,7 @@ by a child template that "extends" this file.
       <application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
         android:icon="@drawable/ic_launcher"
         android:roundIcon="@drawable/ic_launcher_round"
@@ -139,7 +155,7 @@ diff --git a/chrome/android/java/res/xml/legal_information_preferences.xml b/chr
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -13,20 +13,20 @@ found in the LICENSE file.
+@@ -13,19 +13,19 @@ found in the LICENSE file.
         android:order="0" />
     <PreferenceCategory
         android:key="account_and_google_services_section"
@@ -148,9 +164,8 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
         android:title="@string/prefs_section_account_and_google_services"/>
     <org.chromium.chrome.browser.sync.settings.SignInPreference
         android:key="sign_in"
-        android:order="2"
-+        android:order="1002"
-         android:title="@string/sign_in_to_chrome"/>
+-        android:order="2"/>
+        android:order="1002"/>
     <org.chromium.components.browser_ui.settings.ChromeBasePreference
         android:key="manage_sync"
 -        android:order="3"
@@ -9148,7 +9163,7 @@ diff --git a/chrome/android/java/res_chromium_base/values/channel_constants.xml
 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
-@@ -485,8 +485,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
+@@ -502,8 +502,8 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
                     && !isEmptyUrl(mParams.getUrl())
                     && UrlUtilities.isAcceptedScheme(mParams.getUrl())) {
                 if (mMode == ContextMenuMode.NORMAL) {
@@ -9216,17 +9231,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/Br
 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
-@@ -913,12 +913,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -1065,12 +1065,12 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                                 if (tab.canGoBack()) {
                                     return ActionType.NAVIGATE_BACK;
                                 }
 -                                if (TabAssociatedApp.isOpenedFromExternalApp(tab)) {
 +                                if (TabAssociatedApp.isOpenedFromExternalApp(tab) && tab.getLaunchType() == TabLaunchType.FROM_EXTERNAL_APP) {
-                                     return ActionType.EXIT_APP;
+                                     return ActionType.EXIT_APP_AND_CLOSE_TAB;
                                 }
                                 return mBackButtonShouldCloseTabFn.apply(tab)
                                         ? ActionType.CLOSE_TAB
-                                        : ActionType.EXIT_APP;
+-                                        : ActionType.EXIT_APP_ONLY;
 +                                        : ActionType.CLOSE_TAB;
                             }
 
@@ -9234,7 +9249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.grdp
 --- a/chrome/app/extensions_strings.grdp
 +++ b/chrome/app/extensions_strings.grdp
-@@ -404,7 +404,7 @@
+@@ -395,7 +395,7 @@
     No recent activities
   </message>
   <message name="IDS_EXTENSIONS_NO_INSTALLED_ITEMS" desc="The message shown to the user on the Extensions settings page when there are no extensions or apps installed.">
@@ -9243,7 +9258,7 @@ diff --git a/chrome/app/extensions_strings.grdp b/chrome/app/extensions_strings.
   </message>
   <message name="IDS_EXTENSIONS_NO_DESCRIPTION" desc="The message shown to the user when an extension does not have any description.">
     No description provided
-@@ -542,7 +542,7 @@
+@@ -533,7 +533,7 @@
     My extensions
   </message>
   <message name="IDS_EXTENSIONS_SIDEBAR_DISCOVER_MORE" desc="The text displayed in the sidebar of the chrome://extensions page to open the Chrome Web Store to get more extensions.">
@@ -13209,7 +13224,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
-@@ -1784,6 +1784,7 @@ static_library("browser") {
+@@ -1406,6 +1406,7 @@ static_library("browser") {
     "//build/config/chromebox_for_meetings:buildflags",
     "//build/config/compiler:compiler_buildflags",
     "//build/config/linux/dbus:buildflags",
@@ -13217,22 +13232,42 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
     "//cc",
     "//chrome:extra_resources",
     "//chrome:resources",
+diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
+--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
+@@ -35,7 +35,7 @@ using content::BrowserThread;
+ namespace {
+ 
+ // The Registry subkey that contains information about external extensions.
+-const wchar_t kRegistryExtensions[] = L"Software\\Google\\Chrome\\Extensions";
+const wchar_t kRegistryExtensions[] = L"Software\\Uazo\\Cromite\\Extensions";
+ 
+ // Registry value of the key that defines the installation parameter.
+ const wchar_t kRegistryExtensionInstallParam[] = L"install_parameter";
+@@ -82,6 +82,7 @@ void ExternalRegistryLoader::StartLoading() {
+ 
+ base::DictValue ExternalRegistryLoader::LoadPrefsOnBlockingThread() {
+   base::DictValue prefs;
+  if ((true)) return prefs;
+ 
+   // A map of IDs, to weed out duplicates between HKCU and HKLM.
+   std::set<std::wstring> keys;
 diff --git a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
 --- a/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
 +++ b/chrome/browser/hub/internal/android/java/src/org/chromium/chrome/browser/hub/HubToolbarMediator.java
-@@ -84,7 +84,7 @@ public class HubToolbarMediator {
+@@ -86,7 +86,7 @@ public class HubToolbarMediator {
                 @Override
                 public void onConfigurationChanged(Configuration configuration) {
                     int screenWidthDp = configuration.screenWidthDp;
 -                    boolean isTablet = HubUtils.isScreenWidthTablet(screenWidthDp);
 +                    boolean isTablet = true; //HubUtils.isScreenWidthTablet(screenWidthDp);
-                     mPropertyModel.set(BACK_BUTTON_VISIBLE, isTablet);
 
                     Pane pane = mPaneManager.getFocusedPaneSupplier().get();
+                     if (pane == null) return;
 diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
 --- a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
 +++ b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml
-@@ -38,33 +38,22 @@ found in the LICENSE file.
+@@ -38,34 +38,22 @@ found in the LICENSE file.
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start|center_vertical">
@@ -13240,11 +13275,12 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x
 +            android:layout_width="@dimen/hub_toolbar_action_button_start_margin"
 +            android:layout_height="match_parent"/>
 
+-        <!-- This is needed to keep the new tab button aligned with the first tab. -->
 -        <Space
 -          android:id="@+id/margin_spacer"
 -          android:layout_width="@dimen/hub_toolbar_action_button_start_margin"
 -          android:layout_height="match_parent"
-          android:visibility="gone"/>
+-          android:visibility="visible"/>
 -
 -        <org.chromium.ui.widget.ChromeImageButton
 -          android:id="@+id/toolbar_back_button"
@@ -13281,7 +13317,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x
       </LinearLayout>
 
       <FrameLayout
-@@ -96,18 +85,39 @@ found in the LICENSE file.
+@@ -97,18 +85,39 @@ found in the LICENSE file.
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="end" >
@@ -13346,7 +13382,7 @@ diff --git a/chrome/browser/omaha/android/java/src/org/chromium/chrome/browser/o
 diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 --- a/chrome/browser/prefs/BUILD.gn
 +++ b/chrome/browser/prefs/BUILD.gn
-@@ -59,6 +59,7 @@ source_set("impl") {
+@@ -60,6 +60,7 @@ source_set("impl") {
   deps = [
     ":prefs",
     ":util",
@@ -13357,7 +13393,7 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn
 diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
 +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
 #include "base/trace_event/trace_event.h"
 #include "build/branding_buildflags.h"
 #include "build/build_config.h"
@@ -13365,7 +13401,7 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enterprise/signin/enterprise_signin_prefs.h"
 #include "chrome/browser/policy/chrome_browser_policy_connector.h"
-@@ -294,10 +295,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
+@@ -292,10 +293,7 @@ std::unique_ptr<ProfilePrefStoreManager> CreateProfilePrefStoreManager(
     const base::FilePath& profile_path) {
   std::string seed;
   CHECK(ui::ResourceBundle::HasSharedInstance());
@@ -13377,10 +13413,22 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browse
   return std::make_unique<ProfilePrefStoreManager>(profile_path, seed);
 }
 
+diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
+--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
+@@ -381,7 +381,7 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
+ bool ProcessSingleton::Create() {
+   TRACE_EVENT0("startup", "ProcessSingleton::Create");
+ 
+-  static const wchar_t kMutexName[] = L"Local\\ChromeProcessSingletonStartup!";
+  static const wchar_t kMutexName[] = L"Local\\CromiteProcessSingletonStartup!";
+ 
+   remote_window_ = FindRunningChromeWindow(user_data_dir_);
+   if (!remote_window_ && !EscapeVirtualization(user_data_dir_)) {
 diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc
 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc
 +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
-@@ -79,7 +79,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
+@@ -78,7 +78,7 @@ const int kMaxProfileShortcutFileNameLength = 64;
 // Incrementing this number will cause profile icons to be regenerated on
 // profile startup (it should be incremented whenever the product/avatar icons
 // change, etc).
@@ -13411,7 +13459,7 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
       #menu {
         color: var(--google-grey-700);
         display: flex;
-@@ -177,7 +189,7 @@
+@@ -167,7 +179,7 @@
         </a>
         <a role="menuitem" id="about-menu" href="/help"
             class="cr-nav-menu-item">
@@ -13446,7 +13494,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.chrome.browser.omnibox.OmniboxMetrics;
 import org.chromium.chrome.browser.omnibox.R;
-@@ -112,8 +113,11 @@ public class OmniboxSuggestionsContainer extends FrameLayout {
+@@ -109,8 +110,11 @@ public class OmniboxSuggestionsContainer extends FrameLayout {
         // Omnibox.
         // Making the container `clickable=true` achieves similar goal, but this consumes all
         // activators, including keyboard <Enter> key.
@@ -13459,11 +13507,11 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +        return false;
     }
 
-     private void maybeUpdateLayoutParams(int topMargin) {
+     /**
 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
-@@ -2378,7 +2378,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -2509,7 +2509,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">
@@ -13472,7 +13520,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
       </message>
       <message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
         Application version
-@@ -5868,7 +5868,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
+@@ -6030,7 +6030,7 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d
 
       <!-- Storage Preference UI strings for clearing storage. -->
       <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Chrome's Manage Space Activity.">
@@ -13484,7 +13532,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 --- a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
 +++ b/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc
-@@ -140,6 +140,7 @@ bool AreNewChromeLabsExperimentsAvailable(Profile* profile) {
+@@ -139,6 +139,7 @@ bool AreNewChromeLabsExperimentsAvailable(Profile* profile) {
 }
 
 bool IsChromeLabsEnabled() {
@@ -13495,7 +13543,7 @@ diff --git a/chrome/browser/ui/toolbar/chrome_labs/chrome_labs_utils.cc b/chrome
 diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 --- a/chrome/common/url_constants.h
 +++ b/chrome/common/url_constants.h
-@@ -135,7 +135,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
+@@ -117,7 +117,7 @@ inline constexpr char kChromeHelpViaMenuURL[] =
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
 inline constexpr char kChromeHelpViaWebUIURL[] =
@@ -13504,31 +13552,31 @@ diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
 #if BUILDFLAG(IS_CHROMEOS)
 inline constexpr char kChromeOsHelpViaWebUIURL[] =
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -193,7 +193,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
+@@ -175,7 +175,7 @@ inline constexpr char kChromeUIUntrustedNewTabPageUrl[] =
     "chrome-untrusted://new-tab-page/";
 
 // The URL for the Chromium project used in the About dialog.
 -inline constexpr char16_t kChromiumProjectURL[] = u"https://www.chromium.org/";
 +inline constexpr char16_t kChromiumProjectURL[] = u"https://www.cromite.org/";
+ #if BUILDFLAG(IS_CHROMEOS)
+ static_assert(std::u16string_view(kChromiumProjectURL) ==
+               ash::chrome_external_urls::kChromiumProjectURL);
+diff --git a/chrome/install_static/chromium_install_modes.h b/chrome/install_static/chromium_install_modes.h
+--- a/chrome/install_static/chromium_install_modes.h
+++ b/chrome/install_static/chromium_install_modes.h
+@@ -21,7 +21,7 @@ inline constexpr wchar_t kCompanyPathName[] = L"";
 
- #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
- // The URL for the "Clear browsing data in Chrome" help center article.
-diff --git a/chrome/install_static/chromium_install_modes.cc b/chrome/install_static/chromium_install_modes.cc
--- a/chrome/install_static/chromium_install_modes.cc
-+++ b/chrome/install_static/chromium_install_modes.cc
-@@ -14,7 +14,7 @@ namespace install_static {
- 
- const wchar_t kCompanyPathName[] = L"";
- 
-const wchar_t kProductPathName[] = L"Chromium";
-+const wchar_t kProductPathName[] = L"Cromite";
- 
- const size_t kProductPathNameLength = _countof(kProductPathName) - 1;
+ // The brand-specific product name to be included as a component of the install
+ // and user data directory paths.
+-inline constexpr wchar_t kProductPathName[] = L"Chromium";
+inline constexpr wchar_t kProductPathName[] = L"Cromite";
 
+ // The brand-specific safe browsing client name.
+ inline constexpr char kSafeBrowsingName[] = "chromium";
 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
-@@ -994,7 +994,7 @@
+@@ -997,7 +997,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]">
@@ -18436,7 +18484,7 @@ i?Ib$(ofrX17!1R|`h|N%TnD<%35@j2bgPM^i2nno*_EOI
 diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
 --- a/components/omnibox/browser/autocomplete_controller.cc
 +++ b/components/omnibox/browser/autocomplete_controller.cc
-@@ -1105,6 +1105,7 @@ bool AutocompleteController::ShouldRunProvider(
+@@ -1158,6 +1158,7 @@ bool AutocompleteController::ShouldRunProvider(
 
 #if BUILDFLAG(IS_ANDROID)
   if (omnibox::IsAndroidHub(input_.current_page_classification())) {
@@ -18557,6 +18605,18 @@ diff --git a/components/policy/core/common/policy_paths.cc b/components/policy/c
 #endif  // BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
 
+diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
+--- a/components/policy/tools/generate_policy_source.py
+++ b/components/policy/tools/generate_policy_source.py
+@@ -28,7 +28,7 @@ from xml.sax.saxutils import escape as xml_escape
+ 
+ CHROME_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Google\\\\Chrome'
+ CHROME_FOR_TESTING_POLICY_KEY = CHROME_POLICY_KEY + ' for Testing'
+-CHROMIUM_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Chromium'
+CHROMIUM_POLICY_KEY = 'SOFTWARE\\\\Policies\\\\Cromite'
+ PLATFORM_STRINGS = {
+     'chrome_frame': ['win'],
+     'chrome_os': ['chrome_os'],
 diff --git a/components/resources/default_100_percent/chromium/product_logo.png b/components/resources/default_100_percent/chromium/product_logo.png
 index 7b60bd8c6053346e4eb265cc77d28add65103028..66b3c4c7a4f68fba1ef098000bd373ba103a0de0 100644
 GIT binary patch
@@ -19175,18 +19235,19 @@ diff --git a/components/webui/version/resources/about_version.ts b/components/we
   chrome.send('requestVersionInfo');
 -  const includeVariationsCmd = location.search.includes('show-variations-cmd');
 +  const includeVariationsCmd = true;
-   sendWithPromise('requestVariationInfo', includeVariationsCmd)
+   sendWithPromise<{variationsList: string[], variationsCmd: string}>(
+       'requestVariationInfo', includeVariationsCmd)
       .then(handleVariationInfo);
-   sendWithPromise('requestPathInfo').then(handlePathInfo);
 diff --git a/components/webui/version/resources/about_version_mobile.css b/components/webui/version/resources/about_version_mobile.css
 --- a/components/webui/version/resources/about_version_mobile.css
 +++ b/components/webui/version/resources/about_version_mobile.css
-@@ -17,3 +17,12 @@
+@@ -17,3 +17,13 @@
   margin-left: auto;
   margin-right: auto;
 }
 +
-+tr, td {
+tr,
+td {
 +  display: block;
 +  text-align: left !important;
 +}
@@ -19197,7 +19258,7 @@ diff --git a/components/webui/version/resources/about_version_mobile.css b/compo
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -576,19 +576,22 @@ void ResolveInvalidConfigurations() {
+@@ -552,19 +552,22 @@ void ResolveInvalidConfigurations() {
        base::FeatureList::IsEnabled(
            features::kPrivacySandboxAdsAPIsM1Override)) &&
       !base::FeatureList::IsEnabled(blink::features::kFencedFrames)) {
@@ -19224,7 +19285,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "Fenced frames must be enabled in order to enable local "
            "unpartitioned "
         << "data access. Use --" << switches::kEnableFeatures << "="
-@@ -596,12 +599,14 @@ void ResolveInvalidConfigurations() {
+@@ -572,12 +575,14 @@ void ResolveInvalidConfigurations() {
     WebRuntimeFeatures::EnableFeatureFromString(
         "FencedFramesLocalUnpartitionedDataAccess", false);
   }
@@ -19240,7 +19301,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "Topics cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
         << network::features::kBrowsingTopics.name << " in addition.";
-@@ -609,30 +614,23 @@ void ResolveInvalidConfigurations() {
+@@ -585,30 +590,23 @@ void ResolveInvalidConfigurations() {
     WebRuntimeFeatures::EnableTopicsDocumentAPI(false);
     WebRuntimeFeatures::EnableTopicsImgAPI(false);
   } else {
@@ -19277,7 +19338,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
         << "AttributionReporting cannot be enabled in this "
            "configuration. Use --"
         << switches::kEnableFeatures << "="
-@@ -640,23 +638,25 @@ void ResolveInvalidConfigurations() {
+@@ -616,23 +614,25 @@ void ResolveInvalidConfigurations() {
         << " in addition.";
     WebRuntimeFeatures::EnableAttributionReporting(false);
   }
@@ -19298,21 +19359,21 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 +    CHECK(false) << "kInterestGroupStorage is enabled!";
   }
 
-   // PermissionElement cannot be enabled without the support of the
+   // UserMediaElement cannot be enabled without the support of the
   // browser process.
-   if (!base::FeatureList::IsEnabled(blink::features::kPermissionElement)) {
+   if (!base::FeatureList::IsEnabled(blink::features::kUserMediaElement)) {
 -    LOG_IF(WARNING,
-           WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
-+    CHECK(!WebRuntimeFeatures::IsPermissionElementEnabledByRuntimeFlag())
-         << "PermissionElement cannot be enabled in this configuration. Use --"
+-           WebRuntimeFeatures::IsUserMediaElementEnabledByRuntimeFlag())
+    CHECK(!WebRuntimeFeatures::IsUserMediaElementEnabledByRuntimeFlag())
+         << "UserMediaElement cannot be enabled in this configuration. Use --"
         << switches::kEnableFeatures << "="
-         << blink::features::kPermissionElement.name << " instead.";
+         << blink::features::kUserMediaElement.name << " instead.";
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Cromite-Branding.inc
@@ -0,0 +1 @@
-+SET_CROMITE_FEATURE_ENABLED(kGridTabSwitcherUpdate);
+SET_CROMITE_FEATURE_DISABLED(kShowTabListAnimations);
 diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py
 --- a/tools/grit/grit/grd_reader.py
 +++ b/tools/grit/grit/grd_reader.py
@@ -11,7 +11,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/ChromeActionModeHandler.java      |  4 +-
 .../chrome/browser/ChromeTabbedActivity.java  | 15 +++-
 ...ActivityTabWebContentsDelegateAndroid.java | 10 ++-
- .../compositor/layouts/LayoutManagerImpl.java |  8 ++
+ .../compositor/layouts/LayoutManagerImpl.java |  9 ++-
 .../tab/TabContextMenuItemDelegate.java       |  7 +-
 .../chrome/browser/ui/RootUiCoordinator.java  |  8 +-
 .../Customize-selection-popup.grdp            | 34 +++++++++
@@ -23,7 +23,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 .../browser/PendingSelectionMenu.java         |  8 +-
 .../browser/SelectionMenuItem.java            | 73 ++++++++++++-------
 .../SelectionActionMenuDelegate.java          | 32 +++++---
- 16 files changed, 194 insertions(+), 66 deletions(-)
+ 16 files changed, 194 insertions(+), 67 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Customize-selection-popup.grdp

 diff --git a/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java b/android_webview/java/src/org/chromium/android_webview/selection/SamsungSelectionActionMenuDelegate.java
@@ -81,7 +81,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
-@@ -888,10 +888,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+@@ -944,10 +944,17 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
                                 @TabLaunchType int type,
                                 @TabCreationState int creationState,
                                 boolean markedForSelection) {
@@ -106,7 +106,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activity_glue/ActivityTabWebContentsDelegateAndroid.java
-@@ -248,6 +248,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+@@ -253,6 +253,14 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
         // Skip opening a new Tab if it doesn't make sense.
         if (mTab.isClosing()) return false;
 
@@ -118,10 +118,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 +            tabLaunchType = TabLaunchType.FROM_LONGPRESS_BACKGROUND_IN_GROUP;
 +        }
 +
-         WindowAndroid window = mTab.getWindowAndroid();
-         boolean openingPopup =
-                 window != null
-@@ -300,7 +308,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
+         if (ChromeFeatureList.isEnabled(ChromeFeatureList.DOCUMENT_PICTURE_IN_PICTURE_API)
+                 && disposition == WindowOpenDisposition.NEW_PICTURE_IN_PICTURE) {
+             assertNonNull(pictureInPictureWindowOptions);
+@@ -270,7 +278,7 @@ public class ActivityTabWebContentsDelegateAndroid extends TabWebContentsDelegat
                         mTab,
                         /* shouldPin= */ false,
                         webContents,
@@ -133,32 +133,37 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/tab_activit
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerImpl.java
-@@ -18,6 +18,7 @@ import android.view.ViewGroup;
+@@ -20,6 +20,7 @@ import androidx.annotation.Px;
 import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Callback;
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.TraceEvent;
- import org.chromium.base.supplier.NonNullObservableSupplier;
-@@ -249,6 +250,13 @@ public class LayoutManagerImpl
-                                                 != TabLaunchType
-                                                         .FROM_COLLABORATION_BACKGROUND_IN_GROUP)
-                                 || (!getTabModelSelector().isIncognitoSelected() && incognito);
-+                boolean selectionPopupTabsForeground =
-+                            ContextUtils.getAppSharedPreferences().getBoolean(
-+                                "selection_popup_tabs_foreground", false);
-+                if (selectionPopupTabsForeground) {
-+                    willBeSelected = launchType != TabLaunchType.FROM_RESTORE_TABS_UI
-+                        || (!getTabModelSelector().isIncognitoSelected() && incognito);
-+                }
-                 float lastTapX = LocalizationUtils.isLayoutRtl() ? mHost.getWidth() * mPxToDp : 0.f;
-                 float lastTapY = 0.f;
-                 if (launchType != TabLaunchType.FROM_CHROME_UI) {
+ import org.chromium.base.supplier.MonotonicObservableSupplier;
+@@ -243,11 +244,17 @@ public class LayoutManagerImpl
+             boolean willBeSelected = willAddedTabBeSelected(launchType, incognito);
+             float lastTapX = LocalizationUtils.isLayoutRtl() ? mHost.getWidth() * mPxToDp : 0.f;
+             float lastTapY = 0.f;
+            boolean selectionPopupTabsForeground =
+                        ContextUtils.getAppSharedPreferences().getBoolean(
+                            "selection_popup_tabs_foreground", false);
+            if (selectionPopupTabsForeground) {
+                willBeSelected = launchType != TabLaunchType.FROM_RESTORE_TABS_UI
+                    || (!getTabModelSelector().isIncognitoSelected() && incognito);
+            }
+             if (launchType != TabLaunchType.FROM_CHROME_UI) {
+                 lastTapX = mPxToDp * mLastTapX;
+                 lastTapY = mPxToDp * mLastTapY;
+             }
+-
+             tabCreated(
+                     tabId,
+                     getTabModelSelector().getCurrentTabId(),
 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
-@@ -430,8 +430,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
+@@ -404,8 +404,13 @@ public class TabContextMenuItemDelegate implements ContextMenuItemDelegate {
     public void onOpenImageInNewTab(GURL url, @Nullable Referrer referrer) {
         LoadUrlParams loadUrlParams = new LoadUrlParams(url.getSpec());
         loadUrlParams.setReferrer(referrer);
@@ -176,15 +181,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
-@@ -36,6 +36,7 @@ import androidx.core.view.WindowInsetsCompat;
+@@ -34,6 +34,7 @@ import androidx.core.view.WindowInsetsCompat;
+ 
 import org.chromium.base.Callback;
 import org.chromium.base.CallbackController;
- import org.chromium.base.DeviceInfo;
 +import org.chromium.base.ContextUtils;
+ import org.chromium.base.DeviceInfo;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.lifetime.Destroyable;
- import org.chromium.base.metrics.RecordUserAction;
-@@ -1033,11 +1034,16 @@ public class RootUiCoordinator
+@@ -1083,11 +1084,16 @@ public class RootUiCoordinator
                     TrackerFactory.getTrackerForProfile(tab.getProfile())
                             .notifyEvent(EventConstants.WEB_SEARCH_PERFORMED);
 
@@ -265,7 +270,7 @@ diff --git a/components/android_autofill/browser/java/src/org/chromium/component
 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
-@@ -84,4 +84,28 @@ found in the LICENSE file.
+@@ -89,4 +89,28 @@ found in the LICENSE file.
         android:key="disable_toolbar_swipeup"
         android:title="@string/disable_toolbar_swipe_up" />
 
@@ -371,7 +376,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
                 .setIsEnabled(true)
@@ -412,7 +412,7 @@ public class SelectActionMenuHelper {
                 new SelectionMenuItem.Builder(android.R.string.paste_as_plain_text)
-                         .setId(R.id.select_action_menu_paste_as_plain_text)
+                         .setId(android.R.id.pasteAsPlainText)
                         .setGroupId(R.id.select_action_menu_default_items)
 -                        .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS)
 +                        .setOrderAndCategory(order, ItemGroupOffset.DEFAULT_ITEMS())
@@ -390,7 +395,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 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
-@@ -1115,7 +1115,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
+@@ -1149,7 +1149,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
 
     private boolean handleAssistMenuItemClick(int order) {
         // Primary assist action is always the first action in the list so offset by 1.
@@ -402,15 +407,15 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
 diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 --- a/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/selection/SmartSelectionClient.java
-@@ -18,6 +18,7 @@ import org.jni_zero.CalledByNative;
- import org.jni_zero.JNINamespace;
+@@ -19,6 +19,7 @@ import org.jni_zero.JNINamespace;
+ import org.jni_zero.JniType;
 import org.jni_zero.NativeMethods;
 
 +import org.chromium.base.ContextUtils;
 import org.chromium.base.ObserverList;
 import org.chromium.base.UserData;
 import org.chromium.build.annotations.Initializer;
-@@ -84,6 +85,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
+@@ -81,6 +82,9 @@ public class SmartSelectionClient implements SelectionClient, UserData {
             return null;
         }
 
@@ -10,9 +10,10 @@ 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  | 14 ++++++++---
- .../chrome/browser/omnibox/UrlBar.java        | 24 +++++++++++++++++++
- 3 files changed, 36 insertions(+), 3 deletions(-)
+ .../browser/omnibox/LocationBarMediator.java  | 21 ++++++++++++---
+ .../chrome/browser/omnibox/UrlBar.java        | 26 +++++++++++++++++++
+ .../browser/omnibox/UrlBarViewBinder.java     |  1 +
+ 4 files changed, 45 insertions(+), 4 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
@@ -28,34 +29,62 @@ 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
-@@ -411,8 +411,17 @@ class LocationBarMediator
-             if (!mUrlFocusedWithPastedText
-                     && !shouldRetainOmniboxOnFocus
-                     && mLocationBarLayout.shouldClearTextOnFocus()) {
-                setUrlBarText(
-                        UrlBarData.EMPTY, UrlBar.ScrollType.NO_SCROLL, SelectionState.SELECT_END);
-+                UrlBarData data = mLocationBarDataProvider.getUrlBarData();
-+                @SelectionState int selectionState = SelectionState.SELECT_ALL;
-+                GURL url = mLocationBarDataProvider.getUrlBarData().url;
-+                if (url != null && mTemplateUrlServiceSupplier.get() != null) {
-+                    String searchParams =
-+                        mTemplateUrlServiceSupplier.get().getSearchQueryForUrl(url);
-+                    if (searchParams != null && !searchParams.isEmpty()) {
-+                        data = UrlBarData.forUrlAndText(data.url, data.displayText, searchParams);
-+                    }
-+                }
-+                setUrlBarText(data, UrlBar.ScrollType.NO_SCROLL, selectionState);
-             } else if (shouldRetainOmniboxOnFocus) {
-                 mUrlCoordinator.setSelectAllOnFocus(true);
+@@ -1007,7 +1007,7 @@ class LocationBarMediator
+                 // Existing text (e.g. if the user pasted via the fakebox) from the fake box
+                 // should be restored after toggling the focus.
+                 if (mCurrentInput != null && !mCurrentInput.getUserText().isEmpty()) {
+-                    beginOrResumeInput(/* activateNewSession= */ false);
+                    beginOrResumeInput(/* activateNewSession= */ false, /* wasFocus */ false);
+                 }
             }
-@@ -1921,7 +1930,6 @@ class LocationBarMediator
-         mUrlCoordinator.setKeyboardVisibility(true, false);
+ 
+@@ -1052,7 +1052,7 @@ class LocationBarMediator
+      */
+     @EnsuresNonNullIf("mCurrentInput")
+     @VisibleForTesting
+-    void beginOrResumeInput(boolean activateNewSession) {
+    void beginOrResumeInput(boolean activateNewSession, boolean wasFocus) {
+         // Do not instantiate a new ephemeral session unless we're activating it as well.
+         var session = FuseboxSessionState.from(mLocationBarDataProvider);
+ 
+@@ -1087,6 +1087,19 @@ class LocationBarMediator
+         mStatusCoordinator.setSiteSearchDataSupplier(mCurrentInput.getSiteSearchDataSupplier());
+ 
+         UrlBarData data = UrlBarData.forNonUrlText(mCurrentInput.getUserText());
+        if (wasFocus) {
+            data = mLocationBarDataProvider.getUrlBarData();
+            GURL url = mLocationBarDataProvider.getUrlBarData().url;
+            if (url != null && mTemplateUrlServiceSupplier.get() != null) {
+                String searchParams =
+                    mTemplateUrlServiceSupplier.get().getSearchQueryForUrl(url);
+                if (searchParams != null && !searchParams.isEmpty()) {
+                    mCurrentInput.setUserText(searchParams);
+                    data = UrlBarData.forUrlAndText(data.url, data.displayText, searchParams);
+                }
+            }
+            mCurrentInput.setSelection(0, Integer.MAX_VALUE);
+        }
+         mUrlCoordinator.setUrlBarData(
+                 data, UrlBar.ScrollType.NO_SCROLL, mCurrentInput.getSelection());
+ 
+@@ -1162,7 +1175,7 @@ class LocationBarMediator
+         // This call is permitted to happen before anyone else is activated, and
+         // must be called before everyone else cleans up.
+         if (hasFocus) {
+-            beginOrResumeInput(/* activateNewSession= */ true);
+            beginOrResumeInput(/* activateNewSession= */ true, /* wasFocus */ true);
+         } else {
+             endInputInternal();
+         }
+@@ -2065,7 +2078,7 @@ class LocationBarMediator
+         }
+ 
+         // Wait for the Url focus change before refreshing autocomplete.
+-        beginOrResumeInput(/* activateNewSession= */ true);
+        beginOrResumeInput(/* activateNewSession= */ true, /* wasFocus */ false);
     }
 
-
-     // UrlBarDelegate implementation.
- 
-     @Override
+     /**
 diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
 +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBar.java
@@ -67,18 +96,26 @@ 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;
-@@ -112,6 +113,7 @@ public class UrlBar extends AutocompleteEditText {
+@@ -57,6 +58,7 @@ import org.chromium.components.browser_ui.util.FirstDrawDetector;
+ import org.chromium.components.omnibox.OmniboxFeatures;
+ import org.chromium.ui.KeyboardVisibilityDelegate;
+ import org.chromium.ui.base.KeyNavigationUtil;
+import org.chromium.ui.base.DeviceFormFactor;
+ import org.chromium.ui.display.DisplayAndroid;
+ import org.chromium.ui.display.DisplayUtil;
+ 
+@@ -112,6 +114,7 @@ public class UrlBar extends AutocompleteEditText {
+     private boolean mFocusEventEmitted;
     private boolean mAllowFocus = true;
-     private boolean mShouldSendTypingStartedEvent;
- 
+     private boolean mAllowMultilineInput;
 +    private boolean mPendingSelectAll;
+     private boolean mCurrentInputCanBeWrapped;
+ 
     private boolean mPendingScroll;
-     private boolean mIsInCct;
- 
-@@ -374,6 +376,28 @@ public class UrlBar extends AutocompleteEditText {
+@@ -335,6 +338,29 @@ public class UrlBar extends AutocompleteEditText {
+             mPendingScroll = false;
+         }
         fixupTextDirection();
- 
-         mShouldSendTypingStartedEvent = focused;
 +
 +        if (mPendingSelectAll) {
 +            UrlBar sender = this;
@@ -94,7 +131,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
 +
 +    @Override
 +    public void selectAll() {
-+        mPendingSelectAll = true;
+        if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(getContext()))
+            mPendingSelectAll = true;
 +        super.selectAll();
 +    }
 +
@@ -104,4 +142,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
     }
 
     @Override
+diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
+--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarViewBinder.java
+@@ -100,6 +100,7 @@ class UrlBarViewBinder {
+                     selectionRange = Range.create(textLength, textLength);
+                 }
+                 view.setSelection(selectionRange.getLower(), selectionRange.getUpper());
+                view.selectAll();
+                 view.requestAccessibilityFocus();
+             }
+         } else if (UrlBarProperties.TEXT_COLOR.equals(propertyKey)) {
 --
@@ -42,7 +42,7 @@ diff --git a/components/browser_ui/accessibility/android/java/res/xml/accessibil
 diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 --- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
 +++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -1205,6 +1205,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
+@@ -1380,6 +1380,11 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProviderCompa
             structure.setChildCount(0);
             return;
         }
@@ -14,16 +14,16 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -97,7 +97,8 @@ found in the LICENSE file.
+@@ -104,7 +104,8 @@ found in the LICENSE file.
         android:fragment="org.chromium.chrome.browser.tasks.tab_management.TabsSettings"
         android:key="tabs"
-         android:order="18"
+         android:order="19"
 -        android:title="@string/tabs_settings_title"/>
 +        android:title="@string/tabs_settings_title"
 +        app:isPreferenceVisible="false"/>
     <Preference
-         android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
-         android:key="homepage"
+         android:fragment="org.chromium.chrome.browser.glic.GlicSettings"
+         android:key="glic"
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabArchiveSettings.java
@@ -0,0 +1,89 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Mon, 18 May 2026 15:44:56 +0000
+Subject: Disable AppRating
+
+Chromium Android includes an AppRating promo path that can trigger user-facing
+review prompts through the Android app-rating integration. The implementation
+depends on Google Play Review APIs provided by Google Play Services. Those
+dependencies are already excluded by default in this fork through a separate
+patch, making the AppRating feature non-functional and unnecessary.
+
+Change:
+Remove AppRatingPromoController from the optional promo selection flow and
+exclude the app_rating Java and junit targets from the Android build graph.
+
+Privacy/Security Impact:
+Removes an unused user-engagement surface and avoids invoking review-related
+logic tied to Google Play Services. No browser engine, network, Blink, V8,
+storage, or process-isolation behavior is changed.
+
+Notes:
+AppRating depends on Google Play Review APIs from Google Play Services.
+Since Google Play Services support is already excluded by default through a
+separate patch, this change removes the now-unused integration and prevents
+accidental reintroduction of the feature.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/android/BUILD.gn                                     | 4 ++--
+ .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java | 6 ------
+ chrome/browser/ui/android/app_rating/BUILD.gn               | 2 ++
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -506,7 +506,7 @@ if (_is_default_toolchain) {
+       "//chrome/browser/touch_to_fill/common/android:java",
+       "//chrome/browser/translate/android:java",
+       "//chrome/browser/ui/android/actions:java",
+-      "//chrome/browser/ui/android/app_rating:java",
+      #"//chrome/browser/ui/android/app_rating:java",
+       "//chrome/browser/ui/android/appmenu:factory_java",
+       "//chrome/browser/ui/android/appmenu:java",
+       "//chrome/browser/ui/android/bottombar:java",
+@@ -1189,7 +1189,7 @@ if (_is_default_toolchain) {
+       "//chrome/browser/touch_to_fill/password_manager/password_generation/android/internal:junit",
+       "//chrome/browser/translate/android:junit",
+       "//chrome/browser/ui/android/actions:junit",
+-      "//chrome/browser/ui/android/app_rating:junit",
+      #"//chrome/browser/ui/android/app_rating:junit",
+       "//chrome/browser/ui/android/appmenu/internal:junit",
+       "//chrome/browser/ui/android/autofill/internal:junit",
+       "//chrome/browser/ui/android/bottombar:junit",
+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
+@@ -201,7 +201,6 @@ import org.chromium.chrome.browser.toolbar.ToolbarFeatures;
+ import org.chromium.chrome.browser.toolbar.ToolbarIntentMetadata;
+ import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarBehavior;
+ import org.chromium.chrome.browser.ui.RootUiCoordinator;
+-import org.chromium.chrome.browser.ui.app_rating.AppRatingPromoController;
+ import org.chromium.chrome.browser.ui.appmenu.AppMenuBlocker;
+ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
+ import org.chromium.chrome.browser.ui.bottombar.BottomBarHostManager;
+@@ -2237,11 +2236,6 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+             return true;
+         }
+ 
+-        if (AppRatingPromoController.maybeShowPromo(profile, mActivity)) {
+-            UserEducationUtils.recordOptionalPromoType(OptionalPromoType.APP_RATING_PROMPT);
+-            return true;
+-        }
+-
+         UserEducationUtils.recordOptionalPromoType(OptionalPromoType.NONE_SHOWN);
+         return false;
+     }
+diff --git a/chrome/browser/ui/android/app_rating/BUILD.gn b/chrome/browser/ui/android/app_rating/BUILD.gn
+--- a/chrome/browser/ui/android/app_rating/BUILD.gn
+++ b/chrome/browser/ui/android/app_rating/BUILD.gn
+@@ -5,6 +5,8 @@
+ import("//build/config/android/config.gni")
+ import("//build/config/android/rules.gni")
+ 
+assert(false)
+
+ if (enable_chrome_android_internal) {
+   android_aar_prebuilt("play_review_aar_internal_java") {
+     aar_path = "//third_party/android_deps/autorolled/cipd/libs/com_google_android_play_review/review.aar"
+--
@@ -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
-@@ -263,7 +263,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
+@@ -302,7 +302,7 @@ bool CSSSupportsParser::ConsumeBlinkFeatureFn(CSSParserTokenStream& stream) {
             feature_name.Value().Utf8()) &&
         guard.Release()) {
       stream.ConsumeWhitespace();
@@ -28,7 +28,7 @@ diff --git a/third_party/blink/renderer/core/css/parser/css_supports_parser.cc b
 diff --git a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 --- a/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
 +++ b/third_party/blink/renderer/core/speculation_rules/document_rule_predicate.cc
-@@ -520,7 +520,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
+@@ -521,7 +521,7 @@ DocumentRulePredicate* DocumentRulePredicate::Parse(
     HeapVector<CSSSelector> arena;
     CSSPropertyValueSet* empty_properties =
         ImmutableCSSPropertyValueSet::Create(base::span<CSSPropertyValue>(),
@@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1431,7 +1431,7 @@
+@@ -1578,7 +1578,7 @@
     },
     {
       name: "CSSDynamicRangeLimit",
@@ -4,26 +4,55 @@ Subject: Disable Compose feature

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- chrome/browser/ui/webui/settings/settings_ui.cc     | 6 ++++--
+ chrome/browser/renderer_context_menu/BUILD.gn       | 6 +++---
+ chrome/browser/ui/webui/settings/settings_ui.cc     | 4 ++--
 components/compose/core/browser/compose_features.cc | 2 ++
 components/compose/features.gni                     | 2 +-
- 3 files changed, 7 insertions(+), 3 deletions(-)
+ 4 files changed, 8 insertions(+), 6 deletions(-)

+diff --git a/chrome/browser/renderer_context_menu/BUILD.gn b/chrome/browser/renderer_context_menu/BUILD.gn
+--- a/chrome/browser/renderer_context_menu/BUILD.gn
+++ b/chrome/browser/renderer_context_menu/BUILD.gn
+@@ -89,7 +89,7 @@ source_set("impl") {
+       "//chrome/browser/apps/app_service",
+       "//chrome/browser/apps/platform_apps",
+       "//chrome/browser/autocomplete",
+-      "//chrome/browser/compose",
+      #"//chrome/browser/compose",
+       "//chrome/browser/custom_handlers",
+       "//chrome/browser/devtools",
+       "//chrome/browser/glic",
+@@ -232,7 +232,7 @@ static_library("test_support") {
+       "render_view_context_menu_test_util.cc",
+     ]
+     public_deps += [ "//extensions/buildflags" ]
+-    deps += [ "//chrome/browser/compose" ]
+    #deps += [ "//chrome/browser/compose" ]
+   }
+ 
+   if (is_chromeos) {
+@@ -325,7 +325,7 @@ if (!is_android) {
+       ":test_support",
+       "//base/test:test_support",
+       "//chrome/browser",
+-      "//chrome/browser/compose:test_support",
+      #"//chrome/browser/compose:test_support",
+       "//chrome/browser/devtools",
+       "//chrome/browser/pdf:pdf_extension_test_utils",
+       "//chrome/browser/search_engines",
 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
-@@ -21,7 +21,9 @@
+@@ -21,7 +21,7 @@
 #include "chrome/browser/browser_features.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/commerce/shopping_service_factory.h"
 -#include "chrome/browser/compose/compose_enabling.h"
-+// #if BUILDFLAG(ENABLE_COMPOSE)
 +// #include "chrome/browser/compose/compose_enabling.h"
-+// #endif
+ #include "chrome/browser/glic/public/glic_enabling.h"
+ #include "chrome/browser/glic/public/glic_keyed_service.h"
 #include "chrome/browser/history_embeddings/history_embeddings_utils.h"
- #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
- #include "chrome/browser/optimization_guide/optimization_guide_keyed_service_factory.h"
-@@ -358,7 +360,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -367,7 +367,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
       base::FeatureList::IsEnabled(permissions::features::kKeyboardLockPrompt));
 
 #if BUILDFLAG(ENABLE_COMPOSE)
@@ -12,16 +12,16 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.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
-@@ -1449,8 +1449,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
+@@ -1569,8 +1569,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
   registry->RegisterBooleanPref(prefs::kSandboxExternalProtocolBlocked, true);
   registry->RegisterBooleanPref(prefs::kSSLErrorOverrideAllowed, true);
   registry->RegisterListPref(prefs::kSSLErrorOverrideAllowedForOrigins);
 -  registry->RegisterBooleanPref(prefs::kCompressionDictionaryTransportEnabled,
 -                                true);
 +  registry->RegisterBooleanPref(prefs::kCompressionDictionaryTransportEnabled, false);
- #if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
-   registry->RegisterBooleanPref(prefs::kTranslatorAPIAllowed, true);
- #endif
+   registry->RegisterBooleanPref(
+       prefs::kSuppressDifferentOriginSubframeJSDialogs, true);
+ #if BUILDFLAG(IS_ANDROID)
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-Compression-Dictionary-Transport.inc
 new file mode 100644
 --- /dev/null
@@ -10,7 +10,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/device_api/device_service_impl.cc
 --- a/chrome/browser/device_api/device_service_impl.cc
 +++ b/chrome/browser/device_api/device_service_impl.cc
-@@ -154,6 +154,7 @@ bool IsPermissionsPolicyFeatureEnabled() {
+@@ -147,6 +147,7 @@ bool IsAffiliatedUser() {
 
 bool IsTrustedContext(content::RenderFrameHost& host,
                       const url::Origin& origin) {
@@ -18,7 +18,7 @@ diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/d
   // Do not create the service for the incognito mode.
   if (GetProfile(host)->IsIncognitoProfile()) {
     return false;
-@@ -349,6 +350,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
+@@ -323,6 +324,10 @@ void DeviceServiceImpl::GetAnnotatedLocation(
 void DeviceServiceImpl::GetDeviceAttribute(
     void (DeviceAttributeApi::*method)(DeviceAttributeCallback callback),
     DeviceAttributeCallback callback) {
@@ -26,7 +26,7 @@ diff --git a/chrome/browser/device_api/device_service_impl.cc b/chrome/browser/d
 +    device_attribute_api_->ReportNotAllowedError(std::move(callback));
 +    return;
 +  }
-   if (!IsAffiliatedUser()) {
+   if (!IsAffiliatedUser() &&
+       !IsDevModeInstalledIwaOrigin(render_frame_host(), origin())) {
     device_attribute_api_->ReportNotAffiliatedError(std::move(callback));
-     return;
 --
@@ -17,7 +17,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -639,7 +639,7 @@ void ContentSettingsRegistry::Init() {
+@@ -640,7 +640,7 @@ void ContentSettingsRegistry::Init() {
            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
   Register(ContentSettingsType::FEDERATED_IDENTITY_AUTO_REAUTHN_PERMISSION,
@@ -47,7 +47,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
-@@ -2316,7 +2316,7 @@
+@@ -2544,7 +2544,7 @@
     {
       name: "FedCm",
       public: true,
@@ -5,13 +5,13 @@ Subject: Disable GSA by default
 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
 .../src/org/chromium/base/PackageUtils.java   |  1 +
- .../chrome/browser/IntentHandler.java         |  7 ----
+ .../chrome/browser/IntentHandler.java         |  6 ----
 .../chrome/browser/share/LensUtils.java       | 14 ++------
 .../chromium/chrome/browser/gsa/GSAUtils.java | 34 +++----------------
 .../GoogleBottomBarActionsHandler.java        | 19 ++---------
 .../chrome/browser/pdf/PdfCoordinator.java    |  2 +-
 .../Disable-GSA-by-default.inc                |  1 +
- 7 files changed, 12 insertions(+), 66 deletions(-)
+ 7 files changed, 12 insertions(+), 65 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-GSA-by-default.inc

 diff --git a/base/android/java/src/org/chromium/base/PackageUtils.java b/base/android/java/src/org/chromium/base/PackageUtils.java
@@ -28,7 +28,7 @@ diff --git a/base/android/java/src/org/chromium/base/PackageUtils.java b/base/an
 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
-@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.document.ChromeLauncherActivity;
+@@ -52,7 +52,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;
@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
 import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
 import org.chromium.chrome.browser.pdf.PdfUtils;
 import org.chromium.chrome.browser.profiles.Profile;
-@@ -306,9 +305,6 @@ public class IntentHandler {
+@@ -321,9 +320,6 @@ public class IntentHandler {
     public static final String EXTRA_TIPS_NOTIFICATION_FEATURE_TYPE =
             "org.chromium.chrome.browser.tips_notification_feature_type";
 
@@ -46,15 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.j
     /** Action to launch the Chrome Item Picker UI, e.g.: tabs. */
     public static final String EXTRA_OPEN_CHROME_ITEM_PICKER =
             "org.chromium.chrome.browser.actions.open_chrome_item_picker";
-@@ -316,7 +312,6 @@ public class IntentHandler {
-     /** Optional extra for the maximum number of items the user can select. */
-     public static final String EXTRA_ITEM_PICKER_MAX_SELECTABLE_ITEMS =
-             "org.chromium.chrome.browser.extras.item_picker_max_selectable_items";
-
-     public static final String EXTRA_ITEM_PICKER_ERROR =
-             "org.chromium.chrome.browser.chrome_item_picker.EXTRA_ITEM_PICKER_ERROR";
- 
-@@ -572,8 +567,6 @@ public class IntentHandler {
+@@ -584,8 +580,6 @@ public class IntentHandler {
             return ExternalAppId.LINE;
         } else if (PACKAGE_WHATSAPP.equals(packageName)) {
             return ExternalAppId.WHATSAPP;
@@ -240,7 +232,7 @@ diff --git a/chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/c
 diff --git a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 --- a/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
 +++ b/chrome/browser/ui/android/pdf/java/src/org/chromium/chrome/browser/pdf/PdfCoordinator.java
-@@ -276,7 +276,7 @@ public class PdfCoordinator {
+@@ -396,7 +396,7 @@ public class PdfCoordinator implements PdfActionsDelegate, PdfToolbarActionsDele
     }
 
     @Nullable String requestAssistContent(String filename, boolean isWorkProfile) {
@@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 --- a/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
 +++ b/components/installedapp/android/java/src/org/chromium/components/installedapp/InstalledAppProviderImpl.java
-@@ -162,6 +162,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
+@@ -137,6 +137,7 @@ public class InstalledAppProviderImpl implements InstalledAppProvider {
             final Url manifestUrl,
             final boolean addSavedRelatedApplications,
             final FilterInstalledApps_Response callback) {
@@ -58,7 +58,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -3080,9 +3080,8 @@
+@@ -3386,9 +3386,8 @@
       status: "stable",
     },
     {
@@ -5,8 +5,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/prefs/browser_prefs.cc               | 2 +-
 chrome/browser/ui/webui/settings/settings_ui.cc     | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 3 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
@@ -19,10 +20,22 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
         android:title="@string/privacy_guide_pref_title"
         android:summary="@string/privacy_guide_pref_summary"
         android:fragment="org.chromium.chrome.browser.privacy_guide.PrivacyGuideFragment" />
+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
+@@ -2107,7 +2107,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+   registry->RegisterBooleanPref(webauthn::pref_names::kAllowWithBrokenCerts,
+                                 false);
+ 
+-  registry->RegisterBooleanPref(prefs::kPrivacyGuideViewed, false);
+  registry->RegisterBooleanPref(prefs::kPrivacyGuideViewed, true);
+ 
+   RegisterProfilePrefsForMigration(registry);
+ 
 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
-@@ -335,8 +335,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
+@@ -344,8 +344,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui)
 #endif  // BUILDFLAG(IS_CHROMEOS)
 
   bool show_privacy_guide =
@@ -3,15 +3,27 @@ Date: Wed, 24 Jan 2024 12:19:44 +0000
 Subject: Disable Read Aloud by default

 ---
- .../flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc | 2 ++
- 1 file changed, 2 insertions(+)
+ chrome/browser/prefs/browser_prefs.cc                           | 2 +-
+ .../flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc

+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
+@@ -1444,7 +1444,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
+ #if BUILDFLAG(IS_ANDROID)
+   registry->RegisterBooleanPref(policy::policy_prefs::kBackForwardCacheEnabled,
+                                 true);
+-  registry->RegisterBooleanPref(policy::policy_prefs::kReadAloudEnabled, true);
+  registry->RegisterBooleanPref(policy::policy_prefs::kReadAloudEnabled, false);
+ #endif  // BUILDFLAG(IS_ANDROID)
+ 
+   // Below this point is for platform-specific and compile-time conditional
 diff --git a/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/Disable-Read-Aloud.inc
-@@ -0,0 +1,2 @@
-+SET_CROMITE_FEATURE_DISABLED(kReadAloud);
+@@ -0,0 +1 @@
 +SET_CROMITE_FEATURE_DISABLED(kReadAloudPlayback);
 --
@@ -4,16 +4,16 @@ Subject: Disable Real Box

 Real-box is search box in ntp
 ---
- chrome/browser/prefs/browser_prefs.cc         |  2 +-
- .../browser/resources/new_tab_page/app.html   | 19 -------------------
- .../searchbox/searchbox_handler.cc            |  1 +
- components/search/ntp_features.cc             |  4 ++--
- 4 files changed, 4 insertions(+), 22 deletions(-)
+ chrome/browser/prefs/browser_prefs.cc          |  2 +-
+ chrome/browser/resources/new_tab_page/app.html | 18 +-----------------
+ .../searchbox/searchbox_handler.cc             |  2 ++
+ components/search/ntp_features.cc              |  4 ++--
+ 4 files changed, 6 insertions(+), 20 deletions(-)

 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -2031,7 +2031,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
+@@ -2079,7 +2079,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
   registry->RegisterBooleanPref(
       prefs::kLensRegionSearchEnabled, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -25,47 +25,47 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
 diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html
 --- a/chrome/browser/resources/new_tab_page/app.html
 +++ b/chrome/browser/resources/new_tab_page/app.html
-@@ -41,25 +41,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js';
-         ?hidden="${!this.showScrim_}"></div>
-   ` : ''}
-   <div id="searchboxContainer">
-    <cr-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
+@@ -43,23 +43,7 @@ import {SubmitButtonIconType} from '//resources/cr_components/composebox/compose
+   <div id="searchboxContainer"
+       @focusin="${this.onSearchboxContainerFocusin_}"
+       @focusout="${this.onSearchboxContainerFocusout_}">
+-    <ntp-searchbox id="searchbox" ?is-dark="${this.isThemeDark_()}"
 -        placeholder-text="$i18n{searchBoxPlaceholder}"
 -        ?color-source-is-baseline="${this.colorSourceIsBaseline}"
-        @open-composebox="${this.openComposebox_}"
+-        @open-composebox="${this.onOpenComposebox_}"
 -        @open-lens-search="${this.onOpenLensSearch_}"
 -        @open-voice-search="${this.onOpenVoiceSearch_}" ?shown="${this.realboxShown_}"
 -        ?had-secondary-side="${this.realboxHadSecondarySide}"
 -        @had-secondary-side-changed="${this.onRealboxHadSecondarySideChanged_}"
-        @context-menu-entrypoint-click="${this.onContextMenuEntrypointClick_}"
 -        ?can-show-secondary-side="${this.realboxCanShowSecondarySide}"
 -        ?compose-button-enabled="${this.composeButtonEnabled}"
 -        ?composebox-enabled="${this.composeboxEnabled}"
-        searchbox-layout-mode="${this.realboxLayoutMode_}"
+-        searchbox-layout-mode="${this.ntpRealboxNextEnabled_ ? 'Compact' : ''}"
 -        ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}"
 -        ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}"
-        @searchbox-input-focus-changed="${this.onInputFocusChanged_}"
 -        context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}"
 -        ?multi-line-enabled="${this.multiLineEnabled_}">
-    </cr-searchbox>
+-    </ntp-searchbox>
+    <div id="searchbox"></div>
     ${this.showComposebox_ ? html`
       <div id="dialogAnchor"></div>
       <dialog id="composeboxDialog">
 diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
 --- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
 +++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc
-@@ -298,6 +298,7 @@ void SearchboxHandler::SetupWebUIDataSource(content::WebUIDataSource* source,
-                                             Profile* profile,
-                                             bool enable_voice_search,
-                                             bool enable_lens_search) {
-+  enable_lens_search = false;
+@@ -321,6 +321,8 @@ base::DictValue SearchboxHandler::GetWebUIDataSourceDict(Profile* profile) {
+ base::DictValue SearchboxHandler::GetWebUIDataSourceDict(
+     Profile* profile,
+     WebUIDataSourceOptions options) {
+  options.enable_lens_search = false;
+  options.enable_voice_search = false;
+   base::DictValue dict;
+ 
   // The WebUI Omnibox code will override this to `true` to adjust various
-   // color and layout options.
-   source->AddBoolean("isTopChromeSearchbox", false);
 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
-@@ -114,7 +114,7 @@ BASE_FEATURE(kNtpDriveModuleShowSixFiles, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -97,7 +97,7 @@ BASE_FEATURE(kNtpDriveModuleSegmentation, base::FEATURE_DISABLED_BY_DEFAULT);
 
 // If enabled, logo will be shown.
 // This is a kill switch. Keep indefinitely.
@@ -74,7 +74,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.
-@@ -156,7 +156,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
+@@ -139,7 +139,7 @@ BASE_FEATURE(kNtpModuleSignInRequirement, base::FEATURE_ENABLED_BY_DEFAULT);
 
 // If enabled, OneGoogleBar will be shown.
 // This is a kill switch. Keep indefinitely.
@@ -14,7 +14,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
-@@ -5072,8 +5072,8 @@
+@@ -5510,8 +5510,8 @@
     {
       // Preserves the sticky user activation state after a page navigates to
       // another same-origin page. https://crbug.com/433729626
@@ -26,13 +26,13 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
 License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 ---
 .../about_flags_cc/Disable-TLS-resumption.inc | 12 ++++
- .../features_cc/Disable-TLS-resumption.inc    |  7 +++
+ .../features_cc/Disable-TLS-resumption.inc    |  7 ++
 .../features_h/Disable-TLS-resumption.inc     |  5 ++
 net/http/http_network_session.cc              |  1 +
- net/quic/quic_session_pool.cc                 | 34 ++++++++++-
- net/socket/ssl_client_socket_impl.cc          | 59 +++++++++++++++++++
+ net/quic/quic_session_pool.cc                 | 35 +++++++++-
+ net/socket/ssl_client_socket_impl.cc          | 68 +++++++++++++++++++
 net/socket/ssl_client_socket_impl.h           |  2 +
- 7 files changed, 119 insertions(+), 1 deletion(-)
+ 7 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Disable-TLS-resumption.inc
 create mode 100644 cromite_flags/net/base/features_cc/Disable-TLS-resumption.inc
 create mode 100644 cromite_flags/net/base/features_h/Disable-TLS-resumption.inc
@@ -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
-@@ -381,6 +381,38 @@ base::TimeDelta GetAdditionalDelayForMainJob() {
+@@ -384,6 +384,38 @@ base::TimeDelta GetAdditionalDelayForMainJob() {
 
 }  // namespace
 
@@ -129,19 +129,28 @@ diff --git a/net/quic/quic_session_pool.cc b/net/quic/quic_session_pool.cc
 QuicSessionRequest::QuicSessionRequest(QuicSessionPool* pool) : pool_(pool) {}
 
 QuicSessionRequest::~QuicSessionRequest() {
-@@ -2422,7 +2454,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
+@@ -2484,8 +2516,7 @@ QuicSessionPool::CreateCryptoConfigHandle(QuicCryptoClientConfigKey key) {
               cert_verifier_, transport_security_state_, sct_auditing_delegate_,
               std::move(hostnames_to_allow_unknown_roots),
               key.network_anonymization_key),
-          std::make_unique<quic::QuicClientSessionCache>(), this);
-+          std::make_unique<BromiteSessionCache>(), this);
+-          std::make_unique<quic::QuicClientSessionCache>(
+-              kDefaultQuicSessionCacheSize),
+          std::make_unique<BromiteSessionCache>(),
+           kDefaultQuicSessionCacheSize, this);
 
   quic::QuicCryptoClientConfig* crypto_config = crypto_config_owner->config();
-   crypto_config->AddCanonicalSuffix(".c.youtube.com");
 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
-@@ -292,7 +292,33 @@ SSLClientSocketImpl::SSLClientSocketImpl(
+@@ -31,6 +31,7 @@
+ #include "base/strings/string_view_util.h"
+ #include "base/synchronization/lock.h"
+ #include "base/task/sequenced_task_runner.h"
+#include "base/types/fixed_array.h"
+ #include "base/trace_event/trace_event.h"
+ #include "base/values.h"
+ #include "build/build_config.h"
+@@ -292,7 +293,41 @@ SSLClientSocketImpl::SSLClientSocketImpl(
   CHECK(context_);
 }
 
@@ -155,18 +164,26 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
 +  }
 +
 +  unsigned len;
-+  auto* session_id = SSL_SESSION_get_id(session, &len);
+  const uint8_t *session_id = SSL_SESSION_get_id(session, &len);
+  base::FixedArray<uint8_t> session_id_bytes(len);
+  for (unsigned i = 0; i < len; i++) {
+    session_id_bytes[i] = UNSAFE_TODO(session_id[i]);
+  }
 +
 +  const uint8_t *ticket;
 +  size_t ticklen;
 +  SSL_SESSION_get0_ticket(session, &ticket, &ticklen);
+  base::FixedArray<uint8_t> ticket_bytes(ticklen);
+  for (size_t i = 0; i < ticklen; i++) {
+    ticket_bytes[i] = UNSAFE_TODO(ticket[i]);
+  }
 +
 +  LOG(INFO) << "SSL Log: "
 +            << tag
 +            << " host: " << host_and_port_.ToString()
 +            << " NIK: " << ssl_config_.network_anonymization_key.ToDebugString()
-+            << " sessionid: " << base::HexEncode(session_id, len)
-+            << (ticklen > 0 ? " ticket:" + base::HexEncode(ticket, ticklen) : "");
+            << " sessionid: " << base::HexEncode(base::span<uint8_t>(session_id_bytes))
+            << (ticklen > 0 ? " ticket:" + base::HexEncode(ticket_bytes) : "");
 +}
 +
 SSLClientSocketImpl::~SSLClientSocketImpl() {
@@ -175,7 +192,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   Disconnect();
 }
 
-@@ -711,6 +737,8 @@ int SSLClientSocketImpl::Init() {
+@@ -710,6 +745,8 @@ int SSLClientSocketImpl::Init() {
     }
     if (session)
       SSL_set_session(ssl_.get(), session.get());
@@ -184,7 +201,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   }
 
   transport_adapter_ = std::make_unique<SocketBIOAdapter>(
-@@ -988,6 +1016,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
+@@ -994,6 +1031,35 @@ int SSLClientSocketImpl::DoHandshakeComplete(int result) {
                     : SSLHandshakeDetails::kTLS13Full;
     }
   }
@@ -220,7 +237,7 @@ diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket
   UMA_HISTOGRAM_ENUMERATION("Net.SSLHandshakeDetails", details);
 
   // Measure TLS connections that implement the renegotiation_info and EMS
-@@ -1627,6 +1684,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
+@@ -1624,6 +1690,8 @@ bool SSLClientSocketImpl::IsRenegotiationAllowed() const {
 }
 
 bool SSLClientSocketImpl::IsCachingEnabled() const {
@@ -23,7 +23,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 #include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_ua_data_values.h"
-@@ -17,6 +20,20 @@
+@@ -16,6 +19,20 @@
 
 namespace blink {
 
@@ -36,7 +36,7 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 +  if (components.size() > 0) {
 +    version_str = base::StrCat({base::NumberToString(components[0]), ".0.0.0"});
 +  }
-+  return String::FromUTF8(version_str);
+  return String::FromUtf8(version_str);
 +}
 +
 +}
@@ -44,16 +44,16 @@ diff --git a/third_party/blink/renderer/core/frame/navigator_ua_data.cc b/third_
 NavigatorUAData::NavigatorUAData(ExecutionContext* context)
     : ExecutionContextClient(context) {
   NavigatorUABrandVersion* dict = NavigatorUABrandVersion::Create();
-@@ -53,7 +70,7 @@ void NavigatorUAData::SetFullVersionList(
+@@ -52,7 +69,7 @@ void NavigatorUAData::SetFullVersionList(
     const UserAgentBrandList& full_version_list) {
   for (const auto& brand_version : full_version_list) {
-     AddBrandFullVersion(String::FromUTF8(brand_version.brand),
-                        String::FromUTF8(brand_version.version));
-+        GetReducedVersionNumber(brand_version.version));
+     AddBrandFullVersion(String::FromUtf8(brand_version.brand),
+-                        String::FromUtf8(brand_version.version));
+                        GetReducedVersionNumber(brand_version.version));
   }
 }
 
-@@ -75,7 +92,7 @@ void NavigatorUAData::SetModel(const String& model) {
+@@ -74,7 +91,7 @@ void NavigatorUAData::SetModel(const String& model) {
 }
 
 void NavigatorUAData::SetUAFullVersion(const String& ua_full_version) {
@@ -21,7 +21,7 @@ new file mode 100644
 diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -5695,8 +5695,7 @@
+@@ -6174,8 +6174,7 @@
       status: "stable",
     },
     {
@@ -12,7 +12,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
 --- a/content/child/runtime_features.cc
 +++ b/content/child/runtime_features.cc
-@@ -555,6 +555,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -531,6 +531,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
 
   WebRuntimeFeatures::EnableRemotePlayback(false);
 
@@ -24,7 +24,7 @@ diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.
 diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc
 --- a/gpu/config/gpu_finch_features.cc
 +++ b/gpu/config/gpu_finch_features.cc
-@@ -190,7 +190,7 @@ BASE_FEATURE(kEnableDrDc,
+@@ -215,7 +215,7 @@ BASE_FEATURE(kEnableDrDc,
 // enabled by default on supported platforms.
 #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
     BUILDFLAG(IS_ANDROID) || BUILDFLAG(USE_WEBGPU_ON_VULKAN_VIA_GL_INTEROP)
@@ -4,21 +4,18 @@ Subject: Disable all promo dialogs

 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 +-
- .../views/profiles/profile_picker_feature_promo_controller.cc  | 1 +
- .../user_education/impl/browser_feature_promo_controller_20.cc | 1 +
- .../chrome/browser/user_education/UserEducationHelper.java     | 1 +
- .../browser/user_education/user_education_service_factory.cc   | 1 +
- .../common/feature_promo/feature_promo_registry.cc             | 2 ++
- .../common/feature_promo/impl/feature_promo_controller_20.cc   | 1 +
- .../common/feature_promo/impl/feature_promo_controller_25.cc   | 3 ++-
- 9 files changed, 11 insertions(+), 2 deletions(-)
+ .../chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java     | 1 +
+ chrome/browser/ui/browser_ui_prefs.cc                           | 2 +-
+ .../chrome/browser/user_education/UserEducationHelper.java      | 1 +
+ chrome/browser/user_education/user_education_service_factory.cc | 1 +
+ .../common/feature_promo/feature_promo_registry.cc              | 2 ++
+ .../common/feature_promo/impl/feature_promo_queue.cc            | 1 +
+ 6 files changed, 7 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
-@@ -1880,6 +1880,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -2185,6 +2185,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
     }
 
     private boolean maybeShowPromo(Profile profile) {
@@ -29,7 +26,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -185,7 +185,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -193,7 +193,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   registry->RegisterBooleanPref(prefs::kEnterpriseHardwarePlatformAPIEnabled,
                                 false);
@@ -38,28 +35,6 @@ 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/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
-@@ -36,6 +36,7 @@ user_education::FeaturePromoResult
- ProfilePickerFeaturePromoController::CanShowPromoForElement(
-     ui::TrackedElement* anchor_element,
-     const user_education::UserEducationContextPtr&) const {
-+  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
-   return ProfilePicker::IsOpen()
-              ? user_education::FeaturePromoResult::Success()
-              : user_education::FeaturePromoResult::kBlockedByUi;
-diff --git a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
--- a/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
-+++ b/chrome/browser/ui/views/user_education/impl/browser_feature_promo_controller_20.cc
-@@ -47,6 +47,7 @@ user_education::FeaturePromoResult
- BrowserFeaturePromoController20::CanShowPromoForElement(
-     ui::TrackedElement* anchor_element,
-     const user_education::UserEducationContextPtr& context) const {
-+  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
-   auto* const browser_context = context->AsA<BrowserUserEducationContext>();
-   CHECK(browser_context && browser_context->IsValid());
-   auto* const browser_view = &browser_context->GetBrowserView();
 diff --git a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 --- a/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
 +++ b/chrome/browser/user_education/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java
@@ -101,35 +76,15 @@ diff --git a/components/user_education/common/feature_promo/feature_promo_regist
   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
-@@ -106,6 +106,7 @@ FeaturePromoResult FeaturePromoController20::CanShowPromoCommon(
-     const UserEducationContextPtr& context,
-     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
-@@ -189,6 +189,7 @@ FeaturePromoController25::~FeaturePromoController25() {
- FeaturePromoResult FeaturePromoController25::CanShowPromo(
-     const FeaturePromoParams& params,
+diff --git a/components/user_education/common/feature_promo/impl/feature_promo_queue.cc b/components/user_education/common/feature_promo/impl/feature_promo_queue.cc
+--- a/components/user_education/common/feature_promo/impl/feature_promo_queue.cc
+++ b/components/user_education/common/feature_promo/impl/feature_promo_queue.cc
+@@ -76,6 +76,7 @@ FeaturePromoResult FeaturePromoQueue::CanShow(
+     const FeaturePromoSpecification& spec,
+     const FeaturePromoParams& promo_params,
     const UserEducationContextPtr& context) const {
-+  if ((true)) return FeaturePromoResult::kBlockedByContext;
-   auto* const spec = registry()->GetParamsForFeature(*params.feature);
-   if (!spec) {
-     return FeaturePromoResult::kError;
-@@ -211,7 +212,7 @@ void FeaturePromoController25::MaybeShowStartupPromo(
- void FeaturePromoController25::MaybeShowPromo(FeaturePromoParams params,
-                                               UserEducationContextPtr context) {
-   auto* const spec = registry()->GetParamsForFeature(*params.feature);
-  if (!spec) {
-+  if (((true)) || !spec) {
-     PostShowPromoResult(std::move(params.show_promo_result_callback),
-                         FeaturePromoResult::kError);
-     return;
+  if ((true)) return user_education::FeaturePromoResult::kBlockedByUi;
+   auto required = required_preconditions_provider_->GetPreconditions(
+       spec, promo_params, context);
+   UnownedTypedDataCollection data;
 --
@@ -16,7 +16,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../apk/AndroidManifest.xml                   |   3 -
 chrome/android/java/AndroidManifest.xml       |   4 -
 .../ChromeSiteSettingsDelegate.java           |   2 +
- .../k_anonymity_trust_token_getter.cc         |   2 +-
 .../privacy_page/privacy_page_index.html      |   9 -
 chrome/browser/resources/settings/route.ts    |   2 +-
 .../site_settings/site_settings_page.ts       |   1 +
@@ -47,14 +46,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 third_party/blink/renderer/core/page/page.cc  |   2 +-
 .../platform/runtime_enabled_features.json5   |  20 +-
 ui/events/android/motion_event_android.cc     |   8 +-
- 36 files changed, 103 insertions(+), 437 deletions(-)
+ 35 files changed, 102 insertions(+), 436 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
-@@ -1357,6 +1357,7 @@ network::mojom::AttributionSupport
+@@ -1380,6 +1380,7 @@ network::mojom::AttributionSupport
 AwContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
     bool client_os_disabled) {
@@ -62,7 +61,7 @@ diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webv
   // WebView only supports OS-level attribution and not web-attribution.
   switch (state) {
     case AttributionReportingOsApiState::kDisabled:
-@@ -1375,6 +1376,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -1398,6 +1399,8 @@ bool AwContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -80,10 +79,10 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
     private int mMixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW;
 -    private int mAttributionBehavior = AttributionBehavior.APP_SOURCE_AND_WEB_TRIGGER;
 +    private int mAttributionBehavior = AttributionBehavior.DISABLED;
+     private boolean mIgnoreDuplicateNavEnabled;
+     private int mIgnoreDuplicateNavThresholdMs = -1;
 
-     @SpeculativeLoadingAllowedFlags
-     private int mSpeculativeLoadingAllowedFlags =
-@@ -1806,7 +1806,7 @@ public class AwSettings {
+@@ -1868,7 +1868,7 @@ public class AwSettings {
     public void setAttributionBehavior(@AttributionBehavior int behavior) {
         synchronized (mAwSettingsLock) {
             if (mAttributionBehavior != behavior) {
@@ -95,7 +94,7 @@ diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.ja
 diff --git a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
 --- a/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
 +++ b/android_webview/tools/system_webview_shell/apk/AndroidManifest.xml
-@@ -184,9 +184,6 @@
+@@ -191,9 +191,6 @@
             android:exported="true">
         </activity>
 
@@ -116,7 +115,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"/>
     <!--
-@@ -1231,9 +1230,6 @@ by a child template that "extends" this file.
+@@ -1214,9 +1213,6 @@ by a child template that "extends" this file.
             android:name="com.google.android.gms.cast.framework.ReconnectionService"
             tools:node="remove" />
 
@@ -138,18 +137,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/C
             case SiteSettingsCategory.Type.AUTO_DARK_WEB_CONTENT:
                 return ChromeFeatureList.isEnabled(
                         ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING);
-diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
--- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
-+++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.cc
-@@ -122,7 +122,7 @@ KAnonymityTrustTokenGetter::~KAnonymityTrustTokenGetter() = default;
- 
- void KAnonymityTrustTokenGetter::TryGetTrustTokenAndKey(
-     TryGetTrustTokenAndKeyCallback callback) {
-  if (!identity_manager_ ||
-+  if (((true)) || !identity_manager_ ||
-       !identity_manager_->HasPrimaryAccount(signin::ConsentLevel::kSignin)) {
-     std::move(callback).Run(std::nullopt);
-     return;
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page_index.html
@@ -172,8 +159,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page_index.h
 diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts
 --- a/chrome/browser/resources/settings/route.ts
 +++ b/chrome/browser/resources/settings/route.ts
-@@ -79,7 +79,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
-         r.SITE_SETTINGS.createChild('smartCardReaders');
+@@ -78,7 +78,7 @@ function addPrivacyChildRoutes(r: Partial<SettingsRoutes>) {
+     r.SITE_SETTINGS_WEB_PRINTING = r.SITE_SETTINGS.createChild('webPrinting');
   }
   // </if>
 -  r.SITE_SETTINGS_AUTO_VERIFY = r.SITE_SETTINGS.createChild('autoVerify');
@@ -216,7 +203,7 @@ diff --git a/components/attribution_reporting/features.cc b/components/attributi
 diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
 --- a/components/content_settings/core/browser/content_settings_registry.cc
 +++ b/components/content_settings/core/browser/content_settings_registry.cc
-@@ -648,7 +648,7 @@ void ContentSettingsRegistry::Init() {
+@@ -649,7 +649,7 @@ void ContentSettingsRegistry::Init() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY);
 
@@ -308,16 +295,16 @@ diff --git a/content/browser/attribution_reporting/attribution_data_host_manager
 diff --git a/content/browser/attribution_reporting/attribution_host.cc b/content/browser/attribution_reporting/attribution_host.cc
 --- a/content/browser/attribution_reporting/attribution_host.cc
 +++ b/content/browser/attribution_reporting/attribution_host.cc
-@@ -132,8 +132,6 @@ AttributionHost::AttributionHost(WebContents* web_contents)
-       attribution_reporting::features::kConversionMeasurement));
- 
- #if BUILDFLAG(IS_ANDROID)
-  input_event_tracker_android_ =
-      std::make_unique<AttributionInputEventTrackerAndroid>(web_contents);
+@@ -135,8 +135,6 @@ AttributionHost::AttributionHost(WebContents* web_contents)
+   // AttributionInputEventTrackerAndroid without a native view will crash. For
+   // now, just disable this code if the view is null.
+   if (web_contents->GetNativeView()) {
+-    input_event_tracker_android_ =
+-        std::make_unique<AttributionInputEventTrackerAndroid>(web_contents);
+   }
 #endif
 }
- 
-@@ -342,6 +340,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
+@@ -346,6 +344,7 @@ void AttributionHost::NotifyNavigationRegistrationData(
     return;
   }
 
@@ -389,7 +376,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
-@@ -534,6 +534,8 @@ void AssignSourceForDeactivationOrDeletion(
+@@ -533,6 +533,8 @@ void AssignSourceForDeactivationOrDeletion(
   }
 }
 
@@ -398,7 +385,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 }  // namespace
 
 // static
-@@ -556,9 +558,9 @@ bool AttributionStorageSql::Transaction::Commit() {
+@@ -555,9 +557,9 @@ bool AttributionStorageSql::Transaction::Commit() {
 AttributionStorageSql::AttributionStorageSql(
     const base::FilePath& user_data_directory,
     AttributionResolverDelegate* delegate)
@@ -414,7 +401,7 @@ diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -10569,6 +10569,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
+@@ -10919,6 +10919,7 @@ bool RenderFrameHostImpl::IsFencedFrameReportingFromRendererAllowed(
     return false;
   }
 
@@ -422,7 +409,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
   if (!IsActive()) {
     // reportEvent is not allowed when this RenderFrameHost or one of its
     // ancestors is not active.
-@@ -14679,6 +14680,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
+@@ -15150,6 +15151,16 @@ void RenderFrameHostImpl::BindTrustTokenQueryAnswerer(
     return;
   }
 
@@ -442,7 +429,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -1511,15 +1511,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1465,15 +1465,6 @@ void StoragePartitionImpl::Initialize(
 
   bucket_manager_ = std::make_unique<BucketManager>(this);
 
@@ -458,7 +445,7 @@ diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage
   if (base::FeatureList::IsEnabled(network::features::kInterestGroupStorage)) {
     // Auction worklets on non-Android use dedicated processes; on Android due
     // to high cost of process launch they try to reuse renderers.
-@@ -1571,9 +1562,6 @@ void StoragePartitionImpl::Initialize(
+@@ -1525,9 +1516,6 @@ void StoragePartitionImpl::Initialize(
 
   font_access_manager_ = FontAccessManager::Create();
 
@@ -471,7 +458,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
-@@ -209,8 +209,6 @@ android_library("content_full_java") {
+@@ -204,8 +204,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",
@@ -945,7 +932,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
-@@ -648,6 +648,7 @@ void ContentBrowserClient::OnAuctionComplete(
+@@ -640,6 +640,7 @@ void ContentBrowserClient::OnAuctionComplete(
 network::mojom::AttributionSupport ContentBrowserClient::GetAttributionSupport(
     AttributionReportingOsApiState state,
     bool client_os_disabled) {
@@ -953,7 +940,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;
-@@ -665,13 +666,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
+@@ -657,13 +658,13 @@ bool ContentBrowserClient::IsAttributionReportingOperationAllowed(
     const url::Origin* destination_origin,
     const url::Origin* reporting_origin,
     bool* can_bypass) {
@@ -969,7 +956,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b
 }
 
 bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
-@@ -679,7 +680,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
+@@ -671,7 +672,7 @@ bool ContentBrowserClient::IsAttributionReportingAllowedForContext(
     content::RenderFrameHost* rfh,
     const url::Origin& context_origin,
     const url::Origin& reporting_origin) {
@@ -987,8 +974,8 @@ diff --git a/content/public/browser/navigation_controller.cc b/content/public/br
       reload_type(input.reload_type),
 -      impression(input.impression),
       is_pdf(input.is_pdf),
-       has_rel_opener(input.has_rel_opener) {
- #if DCHECK_IS_ON()
+       has_rel_opener(input.has_rel_opener),
+       internal_scroll_to_text_fragment(input.internal_scroll_to_text_fragment) {
 diff --git a/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc b/cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
 new file mode 100644
 --- /dev/null
@@ -1023,7 +1010,7 @@ diff --git a/services/network/attribution/request_headers_internal.cc b/services
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1312,6 +1312,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
+@@ -1375,6 +1375,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,
 
 void NetworkContext::ClearTrustTokenSessionOnlyData(
     ClearTrustTokenSessionOnlyDataCallback callback) {
@@ -1034,7 +1021,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
   // Only called when Private State Tokens is enabled, i.e.,
   // `trust_token_store_` is non-null.
   DCHECK(trust_token_store_);
-@@ -2709,26 +2713,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
+@@ -2843,26 +2847,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
     builder.set_network_quality_estimator(
         network_service_->network_quality_estimator());
   }
@@ -1095,7 +1082,7 @@ diff --git a/third_party/blink/renderer/core/frame/attribution_src_loader.cc b/t
 diff --git a/third_party/blink/renderer/core/page/page.cc b/third_party/blink/renderer/core/page/page.cc
 --- a/third_party/blink/renderer/core/page/page.cc
 +++ b/third_party/blink/renderer/core/page/page.cc
-@@ -1579,7 +1579,7 @@ void Page::UpdateBrowsingContextGroup(
+@@ -1590,7 +1590,7 @@ void Page::UpdateBrowsingContextGroup(
 
 void Page::SetAttributionSupport(
     network::mojom::AttributionSupport attribution_support) {
@@ -1107,7 +1094,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
-@@ -296,8 +296,8 @@
+@@ -297,8 +297,8 @@
     },
     {
       // Interest Group JS API/runtimeflag.
@@ -1118,7 +1105,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       origin_trial_feature_name: "AdInterestGroupAPI",
       implied_by: ["Fledge", "Parakeet"],
       public: true,
-@@ -630,8 +630,8 @@
+@@ -694,8 +694,8 @@
       status: "stable",
     },
     {
@@ -1129,7 +1116,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       base_feature: "none",
       public: true,
     },
-@@ -4132,8 +4132,8 @@
+@@ -4475,8 +4475,8 @@
       base_feature: "none",
     },
     {
@@ -1140,7 +1127,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
       base_feature: "none",
       public: true,
     },
-@@ -5372,16 +5372,16 @@
+@@ -5832,16 +5832,16 @@
       status: "experimental",
     },
     {
@@ -12,7 +12,7 @@ Subject: Disable crash reporting
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -2690,15 +2690,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2814,15 +2814,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
         base::NumberToString(pid));
   }
 #endif
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -16356,6 +16356,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
+@@ -16841,6 +16841,7 @@ void RenderFrameHostImpl::OnSameDocumentCommitProcessed(
 void RenderFrameHostImpl::MaybeGenerateCrashReport(
     base::TerminationStatus status,
     int exit_code) {
@@ -42,7 +42,7 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/b
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -10371,7 +10371,7 @@ void WebContentsImpl::RendererUnresponsive(
+@@ -10626,7 +10626,7 @@ void WebContentsImpl::RendererUnresponsive(
   base::UmaHistogramEnumeration(
       "ReportingAndNEL.UnresponsiveRenderer.CrashReportOutcome", outcome);
 
@@ -23,10 +23,10 @@ diff --git a/third_party/blink/renderer/core/loader/ping_loader.cc b/third_party
                                    const KURL& ping_url,
                                    const KURL& destination_url) {
 +  if ((true)) return;
-   if (!ping_url.ProtocolIsInHTTPFamily())
+   if (!ping_url.ProtocolIsInHttpFamily()) {
     return;
- 
-@@ -148,6 +150,7 @@ void PingLoader::SendViolationReport(ExecutionContext* execution_context,
+   }
+@@ -149,6 +151,7 @@ void PingLoader::SendViolationReport(ExecutionContext* execution_context,
                                      const KURL& report_url,
                                      scoped_refptr<EncodedFormData> report,
                                      bool is_frame_ancestors_violation) {
@@ -30,11 +30,11 @@ diff --git a/third_party/blink/renderer/core/css/document_style_environment_vari
 +  if (!RuntimeEnabledFeatures::CSSPreferredTextScaleEnabled()) return;
   double scale_factor;
 
-   // For compat, we don't expose env(preferred-text-scale)'s true value to pages
+   Settings* settings = document_->GetSettings();
 diff --git a/third_party/blink/renderer/core/css/style_environment_variables.cc b/third_party/blink/renderer/core/css/style_environment_variables.cc
 --- a/third_party/blink/renderer/core/css/style_environment_variables.cc
 +++ b/third_party/blink/renderer/core/css/style_environment_variables.cc
-@@ -49,7 +49,9 @@ void SetDefaultEnvironmentVariables(StyleEnvironmentVariables* instance) {
+@@ -48,7 +48,9 @@ void SetDefaultEnvironmentVariables(StyleEnvironmentVariables* instance) {
   instance->SetVariable(UADefinedVariable::kKeyboardInsetHeight,
                         kKeyboardInsetDefault);
 
@@ -48,7 +48,7 @@ diff --git a/third_party/blink/renderer/core/css/style_environment_variables.cc
 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
-@@ -1055,7 +1055,9 @@ void Page::SettingsChanged(ChangeType change_type) {
+@@ -1063,7 +1063,9 @@ void Page::SettingsChanged(ChangeType change_type) {
       }
       break;
     case ChangeType::kFontScaleFactor:
@@ -62,7 +62,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
-@@ -1593,6 +1593,9 @@
+@@ -1749,6 +1749,9 @@
       name: "CSSPositionStickyStaticScrollPosition",
       status: "test",
     },
@@ -7,14 +7,16 @@ see https://w3c.github.io/webappsec-dbsc/#privacy-considerations

 License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
- .../metrics/chrome_browser_main_extra_parts_metrics.cc      | 6 ++++++
- net/features.gni                                            | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
+ .../metrics/chrome_browser_main_extra_parts_metrics.cc |  6 ++++++
+ net/BUILD.gn                                           |  7 +++++++
+ net/base/features.cc                                   | 10 ++++++----
+ net/features.gni                                       |  2 +-
+ 4 files changed, 20 insertions(+), 5 deletions(-)

 diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -124,6 +124,10 @@
+@@ -127,6 +127,10 @@
 #include "chrome/browser/signin/bound_session_credentials/unexportable_key_service_factory.h"
 #endif  // BUILDFLAG(IS_MAC)
 
@@ -25,7 +27,7 @@ diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b
 namespace {
 
 // The number of restarts to wait until removing the enable-benchmarking flag.
-@@ -884,7 +888,9 @@ void RecordStartupMetrics() {
+@@ -937,7 +941,9 @@ void RecordStartupMetrics() {
 #endif  // BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -35,6 +37,45 @@ diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b
 #endif  // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
 
   // Record whether Chrome is the default browser or not.
+diff --git a/net/BUILD.gn b/net/BUILD.gn
+--- a/net/BUILD.gn
+++ b/net/BUILD.gn
+@@ -1291,6 +1291,13 @@ component("net") {
+     ]
+   }
+ 
+  if (!enable_device_bound_sessions) {
+    sources += [
+      "device_bound_sessions/session_error.cc",
+      "device_bound_sessions/session_error.h",
+    ]
+  }
+
+   if (enable_device_bound_sessions) {
+     sources += [
+       "device_bound_sessions/cookie_craving.cc",
+diff --git a/net/base/features.cc b/net/base/features.cc
+--- a/net/base/features.cc
+++ b/net/base/features.cc
+@@ -362,12 +362,14 @@ BASE_FEATURE(kUseNetworkPathMonitorForNetworkChangeNotifier,
+ );
+ #endif  // BUILDFLAG(IS_APPLE)
+ 
+-#if BUILDFLAG(IS_WIN)
+-BASE_FEATURE(kDeviceBoundSessions, base::FEATURE_ENABLED_BY_DEFAULT);
+-#else
+ BASE_FEATURE(kDeviceBoundSessions, base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kPersistDeviceBoundSessions,
+#if BUILDFLAG(IS_WIN) && BUILDFLAG(ENABLE_DEVICE_BOUND_SESSIONS)
+    base::FEATURE_ENABLED_BY_DEFAULT
+#else
+    base::FEATURE_DISABLED_BY_DEFAULT
+);
+ #endif
+-BASE_FEATURE(kPersistDeviceBoundSessions, base::FEATURE_ENABLED_BY_DEFAULT);
+ BASE_FEATURE_PARAM(bool,
+                    kDeviceBoundSessionsRefreshQuota,
+                    &kDeviceBoundSessions,
 diff --git a/net/features.gni b/net/features.gni
 --- a/net/features.gni
 +++ b/net/features.gni
@@ -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
-@@ -85,4 +85,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
+@@ -80,4 +80,7 @@ bool IsWebFeedEnabledForLocale(const std::string& country) {
          !base::FeatureList::IsEnabled(kWebFeedKillSwitch);
 }
 
@@ -22,7 +22,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../firstrun/VariationsSeedFetcher.java       | 36 +++----------------
 components/variations/net/BUILD.gn            |  2 --
 .../omnibox_autofocus_url_loader_throttle.cc  |  1 +
- .../variations/net/variations_http_headers.cc |  2 ++
+ .../variations/net/variations_http_headers.cc |  2 +-
 .../net/variations_url_loader_throttle.cc     |  1 +
 .../service/variations_field_trial_creator.cc |  6 ++--
 .../variations/service/variations_service.cc  | 19 ++--------
@@ -34,14 +34,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
 .../Disable-fetching-of-all-field-trials.inc  |  1 +
 .../renderer/core/loader/document_loader.cc   |  7 ----
 .../platform/loader/fetch/resource_request.h  |  1 -
- 27 files changed, 31 insertions(+), 90 deletions(-)
+ 27 files changed, 30 insertions(+), 91 deletions(-)
 create mode 100644 cromite_flags/net/base/features_cc/Disable-fetching-of-all-field-trials.inc
 create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-fetching-of-all-field-trials.inc

 diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
 --- a/android_webview/browser/aw_browser_context.cc
 +++ b/android_webview/browser/aw_browser_context.cc
-@@ -496,6 +496,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
+@@ -508,6 +508,7 @@ AwBrowserContext::RetrieveInProgressDownloadManager() {
 
 content::OriginTrialsControllerDelegate*
 AwBrowserContext::GetOriginTrialsControllerDelegate() {
@@ -75,7 +75,7 @@ diff --git a/android_webview/common/aw_content_client.cc b/android_webview/commo
 diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/BUILD.gn
 --- a/android_webview/nonembedded/BUILD.gn
 +++ b/android_webview/nonembedded/BUILD.gn
-@@ -107,7 +107,6 @@ android_library("services_java") {
+@@ -108,7 +108,6 @@ android_library("services_java") {
     "java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
     "java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
     "java/src/org/chromium/android_webview/services/AwNetLogService.java",
@@ -83,7 +83,7 @@ diff --git a/android_webview/nonembedded/BUILD.gn b/android_webview/nonembedded/
     "java/src/org/chromium/android_webview/services/ComponentUpdaterResetSafeModeAction.java",
     "java/src/org/chromium/android_webview/services/ComponentUpdaterSafeModeUtils.java",
     "java/src/org/chromium/android_webview/services/ComponentsProviderPathUtil.java",
-@@ -126,7 +125,6 @@ android_library("services_java") {
+@@ -127,7 +126,6 @@ android_library("services_java") {
     "java/src/org/chromium/android_webview/services/SafeModeService.java",
     "java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java",
     "java/src/org/chromium/android_webview/services/StartupFeatureMetadataHolder.java",
@@ -285,15 +285,15 @@ diff --git a/components/variations/net/omnibox_autofocus_url_loader_throttle.cc
 diff --git a/components/variations/net/variations_http_headers.cc b/components/variations/net/variations_http_headers.cc
 --- a/components/variations/net/variations_http_headers.cc
 +++ b/components/variations/net/variations_http_headers.cc
-@@ -252,6 +252,8 @@ class VariationsHeaderHelper {
-   VariationsHeaderHelper& operator=(const VariationsHeaderHelper&) = delete;
+@@ -140,7 +140,7 @@ bool ShouldAppendVariationsHeader(const GURL& url, InIncognito incognito) {
+ std::optional<std::string> GetHeaderValue(
+     variations::mojom::VariationsHeadersPtr variations_headers,
+     bool is_first_party_context) {
+-  if (!variations_headers) {
+  if (((true))) {
+     return std::nullopt;
+   }
 
-   bool AppendHeaderIfNeeded(const GURL& url, InIncognito incognito) {
-+    if((true)) return false;
-+
-     // Note the criteria for attaching client experiment headers:
-     // 1. We only transmit to Google owned domains which can evaluate
-     // experiments.
 diff --git a/components/variations/net/variations_url_loader_throttle.cc b/components/variations/net/variations_url_loader_throttle.cc
 --- a/components/variations/net/variations_url_loader_throttle.cc
 +++ b/components/variations/net/variations_url_loader_throttle.cc
@@ -308,7 +308,7 @@ diff --git a/components/variations/net/variations_url_loader_throttle.cc b/compo
 diff --git a/components/variations/service/variations_field_trial_creator.cc b/components/variations/service/variations_field_trial_creator.cc
 --- a/components/variations/service/variations_field_trial_creator.cc
 +++ b/components/variations/service/variations_field_trial_creator.cc
-@@ -130,6 +130,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
+@@ -123,6 +123,7 @@ Study::CpuArchitecture GetCurrentCpuArchitecture() {
 }
 
 #if BUILDFLAG(FIELDTRIAL_TESTING_ENABLED)
@@ -316,7 +316,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/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
-@@ -373,9 +374,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
+@@ -349,9 +350,6 @@ bool VariationsFieldTrialCreator::SetUpFieldTrials(
         metrics_state_manager->GetLowEntropySource());
   }
 
@@ -326,7 +326,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
   platform_field_trials->RegisterFeatureOverrides(feature_list.get());
 
   base::FeatureList::SetInstance(std::move(feature_list));
-@@ -721,6 +719,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+@@ -656,6 +654,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
     base::FeatureList* feature_list,
     SafeSeedManager* safe_seed_manager,
     std::unique_ptr<ClientFilterableState> client_state) {
@@ -334,7 +334,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
   TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed");
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   CHECK(!create_trials_from_seed_called_);
-@@ -840,6 +839,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
+@@ -768,6 +767,7 @@ CreateTrialsResult VariationsFieldTrialCreator::CreateTrialsFromSeed(
 
 void VariationsFieldTrialCreator::LoadSeedFromJsonFile(
     const base::FilePath& json_seed_path) {
@@ -345,7 +345,7 @@ diff --git a/components/variations/service/variations_field_trial_creator.cc b/c
 diff --git a/components/variations/service/variations_service.cc b/components/variations/service/variations_service.cc
 --- a/components/variations/service/variations_service.cc
 +++ b/components/variations/service/variations_service.cc
-@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
+@@ -222,22 +222,7 @@ bool GetInstanceManipulations(const net::HttpResponseHeaders* headers,
 // Variations seed fetching is only enabled in official Chrome builds, if a URL
 // is specified on the command line, and for testing.
 bool IsFetchingEnabled() {
@@ -369,7 +369,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
-@@ -636,7 +621,7 @@ bool VariationsService::DoFetchFromURL(const GURL& url, bool is_http_retry) {
+@@ -630,7 +615,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.
@@ -390,7 +390,7 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
 
   ClientHintsControllerDelegate* client_hint_delegate =
       browser_context->GetClientHintsControllerDelegate();
-@@ -139,11 +137,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
+@@ -140,11 +138,6 @@ CreateContentBrowserURLLoaderThrottlesForKeepAlive(
   std::vector<std::unique_ptr<blink::URLLoaderThrottle>> throttles =
       GetContentClient()->browser()->CreateURLLoaderThrottlesForKeepAlive(
           browser_context, frame_tree_node_id);
@@ -400,8 +400,8 @@ diff --git a/content/browser/loader/url_loader_throttles.cc b/content/browser/lo
 -  variations::VariationsURLLoaderThrottle::AppendThrottleIfNeeded(
 -      browser_context->GetVariationsClient(), &throttles);
 
-   auto throttle = MaybeCreateIdentityUrlLoaderThrottle(base::BindRepeating(
-       webid::SetIdpSigninStatus, browser_context, frame_tree_node_id));
+   return throttles;
+ }
 diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/browser/origin_trials/origin_trials_utils.cc
 --- a/content/browser/origin_trials/origin_trials_utils.cc
 +++ b/content/browser/origin_trials/origin_trials_utils.cc
@@ -417,7 +417,7 @@ diff --git a/content/browser/origin_trials/origin_trials_utils.cc b/content/brow
 diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
 --- a/content/browser/renderer_host/navigation_request.cc
 +++ b/content/browser/renderer_host/navigation_request.cc
-@@ -836,6 +836,7 @@ void PersistOriginTrialsFromHeaders(
+@@ -875,6 +875,7 @@ void PersistOriginTrialsFromHeaders(
     const network::mojom::URLResponseHead* response,
     BrowserContext* browser_context,
     ukm::SourceId source_id) {
@@ -458,7 +458,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
-@@ -211,13 +211,6 @@ std::vector<int> CopyInitiatorOriginTrials(
+@@ -215,13 +215,6 @@ std::vector<int> CopyInitiatorOriginTrials(
     const Vector<mojom::blink::OriginTrialFeature>&
         initiator_origin_trial_features) {
   std::vector<int> result;
@@ -475,7 +475,7 @@ diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_p
 diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
 --- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h
 +++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
-@@ -568,7 +568,6 @@ class PLATFORM_EXPORT ResourceRequestHead {
+@@ -586,7 +586,6 @@ class PLATFORM_EXPORT ResourceRequestHead {
   }
   void SetTrustTokenParams(
       std::optional<network::mojom::blink::TrustTokenParams> params) {
@@ -31,7 +31,7 @@ new file mode 100644
 diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 --- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
 +++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5
-@@ -385,6 +385,7 @@
+@@ -394,6 +394,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
-@@ -228,6 +228,11 @@
+@@ -229,6 +229,11 @@
       name: "AcceleratedSmallCanvases",
       status: "stable",
     },
@@ -0,0 +1,823 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Fri, 21 Apr 2023 13:10:20 +0000
+Subject: Disable integration with Gemini
+
+Due to errors, some points are not covered by the gn arg check.
+This patch fixes build errors.
+
+License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
+---
+ chrome/android/BUILD.gn                       |  2 -
+ .../android/java/res/xml/main_preferences.xml |  5 --
+ .../chrome/browser/ChromeTabbedActivity.java  |  6 +--
+ .../chrome/browser/SnackbarActivity.java      |  2 -
+ .../chrome/browser/ntp/NewTabPage.java        |  2 -
+ .../browser/settings/SettingsActivity.java    |  2 -
+ .../search/SearchIndexProviderRegistry.java   |  1 -
+ .../TabbedAdaptiveToolbarBehavior.java        |  8 ---
+ .../TabbedAppMenuPropertiesDelegate.java      |  7 +--
+ .../tabbed_mode/TabbedRootUiCoordinator.java  |  4 +-
+ chrome/browser/BUILD.gn                       |  8 ++-
+ chrome/browser/actor/BUILD.gn                 |  3 --
+ chrome/browser/android/tab_features.cc        |  4 ++
+ chrome/browser/android/tab_features.h         |  4 ++
+ .../browser/chrome_content_browser_client.cc  |  4 +-
+ chrome/browser/extensions/api/BUILD.gn        |  2 +-
+ .../api/experimental_actor/BUILD.gn           |  2 +-
+ .../experimental_actor_api.cc                 | 11 +----
+ .../api/experimental_ai_data/BUILD.gn         |  2 +-
+ .../experimental_ai_data_api.cc               | 49 ++-----------------
+ .../api/pdf_viewer_private/BUILD.gn           |  3 --
+ .../pdf_viewer_private_api.cc                 | 43 +---------------
+ chrome/browser/glic/BUILD.gn                  |  4 +-
+ chrome/browser/glic/android/BUILD.gn          |  2 +-
+ chrome/browser/glic/public/glic_enabling.cc   |  1 +
+ chrome/browser/pdf/BUILD.gn                   |  1 -
+ chrome/browser/profiles/BUILD.gn              |  2 +-
+ ...hrome_browser_main_extra_parts_profiles.cc |  2 +-
+ chrome/browser/sync/BUILD.gn                  |  4 +-
+ chrome/browser/sync/test/integration/BUILD.gn |  2 +-
+ chrome/browser/ui/BUILD.gn                    |  2 +-
+ chrome/browser/ui/pdf/BUILD.gn                |  1 -
+ .../pdf/chrome_pdf_document_helper_client.cc  |  2 +
+ .../ui/tabs/alert/tab_alert_controller.cc     |  2 +
+ chrome/common/BUILD.gn                        |  1 +
+ chrome/common/chrome_features.cc              |  1 +
+ chrome/common/features.gni                    |  2 +
+ chrome/test/BUILD.gn                          | 10 ++--
+ components/browser_sync/BUILD.gn              |  2 +-
+ 39 files changed, 51 insertions(+), 164 deletions(-)
+
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
+@@ -372,8 +372,6 @@ if (_is_default_toolchain) {
+       "//chrome/browser/creator/android:java",
+       "//chrome/browser/data_sharing:factory_java",
+       "//chrome/browser/data_sharing:instant_message_delegate_factory_java",
+-      "//chrome/browser/glic:public_java",
+-      "//chrome/browser/glic/android:java",
+       "//chrome/browser/page_content_annotations:factory_java",
+       "//chrome/browser/prefs/android:java",
+       "//chrome/browser/settings:search_java",
+diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
+--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
+@@ -106,11 +106,6 @@ found in the LICENSE file.
+         android:order="19"
+         android:title="@string/tabs_settings_title"
+         app:isPreferenceVisible="false"/>
+-    <Preference
+-        android:fragment="org.chromium.chrome.browser.glic.GlicSettings"
+-        android:key="glic"
+-        android:order="20"
+-        android:title="@string/glic_button_entrypoint_label"/>
+     <Preference
+         android:fragment="org.chromium.chrome.browser.homepage.settings.HomepageSettings"
+         android:key="homepage"
+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
+@@ -1129,10 +1129,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt
+                             mXrSceneCoreSessionManagerSupplier.get(),
+                             mBackPressManager,
+                             getSnackbarManager(),
+-                            /* glicClickHandler= */ () ->
+-                                    ((TabbedRootUiCoordinator) mRootUiCoordinator)
+-                                            .toggleGlic(),
+-                            /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager(false));
+                            /* glicClickHandler= */ () -> {},
+                            /*browserControlsManagerSupplier*/ () -> getBrowserControlsManager());
+             mLayoutStateProviderSupplier.set(mLayoutManager);
+         }
+     }
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/SnackbarActivity.java
+@@ -12,7 +12,6 @@ import androidx.annotation.CallSuper;
+ 
+ import org.chromium.build.annotations.NullMarked;
+ import org.chromium.build.annotations.Nullable;
+-import org.chromium.chrome.browser.glic.GlicHelper;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.ParentOverrideSlot;
+ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
+@@ -45,7 +44,6 @@ public abstract class SnackbarActivity extends SynchronousInitializationActivity
+         getProfileSupplier()
+                 .runSyncOrOnAvailable(
+                         (profile) -> {
+-                            GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, profile, this);
+                         });
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.feed.FeedSurfaceProvider;
+ import org.chromium.chrome.browser.feed.FeedSwipeRefreshLayout;
+ import org.chromium.chrome.browser.feed.NtpFeedSurfaceLifecycleManager;
+ import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator;
+-import org.chromium.chrome.browser.glic.GlicHelper;
+ import org.chromium.chrome.browser.layouts.LayoutType;
+ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+ import org.chromium.chrome.browser.lifecycle.LifecycleObserver;
+@@ -967,7 +966,6 @@ public class NewTabPage
+         mLastShownTimeNs = System.nanoTime();
+         RecordUserAction.record("MobileNTPShown");
+         SuggestionsMetrics.recordSurfaceVisible();
+-        GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, mTab.getProfile(), mActivity);
+     }
+ 
+     /** Records UMA for the NTP being hidden and the time spent on it. */
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+@@ -58,7 +58,6 @@ import org.chromium.chrome.browser.back_press.BackPressHelper.OnKeyDownHandler;
+ import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate;
+ import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
+ import org.chromium.chrome.browser.flags.ChromeFeatureList;
+-import org.chromium.chrome.browser.glic.GlicHelper;
+ import org.chromium.chrome.browser.init.ActivityLifecycleDispatcherImpl;
+ import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
+ import org.chromium.chrome.browser.lifetime.ApplicationLifetime;
+@@ -855,7 +854,6 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
+     @Override
+     protected void onStart() {
+         super.onStart();
+-        GlicHelper.maybeShowGlicTaskInProgressSnackbar(this, mProfile, this);
+     }
+ 
+     @Override
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
+@@ -35,7 +35,6 @@ public final class SearchIndexProviderRegistry {
+                             .SEARCH_INDEX_DATA_PROVIDER,
+                     org.chromium.chrome.browser.contextualsearch.ContextualSearchSettingsFragment
+                             .SEARCH_INDEX_DATA_PROVIDER,
+-                    org.chromium.chrome.browser.glic.GlicSettings.SEARCH_INDEX_DATA_PROVIDER,
+                     org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings
+                             .SEARCH_INDEX_DATA_PROVIDER,
+                     org.chromium.chrome.browser.homepage.settings.HomepageSettings
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAdaptiveToolbarBehavior.java
+@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.ai.PageSummaryButtonController;
+ import org.chromium.chrome.browser.bookmarks.AddToBookmarksToolbarButtonController;
+ import org.chromium.chrome.browser.bookmarks.BookmarkModel;
+ import org.chromium.chrome.browser.bookmarks.TabBookmarker;
+-import org.chromium.chrome.browser.glic.GlicToolbarButtonController;
+ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
+ import org.chromium.chrome.browser.tab_group_suggestion.toolbar.GroupSuggestionsButtonController;
+ import org.chromium.chrome.browser.tab_group_suggestion.toolbar.GroupSuggestionsButtonDataProvider;
+@@ -125,13 +124,6 @@ public class TabbedAdaptiveToolbarBehavior implements AdaptiveToolbarBehavior {
+             controller.addButtonVariant(AdaptiveToolbarButtonVariant.TAB_GROUPING, tabGrouping);
+         }
+ 
+-        if (AdaptiveToolbarFeatures.isGlicActionEnabled()) {
+-            controller.addButtonVariant(
+-                    AdaptiveToolbarButtonVariant.GLIC,
+-                    new GlicToolbarButtonController(
+-                            mContext, mActivityTabProvider, mToggleGlicCallback, trackerSupplier));
+-        }
+-
+         mRegisterVoiceSearchRunnable.run();
+     }
+ 
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java
+@@ -1407,12 +1407,7 @@ public class TabbedAppMenuPropertiesDelegate extends AppMenuPropertiesDelegateIm
+                 || !ChromeFeatureList.sGlic.isEnabled()) {
+             return null;
+         }
+-        return new MVCListAdapter.ListItem(
+-                AppMenuHandler.AppMenuItemType.STANDARD,
+-                buildModelForStandardMenuItem(
+-                        R.id.glic_menu_id,
+-                        R.string.glic_button_entrypoint_ask_gemini_label,
+-                        shouldShowIconBeforeItem() ? R.drawable.ic_spark_24dp : Resources.ID_NULL));
+        return null;
+     }
+ 
+     /**
+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
+@@ -111,7 +111,6 @@ import org.chromium.chrome.browser.gesturenav.GestureUserEducationIphController;
+ import org.chromium.chrome.browser.gesturenav.HistoryNavigationCoordinator;
+ import org.chromium.chrome.browser.gesturenav.NavigationSheet;
+ import org.chromium.chrome.browser.gesturenav.TabbedSheetDelegate;
+-import org.chromium.chrome.browser.glic.GlicKeyedServiceHandler;
+ import org.chromium.chrome.browser.history.HistoryManagerUtils;
+ import org.chromium.chrome.browser.hub.HubManager;
+ import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthCoordinatorFactory;
+@@ -2394,8 +2393,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+         Profile profile = mTabModelSelectorSupplier.get().getCurrentModel().getProfile();
+         assert profile != null;
+ 
+-        return GlicKeyedServiceHandler.toggleGlic(
+-                profile, mChromeAndroidTaskSupplier.get(), preventClose);
+        return false;
+     }
+ 
+     /* package */ KeyboardFocusRowManager getKeyboardFocusRowManagerForTesting() {
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
+@@ -1101,7 +1101,7 @@ static_library("browser") {
+     "//chrome/browser/ntp_tiles:impl",
+     "//chrome/browser/memory:impl",
+     "//chrome/browser/preloading/search_preload:search_preload",
+-    "//chrome/browser/ai:impl",
+    # "//chrome/browser/ai:impl",
+     "//chrome/browser/autofill",
+ 
+     # speech:impl includes headers from the browser monolith (e.g.
+@@ -1426,8 +1426,8 @@ static_library("browser") {
+     "//chrome/browser/accessibility_annotator/first_run",
+     "//chrome/browser/account_settings",
+     "//chrome/browser/affiliations",
+-    "//chrome/browser/ai",
+-    "//chrome/browser/ai:impl",
+    # "//chrome/browser/ai",
+    # "//chrome/browser/ai:impl",
+     "//chrome/browser/app_mode",
+     "//chrome/browser/autocomplete",
+     "//chrome/browser/autocomplete:aim_eligibility_service",
+@@ -3083,8 +3083,6 @@ static_library("browser") {
+       "//chrome/browser/flags:flags_android_impl",
+       "//chrome/browser/gesturenav/android:gesturenav",
+       "//chrome/browser/gesturenav/android:impl",
+-      "//chrome/browser/glic/android",
+-      "//chrome/browser/glic/android:jni_headers",
+       "//chrome/browser/keyboard_accessory/android",
+       "//chrome/browser/language/android:jni_headers",
+       "//chrome/browser/lifetime/android:jni_headers",
+diff --git a/chrome/browser/actor/BUILD.gn b/chrome/browser/actor/BUILD.gn
+--- a/chrome/browser/actor/BUILD.gn
+++ b/chrome/browser/actor/BUILD.gn
+@@ -402,9 +402,6 @@ source_set("browser_tests") {
+     ":tools_test_support",
+     "ui:event_dispatcher",
+     "//chrome/browser/affiliations",
+-    "//chrome/browser/glic",
+-    "//chrome/browser/glic/actor:browser_tests",
+-    "//chrome/browser/glic/test_support",
+     "//chrome/browser/lookalikes:test_support",
+     "//chrome/browser/optimization_guide",
+     "//chrome/browser/optimization_guide:test_support",
+diff --git a/chrome/browser/android/tab_features.cc b/chrome/browser/android/tab_features.cc
+--- a/chrome/browser/android/tab_features.cc
+++ b/chrome/browser/android/tab_features.cc
+@@ -12,9 +12,11 @@
+ #include "chrome/browser/actor/android/ui/actor_ui_tab_controller_android.h"
+ #include "chrome/browser/glic/public/features.h"
+ #include "chrome/browser/glic/public/glic_enabling.h"
+#if BUILDFLAG(ENABLE_GLIC)
+ #include "chrome/browser/glic/public/widget/glic_side_panel_coordinator_android.h"
+ #include "chrome/browser/glic/public/widget/glic_side_panel_coordinator_desktop_android.h"
+ #include "chrome/browser/glic/service/glic_instance_helper.h"
+#endif
+ #include "chrome/browser/net/qwac_web_contents_observer.h"
+ #include "chrome/browser/preloading/new_tab_page_preload/new_tab_page_preload_pipeline_manager.h"
+ #include "chrome/browser/profiles/profile.h"
+@@ -73,6 +75,7 @@ TabFeatures::TabFeatures(content::WebContents* web_contents, Profile* profile) {
+       GetUserDataFactory().CreateInstance<lens::TabContextualizationController>(
+           *tab, tab);
+ 
+#if BUILDFLAG(ENABLE_GLIC)
+   glic_instance_helper_ =
+       GetUserDataFactory().CreateInstance<glic::GlicInstanceHelper>(*tab, tab);
+   if (AndroidSidePanelEnabledFn::IsEnabled()) {
+@@ -85,6 +88,7 @@ TabFeatures::TabFeatures(content::WebContents* web_contents, Profile* profile) {
+         GetUserDataFactory()
+             .CreateInstance<glic::GlicSidePanelCoordinatorAndroid>(*tab, tab);
+   }
+#endif
+ }
+ 
+ TabFeatures::~TabFeatures() = default;
+diff --git a/chrome/browser/android/tab_features.h b/chrome/browser/android/tab_features.h
+--- a/chrome/browser/android/tab_features.h
+++ b/chrome/browser/android/tab_features.h
+@@ -27,10 +27,12 @@ namespace content {
+ class WebContents;
+ }  // namespace content
+ 
+#if BUILDFLAG(ENABLE_GLIC)
+ namespace glic {
+ class GlicInstanceHelper;
+ class GlicSidePanelCoordinator;
+ }  // namespace glic
+#endif
+ 
+ namespace sync_sessions {
+ class SyncSessionsRouterTabHelper;
+@@ -75,8 +77,10 @@ class TabFeatures {
+   std::unique_ptr<lens::TabContextualizationController>
+       tab_contextualization_controller_;
+ 
+#if BUILDFLAG(ENABLE_GLIC)
+   std::unique_ptr<glic::GlicInstanceHelper> glic_instance_helper_;
+   std::unique_ptr<glic::GlicSidePanelCoordinator> glic_side_panel_coordinator_;
+#endif
+   std::unique_ptr<actor::ui::ActorUiTabControllerInterface>
+       actor_ui_tab_controller_;
+ };
+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
+@@ -789,8 +789,6 @@ using web_apps::ChromeContentBrowserClientIsolatedWebAppsPart;
+ 
+ namespace {
+ 
+-const char kAIManagerUserDataKey[] = "ai_manager";
+-
+ #if BUILDFLAG(IS_MAC)
+ constexpr char kSecurePaymentConfirmationKeychainAccessGroup[] =
+     MAC_TEAM_IDENTIFIER_STRING "." MAC_BUNDLE_IDENTIFIER_STRING
+@@ -8758,6 +8756,7 @@ void ChromeContentBrowserClient::BindAIManager(
+     base::SupportsUserData* context_user_data,
+     content::RenderFrameHost* rfh,
+     mojo::PendingReceiver<blink::mojom::AIManager> receiver) {
+#if false
+   if (!context_user_data->GetUserData(kAIManagerUserDataKey)) {
+     context_user_data->SetUserData(
+         kAIManagerUserDataKey,
+@@ -8767,6 +8766,7 @@ void ChromeContentBrowserClient::BindAIManager(
+   AIManager* ai_manager = static_cast<AIManager*>(
+       context_user_data->GetUserData(kAIManagerUserDataKey));
+   ai_manager->AddReceiver(std::move(receiver));
+#endif
+ }
+ 
+ #if BUILDFLAG(ENABLE_ON_DEVICE_TRANSLATION)
+diff --git a/chrome/browser/extensions/api/BUILD.gn b/chrome/browser/extensions/api/BUILD.gn
+--- a/chrome/browser/extensions/api/BUILD.gn
+++ b/chrome/browser/extensions/api/BUILD.gn
+@@ -132,7 +132,7 @@ function_registration("api_registration") {
+     "//components/policy/proto",
+ 
+     # Different APIs include headers from these targets.
+-    "//chrome/browser/ai",
+    # "//chrome/browser/ai",
+     "//chrome/common",
+     "//chrome/common:mojo_bindings",
+     "//components/autofill/core/common/mojom:mojo_types",
+diff --git a/chrome/browser/extensions/api/experimental_actor/BUILD.gn b/chrome/browser/extensions/api/experimental_actor/BUILD.gn
+--- a/chrome/browser/extensions/api/experimental_actor/BUILD.gn
+++ b/chrome/browser/extensions/api/experimental_actor/BUILD.gn
+@@ -19,7 +19,7 @@ source_set("experimental_actor") {
+   deps = [
+     "//base",
+     "//chrome/browser/actor",
+-    "//chrome/browser/ai",
+    # "//chrome/browser/ai",
+     "//chrome/browser/extensions",
+     "//chrome/browser/ui",
+   ]
+diff --git a/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc b/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
+--- a/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
+++ b/chrome/browser/extensions/api/experimental_actor/experimental_actor_api.cc
+@@ -126,17 +126,10 @@ ExperimentalActorApiFunction::ExperimentalActorApiFunction() = default;
+ ExperimentalActorApiFunction::~ExperimentalActorApiFunction() = default;
+ 
+ bool ExperimentalActorApiFunction::PreRunValidation(std::string* error) {
+-  if (GetCurrentChannel() == version_info::Channel::STABLE &&
+-      !AiDataKeyedService::IsExtensionAllowlistedForStable(extension_id())) {
+-    *error = "API access not allowed on this channel.";
+  if ((false)) {
+    *error = "API not allowed.";
+     return false;
+   }
+-
+-  if (!AiDataKeyedService::IsExtensionAllowlistedForActions(extension_id())) {
+-    *error = "Actions API access restricted for this extension.";
+-    return false;
+-  }
+-
+   auto* actor_service = actor::ActorKeyedService::Get(browser_context());
+   if (!actor_service) {
+     *error = "Incognito profile not supported.";
+diff --git a/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn b/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
+--- a/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
+++ b/chrome/browser/extensions/api/experimental_ai_data/BUILD.gn
+@@ -17,7 +17,7 @@ source_set("experimental_ai_data") {
+ 
+   deps = [
+     "//base",
+-    "//chrome/browser/ai",
+    # "//chrome/browser/ai",
+     "//chrome/browser/extensions",
+     "//chrome/browser/ui",
+     "//pdf/mojom",
+diff --git a/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc b/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
+--- a/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
+++ b/chrome/browser/extensions/api/experimental_ai_data/experimental_ai_data_api.cc
+@@ -28,26 +28,10 @@ ExperimentalAiDataApiFunction::ExperimentalAiDataApiFunction() = default;
+ ExperimentalAiDataApiFunction::~ExperimentalAiDataApiFunction() = default;
+ 
+ bool ExperimentalAiDataApiFunction::PreRunValidation(std::string* error) {
+-  // Check the allowlist and return an error if extension is not allow listed.
+-  if (!AiDataKeyedService::IsExtensionAllowlistedForData(extension_id())) {
+-    *error = "API access restricted for this extension.";
+  if ((false)) {
+    *error = "API not allowed.";
+     return false;
+   }
+-
+-  if (GetCurrentChannel() == version_info::Channel::STABLE &&
+-      !AiDataKeyedService::IsExtensionAllowlistedForStable(extension_id())) {
+-    *error = "API access not allowed on this channel.";
+-    return false;
+-  }
+-
+-  auto* ai_data_service =
+-      AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
+-  if (!ai_data_service) {
+-    *error = "Incognito profile not supported.";
+-    return false;
+-  }
+-  DCHECK(ai_data_service);
+-
+   return true;
+ }
+ 
+@@ -82,15 +66,7 @@ ExtensionFunction::ResponseAction ExperimentalAiDataGetAiDataFunction::Run() {
+   }
+   DCHECK(web_contents);
+ 
+-  auto* ai_data_service =
+-      AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
+-  DCHECK(ai_data_service);
+-
+-  ai_data_service->GetAiData(
+-      params->dom_node_id, web_contents, params->user_input,
+-      base::BindOnce(&ExperimentalAiDataGetAiDataFunction::OnDataCollected,
+-                     this));
+-  return RespondLater();
+  return RespondNow(Error("Invalid api."));
+ }
+ 
+ ExperimentalAiDataGetAiDataWithSpecifierFunction::
+@@ -111,24 +87,7 @@ ExperimentalAiDataGetAiDataWithSpecifierFunction::Run() {
+   }
+   DCHECK(web_contents);
+ 
+-  auto* ai_data_service =
+-      AiDataKeyedServiceFactory::GetAiDataKeyedService(browser_context());
+-  DCHECK(ai_data_service);
+-
+-  // De-serailizing protos is safe per
+-  // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/security/rule-of-2.md
+-  optimization_guide::proto::ModelPrototypingCollectionSpecifier specifier;
+-  if (!specifier.ParseFromArray(params->ai_data_specifier.data(),
+-                                params->ai_data_specifier.size())) {
+-    return RespondNow(Error("Parsing ai data specifier failed."));
+-  }
+-
+-  ai_data_service->GetAiDataWithSpecifier(
+-      web_contents, specifier,
+-      base::BindOnce(
+-          &ExperimentalAiDataGetAiDataWithSpecifierFunction::OnDataCollected,
+-          this));
+-  return RespondLater();
+  return RespondNow(Error("Invalid api."));
+ }
+ 
+ }  // namespace extensions
+diff --git a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
+--- a/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
+++ b/chrome/browser/extensions/api/pdf_viewer_private/BUILD.gn
+@@ -19,7 +19,6 @@ source_set("pdf_viewer_private") {
+   deps = [
+     "//base",
+     "//chrome/browser/extensions",
+-    "//chrome/browser/glic",
+     "//chrome/browser/pdf",
+     "//chrome/browser/pdf:pdf_pref_names",
+     "//chrome/browser/profiles:profile",
+@@ -48,8 +47,6 @@ source_set("browser_tests") {
+   sources = [ "pdf_viewer_private_browsertest.cc" ]
+   deps = [
+     ":pdf_viewer_private",
+-    "//chrome/browser/glic",
+-    "//chrome/browser/glic/test_support",
+     "//chrome/test:test_support",
+     "//content/test:test_support",
+   ]
+diff --git a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc b/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
+--- a/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
+++ b/chrome/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc
+@@ -12,9 +12,6 @@
+ #include "base/numerics/safe_conversions.h"
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/values.h"
+-#include "chrome/browser/glic/public/glic_enabling.h"
+-#include "chrome/browser/glic/public/glic_keyed_service.h"
+-#include "chrome/browser/glic/public/glic_keyed_service_factory.h"
+ #include "chrome/browser/pdf/pdf_pref_names.h"
+ #include "chrome/browser/pdf/pdf_viewer_stream_manager.h"
+ #include "chrome/browser/profiles/profile.h"
+@@ -57,8 +54,6 @@ namespace SetPdfPluginAttributes =
+ 
+ namespace SetPdfDocumentTitle = api::pdf_viewer_private::SetPdfDocumentTitle;
+ 
+-constexpr char kSummarizePrompt[] = "Summarize this document";
+-
+ // Check if the current URL is allowed based on a list of allowlisted domains.
+ bool IsUrlAllowedToEmbedLocalFiles(const GURL& current_url,
+                                    const base::ListValue& allowlisted_domains) {
+@@ -321,43 +316,7 @@ ExtensionFunction::ResponseAction PdfViewerPrivateGlicSummarizeFunction::Run() {
+     return RespondNow(Error("No tab."));
+   }
+ 
+-  if (!glic::GlicEnabling::IsEnabledForProfile(
+-          Profile::FromBrowserContext(contents->GetBrowserContext()))) {
+-    return RespondNow(Error("Glic is not enabled."));
+-  }
+-
+-  glic::GlicKeyedService* glic_service =
+-      glic::GlicKeyedServiceFactory::GetGlicKeyedService(
+-          contents->GetBrowserContext());
+-  CHECK(glic_service);
+-
+-  int arm = features::kPdfGlicSummarizeArm.Get();
+-  bool has_consented = glic::GlicEnabling::HasConsentedForProfile(
+-      Profile::FromBrowserContext(contents->GetBrowserContext()));
+-
+-  glic::GlicInvokeOptions options{
+-      glic::mojom::InvocationSource::kPdfSummarizeButton};
+-  options.prompts.push_back(kSummarizePrompt);
+-  options.conversation = glic::NewConversation();
+-
+-  if (has_consented) {
+-    glic_service->InvokeWithAutoSubmit(
+-        glic::InvokeWithAutoSubmitPasskeyProvider::GetPassKey(), tab_interface,
+-        std::move(options));
+-  } else {
+-    if (arm == 3) {
+-      options.fre_override = glic::mojom::FreOverride::kTrustFirstInline;
+-      glic_service->InvokeWithAutoSubmit(
+-          glic::InvokeWithAutoSubmitPasskeyProvider::GetPassKey(),
+-          tab_interface, std::move(options));
+-    } else {
+-      options.fre_override = glic::mojom::FreOverride::kTrustFirstText;
+-      glic_service->Invoke(tab_interface, std::move(options));
+-    }
+-  }
+-
+-  success = true;
+-  return RespondNow(NoArguments());
+  return RespondNow(Error("Glic is not enabled."));
+ }
+ 
+ }  // namespace extensions
+diff --git a/chrome/browser/glic/BUILD.gn b/chrome/browser/glic/BUILD.gn
+--- a/chrome/browser/glic/BUILD.gn
+++ b/chrome/browser/glic/BUILD.gn
+@@ -458,9 +458,9 @@ source_set("impl") {
+   } else {  # is_android
+     deps += [
+       ":actor_types_for_migration",
+-      "//chrome/browser/glic/android",
+      #"//chrome/browser/glic/android",
+       "//chrome/browser/glic/android:jni_bridges",
+-      "//chrome/browser/ui/side_panel:side_panel_ui_provider",
+      #"//chrome/browser/ui/side_panel:side_panel_ui_provider",
+       "//chrome/browser/ui/side_panel/android",
+       "//ui/android",
+     ]
+diff --git a/chrome/browser/glic/android/BUILD.gn b/chrome/browser/glic/android/BUILD.gn
+--- a/chrome/browser/glic/android/BUILD.gn
+++ b/chrome/browser/glic/android/BUILD.gn
+@@ -87,7 +87,7 @@ source_set("jni_bridges") {
+   ]
+ }
+ 
+-source_set("android") {
+source_set("android_notused") {
+   sources = [
+     "glic_keyed_service_android.cc",
+     "glic_keyed_service_android.h",
+diff --git a/chrome/browser/glic/public/glic_enabling.cc b/chrome/browser/glic/public/glic_enabling.cc
+--- a/chrome/browser/glic/public/glic_enabling.cc
+++ b/chrome/browser/glic/public/glic_enabling.cc
+@@ -444,6 +444,7 @@ GlicGlobalEnabling::GlicGlobalEnabling(Delegate& delegate) {
+ GlicGlobalEnabling::~GlicGlobalEnabling() = default;
+ 
+ bool GlicGlobalEnabling::IsEnabledByFlags() {
+  if ((true)) return false;
+   if (g_bypass_enablement_checks_for_testing) {
+     return true;
+   }
+diff --git a/chrome/browser/pdf/BUILD.gn b/chrome/browser/pdf/BUILD.gn
+--- a/chrome/browser/pdf/BUILD.gn
+++ b/chrome/browser/pdf/BUILD.gn
+@@ -33,7 +33,6 @@ source_set("pdf") {
+     "//build:chromeos_buildflags",
+     "//chrome/browser:browser_process",
+     "//chrome/browser:resources",
+-    "//chrome/browser/glic",
+     "//chrome/browser/pdf:pdf_pref_names",
+     "//chrome/browser/profiles:profile",
+     "//chrome/browser/resources/pdf:resources",
+diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
+--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
+@@ -370,7 +370,7 @@ source_set("profiles_extra_parts_impl") {
+     "//chrome/browser/accessibility_annotator/first_run",
+     "//chrome/browser/account_settings",
+     "//chrome/browser/affiliations",
+-    "//chrome/browser/ai",
+    # "//chrome/browser/ai",
+     "//chrome/browser/autocomplete",
+     "//chrome/browser/autocomplete:aim_eligibility_service",
+     "//chrome/browser/autofill",
+diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+@@ -712,7 +712,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+   actor_login::ActorLoginPermissionCleaningServiceFactory::GetInstance();
+   actor_login::ActorLoginPermissionServiceFactory::GetInstance();
+   chrome_finds_internals::ChromeFindsAgentFactory::GetInstance();
+-  AiDataKeyedServiceFactory::GetInstance();
+  // AiDataKeyedServiceFactory::GetInstance();
+   AimEligibilityServiceFactory::GetInstance();
+ #if BUILDFLAG(IS_ANDROID)
+   AndroidProfileBrowserCollectionServiceFactory::GetInstance();
+diff --git a/chrome/browser/sync/BUILD.gn b/chrome/browser/sync/BUILD.gn
+--- a/chrome/browser/sync/BUILD.gn
+++ b/chrome/browser/sync/BUILD.gn
+@@ -105,7 +105,7 @@ source_set("sync") {
+     "//chrome/browser/password_manager/factories",
+     "//chrome/browser/plus_addresses",
+     "//chrome/browser/signin",
+-    "//chrome/browser/skills",
+    #"//chrome/browser/skills",
+     "//chrome/browser/subscription_eligibility",
+     "//chrome/browser/ui/sync",
+     "//chrome/browser/ui/toolbar",
+@@ -151,7 +151,7 @@ source_set("sync") {
+     "//components/saved_tab_groups/public",
+     "//components/send_tab_to_self",
+     "//components/sharing_message",
+-    "//components/skills/public",
+    #"//components/skills/public",
+     "//components/spellcheck:buildflags",
+     "//components/spellcheck/browser",
+     "//components/strings:components_strings_grit",
+diff --git a/chrome/browser/sync/test/integration/BUILD.gn b/chrome/browser/sync/test/integration/BUILD.gn
+--- a/chrome/browser/sync/test/integration/BUILD.gn
+++ b/chrome/browser/sync/test/integration/BUILD.gn
+@@ -266,7 +266,7 @@ source_set("sync_integration_tests_impl") {
+       "//chrome/browser/send_tab_to_self",
+       "//chrome/browser/send_tab_to_self:impl",
+       "//chrome/browser/sharing",
+-      "//chrome/browser/skills",
+      #"//chrome/browser/skills",
+       "//chrome/browser/themes",
+       "//chrome/browser/ui:ui_features",
+       "//chrome/browser/ui/send_tab_to_self",
+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
+@@ -279,7 +279,7 @@ static_library("ui") {
+     "//chrome/browser:font_pref",
+     "//chrome/browser:global_features",
+     "//chrome/browser/affiliations",
+-    "//chrome/browser/ai",
+    # "//chrome/browser/ai",
+     "//chrome/browser/autocomplete",
+     "//chrome/browser/autocomplete:aim_eligibility_service",
+     "//chrome/browser/autofill",
+diff --git a/chrome/browser/ui/pdf/BUILD.gn b/chrome/browser/ui/pdf/BUILD.gn
+--- a/chrome/browser/ui/pdf/BUILD.gn
+++ b/chrome/browser/ui/pdf/BUILD.gn
+@@ -15,7 +15,6 @@ source_set("pdf") {
+   ]
+   deps = [
+     "//chrome/browser/download",
+-    "//chrome/browser/glic",
+     "//chrome/browser/pdf",
+     "//chrome/browser/screen_ai:screen_ai_install_state",
+     "//chrome/browser/ui/tab_contents",
+diff --git a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+--- a/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+++ b/chrome/browser/ui/pdf/chrome_pdf_document_helper_client.cc
+@@ -66,6 +66,7 @@ void LogGlicSummarizeMetrics(content::RenderFrameHost* render_frame_host) {
+     return;
+   }
+ 
+#if BUILDFLAG(ENABLE_GLIC)
+   bool glic_enabled = glic::GlicEnabling::IsEnabledForProfile(
+       Profile::FromBrowserContext(web_contents_to_use->GetBrowserContext()));
+   base::UmaHistogramBoolean("PDF.GlicEnabled", glic_enabled);
+@@ -74,6 +75,7 @@ void LogGlicSummarizeMetrics(content::RenderFrameHost* render_frame_host) {
+           web_contents_to_use->GetBrowserContext());
+   base::UmaHistogramBoolean("PDF.GlicSummarizeButtonEnabled",
+                             glic_summarize_button_enabled);
+#endif
+ }
+ 
+ }  // namespace
+diff --git a/chrome/browser/ui/tabs/alert/tab_alert_controller.cc b/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
+--- a/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
+++ b/chrome/browser/ui/tabs/alert/tab_alert_controller.cc
+@@ -174,12 +174,14 @@ std::u16string TabAlertController::GetTabAlertStateText(
+     case TabAlert::kActorWaitingOnUser:
+       return l10n_util::GetStringUTF16(
+           IDS_TOOLTIP_TAB_ALERT_STATE_ACTOR_ACCESSING);
+#if BUILDFLAG(ENABLE_GLIC)
+     case TabAlert::kGlicAccessing:
+       return l10n_util::GetStringUTF16(
+           IDS_TOOLTIP_TAB_ALERT_STATE_GLIC_ACCESSING);
+     case TabAlert::kGlicSharing:
+       return l10n_util::GetStringUTF16(
+           IDS_TOOLTIP_TAB_ALERT_STATE_GLIC_SHARING);
+#endif
+   }
+   NOTREACHED();
+ }
+diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
+--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
+@@ -55,6 +55,7 @@ buildflag_header("buildflags") {
+     "ENABLE_BACKGROUND_CONTENTS=$enable_background_contents",
+     "ENABLE_CHROME_NOTIFICATIONS=$enable_chrome_notifications",
+     "ENABLE_DOWNGRADE_PROCESSING=$enable_downgrade_processing",
+    "ENABLE_GLIC=$enable_glic",
+     "ENABLE_HANGOUT_SERVICES_EXTENSION=$enable_hangout_services_extension",
+     "ENABLE_PDF_SAVE_TO_DRIVE=$enable_pdf_save_to_drive",
+     "ENABLE_SERVICE_DISCOVERY=$enable_service_discovery",
+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
+@@ -453,6 +453,7 @@ BASE_FEATURE(kGlic,
+              base::FEATURE_DISABLED_BY_DEFAULT
+ #endif
+ );
+SET_CROMITE_FEATURE_DISABLED(kGlic);
+ 
+ // Controls whether the Glic feature is always detached.
+ BASE_FEATURE(kGlicDetached, base::FEATURE_ENABLED_BY_DEFAULT);
+diff --git a/chrome/common/features.gni b/chrome/common/features.gni
+--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
+@@ -49,6 +49,8 @@ declare_args() {
+   # Enables usage of notifications via Chrome's MessageCenter.
+   enable_chrome_notifications = is_mac || is_win || is_linux
+ 
+  enable_glic = is_mac || is_win || is_linux || is_chromeos
+
+   # Skips unmigrated actor files in the build on Android. This is temporary, and
+   # will eventually be removed once migration is done. Adding this flag likely
+   # means the code needs to be adapted for Android. Once adapted, the final code
+diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
+--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
+@@ -2017,7 +2017,7 @@ if (is_android) {
+       "//chrome/browser/enterprise/data_controls",
+       "//chrome/browser/enterprise/platform_auth:features",
+       "//chrome/browser/flags:flags_android",
+-      "//chrome/browser/glic:browser_tests",
+      #"//chrome/browser/glic:browser_tests",
+       "//chrome/browser/history",
+       "//chrome/browser/keyboard_accessory/android:public",
+       "//chrome/browser/metrics:test_support",
+@@ -2564,7 +2564,7 @@ if (!is_android) {
+       "//chrome/browser/actor:test_support",
+       "//chrome/browser/actor/ui:browser_tests",
+       "//chrome/browser/affiliations",
+-      "//chrome/browser/ai",
+      # "//chrome/browser/ai",
+       "//chrome/browser/apps/app_service",
+       "//chrome/browser/apps/app_service:app_registry_cache_waiter",
+       "//chrome/browser/apps/app_service:test_support",
+@@ -7015,9 +7015,9 @@ test("unit_tests") {
+     "//chrome/browser/accessibility_annotator:unit_tests",
+     "//chrome/browser/actor:unit_tests",
+     "//chrome/browser/actor/ui:unit_tests",
+-    "//chrome/browser/ai",
+-    "//chrome/browser/ai:test_support",
+-    "//chrome/browser/ai:unit_tests",
+    # "//chrome/browser/ai",
+    # "//chrome/browser/ai:test_support",
+    # "//chrome/browser/ai:unit_tests",
+     "//chrome/browser/apps:icon_standardizer",
+     "//chrome/browser/apps:user_type_filter",
+     "//chrome/browser/autocomplete",
+diff --git a/components/browser_sync/BUILD.gn b/components/browser_sync/BUILD.gn
+--- a/components/browser_sync/BUILD.gn
+++ b/components/browser_sync/BUILD.gn
+@@ -51,7 +51,7 @@ static_library("browser_sync") {
+     "//components/send_tab_to_self",
+     "//components/sharing_message",
+     "//components/skills:features",
+-    "//components/skills/public",
+    #"//components/skills/public",
+     "//components/supervised_user/core/common:buildflags",
+     "//components/sync/invalidations",
+     "//components/sync_bookmarks",
+--
@@ -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
-@@ -422,7 +422,7 @@ void ProfileImpl::RegisterProfilePrefs(
+@@ -431,7 +431,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
-@@ -548,6 +548,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
+@@ -524,6 +524,8 @@ void SetCustomizedRuntimeFeaturesFromCombinedArgs(
     WebRuntimeFeatures::EnableV8IdleTasks(true);
   }
 
@@ -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 KURL& source,
+@@ -96,7 +96,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
-@@ -4291,14 +4291,10 @@
+@@ -4662,14 +4662,10 @@
       base_feature: "none",
     },
     {
@@ -9,10 +9,13 @@ Subject: Disable minikin hyphenation
 diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/public/public_features.gni
 --- a/third_party/blink/public/public_features.gni
 +++ b/third_party/blink/public/public_features.gni
-@@ -10,4 +10,4 @@ import("//build/config/ui.gni")
+@@ -10,7 +10,7 @@ import("//build/config/ui.gni")
 enable_unhandled_tap = is_android
 
 # Use Minikin hyphenation engine.
 -use_minikin_hyphenation = !is_apple
 +use_minikin_hyphenation = false
+ 
+ # Web Smart Card API is currently supported only on chromeos.
+ # TODO(crbug.com/470349523): Migrate more smart card files to this flag.
 --
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
uazoandgithub-actions[bot]	fc26f22da2	[AUTO][FILECONTROL] - version 149.0.7827.59	2026-06-03 06:50:25 +00:00
Carmelo Messina	cdf415cc86	[TOOLS] Removed xdg-mime and xdg-settings from linux release	2026-05-21 17:55:57 +02:00
Carmelo Messina	cb3baf14f5	ungoogled-chromium: Disable translate integration: fix desktop build	2026-05-20 17:40:29 +02:00
Carmelo Messina	3dc5833d37	Patches for 148.0.7778.168	2026-05-19 15:40:33 +02:00
Carmelo Messina	bd0ad9b858	Bump to 148.0.7778.168	2026-05-19 12:46:35 +02:00
uazoandGitHub	8ed2e4a1e6	[AUTO][DOC] Generate patches doc for master branch (#2903 ) [AUTO][DOC] Generate patches doc for master branch	2026-05-19 12:43:30 +02:00
uazoandGitHub	0c23c594a1	[AUTO][FILECONTROL] - version 148.0.7778.168 (#2851 ) [AUTO][FILECONTROL] - version 148.0.7778.168	2026-05-19 12:42:48 +02:00
uazoandgithub-actions[bot]	b855b1f4d3	[AUTO][DOC] Generate patches doc for master branch	2026-05-19 10:39:44 +00:00
Carmelo Messina	43b0b3325f	Bump to 148.0.7778.167	2026-05-19 12:38:55 +02:00
uazoandGitHub	73bd3f72e0	Rebase to 148 (#2888 ) Rebase to 148	2026-05-19 11:39:57 +02:00
uazoandGitHub	fa29828566	[AUTO] Patches auto-rebase for next-148 branch (#2901 ) [AUTO] Patches auto-rebase for next-148 branch	2026-05-19 11:16:08 +02:00
uazoandgithub-actions[bot]	b632e0d604	[AUTO] Patches auto-rebase	2026-05-19 09:12:10 +00:00
Carmelo Messina	925f3452ce	gn args: cleans up the gn args for v148	2026-05-19 11:08:04 +02:00
Carmelo Messina	6b10069f92	Enable Android DevTools Frontend: Enable the Android DevTools frontend and remove Android-specific UI restrictions that prevented access to developer features on phones.	2026-05-19 11:06:34 +02:00
Carmelo Messina	932da2ddc3	Disable AppRating: Remove AppRating code paths and build targets. The feature depends on Google Play Review APIs already disabled by default.	2026-05-19 11:04:31 +02:00
Carmelo Messina	08a05c03de	Supporting Dangling Ptr Detection via BackupRefPtr: enabled by default	2026-05-19 10:50:47 +02:00
Carmelo Messina	d0acb9af5a	Patches for v148 (no changes, context changed)	2026-05-19 10:49:53 +02:00
Carmelo Messina	0bf212cf9b	Patches for v148	2026-05-19 10:48:25 +02:00
uazoandgithub-actions[bot]	62141931a7	[AUTO][FILECONTROL] - version	2026-05-14 05:06:55 +00:00
Carmelo Messina	5aab1a3f2a	Bump to 148.0.7778.120	2026-05-08 11:44:31 +02:00
Carmelo Messina	edba3a2430	[TOOLS] Update runner to v2.334.0	2026-05-08 08:40:38 +02:00
Carmelo Messina	2afc7b19a4	Bump to 148.0.7778.97	2026-05-08 08:37:18 +02:00
Carmelo Messina	5e2e7d3817	Patches for 148.0.7778.97 (need work)	2026-05-08 08:36:11 +02:00
Carmelo Messina	ca9926de51	Patches for 148.0.7778.97	2026-05-08 08:35:17 +02:00
Carmelo Messina	79b95d83fe	Rebase to 147.0.7727.102	2026-04-20 17:52:46 +02:00
Carmelo Messina	c787e9a932	Bump to 147.0.7727.102	2026-04-18 09:34:32 +02:00
uazoandGitHub	e8cb7f5b6c	[AUTO][FILECONTROL] - version 147.0.7727.56 (#2833 ) [AUTO][FILECONTROL] - version 147.0.7727.56	2026-04-18 09:34:55 +02:00
uazoandgithub-actions[bot]	2a677c2453	[AUTO][FILECONTROL] - version	2026-04-17 04:27:38 +00:00
uazoandGitHub	9af44e67e6	[AUTO][DOC] Generate patches doc for master branch (#2830 ) [AUTO][DOC] Generate patches doc for master branch	2026-04-15 17:50:28 +02:00
uazoandgithub-actions[bot]	0fb56ae592	[AUTO][DOC] Generate patches doc for master branch	2026-04-15 15:42:28 +00:00
Carmelo Messina	880346893d	no changes to the code, just changes to the context	2026-04-15 17:40:51 +02:00
Carmelo Messina	0287d87391	Supporting Dangling Ptr Detection via BackupRefPtr: fix the memory release order in Android	2026-04-15 17:39:18 +02:00
Carmelo Messina	f9ced0c819	Experimental support for extensions on Android: fix a crash caused by an dangling pointer (#256 ) In Chromium, extension support on Android suffers from a number of issues caused by incorrect pointer handling during dtor, since the dtor behaviour for profiles and windows differs from that of the desktop version. With these changes, all issues should be resolved (until the next major :) and cromite no longer crashes for these reasons.	2026-04-15 17:38:06 +02:00
Carmelo Messina	50bf1e7137	Enable native Android autofill: fix a crash caused by an dangling pointer	2026-04-15 17:30:10 +02:00
Carmelo Messina	8a021bb680	Enable extensions in incognito: removed unnecessary code added in a previous version (#2511 #256 )	2026-04-15 17:28:15 +02:00
Carmelo Messina	a8aed07597	Cromite Branding: Fix for taskbar grouping (#2796 ) Modifies the handling of the system mutex to distinguish Cromite from other Chromium forks and the policy registry path. Disables the forced loading of chrome extensions specified in the registry key.	2026-04-15 17:25:19 +02:00
Carmelo Messina	6b30b1b2ba	Add menu item to bookmark all tabs: workaround for the occasional crashes when closing desktop applications caused by a dangling raw_ptr. I don't notice the same problem on Android. Currently, all fields in the Chromium bookmark model are marked as “untriaged”, unfortunately since 2022, but they're working on it (https://issues.chromium.org/issues/40212619)	2026-04-15 17:20:36 +02:00
Carmelo Messina	a23dc6d722	Enables keyword-based site search on Android devices: to replace the default active patch with the new search engine management ui (#2811 )	2026-04-15 17:12:39 +02:00
Carmelo Messina	69724a461a	Enable search engine settings desktop ui: drop patch (#2811 )	2026-04-15 17:10:40 +02:00
Carmelo Messina	1003da6c2e	[TOOLS] Add Android 16 to platform versions (#2803 )	2026-04-11 09:02:57 +02:00
Carmelo Messina	16109ace42	[TOOLS] Remove headless_lib_data.pak from release zip	2026-04-10 16:38:47 +02:00
uazoandGitHub	1468382f54	[AUTO][DOC] Generate patches doc for master branch (#2810 ) [AUTO][DOC] Generate patches doc for master branch	2026-04-10 08:27:41 +02:00
uazoandgithub-actions[bot]	bf5b69343e	[AUTO][DOC] Generate patches doc for master branch	2026-04-10 06:25:05 +00:00
uazoandGitHub	63e4fcb119	Rebase to v147 (#2788 ) Rebase to v147	2026-04-10 08:24:46 +02:00
Carmelo Messina	271900671d	Experimental support for extensions on Android: fix dangling raw_ptr android code	2026-04-09 17:17:45 +02:00
Carmelo Messina	a5159d2fd6	Disable device bound session: fix windows build	2026-04-09 17:16:34 +02:00
Carmelo Messina	a48bb52d21	Dictionary suggestions for the Omnibox: fix build	2026-04-09 17:16:09 +02:00
Carmelo Messina	15d48b0614	Patches for 147.0.7727.56	2026-04-08 14:31:34 +02:00
Carmelo Messina	c77fa98a16	Bump to 147.0.7727.56	2026-04-08 10:50:53 +02:00
Carmelo Messina	6465669461	Patches for v147 (final)	2026-04-08 10:42:08 +02:00
Carmelo Messina	130b90c921	Bump to 147.0.7727.24	2026-03-27 15:11:13 +01:00
Carmelo Messina	d1379887a6	Patches for v147 (to be checked)	2026-03-27 15:10:40 +01:00
Carmelo Messina	bfd5fc63c2	Patches for v147	2026-03-27 15:09:49 +01:00
uazoandGitHub	416bb7c5cb	[AUTO][FILECONTROL] - version 146.0.7680.31 (#2745 ) [AUTO][FILECONTROL] - version 146.0.7680.31	2026-03-27 12:13:00 +01:00
uazoandGitHub	32de090df4	Rebase to v146 (#2764 ) Rebase to v146	2026-03-27 12:12:30 +01:00
Carmelo Messina	31d4039f39	TOOLS: download python3 deps for tools/flags	2026-03-24 11:16:30 +01:00
Carmelo Messina	bc395b8bd9	Disable integration with Gemini: Due to the extensive integration of Gemini into the desktop versions, the flag will be removed. In the Android version, the integration is not yet as extensive, so the patch removes it during the build process.	2026-03-24 11:15:30 +01:00
Carmelo Messina	41270b79c6	Patches for v146 (#2511 #256 )	2026-03-24 11:12:18 +01:00
Carmelo Messina	813bec3069	Patches for v146	2026-03-24 11:10:18 +01:00
uazoandGitHub	21fe58812e	[AUTO] Patches auto-rebase for next-146 branch (#2765 ) [AUTO] Patches auto-rebase for next-146 branch	2026-03-11 12:58:53 +01:00
uazoandgithub-actions[bot]	0cb2f33e3f	[AUTO] Patches auto-rebase	2026-03-11 11:54:07 +00:00
Carmelo Messina	d11d70028c	Bump to 146.0.7680.111	2026-03-11 12:49:53 +01:00
Carmelo Messina	b224fa6ab9	Bump to 146.0.7680.31	2026-03-11 12:44:34 +01:00
Carmelo Messina	3d1185d594	Patches for v146 (need some work)	2026-03-11 12:43:59 +01:00
Carmelo Messina	ead22ceee7	Patches for v146	2026-03-11 12:43:32 +01:00
uazoandGitHub	d133d52d09	[AUTO][DOC] Generate patches doc for master branch (#2746 ) [AUTO][DOC] Generate patches doc for master branch	2026-02-27 13:48:02 +01:00
uazoandgithub-actions[bot]	cdeda1d632	[AUTO][DOC] Generate patches doc for master branch	2026-02-27 12:40:08 +00:00
Carmelo Messina	a1e722dbef	Disable integration with Gemini: due to errors, some points are not covered by the gn arg check. This patch fixes build errors. Note that the enable_glic argument is already disabled in cromite's gn args. It is explicitly stated in the patch for clarity. This patch fixes desktop builds of 145.0.7632.120.	2026-02-27 13:33:20 +01:00
uazoandgithub-actions[bot]	8627614ac9	[AUTO][FILECONTROL] - version 146.0.7680.31	2026-02-26 04:20:41 +00:00
Carmelo Messina	080634431f	Experimental support for extensions on Android: version 145.0.7632.120	2026-02-25 17:02:34 +01:00
Carmelo Messina	9b33511160	Patches for 145.0.7632.120	2026-02-25 12:35:55 +01:00
uazoandGitHub	27d49f75f1	[AUTO][FILECONTROL] - version 145.0.7632.120 (#2736 ) [AUTO][FILECONTROL] - version 145.0.7632.120	2026-02-24 18:07:21 +01:00
uazoandGitHub	d0a7c9c0ae	[AUTO][DOC] Generate patches doc for master branch (#2742 ) [AUTO][DOC] Generate patches doc for master branch	2026-02-24 18:02:54 +01:00
uazoandgithub-actions[bot]	b947bec617	[AUTO][DOC] Generate patches doc for master branch	2026-02-24 16:58:35 +00:00
Carmelo Messina	d24356fc41	Enable Socket Pool Limit Randomization: anticipates the activation of Socket Pool Limit Randomization scheduled for v147 The new feature is complete (see https://chromium-review.googlesource.com/c/chromium/src/+/7515640)	2026-02-24 17:57:30 +01:00
Carmelo Messina	50795297ae	Experimental support for extensions on Android: fix dangling raw_ptr on popup controller (#256 #2511 )	2026-02-24 17:54:40 +01:00
Carmelo Messina	65d7b3483c	Partition blobs by top frame URL: allows the use of blobs within a third-party iframe workers (#2722 )	2026-02-24 17:52:06 +01:00
Carmelo Messina	c946bfccc2	Patches for 145.0.7632.120	2026-02-24 11:03:01 +01:00
Carmelo Messina	90984b5000	Bump to 145.0.7632.120	2026-02-24 08:33:25 +01:00
uazoandgithub-actions[bot]	8a4569c014	[AUTO][FILECONTROL] - version 145.0.7632.120	2026-02-24 04:22:23 +00:00
Carmelo Messina	f964e2a760	Bump to 145.0.7632.110	2026-02-21 11:10:37 +01:00
Carmelo Messina	3f39c33bc6	[TOOLS] build images: move "Create issue" before "Update files under control"	2026-02-19 14:30:07 +01:00
Carmelo Messina	e30dd7c2d3	[TOOLS] remove webview_includes_weblayer gn arg	2026-02-19 13:46:00 +01:00
Carmelo Messina	d19a6c6baf	[TOOLS] Update under control file list add android_webview/test/data/web_tests/webexposed/global-interface-listing-expected.txt	2026-02-19 13:45:08 +01:00
Carmelo Messina	31e9cdbb46	[TOOLS] Update runner to v2.331.0	2026-02-19 13:44:06 +01:00
Carmelo Messina	1a191f7b3c	[TOOLS] Download android-desktop pgo profiles (currently unused)	2026-02-19 13:42:17 +01:00
Carmelo Messina	a033b60f93	[TOOLS] Release: move the creation of updateurl.txt closer to the Windows release	2026-02-19 13:40:49 +01:00